From fd9f98b2ba56a916e2fe93b31bc4d63c1b4507f3 Mon Sep 17 00:00:00 2001 From: Brian Clements Date: Thu, 22 May 2014 10:21:43 -0500 Subject: [PATCH] Omaha #3206 edex changes related to new javax.serlvet FOSS project Former-commit-id: f9de79465a622931b840099b209d91f4f1a8ce56 [formerly c042671ecf12a6fa46e35d4954d23492f35b7c76] Former-commit-id: c875f17719000ea8efbc32864f11c3ac535c083d --- cave/com.raytheon.uf.viz.cots.feature/feature.xml | 6 ++++++ .../com.raytheon.uf.edex.ogc.common/META-INF/MANIFEST.MF | 2 ++ .../META-INF/MANIFEST.MF | 2 ++ edexOsgi/com.raytheon.uf.edex.wfs/META-INF/MANIFEST.MF | 2 ++ javaUtilities/collaboration.dataserver.feature/feature.xml | 6 ++++++ javaUtilities/collaboration.dataserver/META-INF/MANIFEST.MF | 2 ++ 6 files changed, 20 insertions(+) diff --git a/cave/com.raytheon.uf.viz.cots.feature/feature.xml b/cave/com.raytheon.uf.viz.cots.feature/feature.xml index d6d8f43afd..e7f65f3422 100644 --- a/cave/com.raytheon.uf.viz.cots.feature/feature.xml +++ b/cave/com.raytheon.uf.viz.cots.feature/feature.xml @@ -75,4 +75,10 @@ install-size="0" version="0.0.0"/> + + diff --git a/edexOsgi/com.raytheon.uf.edex.ogc.common/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.ogc.common/META-INF/MANIFEST.MF index 5574836c33..6e8f451efd 100644 --- a/edexOsgi/com.raytheon.uf.edex.ogc.common/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.ogc.common/META-INF/MANIFEST.MF @@ -41,4 +41,6 @@ Export-Package: com.raytheon.uf.edex.ogc.common, com.raytheon.uf.edex.ogc.common.time, com.raytheon.uf.edex.ogc.common.util Import-Package: com.raytheon.uf.common.localization, + javax.servlet, + javax.servlet.http, org.apache.cxf.helpers diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/META-INF/MANIFEST.MF index 0457032e44..b719fbc74b 100644 --- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/META-INF/MANIFEST.MF @@ -51,3 +51,5 @@ Export-Package: com.raytheon.uf.edex.registry.ebxml.acp, com.raytheon.uf.edex.registry.ebxml.util.xpath, com.raytheon.uf.edex.registry.ebxml.web, com.raytheon.uf.edex.registry.events +Import-Package: javax.servlet, + javax.servlet.http diff --git a/edexOsgi/com.raytheon.uf.edex.wfs/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.wfs/META-INF/MANIFEST.MF index 2e9a146088..39d1159740 100644 --- a/edexOsgi/com.raytheon.uf.edex.wfs/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.wfs/META-INF/MANIFEST.MF @@ -39,3 +39,5 @@ Export-Package: com.raytheon.uf.edex.wfs, com.raytheon.uf.edex.wfs.v1_1_0, com.raytheon.uf.edex.wfs.v2_0_0, com.raytheon.uf.edex.wfs.wxxm +Import-Package: javax.servlet, + javax.servlet.http diff --git a/javaUtilities/collaboration.dataserver.feature/feature.xml b/javaUtilities/collaboration.dataserver.feature/feature.xml index b45683756b..9340606734 100644 --- a/javaUtilities/collaboration.dataserver.feature/feature.xml +++ b/javaUtilities/collaboration.dataserver.feature/feature.xml @@ -112,4 +112,10 @@ install-size="0" version="0.0.0"/> + + diff --git a/javaUtilities/collaboration.dataserver/META-INF/MANIFEST.MF b/javaUtilities/collaboration.dataserver/META-INF/MANIFEST.MF index 4ea5af2b0a..418c4e6cd0 100644 --- a/javaUtilities/collaboration.dataserver/META-INF/MANIFEST.MF +++ b/javaUtilities/collaboration.dataserver/META-INF/MANIFEST.MF @@ -13,3 +13,5 @@ Require-Bundle: org.eclipse.jetty, org.apache.commons.collections, org.slf4j, ch.qos.logback +Import-Package: javax.servlet, + javax.servlet.http