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

Omaha #5166: Update logging to use SLF4J:grib,obs,warning

Browse source 
amend: Update Bundle-Version in manifest

Change-Id: I68e20f62d8e4049a41ab68015ae557f235ea38f8

Former-commit-id: 0385f259aa759953c9253d39c3e3681d453b826d
This commit is contained in:
Kevin Bisanz 2015-12-15 16:34:11 -06:00
parent 31b3ba9bd4
commit 5e5c388692
7 changed files with 38 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
edexOsgi/com.raytheon.edex.plugin.grib/META-INF/MANIFEST.MF
View file

@ -27,4 +27,4 @@ Export-Package: com.raytheon.edex.plugin.grib,
com.raytheon.edex.plugin.grib.util, com.raytheon.edex.plugin.grib.util,
com.raytheon.edex.util.grib com.raytheon.edex.util.grib
Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: org.apache.commons.logging Import-Package: org.slf4j

7
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/Grib1ParameterLookup.java
View file

@ -24,8 +24,8 @@ import java.io.File;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.apache.commons.logging.Log; import org.slf4j.Logger;
import org.apache.commons.logging.LogFactory; import org.slf4j.LoggerFactory;
import com.raytheon.edex.plugin.grib.exception.GribException; import com.raytheon.edex.plugin.grib.exception.GribException;
import com.raytheon.uf.common.localization.IPathManager; import com.raytheon.uf.common.localization.IPathManager;
@ -47,6 +47,7 @@ import com.raytheon.uf.common.serialization.SingleTypeJAXBManager;
* Mar 09, 2010 4758 bphillip Initial Creation * Mar 09, 2010 4758 bphillip Initial Creation
* Oct 15, 2013 2473 bsteffen Remove deprecated method calls. * Oct 15, 2013 2473 bsteffen Remove deprecated method calls.
* Jul 21, 2014 3373 bclement JAXB manager API changes * Jul 21, 2014 3373 bclement JAXB manager API changes
* Dec 15, 2015 5166 kbisanz Update logging to use SLF4J
* *
* </pre> * </pre>
* *
@ -58,7 +59,7 @@ public class Grib1ParameterLookup {
+ "grib1ParameterConvTable.xml"; + "grib1ParameterConvTable.xml";
/** The logger */ /** The logger */
protected transient Log logger = LogFactory.getLog(getClass()); protected transient Logger logger = LoggerFactory.getLogger(getClass());
/** The singleton instance */ /** The singleton instance */
private static Grib1ParameterLookup instance; private static Grib1ParameterLookup instance;

7
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
View file

@ -25,8 +25,8 @@ import java.util.Set;
import javax.xml.bind.JAXB; import javax.xml.bind.JAXB;
import org.apache.commons.logging.Log; import org.slf4j.Logger;
import org.apache.commons.logging.LogFactory; import org.slf4j.LoggerFactory;
import com.raytheon.edex.plugin.grib.spatial.GribSpatialCache; import com.raytheon.edex.plugin.grib.spatial.GribSpatialCache;
import com.raytheon.uf.common.dataplugin.grid.mapping.DatasetIdMapper; import com.raytheon.uf.common.dataplugin.grid.mapping.DatasetIdMapper;
@ -58,6 +58,7 @@ import com.raytheon.uf.common.util.mapping.MultipleMappingException;
* Apr 25, 2014 2874 bsteffen Add processType * Apr 25, 2014 2874 bsteffen Add processType
* Jul 02, 2014 3230 rferrel Recursively get model files in initModelList. * Jul 02, 2014 3230 rferrel Recursively get model files in initModelList.
* Jul 30, 2014 3455 bsteffen Allow model matching with no grid defined. * Jul 30, 2014 3455 bsteffen Allow model matching with no grid defined.
* Dec 15, 2015 5166 kbisanz Update logging to use SLF4J
* *
* *
* </pre> * </pre>
@ -70,7 +71,7 @@ public class GribModelLookup {
.getHandler(GribModelLookup.class); .getHandler(GribModelLookup.class);
/** The logger */ /** The logger */
protected transient Log logger = LogFactory.getLog(getClass()); protected transient Logger logger = LoggerFactory.getLogger(getClass());
/** The singleton instance of GribModelLookup **/ /** The singleton instance of GribModelLookup **/
private static GribModelLookup instance; private static GribModelLookup instance;

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

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: Obs Plug-in Bundle-Name: Obs Plug-in
Bundle-SymbolicName: com.raytheon.edex.plugin.obs Bundle-SymbolicName: com.raytheon.edex.plugin.obs
Bundle-Version: 1.14.0.qualifier Bundle-Version: 1.15.0.qualifier
Bundle-Vendor: RAYTHEON Bundle-Vendor: RAYTHEON
Export-Package: com.raytheon.edex.plugin.obs, Export-Package: com.raytheon.edex.plugin.obs,
com.raytheon.edex.plugin.obs.metar, com.raytheon.edex.plugin.obs.metar,
@ -24,4 +24,4 @@ Import-Package: com.raytheon.uf.common.dataplugin.obs.metar,
com.raytheon.uf.common.dataplugin.obs.metar.util, com.raytheon.uf.common.dataplugin.obs.metar.util,
com.raytheon.uf.common.status, com.raytheon.uf.common.status,
com.raytheon.uf.common.wmo, com.raytheon.uf.common.wmo,
org.apache.commons.logging org.slf4j

7
edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/ObsDecoder.java
View file

@ -20,8 +20,8 @@
package com.raytheon.edex.plugin.obs; package com.raytheon.edex.plugin.obs;
import org.apache.commons.logging.Log; import org.slf4j.Logger;
import org.apache.commons.logging.LogFactory; import org.slf4j.LoggerFactory;
import com.raytheon.edex.esb.Headers; import com.raytheon.edex.esb.Headers;
import com.raytheon.edex.exception.DecoderException; import com.raytheon.edex.exception.DecoderException;
@ -56,6 +56,7 @@ import com.raytheon.uf.common.wmo.WMOHeader;
* Aug 30, 2013 2298 rjpeter Make getPluginName abstract * Aug 30, 2013 2298 rjpeter Make getPluginName abstract
* Oct 23, 2013 2361 njensen Removed dead mesowest code * Oct 23, 2013 2361 njensen Removed dead mesowest code
* May 14, 2014 2536 bclement moved WMO Header to common * May 14, 2014 2536 bclement moved WMO Header to common
* Dec 15, 2015 5166 kbisanz Update logging to use SLF4J
* </pre> * </pre>
* *
* @author bphillip * @author bphillip
@ -63,7 +64,7 @@ import com.raytheon.uf.common.wmo.WMOHeader;
*/ */
public class ObsDecoder extends AbstractDecoder { public class ObsDecoder extends AbstractDecoder {
/** The logger */ /** The logger */
private final Log logger = LogFactory.getLog(getClass()); private final Logger logger = LoggerFactory.getLogger(getClass());
private final IPerformanceStatusHandler perfLog = PerformanceStatus private final IPerformanceStatusHandler perfLog = PerformanceStatus
.getHandler("Obs:"); .getHandler("Obs:");

31
edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarSeparator.java
View file

@ -32,8 +32,8 @@ import java.util.NoSuchElementException;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.apache.commons.logging.Log; import org.slf4j.Logger;
import org.apache.commons.logging.LogFactory; import org.slf4j.LoggerFactory;
import com.raytheon.edex.esb.Headers; import com.raytheon.edex.esb.Headers;
import com.raytheon.edex.exception.DecoderException; import com.raytheon.edex.exception.DecoderException;
@ -53,12 +53,13 @@ import com.raytheon.uf.common.wmo.WMOHeader;
* *
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* July2006 3 &amp; 14 Phillippe Initial Creation * Jul ??, 2006 3 &amp; 14 Phillippe Initial Creation
* 14Nov2006 71 Rockwood Implemented filter for NIL observations * Nov 14, 2006 71 Rockwood Implemented filter for NIL observations
* 20080418 1093 jkorman Added filter for Alaskan &quot;Airways&quot; * Apr 14, 2008 1093 jkorman Added filter for Alaskan &quot;Airways&quot;
* observations. * observations.
* May 14, 2014 2536 bclement moved WMO Header to common, removed unused HEADERREGEX * May 14, 2014 2536 bclement moved WMO Header to common, removed unused HEADERREGEX
* Oct 02, 2014 3693 mapeters Changed pattern String constants to Pattern constants. * Oct 02, 2014 3693 mapeters Changed pattern String constants to Pattern constants.
* Dec 15, 2015 5166 kbisanz Update logging to use SLF4J
* </pre> * </pre>
* *
* @author bphillip * @author bphillip
@ -73,7 +74,7 @@ import com.raytheon.uf.common.wmo.WMOHeader;
*/ */
public class MetarSeparator extends AbstractRecordSeparator { public class MetarSeparator extends AbstractRecordSeparator {
private final Log theLogger = LogFactory.getLog(getClass()); private final Logger theLogger = LoggerFactory.getLogger(getClass());
/** Regex used for separating multi-record files */ /** Regex used for separating multi-record files */
private static final Pattern ICAODATEPAIR = Pattern private static final Pattern ICAODATEPAIR = Pattern
@ -112,6 +113,7 @@ public class MetarSeparator extends AbstractRecordSeparator {
/** /**
* Get the WMO Header found within this data. * Get the WMO Header found within this data.
*
* @return The message WMO Header. * @return The message WMO Header.
*/ */
public WMOHeader getWMOHeader() { public WMOHeader getWMOHeader() {
@ -171,16 +173,16 @@ public class MetarSeparator extends AbstractRecordSeparator {
try { try {
// Extracts the header // Extracts the header
WMOHeader wmoHeader = new WMOHeader(message.getBytes()); WMOHeader wmoHeader = new WMOHeader(message.getBytes());
if(wmoHeader.isValid()) { if (wmoHeader.isValid()) {
header = wmoHeader; header = wmoHeader;
} }
// Pattern pattern = Pattern.compile(HEADERREGEX); // Pattern pattern = Pattern.compile(HEADERREGEX);
// Matcher matcher = pattern.matcher(message); // Matcher matcher = pattern.matcher(message);
// //
// if (matcher.find()) { // if (matcher.find()) {
// header = matcher.group(); // header = matcher.group();
// } // }
// Determines the type // Determines the type
Matcher matcher = METARTYPE.matcher(message); Matcher matcher = METARTYPE.matcher(message);
@ -249,7 +251,8 @@ public class MetarSeparator extends AbstractRecordSeparator {
// Check for NIL observations and, if found, throw out // Check for NIL observations and, if found, throw out
matcher = NILREGEX.matcher(observation); matcher = NILREGEX.matcher(observation);
if (!matcher.find()) { if (!matcher.find()) {
String record = header.getWmoHeader() + "\n" + type + " " + observation; String record = header.getWmoHeader() + "\n" + type + " "
+ observation;
records.add(record); records.add(record);
} }
} }

1
edexOsgi/com.raytheon.edex.plugin.warning/META-INF/MANIFEST.MF
View file

@ -20,5 +20,4 @@ Require-Bundle: org.geotools,
Export-Package: com.raytheon.edex.plugin.warning.tools Export-Package: com.raytheon.edex.plugin.warning.tools
Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: com.raytheon.uf.common.time, Import-Package: com.raytheon.uf.common.time,
org.apache.commons.logging,
org.hibernate.annotations org.hibernate.annotations