From 1c60c28dbccd2c996b275afc8cfb15dc49a08450 Mon Sep 17 00:00:00 2001 From: ucar-tmeyer Date: Thu, 22 Dec 2022 14:37:38 +0000 Subject: [PATCH 1/3] Default CAVE/Thin Client setup with Alertview (also changes in awips2-core) cave/build/p2-build.xml -Added alertview feature to be built by rpms cave/com.raytheon.uf.viz.thinclient.cave/ThinClientPluginBlacklist.txt -Removed cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/ThinClientComponent.java -Removed plugin blacklist cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/preferences/PreferenceInitializer.java -Changed defaults to POLL instead of PUSH, and to POLL every 1 minute (instead of 5) --- cave/build/p2-build.xml | 4 +- .../ThinClientPluginBlacklist.txt | 61 ------------------- .../thinclient/cave/ThinClientComponent.java | 30 +-------- .../preferences/PreferenceInitializer.java | 4 +- 4 files changed, 6 insertions(+), 93 deletions(-) delete mode 100644 cave/com.raytheon.uf.viz.thinclient.cave/ThinClientPluginBlacklist.txt diff --git a/cave/build/p2-build.xml b/cave/build/p2-build.xml index 92f35cdb37..276b047831 100644 --- a/cave/build/p2-build.xml +++ b/cave/build/p2-build.xml @@ -295,7 +295,9 @@ - + + + diff --git a/cave/com.raytheon.uf.viz.thinclient.cave/ThinClientPluginBlacklist.txt b/cave/com.raytheon.uf.viz.thinclient.cave/ThinClientPluginBlacklist.txt deleted file mode 100644 index 6e057604a8..0000000000 --- a/cave/com.raytheon.uf.viz.thinclient.cave/ThinClientPluginBlacklist.txt +++ /dev/null @@ -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 \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/ThinClientComponent.java b/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/ThinClientComponent.java index dca22bfe46..7da204395f 100644 --- a/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/ThinClientComponent.java +++ b/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 * * * @author njensen @@ -117,34 +117,6 @@ public class ThinClientComponent extends CAVE implements IThinClientComponent { ThinClientURICatalog.getInstance(); ThinClientDataUpdateTree.getInstance(); - List pluginBlacklist = new ArrayList(); - 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 diff --git a/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/preferences/PreferenceInitializer.java b/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/preferences/PreferenceInitializer.java index c6dcee086a..a9e275cb8c 100644 --- a/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/preferences/PreferenceInitializer.java +++ b/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); From a590b8859eacbe95160009c7909d9a36dfa3aaa1 Mon Sep 17 00:00:00 2001 From: ucar-tmeyer Date: Fri, 30 Dec 2022 16:02:04 +0000 Subject: [PATCH 2/3] Also removed the building of the AlertViz rpm *rpms/awips2.core/deploy.builder/build.sh *rpms/build/x86_64/build.sh *rpms/build/common/lookupRPM.sh Commented out building of AlertViz rpm *dist/comps.xml Removed mandatory awips2-alertviz rpm Removed awips2-gfesuite rpm Added qpis2-qpid-proton rpm (which typically got installed from dependecies, but wouldn't get removed) --- cave/com.raytheon.viz.product.awips/awips.product | 2 +- dist/comps.xml | 5 ++--- rpms/awips2.core/deploy.builder/build.sh | 2 +- rpms/build/common/lookupRPM.sh | 8 ++++---- rpms/build/x86_64/build.sh | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/cave/com.raytheon.viz.product.awips/awips.product b/cave/com.raytheon.viz.product.awips/awips.product index b84c3f46f1..3ac9729b4e 100644 --- a/cave/com.raytheon.viz.product.awips/awips.product +++ b/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 diff --git a/dist/comps.xml b/dist/comps.xml index 41ef72aba2..c36b09105f 100755 --- a/dist/comps.xml +++ b/dist/comps.xml @@ -102,7 +102,6 @@ awips2-yajsw awips2-edex-rcm awips2-edex-mpe - awips2-gfesuite awips2-edex-geodb awips2-ldm @@ -120,6 +119,7 @@ awips2-python awips2-python-jep awips2-qpid-broker-j + awips2-qpid-proton awips2-rcm awips2-data.hdf5-topo awips2-data.gfe @@ -177,9 +177,9 @@ awips2-cave-wrapper awips2-gfesuite - awips2-alertviz awips2-cli awips2-notification + awips2-qpid-proton awips2-python-dynamicserialize awips2-python-h5py @@ -232,7 +232,6 @@ awips2-ncep-gempak awips2-gfesuite - awips2-alertviz awips2-cli awips2-notification diff --git a/rpms/awips2.core/deploy.builder/build.sh b/rpms/awips2.core/deploy.builder/build.sh index 66a437ae46..ec89be526c 100644 --- a/rpms/awips2.core/deploy.builder/build.sh +++ b/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" diff --git a/rpms/build/common/lookupRPM.sh b/rpms/build/common/lookupRPM.sh index e4f085835e..b919bcefc9 100644 --- a/rpms/build/common/lookupRPM.sh +++ b/rpms/build/common/lookupRPM.sh @@ -342,10 +342,10 @@ function lookupRPM() fi # awips2 rpms -> viz rpms. - if [ "${1}" = "awips2-alertviz" ]; then - export RPM_SPECIFICATION="${awips2_cave_dir}/Installer.alertviz" - return 0 - fi + #if [ "${1}" = "awips2-alertviz" ]; then + # export RPM_SPECIFICATION="${awips2_cave_dir}/Installer.alertviz" + # return 0 + #fi if [ "${1}" = "-cave" ]; then return 0 fi diff --git a/rpms/build/x86_64/build.sh b/rpms/build/x86_64/build.sh index d0b2b1f8b5..a6d66f963f 100644 --- a/rpms/build/x86_64/build.sh +++ b/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" From ba196f94e124044f7ae33aac4b76ea5b99845bbd Mon Sep 17 00:00:00 2001 From: ucar-tmeyer Date: Tue, 3 Jan 2023 17:44:41 +0000 Subject: [PATCH 3/3] Changed the alias cave to run cave.sh, not run.sh since it's no longer used --- rpms/awips2.upc/Installer.awips/scripts/profile.d/awips2.csh | 2 +- rpms/awips2.upc/Installer.awips/scripts/profile.d/awips2.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rpms/awips2.upc/Installer.awips/scripts/profile.d/awips2.csh b/rpms/awips2.upc/Installer.awips/scripts/profile.d/awips2.csh index c4793fcbd8..14042bf2ab 100755 --- a/rpms/awips2.upc/Installer.awips/scripts/profile.d/awips2.csh +++ b/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" diff --git a/rpms/awips2.upc/Installer.awips/scripts/profile.d/awips2.sh b/rpms/awips2.upc/Installer.awips/scripts/profile.d/awips2.sh index 7014af4952..89b917a976 100755 --- a/rpms/awips2.upc/Installer.awips/scripts/profile.d/awips2.sh +++ b/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