diff --git a/RadarServer/com.raytheon.rcm.server/META-INF/MANIFEST.MF b/RadarServer/com.raytheon.rcm.server/META-INF/MANIFEST.MF index 16df3d324c..0523aa823a 100644 --- a/RadarServer/com.raytheon.rcm.server/META-INF/MANIFEST.MF +++ b/RadarServer/com.raytheon.rcm.server/META-INF/MANIFEST.MF @@ -13,10 +13,10 @@ Export-Package: com.raytheon.rcm.coll, com.raytheon.rcm.rpsmgr, com.raytheon.rcm.server Require-Bundle: com.raytheon.rcm.lib;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.0.4", org.springframework;bundle-version="2.5.6", org.itadaki.bzip2;bundle-version="0.9.1", org.quartz;bundle-version="1.8.6" Import-Package: com.raytheon.uf.common.util, + org.apache.commons.logging, org.apache.log4j, org.junit diff --git a/cave/com.raytheon.uf.viz.alertviz/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.alertviz/META-INF/MANIFEST.MF index a82e18fe2c..4f5ed9299a 100644 --- a/cave/com.raytheon.uf.viz.alertviz/META-INF/MANIFEST.MF +++ b/cave/com.raytheon.uf.viz.alertviz/META-INF/MANIFEST.MF @@ -16,7 +16,6 @@ Require-Bundle: org.eclipse.ui, com.raytheon.uf.common.message;bundle-version="1.11.11", com.raytheon.uf.common.alertviz, javax.jms;bundle-version="1.0.0", - org.apache.log4j, ch.qos.logback;bundle-version="1.0.13" Bundle-ClassPath: ., lib/derbyrun.jar, @@ -27,7 +26,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: com.raytheon.uf.common.python, com.raytheon.uf.common.time, com.raytheon.uf.viz.python.swt, - com.raytheon.uf.viz.python.swt.widgets + com.raytheon.uf.viz.python.swt.widgets, + org.apache.log4j Bundle-ActivationPolicy: lazy Eclipse-BuddyPolicy: ext, registered, global Eclipse-RegisterBuddy: ch.qos.logback, org.apache.log4j diff --git a/cave/com.raytheon.uf.viz.base.feature/feature.xml b/cave/com.raytheon.uf.viz.base.feature/feature.xml index 8d726ff05c..7d56933047 100644 --- a/cave/com.raytheon.uf.viz.base.feature/feature.xml +++ b/cave/com.raytheon.uf.viz.base.feature/feature.xml @@ -254,10 +254,4 @@ version="0.0.0" unpack="false"/> - - diff --git a/cave/com.raytheon.uf.viz.datadelivery/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.datadelivery/META-INF/MANIFEST.MF index 2390899732..42448bd11e 100644 --- a/cave/com.raytheon.uf.viz.datadelivery/META-INF/MANIFEST.MF +++ b/cave/com.raytheon.uf.viz.datadelivery/META-INF/MANIFEST.MF @@ -22,7 +22,6 @@ Require-Bundle: org.eclipse.ui, com.raytheon.uf.common.auth;bundle-version="1.12.1174", com.raytheon.uf.common.datadelivery.event;bundle-version="1.0.0", com.raytheon.uf.common.serialization.comm, - org.junit, org.apache.commons.lang;bundle-version="2.3.0", com.google.guava;bundle-version="1.0.0", com.raytheon.uf.common.registry.ebxml;bundle-version="1.0.0", diff --git a/cave/com.raytheon.uf.viz.event/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.event/META-INF/MANIFEST.MF index 130aa04e36..8637248d71 100644 --- a/cave/com.raytheon.uf.viz.event/META-INF/MANIFEST.MF +++ b/cave/com.raytheon.uf.viz.event/META-INF/MANIFEST.MF @@ -9,8 +9,7 @@ Require-Bundle: org.eclipse.core.runtime, com.raytheon.uf.common.event;bundle-version="1.0.0", com.raytheon.uf.common.serialization.comm;bundle-version="1.12.1174", com.raytheon.uf.common.status;bundle-version="1.12.1174", - org.eclipse.ui;bundle-version="3.6.1", - org.apache.log4j;bundle-version="1.0.0" + org.eclipse.ui;bundle-version="3.6.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Eclipse-BuddyPolicy: ext, registered, global diff --git a/cave/com.raytheon.uf.viz.feature.alertviz/feature.xml b/cave/com.raytheon.uf.viz.feature.alertviz/feature.xml index 06847f03f2..e74e833efa 100644 --- a/cave/com.raytheon.uf.viz.feature.alertviz/feature.xml +++ b/cave/com.raytheon.uf.viz.feature.alertviz/feature.xml @@ -123,12 +123,6 @@ install-size="0" version="0.0.0"/> - - diff --git a/cave/com.raytheon.viz.texteditor/META-INF/MANIFEST.MF b/cave/com.raytheon.viz.texteditor/META-INF/MANIFEST.MF index f986d342aa..cc7b2e89e6 100644 --- a/cave/com.raytheon.viz.texteditor/META-INF/MANIFEST.MF +++ b/cave/com.raytheon.viz.texteditor/META-INF/MANIFEST.MF @@ -23,7 +23,6 @@ Require-Bundle: org.eclipse.ui, com.raytheon.uf.common.dataplugin.text;bundle-version="1.11.30", com.raytheon.uf.common.site;bundle-version="1.0.0", com.raytheon.uf.common.dataplugin.radar;bundle-version="1.0.0", - org.apache.commons.logging, com.raytheon.uf.viz.localization, com.raytheon.uf.common.auth;bundle-version="1.12.1174" Bundle-ActivationPolicy: lazy diff --git a/cave/ohd.hseb.common/META-INF/MANIFEST.MF b/cave/ohd.hseb.common/META-INF/MANIFEST.MF index 0498cf6569..c21309aa06 100644 --- a/cave/ohd.hseb.common/META-INF/MANIFEST.MF +++ b/cave/ohd.hseb.common/META-INF/MANIFEST.MF @@ -234,9 +234,7 @@ Export-Package: ChartDirector, ucar.util.prefs.ui Bundle-ActivationPolicy: lazy Require-Bundle: ohd.hseb.ihfsdb, - org.junit, - org.postgres, - org.apache.log4j + org.postgres Bundle-ClassPath: externaljars/bsf.jar, externaljars/bsh-2.0b4.jar, externaljars/ChartDirector.jar, diff --git a/cots/com.google.guava/META-INF/MANIFEST.MF b/cots/com.google.guava/META-INF/MANIFEST.MF index 09f2a2cc1a..4b29aab88e 100644 --- a/cots/com.google.guava/META-INF/MANIFEST.MF +++ b/cots/com.google.guava/META-INF/MANIFEST.MF @@ -4,7 +4,6 @@ Bundle-Name: Google Common (Guava) Bundle-SymbolicName: com.google.guava Bundle-Version: 1.0.0.qualifier Bundle-Vendor: GOOGLE -Require-Bundle: org.eclipse.core.runtime Bundle-ActivationPolicy: lazy Bundle-ClassPath: guava-11.0.2.jar Export-Package: diff --git a/cots/edu.uci.ics.crawler4j/META-INF/MANIFEST.MF b/cots/edu.uci.ics.crawler4j/META-INF/MANIFEST.MF index bc7df99797..96d647b13e 100644 --- a/cots/edu.uci.ics.crawler4j/META-INF/MANIFEST.MF +++ b/cots/edu.uci.ics.crawler4j/META-INF/MANIFEST.MF @@ -16,12 +16,8 @@ Bundle-ClassPath: apache-mime4j-core-0.7.jar, tika-core-1.0.jar, tika-parsers-1.0.jar, . -Require-Bundle: org.eclipse.core.runtime, - org.apache.log4j, - org.apache.commons.codec;bundle-version="1.4.0", - org.apache.commons.httpclient;bundle-version="3.1.0", - org.apache.http;bundle-version="4.1.2", - org.apache.commons.logging;bundle-version="1.1.2" +Require-Bundle: org.apache.commons.codec;bundle-version="1.4.0", + org.apache.http;bundle-version="4.1.2" Export-Package: com.drew.imaging, com.drew.imaging.jpeg, com.drew.imaging.tiff, @@ -176,3 +172,4 @@ Export-Package: com.drew.imaging, org.cyberneko.html, org.objectweb.asm, org.objectweb.asm.signature +Import-Package: org.apache.log4j diff --git a/cots/javax.jms/META-INF/MANIFEST.MF b/cots/javax.jms/META-INF/MANIFEST.MF index feacbfd370..2798453b71 100644 --- a/cots/javax.jms/META-INF/MANIFEST.MF +++ b/cots/javax.jms/META-INF/MANIFEST.MF @@ -3,9 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: Jms Bundle-SymbolicName: javax.jms Bundle-Version: 1.0.0.qualifier -Bundle-Activator: javax.jms.Activator -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ClassPath: geronimo-jms_1.1_spec-1.1.1.jar, . diff --git a/cots/net.dods/META-INF/MANIFEST.MF b/cots/net.dods/META-INF/MANIFEST.MF index d547964b9c..6c1e3ff18a 100644 --- a/cots/net.dods/META-INF/MANIFEST.MF +++ b/cots/net.dods/META-INF/MANIFEST.MF @@ -5,9 +5,7 @@ Bundle-SymbolicName: net.dods Bundle-Version: 1.1.7.qualifier Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - javax.servlet;bundle-version="2.5.0", - org.apache.http;bundle-version="4.1.2", - org.junit + org.apache.http;bundle-version="4.1.2" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ClassPath: gnu-getopt-1.0.6.jar, @@ -28,5 +26,7 @@ Export-Package: dods.dap, dods.util.geturl, dods.util.geturl.gui, dods.util.gui -Import-Package: org.apache.http.conn.params, +Import-Package: javax.servlet, + javax.servlet.http, + org.apache.http.conn.params, org.apache.http.conn.scheme diff --git a/cots/org.apache.activemq/META-INF/MANIFEST.MF b/cots/org.apache.activemq/META-INF/MANIFEST.MF index 4ce092bdb4..e7294c5dce 100644 --- a/cots/org.apache.activemq/META-INF/MANIFEST.MF +++ b/cots/org.apache.activemq/META-INF/MANIFEST.MF @@ -114,6 +114,6 @@ Export-Package: javax.transaction, org.apache.activemq.xbean, org.jencks.amqpool Require-Bundle: org.springframework;bundle-version="2.5.6", - javax.jms;bundle-version="1.0.0";resolution:=optional, - org.apache.commons.logging, + javax.jms;bundle-version="1.0.0";resolution:=optional +Import-Package: org.apache.commons.logging, org.apache.log4j diff --git a/cots/org.apache.commons.logging/META-INF/MANIFEST.MF b/cots/org.apache.commons.logging/META-INF/MANIFEST.MF index e351dfec8e..4a7b2292e2 100644 --- a/cots/org.apache.commons.logging/META-INF/MANIFEST.MF +++ b/cots/org.apache.commons.logging/META-INF/MANIFEST.MF @@ -8,4 +8,3 @@ Bundle-Vendor: Raytheon-bundled OSS Export-Package: org.apache.commons.logging, org.apache.commons.logging.impl Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.apache.log4j diff --git a/cots/org.apache.ws.security/META-INF/MANIFEST.MF b/cots/org.apache.ws.security/META-INF/MANIFEST.MF index 127ebcf007..ac5c99f673 100644 --- a/cots/org.apache.ws.security/META-INF/MANIFEST.MF +++ b/cots/org.apache.ws.security/META-INF/MANIFEST.MF @@ -3,12 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Security Bundle-SymbolicName: org.apache.ws.security Bundle-Version: 1.0.0.qualifier -Bundle-Activator: org.apache.ws.security.Activator -Require-Bundle: org.eclipse.core.runtime, - org.apache.commons.logging;bundle-version="1.1.1", - org.junit;bundle-version="1.0.0", - org.apache.log4j;bundle-version="1.0.0", - org.slf4j;bundle-version="1.6.1" +Require-Bundle: org.slf4j;bundle-version="1.6.1" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ClassPath: bcprov-jdk15-1.46.jar, diff --git a/edexOsgi/com.raytheon.edex.autobldsrv/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.autobldsrv/META-INF/MANIFEST.MF index d030a55ed9..5cd1208449 100644 --- a/edexOsgi/com.raytheon.edex.autobldsrv/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.edex.autobldsrv/META-INF/MANIFEST.MF @@ -4,15 +4,17 @@ Bundle-Name: Autobldsrv Plug-in Bundle-SymbolicName: com.raytheon.edex.autobldsrv Bundle-Version: 1.12.1174.qualifier Bundle-Vendor: RAYTHEON -Require-Bundle: com.raytheon.edex.common, - org.apache.commons.configuration, - com.raytheon.edex.uengine, - org.apache.commons.logging, - javax.persistence, - com.raytheon.uf.common.status, - com.raytheon.uf.edex.core, - com.raytheon.uf.edex.database, - org.quartz;bundle-version="1.8.6" Export-Package: com.raytheon.edex.services Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Import-Package: com.raytheon.uf.common.message +Import-Package: com.raytheon.edex.uengine.runners, + com.raytheon.edex.util, + org.apache.commons.logging +Require-Bundle: com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174", + com.raytheon.uf.common.serialization;bundle-version="1.12.1174", + com.raytheon.uf.common.message;bundle-version="1.12.1174", + com.raytheon.uf.common.util;bundle-version="1.12.1174", + com.raytheon.uf.edex.core;bundle-version="1.12.1174", + com.raytheon.uf.common.status;bundle-version="1.12.1174", + com.raytheon.uf.edex.database;bundle-version="1.0.0", + com.raytheon.uf.common.dataquery;bundle-version="1.0.0", + org.quartz;bundle-version="1.8.6" diff --git a/edexOsgi/com.raytheon.edex.autobldsrv/component-deploy.xml b/edexOsgi/com.raytheon.edex.autobldsrv/component-deploy.xml deleted file mode 100644 index 2d15df1140..0000000000 --- a/edexOsgi/com.raytheon.edex.autobldsrv/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.common/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.common/META-INF/MANIFEST.MF index d9dfe652d4..6af9a9984f 100644 --- a/edexOsgi/com.raytheon.edex.common/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.edex.common/META-INF/MANIFEST.MF @@ -30,7 +30,6 @@ Require-Bundle: net.sf.ehcache, org.apache.velocity;bundle-version="1.6.0", org.geotools, org.jep, - org.junit, org.apache.commons.beanutils, org.apache.commons.lang, javax.measure, @@ -58,3 +57,7 @@ Require-Bundle: net.sf.ehcache, com.raytheon.uf.edex.core;visibility:=reexport, org.slf4j;bundle-version="1.7.5" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Import-Package: junit.framework, + org.hamcrest, + org.jmock.api, + org.junit diff --git a/edexOsgi/com.raytheon.edex.monitorsrv/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.monitorsrv/META-INF/MANIFEST.MF index c1f96e921c..e99033801c 100644 --- a/edexOsgi/com.raytheon.edex.monitorsrv/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.edex.monitorsrv/META-INF/MANIFEST.MF @@ -4,11 +4,12 @@ Bundle-Name: Monitorsrv Plug-in Bundle-SymbolicName: com.raytheon.edex.monitorsrv Bundle-Version: 1.12.1174.qualifier Bundle-Vendor: RAYTHEON -Require-Bundle: com.raytheon.edex.common, - org.apache.commons.logging, - org.apache.log4j;bundle-version="1.0.0" Export-Package: com.raytheon.edex.monitors, com.raytheon.edex.services Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Import-Package: com.raytheon.uf.edex.core, - com.raytheon.uf.edex.database.dao +Import-Package: com.raytheon.edex.util, + org.apache.commons.logging, + org.apache.log4j +Require-Bundle: com.raytheon.uf.edex.core;bundle-version="1.12.1174", + com.raytheon.uf.edex.database;bundle-version="1.0.0", + com.raytheon.uf.common.util;bundle-version="1.12.1174" diff --git a/edexOsgi/com.raytheon.edex.monitorsrv/component-deploy.xml b/edexOsgi/com.raytheon.edex.monitorsrv/component-deploy.xml deleted file mode 100644 index 3d3d090baf..0000000000 --- a/edexOsgi/com.raytheon.edex.monitorsrv/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.notifysrv/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.notifysrv/META-INF/MANIFEST.MF index f13e3c234c..70a3c2a380 100644 --- a/edexOsgi/com.raytheon.edex.notifysrv/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.edex.notifysrv/META-INF/MANIFEST.MF @@ -4,9 +4,11 @@ Bundle-Name: Notifysrv Plug-in Bundle-SymbolicName: com.raytheon.edex.notifysrv Bundle-Version: 1.12.1174.qualifier Bundle-Vendor: RAYTHEON -Require-Bundle: com.raytheon.edex.common, - org.apache.commons.configuration, - org.apache.commons.logging Export-Package: com.raytheon.edex.services Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Import-Package: com.raytheon.uf.edex.core +Require-Bundle: com.raytheon.uf.edex.core;bundle-version="1.12.1174", + com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174", + org.apache.commons.configuration;bundle-version="1.6.0" +Import-Package: com.raytheon.edex.subscription, + com.raytheon.edex.util, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.edex.notifysrv/component-deploy.xml b/edexOsgi/com.raytheon.edex.notifysrv/component-deploy.xml deleted file mode 100644 index f666a2c495..0000000000 --- a/edexOsgi/com.raytheon.edex.notifysrv/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.plugin.airep/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.airep/META-INF/MANIFEST.MF index 901796405c..cd72d13cde 100644 --- a/edexOsgi/com.raytheon.edex.plugin.airep/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.edex.plugin.airep/META-INF/MANIFEST.MF @@ -3,19 +3,22 @@ Bundle-ManifestVersion: 2 Bundle-Name: Airep Plug-in Bundle-SymbolicName: com.raytheon.edex.plugin.airep Bundle-Version: 1.12.1174.qualifier -Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization Bundle-Vendor: RAYTHEON -Require-Bundle: org.apache.commons.logging, - com.raytheon.edex.common, - com.raytheon.uf.common.pointdata, - com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", - javax.measure, - org.geotools, - javax.persistence, - org.apache.camel;bundle-version="1.0.0";resolution:=optional, - org.junit;bundle-version="1.0.0" Export-Package: com.raytheon.edex.plugin.airep, com.raytheon.edex.plugin.airep.dao, com.raytheon.edex.plugin.airep.decoder Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Import-Package: com.raytheon.uf.common.dataplugin.airep +Import-Package: com.raytheon.edex.db.dao, + com.raytheon.edex.esb, + com.raytheon.edex.exception, + com.raytheon.edex.plugin, + org.apache.commons.logging, + org.junit +Require-Bundle: com.raytheon.uf.common.dataplugin.airep;bundle-version="1.0.0", + com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174", + com.raytheon.uf.common.datastorage;bundle-version="1.12.1174", + com.raytheon.uf.common.geospatial;bundle-version="1.12.1174", + com.raytheon.uf.common.pointdata;bundle-version="1.12.1174", + com.raytheon.uf.edex.database;bundle-version="1.0.0", + com.raytheon.uf.edex.core;bundle-version="1.12.1174", + com.raytheon.uf.edex.decodertools;bundle-version="1.12.1174" diff --git a/edexOsgi/com.raytheon.edex.plugin.airep/component-deploy.xml b/edexOsgi/com.raytheon.edex.plugin.airep/component-deploy.xml deleted file mode 100644 index 27bfa6aaca..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.airep/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.plugin.binlightning/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.binlightning/META-INF/MANIFEST.MF index 799dd83d43..5e8d93af13 100644 --- a/edexOsgi/com.raytheon.edex.plugin.binlightning/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.edex.plugin.binlightning/META-INF/MANIFEST.MF @@ -3,12 +3,16 @@ Bundle-ManifestVersion: 2 Bundle-Name: Binlightning Plug-in Bundle-SymbolicName: com.raytheon.edex.plugin.binlightning Bundle-Version: 1.12.1174.qualifier -Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization, com.raytheon.edex.common Bundle-Vendor: RAYTHEON -Require-Bundle: org.apache.commons.logging, - com.raytheon.edex.common, - com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", - javax.persistence, - com.raytheon.uf.common.dataplugin.binlightning;bundle-version="1.12.1174";visibility:=reexport Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: com.raytheon.edex.plugin.binlightning.dao +Import-Package: com.raytheon.edex.esb, + com.raytheon.edex.exception, + com.raytheon.edex.plugin, + org.apache.commons.logging +Require-Bundle: com.raytheon.uf.common.dataplugin.binlightning;bundle-version="1.12.1174", + com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174", + com.raytheon.uf.common.datastorage;bundle-version="1.12.1174", + com.raytheon.uf.edex.core;bundle-version="1.12.1174", + com.raytheon.uf.edex.database;bundle-version="1.0.0", + com.raytheon.uf.edex.decodertools;bundle-version="1.12.1174" diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrmos/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.bufrmos/META-INF/MANIFEST.MF index cfcdf25458..6f37159a96 100644 --- a/edexOsgi/com.raytheon.edex.plugin.bufrmos/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.edex.plugin.bufrmos/META-INF/MANIFEST.MF @@ -3,18 +3,20 @@ Bundle-ManifestVersion: 2 Bundle-Name: Bufrmos Plug-in Bundle-SymbolicName: com.raytheon.edex.plugin.bufrmos Bundle-Version: 1.12.1174.qualifier -Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization, com.raytheon.edex.common +Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization Bundle-Vendor: RAYTHEON -Require-Bundle: org.apache.commons.logging, - com.raytheon.edex.common, - com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", - javax.measure, - org.geotools, - javax.persistence, - com.raytheon.uf.edex.pointdata;bundle-version="1.0.0" Export-Package: com.raytheon.edex.plugin.bufrmos, com.raytheon.edex.plugin.bufrmos.common Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Import-Package: com.raytheon.uf.common.pointdata, - com.raytheon.uf.common.pointdata.spatial, - com.raytheon.uf.common.status +Require-Bundle: com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174", + com.raytheon.uf.common.datastorage;bundle-version="1.12.1174", + com.raytheon.uf.common.serialization;bundle-version="1.12.1174", + com.raytheon.uf.common.status;bundle-version="1.12.1174", + com.raytheon.uf.edex.core;bundle-version="1.12.1174", + com.raytheon.uf.edex.database;bundle-version="1.0.0", + com.raytheon.uf.edex.pointdata;bundle-version="1.12.1174", + com.raytheon.uf.edex.decodertools;bundle-version="1.12.1174" +Import-Package: com.raytheon.edex.esb, + com.raytheon.edex.exception, + com.raytheon.edex.plugin, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrmos/component-deploy.xml b/edexOsgi/com.raytheon.edex.plugin.bufrmos/component-deploy.xml deleted file mode 100644 index 3dfe59c20c..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.bufrmos/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrua/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.bufrua/META-INF/MANIFEST.MF index 0ccbb69f2e..bc344241c1 100644 --- a/edexOsgi/com.raytheon.edex.plugin.bufrua/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.edex.plugin.bufrua/META-INF/MANIFEST.MF @@ -3,20 +3,22 @@ Bundle-ManifestVersion: 2 Bundle-Name: Bufrua Plug-in Bundle-SymbolicName: com.raytheon.edex.plugin.bufrua Bundle-Version: 1.12.1174.qualifier -Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization, com.raytheon.edex.common Bundle-Vendor: RAYTHEON -Require-Bundle: com.raytheon.uf.common.dataplugin.bufrua;bundle-version="1.0.0", - com.raytheon.uf.edex.bufrtools;bundle-version="1.11.16", - org.apache.commons.logging, - com.raytheon.edex.common, - com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", - com.raytheon.uf.common.pointdata;bundle-version="1.11.8", - com.raytheon.uf.edex.pointdata;bundle-version="1.11.8", - javax.measure, - org.geotools, - javax.persistence, - com.raytheon.uf.edex.menus;bundle-version="1.0.0", - com.raytheon.uf.common.localization;bundle-version="1.12.1174" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: com.raytheon.edex.plugin.bufrua.dao -Import-Package: com.raytheon.uf.common.status +Require-Bundle: com.raytheon.uf.common.dataplugin.bufrua;bundle-version="1.12.1174", + com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174", + com.raytheon.uf.common.datastorage;bundle-version="1.12.1174", + com.raytheon.uf.common.serialization;bundle-version="1.12.1174", + com.raytheon.uf.common.geospatial;bundle-version="1.12.1174", + com.raytheon.uf.common.localization;bundle-version="1.12.1174", + com.raytheon.uf.common.status;bundle-version="1.12.1174", + com.raytheon.uf.edex.core;bundle-version="1.12.1174", + com.raytheon.uf.edex.database;bundle-version="1.0.0", + com.raytheon.uf.edex.pointdata;bundle-version="1.12.1174", + com.raytheon.uf.edex.menus;bundle-version="1.0.0", + com.raytheon.uf.edex.bufrtools;bundle-version="1.12.1174", + com.raytheon.uf.edex.decodertools;bundle-version="1.12.1174" +Import-Package: com.raytheon.edex.esb, + com.raytheon.edex.plugin, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.edex.plugin.ccfp/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.ccfp/META-INF/MANIFEST.MF index b0cf3f30c6..e585ff271d 100644 --- a/edexOsgi/com.raytheon.edex.plugin.ccfp/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.edex.plugin.ccfp/META-INF/MANIFEST.MF @@ -7,8 +7,8 @@ Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization, com.raytheon.edex.c Bundle-Vendor: RAYTHEON Require-Bundle: com.raytheon.edex.common, com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", - org.apache.commons.logging, org.geotools, javax.persistence Export-Package: com.raytheon.edex.plugin.ccfp Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Import-Package: org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.edex.plugin.ccfp/component-deploy.xml b/edexOsgi/com.raytheon.edex.plugin.ccfp/component-deploy.xml deleted file mode 100644 index c28755b7e7..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.ccfp/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF index d4b19ba75f..f756d64f4c 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF @@ -8,13 +8,11 @@ Bundle-ActivationPolicy: lazy Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization, com.raytheon.edex.common Bundle-Vendor: RAYTHEON Require-Bundle: com.raytheon.uf.common.dataplugin.gfe;bundle-version="1.12.1174", - org.apache.commons.logging, org.jep, javax.measure, com.raytheon.uf.common.localization, javax.persistence, com.raytheon.uf.common.serialization, - org.junit;bundle-version="1.0.0", com.raytheon.uf.edex.plugin.grid, com.raytheon.uf.common.topo;bundle-version="1.12.1174", com.raytheon.edex.common, @@ -69,5 +67,8 @@ Import-Package: com.raytheon.edex.db.dao, com.raytheon.uf.common.time.util, com.raytheon.uf.edex.activetable, com.raytheon.uf.edex.site, - org.hibernate + junit.framework, + org.apache.commons.logging, + org.hibernate, + org.junit Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/edexOsgi/com.raytheon.edex.plugin.goessounding/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.goessounding/META-INF/MANIFEST.MF index 339919bee3..5bee1409f1 100644 --- a/edexOsgi/com.raytheon.edex.plugin.goessounding/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.edex.plugin.goessounding/META-INF/MANIFEST.MF @@ -9,7 +9,6 @@ Require-Bundle: com.raytheon.edex.common, com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", javax.measure, org.geotools, - org.apache.commons.logging, javax.persistence, com.raytheon.uf.common.localization;bundle-version="1.11.16" Export-Package: com.raytheon.edex.plugin.goessounding, @@ -20,4 +19,5 @@ Import-Package: com.raytheon.uf.common.dataplugin.goessounding, com.raytheon.uf.common.pointdata, com.raytheon.uf.common.pointdata.spatial, com.raytheon.uf.common.status, - com.raytheon.uf.edex.pointdata + com.raytheon.uf.edex.pointdata, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.grib/META-INF/MANIFEST.MF index 6e3d2a62b7..42a8b0697d 100644 --- a/edexOsgi/com.raytheon.edex.plugin.grib/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.edex.plugin.grib/META-INF/MANIFEST.MF @@ -8,7 +8,6 @@ Bundle-Vendor: RAYTHEON Require-Bundle: javax.measure, javax.persistence, com.raytheon.edex.common, - org.apache.commons.logging, com.raytheon.edex.uengine, org.apache.commons.lang, org.apache.commons.configuration, @@ -32,7 +31,8 @@ Import-Package: com.raytheon.edex.exception, com.raytheon.uf.common.gridcoverage.subgrid, com.raytheon.uf.common.status, com.raytheon.uf.edex.plugin.grid.dao, - org.apache.camel + org.apache.camel, + org.apache.commons.logging Export-Package: com.raytheon.edex.objects.hibernate.grib, com.raytheon.edex.plugin.grib, com.raytheon.edex.plugin.grib.exception, diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/component-deploy.xml b/edexOsgi/com.raytheon.edex.plugin.grib/component-deploy.xml deleted file mode 100644 index d3bfcc2361..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.grib/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.plugin.ldad/component-deploy.xml b/edexOsgi/com.raytheon.edex.plugin.ldad/component-deploy.xml deleted file mode 100644 index 60dc79cf2d..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.ldad/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.plugin.ldadhydro/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.ldadhydro/META-INF/MANIFEST.MF index c8267ecdb3..d5c4b12283 100644 --- a/edexOsgi/com.raytheon.edex.plugin.ldadhydro/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.edex.plugin.ldadhydro/META-INF/MANIFEST.MF @@ -9,12 +9,11 @@ Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.13", javax.persistence;bundle-version="1.0.0", javax.measure;bundle-version="1.0.0", org.geotools;bundle-version="2.5.2", - org.apache.log4j;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.0.4", com.raytheon.uf.common.localization;bundle-version="1.11.13", com.raytheon.edex.plugin.ldad;bundle-version="1.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: com.raytheon.edex.plugin.ldadhydro.dao Import-Package: com.raytheon.uf.common.dataplugin.ldadhydro, com.raytheon.uf.common.status, - com.raytheon.uf.edex.pointdata + com.raytheon.uf.edex.pointdata, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.edex.plugin.ldadhydro/component-deploy.xml b/edexOsgi/com.raytheon.edex.plugin.ldadhydro/component-deploy.xml deleted file mode 100644 index 86f1c539ba..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.ldadhydro/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.plugin.ldadmanual/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.ldadmanual/META-INF/MANIFEST.MF index 39c0e552ed..13dabcb488 100644 --- a/edexOsgi/com.raytheon.edex.plugin.ldadmanual/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.edex.plugin.ldadmanual/META-INF/MANIFEST.MF @@ -9,9 +9,8 @@ Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.13", javax.persistence;bundle-version="1.0.0", javax.measure;bundle-version="1.0.0", org.geotools;bundle-version="2.5.2", - org.apache.log4j;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.0.4", com.raytheon.uf.common.localization;bundle-version="1.11.13", com.raytheon.edex.plugin.ldad;bundle-version="1.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: com.raytheon.edex.plugin.ldadmanual.dao +Import-Package: org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.edex.plugin.ldadmanual/component-deploy.xml b/edexOsgi/com.raytheon.edex.plugin.ldadmanual/component-deploy.xml deleted file mode 100644 index b27c4a99fe..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.ldadmanual/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/META-INF/MANIFEST.MF index 50220f5ca2..e312c208ae 100644 --- a/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/META-INF/MANIFEST.MF @@ -8,8 +8,6 @@ Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.13", javax.persistence;bundle-version="1.0.0", javax.measure;bundle-version="1.0.0", org.geotools;bundle-version="2.5.2", - org.apache.log4j;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.0.4", com.raytheon.uf.common.localization;bundle-version="1.11.13", com.raytheon.edex.plugin.ldad;bundle-version="1.0.0", com.raytheon.uf.common.pointdata;bundle-version="1.11.17", @@ -17,4 +15,5 @@ Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.13", Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: com.raytheon.edex.plugin.ldadprofiler.common, com.raytheon.edex.plugin.ldadprofiler.dao -Import-Package: com.raytheon.uf.common.status +Import-Package: com.raytheon.uf.common.status, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/component-deploy.xml b/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/component-deploy.xml deleted file mode 100644 index 7c2beb9217..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.plugin.obs/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.obs/META-INF/MANIFEST.MF index 7c388cd7e5..052b44a770 100644 --- a/edexOsgi/com.raytheon.edex.plugin.obs/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.edex.plugin.obs/META-INF/MANIFEST.MF @@ -13,7 +13,6 @@ Export-Package: com.raytheon.edex.plugin.obs, com.raytheon.edex.uengine.tasks.obs Require-Bundle: com.raytheon.edex.common, com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", - org.apache.commons.logging, javax.measure, org.geotools, com.raytheon.edex.uengine, @@ -24,4 +23,5 @@ Require-Bundle: com.raytheon.edex.common, Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: com.raytheon.uf.common.dataplugin.obs.metar, com.raytheon.uf.common.dataplugin.obs.metar.util, - com.raytheon.uf.common.status + com.raytheon.uf.common.status, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.edex.plugin.obs/component-deploy.xml b/edexOsgi/com.raytheon.edex.plugin.obs/component-deploy.xml deleted file mode 100644 index ee7b68542e..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.obs/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.plugin.pirep/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.pirep/META-INF/MANIFEST.MF index c9df579402..daceb408ca 100644 --- a/edexOsgi/com.raytheon.edex.plugin.pirep/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.edex.plugin.pirep/META-INF/MANIFEST.MF @@ -8,14 +8,14 @@ Bundle-Vendor: RAYTHEON Require-Bundle: com.raytheon.edex.common, com.raytheon.uf.edex.pointdata, com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", - org.apache.commons.logging, org.geotools, javax.measure, javax.persistence, - org.apache.camel;bundle-version="1.0.0";resolution:=optional, - org.junit;bundle-version="1.0.0" + org.apache.camel;bundle-version="1.0.0";resolution:=optional Export-Package: com.raytheon.edex.plugin.pirep, com.raytheon.edex.plugin.pirep.dao, com.raytheon.edex.plugin.pirep.decoder Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Import-Package: com.raytheon.uf.common.dataplugin.pirep +Import-Package: com.raytheon.uf.common.dataplugin.pirep, + org.apache.commons.logging, + org.junit diff --git a/edexOsgi/com.raytheon.edex.plugin.pirep/component-deploy.xml b/edexOsgi/com.raytheon.edex.plugin.pirep/component-deploy.xml deleted file mode 100644 index 6099b28bdd..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.pirep/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.plugin.poessounding/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.poessounding/META-INF/MANIFEST.MF index 388f442a13..0c26b29572 100644 --- a/edexOsgi/com.raytheon.edex.plugin.poessounding/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.edex.plugin.poessounding/META-INF/MANIFEST.MF @@ -10,7 +10,6 @@ Require-Bundle: com.raytheon.edex.common, com.raytheon.uf.common.localization, javax.measure, org.geotools, - org.apache.commons.logging, javax.persistence Export-Package: com.raytheon.edex.plugin.poessounding, com.raytheon.edex.plugin.poessounding.decoder @@ -20,4 +19,5 @@ Import-Package: com.raytheon.uf.common.dataplugin.poessounding, com.raytheon.uf.common.pointdata, com.raytheon.uf.common.pointdata.spatial, com.raytheon.uf.common.status, - com.raytheon.uf.edex.pointdata + com.raytheon.uf.edex.pointdata, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.edex.plugin.poessounding/component-deploy.xml b/edexOsgi/com.raytheon.edex.plugin.poessounding/component-deploy.xml deleted file mode 100644 index 7b8ec0c974..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.poessounding/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.plugin.profiler/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.profiler/META-INF/MANIFEST.MF index 791dd31589..bfe537357d 100644 --- a/edexOsgi/com.raytheon.edex.plugin.profiler/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.edex.plugin.profiler/META-INF/MANIFEST.MF @@ -10,10 +10,10 @@ Require-Bundle: com.raytheon.edex.common, com.raytheon.uf.common.pointdata;bundle-version="1.11.8", com.raytheon.uf.edex.pointdata;bundle-version="1.11.8", org.geotools, - org.apache.commons.logging, javax.persistence, javax.measure, com.raytheon.uf.common.localization;bundle-version="1.11.16" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: com.raytheon.uf.common.dataplugin.profiler, - com.raytheon.uf.common.dataplugin.profiler.dao + com.raytheon.uf.common.dataplugin.profiler.dao, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.edex.plugin.profiler/component-deploy.xml b/edexOsgi/com.raytheon.edex.plugin.profiler/component-deploy.xml deleted file mode 100644 index 1eb67ff307..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.profiler/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.plugin.recco/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.recco/META-INF/MANIFEST.MF index 314bd55721..f94b169a3f 100644 --- a/edexOsgi/com.raytheon.edex.plugin.recco/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.edex.plugin.recco/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: com.raytheon.edex.common, com.raytheon.uf.common.pointdata, javax.measure, org.geotools, - org.apache.commons.logging, javax.persistence, com.raytheon.uf.edex.decodertools;bundle-version="1.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Import-Package: org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.edex.plugin.recco/component-deploy.xml b/edexOsgi/com.raytheon.edex.plugin.recco/component-deploy.xml deleted file mode 100644 index a0d2f276c6..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.recco/component-deploy.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.plugin.redbook/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.redbook/META-INF/MANIFEST.MF index 0befa3fc39..0fb9b91fb7 100644 --- a/edexOsgi/com.raytheon.edex.plugin.redbook/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.edex.plugin.redbook/META-INF/MANIFEST.MF @@ -7,7 +7,6 @@ Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serializ Bundle-Vendor: RAYTHEON Require-Bundle: com.raytheon.edex.common, com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", - org.apache.commons.logging, javax.persistence, com.raytheon.uf.common.localization;bundle-version="1.12.1174", com.raytheon.uf.common.status;bundle-version="1.12.1174" @@ -16,3 +15,4 @@ Export-Package: com.raytheon.edex.plugin.redbook, com.raytheon.edex.plugin.redbook.common.blocks, com.raytheon.edex.plugin.redbook.decoder Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Import-Package: org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.edex.plugin.redbook/component-deploy.xml b/edexOsgi/com.raytheon.edex.plugin.redbook/component-deploy.xml deleted file mode 100644 index fa2973a9bc..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.redbook/component-deploy.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF index 8586d9adda..1b5d69be77 100644 --- a/edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF @@ -8,7 +8,6 @@ Bundle-Vendor: RAYTHEON Require-Bundle: com.raytheon.edex.common, com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", com.raytheon.uf.edex.pointdata, - org.apache.commons.logging, org.geotools, javax.measure, javax.persistence @@ -18,4 +17,5 @@ Import-Package: com.raytheon.uf.common.dataplugin.sfcobs, com.raytheon.uf.common.dataplugin.sfcobs.dao, com.raytheon.uf.common.pointdata, com.raytheon.uf.common.pointdata.spatial, - com.raytheon.uf.common.status + com.raytheon.uf.common.status, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.edex.plugin.sfcobs/component-deploy.xml b/edexOsgi/com.raytheon.edex.plugin.sfcobs/component-deploy.xml deleted file mode 100644 index 76ca90c9c7..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.sfcobs/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF index a1281b548f..44156641ea 100644 --- a/edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF @@ -16,12 +16,10 @@ Export-Package: com.raytheon.edex.plugin.shef, com.raytheon.edex.transform.shef.obs Require-Bundle: com.raytheon.edex.common, com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", - org.apache.commons.logging, com.raytheon.uf.common.localization, javax.persistence, org.apache.commons.cli;bundle-version="1.0.0", - com.raytheon.uf.common.dataplugin.shef;bundle-version="1.12.1174", - org.junit;bundle-version="1.0.0" + com.raytheon.uf.common.dataplugin.shef;bundle-version="1.12.1174" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: com.raytheon.edex.plugin.obs, com.raytheon.edex.plugin.obs.metar, @@ -31,5 +29,7 @@ Import-Package: com.raytheon.edex.plugin.obs, com.raytheon.uf.common.dataplugin.obs.metar.util, com.raytheon.uf.common.dataplugin.sfcobs, com.raytheon.uf.common.dataplugin.text.request, - com.raytheon.uf.common.ohd + com.raytheon.uf.common.ohd, + org.apache.commons.logging, + org.junit diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/component-deploy.xml b/edexOsgi/com.raytheon.edex.plugin.shef/component-deploy.xml deleted file mode 100644 index 93dfefecb5..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.shef/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.plugin.taf/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.taf/META-INF/MANIFEST.MF index 89b83b9071..3396615089 100644 --- a/edexOsgi/com.raytheon.edex.plugin.taf/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.edex.plugin.taf/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Export-Package: com.raytheon.edex.plugin.taf, Require-Bundle: com.raytheon.edex.common, com.raytheon.uf.edex.pointdata, com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", - org.apache.commons.logging, org.apache.commons.lang, javax.persistence Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Import-Package: org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.edex.plugin.taf/component-deploy.xml b/edexOsgi/com.raytheon.edex.plugin.taf/component-deploy.xml deleted file mode 100644 index f47f156632..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.taf/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF index a48d919f74..ada536a455 100644 --- a/edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF @@ -6,7 +6,6 @@ Bundle-Version: 1.12.1174.qualifier Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization Bundle-Vendor: RAYTHEON Require-Bundle: com.raytheon.edex.textdb, - org.apache.commons.logging, org.apache.commons.lang, com.raytheon.edex.common, javax.persistence, @@ -20,4 +19,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: com.raytheon.uf.common.dataplugin.text, com.raytheon.uf.common.dataplugin.text.db, com.raytheon.uf.common.dataplugin.text.request, - com.raytheon.uf.edex.maintenance.archive + com.raytheon.uf.edex.maintenance.archive, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.edex.plugin.text/component-deploy.xml b/edexOsgi/com.raytheon.edex.plugin.text/component-deploy.xml deleted file mode 100644 index 350c49da11..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.text/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.plugin.textlightning/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.textlightning/META-INF/MANIFEST.MF index 71e89cd9fa..79aa87f42e 100644 --- a/edexOsgi/com.raytheon.edex.plugin.textlightning/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.edex.plugin.textlightning/META-INF/MANIFEST.MF @@ -5,10 +5,10 @@ Bundle-SymbolicName: com.raytheon.edex.plugin.textlightning Bundle-Version: 1.12.1174.qualifier Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization, com.raytheon.edex.common Bundle-Vendor: RAYTHEON -Require-Bundle: org.apache.commons.logging, - com.raytheon.edex.common, +Require-Bundle: com.raytheon.edex.common, com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", javax.persistence Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: com.raytheon.uf.common.dataplugin.binlightning, - com.raytheon.uf.common.dataplugin.binlightning.impl + com.raytheon.uf.common.dataplugin.binlightning.impl, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.edex.plugin.warning/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.warning/META-INF/MANIFEST.MF index 47924a6729..101bc4e9bf 100644 --- a/edexOsgi/com.raytheon.edex.plugin.warning/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.edex.plugin.warning/META-INF/MANIFEST.MF @@ -5,8 +5,7 @@ Bundle-SymbolicName: com.raytheon.edex.plugin.warning Bundle-Version: 1.12.1174.qualifier Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization Bundle-Vendor: RAYTHEON -Require-Bundle: org.apache.commons.logging, - org.geotools, +Require-Bundle: org.geotools, javax.persistence, com.raytheon.edex.common, com.raytheon.uf.common.serialization, diff --git a/edexOsgi/com.raytheon.edex.plugin.warning/component-deploy.xml b/edexOsgi/com.raytheon.edex.plugin.warning/component-deploy.xml deleted file mode 100644 index 4c02a3a9f4..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.warning/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.productsrv/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.productsrv/META-INF/MANIFEST.MF index 15bd7b9fe4..b9f999de43 100644 --- a/edexOsgi/com.raytheon.edex.productsrv/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.edex.productsrv/META-INF/MANIFEST.MF @@ -6,7 +6,6 @@ Bundle-Version: 1.12.1174.qualifier Bundle-Vendor: RAYTHEON Require-Bundle: com.raytheon.edex.common, com.raytheon.edex.uengine, - org.apache.commons.logging, org.jep, com.raytheon.uf.common.localization Export-Package: com.raytheon.edex.services @@ -14,4 +13,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: com.raytheon.uf.common.message, com.raytheon.uf.common.message.response, com.raytheon.uf.common.python, - com.raytheon.uf.common.status + com.raytheon.uf.common.status, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.edex.productsrv/component-deploy.xml b/edexOsgi/com.raytheon.edex.productsrv/component-deploy.xml deleted file mode 100644 index 85fdb9b078..0000000000 --- a/edexOsgi/com.raytheon.edex.productsrv/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.textdb/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.textdb/META-INF/MANIFEST.MF index 78f38e2f78..8faab5a194 100644 --- a/edexOsgi/com.raytheon.edex.textdb/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.edex.textdb/META-INF/MANIFEST.MF @@ -7,7 +7,6 @@ Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serializ Bundle-Vendor: RAYTHEON Require-Bundle: com.raytheon.edex.common, com.raytheon.uf.common.localization, - org.apache.commons.logging, org.apache.commons.lang, com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", javax.persistence, @@ -20,4 +19,5 @@ Export-Package: com.raytheon.edex.textdb.alarms, com.raytheon.edex.textdb.fax Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: com.raytheon.uf.common.message, - com.raytheon.uf.common.serialization.comm + com.raytheon.uf.common.serialization.comm, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.edex.textdb/component-deploy.xml b/edexOsgi/com.raytheon.edex.textdb/component-deploy.xml deleted file mode 100644 index 88802f793d..0000000000 --- a/edexOsgi/com.raytheon.edex.textdb/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/edexOsgi/com.raytheon.edex.uengine/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.uengine/META-INF/MANIFEST.MF index 4ebb0b32ea..5642e36e7e 100644 --- a/edexOsgi/com.raytheon.edex.uengine/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.edex.uengine/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: Uengine Plug-in Bundle-SymbolicName: com.raytheon.edex.uengine Bundle-Version: 1.12.1174.qualifier -Bundle-Activator: com.raytheon.edex.uengine.Activator Bundle-Vendor: RAYTHEON Bundle-ActivationPolicy: lazy Export-Package: com.raytheon.edex.uengine, @@ -21,7 +20,8 @@ Import-Package: com.raytheon.edex.colormap, com.raytheon.edex.util, com.raytheon.edex.utility, javax.servlet, - javax.servlet.http + javax.servlet.http, + org.apache.commons.logging Require-Bundle: com.raytheon.uf.edex.core;bundle-version="1.12.1174", com.raytheon.uf.edex.database;bundle-version="1.0.0", com.raytheon.uf.common.dataquery;bundle-version="1.0.0", @@ -37,7 +37,6 @@ Require-Bundle: com.raytheon.uf.edex.core;bundle-version="1.12.1174", com.raytheon.uf.common.python;bundle-version="1.12.1174", com.raytheon.uf.common.util;bundle-version="1.12.1174", org.apache.commons.configuration;bundle-version="1.6.0", - org.apache.commons.logging;bundle-version="1.1.2", org.apache.commons.lang;bundle-version="2.3.0", org.apache.commons.pool;bundle-version="1.3.0", org.apache.activemq;bundle-version="5.2.0", diff --git a/edexOsgi/com.raytheon.uf.common.alertviz/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.alertviz/META-INF/MANIFEST.MF index 082e8f5174..765fabd616 100644 --- a/edexOsgi/com.raytheon.uf.common.alertviz/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.alertviz/META-INF/MANIFEST.MF @@ -4,8 +4,7 @@ Bundle-Name: Alertviz Bundle-SymbolicName: com.raytheon.uf.common.alertviz Bundle-Version: 1.0.0.qualifier Bundle-Vendor: RAYTHEON -Require-Bundle: org.eclipse.core.runtime, - com.raytheon.uf.common.serialization;bundle-version="1.12.1174", +Require-Bundle: com.raytheon.uf.common.serialization;bundle-version="1.12.1174", com.raytheon.uf.common.serialization.comm;bundle-version="1.12.1174" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: com.raytheon.uf.common.alertviz diff --git a/edexOsgi/com.raytheon.uf.common.datadelivery.registry/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.datadelivery.registry/META-INF/MANIFEST.MF index 9a73f1811e..2993b329c6 100644 --- a/edexOsgi/com.raytheon.uf.common.datadelivery.registry/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.datadelivery.registry/META-INF/MANIFEST.MF @@ -13,7 +13,6 @@ Require-Bundle: com.raytheon.uf.common.registry.schemas.ebxml;bundle-version="1. com.raytheon.uf.common.util;bundle-version="1.12.1174", com.raytheon.uf.common.localization;bundle-version="1.12.1174", org.geotools;bundle-version="2.6.4", - org.junit, com.raytheon.uf.common.comm;bundle-version="1.12.1174", org.apache.commons.lang;bundle-version="2.3.0", com.google.guava;bundle-version="1.0.0", diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/META-INF/MANIFEST.MF index c487d8fef5..1b6c8d7e78 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/META-INF/MANIFEST.MF @@ -10,7 +10,6 @@ Export-Package: com.raytheon.uf.common.dataplugin.binlightning, com.raytheon.uf.common.dataplugin.binlightning.impl Require-Bundle: com.raytheon.edex.common, org.geotools, - org.apache.commons.logging, javax.persistence, javax.measure Import-Package: com.raytheon.uf.common.dataplugin.binlightning, diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrascat/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrascat/META-INF/MANIFEST.MF index 496fec4875..6bcacba4a3 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrascat/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrascat/META-INF/MANIFEST.MF @@ -8,7 +8,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: com.raytheon.uf.common.dataplugin.bufrascat Require-Bundle: com.raytheon.edex.common, org.geotools, - org.apache.commons.logging, javax.persistence, javax.measure Import-Package: com.raytheon.uf.common.pointdata, diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrhdw/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrhdw/META-INF/MANIFEST.MF index 32cae7b9f0..647376a2bc 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrhdw/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrhdw/META-INF/MANIFEST.MF @@ -11,7 +11,6 @@ Require-Bundle: com.raytheon.edex.common, com.raytheon.uf.common.pointdata;bundle-version="1.11.8", com.raytheon.uf.edex.pointdata;bundle-version="1.11.8", org.geotools, - org.apache.commons.logging, javax.persistence, javax.measure Import-Package: com.raytheon.uf.common.status diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrmthdw/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrmthdw/META-INF/MANIFEST.MF index 1f01464584..c62589c344 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrmthdw/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrmthdw/META-INF/MANIFEST.MF @@ -11,7 +11,6 @@ Require-Bundle: com.raytheon.edex.common, com.raytheon.uf.common.pointdata;bundle-version="1.11.8", com.raytheon.uf.edex.pointdata;bundle-version="1.11.8", org.geotools, - org.apache.commons.logging, javax.persistence, javax.measure Import-Package: com.raytheon.uf.common.status diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/META-INF/MANIFEST.MF index 9d9e02ba0f..054d413a2c 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/META-INF/MANIFEST.MF @@ -10,7 +10,6 @@ Export-Package: com.raytheon.uf.common.dataplugin.ncwf, com.raytheon.uf.common.dataplugin.ncwf.dao Require-Bundle: com.raytheon.edex.common, org.geotools, - org.apache.commons.logging, javax.persistence, javax.measure Import-Package: com.raytheon.uf.common.pointdata, diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/META-INF/MANIFEST.MF index 5f6b51c2f3..b2e894377d 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/META-INF/MANIFEST.MF @@ -11,7 +11,6 @@ Require-Bundle: com.raytheon.edex.common, com.raytheon.uf.common.pointdata;bundle-version="1.11.8", com.raytheon.uf.edex.pointdata;bundle-version="1.11.8", org.geotools, - org.apache.commons.logging, javax.persistence, javax.measure Import-Package: com.raytheon.uf.common.status diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/META-INF/MANIFEST.MF index 63ad7a8fb8..efbcf35827 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/META-INF/MANIFEST.MF @@ -13,10 +13,10 @@ Require-Bundle: com.raytheon.edex.common, com.raytheon.uf.common.pointdata;bundle-version="1.11.8", com.raytheon.uf.edex.pointdata;bundle-version="1.11.8", org.geotools, - org.apache.commons.logging, javax.persistence, javax.measure Import-Package: com.raytheon.uf.common.pointdata, com.raytheon.uf.common.status, com.raytheon.uf.edex.decodertools.time, - com.raytheon.uf.edex.pointdata + com.raytheon.uf.edex.pointdata, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/component-deploy.xml deleted file mode 100644 index f88c3d736c..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/META-INF/MANIFEST.MF index dab2419f1e..dfa2741b8e 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/META-INF/MANIFEST.MF @@ -12,7 +12,6 @@ Require-Bundle: com.raytheon.edex.common, com.raytheon.uf.common.pointdata;bundle-version="1.11.8", com.raytheon.uf.edex.pointdata;bundle-version="1.11.8", org.geotools, - org.apache.commons.logging, javax.persistence, javax.measure Import-Package: com.raytheon.uf.common.dataplugin.bufrssmi, diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.cwa/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.cwa/META-INF/MANIFEST.MF index 3ff7bb1151..78351563ac 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.cwa/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.cwa/META-INF/MANIFEST.MF @@ -10,7 +10,6 @@ Require-Bundle: com.raytheon.edex.common, com.raytheon.uf.common.pointdata;bundle-version="1.11.16", com.raytheon.uf.edex.pointdata;bundle-version="1.11.16", org.geotools, - org.apache.commons.logging, javax.persistence,javax.measure Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.cwat/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.cwat/META-INF/MANIFEST.MF index c2b57e97dc..97bbb6ee47 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.cwat/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.cwat/META-INF/MANIFEST.MF @@ -7,7 +7,6 @@ Bundle-Vendor: RAYTHEON Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization, com.raytheon.uf.viz.core Require-Bundle: javax.persistence;bundle-version="1.0.0", com.raytheon.edex.common;bundle-version="1.11.1", - org.apache.commons.logging;bundle-version="1.0.4", org.geotools;bundle-version="2.5.2", com.raytheon.uf.common.monitor;bundle-version="1.11.5", com.raytheon.uf.common.dataplugin.radar;bundle-version="1.0.0" @@ -15,3 +14,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Export-Package: com.raytheon.uf.common.dataplugin.cwat, com.raytheon.uf.common.dataplugin.cwat.dao +Import-Package: org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.cwat/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.cwat/component-deploy.xml deleted file mode 100644 index 390258181d..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.cwat/component-deploy.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.fog/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.fog/META-INF/MANIFEST.MF index 13f763f99b..24ced4a1df 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.fog/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.fog/META-INF/MANIFEST.MF @@ -9,7 +9,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: com.raytheon.uf.common.dataplugin.fog, com.raytheon.uf.common.dataplugin.fog.dao, com.raytheon.uf.common.dataplugin.fog.analysis Require-Bundle: javax.persistence;bundle-version="1.0.0", com.raytheon.edex.common;bundle-version="1.11.1", - org.apache.commons.logging;bundle-version="1.0.4", org.geotools;bundle-version="2.5.2", com.raytheon.uf.common.monitor;bundle-version="1.11.5", com.raytheon.uf.common.localization;bundle-version="1.11.13", diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/META-INF/MANIFEST.MF index a26f7375d3..07bfa6dc2f 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/META-INF/MANIFEST.MF @@ -9,9 +9,7 @@ Bundle-Vendor: RAYTHEON Require-Bundle: org.geotools, javax.measure, javax.persistence, - org.apache.commons.logging, org.jep, - org.junit;bundle-version="1.0.0", org.springframework, com.raytheon.uf.common.serialization, org.hibernate, @@ -61,5 +59,7 @@ Import-Package: com.raytheon.edex.exception, com.raytheon.uf.common.serialization.comm, com.raytheon.uf.common.status, com.raytheon.uf.common.time, - com.raytheon.uf.common.util + com.raytheon.uf.common.util, + junit.framework, + org.junit Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/component-deploy.xml deleted file mode 100644 index 618600474d..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grib/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.grib/META-INF/MANIFEST.MF index 004ced58e9..df11fb85d6 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grib/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grib/META-INF/MANIFEST.MF @@ -8,9 +8,6 @@ Bundle-Vendor: Raytheon Require-Bundle: javax.measure, javax.persistence, org.apache.commons.lang, - org.apache.commons.logging, - org.eclipse.ui, - org.eclipse.core.runtime, org.geotools, com.raytheon.edex.common, com.raytheon.uf.common.dataplugin, diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grib/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grib/component-deploy.xml deleted file mode 100644 index 61468fde15..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grib/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.ldadhydro/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.ldadhydro/component-deploy.xml deleted file mode 100644 index c723992390..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.ldadhydro/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.ldadmesonet/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.ldadmesonet/META-INF/MANIFEST.MF index 53396c6a51..b820892007 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.ldadmesonet/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.ldadmesonet/META-INF/MANIFEST.MF @@ -9,13 +9,13 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: com.raytheon.edex.common, com.raytheon.uf.common.pointdata;bundle-version="1.11.16", com.raytheon.uf.edex.pointdata;bundle-version="1.11.16", - org.apache.commons.logging, javax.persistence, javax.measure, com.raytheon.uf.common.dataplugin Import-Package: com.raytheon.uf.common.status, com.raytheon.uf.edex.decodertools.core, com.raytheon.uf.edex.decodertools.time, - com.vividsolutions.jts.geom + com.vividsolutions.jts.geom, + org.apache.commons.logging Export-Package: com.raytheon.uf.common.dataplugin.ldadmesonet, com.raytheon.uf.common.dataplugin.ldadmesonet.dao diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.ldadmesonet/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.ldadmesonet/component-deploy.xml deleted file mode 100644 index cf4ddfa34e..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.ldadmesonet/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.lsr/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.lsr/META-INF/MANIFEST.MF index d6951eb457..42efd5b99e 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.lsr/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.lsr/META-INF/MANIFEST.MF @@ -10,7 +10,6 @@ Require-Bundle: com.raytheon.edex.common, com.raytheon.uf.common.pointdata;bundle-version="1.11.16", com.raytheon.uf.edex.pointdata;bundle-version="1.11.16", org.geotools, - org.apache.commons.logging, javax.persistence, javax.measure Import-Package: com.raytheon.uf.common.status, diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.obs/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.obs/component-deploy.xml deleted file mode 100644 index 063193419b..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.obs/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/META-INF/MANIFEST.MF index 074a4593d8..d5eceea58f 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/META-INF/MANIFEST.MF @@ -9,11 +9,11 @@ Bundle-ActivationPolicy: lazy Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization, com.raytheon.uf.viz.core Require-Bundle: javax.persistence;bundle-version="1.0.0", com.raytheon.edex.common;bundle-version="1.11.1", - org.apache.commons.logging;bundle-version="1.0.4", org.geotools;bundle-version="2.5.2", com.raytheon.uf.common.monitor;bundle-version="1.11.5", com.raytheon.uf.common.dataplugin.radar;bundle-version="1.0.0", javax.measure;bundle-version="1.0.0" Export-Package: com.raytheon.uf.common.dataplugin.preciprate, com.raytheon.uf.common.dataplugin.preciprate.dao -Import-Package: com.raytheon.uf.common.status +Import-Package: com.raytheon.uf.common.status, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/component-deploy.xml deleted file mode 100644 index 2fd7b34ae5..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/component-deploy.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.qpf/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.qpf/META-INF/MANIFEST.MF index 9a43df454f..a45017ee3f 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.qpf/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.qpf/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Export-Package: com.raytheon.uf.common.dataplugin.qpf, com.raytheon.uf.common.dataplugin.qpf.dao Require-Bundle: javax.persistence;bundle-version="1.0.0", com.raytheon.edex.common;bundle-version="1.11.1", - org.apache.commons.logging;bundle-version="1.0.4", org.geotools;bundle-version="2.5.2", com.raytheon.uf.common.monitor;bundle-version="1.11.5", com.raytheon.uf.common.dataplugin.radar;bundle-version="1.0.0" +Import-Package: org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.qpf/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.qpf/component-deploy.xml deleted file mode 100644 index a23a69db85..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.qpf/component-deploy.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.scan/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.scan/META-INF/MANIFEST.MF index 158288bf4f..0b02e76ef3 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.scan/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.scan/META-INF/MANIFEST.MF @@ -11,11 +11,11 @@ Export-Package: com.raytheon.uf.common.dataplugin.scan, com.raytheon.uf.common.dataplugin.scan.data Require-Bundle: javax.persistence;bundle-version="1.0.0", com.raytheon.edex.common;bundle-version="1.11.1", - org.apache.commons.logging;bundle-version="1.0.4", com.raytheon.uf.common.monitor;bundle-version="1.11.5", com.raytheon.uf.common.dataplugin.binlightning;bundle-version="1.11.26", com.raytheon.uf.common.dataplugin.grid, com.raytheon.uf.common.sounding;bundle-version="1.12.1112", com.raytheon.uf.common.dataplugin.radar;bundle-version="1.0.0", com.raytheon.uf.common.status;bundle-version="1.12.1174" +Import-Package: org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.scan/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.scan/component-deploy.xml deleted file mode 100644 index 323e4e0e52..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.scan/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.sfcobs/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.sfcobs/META-INF/MANIFEST.MF index 11fab54903..c0b1ddc4b1 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.sfcobs/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.sfcobs/META-INF/MANIFEST.MF @@ -8,7 +8,6 @@ Bundle-Vendor: RAYTHEON Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: com.raytheon.edex.common, org.geotools, - org.apache.commons.logging, javax.persistence, javax.measure, com.raytheon.uf.common.pointdata;bundle-version="1.11.16", @@ -17,4 +16,5 @@ Export-Package: com.raytheon.uf.common.dataplugin.sfcobs, com.raytheon.uf.common.dataplugin.sfcobs.dao Import-Package: com.raytheon.uf.common.status, com.raytheon.uf.edex.decodertools.core, - com.raytheon.uf.edex.decodertools.time + com.raytheon.uf.edex.decodertools.time, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.sfcobs/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.sfcobs/component-deploy.xml deleted file mode 100644 index 2fdc60f306..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.sfcobs/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/META-INF/MANIFEST.MF index c4fc93885f..3b3292f5aa 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/META-INF/MANIFEST.MF @@ -10,7 +10,6 @@ Require-Bundle: com.raytheon.edex.common, com.raytheon.uf.common.pointdata;bundle-version="1.11.16", com.raytheon.uf.edex.pointdata;bundle-version="1.11.16", org.geotools, - org.apache.commons.logging, javax.persistence, javax.measure Import-Package: com.raytheon.uf.common.status, diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.tcg/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.tcg/META-INF/MANIFEST.MF index 6756b1d15e..89d7210955 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.tcg/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.tcg/META-INF/MANIFEST.MF @@ -10,7 +10,6 @@ Require-Bundle: com.raytheon.edex.common, com.raytheon.uf.common.pointdata;bundle-version="1.11.16", com.raytheon.uf.edex.pointdata;bundle-version="1.11.16", org.geotools, - org.apache.commons.logging, javax.persistence, javax.measure Import-Package: com.raytheon.uf.common.status, diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.tcs/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.tcs/META-INF/MANIFEST.MF index 767439089e..e804619b08 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.tcs/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.tcs/META-INF/MANIFEST.MF @@ -10,7 +10,6 @@ Require-Bundle: com.raytheon.edex.common, com.raytheon.uf.common.pointdata;bundle-version="1.11.16", com.raytheon.uf.edex.pointdata;bundle-version="1.11.16", org.geotools, - org.apache.commons.logging, javax.persistence, javax.measure Import-Package: com.raytheon.uf.common.status, diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.vaa/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.vaa/META-INF/MANIFEST.MF index 94807a55e6..d9552f6290 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.vaa/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.vaa/META-INF/MANIFEST.MF @@ -9,7 +9,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: com.raytheon.edex.common, com.raytheon.uf.common.pointdata;bundle-version="1.11.16", org.geotools, - org.apache.commons.logging, javax.persistence, javax.measure Import-Package: com.raytheon.uf.edex.decodertools.core, diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.vil/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.vil/META-INF/MANIFEST.MF index 89122debf6..b23fc4e030 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.vil/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.vil/META-INF/MANIFEST.MF @@ -7,10 +7,10 @@ Bundle-Vendor: RAYTHEON Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization Require-Bundle: javax.persistence;bundle-version="1.0.0", com.raytheon.edex.common;bundle-version="1.11.1", - org.apache.commons.logging;bundle-version="1.0.4", org.geotools;bundle-version="2.5.2", com.raytheon.uf.common.monitor;bundle-version="1.11.5" -Import-Package: com.raytheon.uf.common.dataplugin.radar +Import-Package: com.raytheon.uf.common.dataplugin.radar, + org.apache.commons.logging Export-Package: com.raytheon.uf.common.dataplugin.vil, com.raytheon.uf.common.dataplugin.vil.dao Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.vil/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.vil/component-deploy.xml deleted file mode 100644 index a1cf7a488d..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.vil/component-deploy.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin/META-INF/MANIFEST.MF index e5662e833b..dee4ff2d80 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin/META-INF/MANIFEST.MF @@ -6,10 +6,6 @@ Bundle-Version: 1.12.1174.qualifier Bundle-Vendor: RAYTHEON Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization -Import-Package: javax.measure.unit, - javax.persistence, - org.apache.commons.beanutils, - org.hibernate.annotations Export-Package: com.raytheon.uf.common.dataplugin, com.raytheon.uf.common.dataplugin.annotations, com.raytheon.uf.common.dataplugin.defaults, @@ -21,4 +17,8 @@ Require-Bundle: com.raytheon.uf.common.localization;bundle-version="1.12.1174", com.raytheon.uf.common.time;bundle-version="1.12.1174";visibility:=reexport, com.raytheon.uf.common.serialization, com.raytheon.uf.common.serialization.comm, - com.raytheon.uf.common.util;bundle-version="1.12.1174" + com.raytheon.uf.common.util;bundle-version="1.12.1174", + org.apache.commons.beanutils;bundle-version="1.8.3", + javax.measure;bundle-version="1.0.0", + javax.persistence;bundle-version="1.0.0";visibility:=reexport, + org.hibernate;bundle-version="1.0.0";visibility:=reexport diff --git a/edexOsgi/com.raytheon.uf.common.hydro/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.hydro/META-INF/MANIFEST.MF index ef3ff5fc43..8465cd91b8 100644 --- a/edexOsgi/com.raytheon.uf.common.hydro/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.hydro/META-INF/MANIFEST.MF @@ -17,5 +17,4 @@ Import-Package: com.raytheon.uf.common.localization, com.raytheon.uf.common.menus.xml, com.raytheon.uf.common.message.response, com.raytheon.uf.common.ohd, - com.raytheon.uf.common.serialization.comm, - org.apache.commons.logging + com.raytheon.uf.common.serialization.comm diff --git a/edexOsgi/com.raytheon.uf.common.json/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.json/META-INF/MANIFEST.MF index a1ebb1ba20..efe9461c96 100644 --- a/edexOsgi/com.raytheon.uf.common.json/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.json/META-INF/MANIFEST.MF @@ -7,10 +7,10 @@ Bundle-Vendor: RAYTHEON Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.codehaus.jackson;bundle-version="1.7.3", org.geotools;bundle-version="2.6.4", - org.apache.commons.logging;bundle-version="1.1.1", org.apache.commons.pool;bundle-version="1.3.0" Export-Package: com.raytheon.uf.common.json, com.raytheon.uf.common.json.geo, com.raytheon.uf.common.json.impl, com.raytheon.uf.common.json.jackson, com.raytheon.uf.common.json.jackson.util +Import-Package: org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.common.json/build.properties b/edexOsgi/com.raytheon.uf.common.json/build.properties index eed92de664..17d1dd3115 100644 --- a/edexOsgi/com.raytheon.uf.common.json/build.properties +++ b/edexOsgi/com.raytheon.uf.common.json/build.properties @@ -1,7 +1,6 @@ source.. = src/ output.. = bin/ bin.includes = .project,\ - component-deploy.xml,\ .classpath,\ META-INF/,\ build.properties,\ diff --git a/edexOsgi/com.raytheon.uf.common.json/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.json/component-deploy.xml deleted file mode 100644 index fc73394683..0000000000 --- a/edexOsgi/com.raytheon.uf.common.json/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.management/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.management/META-INF/MANIFEST.MF index 4a26e0d325..fcb733ffe3 100644 --- a/edexOsgi/com.raytheon.uf.common.management/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.management/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: Management Bundle-SymbolicName: com.raytheon.uf.common.management Bundle-Version: 1.0.0.qualifier -Bundle-Activator: com.raytheon.uf.common.management.Activator Bundle-Vendor: RAYTHEON Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy diff --git a/edexOsgi/com.raytheon.uf.common.menus/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.menus/META-INF/MANIFEST.MF index bcc643583e..d7b951716c 100644 --- a/edexOsgi/com.raytheon.uf.common.menus/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.menus/META-INF/MANIFEST.MF @@ -12,7 +12,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Import-Package: com.raytheon.uf.common.localization, com.raytheon.uf.common.status, - com.raytheon.uf.common.util.registry, - org.apache.commons.logging + com.raytheon.uf.common.util.registry Export-Package: com.raytheon.uf.common.menus, com.raytheon.uf.common.menus.xml diff --git a/edexOsgi/com.raytheon.uf.common.mpe/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.mpe/META-INF/MANIFEST.MF index 67a8a5bbeb..aeaa1f2ea8 100644 --- a/edexOsgi/com.raytheon.uf.common.mpe/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.mpe/META-INF/MANIFEST.MF @@ -4,15 +4,12 @@ Bundle-Name: Mpe Plug-in Bundle-SymbolicName: com.raytheon.uf.common.mpe Bundle-Version: 1.12.1174.qualifier Bundle-Vendor: RAYTHEON -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - com.raytheon.edex.common, +Require-Bundle: com.raytheon.edex.common, org.geotools, org.apache.commons.lang, javax.persistence;bundle-version="1.0.0", javax.measure;bundle-version="1.0.0" Bundle-ActivationPolicy: lazy -Export-Package: com.raytheon.uf.common.mpe, - com.raytheon.uf.common.mpe.constants, +Export-Package: com.raytheon.uf.common.mpe.constants, com.raytheon.uf.common.mpe.util diff --git a/edexOsgi/com.raytheon.uf.common.mpe/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.mpe/component-deploy.xml deleted file mode 100644 index 4e158ab3d2..0000000000 --- a/edexOsgi/com.raytheon.uf.common.mpe/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.mpe/src/com/raytheon/uf/common/mpe/Activator.java b/edexOsgi/com.raytheon.uf.common.mpe/src/com/raytheon/uf/common/mpe/Activator.java deleted file mode 100644 index bd21ff4334..0000000000 --- a/edexOsgi/com.raytheon.uf.common.mpe/src/com/raytheon/uf/common/mpe/Activator.java +++ /dev/null @@ -1,69 +0,0 @@ -/** - * This software was developed and / or modified by Raytheon Company, - * pursuant to Contract DG133W-05-CQ-1067 with the US Government. - * - * U.S. EXPORT CONTROLLED TECHNICAL DATA - * This software product contains export-restricted data whose - * export/transfer/disclosure is restricted by U.S. law. Dissemination - * to non-U.S. persons whether in the United States or abroad requires - * an export license or other authorization. - * - * Contractor Name: Raytheon Company - * Contractor Address: 6825 Pine Street, Suite 340 - * Mail Stop B8 - * Omaha, NE 68106 - * 402.291.0100 - * - * See the AWIPS II Master Rights File ("Master Rights File.pdf") for - * further licensing information. - **/ -package com.raytheon.uf.common.mpe; - -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class Activator extends AbstractUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "com.raytheon.uf.common.mpe"; - - // The shared instance - private static Activator plugin; - - /** - * The constructor - */ - public Activator() { - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static Activator getDefault() { - return plugin; - } - -} diff --git a/edexOsgi/com.raytheon.uf.common.ohd/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.ohd/META-INF/MANIFEST.MF index ab9088740a..bff02b87b1 100644 --- a/edexOsgi/com.raytheon.uf.common.ohd/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.ohd/META-INF/MANIFEST.MF @@ -5,12 +5,12 @@ Bundle-SymbolicName: com.raytheon.uf.common.ohd Bundle-Version: 1.12.1174.qualifier Bundle-Vendor: RAYTHEON Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.apache.commons.logging, - com.raytheon.uf.common.localization, +Require-Bundle: com.raytheon.uf.common.localization, javax.persistence, com.raytheon.viz.core;bundle-version="1.10.13";resolution:=optional Export-Package: com.raytheon.uf.common.ohd Import-Package: com.raytheon.uf.common.localization, - com.raytheon.uf.common.util + com.raytheon.uf.common.util, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.common.ohd/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.ohd/component-deploy.xml deleted file mode 100644 index 145eb06c67..0000000000 --- a/edexOsgi/com.raytheon.uf.common.ohd/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.site/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.site/META-INF/MANIFEST.MF index 8f733e1c5c..b2622c2a51 100644 --- a/edexOsgi/com.raytheon.uf.common.site/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.site/META-INF/MANIFEST.MF @@ -6,7 +6,6 @@ Bundle-Version: 1.12.1174.qualifier Bundle-Vendor: RAYTHEON Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: com.raytheon.uf.common.localization;bundle-version="1.12.1130", - org.apache.commons.logging;bundle-version="1.0.4", com.raytheon.uf.common.status;bundle-version="1.12.1130", com.raytheon.uf.common.serialization;bundle-version="1.12.1130", com.raytheon.uf.common.serialization.comm;bundle-version="1.12.1174", diff --git a/edexOsgi/com.raytheon.uf.common.spatial/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.spatial/META-INF/MANIFEST.MF index 5da49e577a..d284863490 100644 --- a/edexOsgi/com.raytheon.uf.common.spatial/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.spatial/META-INF/MANIFEST.MF @@ -7,10 +7,10 @@ Bundle-Vendor: RAYTHEON Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: com.raytheon.uf.common.spatial.reprojection Require-Bundle: org.apache.commons.lang;bundle-version="2.3.0", - org.apache.commons.logging;bundle-version="1.1.1", org.geotools;bundle-version="2.6.4", com.raytheon.uf.common.geospatial;bundle-version="1.12.1174", com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174", com.raytheon.uf.common.datastorage;bundle-version="1.12.1174", com.raytheon.uf.common.serialization;bundle-version="1.12.1174" +Import-Package: org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.common.useradmin/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.useradmin/META-INF/MANIFEST.MF index 3072983673..65a8158bb8 100644 --- a/edexOsgi/com.raytheon.uf.common.useradmin/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.useradmin/META-INF/MANIFEST.MF @@ -3,13 +3,10 @@ Bundle-ManifestVersion: 2 Bundle-Name: Useradmin Bundle-SymbolicName: com.raytheon.uf.common.useradmin Bundle-Version: 1.0.0.qualifier -Bundle-Activator: com.raytheon.uf.common.useradmin.Activator Bundle-Vendor: RAYTHEON Require-Bundle: com.raytheon.uf.common.auth;bundle-version="1.12.1174", com.raytheon.uf.common.serialization;bundle-version="1.12.1174", - com.raytheon.uf.common.serialization.comm;bundle-version="1.12.1174", - org.eclipse.ui;bundle-version="3.6.1", - org.eclipse.core.runtime;bundle-version="3.6.0" + com.raytheon.uf.common.serialization.comm;bundle-version="1.12.1174" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Export-Package: com.raytheon.uf.common.useradmin.request diff --git a/edexOsgi/com.raytheon.uf.common.useradmin/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.useradmin/component-deploy.xml deleted file mode 100644 index de5e3b6303..0000000000 --- a/edexOsgi/com.raytheon.uf.common.useradmin/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.useradmin/src/com/raytheon/uf/common/useradmin/Activator.java b/edexOsgi/com.raytheon.uf.common.useradmin/src/com/raytheon/uf/common/useradmin/Activator.java deleted file mode 100644 index 3df57cda86..0000000000 --- a/edexOsgi/com.raytheon.uf.common.useradmin/src/com/raytheon/uf/common/useradmin/Activator.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.raytheon.uf.common.useradmin; - -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - - - -/** - * The activator class controls the plug-in life cycle - */ -public class Activator extends AbstractUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "com.raytheon.uf.common.useradmin"; //$NON-NLS-1$ - - // The shared instance - private static Activator plugin; - - /** - * The constructor - */ - public Activator() { - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - @Override - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ - @Override - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static Activator getDefault() { - return plugin; - } - -} diff --git a/edexOsgi/com.raytheon.uf.common.util/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.util/META-INF/MANIFEST.MF index 7ee7146d7c..6aa92b9898 100644 --- a/edexOsgi/com.raytheon.uf.common.util/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.util/META-INF/MANIFEST.MF @@ -5,8 +5,7 @@ Bundle-SymbolicName: com.raytheon.uf.common.util Bundle-Version: 1.12.1174.qualifier Bundle-Vendor: RAYTHEON Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.junit;bundle-version="1.0.0", - org.apache.commons.beanutils;bundle-version="1.8.3", +Require-Bundle: org.apache.commons.beanutils;bundle-version="1.8.3", com.raytheon.uf.common.status;bundle-version="1.12.1174", org.apache.commons.lang;bundle-version="2.3.0" Export-Package: com.raytheon.uf.common.util, @@ -17,3 +16,4 @@ Export-Package: com.raytheon.uf.common.util, com.raytheon.uf.common.util.mapping, com.raytheon.uf.common.util.registry, com.raytheon.uf.common.util.session +Import-Package: org.junit diff --git a/edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF index 3f2f5253c8..f1d2e7a4a5 100644 --- a/edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF @@ -12,7 +12,8 @@ Import-Package: com.raytheon.uf.common.activetable, com.raytheon.uf.common.site, com.raytheon.uf.common.status, com.vividsolutions.jts.geom, - javax.persistence + javax.persistence, + org.apache.log4j Require-Bundle: com.raytheon.uf.common.localization;bundle-version="1.11.1", org.jep;bundle-version="1.0.0", com.raytheon.uf.common.serialization;bundle-version="1.11.1", @@ -23,7 +24,6 @@ Require-Bundle: com.raytheon.uf.common.localization;bundle-version="1.11.1", com.raytheon.uf.common.message;bundle-version="1.12.1174", com.raytheon.uf.common.activetable;bundle-version="1.12.1174", com.raytheon.uf.edex.site;bundle-version="1.0.0", - com.google.guava;bundle-version="1.0.0", - org.apache.log4j;bundle-version="1.0.0" + com.google.guava;bundle-version="1.0.0" Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization Export-Package: com.raytheon.uf.edex.activetable diff --git a/edexOsgi/com.raytheon.uf.edex.activetable/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.activetable/component-deploy.xml deleted file mode 100644 index 4697fc053c..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.activetable/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.alertviz/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.alertviz/META-INF/MANIFEST.MF index cd9276e0d7..47021937dd 100644 --- a/edexOsgi/com.raytheon.uf.edex.alertviz/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.alertviz/META-INF/MANIFEST.MF @@ -11,4 +11,3 @@ Require-Bundle: com.raytheon.edex.common;bundle-version="1.12.1174", Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization Export-Package: com.raytheon.uf.edex.alertviz.handler -Import-Package: org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.base.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.base.feature/feature.xml index e3ea365bec..86abdf2f3c 100644 --- a/edexOsgi/com.raytheon.uf.edex.base.feature/feature.xml +++ b/edexOsgi/com.raytheon.uf.edex.base.feature/feature.xml @@ -183,10 +183,4 @@ install-size="0" version="0.0.0"/> - - diff --git a/edexOsgi/com.raytheon.uf.edex.bufrtools/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.bufrtools/META-INF/MANIFEST.MF index c0a489b191..915ed93804 100644 --- a/edexOsgi/com.raytheon.uf.edex.bufrtools/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.bufrtools/META-INF/MANIFEST.MF @@ -5,10 +5,12 @@ Bundle-SymbolicName: com.raytheon.uf.edex.bufrtools Bundle-Version: 1.12.1174.qualifier Bundle-Vendor: RAYTHEON Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.1", - com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", - com.raytheon.uf.common.pointdata;bundle-version="1.11.8", +Require-Bundle: com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174", + com.raytheon.uf.common.datastorage;bundle-version="1.12.1174", + com.raytheon.uf.common.serialization;bundle-version="1.12.1174", + com.raytheon.uf.edex.database;bundle-version="1.0.0", com.raytheon.uf.edex.pointdata;bundle-version="1.11.8", - org.apache.commons.logging;bundle-version="1.0.4", - org.geotools + com.raytheon.uf.edex.decodertools;bundle-version="1.0.0" Export-Package: com.raytheon.uf.edex.bufrtools +Import-Package: com.raytheon.edex.esb, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.bufrtools/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.bufrtools/component-deploy.xml deleted file mode 100644 index 50fb2ede1f..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.bufrtools/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/edexOsgi/com.raytheon.uf.edex.cpgsrv/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.cpgsrv/META-INF/MANIFEST.MF index 2e8288d2ad..e3b480ec6f 100644 --- a/edexOsgi/com.raytheon.uf.edex.cpgsrv/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.cpgsrv/META-INF/MANIFEST.MF @@ -4,10 +4,7 @@ Bundle-Name: Composite Product Generator (CPG) Plug-in Bundle-SymbolicName: com.raytheon.uf.edex.cpgsrv Bundle-Version: 1.12.1174.qualifier Bundle-Vendor: RAYTHEON -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.apache.commons.logging, - com.raytheon.edex.common, +Require-Bundle: com.raytheon.edex.common, com.raytheon.uf.common.status;bundle-version="1.10.13", com.raytheon.uf.common.monitor.cpg;bundle-version="1.0.0", com.raytheon.edex.ingestsrv, @@ -17,4 +14,5 @@ Require-Bundle: org.eclipse.ui, Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Export-Package: com.raytheon.uf.edex.cpgsrv -Import-Package: com.raytheon.uf.common.monitor.cpg +Import-Package: com.raytheon.uf.common.monitor.cpg, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.cpgsrv/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.cpgsrv/component-deploy.xml deleted file mode 100644 index e8b4f8510a..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.cpgsrv/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.dat.utils/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.dat.utils/META-INF/MANIFEST.MF index 27fafccdfb..c3cbd9a5dc 100644 --- a/edexOsgi/com.raytheon.uf.edex.dat.utils/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.dat.utils/META-INF/MANIFEST.MF @@ -10,11 +10,11 @@ Import-Package: com.raytheon.uf.common.dataplugin.ffmp, com.raytheon.uf.common.dataplugin.scan.data, com.raytheon.uf.common.localization, com.raytheon.uf.common.monitor.xml, - com.raytheon.uf.common.status + com.raytheon.uf.common.status, + org.apache.commons.logging Export-Package: com.raytheon.uf.edex.dat.utils Require-Bundle: com.raytheon.edex.common;bundle-version="1.12.2", com.raytheon.uf.common.dataplugin.ffmp;bundle-version="1.12.2", com.raytheon.uf.common.monitor;bundle-version="1.12.2", - org.apache.commons.logging;bundle-version="1.0.4", com.raytheon.uf.common.dataplugin.shef;bundle-version="1.12.1174", com.raytheon.uf.edex.menus;bundle-version="1.0.0" diff --git a/edexOsgi/com.raytheon.uf.edex.database/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.database/META-INF/MANIFEST.MF index 747a9c42d3..611de98d27 100644 --- a/edexOsgi/com.raytheon.uf.edex.database/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.database/META-INF/MANIFEST.MF @@ -9,8 +9,8 @@ Require-Bundle: com.raytheon.uf.common.dataquery;bundle-version="1.0.0", com.raytheon.uf.common.serialization;bundle-version="1.12.1173", com.raytheon.uf.common.serialization.comm;bundle-version="1.12.1173", net.sf.ehcache, - org.springframework;bundle-version="2.5.6", - org.hibernate;bundle-version="1.0.0", + org.springframework;bundle-version="2.5.6";visibility:=reexport, + org.hibernate;bundle-version="1.0.0";visibility:=reexport, com.raytheon.uf.edex.core, com.raytheon.uf.common.datastorage, com.raytheon.uf.common.dataplugin, diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/META-INF/MANIFEST.MF index 7d8b54efd6..1da82fa07a 100644 --- a/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/META-INF/MANIFEST.MF @@ -6,8 +6,7 @@ Bundle-Name: Harvester Bundle-SymbolicName: com.raytheon.uf.edex.datadelivery.harvester Bundle-Version: 1.0.0.qualifier Bundle-Vendor: RAYTHEON -Require-Bundle: org.eclipse.core.runtime, - org.apache.http;bundle-version="4.1.2", +Require-Bundle: org.apache.http;bundle-version="4.1.2", edu.uci.ics.crawler4j;bundle-version="1.0.0", net.dods;bundle-version="1.0.0", com.raytheon.uf.common.datadelivery.registry;bundle-version="1.0.0", @@ -26,7 +25,6 @@ Require-Bundle: org.eclipse.core.runtime, com.raytheon.uf.common.serialization.comm;bundle-version="1.12.1174", com.raytheon.uf.common.datadelivery.event;bundle-version="1.0.0", com.raytheon.uf.edex.event;bundle-version="1.0.0", - org.apache.log4j;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.edex.registry.ebxml;bundle-version="1.0.0", diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/META-INF/MANIFEST.MF index e3a0642a77..a28dec4d13 100644 --- a/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/META-INF/MANIFEST.MF @@ -17,7 +17,6 @@ Require-Bundle: com.raytheon.uf.common.status;bundle-version="1.12.1174", com.raytheon.uf.common.dataplugin.level;bundle-version="1.12.1174", com.raytheon.uf.common.comm;bundle-version="1.12.1174", com.raytheon.uf.edex.database;bundle-version="1.0.0", - org.junit, com.raytheon.uf.common.localization;bundle-version="1.12.1174", com.raytheon.uf.common.datadelivery.event;bundle-version="1.0.0", com.raytheon.uf.common.event;bundle-version="1.0.0", diff --git a/edexOsgi/com.raytheon.uf.edex.decodertools/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.decodertools/META-INF/MANIFEST.MF index 70ffce94e5..e2419f92c1 100644 --- a/edexOsgi/com.raytheon.uf.edex.decodertools/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.decodertools/META-INF/MANIFEST.MF @@ -9,7 +9,6 @@ Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.1", com.raytheon.uf.common.localization, com.raytheon.uf.common.pointdata, javax.measure;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.0.4", org.geotools;bundle-version="2.5.2", com.raytheon.uf.common.site;bundle-version="1.12.1174" Export-Package: com.raytheon.uf.edex.decodertools.aircraft, @@ -23,3 +22,4 @@ Export-Package: com.raytheon.uf.edex.decodertools.aircraft, com.raytheon.uf.edex.decodertools.core.filterimpl, com.raytheon.uf.edex.decodertools.time, com.raytheon.uf.edex.wmo.message +Import-Package: org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.decodertools/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.decodertools/component-deploy.xml deleted file mode 100644 index 261e92c606..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.decodertools/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.event/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.event/META-INF/MANIFEST.MF index 6b8471f1e8..7923305a71 100644 --- a/edexOsgi/com.raytheon.uf.edex.event/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.event/META-INF/MANIFEST.MF @@ -17,6 +17,5 @@ Require-Bundle: com.google.guava;bundle-version="1.0.0", com.raytheon.uf.common.localization;bundle-version="1.12.1174", com.raytheon.uf.common.serialization.comm;bundle-version="1.12.1174", com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174", - org.junit, org.slf4j;bundle-version="1.7.5" Export-Package: com.raytheon.uf.edex.event diff --git a/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/META-INF/MANIFEST.MF index 470a1059a6..812f420b7f 100644 --- a/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/META-INF/MANIFEST.MF @@ -7,9 +7,9 @@ Bundle-Vendor: RAYTHEON Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.1", com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.0.4", org.geotools, javax.persistence, javax.measure Import-Package: com.raytheon.edex.plugin.obs.metar, - com.raytheon.uf.common.dataplugin.obs.metar + com.raytheon.uf.common.dataplugin.obs.metar, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/component-deploy.xml deleted file mode 100644 index 3bee9be3cf..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file 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 7615808aee..3264b92688 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 @@ -6,11 +6,9 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: RAYTHEON Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: net.opengis;bundle-version="1.0.2", - org.apache.commons.logging;bundle-version="1.1.1", org.geotools;bundle-version="2.6.4", org.apache.commons.lang;bundle-version="2.3.0", org.apache.camel;bundle-version="1.0.0", - javax.servlet;bundle-version="2.5.0", org.apache.commons.pool;bundle-version="1.3.0", javax.measure;bundle-version="1.0.0", javax.persistence;bundle-version="1.0.0", @@ -36,3 +34,6 @@ Export-Package: com.raytheon.uf.edex.ogc.common, com.raytheon.uf.edex.ogc.common.output, com.raytheon.uf.edex.ogc.common.spatial, com.raytheon.uf.edex.ogc.common.time +Import-Package: javax.servlet, + javax.servlet.http, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.ohd/component-deploy.xml deleted file mode 100644 index 5ea3f77704..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.ohd/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.parameter/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.parameter/META-INF/MANIFEST.MF index b15a531746..0ec2166edd 100644 --- a/edexOsgi/com.raytheon.uf.edex.parameter/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.parameter/META-INF/MANIFEST.MF @@ -15,7 +15,6 @@ Import-Package: com.raytheon.edex.db.dao, com.raytheon.uf.edex.database.dao, com.raytheon.uf.edex.database.plugin, javax.measure.unit, - org.apache.commons.logging, org.hibernate, org.hibernate.criterion, org.springframework.dao.support, diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.acars/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.acars/META-INF/MANIFEST.MF index 47760aefee..e36df23124 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.acars/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.acars/META-INF/MANIFEST.MF @@ -5,8 +5,7 @@ Bundle-SymbolicName: com.raytheon.uf.edex.plugin.acars Bundle-Version: 1.12.1174.qualifier Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization Bundle-Vendor: RAYTHEON -Require-Bundle: org.apache.commons.logging, - com.raytheon.edex.common, +Require-Bundle: com.raytheon.edex.common, com.raytheon.uf.common.pointdata, com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", org.geotools, @@ -16,4 +15,5 @@ Export-Package: com.raytheon.uf.edex.plugin.acars, com.raytheon.uf.edex.plugin.acars.common, com.raytheon.uf.edex.plugin.acars.dao Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Import-Package: com.raytheon.uf.common.dataplugin.acars +Import-Package: com.raytheon.uf.common.dataplugin.acars, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.acars/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.plugin.acars/component-deploy.xml deleted file mode 100644 index 396d1efffd..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.acars/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/META-INF/MANIFEST.MF index f635c4b6d1..3cbc927bcb 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/META-INF/MANIFEST.MF @@ -9,7 +9,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: com.raytheon.uf.edex.plugin.acars;bundle-version="1.11.4", com.raytheon.uf.edex.decodertools, com.raytheon.uf.common.localization, - org.apache.commons.logging, javax.measure, com.raytheon.edex.common, org.geotools, @@ -19,5 +18,6 @@ Import-Package: com.raytheon.uf.common.dataplugin.acars, com.raytheon.uf.common.dataplugin.acarssounding.tools, com.raytheon.uf.common.pointdata, com.raytheon.uf.common.pointdata.spatial, - com.raytheon.uf.edex.pointdata + com.raytheon.uf.edex.pointdata, + org.apache.commons.logging Export-Package: com.raytheon.uf.edex.plugin.acarssounding diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/META-INF/MANIFEST.MF index 90664f10d5..023d098b49 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/META-INF/MANIFEST.MF @@ -10,10 +10,10 @@ Require-Bundle: com.raytheon.uf.common.dataplugin.bufrascat;bundle-version="1.0. com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", com.raytheon.uf.common.pointdata;bundle-version="1.11.8", com.raytheon.uf.edex.pointdata;bundle-version="1.11.8", - org.apache.commons.logging;bundle-version="1.0.4", com.raytheon.uf.common.localization, org.geotools, javax.persistence, javax.measure Import-Package: com.raytheon.uf.common.status, - com.raytheon.uf.edex.bufrtools + com.raytheon.uf.edex.bufrtools, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/component-deploy.xml deleted file mode 100644 index 4fd3cfd758..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/META-INF/MANIFEST.MF index 42a69a42b8..78870b1865 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/META-INF/MANIFEST.MF @@ -10,8 +10,8 @@ Require-Bundle: com.raytheon.uf.common.dataplugin.bufrhdw;bundle-version="1.0.0" com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", com.raytheon.uf.common.pointdata;bundle-version="1.11.8", com.raytheon.uf.edex.pointdata;bundle-version="1.11.8", - org.apache.commons.logging;bundle-version="1.0.4", org.geotools, javax.persistence, javax.measure -Import-Package: com.raytheon.uf.edex.bufrtools +Import-Package: com.raytheon.uf.edex.bufrtools, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/component-deploy.xml deleted file mode 100644 index 826554e035..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/META-INF/MANIFEST.MF index 5db4b194f0..8521a28b37 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/META-INF/MANIFEST.MF @@ -10,8 +10,8 @@ Require-Bundle: com.raytheon.uf.common.dataplugin.bufrmthdw;bundle-version="1.0. com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", com.raytheon.uf.common.pointdata;bundle-version="1.11.8", com.raytheon.uf.edex.pointdata;bundle-version="1.11.8", - org.apache.commons.logging;bundle-version="1.0.4", org.geotools, javax.persistence, javax.measure -Import-Package: com.raytheon.uf.edex.bufrtools +Import-Package: com.raytheon.uf.edex.bufrtools, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/component-deploy.xml deleted file mode 100644 index 6959261501..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/META-INF/MANIFEST.MF index 2898d0f3a3..7ed7297634 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/META-INF/MANIFEST.MF @@ -10,8 +10,8 @@ Require-Bundle: com.raytheon.uf.common.dataplugin.bufrncwf, com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", com.raytheon.uf.common.pointdata;bundle-version="1.11.8", com.raytheon.uf.edex.pointdata;bundle-version="1.11.8", - org.apache.commons.logging;bundle-version="1.0.4", org.geotools, javax.persistence, javax.measure -Import-Package: com.raytheon.uf.edex.bufrtools +Import-Package: com.raytheon.uf.edex.bufrtools, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/META-INF/MANIFEST.MF index 32ad91da4b..52a350de7e 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/META-INF/MANIFEST.MF @@ -10,8 +10,8 @@ Require-Bundle: com.raytheon.uf.common.dataplugin.bufrquikscat;bundle-version="1 com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", com.raytheon.uf.common.pointdata;bundle-version="1.11.8", com.raytheon.uf.edex.pointdata;bundle-version="1.11.8", - org.apache.commons.logging;bundle-version="1.0.4", org.geotools, javax.persistence, javax.measure -Import-Package: com.raytheon.uf.edex.bufrtools +Import-Package: com.raytheon.uf.edex.bufrtools, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/component-deploy.xml deleted file mode 100644 index 46c3f6ad4d..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/META-INF/MANIFEST.MF index 720aafc6ac..8f52bf99a7 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/META-INF/MANIFEST.MF @@ -10,8 +10,8 @@ Require-Bundle: com.raytheon.uf.common.dataplugin.bufrsigwx, com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", com.raytheon.uf.common.pointdata;bundle-version="1.11.8", com.raytheon.uf.edex.pointdata;bundle-version="1.11.8", - org.apache.commons.logging;bundle-version="1.0.4", org.geotools, javax.persistence, javax.measure -Import-Package: com.raytheon.uf.edex.bufrtools +Import-Package: com.raytheon.uf.edex.bufrtools, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/component-deploy.xml deleted file mode 100644 index f31e27dd9b..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/META-INF/MANIFEST.MF index c99074ce90..b6a5a2fb82 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/META-INF/MANIFEST.MF @@ -10,8 +10,8 @@ Require-Bundle: com.raytheon.uf.common.dataplugin.bufrssmi;bundle-version="1.0.0 com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", com.raytheon.uf.common.pointdata;bundle-version="1.11.8", com.raytheon.uf.edex.pointdata;bundle-version="1.11.8", - org.apache.commons.logging;bundle-version="1.0.4", org.geotools, javax.persistence, javax.measure -Import-Package: com.raytheon.uf.edex.bufrtools +Import-Package: com.raytheon.uf.edex.bufrtools, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/component-deploy.xml deleted file mode 100644 index fdb15a5ef4..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.cwa/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.cwa/META-INF/MANIFEST.MF index 6f93da05e0..4dbb791fb3 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.cwa/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.cwa/META-INF/MANIFEST.MF @@ -10,8 +10,8 @@ Require-Bundle: com.raytheon.uf.common.dataplugin.cwa;bundle-version="1.0.0", com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", com.raytheon.uf.common.pointdata;bundle-version="1.11.8", com.raytheon.uf.edex.pointdata;bundle-version="1.11.8", - org.apache.commons.logging;bundle-version="1.0.4", com.raytheon.uf.common.localization, org.geotools, javax.persistence, javax.measure +Import-Package: org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.cwa/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.plugin.cwa/component-deploy.xml deleted file mode 100644 index 8736932b83..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.cwa/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.cwat/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.cwat/META-INF/MANIFEST.MF index 41e7e5454a..3b22185219 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.cwat/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.cwat/META-INF/MANIFEST.MF @@ -9,7 +9,6 @@ Require-Bundle: com.raytheon.uf.edex.cpgsrv;bundle-version="1.11.7";resolution:= com.raytheon.edex.common;bundle-version="1.11.7", com.raytheon.uf.common.monitor;bundle-version="1.11.7", org.apache.commons.collections, - org.apache.commons.logging;bundle-version="1.0.4", com.raytheon.uf.common.dataplugin.cwat;bundle-version="1.0.0", com.raytheon.uf.common.dataplugin.binlightning;bundle-version="1.0.0", com.raytheon.uf.common.monitor.cpg;bundle-version="1.0.0", @@ -25,4 +24,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Export-Package: com.raytheon.uf.edex.plugin.cwat, com.raytheon.uf.edex.plugin.cwat.common -Import-Package: com.raytheon.uf.edex.plugin.scan.common +Import-Package: com.raytheon.uf.edex.plugin.scan.common, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.cwat/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.plugin.cwat/component-deploy.xml deleted file mode 100644 index 335026cd26..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.cwat/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/META-INF/MANIFEST.MF index cda1339e5b..a14e28f88a 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/META-INF/MANIFEST.MF @@ -8,7 +8,6 @@ Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serializ Require-Bundle: com.raytheon.uf.edex.cpgsrv;bundle-version="1.11.7";resolution:=optional, com.raytheon.edex.common;bundle-version="1.11.7", com.raytheon.uf.common.monitor;bundle-version="1.11.7", - org.apache.commons.logging;bundle-version="1.0.4", com.raytheon.uf.common.mpe;bundle-version="1.0.0", com.raytheon.uf.common.hydro;bundle-version="1.11.11", com.raytheon.uf.common.localization;bundle-version="1.11.26", @@ -25,7 +24,8 @@ Import-Package: com.raytheon.uf.common.dataplugin.grid, com.raytheon.uf.common.ohd, com.raytheon.uf.common.status, com.raytheon.uf.edex.dat.utils;resolution:=optional, - com.raytheon.uf.edex.plugin.scan.common + com.raytheon.uf.edex.plugin.scan.common, + org.apache.commons.logging Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Export-Package: com.raytheon.uf.edex.plugin.ffmp, diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/component-deploy.xml deleted file mode 100644 index 489edf20ba..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/META-INF/MANIFEST.MF index cbcb383e77..d2de7f92e0 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/META-INF/MANIFEST.MF @@ -3,18 +3,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: Datobs Bundle-SymbolicName: com.raytheon.uf.edex.plugin.fssobs Bundle-Version: 1.0.0.qualifier -Bundle-Activator: com.raytheon.uf.edex.plugin.fssobs.Activator Bundle-Vendor: RAYTHEON Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - com.raytheon.uf.edex.cpgsrv;bundle-version="1.12.1153", +Require-Bundle: com.raytheon.uf.edex.cpgsrv;bundle-version="1.12.1153", com.raytheon.edex.common;bundle-version="1.12.1153", com.raytheon.uf.common.monitor.cpg;bundle-version="1.12.1153", org.geotools;bundle-version="2.6.4", com.raytheon.uf.common.dataplugin.fssobs;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.1.1", com.raytheon.edex.plugin.obs;bundle-version="1.12.1172", com.raytheon.uf.common.dataplugin.sfcobs;bundle-version="1.12.1174", com.raytheon.uf.edex.plugin.mesowest;bundle-version="1.12.1174", @@ -28,4 +24,5 @@ Import-Package: com.raytheon.edex.exception, com.raytheon.uf.common.pointdata, com.raytheon.uf.common.pointdata.spatial, com.raytheon.uf.common.status, - com.raytheon.uf.edex.pointdata + com.raytheon.uf.edex.pointdata, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/component-deploy.xml deleted file mode 100644 index cc7b62a50d..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/component-deploy.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/META-INF/MANIFEST.MF index b0996d163c..55c3886d9a 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/META-INF/MANIFEST.MF @@ -10,7 +10,6 @@ Require-Bundle: org.springframework;bundle-version="2.5.6", com.raytheon.uf.edex.ogc.common;bundle-version="1.0.0", javax.persistence;bundle-version="1.0.0", org.apache.commons.lang;bundle-version="2.3.0", - org.apache.commons.logging;bundle-version="1.1.1", com.raytheon.uf.edex.database;bundle-version="1.0.0", com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174", org.hibernate;bundle-version="1.0.0", @@ -30,3 +29,4 @@ Require-Bundle: org.springframework;bundle-version="2.5.6", Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Export-Package: com.raytheon.uf.edex.plugin.grib.ogc +Import-Package: org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.grid/META-INF/MANIFEST.MF index 108bb8e84d..99148e274a 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/META-INF/MANIFEST.MF @@ -17,7 +17,8 @@ Import-Package: com.raytheon.uf.common.dataplugin, com.raytheon.uf.edex.database.cluster, com.raytheon.uf.edex.database.dao, com.raytheon.uf.edex.database.plugin, - com.raytheon.uf.edex.database.query + com.raytheon.uf.edex.database.query, + org.apache.commons.logging Export-Package: com.raytheon.uf.edex.plugin.grid.dao, com.raytheon.uf.edex.plugin.grid.handler Require-Bundle: com.raytheon.uf.common.parameter;bundle-version="1.0.0", @@ -31,5 +32,4 @@ Require-Bundle: com.raytheon.uf.common.parameter;bundle-version="1.0.0", org.springframework;bundle-version="2.5.6", javax.measure;bundle-version="1.0.0", com.raytheon.uf.common.status;bundle-version="1.12.1174", - org.apache.commons.logging;bundle-version="1.1.1", com.raytheon.uf.common.comm;bundle-version="1.12.1174" diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.ldadmesonet/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.ldadmesonet/META-INF/MANIFEST.MF index 7f3b49b8bc..4442038970 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.ldadmesonet/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.ldadmesonet/META-INF/MANIFEST.MF @@ -6,14 +6,12 @@ Bundle-Version: 1.12.1174.qualifier Bundle-Vendor: RAYTHEON Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: com.raytheon.uf.common.dataplugin.ldadmesonet;bundle-version="1.0.0", - org.eclipse.ui, com.raytheon.edex.common, com.raytheon.uf.common.pointdata, javax.persistence, javax.measure, - org.apache.commons.logging, - org.eclipse.core.runtime, com.raytheon.edex.plugin.ldad;bundle-version="1.0.0", com.raytheon.uf.common.dataplugin, com.raytheon.uf.common.localization, - com.raytheon.uf.common.time + com.raytheon.uf.common.time +Import-Package: org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.ldadmesonet/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.plugin.ldadmesonet/component-deploy.xml deleted file mode 100644 index 17689628c2..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.ldadmesonet/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.level.handler/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.plugin.level.handler/component-deploy.xml deleted file mode 100644 index 54623c9bf4..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.level.handler/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.level/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.level/META-INF/MANIFEST.MF index 479bbe4130..6a87ae89a2 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.level/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.level/META-INF/MANIFEST.MF @@ -8,8 +8,6 @@ Bundle-Vendor: Raytheon Require-Bundle: com.raytheon.edex.common, javax.measure, javax.persistence, - org.eclipse.ui, - org.eclipse.core.runtime, org.apache.commons.lang, com.raytheon.uf.common.localization, com.raytheon.uf.common.dataplugin.level, diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.loctables/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.loctables/META-INF/MANIFEST.MF index a1d6b71b9d..41868ea655 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.loctables/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.loctables/META-INF/MANIFEST.MF @@ -11,9 +11,9 @@ Require-Bundle: com.raytheon.edex.common, com.raytheon.uf.common.localization, javax.measure, org.geotools, - org.apache.commons.logging, javax.persistence, com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", com.raytheon.uf.common.site;bundle-version="1.12.1174", com.raytheon.uf.edex.site;bundle-version="1.0.0", com.raytheon.uf.common.monitor;bundle-version="1.12.1174" +Import-Package: org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.loctables/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.plugin.loctables/component-deploy.xml deleted file mode 100644 index 702ee75273..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.loctables/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.lsr/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.lsr/META-INF/MANIFEST.MF index 589501d297..bad5790905 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.lsr/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.lsr/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: com.raytheon.uf.common.dataplugin.lsr;bundle-version="1.0.0", com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", com.raytheon.uf.common.pointdata;bundle-version="1.11.8", com.raytheon.uf.edex.pointdata;bundle-version="1.11.8", - org.apache.commons.logging;bundle-version="1.0.4", org.geotools, javax.persistence, javax.measure +Import-Package: org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.lsr/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.plugin.lsr/component-deploy.xml deleted file mode 100644 index 3b208a48f6..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.lsr/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file 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 e17fde3522..a04de5a63c 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 @@ -19,7 +19,6 @@ Require-Bundle: com.raytheon.uf.edex.ogc.common;bundle-version="1.0.0", com.raytheon.uf.common.util;bundle-version="1.12.1174", com.raytheon.uf.edex.database;bundle-version="1.0.0", ogc.tools.gml;bundle-version="1.0.2", - org.apache.commons.logging;bundle-version="1.1.1", com.raytheon.uf.common.datadelivery.registry;bundle-version="1.0.0", com.raytheon.uf.common.datadelivery.harvester;bundle-version="1.0.0", com.raytheon.uf.common.geospatial;bundle-version="1.12.1174", diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.mesowest/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.mesowest/META-INF/MANIFEST.MF index b1ebd6e231..999b13ce1e 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.mesowest/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.mesowest/META-INF/MANIFEST.MF @@ -9,9 +9,9 @@ Require-Bundle: com.raytheon.edex.common, com.raytheon.uf.common.pointdata, com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", com.raytheon.uf.common.localization, - org.apache.commons.logging, org.geotools, javax.persistence, javax.measure Export-Package: com.raytheon.uf.edex.plugin.mesowest, com.raytheon.uf.edex.plugin.mesowest.common +Import-Package: org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.mesowest/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.plugin.mesowest/component-deploy.xml deleted file mode 100644 index 7db44e303e..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.mesowest/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/META-INF/MANIFEST.MF index 06bc1f8b9a..617fa46411 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/META-INF/MANIFEST.MF @@ -10,9 +10,9 @@ Require-Bundle: com.raytheon.edex.common;bundle-version="1.12.1174", javax.measure;bundle-version="1.0.0", javax.persistence;bundle-version="1.0.0", com.raytheon.uf.common.dataplugin.npp.viirs;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.1.1", ucar.nc2;bundle-version="1.0.0", org.apache.commons.lang;bundle-version="2.3.0", com.raytheon.uf.edex.plugin.npp;bundle-version="1.0.0", com.raytheon.uf.common.status;bundle-version="1.12.1174", com.raytheon.uf.common.localization;bundle-version="1.12.1174" +Import-Package: org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.npp/META-INF/MANIFEST.MF index 3730aceba1..08580cea7f 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.npp/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp/META-INF/MANIFEST.MF @@ -8,6 +8,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: com.raytheon.edex.common;bundle-version="1.12.1174";visibility:=reexport, ucar.nc2;bundle-version="1.0.0";visibility:=reexport, org.geotools;bundle-version="2.6.4", - org.apache.commons.logging;bundle-version="1.1.1", org.apache.commons.lang;bundle-version="2.3.0" Export-Package: com.raytheon.uf.edex.plugin.npp diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/META-INF/MANIFEST.MF index 617d959d22..ee23ffeedb 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/META-INF/MANIFEST.MF @@ -4,9 +4,7 @@ Bundle-Name: Ogc Bundle-SymbolicName: com.raytheon.uf.edex.plugin.obs.ogc Bundle-Version: 1.0.0.qualifier Bundle-Vendor: RAYTHEON -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.geotools;bundle-version="2.6.4", +Require-Bundle: org.geotools;bundle-version="2.6.4", javax.measure;bundle-version="1.0.0", com.raytheon.edex.plugin.obs;bundle-version="1.12.1174", com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174", @@ -19,7 +17,6 @@ Require-Bundle: org.eclipse.ui, com.raytheon.uf.common.status;bundle-version="1.12.1174", org.hibernate;bundle-version="1.0.0", com.raytheon.uf.edex.database;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.1.1", com.raytheon.uf.edex.core;bundle-version="1.12.1174", com.raytheon.uf.edex.wms;bundle-version="1.0.0", com.raytheon.uf.common.util;bundle-version="1.12.1174", diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/META-INF/MANIFEST.MF index 5ca923da0a..746b6e408a 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/META-INF/MANIFEST.MF @@ -5,16 +5,14 @@ Bundle-SymbolicName: com.raytheon.uf.edex.plugin.preciprate Bundle-Version: 1.12.1174.qualifier Bundle-Vendor: RAYTHEON Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - com.raytheon.uf.edex.cpgsrv;bundle-version="1.11.7";resolution:=optional, +Require-Bundle: com.raytheon.uf.edex.cpgsrv;bundle-version="1.11.7";resolution:=optional, com.raytheon.edex.common;bundle-version="1.11.7", com.raytheon.uf.common.monitor;bundle-version="1.11.7", org.geotools;bundle-version="2.5.2", - org.apache.commons.logging;bundle-version="1.0.4", com.raytheon.uf.common.dataplugin.preciprate;bundle-version="1.0.0", com.raytheon.uf.common.monitor.cpg;bundle-version="1.0.0", com.raytheon.uf.common.status;bundle-version="1.12.1152", com.raytheon.uf.common.dataplugin.radar;bundle-version="1.0.0", com.raytheon.uf.common.localization;bundle-version="1.12.1174" -Import-Package: com.raytheon.uf.edex.plugin.scan.common +Import-Package: com.raytheon.uf.edex.plugin.scan.common, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/component-deploy.xml deleted file mode 100644 index e6d3674797..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.qc/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.plugin.qc/component-deploy.xml deleted file mode 100644 index bb33d68260..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.qc/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.qpf/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.qpf/META-INF/MANIFEST.MF index f3a7c2645c..8c3028c7c8 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.qpf/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.qpf/META-INF/MANIFEST.MF @@ -7,7 +7,6 @@ Bundle-Vendor: RAYTHEON Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization, com.raytheon.uf.viz.core Require-Bundle: com.raytheon.uf.common.monitor;bundle-version="1.0.0", com.raytheon.edex.common;bundle-version="1.11.1", - org.apache.commons.logging;bundle-version="1.0.4", com.raytheon.uf.edex.cpgsrv;bundle-version="1.11.1";resolution:=optional, com.raytheon.uf.common.dataplugin.qpf, com.raytheon.uf.common.dataplugin.binlightning;bundle-version="1.0.0", @@ -18,7 +17,8 @@ Require-Bundle: com.raytheon.uf.common.monitor;bundle-version="1.0.0", com.raytheon.uf.edex.dat.utils;bundle-version="1.12.1174", com.raytheon.uf.edex.plugin.scan;bundle-version="1.12.1174" Import-Package: com.raytheon.uf.common.dataplugin.grid, - com.raytheon.uf.edex.plugin.scan.common + com.raytheon.uf.edex.plugin.scan.common, + org.apache.commons.logging Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Export-Package: com.raytheon.uf.edex.plugin.qpf, diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.qpf/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.plugin.qpf/component-deploy.xml deleted file mode 100644 index b2439b82d8..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.qpf/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/META-INF/MANIFEST.MF index 2a64d06336..9931669e57 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/META-INF/MANIFEST.MF @@ -7,7 +7,6 @@ Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serializ Bundle-Vendor: Raytheon Require-Bundle: com.raytheon.edex.common, com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", - org.apache.commons.logging, org.geotools, javax.measure, org.apache.commons.lang, diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.scan.common/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.scan.common/META-INF/MANIFEST.MF index 59b22164ec..8f81bf8f31 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.scan.common/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.scan.common/META-INF/MANIFEST.MF @@ -3,10 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: Common Bundle-SymbolicName: com.raytheon.uf.edex.plugin.scan.common Bundle-Version: 1.0.0.qualifier -Bundle-Activator: com.raytheon.uf.edex.plugin.scan.common.Activator Bundle-Vendor: RAYTHEON -Require-Bundle: org.eclipse.core.runtime, - com.raytheon.edex.common;bundle-version="1.12.1174", +Require-Bundle: com.raytheon.edex.common;bundle-version="1.12.1174", com.raytheon.uf.common.sounding Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.scan.common/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.plugin.scan.common/component-deploy.xml deleted file mode 100644 index 7176623501..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.scan.common/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.scan.common/src/com/raytheon/uf/edex/plugin/scan/common/Activator.java b/edexOsgi/com.raytheon.uf.edex.plugin.scan.common/src/com/raytheon/uf/edex/plugin/scan/common/Activator.java deleted file mode 100644 index ccc3789f1e..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.scan.common/src/com/raytheon/uf/edex/plugin/scan/common/Activator.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.raytheon.uf.edex.plugin.scan.common; - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - -public class Activator implements BundleActivator { - - private static BundleContext context; - - static BundleContext getContext() { - return context; - } - - /* - * (non-Javadoc) - * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext bundleContext) throws Exception { - Activator.context = bundleContext; - } - - /* - * (non-Javadoc) - * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext bundleContext) throws Exception { - Activator.context = null; - } - -} diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.scan/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.scan/META-INF/MANIFEST.MF index 7b55bb55df..2aacc78cbe 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.scan/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.scan/META-INF/MANIFEST.MF @@ -13,7 +13,6 @@ Require-Bundle: com.raytheon.uf.common.dataplugin.binlightning;bundle-version="1 com.raytheon.uf.edex.cpgsrv;bundle-version="1.11.1";resolution:=optional, com.raytheon.uf.common.dataplugin.grid, com.raytheon.edex.common;bundle-version="1.11.26", - org.apache.commons.logging, com.raytheon.uf.common.status, com.raytheon.uf.common.dataplugin.level;bundle-version="1.11.31", com.raytheon.uf.common.sounding;bundle-version="1.12.1112", @@ -23,6 +22,7 @@ Require-Bundle: com.raytheon.uf.common.dataplugin.binlightning;bundle-version="1 com.raytheon.uf.edex.dat.utils;bundle-version="1.12.1174" Export-Package: com.raytheon.uf.edex.plugin.scan, com.raytheon.uf.edex.plugin.scan.process -Import-Package: javax.measure.converter, - com.raytheon.uf.edex.menus, - javax.measure.unit +Import-Package: com.raytheon.uf.edex.menus, + javax.measure.converter, + javax.measure.unit, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.scan/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.plugin.scan/component-deploy.xml deleted file mode 100644 index ca6ed57c29..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.scan/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/META-INF/MANIFEST.MF index 771f6e48ed..1a23861278 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: com.raytheon.uf.common.dataplugin.svrwx;bundle-version="1.0.0", com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", com.raytheon.uf.common.pointdata;bundle-version="1.11.8", com.raytheon.uf.edex.pointdata;bundle-version="1.11.8", - org.apache.commons.logging;bundle-version="1.0.4", org.geotools, javax.persistence, javax.measure +Import-Package: org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/component-deploy.xml deleted file mode 100644 index 91303312f7..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/META-INF/MANIFEST.MF index b0e02d22f4..2cb1bfe722 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: com.raytheon.uf.common.dataplugin.tcg;bundle-version="1.0.0", com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", com.raytheon.uf.common.pointdata;bundle-version="1.11.8", com.raytheon.uf.edex.pointdata;bundle-version="1.11.8", - org.apache.commons.logging;bundle-version="1.0.4", org.geotools, javax.persistence, javax.measure +Import-Package: org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/component-deploy.xml deleted file mode 100644 index ed75723cc5..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/META-INF/MANIFEST.MF index 940050aaeb..a07814155d 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: com.raytheon.uf.common.dataplugin.tcs;bundle-version="1.0.0", com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", com.raytheon.uf.common.pointdata;bundle-version="1.11.8", com.raytheon.uf.edex.pointdata;bundle-version="1.11.8", - org.apache.commons.logging;bundle-version="1.0.4", org.geotools, javax.persistence, javax.measure +Import-Package: org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/component-deploy.xml deleted file mode 100644 index 6c6fe1601e..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.vaa/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.vaa/META-INF/MANIFEST.MF index 8204961c66..00e9ff6500 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.vaa/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.vaa/META-INF/MANIFEST.MF @@ -9,9 +9,9 @@ Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.1", com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", com.raytheon.uf.common.pointdata;bundle-version="1.11.8", com.raytheon.uf.edex.pointdata;bundle-version="1.11.8", - org.apache.commons.logging;bundle-version="1.0.4", org.geotools, javax.persistence, javax.measure Import-Package: com.raytheon.uf.common.dataplugin.vaa, - com.raytheon.uf.common.dataplugin.vaa.dao + com.raytheon.uf.common.dataplugin.vaa.dao, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.vaa/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.plugin.vaa/component-deploy.xml deleted file mode 100644 index fc956c8caf..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.vaa/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.vil/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.vil/META-INF/MANIFEST.MF index ca2692fb21..40ecea0570 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.vil/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.vil/META-INF/MANIFEST.MF @@ -7,13 +7,13 @@ Bundle-Vendor: RAYTHEON Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization, com.raytheon.uf.viz.core Require-Bundle: com.raytheon.uf.common.monitor;bundle-version="1.0.0", com.raytheon.edex.common;bundle-version="1.11.1", - org.apache.commons.logging;bundle-version="1.0.4", com.raytheon.uf.edex.cpgsrv;bundle-version="1.11.1";resolution:=optional, com.raytheon.uf.common.dataplugin.vil, com.raytheon.uf.common.monitor.cpg;bundle-version="1.0.0", com.raytheon.uf.common.status;bundle-version="1.12.1152", com.raytheon.uf.common.dataplugin.radar;bundle-version="1.0.0" -Import-Package: com.raytheon.uf.edex.plugin.scan.common +Import-Package: com.raytheon.uf.edex.plugin.scan.common, + org.apache.commons.logging Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Export-Package: com.raytheon.uf.edex.plugin.vil, diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.vil/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.plugin.vil/component-deploy.xml deleted file mode 100644 index 5a82c16361..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.vil/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/edexOsgi/com.raytheon.uf.edex.python.decoder/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.python.decoder/META-INF/MANIFEST.MF index e56d0af9f1..68c44b832d 100644 --- a/edexOsgi/com.raytheon.uf.edex.python.decoder/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.python.decoder/META-INF/MANIFEST.MF @@ -7,10 +7,10 @@ Bundle-Vendor: RAYTHEON Require-Bundle: com.raytheon.edex.common, org.jep, org.geotools, - org.apache.commons.logging, com.raytheon.uf.common.localization, org.apache.commons.pool;bundle-version="1.0.0" Bundle-ActivationPolicy: lazy Export-Package: com.raytheon.uf.edex.python.decoder Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Import-Package: com.raytheon.uf.common.python +Import-Package: com.raytheon.uf.common.python, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.python.decoder/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.python.decoder/component-deploy.xml deleted file mode 100644 index 9b1cfdd8d6..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.python.decoder/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file 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 c8449455c6..cbd0d58faf 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 @@ -27,7 +27,6 @@ Require-Bundle: com.raytheon.uf.common.registry.schemas.ebxml;bundle-version="1. com.raytheon.uf.common.registry.ebxml, com.raytheon.uf.common.stats;bundle-version="1.0.0", com.raytheon.uf.common.registry.event;bundle-version="1.0.0", - org.apache.commons.httpclient;bundle-version="3.1.0", org.apache.commons.lang;bundle-version="2.3.0", com.raytheon.uf.edex.database;bundle-version="1.0.0", com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174", diff --git a/edexOsgi/com.raytheon.uf.edex.stats/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.stats/META-INF/MANIFEST.MF index 6169e8a8cb..87e15dea6b 100644 --- a/edexOsgi/com.raytheon.uf.edex.stats/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.stats/META-INF/MANIFEST.MF @@ -22,7 +22,6 @@ Require-Bundle: com.raytheon.uf.common.serialization;bundle-version="1.12.1174", com.raytheon.uf.edex.core;bundle-version="1.12.1174", com.raytheon.uf.common.status;bundle-version="1.12.1174", org.apache.commons.collections;bundle-version="3.2.0", - org.junit, javax.measure, org.hibernate;bundle-version="1.0.0" Import-Package: javax.measure.unit diff --git a/edexOsgi/com.raytheon.uf.edex.textdbsrv/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.textdbsrv/META-INF/MANIFEST.MF index 825996a99d..eb903b71cf 100644 --- a/edexOsgi/com.raytheon.uf.edex.textdbsrv/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.textdbsrv/META-INF/MANIFEST.MF @@ -7,7 +7,6 @@ Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serializ Bundle-Vendor: RAYTHEON Require-Bundle: com.raytheon.edex.common, com.raytheon.edex.textdb, - org.apache.commons.logging, org.apache.commons.lang, com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", com.raytheon.uf.common.dataplugin.text, @@ -16,4 +15,5 @@ Export-Package: com.raytheon.uf.edex.services, com.raytheon.uf.edex.services.textdbimpl, com.raytheon.uf.edex.services.textdbsrv Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Import-Package: com.raytheon.uf.common.message +Import-Package: com.raytheon.uf.common.message, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.textdbsrv/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.textdbsrv/component-deploy.xml deleted file mode 100644 index 8b027521fb..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.textdbsrv/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/edexOsgi/com.raytheon.uf.edex.useradmin/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.useradmin/META-INF/MANIFEST.MF index 31bd8e1d90..efa1c62ae6 100644 --- a/edexOsgi/com.raytheon.uf.edex.useradmin/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.useradmin/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: Useradmin Bundle-SymbolicName: com.raytheon.uf.edex.plugin.useradmin Bundle-Version: 1.0.0.qualifier -Bundle-Activator: com.raytheon.uf.edex.useradmin.Activator Bundle-Vendor: RAYTHEON Require-Bundle: com.raytheon.uf.common.auth;bundle-version="1.12.1174", com.raytheon.uf.edex.auth;bundle-version="1.12.1174", diff --git a/edexOsgi/com.raytheon.uf.edex.wcs/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.wcs/META-INF/MANIFEST.MF index de9936403c..75be18c86c 100644 --- a/edexOsgi/com.raytheon.uf.edex.wcs/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.wcs/META-INF/MANIFEST.MF @@ -9,9 +9,7 @@ Require-Bundle: com.raytheon.uf.edex.ogc.common;bundle-version="1.0.0", net.opengis;bundle-version="1.0.2", org.geotools;bundle-version="2.6.4", com.raytheon.edex.common;bundle-version="1.12.1174", - org.apache.commons.logging;bundle-version="1.1.1", ucar.nc2;bundle-version="1.0.0", - javax.servlet;bundle-version="2.5.0", com.raytheon.uf.common.localization;bundle-version="1.12.1174", javax.measure;bundle-version="1.0.0", org.apache.commons.codec;bundle-version="1.4.0", @@ -25,3 +23,6 @@ Export-Package: com.raytheon.uf.edex.wcs, com.raytheon.uf.edex.wcs.provider, com.raytheon.uf.edex.wcs.reg, com.raytheon.uf.edex.wcs.request +Import-Package: javax.servlet, + javax.servlet.http, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.wcs/build.properties b/edexOsgi/com.raytheon.uf.edex.wcs/build.properties index 2660b7d6a5..e016089273 100644 --- a/edexOsgi/com.raytheon.uf.edex.wcs/build.properties +++ b/edexOsgi/com.raytheon.uf.edex.wcs/build.properties @@ -1,6 +1,5 @@ source.. = src/ bin.includes = .project,\ - component-deploy.xml,\ .classpath,\ META-INF/,\ build.properties,\ diff --git a/edexOsgi/com.raytheon.uf.edex.wcs/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.wcs/component-deploy.xml deleted file mode 100644 index fc7a6c9b85..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.wcs/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file 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 2e87e6b4a8..b541b3fe05 100644 --- a/edexOsgi/com.raytheon.uf.edex.wfs/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.wfs/META-INF/MANIFEST.MF @@ -10,8 +10,6 @@ Require-Bundle: org.geotools;bundle-version="2.6.4", com.raytheon.uf.edex.ogc.common;bundle-version="1.0.0", com.raytheon.uf.common.json;bundle-version="1.0.0", org.codehaus.jackson;bundle-version="1.7.3", - org.apache.commons.logging;bundle-version="1.1.1", - javax.servlet;bundle-version="2.5.0", org.apache.commons.pool;bundle-version="1.3.0", net.opengis;bundle-version="1.0.2", ogc.tools.gml;bundle-version="1.0.2", @@ -28,3 +26,6 @@ Export-Package: com.raytheon.uf.edex.wfs, com.raytheon.uf.edex.wfs.reg, com.raytheon.uf.edex.wfs.request, com.raytheon.uf.edex.wfs.util +Import-Package: javax.servlet, + javax.servlet.http, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.wfs/build.properties b/edexOsgi/com.raytheon.uf.edex.wfs/build.properties index 2660b7d6a5..e016089273 100644 --- a/edexOsgi/com.raytheon.uf.edex.wfs/build.properties +++ b/edexOsgi/com.raytheon.uf.edex.wfs/build.properties @@ -1,6 +1,5 @@ source.. = src/ bin.includes = .project,\ - component-deploy.xml,\ .classpath,\ META-INF/,\ build.properties,\ diff --git a/edexOsgi/com.raytheon.uf.edex.wfs/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.wfs/component-deploy.xml deleted file mode 100644 index 9c1b8e8421..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.wfs/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.wms/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.wms/META-INF/MANIFEST.MF index f160d7cfdd..8a3497590e 100644 --- a/edexOsgi/com.raytheon.uf.edex.wms/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.wms/META-INF/MANIFEST.MF @@ -9,11 +9,9 @@ Require-Bundle: com.raytheon.edex.common;bundle-version="1.12.1174", net.opengis;bundle-version="1.0.2", org.codehaus.jackson;bundle-version="1.7.3", org.geotools;bundle-version="2.6.4", - org.apache.commons.logging;bundle-version="1.1.1", org.apache.commons.lang;bundle-version="2.3.0", org.apache.commons.pool;bundle-version="1.3.0", com.raytheon.uf.edex.ogc.common;bundle-version="1.0.0", - javax.servlet;bundle-version="2.5.0", com.raytheon.uf.common.colormap;bundle-version="1.12.1174", org.apache.camel;bundle-version="1.0.0", org.dom4j;bundle-version="1.0.0", @@ -29,7 +27,10 @@ Import-Package: com.raytheon.uf.common.colormap, com.raytheon.uf.edex.ogc.common, com.raytheon.uf.edex.ogc.common.colormap, com.raytheon.uf.edex.ogc.common.db, - com.raytheon.uf.edex.ogc.common.http + com.raytheon.uf.edex.ogc.common.http, + javax.servlet, + javax.servlet.http, + org.apache.commons.logging Export-Package: com.raytheon.uf.edex.wms, com.raytheon.uf.edex.wms.format, com.raytheon.uf.edex.wms.provider, diff --git a/edexOsgi/com.raytheon.uf.edex.wms/build.properties b/edexOsgi/com.raytheon.uf.edex.wms/build.properties index 2660b7d6a5..e016089273 100644 --- a/edexOsgi/com.raytheon.uf.edex.wms/build.properties +++ b/edexOsgi/com.raytheon.uf.edex.wms/build.properties @@ -1,6 +1,5 @@ source.. = src/ bin.includes = .project,\ - component-deploy.xml,\ .classpath,\ META-INF/,\ build.properties,\ diff --git a/edexOsgi/com.raytheon.uf.edex.wms/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.wms/component-deploy.xml deleted file mode 100644 index ac0a31dff9..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.wms/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.airmet/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.common.dataplugin.airmet/META-INF/MANIFEST.MF index 71fd612b3d..bdb44ef9cd 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.airmet/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.airmet/META-INF/MANIFEST.MF @@ -8,7 +8,6 @@ Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serializ Require-Bundle: gov.noaa.nws.ncep.common;bundle-version="1.0.0", com.raytheon.edex.common;bundle-version="1.11.1", com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.0.4", org.geotools, javax.persistence, javax.measure diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.atcf/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.common.dataplugin.atcf/META-INF/MANIFEST.MF index d2cb6f3eae..6e97912f0d 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.atcf/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.atcf/META-INF/MANIFEST.MF @@ -11,8 +11,6 @@ Export-Package: gov.noaa.nws.ncep.common.dataplugin.atcf, gov.noaa.nws.ncep.edex.uengine.tasks.atcf Require-Bundle: javax.persistence;bundle-version="1.0.0", com.raytheon.edex.common;bundle-version="1.11.31", - org.apache.log4j;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.0.4", gov.noaa.nws.ncep.edex.common;bundle-version="1.0.0", gov.noaa.nws.ncep.common;bundle-version="1.0.0" Import-Package: com.raytheon.uf.edex.decodertools.core, diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.atcf/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.atcf/component-deploy.xml deleted file mode 100644 index 64c7d0c22a..0000000000 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.atcf/component-deploy.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.aww/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.common.dataplugin.aww/META-INF/MANIFEST.MF index d58d401d66..d8d0b7c5e9 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.aww/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.aww/META-INF/MANIFEST.MF @@ -7,16 +7,11 @@ Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serializ Bundle-Vendor: AWIPS II migration Require-Bundle: com.raytheon.edex.common;bundle-version="1.10.13", javax.persistence;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.0.4", - org.apache.log4j;bundle-version="1.0.0", - gov.noaa.nws.ncep.common;bundle-version="1.0.0", - org.eclipse.ui;bundle-version="3.4.1", - org.eclipse.core.runtime;bundle-version="3.4.0" + gov.noaa.nws.ncep.common;bundle-version="1.0.0" Import-Package: com.raytheon.uf.edex.decodertools.core, com.raytheon.uf.edex.decodertools.time, com.raytheon.uf.edex.wmo.message, gov.noaa.nws.ncep.edex.common.dao, - org.eclipse.ui.plugin, org.junit, org.osgi.framework Export-Package: gov.noaa.nws.ncep.common.dataplugin.aww, diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.aww/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.aww/component-deploy.xml deleted file mode 100644 index b01c741aad..0000000000 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.aww/component-deploy.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.convsigmet/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.common.dataplugin.convsigmet/META-INF/MANIFEST.MF index a77b054fe5..f8dadab331 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.convsigmet/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.convsigmet/META-INF/MANIFEST.MF @@ -8,7 +8,6 @@ Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serializ Require-Bundle: gov.noaa.nws.ncep.common;bundle-version="1.0.0", com.raytheon.edex.common;bundle-version="1.11.1", com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.0.4", org.geotools, javax.persistence, javax.measure diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ffg/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.common.dataplugin.ffg/META-INF/MANIFEST.MF index 5c2d6df4df..6b4eaa1ce3 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ffg/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.ffg/META-INF/MANIFEST.MF @@ -8,7 +8,6 @@ Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serializ Require-Bundle: gov.noaa.nws.ncep.common;bundle-version="1.0.0", com.raytheon.edex.common;bundle-version="1.11.1", com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.0.4", org.geotools, javax.persistence, javax.measure diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/META-INF/MANIFEST.MF index 85a64c6f26..ac5988844a 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/META-INF/MANIFEST.MF @@ -5,8 +5,7 @@ Bundle-SymbolicName: gov.noaa.nws.ncep.common.dataplugin.geomag Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: com.raytheon.edex.common;bundle-version="1.12.1174", - javax.persistence;bundle-version="1.0.0", - org.junit;bundle-version="1.0.0" + javax.persistence;bundle-version="1.0.0" Export-Package: gov.noaa.nws.ncep.common.dataplugin.geomag, gov.noaa.nws.ncep.common.dataplugin.geomag.dao, gov.noaa.nws.ncep.common.dataplugin.geomag.exception, diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/component-deploy.xml deleted file mode 100644 index 9e45beae05..0000000000 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.idft/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.common.dataplugin.idft/META-INF/MANIFEST.MF index ee42050bc7..711e9c4fd9 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.idft/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.idft/META-INF/MANIFEST.MF @@ -17,5 +17,4 @@ Import-Package: com.raytheon.edex.db.dao, gov.noaa.nws.ncep.edex.common.dao Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.31", javax.persistence;bundle-version="1.0.0", - gov.noaa.nws.ncep.common;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.0.4" + gov.noaa.nws.ncep.common;bundle-version="1.0.0" diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.intlsigmet/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.common.dataplugin.intlsigmet/META-INF/MANIFEST.MF index 0449731ca9..3197a81742 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.intlsigmet/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.intlsigmet/META-INF/MANIFEST.MF @@ -8,7 +8,6 @@ Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serializ Require-Bundle: gov.noaa.nws.ncep.common;bundle-version="1.0.0", com.raytheon.edex.common;bundle-version="1.11.1", com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.0.4", org.geotools, javax.persistence, javax.measure diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/META-INF/MANIFEST.MF index ef2d3e3fed..cbce56b84a 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/META-INF/MANIFEST.MF @@ -5,8 +5,7 @@ Bundle-SymbolicName: gov.noaa.nws.ncep.common.dataplugin.mcidas Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization, org.geotools -Require-Bundle: org.apache.commons.logging;bundle-version="1.0.4", - com.raytheon.edex.common;bundle-version="1.11.17", +Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.17", gov.noaa.nws.ncep.edex.common;bundle-version="1.0.0", com.raytheon.uf.common.serialization.comm;bundle-version="1.11.17", gov.noaa.nws.ncep.common;bundle-version="1.0.0", @@ -21,3 +20,4 @@ Require-Bundle: org.apache.commons.logging;bundle-version="1.0.4", Export-Package: gov.noaa.nws.ncep.common.dataplugin.mcidas, gov.noaa.nws.ncep.common.dataplugin.mcidas.dao, gov.noaa.nws.ncep.common.dataplugin.mcidas.fixed +Import-Package: org.apache.commons.logging diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/component-deploy.xml deleted file mode 100644 index b3a11d6d5a..0000000000 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/META-INF/MANIFEST.MF index ec9888e821..eabdd66cda 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/META-INF/MANIFEST.MF @@ -4,10 +4,7 @@ Bundle-Name: Ncpirep Plug-in Bundle-SymbolicName: gov.noaa.nws.ncep.common.dataplugin.ncairep Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.core.resources, - com.raytheon.uf.common.status;bundle-version="1.12.1174", +Require-Bundle: com.raytheon.uf.common.status;bundle-version="1.12.1174", net.sf.cglib;bundle-version="2.1.3", com.raytheon.uf.edex.core;bundle-version="1.12.1174", javax.measure, diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncccfp/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncccfp/META-INF/MANIFEST.MF index a6ad6f57d3..c862929350 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncccfp/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncccfp/META-INF/MANIFEST.MF @@ -8,8 +8,7 @@ Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serializ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.31", javax.persistence;bundle-version="1.0.0", - gov.noaa.nws.ncep.common;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.0.4" + gov.noaa.nws.ncep.common;bundle-version="1.0.0" Import-Package: com.vividsolutions.jts.geom, gov.noaa.nws.ncep.edex.common.dao, org.opengis.referencing.crs diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/META-INF/MANIFEST.MF index 68b97e8882..184804b6b5 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/META-INF/MANIFEST.MF @@ -9,9 +9,6 @@ Bundle-Vendor: NOAA.NWS.NCEP Require-Bundle: javax.measure, javax.persistence, org.apache.commons.lang, - org.apache.commons.logging, - org.eclipse.ui, - org.eclipse.core.runtime, org.geotools, com.raytheon.edex.common, com.raytheon.uf.common.dataplugin, @@ -23,7 +20,8 @@ Require-Bundle: javax.measure, gov.noaa.nws.ncep.edex.common;bundle-version="1.0.0" Import-Package: com.raytheon.uf.common.dataplugin.level, com.raytheon.uf.common.derivparam.tree, - com.raytheon.uf.common.geospatial + com.raytheon.uf.common.geospatial, + org.apache.commons.logging Export-Package: gov.noaa.nws.ncep.common.dataplugin.ncgrib, gov.noaa.nws.ncep.common.dataplugin.ncgrib.exception, gov.noaa.nws.ncep.common.dataplugin.ncgrib.ncdatatree, diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/component-deploy.xml deleted file mode 100644 index b7010b7a78..0000000000 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/META-INF/MANIFEST.MF index d265d80af3..9de9ba48a6 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/META-INF/MANIFEST.MF @@ -8,8 +8,6 @@ Bundle-Vendor: NOAA/NWS/NCEP/NCO/SIB Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: javax.persistence;bundle-version="1.0.0", com.raytheon.edex.common;bundle-version="1.11.31", - org.apache.commons.logging;bundle-version="1.0.4", - org.apache.log4j;bundle-version="1.0.0", gov.noaa.nws.ncep.common;bundle-version="1.0.0", gov.noaa.nws.ncep.edex.common;bundle-version="1.0.0" Export-Package: gov.noaa.nws.ncep.common.dataplugin.ncpafm, diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/component-deploy.xml deleted file mode 100644 index b1ad67233d..0000000000 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/component-deploy.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncpirep/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncpirep/META-INF/MANIFEST.MF index a03c4894c7..0c46bd7399 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncpirep/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncpirep/META-INF/MANIFEST.MF @@ -4,10 +4,7 @@ Bundle-Name: Ncpirep Plug-in Bundle-SymbolicName: gov.noaa.nws.ncep.common.dataplugin.ncpirep Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.core.resources, - com.raytheon.uf.common.status;bundle-version="1.12.1174", +Require-Bundle: com.raytheon.uf.common.status;bundle-version="1.12.1174", net.sf.cglib;bundle-version="2.1.3", com.raytheon.uf.edex.core;bundle-version="1.12.1174", javax.measure, diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncscat/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncscat/META-INF/MANIFEST.MF index b954a84caf..d352a9824b 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncscat/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncscat/META-INF/MANIFEST.MF @@ -7,11 +7,7 @@ Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serializ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.7", javax.persistence;bundle-version="1.0.0", - org.apache.log4j;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.0.4", - gov.noaa.nws.ncep.common;bundle-version="1.0.0", - org.eclipse.ui;bundle-version="3.4.1", - org.eclipse.core.runtime;bundle-version="3.4.0" + gov.noaa.nws.ncep.common;bundle-version="1.0.0" Export-Package: gov.noaa.nws.ncep.common.dataplugin.ncscat, gov.noaa.nws.ncep.common.dataplugin.ncscat.dao Bundle-Vendor: AWIPS II migration diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncscat/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncscat/component-deploy.xml deleted file mode 100644 index 405f264189..0000000000 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncscat/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncscd/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncscd/META-INF/MANIFEST.MF index 769e599a4b..c8d995a3a9 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncscd/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncscd/META-INF/MANIFEST.MF @@ -3,14 +3,11 @@ Bundle-ManifestVersion: 2 Bundle-Name: NcScd Plug-in Bundle-SymbolicName: gov.noaa.nws.ncep.common.dataplugin.ncscd Bundle-Version: 1.0.0.qualifier -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - com.raytheon.uf.common.datastorage;bundle-version="1.11.31", +Require-Bundle: com.raytheon.uf.common.datastorage;bundle-version="1.11.31", org.springframework;bundle-version="2.5.6", gov.noaa.nws.ncep.edex.common;bundle-version="1.0.0", com.raytheon.uf.edex.database;bundle-version="1.0.0", com.raytheon.edex.common;bundle-version="1.12.1174", - org.apache.commons.logging;bundle-version="1.1.1", com.raytheon.uf.common.pointdata;bundle-version="1.12.1174", com.raytheon.uf.edex.pointdata;bundle-version="1.12.1174" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 @@ -27,7 +24,8 @@ Import-Package: com.raytheon.edex.exception, gov.noaa.nws.ncep.common.tools, javax.measure.quantity, javax.measure.unit, - javax.persistence + javax.persistence, + org.apache.commons.logging Export-Package: gov.noaa.nws.ncep.common.dataplugin.ncscd, gov.noaa.nws.ncep.common.dataplugin.ncscd.dao Bundle-ActivationPolicy: lazy diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncscd/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncscd/component-deploy.xml deleted file mode 100644 index 760c0112b9..0000000000 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncscd/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/META-INF/MANIFEST.MF index 14edf7e7d8..3f841156e9 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/META-INF/MANIFEST.MF @@ -4,10 +4,7 @@ Bundle-Name: Nctaf Plug-in Bundle-SymbolicName: gov.noaa.nws.ncep.common.dataplugin.nctaf Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.core.resources, - com.raytheon.uf.common.status;bundle-version="1.12.1174", +Require-Bundle: com.raytheon.uf.common.status;bundle-version="1.12.1174", net.sf.cglib;bundle-version="2.1.3", com.raytheon.uf.edex.core;bundle-version="1.12.1174", com.raytheon.uf.edex.pointdata, @@ -29,15 +26,15 @@ Import-Package: com.raytheon.edex.db.dao, com.raytheon.uf.edex.database.plugin, com.raytheon.uf.edex.decodertools.aircraft, com.raytheon.uf.edex.decodertools.time, - com.raytheon.uf.edex.pointdata, + com.raytheon.uf.edex.pointdata, com.raytheon.uf.edex.wmo.message, com.vividsolutions.jts.geom, gov.noaa.nws.ncep.common.tools, javax.measure.unit, javax.persistence, - org.springframework.orm.hibernate3, org.apache.commons.lang.builder, - org.apache.commons.logging;bundle-version="1.0.4" + org.apache.commons.logging, + org.springframework.orm.hibernate3 Export-Package: gov.noaa.nws.ncep.common.dataplugin.nctaf, gov.noaa.nws.ncep.common.dataplugin.nctaf.dao diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/component-deploy.xml deleted file mode 100644 index de023b3183..0000000000 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/component-deploy.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/META-INF/MANIFEST.MF index d2d5d89a4f..522b759b68 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/META-INF/MANIFEST.MF @@ -8,7 +8,6 @@ Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.17", com.raytheon.uf.edex.decodertools;bundle-version="1.11.17", gov.noaa.nws.ncep.common;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.0.4", javax.persistence;bundle-version="1.0.0", com.raytheon.uf.common.status;bundle-version="1.12.1174", gov.noaa.nws.ncep.edex.common;bundle-version="1.0.0", @@ -22,4 +21,5 @@ Export-Package: gov.noaa.nws.ncep.common.dataplugin.ncuair, Import-Package: com.raytheon.uf.common.pointdata, com.raytheon.uf.common.pointdata.spatial, com.raytheon.uf.edex.pointdata, - com.vividsolutions.jts.geom + com.vividsolutions.jts.geom, + org.apache.commons.logging diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/component-deploy.xml deleted file mode 100644 index 0f80cb4041..0000000000 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/component-deploy.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.nonconvsigmet/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.common.dataplugin.nonconvsigmet/META-INF/MANIFEST.MF index d09f6a73e6..de2b2be569 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.nonconvsigmet/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.nonconvsigmet/META-INF/MANIFEST.MF @@ -8,7 +8,6 @@ Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serializ Require-Bundle: gov.noaa.nws.ncep.common;bundle-version="1.0.0", com.raytheon.edex.common;bundle-version="1.11.1", com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.0.4", org.geotools, javax.persistence, javax.measure diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/META-INF/MANIFEST.MF index 08e5f04928..d26ace37b8 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/META-INF/MANIFEST.MF @@ -7,11 +7,7 @@ Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serializ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.7", javax.persistence;bundle-version="1.0.0", - org.apache.log4j;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.0.4", - gov.noaa.nws.ncep.common;bundle-version="1.0.0", - org.eclipse.ui;bundle-version="3.4.1", - org.eclipse.core.runtime;bundle-version="3.4.0" + gov.noaa.nws.ncep.common;bundle-version="1.0.0" Export-Package: gov.noaa.nws.ncep.common.dataplugin.ntrans, gov.noaa.nws.ncep.common.dataplugin.ntrans.dao Bundle-Vendor: AWIPS II migration diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/component-deploy.xml deleted file mode 100644 index 82d3846fdd..0000000000 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.solarimage/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.common.dataplugin.solarimage/META-INF/MANIFEST.MF index ec7846c28d..861e31f0aa 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.solarimage/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.solarimage/META-INF/MANIFEST.MF @@ -6,6 +6,5 @@ Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: com.raytheon.edex.common;bundle-version="1.12.1174", javax.persistence;bundle-version="1.0.0", - org.junit;bundle-version="1.0.0", gov.nasa.gsfc.fits;bundle-version="1.0.0" Export-Package: gov.noaa.nws.ncep.common.dataplugin.solarimage diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/META-INF/MANIFEST.MF index 991e8de9e1..4e286f902c 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/META-INF/MANIFEST.MF @@ -8,8 +8,6 @@ Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serializ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.31", javax.persistence;bundle-version="1.0.0", - org.junit;bundle-version="1.0.0", - org.apache.log4j;bundle-version="1.0.0", gov.noaa.nws.ncep.common;bundle-version="1.0.0", com.raytheon.uf.common.status;bundle-version="1.12.1174" Export-Package: gov.noaa.nws.ncep.common.dataplugin.ssha, diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/component-deploy.xml deleted file mode 100644 index 0f091d3e65..0000000000 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/component-deploy.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.stormtrack/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.common.dataplugin.stormtrack/META-INF/MANIFEST.MF index 75da415845..d7c7ce98f0 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.stormtrack/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.stormtrack/META-INF/MANIFEST.MF @@ -11,8 +11,6 @@ Export-Package: gov.noaa.nws.ncep.common.dataplugin.stormtrack, gov.noaa.nws.ncep.edex.uengine.tasks.stormtrack Require-Bundle: javax.persistence;bundle-version="1.0.0", com.raytheon.edex.common;bundle-version="1.11.31", - org.apache.log4j;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.0.4", gov.noaa.nws.ncep.edex.common;bundle-version="1.0.0", gov.noaa.nws.ncep.common;bundle-version="1.0.0" Import-Package: com.raytheon.uf.edex.decodertools.core, diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.stormtrack/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.stormtrack/component-deploy.xml deleted file mode 100644 index b127d4ec79..0000000000 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.stormtrack/component-deploy.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.tcm/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.common.dataplugin.tcm/META-INF/MANIFEST.MF index c5e7848456..b76bf0d544 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.tcm/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.tcm/META-INF/MANIFEST.MF @@ -3,9 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Tcm Plug-in Bundle-SymbolicName: gov.noaa.nws.ncep.common.dataplugin.tcm Bundle-Version: 1.0.0.qualifier -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - com.raytheon.uf.common.dataplugin, +Require-Bundle: com.raytheon.uf.common.dataplugin, com.raytheon.uf.common.datastorage;bundle-version="1.11.31", org.springframework;bundle-version="2.5.6", gov.noaa.nws.ncep.edex.common;bundle-version="1.0.0", diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.wcp/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.common.dataplugin.wcp/META-INF/MANIFEST.MF index 604ff766e2..c35412beff 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.wcp/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.wcp/META-INF/MANIFEST.MF @@ -8,8 +8,7 @@ Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serializ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.31", javax.persistence;bundle-version="1.0.0", - gov.noaa.nws.ncep.common;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.0.4" + gov.noaa.nws.ncep.common;bundle-version="1.0.0" Export-Package: gov.noaa.nws.ncep.common.dataplugin.wcp, gov.noaa.nws.ncep.common.dataplugin.wcp.dao Import-Package: gov.noaa.nws.ncep.edex.common.dao diff --git a/ncep/gov.noaa.nws.ncep.common.log/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.common.log/META-INF/MANIFEST.MF index 83fcbdb894..04f14973c6 100644 --- a/ncep/gov.noaa.nws.ncep.common.log/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.common.log/META-INF/MANIFEST.MF @@ -5,8 +5,8 @@ Bundle-SymbolicName: gov.noaa.nws.ncep.common.log Bundle-Version: 1.0.0.qualifier Bundle-Activator: gov.noaa.nws.ncep.common.log.Activator Bundle-Vendor: NOAA NWS NCEP NCO SIB -Require-Bundle: org.eclipse.core.runtime, - org.apache.log4j;bundle-version="1.0.0" +Require-Bundle: org.eclipse.core.runtime Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Export-Package: gov.noaa.nws.ncep.common.log.logger +Import-Package: org.apache.log4j diff --git a/ncep/gov.noaa.nws.ncep.common.log/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.log/component-deploy.xml deleted file mode 100644 index c603e331ff..0000000000 --- a/ncep/gov.noaa.nws.ncep.common.log/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.common.log4j.config/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.common.log4j.config/META-INF/MANIFEST.MF index a95621d924..eddb4f4659 100644 --- a/ncep/gov.noaa.nws.ncep.common.log4j.config/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.common.log4j.config/META-INF/MANIFEST.MF @@ -3,5 +3,4 @@ Bundle-ManifestVersion: 2 Bundle-Name: CAVE log4j properties configuration Bundle-SymbolicName: gov.noaa.nws.ncep.common.log4j.config Bundle-Version: 1.0.0.qualifier -Fragment-Host: org.apache.log4j;bundle-version="1.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/ncep/gov.noaa.nws.ncep.edex.common/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.common/META-INF/MANIFEST.MF index 08ca936ded..7fabfda06c 100644 --- a/ncep/gov.noaa.nws.ncep.edex.common/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.common/META-INF/MANIFEST.MF @@ -20,7 +20,6 @@ Export-Package: gov.noaa.nws.ncep.edex.common.dao, Require-Bundle: com.raytheon.uf.common.serialization;bundle-version="1.11.12", com.raytheon.uf.edex.decodertools;bundle-version="1.11.16", com.raytheon.uf.common.localization;bundle-version="1.11.16", - org.apache.commons.logging;bundle-version="1.0.4", com.raytheon.edex.common;bundle-version="1.11.16", org.geotools;bundle-version="2.5.8", com.facebook.thrift, @@ -36,4 +35,5 @@ Import-Package: com.raytheon.edex.uengine.tasks.query, gov.noaa.nws.ncep.common.tools, javax.measure.converter, javax.measure.quantity, - javax.measure.unit + javax.measure.unit, + org.apache.commons.logging diff --git a/ncep/gov.noaa.nws.ncep.edex.common/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.common/component-deploy.xml deleted file mode 100644 index 909e266200..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.common/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.edex.gempak.jna/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.gempak.jna/META-INF/MANIFEST.MF index 1d3a4d7e67..f66463fcbd 100644 --- a/ncep/gov.noaa.nws.ncep.edex.gempak.jna/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.gempak.jna/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: gempak.jna Plug-in Bundle-SymbolicName: gov.noaa.nws.ncep.edex.gempak.jna Bundle-Version: 1.0.0.qualifier -Bundle-Activator: gov.noaa.nws.ncep.edex.gempak.jna.Activator Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: gov.noaa.nws.ncep.edex.gempak.jna diff --git a/ncep/gov.noaa.nws.ncep.edex.ingest.grib.util/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.ingest.grib.util/META-INF/MANIFEST.MF index 52335f6340..abeca6c1db 100644 --- a/ncep/gov.noaa.nws.ncep.edex.ingest.grib.util/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.ingest.grib.util/META-INF/MANIFEST.MF @@ -4,5 +4,6 @@ Bundle-Name: NCEP logger util for edex ingest grib process Bundle-SymbolicName: gov.noaa.nws.ncep.edex.ingest.grib.util Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: javax.servlet;bundle-version="2.5.0" -Import-Package: gov.noaa.nws.ncep.common.log.logger +Import-Package: gov.noaa.nws.ncep.common.log.logger, + javax.servlet, + javax.servlet.http diff --git a/ncep/gov.noaa.nws.ncep.edex.ingest.grib.util/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.ingest.grib.util/component-deploy.xml deleted file mode 100644 index 71b169335e..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.ingest.grib.util/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.edex.ingest.util/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.ingest.util/META-INF/MANIFEST.MF index 4270e7d7cb..c3078d1af1 100644 --- a/ncep/gov.noaa.nws.ncep.edex.ingest.util/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.ingest.util/META-INF/MANIFEST.MF @@ -4,5 +4,6 @@ Bundle-Name: EDEX Ingest Utility Bundle-SymbolicName: gov.noaa.nws.ncep.edex.ingest.util Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: javax.servlet;bundle-version="2.5.0" -Import-Package: gov.noaa.nws.ncep.common.log.logger +Import-Package: gov.noaa.nws.ncep.common.log.logger, + javax.servlet, + javax.servlet.http diff --git a/ncep/gov.noaa.nws.ncep.edex.ingest.util/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.ingest.util/component-deploy.xml deleted file mode 100644 index 76af1805c6..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.ingest.util/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.airmet/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.airmet/META-INF/MANIFEST.MF index a29c437bbd..2bc26f29ad 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.airmet/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.airmet/META-INF/MANIFEST.MF @@ -11,9 +11,9 @@ Require-Bundle: gov.noaa.nws.ncep.common.dataplugin.airmet;bundle-version="1.0.0 com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", com.raytheon.uf.common.pointdata;bundle-version="1.11.8", com.raytheon.uf.edex.pointdata;bundle-version="1.11.8", - org.apache.commons.logging;bundle-version="1.0.4", org.geotools, javax.persistence, - javax.measure, - org.junit;bundle-version="1.0.0", - org.apache.log4j;bundle-version="1.0.0" + javax.measure +Import-Package: org.apache.commons.logging, + org.apache.log4j, + org.junit diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.airmet/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.airmet/component-deploy.xml deleted file mode 100644 index 5922cf13d5..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.airmet/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.atcf/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.atcf/META-INF/MANIFEST.MF index b15ced5c61..cb2b534839 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.atcf/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.atcf/META-INF/MANIFEST.MF @@ -8,15 +8,15 @@ Bundle-Vendor: NOAA/NWS/NCEP/NCO/SIB Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.31", javax.persistence;bundle-version="1.0.0", - org.junit;bundle-version="1.0.0", - org.apache.log4j;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.0.4", com.raytheon.uf.common.localization;bundle-version="1.11.31", gov.noaa.nws.ncep.common.dataplugin.atcf, gov.noaa.nws.ncep.common;bundle-version="1.0.0", gov.noaa.nws.ncep.edex.common;bundle-version="1.0.0" Import-Package: gov.noaa.nws.ncep.common.dataplugin.atcf, gov.noaa.nws.ncep.edex.tools.decoder, - gov.noaa.nws.ncep.edex.util + gov.noaa.nws.ncep.edex.util, + org.apache.commons.logging, + org.apache.log4j, + org.junit Export-Package: gov.noaa.nws.ncep.edex.plugin.atcf.decoder, gov.noaa.nws.ncep.edex.plugin.atcf.util diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.atcf/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.atcf/component-deploy.xml deleted file mode 100644 index f05b340e20..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.atcf/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.aww/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.aww/META-INF/MANIFEST.MF index 3ead3429c6..86e3daca22 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.aww/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.aww/META-INF/MANIFEST.MF @@ -8,8 +8,6 @@ Bundle-Vendor: AWIPS II migration Require-Bundle: com.raytheon.edex.common;bundle-version="1.10.13", gov.noaa.nws.ncep.edex.common;bundle-version="1.0.0", javax.persistence;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.0.4", - org.apache.log4j;bundle-version="1.0.0", gov.noaa.nws.ncep.common;bundle-version="1.0.0", com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", com.raytheon.uf.common.pointdata;bundle-version="1.11.8", @@ -19,4 +17,6 @@ Require-Bundle: com.raytheon.edex.common;bundle-version="1.10.13", Import-Package: com.raytheon.uf.edex.decodertools.core, com.raytheon.uf.edex.decodertools.time, com.raytheon.uf.edex.wmo.message, + org.apache.commons.logging, + org.apache.log4j, org.junit diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.aww/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.aww/component-deploy.xml deleted file mode 100644 index ff881e6631..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.aww/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/META-INF/MANIFEST.MF index 30f0e475c7..4d49ee51ae 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/META-INF/MANIFEST.MF @@ -11,8 +11,8 @@ Require-Bundle: gov.noaa.nws.ncep.common.dataplugin.convsigmet;bundle-version="1 com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", com.raytheon.uf.common.pointdata;bundle-version="1.11.8", com.raytheon.uf.edex.pointdata;bundle-version="1.11.8", - org.apache.commons.logging;bundle-version="1.0.4", org.geotools, javax.persistence, - javax.measure, - org.junit;bundle-version="1.0.0" + javax.measure +Import-Package: org.apache.commons.logging, + org.junit diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/component-deploy.xml deleted file mode 100644 index 6c19a8394b..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ffg/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.ffg/META-INF/MANIFEST.MF index a42c07cd8d..506030fcfd 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.ffg/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ffg/META-INF/MANIFEST.MF @@ -7,10 +7,8 @@ Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serializ Bundle-Vendor: NOAA/NWS/NCEP/NCO Require-Bundle: com.raytheon.edex.common;bundle-version="1.10.13", javax.persistence;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.0.4", gov.noaa.nws.ncep.common, gov.noaa.nws.ncep.edex.common;bundle-version="1.0.0", - org.apache.log4j;bundle-version="1.0.0", gov.noaa.nws.ncep.common.dataplugin.ffg;bundle-version="1.0.0" Export-Package: gov.noaa.nws.ncep.edex.plugin.ffg.decoder, gov.noaa.nws.ncep.edex.plugin.ffg.util @@ -19,5 +17,6 @@ Import-Package: com.raytheon.uf.edex.decodertools.core, gov.noaa.nws.ncep.common.tools, gov.noaa.nws.ncep.edex.tools.decoder, gov.noaa.nws.ncep.edex.util, + org.apache.log4j, org.junit Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ffg/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ffg/component-deploy.xml deleted file mode 100644 index f6c15fb6b1..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.ffg/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/META-INF/MANIFEST.MF index b16d9cb479..bfd370fc9d 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/META-INF/MANIFEST.MF @@ -7,6 +7,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: com.raytheon.edex.common;bundle-version="1.12.1174", gov.noaa.nws.ncep.common.dataplugin.geomag;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.1.1", com.raytheon.uf.common.localization;bundle-version="1.10.13" -Import-Package: com.raytheon.uf.edex.decodertools.time +Import-Package: com.raytheon.uf.edex.decodertools.time, + org.apache.commons.logging diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/component-deploy.xml deleted file mode 100644 index 69b072c9d6..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.idft/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.idft/META-INF/MANIFEST.MF index 616dd0cac4..616a99ced2 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.idft/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.idft/META-INF/MANIFEST.MF @@ -7,16 +7,15 @@ Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serializ Bundle-Vendor: AWIPS II Migration Require-Bundle: com.raytheon.edex.common;bundle-version="1.10.13", javax.persistence;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.0.4", gov.noaa.nws.ncep.edex.common;bundle-version="1.0.0", - org.junit;bundle-version="1.0.0", - org.apache.log4j;bundle-version="1.0.0", com.raytheon.uf.common.localization;bundle-version="1.10.13", gov.noaa.nws.ncep.common;bundle-version="1.0.0", gov.noaa.nws.ncep.common.dataplugin.idft;bundle-version="1.0.0" Import-Package: com.raytheon.uf.edex.decodertools.core, com.raytheon.uf.edex.wmo.message, + gov.noaa.nws.ncep.common.dataplugin.idft, gov.noaa.nws.ncep.edex.util, - gov.noaa.nws.ncep.common.dataplugin.idft + org.apache.log4j, + org.junit Export-Package: gov.noaa.nws.ncep.edex.plugin.idft.decoder, gov.noaa.nws.ncep.edex.plugin.idft.util diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.idft/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.idft/component-deploy.xml deleted file mode 100644 index 1759936de4..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.idft/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.intlsigmet/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.intlsigmet/META-INF/MANIFEST.MF index af7b3cf7b6..9143bacb2e 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.intlsigmet/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.intlsigmet/META-INF/MANIFEST.MF @@ -11,8 +11,8 @@ Require-Bundle: gov.noaa.nws.ncep.common.dataplugin.intlsigmet;bundle-version="1 com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", com.raytheon.uf.common.pointdata;bundle-version="1.11.8", com.raytheon.uf.edex.pointdata;bundle-version="1.11.8", - org.apache.commons.logging;bundle-version="1.0.4", org.geotools, javax.persistence, - javax.measure, - org.junit;bundle-version="1.0.0" + javax.measure +Import-Package: org.apache.commons.logging, + org.junit diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.intlsigmet/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.intlsigmet/component-deploy.xml deleted file mode 100644 index 7cf6487bf7..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.intlsigmet/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.mcidas/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.mcidas/component-deploy.xml deleted file mode 100644 index 8e704fb06b..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.mcidas/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/META-INF/MANIFEST.MF index 4cd1222cda..f7f869b751 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/META-INF/MANIFEST.MF @@ -7,8 +7,6 @@ Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serializ Bundle-Vendor: NOAA/NWS/NCEP/NCO Require-Bundle: com.raytheon.edex.common, com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", - org.eclipse.core.runtime, - org.apache.commons.logging, org.geotools, javax.measure, com.raytheon.edex.uengine, @@ -23,4 +21,5 @@ Export-Package: gov.noaa.nws.ncep.edex.plugin.mosaic.decoder, gov.noaa.nws.ncep.edex.plugin.mosaic.uengine, gov.noaa.nws.ncep.edex.plugin.mosaic.util Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Import-Package: org.junit +Import-Package: org.apache.commons.logging, + org.junit diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/component-deploy.xml deleted file mode 100644 index e81d1bf46b..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/META-INF/MANIFEST.MF index fcfd330640..c72cc89555 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/META-INF/MANIFEST.MF @@ -6,8 +6,7 @@ Bundle-Version: 1.12.1174.qualifier Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization Bundle-Vendor: NOAA/NWS/NCEP/NCO/SIB Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.apache.commons.logging;bundle-version="1.1.1", - com.raytheon.edex.common;bundle-version="1.12.1174", +Require-Bundle: com.raytheon.edex.common;bundle-version="1.12.1174", com.raytheon.uf.common.pointdata;bundle-version="1.12.1174", com.raytheon.uf.edex.decodertools;bundle-version="1.12.1174", javax.measure;bundle-version="1.0.0", @@ -15,11 +14,10 @@ Require-Bundle: org.apache.commons.logging;bundle-version="1.1.1", javax.persistence;bundle-version="1.0.0", org.apache.camel;bundle-version="1.0.0";resolution:=optional, com.raytheon.uf.common.status;bundle-version="1.12.1174", - gov.noaa.nws.ncep.common.dataplugin.ncairep;bundle-version="1.0.0", - org.apache.log4j;bundle-version="1.0.0", - org.junit + gov.noaa.nws.ncep.common.dataplugin.ncairep;bundle-version="1.0.0" Export-Package: gov.noaa.nws.ncep.edex.plugin.ncairep, gov.noaa.nws.ncep.edex.plugin.ncairep.decoder Import-Package: com.raytheon.uf.edex.pointdata, gov.noaa.nws.ncep.common.tools, - gov.noaa.nws.ncep.edex.util + gov.noaa.nws.ncep.edex.util, + org.apache.commons.logging diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/component-deploy.xml deleted file mode 100644 index 93d1b443c5..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/component-deploy.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/META-INF/MANIFEST.MF index eab06bd53e..2b680b80d5 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/META-INF/MANIFEST.MF @@ -7,7 +7,6 @@ Bundle-Vendor: AWIPS II Migration Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization, com.raytheon.edex.common Require-Bundle: com.raytheon.edex.common, com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", - org.apache.commons.logging, org.geotools, javax.persistence, com.raytheon.uf.common.localization;bundle-version="1.11.7", @@ -16,3 +15,4 @@ Require-Bundle: com.raytheon.edex.common, gov.noaa.nws.ncep.common;bundle-version="1.0.0" Export-Package: gov.noaa.nws.ncep.edex.plugin.ncccfp.decoder Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Import-Package: org.apache.commons.logging diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/component-deploy.xml deleted file mode 100644 index ecaa106e74..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/META-INF/MANIFEST.MF index d5d48f949d..f6b950a0bd 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/META-INF/MANIFEST.MF @@ -10,7 +10,6 @@ Require-Bundle: javax.measure, com.raytheon.edex.common, com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", org.geotools, - org.apache.commons.logging, com.raytheon.edex.uengine, org.apache.commons.lang, org.apache.commons.configuration, @@ -31,7 +30,8 @@ Import-Package: com.raytheon.uf.common.comm, gov.noaa.nws.ncep.common.dataplugin.ncgrib.subgrid, gov.noaa.nws.ncep.common.dataplugin.ncgrib.util, gov.noaa.nws.ncep.edex.common.dao, - org.apache.camel + org.apache.camel, + org.apache.commons.logging Export-Package: gov.noaa.nws.ncep.edex.objects.hibernate.ncgrib, gov.noaa.nws.ncep.edex.plugin.ncgrib, gov.noaa.nws.ncep.edex.plugin.ncgrib.dao, diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/component-deploy.xml deleted file mode 100644 index 25c54510de..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncpafm/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.ncpafm/META-INF/MANIFEST.MF index 510f496897..44547550c9 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncpafm/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncpafm/META-INF/MANIFEST.MF @@ -8,9 +8,6 @@ Bundle-Vendor: AWIPS II Migration Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: com.raytheon.edex.common;bundle-version="1.10.13", javax.persistence;bundle-version="1.0.0", - org.junit;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.0.4", - org.apache.log4j;bundle-version="1.0.0", com.raytheon.uf.common.localization;bundle-version="1.10.13", gov.noaa.nws.ncep.common;bundle-version="1.0.0", gov.noaa.nws.ncep.edex.common;bundle-version="1.0.0" @@ -18,6 +15,9 @@ Import-Package: com.raytheon.uf.common.pointdata, com.raytheon.uf.edex.decodertools.core, gov.noaa.nws.ncep.common.dataplugin.ncpafm, gov.noaa.nws.ncep.edex.tools.decoder, - gov.noaa.nws.ncep.edex.util + gov.noaa.nws.ncep.edex.util, + org.apache.commons.logging, + org.apache.log4j, + org.junit Export-Package: gov.noaa.nws.ncep.edex.plugin.ncpafm.decoder, gov.noaa.nws.ncep.edex.plugin.ncpafm.util diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncpafm/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncpafm/component-deploy.xml deleted file mode 100644 index 5c8cd3e9c4..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncpafm/component-deploy.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/META-INF/MANIFEST.MF index 547b893265..db32cffc86 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/META-INF/MANIFEST.MF @@ -9,7 +9,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: com.raytheon.edex.common;bundle-version="1.12.1174", com.raytheon.uf.edex.pointdata;bundle-version="1.12.1174", com.raytheon.uf.edex.decodertools;bundle-version="1.12.1174", - org.apache.commons.logging;bundle-version="1.1.1", org.geotools;bundle-version="2.6.4", javax.measure;bundle-version="1.0.0", javax.persistence;bundle-version="1.0.0", @@ -19,4 +18,5 @@ Require-Bundle: com.raytheon.edex.common;bundle-version="1.12.1174", Export-Package: gov.noaa.nws.ncep.edex.plugin.ncpirep, gov.noaa.nws.ncep.edex.plugin.ncpirep.decoder Import-Package: com.raytheon.uf.edex.pointdata, - gov.noaa.nws.ncep.common.tools + gov.noaa.nws.ncep.common.tools, + org.apache.commons.logging diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/component-deploy.xml deleted file mode 100644 index 276ad1938e..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/component-deploy.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/META-INF/MANIFEST.MF index bf8a04d1fa..6188f5bafc 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/META-INF/MANIFEST.MF @@ -8,9 +8,9 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.22", gov.noaa.nws.ncep.edex.common;bundle-version="1.0.0", javax.persistence;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.0.4", gov.noaa.nws.ncep.common;bundle-version="1.0.0", com.raytheon.uf.edex.decodertools;bundle-version="1.11.22", gov.noaa.nws.ncep.common.dataplugin.ncscat;bundle-version="1.0.0" -Import-Package: org.apache.log4j Export-Package: gov.noaa.nws.ncep.edex.plugin.ncscat.util +Import-Package: org.apache.commons.logging, + org.apache.log4j diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/component-deploy.xml deleted file mode 100644 index 405f264189..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncscd/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.ncscd/META-INF/MANIFEST.MF index 024ef285e9..a42be2a663 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncscd/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncscd/META-INF/MANIFEST.MF @@ -9,9 +9,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: com.raytheon.edex.common;bundle-version="1.10.13", gov.noaa.nws.ncep.edex.common;bundle-version="1.0.0", javax.persistence;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.0.4", - org.apache.log4j;bundle-version="1.0.0", - org.junit;bundle-version="1.0.0", gov.noaa.nws.ncep.common.dataplugin.ncscd;bundle-version="1.0.0", com.raytheon.uf.edex.pointdata;bundle-version="1.12.1174", org.geotools @@ -23,4 +20,7 @@ Import-Package: com.raytheon.edex.exception, com.raytheon.uf.edex.wmo.message, gov.noaa.nws.ncep.common.dataplugin.ncscd, gov.noaa.nws.ncep.common.dataplugin.tcm, - gov.noaa.nws.ncep.common.tools + gov.noaa.nws.ncep.common.tools, + org.apache.commons.logging, + org.apache.log4j, + org.junit diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncscd/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncscd/component-deploy.xml deleted file mode 100644 index f971ccf7df..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncscd/component-deploy.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/META-INF/MANIFEST.MF index 2851f1212b..673c067937 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/META-INF/MANIFEST.MF @@ -9,9 +9,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: com.raytheon.edex.common;bundle-version="1.10.13", gov.noaa.nws.ncep.edex.common;bundle-version="1.0.0", javax.persistence;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.0.4", - org.apache.log4j;bundle-version="1.0.0", - org.junit;bundle-version="1.0.0", gov.noaa.nws.ncep.common.dataplugin.nctaf;bundle-version="1.0.0", com.raytheon.uf.edex.pointdata;bundle-version="1.12.1174", org.geotools @@ -22,4 +19,7 @@ Import-Package: com.raytheon.edex.exception, com.raytheon.uf.edex.wmo.message, gov.noaa.nws.ncep.common.dataplugin.nctaf, gov.noaa.nws.ncep.common.dataplugin.tcm, - gov.noaa.nws.ncep.common.tools + gov.noaa.nws.ncep.common.tools, + org.apache.commons.logging, + org.apache.log4j, + org.junit diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/component-deploy.xml deleted file mode 100644 index 8ac032a433..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/component-deploy.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.nctext/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.nctext/META-INF/MANIFEST.MF index 0e614c6e91..fa5165a718 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.nctext/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.nctext/META-INF/MANIFEST.MF @@ -26,6 +26,4 @@ Export-Package: gov.noaa.nws.ncep.edex.plugin.nctext.common, Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.7", gov.noaa.nws.ncep.edex.common;bundle-version="1.0.0", javax.persistence;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.0.4", - org.apache.log4j;bundle-version="1.0.0", com.raytheon.uf.edex.decodertools;bundle-version="1.11.7" diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.nctext/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.nctext/component-deploy.xml deleted file mode 100644 index 611cf82978..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.nctext/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncuair/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.ncuair/META-INF/MANIFEST.MF index 16372b2671..e18184ff85 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncuair/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncuair/META-INF/MANIFEST.MF @@ -7,16 +7,16 @@ Bundle-Vendor: NOAA/NWS/NCEP/NCO/SIB Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: gov.noaa.nws.ncep.common.dataplugin.ncuair;bundle-version="1.0.0", com.raytheon.uf.edex.bufrtools;bundle-version="1.11.17", - org.apache.commons.logging;bundle-version="1.0.4", com.raytheon.edex.common;bundle-version="1.11.17", com.raytheon.uf.edex.pointdata, com.raytheon.uf.edex.decodertools;bundle-version="1.11.17", javax.measure;bundle-version="1.0.0", org.geotools;bundle-version="2.5.2", javax.persistence;bundle-version="1.0.0", - gov.noaa.nws.ncep.edex.common;bundle-version="1.0.0", - org.apache.log4j;bundle-version="1.0.0", - org.junit;bundle-version="1.0.0" + gov.noaa.nws.ncep.edex.common;bundle-version="1.0.0" Import-Package: com.raytheon.edex.exception, com.raytheon.uf.edex.pointdata, - gov.noaa.nws.ncep.common.tools + gov.noaa.nws.ncep.common.tools, + org.apache.commons.logging, + org.apache.log4j, + org.junit diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncuair/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncuair/component-deploy.xml deleted file mode 100644 index b1657383f1..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncuair/component-deploy.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.nonconvsigmet/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.nonconvsigmet/META-INF/MANIFEST.MF index 62691df27d..5f1fff9bfa 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.nonconvsigmet/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.nonconvsigmet/META-INF/MANIFEST.MF @@ -11,8 +11,8 @@ Require-Bundle: gov.noaa.nws.ncep.common.dataplugin.nonconvsigmet;bundle-version com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", com.raytheon.uf.common.pointdata;bundle-version="1.11.8", com.raytheon.uf.edex.pointdata;bundle-version="1.11.8", - org.apache.commons.logging;bundle-version="1.0.4", org.geotools, javax.persistence, javax.measure -Import-Package: org.junit +Import-Package: org.apache.commons.logging, + org.junit diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.nonconvsigmet/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.nonconvsigmet/component-deploy.xml deleted file mode 100644 index 691551f482..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.nonconvsigmet/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/META-INF/MANIFEST.MF index 1b6853482e..e5c3bc30b6 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/META-INF/MANIFEST.MF @@ -8,9 +8,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.22", gov.noaa.nws.ncep.edex.common;bundle-version="1.0.0", javax.persistence;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.0.4", gov.noaa.nws.ncep.common;bundle-version="1.0.0", com.raytheon.uf.edex.decodertools;bundle-version="1.11.22", gov.noaa.nws.ncep.common.dataplugin.ntrans;bundle-version="1.0.0" -Import-Package: org.apache.log4j +Import-Package: org.apache.commons.logging Export-Package: gov.noaa.nws.ncep.edex.plugin.ntrans.decoder diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/component-deploy.xml deleted file mode 100644 index 82d3846fdd..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.pgen/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.pgen/META-INF/MANIFEST.MF index 47bb2a5dfe..9eadcf1982 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.pgen/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.pgen/META-INF/MANIFEST.MF @@ -6,6 +6,6 @@ Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: com.raytheon.edex.common;bundle-version="1.12.1174", gov.noaa.nws.ncep.common.dataplugin.pgen;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.1.1", com.raytheon.uf.common.serialization.comm;bundle-version="1.12.1174", com.raytheon.uf.common.message;bundle-version="1.12.1174" +Import-Package: org.apache.commons.logging diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.sgwh/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.sgwh/META-INF/MANIFEST.MF index 522e3499e8..82852ca60f 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.sgwh/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.sgwh/META-INF/MANIFEST.MF @@ -3,11 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: Sgwh Bundle-SymbolicName: gov.noaa.nws.ncep.edex.plugin.sgwh Bundle-Version: 1.0.0.qualifier -Bundle-Activator: gov.noaa.nws.ncep.edex.plugin.sgwh.Activator Require-Bundle: com.raytheon.edex.common;bundle-version="1.12.1174", gov.noaa.nws.ncep.edex.common;bundle-version="1.0.0", - org.eclipse.ui, - org.eclipse.core.runtime, javax.persistence;bundle-version="1.0.0", gov.noaa.nws.ncep.common.dataplugin.sgwh;bundle-version="1.0.0" Bundle-ActivationPolicy: lazy diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.sgwh/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.sgwh/component-deploy.xml deleted file mode 100644 index 517af111e0..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.sgwh/component-deploy.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.sgwhv/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.sgwhv/META-INF/MANIFEST.MF index cb8701819a..786daee8ce 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.sgwhv/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.sgwhv/META-INF/MANIFEST.MF @@ -5,8 +5,6 @@ Bundle-SymbolicName: gov.noaa.nws.ncep.edex.plugin.sgwhv Bundle-Version: 1.0.0.qualifier Require-Bundle: com.raytheon.edex.common;bundle-version="1.12.1174", gov.noaa.nws.ncep.edex.common;bundle-version="1.0.0", - org.eclipse.ui, - org.eclipse.core.runtime, javax.persistence;bundle-version="1.0.0", gov.noaa.nws.ncep.common.dataplugin.sgwhv;bundle-version="1.0.0" Bundle-ActivationPolicy: lazy diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.sgwhv/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.sgwhv/component-deploy.xml deleted file mode 100644 index 14d4375b21..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.sgwhv/component-deploy.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.solarimage/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.solarimage/META-INF/MANIFEST.MF index fd166040da..abddf018ce 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.solarimage/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.solarimage/META-INF/MANIFEST.MF @@ -6,5 +6,5 @@ Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: gov.nasa.gsfc.fits, com.raytheon.edex.common;bundle-version="1.12.1174", - gov.noaa.nws.ncep.common.dataplugin.solarimage;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.1.1" + gov.noaa.nws.ncep.common.dataplugin.solarimage;bundle-version="1.0.0" +Import-Package: org.apache.commons.logging diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.solarimage/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.solarimage/component-deploy.xml deleted file mode 100644 index f095dc4bd1..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.solarimage/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ssha/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.ssha/META-INF/MANIFEST.MF index 90611814fe..85cada40f6 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.ssha/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ssha/META-INF/MANIFEST.MF @@ -9,8 +9,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.31", gov.noaa.nws.ncep.edex.common;bundle-version="1.0.0", javax.persistence;bundle-version="1.0.0", - org.apache.log4j;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.0.4", com.raytheon.uf.edex.decodertools;bundle-version="1.12.1161", gov.noaa.nws.ncep.common.dataplugin.ssha;bundle-version="1.0.0" Export-Package: gov.noaa.nws.ncep.edex.plugin.ssha.decoder, @@ -20,4 +18,5 @@ Import-Package: com.raytheon.uf.edex.decodertools.bufr, com.raytheon.uf.edex.decodertools.bufr.packets, com.raytheon.uf.edex.decodertools.time, com.raytheon.uf.edex.wmo.message, + org.apache.commons.logging, org.junit diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ssha/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ssha/component-deploy.xml deleted file mode 100644 index a2298e07c8..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.ssha/component-deploy.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/META-INF/MANIFEST.MF index 8001670597..5325f5b59b 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/META-INF/MANIFEST.MF @@ -8,15 +8,15 @@ Bundle-Vendor: NOAA/NWS/NCEP/NCO/SIB Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.31", javax.persistence;bundle-version="1.0.0", - org.junit;bundle-version="1.0.0", - org.apache.log4j;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.0.4", com.raytheon.uf.common.localization;bundle-version="1.11.31", gov.noaa.nws.ncep.common.dataplugin.stormtrack, gov.noaa.nws.ncep.common;bundle-version="1.0.0", gov.noaa.nws.ncep.edex.common;bundle-version="1.0.0" Import-Package: gov.noaa.nws.ncep.common.dataplugin.stormtrack, gov.noaa.nws.ncep.edex.tools.decoder, - gov.noaa.nws.ncep.edex.util + gov.noaa.nws.ncep.edex.util, + org.apache.commons.logging, + org.apache.log4j, + org.junit Export-Package: gov.noaa.nws.ncep.edex.plugin.stormtrack.decoder, gov.noaa.nws.ncep.edex.plugin.stormtrack.util diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/component-deploy.xml deleted file mode 100644 index 67f1f26dd6..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/component-deploy.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.tcm/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.tcm/META-INF/MANIFEST.MF index 4786f0bb33..46ed5eb707 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.tcm/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.tcm/META-INF/MANIFEST.MF @@ -7,12 +7,12 @@ Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serializ Bundle-Vendor: NOAA/NWS/NCEP/NCO Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: javax.persistence;bundle-version="1.0.0", - org.junit;bundle-version="1.0.0", com.raytheon.edex.common;bundle-version="1.10.13", - org.apache.log4j;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.0.4", gov.noaa.nws.ncep.edex.common;bundle-version="1.0.0", gov.noaa.nws.ncep.common.dataplugin.tcm;bundle-version="1.0.0" Import-Package: com.raytheon.uf.edex.decodertools.core, com.raytheon.uf.edex.wmo.message, - gov.noaa.nws.ncep.common.tools + gov.noaa.nws.ncep.common.tools, + org.apache.commons.logging, + org.apache.log4j, + org.junit diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.tcm/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.tcm/component-deploy.xml deleted file mode 100644 index 5a0a45a1c4..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.tcm/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.wcp/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.wcp/META-INF/MANIFEST.MF index 6fd007f03b..8ca6eae430 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.wcp/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.wcp/META-INF/MANIFEST.MF @@ -7,14 +7,14 @@ Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serializ Bundle-Vendor: AWIPS II Migration Require-Bundle: com.raytheon.edex.common;bundle-version="1.10.13", javax.persistence;bundle-version="1.0.0", - org.apache.commons.logging;bundle-version="1.0.4", gov.noaa.nws.ncep.edex.common;bundle-version="1.0.0", - org.apache.log4j;bundle-version="1.0.0", gov.noaa.nws.ncep.common;bundle-version="1.0.0", gov.noaa.nws.ncep.common.dataplugin.wcp;bundle-version="1.0.0" Export-Package: gov.noaa.nws.ncep.edex.plugin.wcp.decoder, gov.noaa.nws.ncep.edex.plugin.wcp.util Import-Package: com.raytheon.uf.edex.decodertools.core, gov.noaa.nws.ncep.edex.util, + org.apache.commons.logging, + org.apache.log4j, org.junit Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.wcp/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.wcp/component-deploy.xml deleted file mode 100644 index da28dea632..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.wcp/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.edex.purgeutil/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.purgeutil/META-INF/MANIFEST.MF index d7d21e58e9..d45016e903 100644 --- a/ncep/gov.noaa.nws.ncep.edex.purgeutil/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.edex.purgeutil/META-INF/MANIFEST.MF @@ -8,9 +8,9 @@ Import-Package: com.raytheon.edex.db.dao, com.raytheon.edex.plugin, com.raytheon.uf.common.dataplugin, gov.noaa.nws.ncep.common.log.logger, + javax.servlet, + javax.servlet.http, org.hibernate Require-Bundle: gov.noaa.nws.ncep.edex.common;bundle-version="1.0.0", com.raytheon.edex.common, - org.apache.http;bundle-version="3.0.1", - javax.servlet;bundle-version="2.5.0", - org.apache.log4j;bundle-version="1.0.0" + org.apache.http;bundle-version="4.1.2" diff --git a/ncep/gov.noaa.nws.ncep.edex.purgeutil/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.purgeutil/component-deploy.xml deleted file mode 100644 index ab4e6b09b0..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.purgeutil/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.edex.uengine/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.uengine/component-deploy.xml deleted file mode 100644 index 5e7a6bffa4..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.uengine/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.gempak.parameterConversionLibrary/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.gempak.parameterConversionLibrary/META-INF/MANIFEST.MF index 741d57b459..dd71dd49c6 100644 --- a/ncep/gov.noaa.nws.ncep.gempak.parameterConversionLibrary/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.gempak.parameterConversionLibrary/META-INF/MANIFEST.MF @@ -3,11 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: ParameterConversionLibrary Bundle-SymbolicName: gov.noaa.nws.ncep.gempak.parameterConversionLibrary Bundle-Version: 1.0.0.qualifier -Bundle-Activator: gov.noaa.nws.ncep.gempak.parameterconversionlibrary.Activator -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.junit;bundle-version="1.0.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: gov.noaa.nws.ncep.gempak.parameterconversionlibrary -Import-Package: gov.noaa.nws.ncep.edex.common.sounding +Import-Package: gov.noaa.nws.ncep.edex.common.sounding, + org.junit diff --git a/ncep/gov.noaa.nws.ncep.gempak.parameterConversionLibrary/src/gov/noaa/nws/ncep/gempak/parameterconversionlibrary/Activator.java b/ncep/gov.noaa.nws.ncep.gempak.parameterConversionLibrary/src/gov/noaa/nws/ncep/gempak/parameterconversionlibrary/Activator.java deleted file mode 100644 index 5e19195dd9..0000000000 --- a/ncep/gov.noaa.nws.ncep.gempak.parameterConversionLibrary/src/gov/noaa/nws/ncep/gempak/parameterconversionlibrary/Activator.java +++ /dev/null @@ -1,50 +0,0 @@ -package gov.noaa.nws.ncep.gempak.parameterconversionlibrary; - -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class Activator extends AbstractUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "gov.noaa.nws.ncep.gempak.parameterConversionLibrary"; //$NON-NLS-1$ - - // The shared instance - private static Activator plugin; - - /** - * The constructor - */ - public Activator() { - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static Activator getDefault() { - return plugin; - } - -} diff --git a/ncep/gov.noaa.nws.ncep.ui.nctextui/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.ui.nctextui/META-INF/MANIFEST.MF index 5c6c09cd42..98e013eb2a 100644 --- a/ncep/gov.noaa.nws.ncep.ui.nctextui/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.ui.nctextui/META-INF/MANIFEST.MF @@ -12,7 +12,6 @@ Require-Bundle: org.eclipse.ui, org.geotools, com.raytheon.viz.core;bundle-version="1.11.17", gov.noaa.nws.ncep.ui.pgen, - org.apache.log4j;bundle-version="1.0.0", gov.noaa.nws.ncep.viz.common;bundle-version="1.0.0", com.raytheon.uf.common.pointdata Eclipse-LazyStart: true diff --git a/ncep/gov.noaa.nws.ncep.ui.pgen/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.ui.pgen/META-INF/MANIFEST.MF index 9ad2e1d927..645d497488 100644 --- a/ncep/gov.noaa.nws.ncep.ui.pgen/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.ui.pgen/META-INF/MANIFEST.MF @@ -17,7 +17,6 @@ Require-Bundle: org.eclipse.ui, com.raytheon.uf.common.message, com.raytheon.viz.core.gl;bundle-version="1.12.1174", org.dom4j, - org.junit;bundle-version="1.0.0", gov.noaa.nws.ncep.edex.common;bundle-version="1.0.0", gov.noaa.nws.ncep.viz.common;bundle-version="1.0.0", gov.noaa.nws.ncep.gempak.parameters.core;bundle-version="1.0.0", @@ -45,5 +44,8 @@ Import-Package: com.raytheon.edex.meteoLib, com.raytheon.viz.core.gl, com.raytheon.viz.core.gl.images, gov.noaa.nws.ncep.common.staticdata, - javax.measure.unit + javax.measure.unit, + org.junit, + org.junit.runner, + org.junit.runners Bundle-ClassPath: . diff --git a/ncep/gov.noaa.nws.ncep.viz.common/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.viz.common/META-INF/MANIFEST.MF index dba6f5ac84..e2ea53784b 100644 --- a/ncep/gov.noaa.nws.ncep.viz.common/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.viz.common/META-INF/MANIFEST.MF @@ -12,7 +12,6 @@ Require-Bundle: org.eclipse.ui, com.raytheon.uf.common.message;bundle-version="1.11.22", gov.noaa.nws.ncep.edex.common;bundle-version="1.0.0", gov.noaa.nws.ncep.viz.localization;bundle-version="1.0.0", - org.junit, org.geotools, org.apache.log4j;bundle-version="1.0.0" Eclipse-LazyStart: true @@ -26,5 +25,8 @@ Export-Package: gov.noaa.nws.ncep.viz.common, gov.noaa.nws.ncep.viz.common.ui.color Import-Package: com.raytheon.uf.common.comm, com.vividsolutions.jts.geom, - javax.measure.unit + javax.measure.unit, + org.junit, + org.junit.runner, + org.junit.runners diff --git a/ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF index 1a0a1487b8..b503e96757 100644 --- a/ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF @@ -7,10 +7,10 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.eclipse.ui;bundle-version="3.6.1", org.eclipse.core.runtime;bundle-version="3.6.0", org.geotools;bundle-version="2.6.4", - org.apache.log4j;bundle-version="1.0.0", javax.measure;bundle-version="1.0.0", com.raytheon.viz.core;bundle-version="1.12.1174", com.raytheon.viz.ui;bundle-version="1.12.1174", gov.noaa.nws.ncep.viz.localization;bundle-version="1.0.0", gov.noaa.nws.ncep.gempak.parameters.core;bundle-version="1.0.0" Export-Package: gov.noaa.nws.ncep.viz.customprojection +Import-Package: org.apache.log4j diff --git a/ncep/gov.noaa.nws.ncep.viz.gempak/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.viz.gempak/META-INF/MANIFEST.MF index 7af40520d6..37a5a29a3e 100644 --- a/ncep/gov.noaa.nws.ncep.viz.gempak/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.viz.gempak/META-INF/MANIFEST.MF @@ -18,8 +18,7 @@ Require-Bundle: org.eclipse.ui, com.raytheon.uf.common.parameter;bundle-version="1.0.0", com.raytheon.uf.common.dataplugin.level;bundle-version="1.12.1174", com.sun.jna, - org.geotools;bundle-version="2.6.4", - org.apache.log4j;bundle-version="1.0.0" + org.geotools;bundle-version="2.6.4" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: gov.noaa.nws.ncep.viz.gempak, diff --git a/ncep/gov.noaa.nws.ncep.viz.overlays/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.viz.overlays/META-INF/MANIFEST.MF index a332dfee02..328bec923b 100644 --- a/ncep/gov.noaa.nws.ncep.viz.overlays/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.viz.overlays/META-INF/MANIFEST.MF @@ -8,7 +8,6 @@ Eclipse-BuddyPolicy: ext, registered, global Eclipse-RegisterBuddy: org.apache.velocity, com.raytheon.edex.common, com.raytheon.uf.common.serialization, com.raytheon.uf.common.status, com.raytheon.viz.ui, com.raytheon.viz.core, com.raytheon.uf.viz.core, com.raytheon.uf.common.serialization, gov.noaa.nws.ncep.viz.resources Require-Bundle: com.raytheon.viz.core, com.raytheon.viz.ui, - org.apache.log4j;bundle-version="1.0.0", org.apache.commons.lang, org.eclipse.core.runtime, org.eclipse.ui, @@ -27,6 +26,7 @@ Export-Package: gov.noaa.nws.ncep.viz.overlays, Import-Package: com.raytheon.uf.common.colormap, com.raytheon.uf.common.time, com.raytheon.uf.viz.core.maps, - javax.measure.converter + javax.measure.converter, + org.apache.log4j Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/ncep/gov.noaa.nws.ncep.viz.rsc.ffa/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.viz.rsc.ffa/META-INF/MANIFEST.MF index d45dbe930c..4f7afa5f8a 100644 --- a/ncep/gov.noaa.nws.ncep.viz.rsc.ffa/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.viz.rsc.ffa/META-INF/MANIFEST.MF @@ -19,7 +19,6 @@ Require-Bundle: org.eclipse.ui, com.raytheon.uf.common.time;bundle-version="1.11.31", com.raytheon.uf.edex.decodertools;bundle-version="1.11.31", com.raytheon.viz.core;bundle-version="1.11.31", - org.apache.log4j;bundle-version="1.0.0", com.raytheon.viz.ui;bundle-version="1.12.1174" Bundle-ActivationPolicy: lazy Eclipse-RegisterBuddy: org.apache.log4j, gov.noaa.nws.ncep.resources, com.raytheon.viz.core, com.raytheon.uf.viz.core, com.raytheon.uf.common.serialization @@ -27,4 +26,5 @@ Eclipse-BuddyPolicy: ext, global Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: gov.noaa.nws.ncep.viz.rsc.ffa.rsc, gov.noaa.nws.ncep.viz.rsc.ffa.util -Import-Package: gov.noaa.nws.ncep.viz.ui.display +Import-Package: gov.noaa.nws.ncep.viz.ui.display, + org.apache.log4j diff --git a/ncep/gov.noaa.nws.ncep.viz.tools/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.viz.tools/META-INF/MANIFEST.MF index 1596f73045..9a4f2d9a6b 100644 --- a/ncep/gov.noaa.nws.ncep.viz.tools/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.viz.tools/META-INF/MANIFEST.MF @@ -10,8 +10,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.geotools;bundle-version="2.5.2", com.raytheon.viz.ui, - org.junit, - org.apache.log4j;bundle-version="1.0.0", javax.measure;bundle-version="1.0.0", com.sun.jna;bundle-version="3.0.9", com.raytheon.viz.alerts, @@ -52,4 +50,6 @@ Export-Package: gov.noaa.nws.ncep.viz.tools, Bundle-ClassPath: . Import-Package: gov.noaa.nws.ncep.common.log.logger, gov.noaa.nws.ncep.edex.common.ncinventory, - gov.noaa.nws.ncep.viz.gempak.grid.inv + gov.noaa.nws.ncep.viz.gempak.grid.inv, + org.apache.log4j, + org.junit diff --git a/ncep/gov.noaa.nws.ncep.viz.ui.locator/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.viz.ui.locator/META-INF/MANIFEST.MF index 38f23edbe7..aa24e89a02 100644 --- a/ncep/gov.noaa.nws.ncep.viz.ui.locator/META-INF/MANIFEST.MF +++ b/ncep/gov.noaa.nws.ncep.viz.ui.locator/META-INF/MANIFEST.MF @@ -14,7 +14,6 @@ Require-Bundle: org.eclipse.ui, gov.noaa.nws.ncep.viz.common, org.geotools;bundle-version="2.5.2", gov.noaa.nws.ncep.viz.localization;bundle-version="1.0.0", - org.junit;bundle-version="1.0.0", gov.noaa.nws.ncep.viz.resources Eclipse-LazyStart: true Export-Package: gov.noaa.nws.ncep.viz.ui.locator, diff --git a/ost/gov.noaa.nws.ost.edex.plugin.regionalsat/META-INF/MANIFEST.MF b/ost/gov.noaa.nws.ost.edex.plugin.regionalsat/META-INF/MANIFEST.MF index 1ca0770d47..bfbcf1bd2e 100644 --- a/ost/gov.noaa.nws.ost.edex.plugin.regionalsat/META-INF/MANIFEST.MF +++ b/ost/gov.noaa.nws.ost.edex.plugin.regionalsat/META-INF/MANIFEST.MF @@ -7,7 +7,6 @@ Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serializ Bundle-Vendor: NWS Require-Bundle: com.raytheon.edex.common, com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", - org.apache.commons.logging, org.geotools, javax.measure, org.apache.commons.lang, @@ -22,7 +21,8 @@ Import-Package: com.raytheon.uf.common.localization, com.raytheon.uf.common.menus, com.raytheon.uf.common.menus.xml, - com.raytheon.uf.common.status + com.raytheon.uf.common.status, + org.apache.commons.logging Export-Package: gov.noaa.nws.ost.edex.plugin.regionalsat, gov.noaa.nws.ost.edex.plugin.regionalsat.decoder;uses:="com.raytheon.edex.plugin,gov.noaa.nws.ost.edex.plugin.regionalsat.dao" diff --git a/ost/gov.noaa.nws.ost.edex.plugin.regionalsat/component-deploy.xml b/ost/gov.noaa.nws.ost.edex.plugin.regionalsat/component-deploy.xml deleted file mode 100644 index 6517091880..0000000000 --- a/ost/gov.noaa.nws.ost.edex.plugin.regionalsat/component-deploy.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - -