diff --git a/cots/org.apache.camel/META-INF/MANIFEST.MF b/cots/org.apache.camel/META-INF/MANIFEST.MF
index ff2b5e9c31..26f2fc5834 100644
--- a/cots/org.apache.camel/META-INF/MANIFEST.MF
+++ b/cots/org.apache.camel/META-INF/MANIFEST.MF
@@ -125,3 +125,5 @@ Export-Package: org.apache.camel,
org.apache.camel.util.concurrent,
org.apache.camel.util.jndi,
org.apache.camel.view
+Require-Bundle: org.springframework;bundle-version="2.5.6",
+ org.apache.commons.management;bundle-version="1.0.0"
diff --git a/edexOsgi/com.raytheon.edex.common/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.common/META-INF/MANIFEST.MF
index 97c9d14435..e93ab56993 100644
--- a/edexOsgi/com.raytheon.edex.common/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.edex.common/META-INF/MANIFEST.MF
@@ -9,7 +9,6 @@ Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization
Export-Package: com.raytheon.edex.colormap,
com.raytheon.edex.common.request,
com.raytheon.edex.db.dao,
- com.raytheon.edex.db.dao.spatial,
com.raytheon.edex.db.mapping,
com.raytheon.edex.db.objects.hibernate,
com.raytheon.edex.db.purge,
@@ -48,18 +47,15 @@ Require-Bundle: net.sf.ehcache,
org.apache.http,
org.springframework;bundle-version="2.5.6";visibility:=reexport,
com.raytheon.uf.common.time;visibility:=reexport,
+ com.raytheon.uf.common.colormap;bundle-version="1.11.0";visibility:=reexport,
com.raytheon.uf.common.dataplugin;visibility:=reexport,
com.raytheon.uf.common.datastorage;bundle-version="1.11.0";visibility:=reexport,
com.raytheon.uf.common.geospatial;bundle-version="1.0.0";visibility:=reexport,
com.raytheon.uf.common.message;bundle-version="1.11.11",
com.raytheon.uf.common.serialization.comm;bundle-version="1.11.17",
org.hibernate;visibility:=reexport,
- com.raytheon.uf.common.pointdata,
com.raytheon.uf.common.util;visibility:=reexport,
com.raytheon.uf.common.dataquery;visibility:=reexport,
com.raytheon.uf.edex.database;visibility:=reexport,
com.raytheon.uf.edex.core;visibility:=reexport
-Import-Package: com.raytheon.uf.common.colormap,
- com.raytheon.uf.common.message.response,
- com.raytheon.uf.common.topo
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/edexOsgi/com.raytheon.edex.common/unit-test/com/raytheon/edex/plugin/data/TestObsStation.java b/edexOsgi/com.raytheon.edex.common/unit-test/com/raytheon/edex/plugin/data/TestObsStation.java
deleted file mode 100644
index 038a3bcafe..0000000000
--- a/edexOsgi/com.raytheon.edex.common/unit-test/com/raytheon/edex/plugin/data/TestObsStation.java
+++ /dev/null
@@ -1,95 +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.plugin.data;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.postgis.PGgeometry;
-import org.postgis.Point;
-
-import com.raytheon.uf.common.pointdata.spatial.ObStation;
-
-/**
- * JUnit test case for {@link com.raytheon.edex.plugin.data.ObsStation} class.
- *
- *
- *
- * SOFTWARE HISTORY
- *
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * 19June2007 343 MW Fegan Initial creation.
- *
- *
- *
- * @author mfegan
- * @version 1
- */
-
-public class TestObsStation {
- /* test data values */
- /* represents POINT(-95.76666666666667 41.266666666666666) */
- private byte[] geometry = { 48, 49, 48, 49, 48, 48, 48, 48, 48, 48, 49, 49,
- 49, 49, 49, 49, 49, 49, 49, 49, 70, 49, 53, 55, 67, 48, 50, 50, 50,
- 50, 50, 50, 50, 50, 50, 50, 65, 50, 52, 52, 52, 48 };
- private Point point = null;
- /* the test object */
- private ObStation station = null;
-
- /**
- * @throws java.lang.Exception
- */
- @Before
- public void setUp() throws Exception {
- station = new ObStation();
- point = (Point) PGgeometry.geomFromString(new String(geometry));
- }
-
- /**
- * @throws java.lang.Exception
- */
- @After
- public void tearDown() throws Exception {
- station = null;
- }
-
- /**
- * Tests the operation of the
- * {@link com.raytheon.uf.common.pointdata.spatial.ObStation#setGeometryWKB(byte[])}
- * method. This method sets both the {@code geometryWKB} and
- * {@code geometry} attributes.
- */
- @Test
- public void basicGeometryWKBTest() {
- // station.setGeometryWKB(null);
- assertNotNull("Checking geometry not null", station.getGeometry());
- assertEquals("Checking geometry value", point.toString(), station
- .getGeometry().toString());
- // assertNotNull("Checking geomertyWKB not
- // null",station.getGeometryWKB());
- // assertEquals("Checking geometryWKB value", geometry, station
- // .getGeometryWKB());
-
- }
-}
diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUADecoder.java b/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUADecoder.java
index cc9eef6920..6c04c47ae0 100644
--- a/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUADecoder.java
+++ b/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUADecoder.java
@@ -27,7 +27,6 @@ import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import com.raytheon.edex.db.dao.spatial.ObStationDao;
import com.raytheon.edex.plugin.bufrua.dao.BufrUADao;
import com.raytheon.edex.plugin.bufrua.decoder.AbstractBUFRUAAdapter;
import com.raytheon.edex.plugin.bufrua.decoder.BUFRUAAdapterFactory;
@@ -43,6 +42,7 @@ import com.raytheon.uf.edex.database.DataAccessLayerException;
import com.raytheon.uf.edex.decodertools.bufr.BUFRDataDocument;
import com.raytheon.uf.edex.decodertools.bufr.descriptors.DefaultDescriptorDelegate;
import com.raytheon.uf.edex.decodertools.core.DecoderTools;
+import com.raytheon.uf.edex.pointdata.spatial.ObStationDao;
import com.raytheon.uf.edex.wmo.message.WMOHeader;
/**
@@ -72,6 +72,7 @@ import com.raytheon.uf.edex.wmo.message.WMOHeader;
* in findDuplicate.
* 20080408 1039 jkorman Added traceId for tracing data.
* 11/25/08 #1684 chammack Camel Refactor
+ * Feb 27, 2013 1638 mschenke Moved ObStationDao to edex pointdata plugin
*
*
* @author jkorman
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 5f6a15838c..c8267ecdb3 100644
--- a/edexOsgi/com.raytheon.edex.plugin.ldadhydro/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.edex.plugin.ldadhydro/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: com.raytheon.edex.plugin.ldadhydro
Bundle-Version: 1.12.1174.qualifier
Bundle-Vendor: RAYTHEON
Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.13",
- com.raytheon.uf.common.pointdata,
+ com.raytheon.uf.edex.pointdata,
javax.persistence;bundle-version="1.0.0",
javax.measure;bundle-version="1.0.0",
org.geotools;bundle-version="2.5.2",
diff --git a/edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/LdadHydroDao.java b/edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/LdadHydroDao.java
index fb3bdec076..93bba23988 100644
--- a/edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/LdadHydroDao.java
+++ b/edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/LdadHydroDao.java
@@ -23,7 +23,6 @@ import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
-import com.raytheon.edex.db.dao.spatial.ObStationDao;
import com.raytheon.uf.common.dataplugin.PluginException;
import com.raytheon.uf.common.dataplugin.ldadhydro.HydroLdadRecord;
import com.raytheon.uf.common.dataplugin.persist.IPersistable;
@@ -34,6 +33,7 @@ import com.raytheon.uf.common.pointdata.spatial.ObStation;
import com.raytheon.uf.edex.database.DataAccessLayerException;
import com.raytheon.uf.edex.database.query.DatabaseQuery;
import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
+import com.raytheon.uf.edex.pointdata.spatial.ObStationDao;
/**
* Data access object for accessing LDAD HYDRO records in the database.
@@ -45,6 +45,7 @@ import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 9/30/09 vkorolev Initial creation
+ * Feb 27, 2013 1638 mschenke Moved ObStationDao to edex pointdata plugin
*
*
*
diff --git a/edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/ObsDao.java b/edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/ObsDao.java
index bd4c704ca5..0341ab2df3 100644
--- a/edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/ObsDao.java
+++ b/edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/ObsDao.java
@@ -26,7 +26,6 @@ import java.util.Map;
import javax.xml.bind.JAXBException;
-import com.raytheon.edex.db.dao.spatial.ObStationDao;
import com.raytheon.uf.common.dataplugin.PluginException;
import com.raytheon.uf.common.dataplugin.obs.metar.MetarRecord;
import com.raytheon.uf.common.dataplugin.persist.IPersistable;
@@ -38,6 +37,7 @@ import com.raytheon.uf.edex.database.DataAccessLayerException;
import com.raytheon.uf.edex.database.query.DatabaseQuery;
import com.raytheon.uf.edex.pointdata.PointDataDbDescription;
import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
+import com.raytheon.uf.edex.pointdata.spatial.ObStationDao;
/**
* TODO Add Description
@@ -49,6 +49,7 @@ import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
* ------------ ---------- ----------- --------------------------
*
* 20071217 453 jkorman added queryDataUriColumn method.
+ * Feb 27, 2013 1638 mschenke Moved ObStationDao to edex pointdata plugin
*
*
* @author jkorman
diff --git a/edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java b/edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java
index 283f8e0f87..357d7bd238 100644
--- a/edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java
+++ b/edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java
@@ -26,7 +26,6 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import com.raytheon.edex.db.dao.spatial.ObStationDao;
import com.raytheon.edex.esb.Headers;
import com.raytheon.edex.exception.DecoderException;
import com.raytheon.edex.plugin.AbstractDecoder;
@@ -41,6 +40,7 @@ import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.edex.decodertools.core.DecoderTools;
import com.raytheon.uf.edex.decodertools.core.IDecoderConstants;
import com.raytheon.uf.edex.decodertools.time.TimeTools;
+import com.raytheon.uf.edex.pointdata.spatial.ObStationDao;
import com.raytheon.uf.edex.wmo.message.WMOHeader;
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.GeometryFactory;
diff --git a/edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/uengine/tasks/obs/SpatialQuery.java b/edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/uengine/tasks/obs/SpatialQuery.java
index 6ce6c954ec..3027e43653 100644
--- a/edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/uengine/tasks/obs/SpatialQuery.java
+++ b/edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/uengine/tasks/obs/SpatialQuery.java
@@ -23,10 +23,10 @@ package com.raytheon.edex.uengine.tasks.obs;
import java.util.ArrayList;
import java.util.List;
-import com.raytheon.edex.db.dao.spatial.ObStationDao;
import com.raytheon.edex.uengine.exception.MicroEngineException;
import com.raytheon.edex.uengine.tasks.ScriptTask;
import com.raytheon.uf.common.pointdata.spatial.ObStation;
+import com.raytheon.uf.edex.pointdata.spatial.ObStationDao;
/**
* SpatialQuery task derived from original uEngine SpatialQuery task.
@@ -37,6 +37,7 @@ import com.raytheon.uf.common.pointdata.spatial.ObStation;
* Date PR# Engineer Description
* ----------- ---------- ------------ --------------------------
* Apr 11, 2007 njensen Initial Creation
+ * Feb 27, 2013 1638 mschenke Moved ObStationDao to edex pointdata plugin
*
*
*
diff --git a/edexOsgi/com.raytheon.edex.plugin.pirep/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.pirep/META-INF/MANIFEST.MF
index b535f2431e..f88cdd6905 100644
--- a/edexOsgi/com.raytheon.edex.plugin.pirep/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.edex.plugin.pirep/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.12.1174.qualifier
Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization
Bundle-Vendor: RAYTHEON
Require-Bundle: com.raytheon.edex.common,
- com.raytheon.uf.common.pointdata,
+ com.raytheon.uf.edex.pointdata,
com.raytheon.uf.edex.decodertools;bundle-version="1.0.0",
org.apache.commons.logging,
org.geotools,
diff --git a/edexOsgi/com.raytheon.edex.plugin.pirep/src/com/raytheon/edex/plugin/pirep/decoder/PirepParser.java b/edexOsgi/com.raytheon.edex.plugin.pirep/src/com/raytheon/edex/plugin/pirep/decoder/PirepParser.java
index d79f9663c6..f56f926d45 100644
--- a/edexOsgi/com.raytheon.edex.plugin.pirep/src/com/raytheon/edex/plugin/pirep/decoder/PirepParser.java
+++ b/edexOsgi/com.raytheon.edex.plugin.pirep/src/com/raytheon/edex/plugin/pirep/decoder/PirepParser.java
@@ -31,7 +31,6 @@ import java.util.regex.Pattern;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import com.raytheon.edex.db.dao.spatial.ObStationDao;
import com.raytheon.edex.esb.Headers;
import com.raytheon.uf.common.dataplugin.pirep.PirepLayerData;
import com.raytheon.uf.common.pointdata.spatial.ObStation;
@@ -45,6 +44,7 @@ import com.raytheon.uf.edex.decodertools.core.DecoderTools;
import com.raytheon.uf.edex.decodertools.core.IDecoderConstants;
import com.raytheon.uf.edex.decodertools.core.LatLonPoint;
import com.raytheon.uf.edex.decodertools.time.TimeTools;
+import com.raytheon.uf.edex.pointdata.spatial.ObStationDao;
import com.vividsolutions.jts.geom.Geometry;
import com.vividsolutions.jts.geom.Point;
@@ -64,6 +64,7 @@ import com.vividsolutions.jts.geom.Point;
* parse text elements properly. Removed test code to unit-test
* parse TEIs.
* 08/23/2012 1011 jkorman Corrected test for icing NEG.
+ * Feb 27, 2013 1638 mschenke Moved ObStationDao to edex pointdata plugin
*
*
* @author jkorman
diff --git a/edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF
index 88e7f8cd7c..d43c73a557 100644
--- a/edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF
@@ -6,6 +6,7 @@ Bundle-Version: 1.12.1174.qualifier
Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization
Bundle-Vendor: RAYTHEON
Require-Bundle: com.raytheon.edex.common,
+ com.raytheon.uf.edex.pointdata,
com.raytheon.uf.edex.decodertools;bundle-version="1.0.0",
org.apache.commons.logging,
org.geotools,
@@ -14,7 +15,4 @@ Require-Bundle: com.raytheon.edex.common,
Export-Package: com.raytheon.edex.plugin.sfcobs.common
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: com.raytheon.uf.common.dataplugin.sfcobs,
- com.raytheon.uf.common.dataplugin.sfcobs.dao,
- com.raytheon.uf.common.pointdata,
- com.raytheon.uf.common.pointdata.spatial,
- com.raytheon.uf.edex.pointdata
+ com.raytheon.uf.common.dataplugin.sfcobs.dao
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 ff1e4b1401..fcc3e226e4 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
@@ -22,7 +22,6 @@ package com.raytheon.edex.plugin.sfcobs.decoder.synoptic;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import com.raytheon.edex.db.dao.spatial.ObStationDao;
import com.raytheon.edex.exception.DecoderException;
import com.raytheon.edex.plugin.sfcobs.decoder.synoptic.regional.Sec5MaritimeDecoder;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
@@ -31,6 +30,7 @@ import com.raytheon.uf.common.pointdata.spatial.ObStation;
import com.raytheon.uf.common.pointdata.spatial.SurfaceObsLocation;
import com.raytheon.uf.edex.database.DataAccessLayerException;
import com.raytheon.uf.edex.decodertools.core.IDecoderConstants;
+import com.raytheon.uf.edex.pointdata.spatial.ObStationDao;
/**
* Decode CMAN synoptic observations. The class decodes section 0 for time and
@@ -45,6 +45,7 @@ import com.raytheon.uf.edex.decodertools.core.IDecoderConstants;
* 20070928 391 jkorman Initial Coding.
* Dec 17, 2007 600 bphillip Added dao pool usage
* 20080116 798 jkorman Changed logging levels.
+ * Feb 27, 2013 1638 mschenke Moved ObStationDao to edex pointdata plugin
*
*
* @author jkorman
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 b87fe58f87..ef52f2ef9e 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
@@ -25,7 +25,6 @@ import java.util.regex.Pattern;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import com.raytheon.edex.db.dao.spatial.ObStationDao;
import com.raytheon.edex.exception.DecoderException;
import com.raytheon.edex.plugin.sfcobs.decoder.synoptic.regional.Sec5Block72Decoder;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
@@ -34,6 +33,7 @@ import com.raytheon.uf.common.pointdata.spatial.ObStation;
import com.raytheon.uf.common.pointdata.spatial.SurfaceObsLocation;
import com.raytheon.uf.edex.database.DataAccessLayerException;
import com.raytheon.uf.edex.decodertools.core.IDecoderConstants;
+import com.raytheon.uf.edex.pointdata.spatial.ObStationDao;
/**
* Decode Land synoptic FM-12 observations. The class decodes section 0 for time
@@ -51,6 +51,7 @@ import com.raytheon.uf.edex.decodertools.core.IDecoderConstants;
* 20070928 391 jkorman Initial Coding.
* Dec 17, 2007 600 bphillip Added dao pool usage
* 20080116 798 jkorman Changed logging levels.
+ * Feb 27, 2013 1638 mschenke Moved ObStationDao to edex pointdata plugin
*
*
* @author jkorman
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 9c57b3c8a6..7999f947ae 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
@@ -22,7 +22,6 @@ package com.raytheon.edex.plugin.sfcobs.decoder.synoptic;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import com.raytheon.edex.db.dao.spatial.ObStationDao;
import com.raytheon.edex.exception.DecoderException;
import com.raytheon.edex.plugin.sfcobs.decoder.synoptic.regional.Sec5MaritimeDecoder;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
@@ -32,6 +31,7 @@ import com.raytheon.uf.common.pointdata.spatial.SurfaceObsLocation;
import com.raytheon.uf.edex.database.DataAccessLayerException;
import com.raytheon.uf.edex.decodertools.core.DecoderTools;
import com.raytheon.uf.edex.decodertools.core.IDecoderConstants;
+import com.raytheon.uf.edex.pointdata.spatial.ObStationDao;
/**
* Decode SHIP synoptic FM-13 observations. The class decodes section 0 for time
@@ -48,6 +48,7 @@ import com.raytheon.uf.edex.decodertools.core.IDecoderConstants;
* 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
*
*
* @author jkorman
diff --git a/edexOsgi/com.raytheon.edex.plugin.taf/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.taf/META-INF/MANIFEST.MF
index 0cef1ea2f9..89b83b9071 100644
--- a/edexOsgi/com.raytheon.edex.plugin.taf/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.edex.plugin.taf/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Export-Package: com.raytheon.edex.plugin.taf,
com.raytheon.edex.plugin.taf.common,
com.raytheon.edex.plugin.taf.decoder
Require-Bundle: com.raytheon.edex.common,
- com.raytheon.uf.common.pointdata,
+ com.raytheon.uf.edex.pointdata,
com.raytheon.uf.edex.decodertools;bundle-version="1.0.0",
org.apache.commons.logging,
org.apache.commons.lang,
diff --git a/edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/decoder/TAFParser.java b/edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/decoder/TAFParser.java
index f536f1f304..f2e1959e7c 100644
--- a/edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/decoder/TAFParser.java
+++ b/edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/decoder/TAFParser.java
@@ -44,7 +44,6 @@ import java.util.regex.Pattern;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import com.raytheon.edex.db.dao.spatial.ObStationDao;
import com.raytheon.edex.exception.DecoderException;
import com.raytheon.edex.plugin.taf.common.ChangeGroup;
import com.raytheon.edex.plugin.taf.common.TafPeriod;
@@ -54,6 +53,7 @@ import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.common.time.TimeRange;
import com.raytheon.uf.edex.database.DataAccessLayerException;
import com.raytheon.uf.edex.decodertools.time.TimeTools;
+import com.raytheon.uf.edex.pointdata.spatial.ObStationDao;
import com.raytheon.uf.edex.wmo.message.WMOHeader;
/**
@@ -68,6 +68,7 @@ import com.raytheon.uf.edex.wmo.message.WMOHeader;
* 20080424 1001 jkorman Initial implementation.
* 9/4/2008 1444 grichard Import constants from TafConstants class.
* Oct 21, 2008 1515 jkorman Added 30 Hour capability changes.
+ * Feb 27, 2013 1638 mschenke Moved ObStationDao to edex pointdata plugin
*
*
* @author jkorman
diff --git a/edexOsgi/com.raytheon.edex.productsrv/res/spring/uengine-request.xml b/edexOsgi/com.raytheon.edex.productsrv/res/spring/uengine-request.xml
index b94836deef..68cfa5a502 100644
--- a/edexOsgi/com.raytheon.edex.productsrv/res/spring/uengine-request.xml
+++ b/edexOsgi/com.raytheon.edex.productsrv/res/spring/uengine-request.xml
@@ -3,6 +3,11 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
+
+
+
+
@@ -78,4 +83,5 @@
+
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.ldadmesonet/src/com/raytheon/uf/common/dataplugin/ldadmesonet/dao/LdadMesonetDao.java b/edexOsgi/com.raytheon.uf.common.dataplugin.ldadmesonet/src/com/raytheon/uf/common/dataplugin/ldadmesonet/dao/LdadMesonetDao.java
index 869b25a1b4..dffbe3aac7 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.ldadmesonet/src/com/raytheon/uf/common/dataplugin/ldadmesonet/dao/LdadMesonetDao.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.ldadmesonet/src/com/raytheon/uf/common/dataplugin/ldadmesonet/dao/LdadMesonetDao.java
@@ -23,7 +23,6 @@ import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
-import com.raytheon.edex.db.dao.spatial.ObStationDao;
import com.raytheon.uf.common.dataplugin.PluginException;
import com.raytheon.uf.common.dataplugin.ldadmesonet.MesonetLdadRecord;
import com.raytheon.uf.common.dataplugin.persist.IPersistable;
@@ -33,6 +32,7 @@ import com.raytheon.uf.common.pointdata.spatial.ObStation;
import com.raytheon.uf.edex.database.DataAccessLayerException;
import com.raytheon.uf.edex.database.query.DatabaseQuery;
import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
+import com.raytheon.uf.edex.pointdata.spatial.ObStationDao;
/**
* Data access object for accessing LDAD MESONET records in the database.
@@ -45,6 +45,7 @@ import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
* ------------ ---------- ----------- --------------------------
* 9/04/09 vkorolev Initial creation
* 10/09/09 DR2814 vkorolev Refactor to Point Data Model
+ * Feb 27, 2013 1638 mschenke Moved ObStationDao to edex pointdata plugin
*
*
*
diff --git a/edexOsgi/com.raytheon.uf.edex.alertviz/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.alertviz/META-INF/MANIFEST.MF
index 0f8a1274cf..cd9276e0d7 100644
--- a/edexOsgi/com.raytheon.uf.edex.alertviz/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.alertviz/META-INF/MANIFEST.MF
@@ -7,8 +7,7 @@ Bundle-Vendor: RAYTHEON
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",
- com.raytheon.uf.common.alertviz;bundle-version="1.0.0",
- com.raytheon.edex.uengine;bundle-version="1.12.1174"
+ com.raytheon.uf.common.alertviz;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization
Export-Package: com.raytheon.uf.edex.alertviz.handler
diff --git a/edexOsgi/com.raytheon.uf.edex.alertviz/src/com/raytheon/uf/edex/alertviz/handler/AlertVizRequestHandler.java b/edexOsgi/com.raytheon.uf.edex.alertviz/src/com/raytheon/uf/edex/alertviz/handler/AlertVizRequestHandler.java
index d9f213bb19..2f31abedbb 100644
--- a/edexOsgi/com.raytheon.uf.edex.alertviz/src/com/raytheon/uf/edex/alertviz/handler/AlertVizRequestHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.alertviz/src/com/raytheon/uf/edex/alertviz/handler/AlertVizRequestHandler.java
@@ -20,7 +20,6 @@
package com.raytheon.uf.edex.alertviz.handler;
-import com.raytheon.edex.uengine.Activator;
import com.raytheon.uf.common.alertviz.AlertVizRequest;
import com.raytheon.uf.common.serialization.comm.IRequestHandler;
import com.raytheon.uf.common.status.UFStatus.Priority;
@@ -38,6 +37,7 @@ import com.raytheon.uf.edex.core.EDEXUtil;
* 11/22/2010 2235 cjeanbap Pass audioFile value to EDEXUtility.
* 02/02/2011 6500 cjeanbap Pass source value to EDEXUtility.
* 03/14/2011 5149 cjeanbap Removed debug log statements.
+ * Feb 27, 2013 1638 mschenke Removed dependency on uengine project
*
*
*
@@ -47,6 +47,8 @@ import com.raytheon.uf.edex.core.EDEXUtil;
public class AlertVizRequestHandler implements IRequestHandler {
+ private static final String PLUGIN_ID = "com.raytheon.uf.edex.alertviz";
+
private static final String RESULT = "None";
/**
@@ -61,13 +63,12 @@ public class AlertVizRequestHandler implements IRequestHandler
String sourceKey = request.getSourceKey();
Priority priority = findPriority(request);
- String pluginName = Activator.PLUGIN_ID;
String category = request.getCategory();
String message = request.getMessage();
String details = request.toString();
String audioFile = request.getAudioFile();
- EDEXUtil.sendMessageAlertViz(priority, pluginName, sourceKey, category,
+ EDEXUtil.sendMessageAlertViz(priority, PLUGIN_ID, sourceKey, category,
message, details, audioFile);
return RESULT;
diff --git a/edexOsgi/com.raytheon.uf.edex.core/res/spring/edex-request.xml b/edexOsgi/com.raytheon.uf.edex.core/res/spring/edex-request.xml
index eacbba35b8..b8a93eb14d 100644
--- a/edexOsgi/com.raytheon.uf.edex.core/res/spring/edex-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.core/res/spring/edex-request.xml
@@ -12,10 +12,5 @@
value="com.raytheon.uf.common.dataplugin.request.GetPluginRecordMapRequest" />
-
-
-
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.database/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.database/META-INF/MANIFEST.MF
index f53a7737cb..4be6a14922 100644
--- a/edexOsgi/com.raytheon.uf.edex.database/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.database/META-INF/MANIFEST.MF
@@ -20,7 +20,6 @@ Require-Bundle: com.raytheon.uf.common.dataquery;bundle-version="1.0.0",
com.raytheon.uf.common.geospatial;bundle-version="1.12.1174",
org.geotools;bundle-version="2.6.4",
com.raytheon.uf.common.localization;bundle-version="1.12.1174",
- com.raytheon.uf.common.spatial,
com.raytheon.uf.common.util
Export-Package: com.raytheon.uf.edex.database,
com.raytheon.uf.edex.database.cluster,
diff --git a/edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java b/edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
index 5adcd67976..a29dfa93c2 100644
--- a/edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
@@ -35,10 +35,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.geotools.coverage.grid.GridCoverage2D;
-import org.geotools.geometry.jts.ReferencedEnvelope;
-import org.opengis.referencing.FactoryException;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionCallbackWithoutResult;
@@ -55,13 +51,9 @@ import com.raytheon.uf.common.datastorage.IDataStore.StoreOp;
import com.raytheon.uf.common.datastorage.Request;
import com.raytheon.uf.common.datastorage.StorageException;
import com.raytheon.uf.common.datastorage.StorageStatus;
-import com.raytheon.uf.common.datastorage.records.ByteDataRecord;
-import com.raytheon.uf.common.datastorage.records.FloatDataRecord;
import com.raytheon.uf.common.datastorage.records.IDataRecord;
-import com.raytheon.uf.common.datastorage.records.IntegerDataRecord;
import com.raytheon.uf.common.geospatial.ISpatialEnabled;
import com.raytheon.uf.common.geospatial.ISpatialObject;
-import com.raytheon.uf.common.geospatial.MapUtil;
import com.raytheon.uf.common.localization.IPathManager;
import com.raytheon.uf.common.localization.LocalizationContext;
import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
@@ -70,8 +62,6 @@ 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.SerializationUtil;
-import com.raytheon.uf.common.spatial.reprojection.DataReprojector;
-import com.raytheon.uf.common.spatial.reprojection.ReferencedDataRecord;
import com.raytheon.uf.common.time.util.TimeUtil;
import com.raytheon.uf.common.util.FileUtil;
import com.raytheon.uf.edex.core.EdexException;
@@ -82,10 +72,6 @@ import com.raytheon.uf.edex.database.purge.PurgeLogger;
import com.raytheon.uf.edex.database.purge.PurgeRule;
import com.raytheon.uf.edex.database.purge.PurgeRuleSet;
import com.raytheon.uf.edex.database.query.DatabaseQuery;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Envelope;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.Polygon;
/**
* Abstract implementation of a Plugin data access object
@@ -105,6 +91,7 @@ import com.vividsolutions.jts.geom.Polygon;
* Jan 14, 2013 1469 bkowal No longer retrieves the hdf5 data directory
* from the environment.
* Feb 12, 2013 #1608 randerso Changed to call deleteDatasets
+ * Feb 26, 2013 1638 mschenke Moved OGC specific functions to OGC project
*
*
*
@@ -1591,129 +1578,4 @@ public abstract class PluginDao extends CoreDao {
return (List) this.queryByCriteria(dbQuery);
}
- public double getHDF5Value(PluginDataObject pdo,
- CoordinateReferenceSystem crs, Coordinate coord,
- double defaultReturn) throws Exception {
- IDataStore store = getDataStore((IPersistable) pdo);
- // TODO a cache would probably be good here
- double rval = defaultReturn;
- if (pdo instanceof ISpatialEnabled) {
- ISpatialObject spat = getSpatialObject(pdo);
- DataReprojector reprojector = getDataReprojector(store);
- ReferencedEnvelope nativeEnv = getNativeEnvelope(spat);
- IDataRecord data = reprojector.getProjectedPoints(pdo.getDataURI(),
- spat, nativeEnv, crs, new Coordinate[] { coord });
- Double res = extractSingle(data);
- if (res != null) {
- rval = res;
- }
- }
- return rval;
- }
-
- /**
- * @param record
- * @param crs
- * target crs for projected data
- * @param envelope
- * bounding box in target crs
- * @return null if envelope is disjoint with data bounds
- * @throws Exception
- */
- public ReferencedDataRecord getProjected(PluginDataObject record,
- CoordinateReferenceSystem crs, Envelope envelope) throws Exception {
- ReferencedEnvelope targetEnv = new ReferencedEnvelope(
- envelope.getMinX(), envelope.getMaxX(), envelope.getMinY(),
- envelope.getMaxY(), crs);
- return getProjected(record, targetEnv);
- }
-
- /**
- * @param record
- * @param crs
- * target crs for projected data
- * @param envelope
- * bounding box in target crs
- * @return null if envelope is disjoint with data bounds
- * @throws Exception
- */
- public GridCoverage2D getProjectedCoverage(PluginDataObject record,
- CoordinateReferenceSystem crs, Envelope envelope) throws Exception {
- ReferencedEnvelope targetEnv = new ReferencedEnvelope(
- envelope.getMinX(), envelope.getMaxX(), envelope.getMinY(),
- envelope.getMaxY(), crs);
- return getProjectedCoverage(record, targetEnv);
- }
-
- /**
- * @param record
- * @param targetEnvelope
- * bounding box in target crs
- * @return null if envelope is disjoint with data bounds
- * @throws Exception
- */
- public ReferencedDataRecord getProjected(PluginDataObject record,
- ReferencedEnvelope targetEnvelope) throws Exception {
- ISpatialObject spatial = getSpatialObject(record);
- IDataStore store = getDataStore((IPersistable) record);
- DataReprojector reprojector = getDataReprojector(store);
- ReferencedEnvelope nativeEnvelope = getNativeEnvelope(spatial);
- return reprojector.getReprojected(record.getDataURI(), spatial,
- nativeEnvelope, targetEnvelope);
- }
-
- /**
- * @param record
- * @param targetEnvelope
- * bounding box in target crs
- * @return null if envelope is disjoint with data bounds
- * @throws Exception
- */
- public GridCoverage2D getProjectedCoverage(PluginDataObject record,
- ReferencedEnvelope envelope) throws Exception {
- ISpatialObject spatial = getSpatialObject(record);
- IDataStore store = getDataStore((IPersistable) record);
- DataReprojector reprojector = getDataReprojector(store);
- ReferencedEnvelope nativeEnvelope = getNativeEnvelope(spatial);
- return reprojector.getReprojectedCoverage(record.getDataURI(), spatial,
- nativeEnvelope, envelope);
- }
-
- protected ISpatialObject getSpatialObject(PluginDataObject record)
- throws Exception {
- if (record instanceof ISpatialEnabled) {
- return ((ISpatialEnabled) record).getSpatialObject();
- } else {
- throw new Exception(record.getClass() + " is not spatially enabled");
- }
- }
-
- protected DataReprojector getDataReprojector(IDataStore dataStore) {
- return new DataReprojector(dataStore);
- }
-
- protected ReferencedEnvelope getNativeEnvelope(ISpatialObject spatial)
- throws FactoryException {
- CoordinateReferenceSystem crs = spatial.getCrs();
- Geometry geom = spatial.getGeometry();
- return MapUtil.getBoundingEnvelope(crs, (Polygon) geom);
- }
-
- public Double extractSingle(IDataRecord record) {
- Double rval = null;
- if (record == null) {
- return rval;
- }
- if (record instanceof ByteDataRecord) {
- byte[] data = ((ByteDataRecord) record).getByteData();
- rval = (double) data[0];
- } else if (record instanceof FloatDataRecord) {
- float[] data = ((FloatDataRecord) record).getFloatData();
- rval = (double) data[0];
- } else if (record instanceof IntegerDataRecord) {
- int[] data = ((IntegerDataRecord) record).getIntData();
- rval = (double) data[0];
- }
- return rval;
- }
}
diff --git a/edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java b/edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java
index f663d8bbe6..8854f77e41 100644
--- a/edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java
+++ b/edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java
@@ -23,7 +23,9 @@ import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -35,6 +37,8 @@ import org.apache.commons.logging.LogFactory;
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.SerializationUtil;
import com.raytheon.uf.common.status.IUFStatusHandler;
@@ -55,6 +59,8 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
* Oct 16, 2009 brockwoo Initial creation
* 6/8/2010 4647 bphillip Added automatic pattern refreshing
* 09/01/2010 4293 cjeanbap Logging of unknown Weather Products.
+ * Feb 27, 2013 1638 mschenke Cleaned up localization code to fix null pointer
+ * when no distribution files present
*
*
*
@@ -263,43 +269,18 @@ public class DistributionSrv {
* @return An array of the files in the distribution directory
*/
private File[] getDistributionFiles() {
- List fileList = new ArrayList();
IPathManager pathMgr = PathManagerFactory.getPathManager();
- LocalizationContext commonStaticBase = pathMgr.getContext(
- LocalizationContext.LocalizationType.EDEX_STATIC,
- LocalizationContext.LocalizationLevel.BASE);
- LocalizationContext siteStaticBase = pathMgr.getContext(
- LocalizationContext.LocalizationType.EDEX_STATIC,
- LocalizationContext.LocalizationLevel.SITE);
-
- File[] distributionFiles = pathMgr.getFile(commonStaticBase,
- "distribution").listFiles();
-
- File[] siteDistributionFiles = pathMgr.getFile(siteStaticBase,
- "distribution").listFiles();
-
- if (siteDistributionFiles == null) {
- return distributionFiles;
- } else if (siteDistributionFiles.length == 0) {
- return distributionFiles;
- }
- fileList.addAll(Arrays.asList(siteDistributionFiles));
- boolean siteOverride = false;
- for (File baseFile : distributionFiles) {
- siteOverride = false;
- for (File siteFile : fileList) {
- if (siteFile.exists()
- && siteFile.getName().equals(baseFile.getName())) {
- siteOverride = true;
- break;
- }
- }
- if (!siteOverride) {
- fileList.add(baseFile);
+ LocalizationFile[] files = pathMgr.listFiles(
+ pathMgr.getLocalSearchHierarchy(LocalizationType.EDEX_STATIC),
+ "distribution", null, true, true);
+ Map distFiles = new HashMap();
+ for (LocalizationFile file : files) {
+ if (distFiles.containsKey(file.getName()) == false) {
+ distFiles.put(file.getName(), file.getFile());
}
}
- return fileList.toArray(new File[] {});
+ return distFiles.values().toArray(new File[0]);
}
}
diff --git a/edexOsgi/com.raytheon.uf.edex.esb.camel/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.esb.camel/META-INF/MANIFEST.MF
index 11f8d9917b..0b39eb70af 100644
--- a/edexOsgi/com.raytheon.uf.edex.esb.camel/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.esb.camel/META-INF/MANIFEST.MF
@@ -14,7 +14,6 @@ Require-Bundle: org.apache.camel;bundle-version="1.0.0",
com.raytheon.uf.common.util,
com.raytheon.uf.edex.core,
org.apache.commons.logging,
- javax.servlet,
com.raytheon.uf.common.stats;bundle-version="1.0.0"
Export-Package: com.raytheon.uf.edex.esb.camel,
com.raytheon.uf.edex.esb.camel.directvm
@@ -22,4 +21,6 @@ Import-Package: com.raytheon.uf.common.event,
com.raytheon.uf.common.message,
com.raytheon.uf.edex.database.cluster,
com.raytheon.uf.edex.event,
- javax.persistence
+ javax.persistence,
+ javax.servlet,
+ javax.servlet.http
diff --git a/edexOsgi/com.raytheon.uf.edex.ogc.common/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.ogc.common/META-INF/MANIFEST.MF
index 70980d9f88..50bd17dd48 100644
--- a/edexOsgi/com.raytheon.uf.edex.ogc.common/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.ogc.common/META-INF/MANIFEST.MF
@@ -18,7 +18,8 @@ Require-Bundle: net.opengis;bundle-version="1.0.2",
org.apache.commons.collections;bundle-version="3.2.0",
com.raytheon.uf.common.json;bundle-version="1.0.0",
com.sun.xml.bind;bundle-version="1.0.0",
- com.raytheon.uf.common.status;bundle-version="1.12.1174"
+ com.raytheon.uf.common.status;bundle-version="1.12.1174",
+ com.raytheon.uf.common.spatial;bundle-version="1.0.0"
Export-Package: com.raytheon.uf.edex.ogc.common,
com.raytheon.uf.edex.ogc.common.colormap,
com.raytheon.uf.edex.ogc.common.db,
diff --git a/edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/spatial/RecordUtil.java b/edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/spatial/RecordUtil.java
new file mode 100644
index 0000000000..5bcfe79fa1
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/spatial/RecordUtil.java
@@ -0,0 +1,194 @@
+/**
+ * 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.ogc.common.spatial;
+
+import org.geotools.coverage.grid.GridCoverage2D;
+import org.geotools.geometry.jts.ReferencedEnvelope;
+import org.opengis.referencing.FactoryException;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
+import com.raytheon.uf.common.dataplugin.PluginDataObject;
+import com.raytheon.uf.common.dataplugin.persist.IPersistable;
+import com.raytheon.uf.common.datastorage.IDataStore;
+import com.raytheon.uf.common.datastorage.records.ByteDataRecord;
+import com.raytheon.uf.common.datastorage.records.FloatDataRecord;
+import com.raytheon.uf.common.datastorage.records.IDataRecord;
+import com.raytheon.uf.common.datastorage.records.IntegerDataRecord;
+import com.raytheon.uf.common.geospatial.ISpatialEnabled;
+import com.raytheon.uf.common.geospatial.ISpatialObject;
+import com.raytheon.uf.common.geospatial.MapUtil;
+import com.raytheon.uf.common.spatial.reprojection.DataReprojector;
+import com.raytheon.uf.common.spatial.reprojection.ReferencedDataRecord;
+import com.raytheon.uf.edex.database.plugin.PluginDao;
+import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.Envelope;
+import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.geom.Polygon;
+
+/**
+ * Removing code only used by ogc services from {@link PluginDao} to here
+ *
+ *
+ *
+ * SOFTWARE HISTORY
+ *
+ * Date Ticket# Engineer Description
+ * ------------ ---------- ----------- --------------------------
+ * Feb 26, 2013 1638 mschenke Code moved from PluginDao to clean up dependencies
+ *
+ *
+ *
+ * @author unknown
+ * @version 1.0
+ */
+
+public class RecordUtil {
+
+ /**
+ * @param record
+ * @param crs
+ * target crs for projected data
+ * @param envelope
+ * bounding box in target crs
+ * @return null if envelope is disjoint with data bounds
+ * @throws Exception
+ */
+ public static ReferencedDataRecord getProjected(PluginDao dao,
+ PluginDataObject record, CoordinateReferenceSystem crs,
+ Envelope envelope) throws Exception {
+ ReferencedEnvelope targetEnv = new ReferencedEnvelope(
+ envelope.getMinX(), envelope.getMaxX(), envelope.getMinY(),
+ envelope.getMaxY(), crs);
+ return getProjected(dao, record, targetEnv);
+ }
+
+ public static double getHDF5Value(PluginDao dao, PluginDataObject pdo,
+ CoordinateReferenceSystem crs, Coordinate coord,
+ double defaultReturn) throws Exception {
+ // TODO a cache would probably be good here
+ double rval = defaultReturn;
+ if (pdo instanceof ISpatialEnabled) {
+ IDataStore store = dao.getDataStore((IPersistable) pdo);
+ ISpatialObject spat = getSpatialObject(pdo);
+ DataReprojector reprojector = getDataReprojector(store);
+ ReferencedEnvelope nativeEnv = getNativeEnvelope(spat);
+ IDataRecord data = reprojector.getProjectedPoints(pdo.getDataURI(),
+ spat, nativeEnv, crs, new Coordinate[] { coord });
+ Double res = extractSingle(data);
+ if (res != null) {
+ rval = res;
+ }
+ }
+ return rval;
+ }
+
+ /**
+ * @param record
+ * @param crs
+ * target crs for projected data
+ * @param envelope
+ * bounding box in target crs
+ * @return null if envelope is disjoint with data bounds
+ * @throws Exception
+ */
+ public static GridCoverage2D getProjectedCoverage(PluginDao dao,
+ PluginDataObject record, CoordinateReferenceSystem crs,
+ Envelope envelope) throws Exception {
+ ReferencedEnvelope targetEnv = new ReferencedEnvelope(
+ envelope.getMinX(), envelope.getMaxX(), envelope.getMinY(),
+ envelope.getMaxY(), crs);
+ return getProjectedCoverage(dao, record, targetEnv);
+ }
+
+ /**
+ * @param record
+ * @param targetEnvelope
+ * bounding box in target crs
+ * @return null if envelope is disjoint with data bounds
+ * @throws Exception
+ */
+ public static ReferencedDataRecord getProjected(PluginDao dao,
+ PluginDataObject record, ReferencedEnvelope targetEnvelope)
+ throws Exception {
+ IDataStore store = dao.getDataStore((IPersistable) record);
+ ISpatialObject spatial = getSpatialObject(record);
+ DataReprojector reprojector = getDataReprojector(store);
+ ReferencedEnvelope nativeEnvelope = getNativeEnvelope(spatial);
+ return reprojector.getReprojected(record.getDataURI(), spatial,
+ nativeEnvelope, targetEnvelope);
+ }
+
+ /**
+ * @param record
+ * @param targetEnvelope
+ * bounding box in target crs
+ * @return null if envelope is disjoint with data bounds
+ * @throws Exception
+ */
+ public static GridCoverage2D getProjectedCoverage(PluginDao dao,
+ PluginDataObject record, ReferencedEnvelope envelope)
+ throws Exception {
+ IDataStore store = dao.getDataStore((IPersistable) record);
+ ISpatialObject spatial = getSpatialObject(record);
+ DataReprojector reprojector = getDataReprojector(store);
+ ReferencedEnvelope nativeEnvelope = getNativeEnvelope(spatial);
+ return reprojector.getReprojectedCoverage(record.getDataURI(), spatial,
+ nativeEnvelope, envelope);
+ }
+
+ protected static DataReprojector getDataReprojector(IDataStore dataStore) {
+ return new DataReprojector(dataStore);
+ }
+
+ protected static ReferencedEnvelope getNativeEnvelope(ISpatialObject spatial)
+ throws FactoryException {
+ CoordinateReferenceSystem crs = spatial.getCrs();
+ Geometry geom = spatial.getGeometry();
+ return MapUtil.getBoundingEnvelope(crs, (Polygon) geom);
+ }
+
+ public static Double extractSingle(IDataRecord record) {
+ Double rval = null;
+ if (record == null) {
+ return rval;
+ }
+ if (record instanceof ByteDataRecord) {
+ byte[] data = ((ByteDataRecord) record).getByteData();
+ rval = (double) data[0];
+ } else if (record instanceof FloatDataRecord) {
+ float[] data = ((FloatDataRecord) record).getFloatData();
+ rval = (double) data[0];
+ } else if (record instanceof IntegerDataRecord) {
+ int[] data = ((IntegerDataRecord) record).getIntData();
+ rval = (double) data[0];
+ }
+ return rval;
+ }
+
+ public static ISpatialObject getSpatialObject(PluginDataObject record)
+ throws Exception {
+ if (record instanceof ISpatialEnabled) {
+ return ((ISpatialEnabled) record).getSpatialObject();
+ } else {
+ throw new Exception(record.getClass() + " is not spatially enabled");
+ }
+ }
+
+}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.loctables/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.loctables/META-INF/MANIFEST.MF
index d74da4915a..a1d6b71b9d 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.loctables/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.loctables/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serializ
Bundle-Vendor: RAYTHEON
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: com.raytheon.edex.common,
- com.raytheon.uf.common.pointdata,
+ com.raytheon.uf.edex.pointdata,
com.raytheon.uf.common.localization,
javax.measure,
org.geotools,
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.loctables/src/com/raytheon/uf/edex/plugin/loctables/util/store/ObStationStoreStrategy.java b/edexOsgi/com.raytheon.uf.edex.plugin.loctables/src/com/raytheon/uf/edex/plugin/loctables/util/store/ObStationStoreStrategy.java
index 88e26a9f6f..95d9c72e40 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.loctables/src/com/raytheon/uf/edex/plugin/loctables/util/store/ObStationStoreStrategy.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.loctables/src/com/raytheon/uf/edex/plugin/loctables/util/store/ObStationStoreStrategy.java
@@ -24,9 +24,8 @@ import java.io.IOException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import com.raytheon.edex.db.dao.spatial.ObStationDao;
import com.raytheon.uf.common.pointdata.spatial.ObStation;
-import com.raytheon.uf.edex.plugin.loctables.util.TableHandler;
+import com.raytheon.uf.edex.pointdata.spatial.ObStationDao;
/**
* TODO Add Description
@@ -38,6 +37,7 @@ import com.raytheon.uf.edex.plugin.loctables.util.TableHandler;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Apr 16, 2010 jkorman Initial creation
+ * Feb 27, 2013 1638 mschenke Moved ObStationDao to edex pointdata plugin
*
*
*
diff --git a/edexOsgi/com.raytheon.uf.edex.pointdata/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.pointdata/META-INF/MANIFEST.MF
index c301a3864f..1b35e4795b 100644
--- a/edexOsgi/com.raytheon.uf.edex.pointdata/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.pointdata/META-INF/MANIFEST.MF
@@ -6,37 +6,18 @@ Bundle-Version: 1.12.1174.qualifier
Bundle-Vendor: RAYTHEON
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
-Import-Package: com.raytheon.edex.db.dao,
- com.raytheon.edex.exception,
- com.raytheon.edex.plugin,
- com.raytheon.edex.uengine.tasks.query,
- com.raytheon.uf.common.comm,
- com.raytheon.uf.common.dataplugin,
- com.raytheon.uf.common.dataplugin.level,
- com.raytheon.uf.common.dataplugin.persist,
- com.raytheon.uf.common.dataquery.db,
- com.raytheon.uf.common.dataquery.requests,
- com.raytheon.uf.common.datastorage,
- com.raytheon.uf.common.datastorage.records,
- com.raytheon.uf.common.derivparam.tree,
- com.raytheon.uf.common.localization,
- com.raytheon.uf.common.message.response,
- com.raytheon.uf.common.pointdata,
- com.raytheon.uf.common.pointdata.accumulate,
- com.raytheon.uf.common.pointdata.requests,
- com.raytheon.uf.common.serialization,
- com.raytheon.uf.common.serialization.comm,
- com.raytheon.uf.common.status,
- com.raytheon.uf.common.time,
- com.raytheon.uf.common.util,
- com.raytheon.uf.common.util.registry,
- com.raytheon.uf.edex.core,
- com.raytheon.uf.edex.core.dataplugin,
- javax.measure.converter,
- javax.measure.unit,
- org.apache.commons.logging,
- org.hibernate
-Require-Bundle: org.springframework;bundle-version="2.5.6",
- net.sf.cglib;bundle-version="2.1.3",
- com.raytheon.uf.edex.database
-Export-Package: com.raytheon.uf.edex.pointdata
+Require-Bundle: com.raytheon.uf.common.pointdata;bundle-version="1.12.1174";visibility:=reexport,
+ 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.status;bundle-version="1.12.1174",
+ com.raytheon.uf.common.localization;bundle-version="1.12.1174",
+ com.raytheon.uf.common.comm;bundle-version="1.12.1174",
+ com.raytheon.uf.common.message;bundle-version="1.12.1174",
+ com.raytheon.uf.common.derivparam;bundle-version="1.12.1174",
+ com.raytheon.uf.common.dataplugin.level;bundle-version="1.12.1174",
+ com.raytheon.edex.common;bundle-version="1.12.1174",
+ com.raytheon.edex.uengine;bundle-version="1.12.1174",
+ org.geotools;bundle-version="2.6.4",
+ javax.measure;bundle-version="1.0.0"
+Export-Package: com.raytheon.uf.edex.pointdata,
+ com.raytheon.uf.edex.pointdata.spatial
diff --git a/edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java b/edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java
index 97cbf327f2..4680e8a31f 100644
--- a/edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java
@@ -79,6 +79,7 @@ import com.raytheon.uf.edex.database.plugin.PluginDao;
* ------------ ---------- ----------- --------------------------
* Apr 13, 2009 chammack Initial creation
* Jan 14, 2013 1469 bkowal Removed the hdf5 data directory.
+ * Feb 27, 2013 1638 mschenke Switched logger to use statusHandler
*
*
*
@@ -472,7 +473,7 @@ public abstract class PointDataPluginDao extends
dbDataDescription = PointDataDbDescription
.fromStream(stream);
} catch (JAXBException e) {
- logger.error("Unable to load " + pluginName
+ statusHandler.error("Unable to load " + pluginName
+ " Point Data Database Description", e);
}
}
@@ -487,7 +488,7 @@ public abstract class PointDataPluginDao extends
.getClass().getResourceAsStream(
"/res/pointdata/" + pluginName + ".xml"));
} catch (JAXBException e) {
- logger.error("Unable to load " + pluginName
+ statusHandler.error("Unable to load " + pluginName
+ " Point Data Description", e);
}
}
diff --git a/edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/db/dao/spatial/ObStationDao.java b/edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/spatial/ObStationDao.java
similarity index 97%
rename from edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/db/dao/spatial/ObStationDao.java
rename to edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/spatial/ObStationDao.java
index 112634858f..e2ef632c54 100644
--- a/edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/db/dao/spatial/ObStationDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/spatial/ObStationDao.java
@@ -18,7 +18,7 @@
* further licensing information.
**/
-package com.raytheon.edex.db.dao.spatial;
+package com.raytheon.uf.edex.pointdata.spatial;
import java.util.ArrayList;
import java.util.List;
@@ -45,6 +45,7 @@ import com.vividsolutions.jts.geom.Coordinate;
* 7/24/07 353 bphillip Initial Check in
* 10/12/07 391 jkorman Modified queryByIcao and queryByWmoIndex
* to guard for an empty list.
+ * Feb 27, 2013 1638 mschenke Moved ObStationDao to edex pointdata plugin
*
*
* @author bphillip
@@ -199,7 +200,7 @@ public class ObStationDao extends CoreDao {
return (List)executeCriteriaQuery(stationEq);
} else {
- logger.warn("Cannot execute spatial query with less than 3 points");
+ statusHandler.warn("Cannot execute spatial query with less than 3 points");
return new ArrayList();
}
diff --git a/edexOsgi/com.raytheon.uf.edex.wcs/src/com/raytheon/uf/edex/wcs/reg/DefaultWcsSource.java b/edexOsgi/com.raytheon.uf.edex.wcs/src/com/raytheon/uf/edex/wcs/reg/DefaultWcsSource.java
index eab325136e..28b61e746f 100644
--- a/edexOsgi/com.raytheon.uf.edex.wcs/src/com/raytheon/uf/edex/wcs/reg/DefaultWcsSource.java
+++ b/edexOsgi/com.raytheon.uf.edex.wcs/src/com/raytheon/uf/edex/wcs/reg/DefaultWcsSource.java
@@ -63,13 +63,14 @@ import com.raytheon.uf.common.datastorage.records.IntegerDataRecord;
import com.raytheon.uf.common.datastorage.records.LongDataRecord;
import com.raytheon.uf.common.datastorage.records.ShortDataRecord;
import com.raytheon.uf.common.datastorage.records.StringDataRecord;
+import com.raytheon.uf.common.spatial.reprojection.ReferencedDataRecord;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.edex.database.DataAccessLayerException;
import com.raytheon.uf.edex.database.plugin.PluginDao;
import com.raytheon.uf.edex.database.plugin.PluginFactory;
import com.raytheon.uf.edex.ogc.common.db.LayerTransformer;
import com.raytheon.uf.edex.ogc.common.db.SimpleLayer;
-import com.raytheon.uf.common.spatial.reprojection.ReferencedDataRecord;
+import com.raytheon.uf.edex.ogc.common.spatial.RecordUtil;
import com.raytheon.uf.edex.wcs.WcsException;
import com.raytheon.uf.edex.wcs.WcsException.Code;
import com.vividsolutions.jts.geom.Envelope;
@@ -218,9 +219,9 @@ public abstract class DefaultWcsSource implements WcsSource {
protected ReferencedDataRecord getDataRecord(PluginDataObject record,
CoordinateReferenceSystem crs, Envelope bbox) throws WcsException {
try {
- // get the projected slice from the DAO
- ReferencedDataRecord projectedRecord = getDao().getProjected(
- record, crs, bbox);
+ // get the projected slice from the DAO
+ ReferencedDataRecord projectedRecord = RecordUtil.getProjected(
+ getDao(), record, crs, bbox);
ReferencedDataRecord rval;
if (projectedRecord != null) {
diff --git a/edexOsgi/com.raytheon.uf.edex.wms/src/com/raytheon/uf/edex/wms/reg/DefaultWmsSource.java b/edexOsgi/com.raytheon.uf.edex.wms/src/com/raytheon/uf/edex/wms/reg/DefaultWmsSource.java
index 1bb43f8a94..dc1b21a8fd 100644
--- a/edexOsgi/com.raytheon.uf.edex.wms/src/com/raytheon/uf/edex/wms/reg/DefaultWmsSource.java
+++ b/edexOsgi/com.raytheon.uf.edex.wms/src/com/raytheon/uf/edex/wms/reg/DefaultWmsSource.java
@@ -48,12 +48,14 @@ import org.opengis.referencing.crs.CoordinateReferenceSystem;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.dataplugin.PluginProperties;
+import com.raytheon.uf.common.dataplugin.persist.IPersistable;
+import com.raytheon.uf.common.spatial.reprojection.ReferencedDataRecord;
import com.raytheon.uf.edex.database.plugin.PluginDao;
import com.raytheon.uf.edex.ogc.common.OgcNamespace;
import com.raytheon.uf.edex.ogc.common.OgcStyle;
import com.raytheon.uf.edex.ogc.common.StyleLookup;
import com.raytheon.uf.edex.ogc.common.db.LayerTransformer;
-import com.raytheon.uf.common.spatial.reprojection.ReferencedDataRecord;
+import com.raytheon.uf.edex.ogc.common.spatial.RecordUtil;
import com.raytheon.uf.edex.wms.WmsException;
import com.raytheon.uf.edex.wms.WmsException.Code;
import com.raytheon.uf.edex.wms.styling.CoverageStyleProvider;
@@ -85,9 +87,9 @@ public abstract class DefaultWmsSource extends AbstractWmsSource implements
null);
double value;
try {
- PluginDao dao = getDao();
- value = dao.getHDF5Value(record, crs, c, 0);
- } catch (Exception e) {
+ PluginDao dao = getDao();
+ value = RecordUtil.getHDF5Value(dao, record, crs, c, 0);
+ } catch (Exception e) {
log.error("Problem retrieving feature data", e);
throw new WmsException(Code.InternalServerError);
}
@@ -183,8 +185,7 @@ public abstract class DefaultWmsSource extends AbstractWmsSource implements
public ReferencedDataRecord getDataRecord(PluginDataObject record,
ReferencedEnvelope envelope) throws WmsException {
try {
- PluginDao dao = getDao();
- return dao.getProjected(record, envelope);
+ return RecordUtil.getProjected(getDao(),record, envelope);
} catch (Exception e) {
log.error("Unable to get reprojected data for record: " + record, e);
throw new WmsException(Code.InternalServerError);
@@ -195,9 +196,8 @@ public abstract class DefaultWmsSource extends AbstractWmsSource implements
public GridCoverage2D getGridCoverage(PluginDataObject record,
ReferencedEnvelope envelope) throws WmsException {
try {
- PluginDao dao = getDao();
- return dao.getProjectedCoverage(record, envelope);
- } catch (Exception e) {
+ return RecordUtil.getProjectedCoverage(getDao(), record, envelope);
+ } catch (Exception e) {
log.error("Unable to get reprojected data for record: " + record, e);
throw new WmsException(Code.InternalServerError);
}
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncscd/src/gov/noaa/nws/ncep/common/dataplugin/ncscd/dao/NcScdDao.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncscd/src/gov/noaa/nws/ncep/common/dataplugin/ncscd/dao/NcScdDao.java
index 9ed9c0806a..faa0084486 100644
--- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncscd/src/gov/noaa/nws/ncep/common/dataplugin/ncscd/dao/NcScdDao.java
+++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncscd/src/gov/noaa/nws/ncep/common/dataplugin/ncscd/dao/NcScdDao.java
@@ -27,7 +27,6 @@ import java.util.Map;
import javax.xml.bind.JAXBException;
-import com.raytheon.edex.db.dao.spatial.ObStationDao;
import com.raytheon.uf.common.dataplugin.PluginException;
import com.raytheon.uf.common.dataplugin.persist.IPersistable;
import com.raytheon.uf.common.dataquery.db.QueryParam;
@@ -38,6 +37,7 @@ import com.raytheon.uf.edex.database.DataAccessLayerException;
import com.raytheon.uf.edex.database.query.DatabaseQuery;
import com.raytheon.uf.edex.pointdata.PointDataDbDescription;
import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
+import com.raytheon.uf.edex.pointdata.spatial.ObStationDao;
import gov.noaa.nws.ncep.common.dataplugin.ncscd.NcScdRecord;
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/META-INF/MANIFEST.MF
index 2a66e64cb8..14edf7e7d8 100644
--- a/ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/META-INF/MANIFEST.MF
+++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/META-INF/MANIFEST.MF
@@ -10,6 +10,7 @@ Require-Bundle: org.eclipse.ui,
com.raytheon.uf.common.status;bundle-version="1.12.1174",
net.sf.cglib;bundle-version="2.1.3",
com.raytheon.uf.edex.core;bundle-version="1.12.1174",
+ com.raytheon.uf.edex.pointdata,
javax.measure,
gov.noaa.nws.ncep.common;bundle-version="1.0.0",
com.raytheon.edex.common;bundle-version="1.12.1174",
@@ -20,8 +21,6 @@ Import-Package: com.raytheon.edex.db.dao,
com.raytheon.uf.common.dataplugin.persist,
com.raytheon.uf.common.datastorage,
com.raytheon.uf.common.geospatial,
- com.raytheon.uf.common.pointdata,
- com.raytheon.uf.common.pointdata.spatial,
com.raytheon.uf.common.serialization,
com.raytheon.uf.common.serialization.annotations,
com.raytheon.uf.common.time,
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/dao/NcTafDao.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/dao/NcTafDao.java
index b5ddcd2190..f953b9d000 100644
--- a/ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/dao/NcTafDao.java
+++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/dao/NcTafDao.java
@@ -12,7 +12,6 @@ import javax.xml.bind.JAXBException;
import gov.noaa.nws.ncep.common.dataplugin.nctaf.NcTafRecord;
-import com.raytheon.edex.db.dao.spatial.ObStationDao;
import com.raytheon.uf.common.dataplugin.PluginException;
import com.raytheon.uf.common.dataplugin.persist.IPersistable;
import com.raytheon.uf.common.dataquery.db.QueryParam;
@@ -21,6 +20,7 @@ import com.raytheon.uf.edex.database.DataAccessLayerException;
import com.raytheon.uf.edex.database.query.DatabaseQuery;
import com.raytheon.uf.edex.pointdata.PointDataDbDescription;
import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
+import com.raytheon.uf.edex.pointdata.spatial.ObStationDao;
import com.raytheon.uf.common.pointdata.PointDataDescription;
import com.raytheon.uf.common.pointdata.spatial.ObStation;
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/META-INF/MANIFEST.MF
index 36e1f44c2b..547b893265 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/META-INF/MANIFEST.MF
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serializ
Bundle-Vendor: NOAA/NWS/NCEP/NCO/SIB
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: com.raytheon.edex.common;bundle-version="1.12.1174",
- com.raytheon.uf.common.pointdata;bundle-version="1.12.1174",
+ com.raytheon.uf.edex.pointdata;bundle-version="1.12.1174",
com.raytheon.uf.edex.decodertools;bundle-version="1.12.1174",
org.apache.commons.logging;bundle-version="1.1.1",
org.geotools;bundle-version="2.6.4",
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/src/gov/noaa/nws/ncep/edex/plugin/ncpirep/decoder/NcPirepParser.java b/ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/src/gov/noaa/nws/ncep/edex/plugin/ncpirep/decoder/NcPirepParser.java
index ab649156d6..c07cb48b24 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/src/gov/noaa/nws/ncep/edex/plugin/ncpirep/decoder/NcPirepParser.java
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/src/gov/noaa/nws/ncep/edex/plugin/ncpirep/decoder/NcPirepParser.java
@@ -32,7 +32,6 @@ import org.apache.commons.logging.LogFactory;
import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN;
-import com.raytheon.edex.db.dao.spatial.ObStationDao;
import com.raytheon.uf.common.pointdata.spatial.ObStation;
import com.raytheon.uf.edex.database.DataAccessLayerException;
import com.raytheon.uf.edex.decodertools.aircraft.AircraftCloudLayer;
@@ -42,6 +41,7 @@ import com.raytheon.uf.edex.decodertools.aircraft.AircraftRemarks;
import com.raytheon.uf.edex.decodertools.core.BasePoint;
import com.raytheon.uf.edex.decodertools.core.LatLonPoint;
import com.raytheon.uf.edex.decodertools.time.TimeTools;
+import com.raytheon.uf.edex.pointdata.spatial.ObStationDao;
import com.vividsolutions.jts.geom.Geometry;
import com.vividsolutions.jts.geom.Point;
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncscd/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.ncscd/META-INF/MANIFEST.MF
index e1b1fef04c..024ef285e9 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncscd/META-INF/MANIFEST.MF
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncscd/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: com.raytheon.edex.common;bundle-version="1.10.13",
org.apache.log4j;bundle-version="1.0.0",
org.junit;bundle-version="1.0.0",
gov.noaa.nws.ncep.common.dataplugin.ncscd;bundle-version="1.0.0",
- com.raytheon.uf.common.pointdata;bundle-version="1.12.1174",
+ com.raytheon.uf.edex.pointdata;bundle-version="1.12.1174",
org.geotools
Export-Package: gov.noaa.nws.ncep.edex.plugin.ncscd.decoder,
gov.noaa.nws.ncep.edex.plugin.ncscd.util
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncscd/src/gov/noaa/nws/ncep/edex/plugin/ncscd/util/NcScdParser.java b/ncep/gov.noaa.nws.ncep.edex.plugin.ncscd/src/gov/noaa/nws/ncep/edex/plugin/ncscd/util/NcScdParser.java
index 470b12c676..5ce616a424 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncscd/src/gov/noaa/nws/ncep/edex/plugin/ncscd/util/NcScdParser.java
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncscd/src/gov/noaa/nws/ncep/edex/plugin/ncscd/util/NcScdParser.java
@@ -29,11 +29,11 @@ import java.util.Calendar;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import com.raytheon.edex.db.dao.spatial.ObStationDao;
import com.raytheon.uf.common.pointdata.spatial.ObStation;
import com.raytheon.uf.common.pointdata.spatial.SurfaceObsLocation;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.edex.decodertools.time.TimeTools;
+import com.raytheon.uf.edex.pointdata.spatial.ObStationDao;
import gov.noaa.nws.ncep.common.dataplugin.ncscd.NcScdRecord;
import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN;
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/META-INF/MANIFEST.MF
index c7585abc20..2851f1212b 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/META-INF/MANIFEST.MF
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: com.raytheon.edex.common;bundle-version="1.10.13",
org.apache.log4j;bundle-version="1.0.0",
org.junit;bundle-version="1.0.0",
gov.noaa.nws.ncep.common.dataplugin.nctaf;bundle-version="1.0.0",
- com.raytheon.uf.common.pointdata;bundle-version="1.12.1174",
+ com.raytheon.uf.edex.pointdata;bundle-version="1.12.1174",
org.geotools
Export-Package: gov.noaa.nws.ncep.edex.plugin.nctaf.decoder
Import-Package: com.raytheon.edex.exception,
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/src/gov/noaa/nws/ncep/edex/plugin/nctaf/decoder/NcTafParser.java b/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/src/gov/noaa/nws/ncep/edex/plugin/nctaf/decoder/NcTafParser.java
index d4f2a3338b..7783a0d65f 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/src/gov/noaa/nws/ncep/edex/plugin/nctaf/decoder/NcTafParser.java
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/src/gov/noaa/nws/ncep/edex/plugin/nctaf/decoder/NcTafParser.java
@@ -30,7 +30,6 @@ import java.util.regex.Pattern;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import com.raytheon.edex.db.dao.spatial.ObStationDao;
import com.raytheon.edex.exception.DecoderException;
import gov.noaa.nws.ncep.common.dataplugin.nctaf.NcTafChangeGroup;
import gov.noaa.nws.ncep.common.dataplugin.nctaf.NcTafPeriod;
@@ -40,6 +39,7 @@ import com.raytheon.uf.common.pointdata.spatial.SurfaceObsLocation;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.common.time.TimeRange;
import com.raytheon.uf.edex.decodertools.time.TimeTools;
+import com.raytheon.uf.edex.pointdata.spatial.ObStationDao;
import com.raytheon.uf.edex.wmo.message.WMOHeader;
/**
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncuair/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.ncuair/META-INF/MANIFEST.MF
index 5115b55daa..16372b2671 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncuair/META-INF/MANIFEST.MF
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncuair/META-INF/MANIFEST.MF
@@ -9,6 +9,7 @@ Require-Bundle: gov.noaa.nws.ncep.common.dataplugin.ncuair;bundle-version="1.0.0
com.raytheon.uf.edex.bufrtools;bundle-version="1.11.17",
org.apache.commons.logging;bundle-version="1.0.4",
com.raytheon.edex.common;bundle-version="1.11.17",
+ com.raytheon.uf.edex.pointdata,
com.raytheon.uf.edex.decodertools;bundle-version="1.11.17",
javax.measure;bundle-version="1.0.0",
org.geotools;bundle-version="2.5.2",
@@ -17,7 +18,5 @@ Require-Bundle: gov.noaa.nws.ncep.common.dataplugin.ncuair;bundle-version="1.0.0
org.apache.log4j;bundle-version="1.0.0",
org.junit;bundle-version="1.0.0"
Import-Package: com.raytheon.edex.exception,
- com.raytheon.uf.common.pointdata,
- com.raytheon.uf.common.pointdata.spatial,
com.raytheon.uf.edex.pointdata,
gov.noaa.nws.ncep.common.tools
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncuair/src/gov/noaa/nws/ncep/edex/plugin/ncuair/decoder/NcUairDecoder.java b/ncep/gov.noaa.nws.ncep.edex.plugin.ncuair/src/gov/noaa/nws/ncep/edex/plugin/ncuair/decoder/NcUairDecoder.java
index b2085dc5a9..ac77eacbf6 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncuair/src/gov/noaa/nws/ncep/edex/plugin/ncuair/decoder/NcUairDecoder.java
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncuair/src/gov/noaa/nws/ncep/edex/plugin/ncuair/decoder/NcUairDecoder.java
@@ -33,9 +33,9 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import com.raytheon.uf.edex.database.DataAccessLayerException;
+import com.raytheon.uf.edex.pointdata.spatial.ObStationDao;
import com.raytheon.uf.edex.wmo.message.WMOHeader;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
-import com.raytheon.edex.db.dao.spatial.ObStationDao;
import com.raytheon.edex.exception.DecoderException;
import com.raytheon.uf.common.dataplugin.PluginException;
import com.raytheon.uf.common.pointdata.spatial.ObStation;
diff --git a/ncep/gov.noaa.nws.ncep.edex.uengine/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.uengine/META-INF/MANIFEST.MF
index 7fed92c0c0..0b73c2720c 100644
--- a/ncep/gov.noaa.nws.ncep.edex.uengine/META-INF/MANIFEST.MF
+++ b/ncep/gov.noaa.nws.ncep.edex.uengine/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@ Require-Bundle: com.raytheon.edex.uengine,
com.raytheon.edex.plugin.modelsounding;bundle-version="1.12.1174",
com.raytheon.edex.plugin.bufrua;bundle-version="1.12.1174",
com.raytheon.uf.common.dataplugin.level;bundle-version="1.12.1174",
- com.raytheon.uf.common.pointdata;bundle-version="1.12.1174",
+ com.raytheon.uf.edex.pointdata;bundle-version="1.12.1174",
gov.noaa.nws.ncep.edex.plugin.ncgrib;bundle-version="1.0.0",
gov.noaa.nws.ncep.common.dataplugin.ncuair;bundle-version="1.0.0",
com.raytheon.uf.common.gridcoverage;bundle-version="1.0.0"
diff --git a/ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/query/GempakAreaQuery.java b/ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/query/GempakAreaQuery.java
index cdf1cc86fe..1a13be1e6c 100644
--- a/ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/query/GempakAreaQuery.java
+++ b/ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/query/GempakAreaQuery.java
@@ -15,11 +15,11 @@ import java.util.List;
import org.hibernate.criterion.Disjunction;
import org.hibernate.criterion.Expression;
-import com.raytheon.edex.db.dao.spatial.ObStationDao;
import com.raytheon.edex.msg.ResponseMessageNull;
import com.raytheon.edex.uengine.exception.MicroEngineException;
import com.raytheon.edex.uengine.tasks.ScriptTask;
import com.raytheon.uf.common.pointdata.spatial.ObStation;
+import com.raytheon.uf.edex.pointdata.spatial.ObStationDao;
/**
* GempakAreaQuery