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

Issue #2388 Multiple code jars in path, Nate's logger finds.

Browse source 
Former-commit-id: 3787da81a8 [formerly 8e5d3d9742] [formerly 3787da81a8 [formerly 8e5d3d9742] [formerly f184d2ba9c [formerly ad02f4640d747328257f9b7a3f2ca2300fcc7bba]]]
Former-commit-id: f184d2ba9c
Former-commit-id: 4360a23a07 [formerly 41ba230de0]
Former-commit-id: b98d037cdd
This commit is contained in:
Dave Hladky 2013-09-19 10:59:07 -05:00
parent 77a256f2ec
commit 5001c8f42e
7 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cots/org.geotools/.classpath
View file

@ -2,7 +2,6 @@
<classpath>
<classpathentry kind="lib" path="common-2.2.1.jar"/>
<classpathentry kind="lib" path="commons-beanutils-1.7.0.jar"/>
<classpathentry kind="lib" path="commons-codec-1.2.jar"/>
<classpathentry kind="lib" path="commons-collections-3.1.jar"/>
<classpathentry kind="lib" path="commons-dbcp-1.2.2.jar"/>
<classpathentry kind="lib" path="commons-jxpath-1.2.jar"/>

1
cots/org.geotools/META-INF/MANIFEST.MF
View file

@ -5,7 +5,6 @@ Bundle-SymbolicName: org.geotools
Bundle-Version: 2.6.4
Bundle-ClassPath: common-2.2.1.jar,
commons-beanutils-1.7.0.jar,
commons-codec-1.2.jar,
commons-collections-3.1.jar,
commons-dbcp-1.2.2.jar,
commons-jxpath-1.2.jar,

2
cots/org.geotools/build.properties
View file

@ -2,7 +2,6 @@ bin.includes = META-INF/,\
.,\
common-2.2.1.jar,\
commons-beanutils-1.7.0.jar,\
commons-codec-1.2.jar,\
commons-collections-3.1.jar,\
commons-dbcp-1.2.2.jar,\
commons-jxpath-1.2.jar,\
@ -35,7 +34,6 @@ bin.includes = META-INF/,\
jdom-1.0.jar,\
jts-1.10.jar,\
commons-beanutils-1.7.0.jar,\
commons-codec-1.2.jar,\
commons-collections-3.1.jar,\
commons-dbcp-1.2.2.jar,\
commons-jxpath-1.2.jar,\

BIN
cots/org.geotools/commons-codec-1.2.jar
View file

Binary file not shown.

3
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPRetrievalAdapter.java
View file

@ -54,6 +54,7 @@ import dods.dap.DataDDS;
* Jul 25, 2012 955 djohnson Make package-private.
* Feb 05, 2013 1580 mpduff EventBus refactor.
* Feb 12, 2013 1543 djohnson The payload can just be an arbitrary object, implementations can define an array if required.
* Spet 19, 2013 2388 dhladky Logging for failed requests.
*
* </pre>
*
@ -85,7 +86,7 @@ class OpenDAPRetrievalAdapter extends RetrievalAdapter {
DConnect connect = ConnectionUtil.getDConnect(request.getRequest());
data = connect.getData(null);
} catch (Exception e) {
statusHandler.handle(Priority.ERROR, e.getLocalizedMessage(), e);
statusHandler.handle(Priority.ERROR, "Request: "+request.getRequest()+" could not be fullfilled!", e.getMessage());
EventBus.publish(new RetrievalEvent(e.getMessage()));
}

6
edexOsgi/com.raytheon.uf.edex.datadelivery.service/META-INF/MANIFEST.MF
View file

@ -26,4 +26,8 @@ Require-Bundle: com.raytheon.uf.common.auth;bundle-version="1.12.1174",
org.springframework;bundle-version="2.5.6",
com.raytheon.uf.edex.datadelivery.retrieval;bundle-version="1.0.0",
com.raytheon.uf.edex.plugin.nwsauth;bundle-version="1.12.1174",
com.raytheon.uf.common.plugin.nwsauth;bundle-version="1.12.1174"
com.raytheon.uf.common.plugin.nwsauth;bundle-version="1.12.1174",
com.raytheon.uf.edex.pointdata;bundle-version="1.12.1174",
com.raytheon.uf.common.dataquery;bundle-version="1.0.0",
com.raytheon.uf.edex.database;bundle-version="1.0.0",
com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174"

6
edexOsgi/com.raytheon.uf.edex.plugin.madis.ogc/src/com/raytheon/uf/edex/plugin/madis/ogc/feature/Madis.java
View file

@ -55,6 +55,7 @@ import com.raytheon.uf.edex.ogc.common.feature.ObsLocation;
* Mar 27, 2013 1746 dhladky Initial creation
* Jun 03, 2013 1763 dhladky Altered QCD values map
* Aug 30, 2013 2298 rjpeter Make getPluginName abstract
* Sept 19,2013 2388 dhladky Fixed creation of geometry (location assignment)
* </pre>
*
* @author dhladky
@ -175,7 +176,7 @@ public class Madis extends AbstractFeatureType {
private static final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(Madis.class);
/**
* Converts a MADIS record to a MADIS feature
*
@ -743,8 +744,7 @@ public class Madis extends AbstractFeatureType {
obsLocation.getStationId());
sol.setElevation(obsLocation.getElevation());
List<Double> points = obsLocation.getLocation().getPos().getValue();
sol.setLongitude(points.get(0));
sol.setLatitude(points.get(1));
sol.assignLocation(points.get(1), points.get(0));
return sol;
}