From 8f0d4bd95cace6faefaf61fc09f0fe54b1904c10 Mon Sep 17 00:00:00 2001
From: mjames-upc <mjames@ucar.edu>
Date: Wed, 6 Apr 2016 13:35:53 -0500
Subject: [PATCH] goesr added to build; com.raytheon.uf.edex.ncep.nco.feature
 uncommented; RunDeployInstall.groovy muting hydro deployment

---
 build/deploy.edex/RunDeployInstall.groovy              |  1 +
 .../menus/satellite/goesr/profile-index.xml            |  2 +-
 .../feature.xml                                        |  4 ++++
 edexOsgi/build.edex/deploy-install.xml                 |  8 ++++----
 edexOsgi/com.raytheon.edex.feature.uframe/feature.xml  | 10 +++++++---
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/build/deploy.edex/RunDeployInstall.groovy b/build/deploy.edex/RunDeployInstall.groovy
index 9919ce49ec..9badff160e 100644
--- a/build/deploy.edex/RunDeployInstall.groovy
+++ b/build/deploy.edex/RunDeployInstall.groovy
@@ -94,6 +94,7 @@ class DeployInstall
       // never deploy these features
       blacklistedEdexFeatures.add("com.raytheon.edex.wa.feature")
       blacklistedEdexFeatures.add("com.raytheon.edex.feature.uframe")
+      blacklistedEdexFeatures.add("com.raytheon.uf.edex.hydro.feature")
        
       this.init(workspaceDirectory.trim())
       if (localizationSites.trim() != "")
diff --git a/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/menus/satellite/goesr/profile-index.xml b/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/menus/satellite/goesr/profile-index.xml
index f5da7875a9..5554a30442 100644
--- a/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/menus/satellite/goesr/profile-index.xml
+++ b/cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/menus/satellite/goesr/profile-index.xml
@@ -19,7 +19,7 @@
         further_licensing_information.
     -->
 <menuContributionFile>
-    <include installTo="menu:goesr"
+    <include installTo="menu:satellite?before=GROUP2"
         fileName="menus/satellite/goesr/profileMenu.xml">
     </include>
 </menuContributionFile>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.feature.awips.developer/feature.xml b/cave/com.raytheon.viz.feature.awips.developer/feature.xml
index bda0bcf1f1..a46bf3b3b6 100644
--- a/cave/com.raytheon.viz.feature.awips.developer/feature.xml
+++ b/cave/com.raytheon.viz.feature.awips.developer/feature.xml
@@ -192,6 +192,10 @@
    <includes
          id="gov.noaa.gsd.viz.ensemble.feature"
          version="0.0.0"/>
+		 
+   <includes
+         id="com.raytheon.uf.viz.satellite.goesr.feature"
+         version="0.0.0"/>
 
    <includes
          id="com.raytheon.uf.viz.d2d.damagepath.feature"
diff --git a/edexOsgi/build.edex/deploy-install.xml b/edexOsgi/build.edex/deploy-install.xml
index e6ae8f4365..b9c63585f9 100644
--- a/edexOsgi/build.edex/deploy-install.xml
+++ b/edexOsgi/build.edex/deploy-install.xml
@@ -13,11 +13,11 @@
 	
 
 	<target name="main" depends="init, setup">
-		<property name="esb.directory" value="${repo.dir}/build/deploy.edex.awips2/esb" />
+		<property name="esb.directory" value="${basedir}/build/deploy.edex.awips2/esb" />
 		<!-- deploy esb {optionally: data, web} -->
-		<ant antfile="${repo.dir}/build/deploy.edex.awips2/deploy/deploy-esb.xml" />
+		<ant antfile="${basedir}/build/deploy.edex.awips2/deploy/deploy-esb.xml" />
 		<!-- deploy esb configuration -->
-		<ant antfile="${repo.dir}/build/deploy.edex.awips2/deploy/deploy-esb-configuration.xml" />
+		<ant antfile="${basedir}/build/deploy.edex.awips2/deploy/deploy-esb-configuration.xml" />
 		<!-- optionally: deploy gfesuite -->
 		<if>
 			<equals arg1="${deploy.gfesuite}" arg2="true" />
@@ -250,4 +250,4 @@
 	<!-- static -->
 	<taskdef name="includegen" classname="com.raytheon.uf.anttasks.includesgen.GenerateIncludesFromFeature" classpathref="ant.classpath" />
 	<taskdef resource="net/sf/antcontrib/antlib.xml" classpath="${basedir}/lib/ant/ant-contrib-1.0b3.jar" />
-</project>
\ No newline at end of file
+</project>
diff --git a/edexOsgi/com.raytheon.edex.feature.uframe/feature.xml b/edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
index 2d6bad5a07..6513b048c9 100644
--- a/edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
+++ b/edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
@@ -107,10 +107,9 @@
          id="com.raytheon.uf.edex.ncep.feature"
          version="0.0.0"/>
 
-   <!-- Uncomment to deploy the National Central Operations EDEX plugins locally -->
-   <!-- includes
+   <includes
          id="com.raytheon.uf.edex.ncep.nco.feature"
-         version="0.0.0"/-->
+         version="0.0.0"/>
 
    <includes
          id="com.raytheon.uf.edex.binlightning.feature"
@@ -143,5 +142,10 @@
    <includes
          id="gov.noaa.nws.sr.oun.edex.mping.feature"
          version="0.0.0"/>
+   
+   <includes
+         id="com.raytheon.uf.edex.goesr.feature"
+         version="0.0.0"/>
+
 
 </feature>