Omaha #3132 - merge omaha_14.3.1 into omaha_14.4.1

Former-commit-id: e955496335 [formerly e955496335 [formerly de217b0bd6bbf72ea138f9bc1286992d43d72ef1]]
Former-commit-id: 4d1b6ddc00
Former-commit-id: 233bc14114

edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Ncwf Plug-in
 Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.bufrncwf
-Bundle-Version: 1.12.1174.qualifier
+Bundle-Version: 1.14.0.qualifier
 Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
@@ -14,5 +14,4 @@ Require-Bundle: com.raytheon.uf.common.serialization,
  com.raytheon.uf.common.geospatial
 Import-Package: com.raytheon.uf.common.pointdata,
  com.raytheon.uf.common.pointdata.spatial,
- com.raytheon.uf.common.status,
+ com.raytheon.uf.common.status
- com.raytheon.uf.edex.decodertools.core

edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/src/com/raytheon/uf/common/dataplugin/bufrncwf/NCWFFeature.java

@@ -25,7 +25,6 @@ import java.util.List;
 
 import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
 import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
-import com.raytheon.uf.edex.decodertools.core.DecoderTools;
 import com.vividsolutions.jts.geom.Coordinate;
 
 /**
@@ -38,6 +37,7 @@ import com.vividsolutions.jts.geom.Coordinate;
  * ------------ ---------- ----------- --------------------------
  * --/--/----              jkorman     Initial creation
  * Oct 15, 2013 2361       njensen     Remove XML annotations
+ * May 12, 2014 3133       njensen     Remove dependency on DecoderTools
  * 
  * </pre>
  * 
@@ -66,7 +66,7 @@ public class NCWFFeature implements Serializable {
      *            Feature centroid longitude.
      */
     public NCWFFeature(Double lat, Double lon) {
-        centroidLocation = DecoderTools.createCoordinate(lat, lon);
+        centroidLocation = new Coordinate(lon, lat);
     }
 
     /**
@@ -81,7 +81,7 @@ public class NCWFFeature implements Serializable {
      * @return
      */
     public double getCentroidLatitude() {
-        return DecoderTools.getCoordinateLatitude(centroidLocation);
+        return centroidLocation.y;
     }
 
     /**
@@ -89,7 +89,7 @@ public class NCWFFeature implements Serializable {
      * @return
      */
     public double getCentroidLongitude() {
-        return DecoderTools.getCoordinateLongitude(centroidLocation);
+        return centroidLocation.x;
     }
 
     /**

edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Bufrssmi Plug-in
 Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.bufrssmi
-Bundle-Version: 1.12.1174.qualifier
+Bundle-Version: 1.14.0.qualifier
 Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
@@ -15,5 +15,4 @@ Require-Bundle: com.raytheon.uf.common.serialization,
  com.raytheon.uf.common.dataplugin
 Import-Package: com.raytheon.uf.common.dataplugin.bufrssmi,
  com.raytheon.uf.common.pointdata,
- com.raytheon.uf.common.status,
+ com.raytheon.uf.common.status
- com.raytheon.uf.edex.decodertools.time

edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/src/com/raytheon/uf/common/dataplugin/bufrssmi/SSMIScanData.java

@@ -42,7 +42,7 @@ 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.raytheon.uf.edex.decodertools.time.TimeTools;
+import com.raytheon.uf.common.time.util.TimeUtil;
 import com.vividsolutions.jts.geom.Geometry;
 
 /**
@@ -62,6 +62,7 @@ import com.vividsolutions.jts.geom.Geometry;
  * May 17, 2013 1869       bsteffen    Remove DataURI column from sat plot
  *                                     types.
  * Aug 30, 2013 2298       rjpeter     Make getPluginName abstract
+ * May 12, 2014 3133       njensen     Use TimeUtil instead of TimeTools
  * 
  * </pre>
  * 
@@ -315,7 +316,7 @@ public class SSMIScanData extends PersistablePluginDataObject implements
         SSMIScanData obs = new SSMIScanData();
 
         obs.dataTime = dataTime.clone();
-        obs.timeObs = TimeTools.copy(timeObs);
+        obs.timeObs = TimeUtil.newCalendar(timeObs);
         obs.orbitNumber = orbitNumber;
         obs.satId = satId;
         obs.scanNumber = scanNumber;

edexOsgi/com.raytheon.uf.common.dataplugin.text/META-INF/MANIFEST.MF

@@ -8,8 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization
 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"
- com.raytheon.edex.common;bundle-version="1.12.1174"
 Import-Package: com.raytheon.uf.common.dataplugin.persist,
  com.raytheon.uf.common.serialization,
  com.raytheon.uf.common.serialization.annotations,

edexOsgi/com.raytheon.uf.edex.archive.feeder/META-INF/MANIFEST.MF

@@ -2,14 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Utility
 Bundle-SymbolicName: com.raytheon.uf.edex.archive.feeder
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.14.0.qualifier
-Bundle-Activator: com.raytheon.uf.edex.archive.feeder.Activator
 Bundle-Vendor: RAYTHEON
 Require-Bundle: com.raytheon.uf.common.serialization;bundle-version="1.12.1174",
  com.raytheon.edex.common;bundle-version="1.12.1174",
  com.raytheon.uf.edex.database;bundle-version="1.0.0",
- org.eclipse.ui,
- org.eclipse.core.runtime,
  com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174",
  com.raytheon.uf.common.status;bundle-version="1.12.1174",
  org.apache.camel;bundle-version="1.0.0",