From 8c48ae0c7f60b77784bbacc686489e7e31d7fc59 Mon Sep 17 00:00:00 2001
From: Everett Kladstrup <Everett.A.Kladstrup@raytheon.com>
Date: Thu, 10 Apr 2014 10:49:23 -0500
Subject: [PATCH] Issue #2725 Put derivparam plugins in viz and edex separately

Former-commit-id: e543570a0794d05df3f38420d9c46e7fb33da784 [formerly 90244ad7ec714f01fadceece873c96e95261ad26] [formerly d76aaed2f0e5addb0e072092268d33096da056c8] [formerly e543570a0794d05df3f38420d9c46e7fb33da784 [formerly 90244ad7ec714f01fadceece873c96e95261ad26] [formerly d76aaed2f0e5addb0e072092268d33096da056c8] [formerly 1a8a05cd0e635ef3773a951a5fd23c6b67418cda [formerly d76aaed2f0e5addb0e072092268d33096da056c8 [formerly b349f878ffe5fb8fd231cc9286cce6542f0ed88e]]]]
Former-commit-id: 1a8a05cd0e635ef3773a951a5fd23c6b67418cda
Former-commit-id: 2bdc415769ff46ef9255e2ccb0283e70cc24ecf8 [formerly fa9ee9766223857a8fdb0270fae791c49c35b496] [formerly a7438ce6930c1b0cfa77ca4e1ab2e52ab9d87305 [formerly db413dc65faa08c89bb0142d155030543a3fc706]]
Former-commit-id: 3c959c72253be569c0d3064f9aa11bbcb014ea8f [formerly 1a68ea889a34d630c5450b336c23769a5c4e833c]
Former-commit-id: 1467f1a3163ba6f02d520aedbf522512660263d9
---
 .../feature.xml                               | 20 +++++++++++++++++++
 .../feature.xml                               | 19 ------------------
 .../feature.xml                               | 14 -------------
 .../META-INF/MANIFEST.MF                      |  7 ++++---
 .../feature.xml                               |  7 +++++++
 .../feature.xml                               | 13 ++++++++++++
 6 files changed, 44 insertions(+), 36 deletions(-)

diff --git a/cave/com.raytheon.uf.viz.common.core.feature/feature.xml b/cave/com.raytheon.uf.viz.common.core.feature/feature.xml
index dfd2463861..3cb67845b3 100644
--- a/cave/com.raytheon.uf.viz.common.core.feature/feature.xml
+++ b/cave/com.raytheon.uf.viz.common.core.feature/feature.xml
@@ -133,4 +133,24 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="com.raytheon.uf.common.derivparam"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="com.raytheon.uf.common.derivparam.python"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.raytheon.uf.common.inventory"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/cave/com.raytheon.uf.viz.core.feature/feature.xml b/cave/com.raytheon.uf.viz.core.feature/feature.xml
index d655107d2f..15e7d2f59d 100644
--- a/cave/com.raytheon.uf.viz.core.feature/feature.xml
+++ b/cave/com.raytheon.uf.viz.core.feature/feature.xml
@@ -67,18 +67,6 @@
          install-size="0"
          version="0.0.0"/>
 
-   <plugin
-         id="com.raytheon.uf.common.derivparam"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="com.raytheon.uf.common.derivparam.python"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
    <plugin
          id="com.raytheon.uf.viz.derivparam.ui"
          download-size="0"
@@ -205,11 +193,4 @@
          install-size="0"
          version="0.0.0"/>
 
-   <plugin
-         id="com.raytheon.uf.common.inventory"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/edexOsgi/com.raytheon.uf.common.base.feature/feature.xml b/edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
index 50d1f77f75..fc1fa63374 100644
--- a/edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
+++ b/edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
@@ -373,13 +373,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="com.raytheon.uf.common.derivparam"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.apache.qpid"
          download-size="0"
@@ -430,11 +423,4 @@
          install-size="0"
          version="0.9.9"/>
 
-   <plugin
-         id="com.raytheon.uf.common.inventory"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/edexOsgi/com.raytheon.uf.common.derivparam.python/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.derivparam.python/META-INF/MANIFEST.MF
index b522ed5068..12472dc0ed 100644
--- a/edexOsgi/com.raytheon.uf.common.derivparam.python/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.derivparam.python/META-INF/MANIFEST.MF
@@ -1,18 +1,19 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Derived Parameter Python Plug-in
-Bundle-SymbolicName: com.raytheon.uf.common.derivparam.python;singleton:=true
+Bundle-SymbolicName: com.raytheon.uf.common.derivparam.python
 Bundle-Version: 1.14.0.qualifier
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.raytheon.uf.common.python,
  com.raytheon.uf.common.python.concurrent,
- com.raytheon.uf.viz.core;bundle-version="1.13.0",
  com.raytheon.uf.common.wxmath,
  com.raytheon.uf.common.util,
  com.raytheon.uf.common.datastorage,
- com.raytheon.uf.common.derivparam;bundle-version="1.12.1174"
+ com.raytheon.uf.common.derivparam;bundle-version="1.12.1174",
+ com.raytheon.uf.common.status;bundle-version="1.12.1174",
+ com.raytheon.uf.common.localization;bundle-version="1.14.0"
 Export-Package: com.raytheon.uf.common.derivparam.python,
  com.raytheon.uf.common.derivparam.python.function
 Import-Package: com.raytheon.uf.common.inventory.tree
diff --git a/edexOsgi/com.raytheon.uf.edex.base.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.base.feature/feature.xml
index 7605bdd28d..0aff8145cc 100644
--- a/edexOsgi/com.raytheon.uf.edex.base.feature/feature.xml
+++ b/edexOsgi/com.raytheon.uf.edex.base.feature/feature.xml
@@ -196,4 +196,11 @@
          install-size="0"
          version="0.0.0"/>
 
+   <plugin
+         id="com.raytheon.uf.common.inventory"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
index 2ba5829756..194ca4d4ad 100644
--- a/edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
+++ b/edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
@@ -161,4 +161,17 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="com.raytheon.uf.common.derivparam"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="com.raytheon.uf.common.derivparam.python"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>