product.awips plugin.properties, about, logo update

Conflicts:
	cave/com.raytheon.viz.product.awips/icons/awipsLogo.png

cave/com.raytheon.uf.viz.product.alertviz/build.properties

@@ -2,5 +2,4 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               plugin.xml,\
-               plugin.properties
+               plugin.xml

cave/com.raytheon.uf.viz.product.alertviz/plugin.properties

@@ -1 +0,0 @@
-caveVersion=DEVELOPMENT

cave/com.raytheon.uf.viz.product.alertviz/plugin.xml

@@ -36,7 +36,7 @@
             </property>
             <property
                   name="aboutImage"
-                  value="platform:/plugin/com.raytheon.viz.product.awips/icons/ipr.gif">
+                  value="platform:/plugin/com.raytheon.viz.product.awips/icons/awips.png">
             </property>
             <property
                   name="appName"
@@ -44,7 +44,7 @@
             </property>
             <property
                name="version"
-               value="%caveVersion"/>
+               value="%vizVersion"/>
          </product>
       </extension>
       

cave/com.raytheon.viz.product.awips/META-INF/MANIFEST.MF

@@ -9,5 +9,5 @@ Export-Package: com.raytheon.viz.product.awips;uses:="org.eclipse.jface.resource
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Localization: plugin

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

@@ -37,7 +37,8 @@
 -XX:G1MixedGCLiveThresholdPercent=25
 -XX:G1OldCSetRegionThresholdPercent=25
 -XX:G1HeapWastePercent=5
--DvizVersion=DEVELOPMENT
+-DvizVersion=17.1.1-3
+-DbuildSystem=macOS/Eclipse
       </vmArgs>
       <vmArgsWin>-Dfile.encoding=UTF-8
       </vmArgsWin>

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

@@ -1,8 +1,8 @@
-caveAboutText=Common AWIPS Visualization Environment (CAVE)\n\
-\n\
-Developed on the Raytheon Visualization Environment (viz)\n\
-\tBUILD VERSION: {0}\n\
-\tBUILD DATE: {1}\n\
-\tBUILD TIME: {2}\n\
-\tBUILD SYSTEM: {3}
-caveVersion=DEVELOPMENT
+caveAboutText=Common AWIPS Visualization Environment (CAVE), developed \
+on the Raytheon viz environment, released as non-operational \
+software by UCAR's Unidata Program Center\n\
+http://www.unidata.ucar.edu/software/awips \
+\n\n\
+\tVersion: {0}\n\
+\tBuild system: {3}
+caveVersion={0}

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

@@ -33,10 +33,10 @@
                value="%caveAboutText"/>
          <property
                name="version"
-               value="%caveVersion"/>
+               value="%vizVersion"/>
          <property
                name="aboutImage"
-               value="icons/ipr.gif"/>
+               value="icons/awips.png"/>
          <property
                name="appName"
                value="CAVE">

rpms/awips2.cave/Installer.cave/component.spec

@@ -183,35 +183,20 @@ rm -rf /awips2/cave/configuration/org.eclipse.osgi
 
 popd > /dev/null 2>&1
 
-# determine if an installation of awips2-common-base is already present
-# (edex has been installed before CAVE on an ADAM machine)
-#if [ -f /awips2/.cave/installCAVECommon.sh ]; then
-#   # copy common-base files to cave
-#   cp -r /awips2/.cave/.repository /awips2/cave/
-#   cp /awips2/.cave/installCAVECommon.sh /awips2/cave
-#   
-#   # install the common-base feature
-#   /bin/bash /awips2/cave/installCAVECommon.sh
-#   rm -f /awips2/cave/installCAVECommon.sh  
-#   
-#   # cleanup
-#   rm -rf /awips2/.cave
-#fi
+function updateCaveVersion() {
+   # Note: the system properties echoed to the versions script are based on
+   # about.mappings in the com.raytheon.viz.product.awips plugin.
+   AWIPS_VERSION_TXT=/awips2/cave/awipsVersion.txt
 
-#function updateCaveVersion() {
-#   # Note: the system properties echoed to the versions script are based on
-#   # about.mappings in the com.raytheon.viz.product.awips plugin.
-#   AWIPS_VERSION_TXT=/awips2/cave/awipsVersion.txt
-#
-#   echo "-DvizVersion=%{_component_version}-%{_component_release}" > ${AWIPS_VERSION_TXT}
-#   echo "-DbuildDate=%{_component_build_date}" >> ${AWIPS_VERSION_TXT}
-#   echo "-DbuildTime=%{_component_build_time}" >> ${AWIPS_VERSION_TXT}
-#   echo "-DbuildSystem=%{_component_build_system}" >> ${AWIPS_VERSION_TXT}
-#}
-#
-#if [ -d /awips2/cave ]; then
-#   updateCaveVersion
-#fi
+   echo "-DvizVersion=%{_component_version}-%{_component_release}" > ${AWIPS_VERSION_TXT}
+   echo "-DbuildDate=%{_component_build_date}" >> ${AWIPS_VERSION_TXT}
+   echo "-DbuildTime=%{_component_build_time}" >> ${AWIPS_VERSION_TXT}
+   echo "-DbuildSystem=%{_component_build_system}" >> ${AWIPS_VERSION_TXT}
+}
+
+if [ -d /awips2/cave ]; then
+   updateCaveVersion
+fi
 
 chown -R awips:fxalpha /awips2/cave
 

rpms/awips2.core/Installer.version/component.spec

@@ -105,20 +105,6 @@ function updateEDEXVersion()
       >> ${EDEX_BANNER_TXT}
 }
 
-function updateAlertVizVersion() {
-   # Note: alertviz does not include any of the branding information that CAVE does.
-   # So, we will only be utilizing the version override.
-   AWIPS_VERSION_TXT=/awips2/alertviz/awipsVersion.txt
-
-   echo "--launcher.appendVmargs" > ${AWIPS_VERSION_TXT}
-   echo "-vmargs" >> ${AWIPS_VERSION_TXT}
-   echo "-DvizVersion=%{_component_version}-%{_component_release}" >> ${AWIPS_VERSION_TXT}
-}
-
-if [ -d /awips2/alertviz ]; then
-   updateAlertVizVersion
-fi
-
 EDEX_BANNER_TXT="/awips2/edex/conf/banner.txt"
 # does banner.txt exist?
 if [ -f ${EDEX_BANNER_TXT} ]; then