Omaha #3530 fixed dependencies on qc and ldadmesonet
Change-Id: Ida090030fa029633e2f1e8b967131a4806c8ebe2 Former-commit-id: 3fa55526310ca6cfa7b2b054296ced7321f86480
This commit is contained in:
Brian Clements
parent
83b666c0df
commit
af2554f364
15 changed files with 64 additions and 80 deletions
|
|
@ -2,19 +2,13 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Ldadmesonet Plug-in
|
||||
Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.ldadmesonet
|
||||
Bundle-Version: 1.14.0.qualifier
|
||||
Bundle-Version: 1.14.1.qualifier
|
||||
Bundle-Vendor: RAYTHEON
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
|
||||
Require-Bundle: com.raytheon.edex.common,
|
||||
com.raytheon.uf.common.pointdata;bundle-version="1.11.16",
|
||||
com.raytheon.uf.edex.pointdata;bundle-version="1.11.16",
|
||||
javax.persistence,
|
||||
javax.measure,
|
||||
com.raytheon.uf.common.dataplugin
|
||||
Import-Package: com.raytheon.uf.common.status,
|
||||
com.raytheon.uf.edex.decodertools.core,
|
||||
com.raytheon.uf.edex.decodertools.time,
|
||||
com.vividsolutions.jts.geom,
|
||||
org.apache.commons.logging
|
||||
Export-Package: com.raytheon.uf.common.dataplugin.ldadmesonet,
|
||||
com.raytheon.uf.common.dataplugin.ldadmesonet.dao
|
||||
Import-Package: com.raytheon.uf.common.geospatial,
|
||||
com.raytheon.uf.common.serialization.annotations,
|
||||
com.vividsolutions.jts.geom
|
||||
Export-Package: com.raytheon.uf.common.dataplugin.ldadmesonet
|
||||
Require-Bundle: javax.persistence,
|
||||
com.raytheon.uf.common.dataplugin,
|
||||
com.raytheon.uf.common.pointdata
|
||||
|
|
|
|||
|
|
@ -2,16 +2,13 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Qc Plug-in
|
||||
Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.qc
|
||||
Bundle-Version: 1.14.0.qualifier
|
||||
Bundle-Version: 1.14.1.qualifier
|
||||
Bundle-Vendor: RAYTHEON
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
|
||||
Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.17",
|
||||
javax.persistence;bundle-version="1.0.0",
|
||||
com.raytheon.uf.common.pointdata;bundle-version="1.12.1161",
|
||||
com.raytheon.uf.edex.pointdata;bundle-version="1.12.1161",
|
||||
com.raytheon.uf.common.python;bundle-version="1.12.1161",
|
||||
org.jep;bundle-version="1.0.0",
|
||||
com.raytheon.uf.common.localization;bundle-version="1.12.1161"
|
||||
Export-Package: com.raytheon.uf.common.dataplugin.qc,
|
||||
com.raytheon.uf.common.dataplugin.qc.internal
|
||||
Import-Package: com.raytheon.uf.common.status
|
||||
Require-Bundle: com.raytheon.uf.common.dataplugin
|
||||
Export-Package: com.raytheon.uf.common.dataplugin.qc
|
||||
Import-Package: com.raytheon.uf.common.geospatial,
|
||||
com.raytheon.uf.common.pointdata.spatial,
|
||||
com.raytheon.uf.common.serialization.annotations,
|
||||
com.raytheon.uf.common.status,
|
||||
javax.persistence
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
#Wed Jan 20 03:12:15 CST 2010
|
||||
eclipse.preferences.version=1
|
||||
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
|
||||
|
|
@ -2,16 +2,13 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Ldadmesonet Plug-in
|
||||
Bundle-SymbolicName: com.raytheon.uf.edex.plugin.ldadmesonet
|
||||
Bundle-Version: 1.12.1174.qualifier
|
||||
Bundle-Version: 1.14.0.qualifier
|
||||
Bundle-Vendor: RAYTHEON
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
|
||||
Require-Bundle: com.raytheon.uf.common.dataplugin.ldadmesonet;bundle-version="1.0.0",
|
||||
com.raytheon.edex.common,
|
||||
com.raytheon.uf.common.pointdata,
|
||||
javax.persistence,
|
||||
javax.measure,
|
||||
com.raytheon.edex.plugin.ldad;bundle-version="1.0.0",
|
||||
com.raytheon.uf.common.dataplugin,
|
||||
com.raytheon.uf.common.localization,
|
||||
com.raytheon.uf.common.time
|
||||
Import-Package: org.apache.commons.logging
|
||||
com.raytheon.uf.edex.pointdata
|
||||
Import-Package: com.raytheon.uf.common.status
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<bean id="mesonetProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
|
||||
<property name="pluginName" value="ldadmesonet" />
|
||||
<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.ldadmesonet" />
|
||||
<property name="dao" value="com.raytheon.uf.common.dataplugin.ldadmesonet.dao.LdadMesonetDao" />
|
||||
<property name="dao" value="com.raytheon.uf.edex.plugin.ldadmesonet.dao.LdadMesonetDao" />
|
||||
<property name="record" value="com.raytheon.uf.common.dataplugin.ldadmesonet.MesonetLdadRecord" />
|
||||
</bean>
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
<constructor-arg value="jms-durable:queue:Ingest.ldadmesonet"/>
|
||||
</bean>
|
||||
|
||||
<bean id="ldadmesonetPointData" class="com.raytheon.uf.common.dataplugin.ldadmesonet.LdadmesonetPointDataTransform"/>
|
||||
<bean id="ldadmesonetPointData" class="com.raytheon.uf.edex.plugin.ldadmesonet.LdadmesonetPointDataTransform"/>
|
||||
|
||||
<camelContext id="ldadmesonet-camel"
|
||||
xmlns="http://camel.apache.org/schema/spring"
|
||||
|
|
|
|||
|
|
@ -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.ldadmesonet;
|
||||
package com.raytheon.uf.edex.plugin.ldadmesonet;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
|
|
@ -26,11 +26,12 @@ import java.util.List;
|
|||
import java.util.Map;
|
||||
|
||||
import com.raytheon.uf.common.dataplugin.PluginDataObject;
|
||||
import com.raytheon.uf.common.dataplugin.ldadmesonet.dao.LdadMesonetDao;
|
||||
import com.raytheon.uf.common.dataplugin.ldadmesonet.MesonetLdadRecord;
|
||||
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.edex.plugin.ldadmesonet.dao.LdadMesonetDao;
|
||||
|
||||
/**
|
||||
* Transform LDAD MESONET records into Point Data Model.
|
||||
|
|
@ -44,6 +45,7 @@ import com.raytheon.uf.common.pointdata.spatial.SurfaceObsLocation;
|
|||
* Oct 09, 2009 DR2814 vkorolev Initial creation
|
||||
* Aug 30, 2013 2298 rjpeter Make getPluginName abstract
|
||||
* Jul 23, 2014 3410 bclement location changed to floats
|
||||
* Aug 15, 2014 3530 bclement moved from common to edex
|
||||
*
|
||||
* </pre>
|
||||
*
|
||||
|
|
@ -45,8 +45,6 @@ import javax.xml.bind.JAXBException;
|
|||
import javax.xml.bind.Unmarshaller;
|
||||
|
||||
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;
|
||||
import com.raytheon.uf.common.dataplugin.PluginDataObject;
|
||||
|
|
@ -55,6 +53,8 @@ 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.pointdata.spatial.SurfaceObsLocation;
|
||||
import com.raytheon.uf.common.status.IUFStatusHandler;
|
||||
import com.raytheon.uf.common.status.UFStatus;
|
||||
import com.raytheon.uf.common.time.DataTime;
|
||||
|
||||
/**
|
||||
|
|
@ -70,14 +70,17 @@ import com.raytheon.uf.common.time.DataTime;
|
|||
* May 15, 2013 1869 bsteffen Remove DataURI column from ldadmesonet.
|
||||
* Aug 30, 2013 2298 rjpeter Make getPluginName abstract
|
||||
* Jul 23, 2014 3410 bclement location changed to floats
|
||||
* Aug 15, 2014 3530 bclement no longer extends AbstractDecoder
|
||||
* </pre>
|
||||
*
|
||||
* @author vkorolev
|
||||
* @version 1
|
||||
*/
|
||||
|
||||
public class MesonetDecoder<E> extends AbstractDecoder implements
|
||||
IBinaryDecoder {
|
||||
public class MesonetDecoder<E> {
|
||||
|
||||
private static final IUFStatusHandler logger = UFStatus
|
||||
.getHandler(MesonetDecoder.class);
|
||||
|
||||
private static final String BAD_PROPERTY_FMT = "NumberFormatException setting property %s.%s(%s %s)";
|
||||
|
||||
|
|
@ -103,17 +106,11 @@ public class MesonetDecoder<E> extends AbstractDecoder implements
|
|||
|
||||
private String timeZone = null;
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see com.raytheon.edex.plugin.IBinaryDecoder#decode(byte[])
|
||||
/**
|
||||
* @param data
|
||||
* @return
|
||||
* @throws DecoderException
|
||||
*/
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see com.raytheon.edex.plugin.IBinaryDecoder#decode(byte[])
|
||||
*/
|
||||
@Override
|
||||
public PluginDataObject[] decode(byte[] data) throws DecoderException {
|
||||
List<PluginDataObject> retVal = new ArrayList<PluginDataObject>();
|
||||
if (data != null) {
|
||||
|
|
|
|||
|
|
@ -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.ldadmesonet.dao;
|
||||
package com.raytheon.uf.edex.plugin.ldadmesonet.dao;
|
||||
|
||||
import java.sql.SQLException;
|
||||
import java.util.ArrayList;
|
||||
|
|
@ -46,6 +46,7 @@ import com.raytheon.uf.edex.pointdata.spatial.ObStationDao;
|
|||
* 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
|
||||
* Aug 15, 2014 3530 bclement moved from common to edex
|
||||
*
|
||||
* </pre>
|
||||
*
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
#Tue Dec 01 09:54:16 CST 2009
|
||||
eclipse.preferences.version=1
|
||||
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
|
||||
|
|
@ -2,19 +2,15 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Qc Plug-in
|
||||
Bundle-SymbolicName: com.raytheon.uf.edex.plugin.qc
|
||||
Bundle-Version: 1.12.1174.qualifier
|
||||
Bundle-Version: 1.14.0.qualifier
|
||||
Bundle-Vendor: RAYTHEON
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
|
||||
Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.17",
|
||||
com.raytheon.uf.edex.pointdata;bundle-version="1.11.17",
|
||||
com.raytheon.uf.common.pointdata;bundle-version="1.11.17",
|
||||
com.raytheon.uf.common.dataplugin.qc;bundle-version="1.0.0",
|
||||
com.raytheon.uf.common.python;bundle-version="1.11.17",
|
||||
org.jep;bundle-version="1.0.0",
|
||||
com.raytheon.uf.common.localization;bundle-version="1.11.17",
|
||||
javax.persistence;bundle-version="1.0.0",
|
||||
ucar.nc2;bundle-version="1.0.0"
|
||||
Export-Package: com.raytheon.uf.edex.plugin.qc.common
|
||||
Import-Package: com.raytheon.uf.common.message.response,
|
||||
com.raytheon.uf.common.status,
|
||||
org.apache.commons.logging
|
||||
com.raytheon.uf.common.status
|
||||
|
|
|
|||
|
|
@ -36,13 +36,13 @@ import ucar.nc2.Variable;
|
|||
import com.raytheon.uf.common.dataplugin.PluginDataObject;
|
||||
import com.raytheon.uf.common.dataplugin.PluginException;
|
||||
import com.raytheon.uf.common.dataplugin.qc.QCRecord;
|
||||
import com.raytheon.uf.common.dataplugin.qc.internal.QCPaths;
|
||||
import com.raytheon.uf.common.pointdata.spatial.SurfaceObsLocation;
|
||||
import com.raytheon.uf.common.status.IUFStatusHandler;
|
||||
import com.raytheon.uf.common.status.UFStatus;
|
||||
import com.raytheon.uf.common.time.DataTime;
|
||||
import com.raytheon.uf.edex.database.plugin.PluginFactory;
|
||||
import com.raytheon.uf.edex.plugin.qc.dao.QCDao;
|
||||
import com.raytheon.uf.edex.plugin.qc.internal.QCPaths;
|
||||
|
||||
/**
|
||||
* Scans NetCDF files generated by A1 legacy applications and generates QCRecord
|
||||
|
|
|
|||
|
|
@ -30,12 +30,12 @@ import java.util.Map;
|
|||
import java.util.Set;
|
||||
|
||||
import com.raytheon.uf.common.dataplugin.PluginException;
|
||||
import com.raytheon.uf.common.dataplugin.qc.internal.QCPaths;
|
||||
import com.raytheon.uf.common.message.response.ResponseMessageCatalog;
|
||||
import com.raytheon.uf.common.pointdata.PointDataContainer;
|
||||
import com.raytheon.uf.common.util.FileUtil;
|
||||
import com.raytheon.uf.edex.database.DataAccessLayerException;
|
||||
import com.raytheon.uf.edex.plugin.qc.dao.QCDao;
|
||||
import com.raytheon.uf.edex.plugin.qc.internal.QCPaths;
|
||||
import com.raytheon.uf.edex.pointdata.PointDataQuery;
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -28,13 +28,9 @@ import java.util.Map;
|
|||
|
||||
import jep.JepException;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
|
||||
import com.raytheon.uf.common.dataplugin.PluginDataObject;
|
||||
import com.raytheon.uf.common.dataplugin.PluginException;
|
||||
import com.raytheon.uf.common.dataplugin.qc.QCRecord;
|
||||
import com.raytheon.uf.common.dataplugin.qc.internal.QCPaths;
|
||||
import com.raytheon.uf.common.datastorage.StorageException;
|
||||
import com.raytheon.uf.common.datastorage.StorageStatus;
|
||||
import com.raytheon.uf.common.datastorage.records.IntegerDataRecord;
|
||||
|
|
@ -42,8 +38,11 @@ import com.raytheon.uf.common.pointdata.PointDataContainer;
|
|||
import com.raytheon.uf.common.pointdata.PointDataDescription;
|
||||
import com.raytheon.uf.common.python.thread.PythonScriptManager;
|
||||
import com.raytheon.uf.common.python.thread.PythonScriptManager.ScriptRequest;
|
||||
import com.raytheon.uf.common.status.IUFStatusHandler;
|
||||
import com.raytheon.uf.common.status.UFStatus;
|
||||
import com.raytheon.uf.edex.database.DataAccessLayerException;
|
||||
import com.raytheon.uf.edex.database.query.DatabaseQuery;
|
||||
import com.raytheon.uf.edex.plugin.qc.internal.QCPaths;
|
||||
import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
|
||||
|
||||
/**
|
||||
|
|
@ -55,6 +54,7 @@ import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
|
|||
* Date Ticket# Engineer Description
|
||||
* ------------ ---------- ----------- --------------------------
|
||||
* 12/04/2009 3408 bphillip Initial creation
|
||||
* Aug 15, 2014 3530 bclement removed commons logging
|
||||
*
|
||||
* </pre>
|
||||
*
|
||||
|
|
@ -68,7 +68,8 @@ public class QCDao extends PointDataPluginDao<QCRecord> {
|
|||
|
||||
private static PythonScriptManager psm;
|
||||
|
||||
private transient Log logger = LogFactory.getLog(getClass());
|
||||
private static final transient IUFStatusHandler logger = UFStatus
|
||||
.getHandler(QCDao.class);
|
||||
|
||||
static {
|
||||
pdds = QCPaths.getPointDataDescriptions();
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
* further licensing information.
|
||||
**/
|
||||
|
||||
package com.raytheon.uf.common.dataplugin.qc.internal;
|
||||
package com.raytheon.uf.edex.plugin.qc.internal;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileNotFoundException;
|
||||
|
|
@ -47,6 +47,19 @@ import com.raytheon.uf.edex.core.EDEXUtil;
|
|||
|
||||
/**
|
||||
* This class should only be used by the QC plug-ins.
|
||||
*
|
||||
* <pre>
|
||||
*
|
||||
* SOFTWARE HISTORY
|
||||
*
|
||||
* Date Ticket# Engineer Description
|
||||
* ------------ ---------- ----------- --------------------------
|
||||
* ??? ??? ??? Initial creation
|
||||
* Aug 15, 2014 3530 bclement moved from common to edex
|
||||
*
|
||||
* </pre>
|
||||
*
|
||||
* @version 1.0
|
||||
*/
|
||||
public class QCPaths {
|
||||
private static final transient IUFStatusHandler statusHandler = UFStatus
|
||||
Loading…
Add table
Reference in a new issue