Merge pull request #8 from tiffanycmeyer13/thin_client_updates

Default CAVE/Thin Client setup with Alertview

cave/build/p2-build.xml

@@ -298,7 +298,9 @@
 		<antcall target="p2.build.repo">
 			<param name="feature" value="com.raytheon.uf.viz.d2d.ui.awips.feature" />
 		</antcall>
-
+		<antcall target="p2.build.repo">
+			<param name="feature" value="com.raytheon.uf.viz.alertview.feature" />
+		</antcall>
 		<antcall target="cleanup.features" />
 	</target>
 

cave/com.raytheon.uf.viz.thinclient.cave/ThinClientPluginBlacklist.txt

@@ -1,61 +0,0 @@
-# Warngen
-com.raytheon.viz.warngen
-# GFe Perspective
-com.raytheon.viz.gfe
-com.raytheon.viz.ghg
-# AvnFPS
-com.raytheon.viz.aviation
-com.raytheon.viz.avnconfig
-# MPE
-com.raytheon.viz.mpe
-com.raytheon.viz.mpe.ui
-# Hydro
-com.raytheon.viz.hydrobase
-com.raytheon.viz.hydrocommon
-com.raytheon.viz.hydro
-# ncep
-gov.noaa.nws.ncep.viz.ui.perspectives
-gov.noaa.nws.ncep.ui.nctextui
-gov.noaa.nws.ncep.viz.cloudHeight
-gov.noaa.nws.ncep.viz.rsc.airmet
-gov.noaa.nws.ncep.viz.rsc.atcf
-gov.noaa.nws.ncep.viz.rsc.convsigmet
-gov.noaa.nws.ncep.viz.rsc.ffa
-gov.noaa.nws.ncep.viz.rsc.ffg
-gov.noaa.nws.ncep.viz.rsc.idft
-gov.noaa.nws.ncep.viz.rsc.intlsig
-gov.noaa.nws.ncep.viz.rsc.lightning
-gov.noaa.nws.ncep.viz.rsc.mosaic
-gov.noaa.nws.ncep.viz.rsc.ncgrid
-gov.noaa.nws.ncep.viz.rsc.ncscat
-gov.noaa.nws.ncep.viz.rsc.nonconvsigmet
-gov.noaa.nws.ncep.viz.rsc.plotdata
-gov.noaa.nws.ncep.viz.rsc.satellite
-gov.noaa.nws.ncep.viz.rsc.svrl
-gov.noaa.nws.ncep.viz.rsc.warn
-gov.noaa.nws.ncep.viz.rsc.wcn
-gov.noaa.nws.ncep.viz.rsc.wcp
-gov.noaa.nws.ncep.viz.rsc.wstm
-gov.noaa.nws.ncep.viz.rsc.wou
-#localization
-com.raytheon.uf.viz.localization.perspective
-org.eclipse.wst.xml.ui
-com.python.pydev
-com.python.pydev.analysis
-com.python.pydev.codecompletion
-com.python.pydev.debug
-com.python.pydev.fastparser
-com.python.pydev.refactoring
-org.python.pydev
-org.python.pydev.ast
-org.python.pydev.core
-org.python.pydev.customizations
-org.python.pydev.debug
-org.python.pydev.django
-org.python.pydev.help
-org.python.pydev.jython
-org.python.pydev.parser
-org.python.pydev.refactoring
-org.python.pydev.shared_core
-org.python.pydev.shared_interactive_console
-org.python.pydev.shared_ui

cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/ThinClientComponent.java

@@ -78,7 +78,7 @@ import com.raytheon.viz.ui.personalities.awips.CAVE;
  * Dec 04, 2015  5169     bsteffen  Allow ProductAlertObserver to send messages
  *                                  to the AutoUpdater
  * Feb 08, 2016, 5281     tjensen   Combined Data and Menu Refresh Intervals
- * 
+ * May 05, 2017	mjames			Removed thinclient blacklist 
  * </pre>
  * 
  * @author njensen
@@ -117,34 +117,6 @@ public class ThinClientComponent extends CAVE implements IThinClientComponent {
 
         ThinClientURICatalog.getInstance();
         ThinClientDataUpdateTree.getInstance();
-        List<String> pluginBlacklist = new ArrayList<String>();
-        File blacklistFile = BundleScanner.searchInBundle(
-                com.raytheon.uf.viz.thinclient.cave.Activator.PLUGIN_ID, "",
-                "ThinClientPluginBlacklist.txt");
-        if (blacklistFile != null && blacklistFile.exists()) {
-            BufferedReader reader = null;
-            try {
-                reader = new BufferedReader(new FileReader(blacklistFile));
-                String line = null;
-                while (null != (line = reader.readLine())) {
-                    pluginBlacklist.add(line.trim());
-                }
-            } finally {
-                if (reader != null) {
-                    reader.close();
-                }
-            }
-        }
-        try {
-            for (Bundle b : Activator.getDefault().getContext().getBundles()) {
-                if (pluginBlacklist.contains(b.getSymbolicName())) {
-                    b.stop();
-                    b.uninstall();
-                }
-            }
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
     }
 
     @Override

cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/preferences/PreferenceInitializer.java

@@ -68,7 +68,7 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer {
          * method will be used.
          */
         store.setDefault(ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD,
-                ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD_PUSH);
+                ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD_POLL);
 
         store.setDefault(
                 ThinClientPreferenceConstants.P_ENABLE_REQUEST_COMPRESSION,
@@ -80,7 +80,7 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer {
 
         // Default data refresh rate
         store.setDefault(ThinClientPreferenceConstants.P_DATA_REFRESH_INTERVAL,
-                5);
+                1);
 
         // By default, no proxy used
         store.setDefault(ThinClientPreferenceConstants.P_USE_PROXIES, false);

cave/com.raytheon.viz.product.awips/awips.product

@@ -24,7 +24,7 @@
 -Dorg.eclipse.swt.internal.gtk.cairoGraphics=false
 -Dorg.eclipse.swt.internal.gtk.useCairo=false
 -Dorg.eclipse.ui/KEY_CONFIGURATION_ID=com.raytheon.viz.ui.cave.scheme
--Dlogback.configurationFile=logback-viz-core.xml
+-Dlogback.configurationFile=logback-viz-alertview.xml
 -Dlogback.statusListenerClass=com.raytheon.uf.common.logback.UFLogbackInternalStatusListener
 -Dthrift.stream.maxsize=320
 -Dviz.memory.warn.threshold=10M

dist/comps.xml

@@ -102,7 +102,6 @@
          <packagereq type="mandatory">awips2-yajsw</packagereq>
          <packagereq type="mandatory">awips2-edex-rcm</packagereq>
          <packagereq type="mandatory">awips2-edex-mpe</packagereq>
-         <packagereq type="mandatory">awips2-gfesuite</packagereq>
          <packagereq type="mandatory">awips2-edex-geodb</packagereq>
          <packagereq type="mandatory">awips2-ldm</packagereq>
 
@@ -120,6 +119,7 @@
          <packagereq type="mandatory">awips2-python</packagereq>
          <packagereq type="mandatory">awips2-python-jep</packagereq>
          <packagereq type="mandatory">awips2-qpid-broker-j</packagereq>
+         <packagereq type="mandatory">awips2-qpid-proton</packagereq>
          <packagereq type="mandatory">awips2-rcm</packagereq>
          <packagereq type="mandatory">awips2-data.hdf5-topo</packagereq>
          <packagereq type="mandatory">awips2-data.gfe</packagereq>
@@ -177,9 +177,9 @@
          <packagereq type="mandatory">awips2-cave-wrapper</packagereq>
          <packagereq type="mandatory">awips2-gfesuite</packagereq>
 
-         <packagereq type="mandatory">awips2-alertviz</packagereq>
          <packagereq type="mandatory">awips2-cli</packagereq>
          <packagereq type="mandatory">awips2-notification</packagereq>
+         <packagereq type="mandatory">awips2-qpid-proton</packagereq>
 
          <packagereq type="mandatory">awips2-python-dynamicserialize</packagereq>
          <packagereq type="mandatory">awips2-python-h5py</packagereq>
@@ -232,7 +232,6 @@
          <packagereq type="mandatory">awips2-ncep-gempak</packagereq>
          <packagereq type="mandatory">awips2-gfesuite</packagereq>
 
-         <packagereq type="mandatory">awips2-alertviz</packagereq>
          <packagereq type="mandatory">awips2-cli</packagereq>
          <packagereq type="mandatory">awips2-notification</packagereq>
 

rpms/awips2.core/deploy.builder/build.sh

@@ -179,7 +179,7 @@ buildRPM "Installer.gfesuite-server"
 buildRPM "Installer.database-standalone-configuration"
 buildRPM "Installer.database-server-configuration"
 buildRPM "Installer.adapt-native"
-buildRPM "Installer.alertviz"
+#buildRPM "Installer.alertviz"
 buildRPM "Installer.aviation"
 buildRPM "Installer.cli"
 buildRPM "Installer.database"

rpms/awips2.upc/Installer.awips/scripts/profile.d/awips2.csh

@@ -9,7 +9,7 @@ if ( ${USER} == "root" ) then
   endif
   exit 1
 endif
-alias cave /awips2/cave/run.sh
+alias cave /awips2/cave/cave.sh
 set JAVA_INSTALL="/awips2/java"
 set PYTHON_INSTALL="/awips2/python"
 set QPID_LIB_DIR="/awips2/qpid/lib"

rpms/awips2.upc/Installer.awips/scripts/profile.d/awips2.sh

@@ -25,7 +25,7 @@ if [[ ${USER} = "root" ]]; then
 fi
 
 # CAVE alias
-alias cave='/awips2/cave/run.sh'
+alias cave='/awips2/cave/cave.sh'
 if [ -d /awips2/cave ]; then
   export TMCP_HOME=/awips2/cave/caveEnvironment
   export FXA_HOME=/awips2/cave/caveEnvironment

rpms/build/common/lookupRPM.sh

@@ -342,10 +342,10 @@ function lookupRPM()
    fi
 
    # awips2 rpms -> viz rpms.
-   if [ "${1}" = "awips2-alertviz" ]; then
+   #if [ "${1}" = "awips2-alertviz" ]; then
-      export RPM_SPECIFICATION="${awips2_cave_dir}/Installer.alertviz"
+   #   export RPM_SPECIFICATION="${awips2_cave_dir}/Installer.alertviz"
-      return 0
+   #   return 0
-   fi
+   #fi
    if [ "${1}" = "-cave" ]; then
       return 0
    fi

rpms/build/x86_64/build.sh

@@ -165,7 +165,7 @@ function build_server(){
    build_pypies
    buildLocalization
    
-   buildRPM "awips2-alertviz"
+   #buildRPM "awips2-alertviz"
    buildRPM "awips2-aviation-shared"
    buildRPM "awips2-cli"
    buildRPM "awips2-common-base"