From 94d9fe1f6199ad6d03266120c0e1bdee3de10fc5 Mon Sep 17 00:00:00 2001
From: mjames-upc <mjames@ucar.edu>
Date: Mon, 8 Feb 2016 13:11:33 -0600
Subject: [PATCH] feature set reorg for 15.1.2 build

Former-commit-id: 1e02fab43fe3e6ab923308c1f6e75ffd1b94c191
---
 .../feature.xml                               |  7 +++++
 .../feature.xml                               | 30 ++++++++++++++-----
 cave/com.raytheon.viz.gfe.feature/feature.xml |  7 +----
 .../feature.xml                               |  6 ++++
 4 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/cave/com.raytheon.uf.viz.dataplugins.feature/feature.xml b/cave/com.raytheon.uf.viz.dataplugins.feature/feature.xml
index aed9b16de8..c70983b93a 100644
--- a/cave/com.raytheon.uf.viz.dataplugins.feature/feature.xml
+++ b/cave/com.raytheon.uf.viz.dataplugins.feature/feature.xml
@@ -111,6 +111,13 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="com.raytheon.uf.common.dataplugin.ldadmesonet"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
    <plugin
          id="com.raytheon.uf.common.dataplugin.lsr"
          download-size="0"
diff --git a/cave/com.raytheon.viz.feature.awips.developer/feature.xml b/cave/com.raytheon.viz.feature.awips.developer/feature.xml
index de3b919b2e..95257c10a7 100644
--- a/cave/com.raytheon.viz.feature.awips.developer/feature.xml
+++ b/cave/com.raytheon.viz.feature.awips.developer/feature.xml
@@ -69,10 +69,6 @@
          id="com.raytheon.viz.warngen.feature"
          version="0.0.0"/>
 
-   <includes
-         id="gov.noaa.gsd.viz.ensemble.feature"
-         version="0.0.0"/>
-         
    <includes
          id="com.raytheon.viz.grib.feature"
          version="0.0.0"/>
@@ -125,10 +121,18 @@
          id="com.raytheon.uf.viz.ncep.perspective.feature"
          version="0.0.0"/>
 
+   <includes
+         id="com.raytheon.uf.viz.nwsauth.feature"
+         version="0.0.0"/>
+
    <includes
          id="com.raytheon.uf.viz.thinclient.feature"
          version="0.0.0"/>
 
+   <includes
+         id="com.raytheon.uf.viz.useradmin.feature"
+         version="0.0.0"/>
+
    <includes
          id="com.raytheon.uf.viz.kml.export.feature"
          version="0.0.0"/>
@@ -150,13 +154,21 @@
          version="0.0.0"/>
 
    <includes
-         id="com.raytheon.uf.viz.d2d.gfe.feature"
+         id="com.raytheon.viz.avnfps.feature"
          version="0.0.0"/>
 
    <includes
          id="com.raytheon.uf.viz.dat.feature"
          version="0.0.0"/>
 
+   <includes
+         id="com.raytheon.uf.viz.d2d.gfe.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="com.raytheon.uf.viz.collaboration.feature"
+         version="0.0.0"/>
+
    <includes
          id="com.raytheon.uf.viz.gisdatastore.feature"
          version="0.0.0"/>
@@ -172,13 +184,17 @@
    <includes
          id="com.raytheon.uf.viz.aviation.advisory.feature"
          version="0.0.0"/>
-
+<!--
+    <includes
+         id="com.raytheon.uf.viz.datadelivery.feature"
+         version="0.0.0"/>
+-->
    <includes
          id="edu.wisc.ssec.cimss.viz.convectprob.feature"
          version="0.0.0"/>
 
    <includes
-         id="com.raytheon.uf.viz.ncep.npp.feature"
+         id="gov.noaa.gsd.viz.ensemble.feature"
          version="0.0.0"/>
 
    <requires>
diff --git a/cave/com.raytheon.viz.gfe.feature/feature.xml b/cave/com.raytheon.viz.gfe.feature/feature.xml
index 96d217bfc4..5a222d6888 100644
--- a/cave/com.raytheon.viz.gfe.feature/feature.xml
+++ b/cave/com.raytheon.viz.gfe.feature/feature.xml
@@ -23,6 +23,7 @@
       <import feature="com.raytheon.uf.viz.core.feature" version="1.0.0.qualifier"/>
       <import feature="com.raytheon.viz.text.feature" version="1.0.0.qualifier"/>
       <import feature="com.raytheon.uf.viz.kml.export.feature" version="1.0.0.qualifier"/>
+      <import feature="com.raytheon.uf.viz.nwsauth.feature" version="1.0.0.qualifer"/>
    </requires>
 
    <plugin
@@ -37,12 +38,6 @@
          install-size="0"
          version="0.0.0"/>
 
-   <plugin
-         id="com.raytheon.uf.common.dataaccess"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-		 
    <plugin
          id="com.raytheon.viz.ghg"
          download-size="0"
diff --git a/cave/com.raytheon.viz.hydro.feature/feature.xml b/cave/com.raytheon.viz.hydro.feature/feature.xml
index 1805fd7466..14805e3839 100644
--- a/cave/com.raytheon.viz.hydro.feature/feature.xml
+++ b/cave/com.raytheon.viz.hydro.feature/feature.xml
@@ -109,6 +109,12 @@
          install-size="0"
          version="0.0.0"/>
 
+   <plugin
+         id="com.raytheon.uf.common.dataplugin.ldadhydro"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
    <plugin
          id="com.raytheon.uf.viz.app.launcher"
          download-size="0"