From cca8a29e2dbdd0e6ccfa5e5473d419471e6ff6d0 Mon Sep 17 00:00:00 2001 From: Dave Hladky Date: Mon, 3 Jun 2013 16:09:24 -0500 Subject: [PATCH] Issue #2101 Subscription retrieval for WFS (MADIS) follow on of #1763, #2062 for 13.6.1 Change-Id: I4072d87c50e42b30f4e54dedbe25d4335a27874a Former-commit-id: a4bf580fef342a9e765bf324d744b5d9e31d8789 [formerly d1cd0938a667aa2a13646783afd00d5a5a4d96da] [formerly e48e4eeb69c48fd02c4b218a48f505df4143cee0] [formerly a4bf580fef342a9e765bf324d744b5d9e31d8789 [formerly d1cd0938a667aa2a13646783afd00d5a5a4d96da] [formerly e48e4eeb69c48fd02c4b218a48f505df4143cee0] [formerly 752f7106bc4ea979e34be800989d4e2f156dcee7 [formerly e48e4eeb69c48fd02c4b218a48f505df4143cee0 [formerly e4a345b9c4ce48210297ab5af6f25031268eb18e]]]] Former-commit-id: 752f7106bc4ea979e34be800989d4e2f156dcee7 Former-commit-id: 2aa7d84313c356945b38436e47295603331bf915 [formerly 456db39e63d305b013e5828bce3652ef3eaa1e0f] [formerly 79c6ea13ea470ea7f499f58fd8dcfb39b4c0650f [formerly 608c43b64a0d4ea3bfb8a7b37f1e4a66d5829f13]] Former-commit-id: 95b15dab75d50950a9a2ef87f7655ab066dfcc2d [formerly 62a1b06b68bad4149b25534325d3138bc4d4aceb] Former-commit-id: 8babe7152c73a695c83d7e0c44d416e40dc58a73 --- edexOsgi/build.edex/esb/conf/modes.xml | 1 - .../META-INF/MANIFEST.MF | 9 +++++++-- .../res/spring/retrieval-datadelivery-wfs.xml | 5 +++++ .../retrieval/wfs}/metadata/MadisMetadataAdapter.java | 2 +- .../META-INF/MANIFEST.MF | 8 ++------ .../res/spring/madis-metadata.xml | 9 --------- .../comm/HttpProxiedClientValidCredentialsTest.java | 2 +- 7 files changed, 16 insertions(+), 20 deletions(-) rename edexOsgi/{com.raytheon.uf.edex.plugin.madis.ogc/src/com/raytheon/uf/edex/plugin/madis/ogc => com.raytheon.uf.edex.datadelivery.retrieval.wfs/src/com/raytheon/uf/edex/datadelivery/retrieval/wfs}/metadata/MadisMetadataAdapter.java (98%) delete mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.madis.ogc/res/spring/madis-metadata.xml diff --git a/edexOsgi/build.edex/esb/conf/modes.xml b/edexOsgi/build.edex/esb/conf/modes.xml index 27a69bf983..a1f6de4b17 100644 --- a/edexOsgi/build.edex/esb/conf/modes.xml +++ b/edexOsgi/build.edex/esb/conf/modes.xml @@ -233,7 +233,6 @@ pointdata-common.xml obs-common.xml madis-common.xml - madis-metadata.xml level-common.xml persist-ingest.xml management-common.xml diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval.wfs/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval.wfs/META-INF/MANIFEST.MF index b513ea2643..a29b611ac6 100644 --- a/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval.wfs/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval.wfs/META-INF/MANIFEST.MF @@ -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 diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval.wfs/res/spring/retrieval-datadelivery-wfs.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval.wfs/res/spring/retrieval-datadelivery-wfs.xml index 09ffec7ec9..2ec971135c 100644 --- a/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval.wfs/res/spring/retrieval-datadelivery-wfs.xml +++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval.wfs/res/spring/retrieval-datadelivery-wfs.xml @@ -6,5 +6,10 @@ + + + + + \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.madis.ogc/src/com/raytheon/uf/edex/plugin/madis/ogc/metadata/MadisMetadataAdapter.java b/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval.wfs/src/com/raytheon/uf/edex/datadelivery/retrieval/wfs/metadata/MadisMetadataAdapter.java similarity index 98% rename from edexOsgi/com.raytheon.uf.edex.plugin.madis.ogc/src/com/raytheon/uf/edex/plugin/madis/ogc/metadata/MadisMetadataAdapter.java rename to edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval.wfs/src/com/raytheon/uf/edex/datadelivery/retrieval/wfs/metadata/MadisMetadataAdapter.java index 725f02b994..703406356c 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.madis.ogc/src/com/raytheon/uf/edex/plugin/madis/ogc/metadata/MadisMetadataAdapter.java +++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval.wfs/src/com/raytheon/uf/edex/datadelivery/retrieval/wfs/metadata/MadisMetadataAdapter.java @@ -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; diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.madis.ogc/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.madis.ogc/META-INF/MANIFEST.MF index 204faa468b..e17fde3522 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.madis.ogc/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.madis.ogc/META-INF/MANIFEST.MF @@ -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 diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.madis.ogc/res/spring/madis-metadata.xml b/edexOsgi/com.raytheon.uf.edex.plugin.madis.ogc/res/spring/madis-metadata.xml deleted file mode 100644 index 5e6cfb6d09..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.madis.ogc/res/spring/madis-metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/tests/manual/com/raytheon/uf/common/comm/HttpProxiedClientValidCredentialsTest.java b/tests/manual/com/raytheon/uf/common/comm/HttpProxiedClientValidCredentialsTest.java index cbbc45f6e1..e46d837712 100644 --- a/tests/manual/com/raytheon/uf/common/comm/HttpProxiedClientValidCredentialsTest.java +++ b/tests/manual/com/raytheon/uf/common/comm/HttpProxiedClientValidCredentialsTest.java @@ -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);