From 1a6e9108d586c2cb710bf34a976c1d2b4a8d2bc7 Mon Sep 17 00:00:00 2001
From: Michael James <mjames@ucar.edu>
Date: Wed, 24 May 2017 13:00:24 -0600
Subject: [PATCH] mac product and feature updates for product export

---
 .../feature.xml                               |  6 -----
 .../feature.xml                               | 24 ++-----------------
 .../awips.product                             |  5 ++--
 .../developer.product                         |  8 ++++---
 .../nawips.product                            |  2 +-
 5 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/cave/com.raytheon.viz.avnfps.feature/feature.xml b/cave/com.raytheon.viz.avnfps.feature/feature.xml
index 021b3248fa..94c993d7ee 100644
--- a/cave/com.raytheon.viz.avnfps.feature/feature.xml
+++ b/cave/com.raytheon.viz.avnfps.feature/feature.xml
@@ -35,12 +35,6 @@
          install-size="0"
          version="0.0.0"/>
 
-   <plugin
-         id="com.raytheon.viz.avnconfig"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
    <plugin
          id="com.raytheon.uf.common.dataplugin.taf"
          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 26ba971312..9070ac94c9 100644
--- a/cave/com.raytheon.viz.feature.awips.developer/feature.xml
+++ b/cave/com.raytheon.viz.feature.awips.developer/feature.xml
@@ -92,7 +92,7 @@
    <includes
          id="com.raytheon.uf.viz.satellite.goesr.feature"
          version="0.0.0"/>
-   
+
    <includes
          id="com.raytheon.uf.viz.ncep.core.feature"
          version="0.0.0"/>
@@ -161,22 +161,10 @@
          id="com.raytheon.uf.viz.acarssounding.feature"
          version="0.0.0"/>
 
-   <includes
-         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"/>
@@ -200,11 +188,7 @@
    <includes
          id="com.raytheon.uf.viz.d2d.damagepath.feature"
          version="0.0.0"/>
-<!--
-   <includes
-         id="gov.noaa.gsd.viz.hazards.feature"
-         version="0.0.0"/>
--->
+
    <includes
          id="com.raytheon.uf.viz.ncep.npp.feature"
          version="0.0.0"/>
@@ -217,10 +201,6 @@
          id="com.raytheon.uf.viz.grib.feature"
          version="0.0.0"/>
 
-   <includes
-         id="com.raytheon.uf.viz.bmh.feature"
-         version="0.0.0"/>
-
    <includes
          id="gov.noaa.gsd.viz.ensemble.feature"
          version="0.0.0"/>
diff --git a/cave/com.raytheon.viz.product.awips/awips.product b/cave/com.raytheon.viz.product.awips/awips.product
index 4148ea7979..3a6cfa082a 100644
--- a/cave/com.raytheon.viz.product.awips/awips.product
+++ b/cave/com.raytheon.viz.product.awips/awips.product
@@ -24,9 +24,9 @@
 -Dorg.eclipse.swt.internal.gtk.cairoGraphics=false
 -Dorg.eclipse.ui/KEY_CONFIGURATION_ID=com.raytheon.viz.ui.cave.scheme
 -Dqpid.dest_syntax=BURL
--Dlogback.configurationFile=logback-viz-core.xml
+-Dlogback.configurationFile=logback-viz-core-developer.xml
 -Dlogback.statusListenerClass=com.raytheon.uf.common.logback.UFLogbackInternalStatusListener
--Dthrift.stream.maxsize=200
+-Dthrift.stream.maxsize=400
 -Dviz.memory.warn.threshold=98
 -Dhttps.certificate.check=true
 -XX:+UnlockExperimentalVMOptions
@@ -108,7 +108,6 @@
       <feature id="com.raytheon.viz.text.feature"/>
       <feature id="com.raytheon.viz.warngen.feature"/>
       <feature id="com.raytheon.viz.gfe.feature"/>
-      <!-- <feature id="com.raytheon.uf.viz.dat.feature"/> -->
       <feature id="com.raytheon.uf.viz.d2d.ui.awips.feature"/>
       <feature id="com.raytheon.uf.viz.d2d.gfe.feature"/>
       <feature id="com.raytheon.uf.viz.ncep.dataplugins.feature"/>
diff --git a/cave/com.raytheon.viz.product.awips/developer.product b/cave/com.raytheon.viz.product.awips/developer.product
index a631c8ac7e..0a192e5b99 100644
--- a/cave/com.raytheon.viz.product.awips/developer.product
+++ b/cave/com.raytheon.viz.product.awips/developer.product
@@ -14,18 +14,19 @@
    </configIni>
 
    <launcherArgs>
-      <programArgs>-data @user.home/Library/caveData -user @user.home/Library/caveData -clean -consoleLog -component thinclient -alertviz
+      <programArgs>-data @user.home/Library/CAVE -user @user.home/Library/CAVE -clean -consoleLog -component thinclient -alertviz
       </programArgs>
       <vmArgs>-Xmx4536M
 -XX:+UseG1GC
 -XstartOnFirstThread
 -Dosgi.instance.area.readOnly=true
+-Djava.library.path=lib/ext
 -Dorg.eclipse.update.reconcile=false
 -Dorg.eclipse.ui/KEY_CONFIGURATION_ID=com.raytheon.viz.ui.cave.scheme
 -Dqpid.dest_syntax=BURL
 -Dlogback.configurationFile=logback-viz-core-developer.xml
 -Dlogback.statusListenerClass=com.raytheon.uf.common.logback.UFLogbackInternalStatusListener
--Dthrift.stream.maxsize=800
+-Dthrift.stream.maxsize=400
 -Dviz.memory.warn.threshold=99
 -Dorg.eclipse.swt.internal.gtk.cairoGraphics=false
 -Dhttps.certificate.check=false
@@ -58,7 +59,8 @@
    </launcher>
 
    <vm>
-      <windows include="true">jdk1.7.0</windows>
+      <macos include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</macos>
+      <windows include="true">JavaSE-1.8</windows>
    </vm>
 
    <plugins>
diff --git a/cave/com.raytheon.viz.product.awips/nawips.product b/cave/com.raytheon.viz.product.awips/nawips.product
index ef73f603ac..7582cb10be 100644
--- a/cave/com.raytheon.viz.product.awips/nawips.product
+++ b/cave/com.raytheon.viz.product.awips/nawips.product
@@ -24,7 +24,7 @@
 -Dorg.eclipse.swt.internal.gtk.cairoGraphics=false
 -Dorg.eclipse.ui/KEY_CONFIGURATION_ID=com.raytheon.viz.ui.cave.scheme
 -Dqpid.dest_syntax=BURL
--Dlogback.configurationFile=logback-viz-core.xml
+-Dlogback.configurationFile=logback-viz-alertview.xml
 -Dlogback.statusListenerClass=com.raytheon.uf.common.logback.UFLogbackInternalStatusListener
 -Dthrift.stream.maxsize=200
 -Dviz.memory.warn.threshold=98