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

Issue #2101 Subscription retrieval for WFS (MADIS) follow on of #1763, #2062 for 13.6.1

Browse source 
Change-Id: I4072d87c50e42b30f4e54dedbe25d4335a27874a

Former-commit-id: e48e4eeb69 [formerly e4a345b9c4ce48210297ab5af6f25031268eb18e]
Former-commit-id: 752f7106bc
This commit is contained in:
Dave Hladky 2013-06-03 16:09:24 -05:00
parent 8d7a800600
commit 608c43b64a
7 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
edexOsgi/build.edex/esb/conf/modes.xml
View file

@ -233,7 +233,6 @@
<include>pointdata-common.xml</include>
<include>obs-common.xml</include>
<include>madis-common.xml</include>
<include>madis-metadata.xml</include>
<include>level-common.xml</include>
<include>persist-ingest.xml</include>
<include>management-common.xml</include>

9
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval.wfs/META-INF/MANIFEST.MF
View file

@ -19,5 +19,10 @@ Require-Bundle: com.raytheon.uf.common.datadelivery.retrieval;bundle-version="1.
com.raytheon.uf.common.pointdata;bundle-version="1.12.1174",
com.raytheon.uf.common.geospatial;bundle-version="1.12.1174",
com.raytheon.uf.common.event;bundle-version="1.0.0",
com.raytheon.uf.edex.ogc.common;bundle-version="1.0.0"
Export-Package: com.raytheon.uf.edex.datadelivery.retrieval.wfs
com.raytheon.uf.edex.ogc.common;bundle-version="1.0.0",
com.raytheon.uf.common.dataplugin.madis;bundle-version="1.0.0",
com.raytheon.uf.edex.plugin.madis.ogc;bundle-version="1.0.0",
com.raytheon.uf.edex.plugin.madis;bundle-version="1.0.0",
com.raytheon.uf.edex.wfs;bundle-version="1.0.0"
Export-Package: com.raytheon.uf.edex.datadelivery.retrieval.wfs,
com.raytheon.uf.edex.datadelivery.retrieval.wfs.metadata

5
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval.wfs/res/spring/retrieval-datadelivery-wfs.xml
View file

@ -6,5 +6,10 @@
<constructor-arg value="WFS" />
<constructor-arg value="com.raytheon.uf.edex.datadelivery.retrieval.wfs.WfsServiceFactory" type="java.lang.Class" />
</bean>
<bean factory-bean="metadataAdapterRegistry" factory-method="register">
<constructor-arg value="com.raytheon.uf.common.dataplugin.madis.MadisRecord" />
<constructor-arg value="com.raytheon.uf.edex.datadelivery.retrieval.wfs.metadata.MadisMetadataAdapter" type="java.lang.Class" />
</bean>
</beans>

2
edexOsgi/com.raytheon.uf.edex.plugin.madis.ogc/src/com/raytheon/uf/edex/plugin/madis/ogc/metadata/MadisMetadataAdapter.java → edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval.wfs/src/com/raytheon/uf/edex/datadelivery/retrieval/wfs/metadata/MadisMetadataAdapter.java
View file

@ -1,4 +1,4 @@
package com.raytheon.uf.edex.plugin.madis.ogc.metadata;
package com.raytheon.uf.edex.datadelivery.retrieval.wfs.metadata;
import javax.xml.bind.JAXBException;

8
edexOsgi/com.raytheon.uf.edex.plugin.madis.ogc/META-INF/MANIFEST.MF
View file

@ -25,10 +25,6 @@ Require-Bundle: com.raytheon.uf.edex.ogc.common;bundle-version="1.0.0",
com.raytheon.uf.common.geospatial;bundle-version="1.12.1174",
com.raytheon.uf.common.pointdata;bundle-version="1.12.1174",
com.raytheon.uf.edex.wms;bundle-version="1.0.0",
com.raytheon.uf.common.time;bundle-version="1.12.1174",
com.raytheon.uf.edex.datadelivery.retrieval.wfs;bundle-version="1.0.0",
com.raytheon.uf.edex.datadelivery.retrieval;bundle-version="1.0.0",
com.raytheon.uf.common.datadelivery.retrieval;bundle-version="1.0.0"
com.raytheon.uf.common.time;bundle-version="1.12.1174"
Export-Package: com.raytheon.uf.edex.plugin.madis.ogc,
com.raytheon.uf.edex.plugin.madis.ogc.feature,
com.raytheon.uf.edex.plugin.madis.ogc.metadata
com.raytheon.uf.edex.plugin.madis.ogc.feature

9
edexOsgi/com.raytheon.uf.edex.plugin.madis.ogc/res/spring/madis-metadata.xml
View file

@ -1,9 +0,0 @@
<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">
<bean factory-bean="metadataAdapterRegistry" factory-method="register">
<constructor-arg value="com.raytheon.uf.common.dataplugin.madis.MadisRecord" />
<constructor-arg value="com.raytheon.uf.edex.plugin.madis.ogc.metadata.MadisMetadataAdapter" type="java.lang.Class" />
</bean>
</beans>

2
tests/manual/com/raytheon/uf/common/comm/HttpProxiedClientValidCredentialsTest.java
View file

@ -137,7 +137,7 @@ public class HttpProxiedClientValidCredentialsTest {
provider.setProviderType(types);
String url = HttpProxyTestConstants.HTTPS_URI
+ "?request=getfeature&typename=http://madis.edex.uf.raytheon.com:madis&srsName=crs:84&bbox=-96.0,41.0,-94.0,43.0&maxFeatures=1000";
+ "?request=getfeature&typename=http://madis.edex.uf.raytheon.com:madis&srsName=crs:84&bbox=-96.0,41.0,-94.0,43.0&maxFeatures=2000";
Connection conn1 = provider.getConnection();
HttpGet get = new HttpGet();
URI uri = new URI(url);