xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Omaha #3503 Composite product generators init after spring beans are loaded

Browse source 
Change-Id: I894adbc14e1bfe183a3f7717d95dba85291a2a09

Former-commit-id: f6109e74ff5e26547c8fc03d7bb5ecde1046f689
This commit is contained in:
Brian Clements 2014-08-26 16:50:38 -05:00
parent 169f5729db
commit 095f84e71f
33 changed files with 191 additions and 168 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
edexOsgi/com.raytheon.uf.edex.cpgsrv/src/com/raytheon/uf/edex/cpgsrv/CompositeProductGenerator.java
View file

@ -40,6 +40,7 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.edex.core.EDEXUtil;
import com.raytheon.uf.edex.core.EdexException;
import com.raytheon.uf.edex.core.IContextStateProcessor;
import com.raytheon.uf.edex.database.dao.CoreDao;
import com.raytheon.uf.edex.database.dao.DaoConfig;
import com.raytheon.uf.edex.database.plugin.PluginDao;
@ -62,6 +63,7 @@ import com.raytheon.uf.edex.database.plugin.PluginDao;
* 02/12/2013 1615 bgonzale Changed ProcessEvent pluginName to dataType.
* Feb 15, 2013 1638 mschenke Moved DataURINotificationMessage to uf.common.dataplugin
* Apr 17, 2014 2726 rjpeter Updated to send alerts directly to notification route.
* Aug 26, 2014 3503 bclement moved initialization to context state processor pre-start method
* </pre>
*
* @author dhladky
@ -69,7 +71,7 @@ import com.raytheon.uf.edex.database.plugin.PluginDao;
*/
public abstract class CompositeProductGenerator implements
ICompositeProductGenerator, IURIFilter {
ICompositeProductGenerator, IURIFilter, IContextStateProcessor {
private static final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(CompositeProductGenerator.class);
@ -123,18 +125,56 @@ public abstract class CompositeProductGenerator implements
*/
public CompositeProductGenerator(String name, String compositeProductType,
Executor executor) {
// create CPG
if (isRunning()) {
setGeneratorName(name);
setCompositeProductType(compositeProductType);
setExecutor(executor);
configureFilters();
createFilters();
}
routeId = getGeneratorName() + "Generate";
}
/*
* (non-Javadoc)
*
* @see com.raytheon.uf.edex.core.IContextStateProcessor#preStart()
*/
@Override
public void preStart() {
// create CPG
if (isRunning()) {
configureFilters();
createFilters();
}
}
/*
* (non-Javadoc)
*
* @see com.raytheon.uf.edex.core.IContextStateProcessor#postStart()
*/
@Override
public void postStart() {
}
/*
* (non-Javadoc)
*
* @see com.raytheon.uf.edex.core.IContextStateProcessor#preStop()
*/
@Override
public void preStop() {
}
/*
* (non-Javadoc)
*
* @see com.raytheon.uf.edex.core.IContextStateProcessor#postStop()
*/
@Override
public void postStop() {
}
/*
* (non-Javadoc)
*

7
edexOsgi/com.raytheon.uf.edex.plugin.cwat/.settings/org.eclipse.jdt.core.prefs
View file

@ -1,7 +0,0 @@
#Wed Jun 03 12:02:34 CDT 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

4
edexOsgi/com.raytheon.uf.edex.plugin.cwat/META-INF/MANIFEST.MF
View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Cwat Plug-in
Bundle-SymbolicName: com.raytheon.uf.edex.plugin.cwat
Bundle-Version: 1.14.0.qualifier
Bundle-Version: 1.14.1.qualifier
Bundle-Vendor: RAYTHEON
Require-Bundle: com.raytheon.uf.edex.cpgsrv;bundle-version="1.11.7";resolution:=optional,
com.raytheon.uf.common.monitor;bundle-version="1.11.7",
@ -24,10 +24,10 @@ Require-Bundle: com.raytheon.uf.edex.cpgsrv;bundle-version="1.11.7";resolution:=
com.raytheon.uf.edex.database,
com.raytheon.uf.common.datastorage
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
Export-Package: com.raytheon.uf.edex.plugin.cwat,
com.raytheon.uf.edex.plugin.cwat.common
Import-Package: com.raytheon.edex.urifilter,
com.raytheon.uf.common.util,
com.raytheon.uf.edex.core,
com.raytheon.uf.edex.plugin.scan.common,
org.apache.commons.logging

31
edexOsgi/com.raytheon.uf.edex.plugin.cwat/res/spring/cwat-ingest.xml
View file

@ -1,24 +1,27 @@
<beans
xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<bean id="cwatGenerator" class="com.raytheon.uf.edex.plugin.cwat.CWATGenerator"/>
<bean id="cwatGenerator" class="com.raytheon.uf.edex.plugin.cwat.CWATGenerator" />
<bean factory-bean="contextManager" factory-method="registerContextStateProcessor">
<constructor-arg ref="cwat-camel" />
<constructor-arg ref="cwatGenerator" />
</bean>
<bean factory-bean="cpgSrvDispatcher" factory-method="register">
<constructor-arg ref="cwatGenerator"/>
</bean>
<camelContext id="cwat-camel" xmlns="http://camel.apache.org/schema/spring" errorHandlerRef="errorHandler">
<constructor-arg ref="cwatGenerator" />
</bean>
<camelContext id="cwat-camel" xmlns="http://camel.apache.org/schema/spring" errorHandlerRef="errorHandler">
<route id="CWATGenerate">
<from uri="jms-durable:queue:cwatGenerate"/>
<from uri="jms-durable:queue:cwatGenerate" />
<doTry>
<bean ref="serializationUtil" method="transformFromThrift" />
<bean ref="cwatGenerator" method="generate" />
<bean ref="serializationUtil" method="transformFromThrift" />
<bean ref="cwatGenerator" method="generate" />
<doCatch>
<exception>java.lang.Throwable</exception>
<to uri="log:cwat?level=ERROR"/>
<to uri="log:cwat?level=ERROR" />
</doCatch>
</doTry>
</route>

3
edexOsgi/com.raytheon.uf.edex.plugin.cwat/src/com/raytheon/uf/edex/plugin/cwat/CWATGenerator.java
View file

@ -50,6 +50,7 @@ import com.raytheon.uf.edex.plugin.cwat.common.CWATConfig;
* ------------ ---------- ----------- --------------------------
* Feb 25, 2013 1660 D. Hladky Fixed configuration bug in scan.
* Aug 30, 2013 2298 rjpeter Make getPluginName abstract
* Aug 26, 2014 3503 bclement removed constructDataURI() call
*
* </pre>
*
@ -165,8 +166,6 @@ public class CWATGenerator extends CompositeProductGenerator implements
cwaRec.setThreats(cwa.getThreatConditions());
cwaRec.setMaxScti(cwa.getMaxSCTI());
cwaRec.constructDataURI();
this.setPluginDataObjects(new CWATRecord[] { cwaRec });
statusHandler.handle(Priority.INFO, cwa_config.getIcao()

6
edexOsgi/com.raytheon.uf.edex.plugin.cwat/src/com/raytheon/uf/edex/plugin/cwat/CWATURIFilter.java
View file

@ -32,6 +32,7 @@ import com.raytheon.edex.urifilter.URIFilter;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 02/07/2009 1981 dhladky Initial Creation.
* Aug 26, 2014 3503 bclement removed serial version id
*
* </pre>
*
@ -41,11 +42,6 @@ import com.raytheon.edex.urifilter.URIFilter;
public class CWATURIFilter extends URIFilter {
/**
*
*/
private static final long serialVersionUID = -3535529277218686093L;
/** an ICAO you may wish to use in matching */
protected String icao = null;

4
edexOsgi/com.raytheon.uf.edex.plugin.cwat/src/com/raytheon/uf/edex/plugin/cwat/CWAThreat.java
View file

@ -61,6 +61,7 @@ import com.vividsolutions.jts.geom.Coordinate;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 01/06/2009 2037 dhladky Initial Creation.
* Aug 26, 2014 3503 bclement removed unused variable in getSevereWxThreadProb()
*
* </pre>
*
@ -839,7 +840,6 @@ public class CWAThreat {
private short getSevereWxThreatProb(Coordinate gridPt) {
float maxvil = 0.0f;
float isvg10 = 0.0f;
float isvg20 = 0.0f;
float svrWxProb = 0.0f;
int lower = 3;
@ -877,8 +877,6 @@ public class CWAThreat {
}
if (vil[(ii * ScanUtils.SCAN_GRID_DIM) + jj] > 20)
isvg20++;
if (vil[(ii * ScanUtils.SCAN_GRID_DIM) + jj] > 10)
isvg10++;
}
}

31
edexOsgi/com.raytheon.uf.edex.plugin.cwat/src/com/raytheon/uf/edex/plugin/cwat/common/LocationBin.java
View file

@ -1,5 +1,28 @@
/**
* This software was developed and / or modified by Raytheon Company,
* pursuant to Contract DG133W-05-CQ-1067 with the US Government.
*
* U.S. EXPORT CONTROLLED TECHNICAL DATA
* This software product contains export-restricted data whose
* export/transfer/disclosure is restricted by U.S. law. Dissemination
* to non-U.S. persons whether in the United States or abroad requires
* an export license or other authorization.
*
* Contractor Name: Raytheon Company
* Contractor Address: 6825 Pine Street, Suite 340
* Mail Stop B8
* Omaha, NE 68106
* 402.291.0100
*
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
package com.raytheon.uf.edex.plugin.cwat.common;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
import com.vividsolutions.jts.geom.Coordinate;
/**
* CWAT grib binning object
*
@ -10,19 +33,15 @@ package com.raytheon.uf.edex.plugin.cwat.common;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 11/09/10 7441 D. Hladky Initial release
* Aug 26, 2014 3503 bclement removed ISerializableObject
*
* </pre>
*
* @author dhladky
* @version 1
*/
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
import com.vividsolutions.jts.geom.Coordinate;
@DynamicSerialize
public class LocationBin implements ISerializableObject {
public class LocationBin {
@DynamicSerializeElement
private Coordinate cellCoord;

6
edexOsgi/com.raytheon.uf.edex.plugin.cwat/src/com/raytheon/uf/edex/plugin/cwat/common/LocationCache.java
View file

@ -60,13 +60,13 @@ import com.vividsolutions.jts.geom.Coordinate;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Nov 17, 2010 rjpeter Initial creation
* Aug 26, 2014 3503 bclement removed warning
*
* </pre>
*
* @author rjpeter
* @version 1.0
*/
public class LocationCache {
private static final String TASK_NAME = "CWAT Location Gen";
@ -193,8 +193,8 @@ public class LocationCache {
try {
long start = System.currentTimeMillis();
rval = (LocationBinList) SerializationUtil
.transformFromThrift(FileUtil.file2bytes(file));
rval = SerializationUtil.transformFromThrift(
LocationBinList.class, FileUtil.file2bytes(file));
long end = System.currentTimeMillis();
rval.setLastModifiyTime(file.lastModified());
handler.handle(Priority.INFO, "Read CWAT location file ["

7
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/.settings/org.eclipse.jdt.core.prefs
View file

@ -1,7 +0,0 @@
#Thu Jun 25 10:35:09 CDT 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

5
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/res/spring/ffmp-ingest.xml
View file

@ -22,6 +22,11 @@
<constructor-arg ref="ffmpThreadPool"/>
</bean>
<bean factory-bean="contextManager" factory-method="registerContextStateProcessor">
<constructor-arg ref="ffmp-camel" />
<constructor-arg ref="ffmpGenerator" />
</bean>
<bean factory-bean="cpgSrvDispatcher" factory-method="register">
<constructor-arg ref="ffmpGenerator"/>
</bean>

2
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
View file

@ -137,6 +137,7 @@ import com.raytheon.uf.edex.plugin.ffmp.common.FFTIRatioDiff;
* Aug 30, 2013 2298 rjpeter Make getPluginName abstract
* Apr 24, 2014 2940 dhladky Prevent storage of bad records.
* Jul 10, 2014 2914 garmendariz Remove EnvProperties
* Aug 26, 2014 3503 bclement removed constructDataURI() call
* </pre>
*
* @author dhladky
@ -700,7 +701,6 @@ public class FFMPGenerator extends CompositeProductGenerator implements
if (ffmpRec != null) {
ffmpRec.constructDataURI();
persistRecord(ffmpRec);
processDataContainer(ffmpRec, siteKey);
// Now that we have the data container,

61
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPNestTest.java
View file

@ -1,61 +0,0 @@
package com.raytheon.uf.edex.plugin.ffmp;
import java.util.ArrayList;
import com.raytheon.uf.common.dataplugin.ffmp.SourceBinEntry;
public class FFMPNestTest {
public FFMPNestTest() {
// for (int p = 1; p < 2; p++) {
ArrayList<SourceBinEntry> nestPoints = processNest(1, 25, 25, 3, 3);
// }
}
/**
* Process gradually increasing nest looking for points that fall within the
* geometry
*
* @param geom
* @param p
* @param nx
* @param ny
* @param x
* @param y
* @param points
* @return
*/
private ArrayList<SourceBinEntry> processNest(int p, int nx, int ny, int x,
int y) {
ArrayList<SourceBinEntry> myPoints = new ArrayList<SourceBinEntry>();
for (int i = p * (-1); i <= p; i++) {
int xx = x + i;
// process entire row
if (i == p * (-1) || i == p) {
for (int j = p * (-1); j <= p; j++) {
int yy = y + j;
System.out.println(" XX: " + xx + " YY: " + yy);
}
}
// process only book ends
else {
for (int j = p * (-1); j <= p; j++) {
int yy = y + j;
if (yy == y - p || yy == y + p) {
System.out.println(" XX: " + xx + " YY: " + yy);
}
}
}
}
return myPoints;
}
public static void main(String[] args) {
FFMPNestTest test = new FFMPNestTest();
}
}

6
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPURIFilter.java
View file

@ -50,6 +50,7 @@ import com.raytheon.uf.common.ohd.AppsDefaults;
* 06/21/2009 2521 dhladky Initial Creation.
* Feb 15, 2013 1638 mschenke Moved DataURINotificationMessage to uf.common.dataplugin
* Jul 10, 2014 2914 garmendariz Remove EnvProperties
* Aug 26, 2014 3503 bclement removed serial version id
*
* </pre>
*
@ -59,11 +60,6 @@ import com.raytheon.uf.common.ohd.AppsDefaults;
public class FFMPURIFilter extends URIFilter {
/**
*
*/
private static final long serialVersionUID = 3389517248482079383L;
/** an ICAO you may wish to use in matching */
protected String[] icao = null;

4
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTIData.java
View file

@ -1,6 +1,5 @@
package com.raytheon.uf.edex.plugin.ffmp.common;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@ -34,6 +33,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* ------------ ---------- ----------- --------------------------
* July 16, 2012 dhladky Initial creation
* 02/01/13 1569 D. Hladky Added constants, last update time
* Aug 26, 2014 3503 bclement removed ISerialableObject
*
* </pre>
*
@ -42,7 +42,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
*/
@DynamicSerialize
public class FFTIData implements ISerializableObject {
public class FFTIData {
@DynamicSerializeElement
private Double gap = 0.0;

7
edexOsgi/com.raytheon.uf.edex.plugin.fog/.settings/org.eclipse.jdt.core.prefs
View file

@ -1,7 +0,0 @@
#Mon Dec 28 09:52:45 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

5
edexOsgi/com.raytheon.uf.edex.plugin.fog/res/spring/fog-ingest.xml
View file

@ -6,6 +6,11 @@
<bean id="fogGenerator" class="com.raytheon.uf.edex.plugin.fog.FogGenerator"/>
<bean factory-bean="contextManager" factory-method="registerContextStateProcessor">
<constructor-arg ref="fog-camel" />
<constructor-arg ref="fogGenerator" />
</bean>
<bean factory-bean="cpgSrvDispatcher" factory-method="register">
<constructor-arg ref="fogGenerator"/>
</bean>

18
edexOsgi/com.raytheon.uf.edex.plugin.fog/src/com/raytheon/uf/edex/plugin/fog/FogGenerator.java
View file

@ -30,6 +30,22 @@ import com.raytheon.uf.edex.cpgsrv.CompositeProductGenerator;
import com.raytheon.uf.edex.decodertools.time.TimeTools;
import com.raytheon.uf.edex.plugin.fog.common.FogConfig;
/**
* Composite product generator for fog products
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* ??? ??? ??? Initial creation
* Aug 26, 2014 3503 bclement removed constructDataURI() call
*
* </pre>
*
* @version 1.0
*/
public class FogGenerator extends CompositeProductGenerator {
private static final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(FogGenerator.class);
@ -93,8 +109,6 @@ public class FogGenerator extends CompositeProductGenerator {
fogRec.setIR_10_7Array(fog_config.getIR10_7());
}
fogRec.constructDataURI();
this.setPluginDataObjects(new FogRecord[] { fogRec });
statusHandler.info(getGeneratorName() + " wrote FogRecord: \n"

6
edexOsgi/com.raytheon.uf.edex.plugin.fog/src/com/raytheon/uf/edex/plugin/fog/FogURIFilter.java
View file

@ -38,6 +38,7 @@ import com.vividsolutions.jts.geom.Geometry;
* ------------ ---------- ----------- --------------------------
*
* Oct 31, 2012 15464 zhao updated satellite URIfilters
* Aug 26, 2014 3503 bclement removed serial version id
*
* </pre>
*
@ -47,11 +48,6 @@ public class FogURIFilter extends URIFilter {
private static final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(FogURIFilter.class);
/**
*
*/
private static final long serialVersionUID = -7693738314059883681L;
public FogURIFilter(String name) {
super(name);
statusHandler.info("FogFilter " + name + " Filter construction...");

5
edexOsgi/com.raytheon.uf.edex.plugin.fssobs/res/spring/fssobs-ingest.xml
View file

@ -9,6 +9,11 @@
<bean id="fssObsGenerator" class="com.raytheon.uf.edex.plugin.fssobs.FSSObsGenerator"/>
<bean factory-bean="contextManager" factory-method="registerContextStateProcessor">
<constructor-arg ref="fssobs-camel" />
<constructor-arg ref="fssObsGenerator" />
</bean>
<bean factory-bean="cpgSrvDispatcher" factory-method="register">
<constructor-arg ref="fssObsGenerator"/>
</bean>

5
edexOsgi/com.raytheon.uf.edex.plugin.preciprate/res/spring/preciprate-ingest.xml
View file

@ -6,6 +6,11 @@
<bean id="preciprateGenerator" class="com.raytheon.uf.edex.plugin.preciprate.PrecipRateGenerator"/>
<bean factory-bean="contextManager" factory-method="registerContextStateProcessor">
<constructor-arg ref="preciprate-camel" />
<constructor-arg ref="preciprateGenerator" />
</bean>
<bean factory-bean="cpgSrvDispatcher" factory-method="register">
<constructor-arg ref="preciprateGenerator"/>
</bean>

2
edexOsgi/com.raytheon.uf.edex.plugin.preciprate/src/com/raytheon/uf/edex/plugin/preciprate/PrecipRateGenerator.java
View file

@ -51,6 +51,7 @@ import com.raytheon.uf.edex.plugin.preciprate.common.PrecipRateConfig;
* Jan 25, 2010 3796 D. Hladky Initial release
* Feb 25, 2013 1660 D. Hladky Fixed SCAN configuration bug.
* Aug 30, 2013 2298 rjpeter Make getPluginName abstract
* Aug 26, 2014 3503 bclement removed constructDataURI() call
*
* </pre>
*
@ -171,7 +172,6 @@ public class PrecipRateGenerator extends CompositeProductGenerator implements
precipRateRec.setCoefficent(pr.getDhrMap().get(
DHRValues.ZRPOWERCOEFF));
precipRateRec.constructDataURI();
this.setPluginDataObjects(new PrecipRateRecord[] { precipRateRec });
statusHandler.handle(Priority.INFO, precipRateRec.getIcao()

22
edexOsgi/com.raytheon.uf.edex.plugin.preciprate/src/com/raytheon/uf/edex/plugin/preciprate/PrecipRateURIFilter.java
View file

@ -24,13 +24,25 @@ import java.util.regex.Pattern;
import com.raytheon.edex.urifilter.URIFilter;
import com.raytheon.edex.urifilter.URIGenerateMessage;
/**
* Filter for data radar data URIs that have a specific tiltAngle, layer, dhr,
* etc
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* ??? ??? ??? Initial creation
* Aug 26, 2014 3503 bclement removed serial version id
*
* </pre>
*
* @version 1.0
*/
public class PrecipRateURIFilter extends URIFilter {
/**
*
*/
private static final long serialVersionUID = 1346354654L;
public PrecipRateURIFilter(String name) {
super(name);
logger.debug("PrecipRateFilter " + name + " Filter construction...");

21
edexOsgi/com.raytheon.uf.edex.plugin.preciprate/src/com/raytheon/uf/edex/plugin/preciprate/common/PrecipRateConfig.java
View file

@ -39,6 +39,24 @@ import com.raytheon.uf.edex.plugin.preciprate.PrecipRateURIGenerateMessage;
import com.raytheon.uf.edex.plugin.scan.common.ScanCommonUtils;
import com.vividsolutions.jts.geom.Coordinate;
/**
* Config holder object for radar parameters used to filter for precipitation
* rates
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* ??? ??? ??? Initial creation
* Aug 26, 2014 3503 bclement removed unused maxExtent field
*
* </pre>
*
* @author bclement
* @version 1.0
*/
public class PrecipRateConfig {
private static final transient IUFStatusHandler statusHandler = UFStatus
@ -65,9 +83,6 @@ public class PrecipRateConfig {
/** The geometry for the radar **/
private GridGeometry2D radarGeometry = null;
/** max radar extent **/
private double maxExtent = 0.00;
/** create a date formatter for SQL **/
private SimpleDateFormat dateFmt = new SimpleDateFormat(
"MMM dd yy HH:mm:ss");

7
edexOsgi/com.raytheon.uf.edex.plugin.qpf/.settings/org.eclipse.jdt.core.prefs
View file

@ -1,7 +0,0 @@
#Mon Feb 09 11:34:15 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
edexOsgi/com.raytheon.uf.edex.plugin.qpf/META-INF/MANIFEST.MF
View file

@ -21,9 +21,9 @@ Require-Bundle: com.raytheon.uf.common.monitor;bundle-version="1.0.0",
com.raytheon.uf.edex.database
Import-Package: com.raytheon.edex.urifilter,
com.raytheon.uf.common.dataplugin.grid,
com.raytheon.uf.edex.core,
com.raytheon.uf.edex.plugin.scan.common,
org.apache.commons.logging
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
Export-Package: com.raytheon.uf.edex.plugin.qpf,
com.raytheon.uf.edex.plugin.qpf.common

5
edexOsgi/com.raytheon.uf.edex.plugin.qpf/res/spring/qpf-ingest.xml
View file

@ -6,6 +6,11 @@
<bean id="qpfGenerator" class="com.raytheon.uf.edex.plugin.qpf.QPFGenerator"/>
<bean factory-bean="contextManager" factory-method="registerContextStateProcessor">
<constructor-arg ref="qpf-camel" />
<constructor-arg ref="qpfGenerator" />
</bean>
<bean factory-bean="cpgSrvDispatcher" factory-method="register">
<constructor-arg ref="qpfGenerator"/>
</bean>

7
edexOsgi/com.raytheon.uf.edex.plugin.scan/.settings/org.eclipse.jdt.core.prefs
View file

@ -1,7 +0,0 @@
#Wed Mar 17 14:56:34 CDT 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

7
edexOsgi/com.raytheon.uf.edex.plugin.scan/res/spring/scan-ingest.xml
View file

@ -15,9 +15,14 @@
<property name="keepAliveSeconds" value="60000" />
</bean>
<bean id="scanGenerator" class="com.raytheon.uf.edex.plugin.scan.ScanGenerator" depends-on="commonTimeRegistered, gridcoveragelookup">
<bean id="scanGenerator" class="com.raytheon.uf.edex.plugin.scan.ScanGenerator" >
<property name="executor" ref="scanThreadPool"/>
</bean>
<bean factory-bean="contextManager" factory-method="registerContextStateProcessor">
<constructor-arg ref="clusteredScanRoutes" />
<constructor-arg ref="scanGenerator" />
</bean>
<bean factory-bean="scanCpgSrvDispatcher" factory-method="register">
<constructor-arg ref="scanGenerator"/>

2
edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/ScanGenerator.java
View file

@ -58,6 +58,7 @@ import com.raytheon.uf.edex.dat.utils.ScanDataCache;
* Aug 30, 2013 2298 rjpeter Make getPluginName abstract
* May 12, 2014 3133 njensen Remove unused field
* Jul 10, 2014 2914 garmendariz Remove EnvProperties
* Aug 26, 2014 3503 bclement removed constructDataURI() call
*
* </pre>
*
@ -210,7 +211,6 @@ public class ScanGenerator extends CompositeProductGenerator implements
scanRec.setTableData(tables.get(table));
scanRec.setVolScanTime(tables.get(table).getVolScanTime());
scanRec.constructDataURI();
scanRecords[i] = scanRec;
i++;
}

5
edexOsgi/com.raytheon.uf.edex.plugin.vil/res/spring/vil-ingest.xml
View file

@ -5,6 +5,11 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<bean id="vilGenerator" class="com.raytheon.uf.edex.plugin.vil.VILGenerator"/>
<bean factory-bean="contextManager" factory-method="registerContextStateProcessor">
<constructor-arg ref="vil-camel" />
<constructor-arg ref="vilGenerator" />
</bean>
<bean factory-bean="cpgSrvDispatcher" factory-method="register">
<constructor-arg ref="vilGenerator"/>

2
edexOsgi/com.raytheon.uf.edex.plugin.vil/src/com/raytheon/uf/edex/plugin/vil/VILGenerator.java
View file

@ -51,6 +51,7 @@ import com.raytheon.uf.edex.plugin.vil.common.VILConfig;
* Feb 07, 2009 2037 dhladky Initial Creation.
* Feb 25, 2013 1660 D. Hladky Fixed SCAN configuration bug.
* Aug 30, 2013 2298 rjpeter Make getPluginName abstract
* Aug 26, 2014 3503 bclement removed constructDataURI() call
*
* </pre>
*
@ -162,7 +163,6 @@ public class VILGenerator extends CompositeProductGenerator implements
vilRec.setSpatialInfo(vil_config.getSpatialInfo());
vilRec.setFieldName(name.name());
vilRec.setDataArray(vil.getFloatArrays().get(name.name()));
vilRec.constructDataURI();
scanRecords[i] = vilRec;
i++;
}

6
edexOsgi/com.raytheon.uf.edex.plugin.vil/src/com/raytheon/uf/edex/plugin/vil/VILURIFilter.java
View file

@ -32,6 +32,7 @@ import com.raytheon.edex.urifilter.URIFilter;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 11/11/2009 2037 dhladky Initial Creation.
* Aug 26, 2014 3503 bclement removed serial version id
*
* </pre>
*
@ -41,11 +42,6 @@ import com.raytheon.edex.urifilter.URIFilter;
public class VILURIFilter extends URIFilter {
/**
*
*/
private static final long serialVersionUID = -8944715498444496570L;
/** an ICAO you may wish to use in matching */
protected String icao = null;