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)
This commit is contained in:
ucar-tmeyer 2022-12-22 14:37:38 +00:00
parent 3bf5fd6280
commit 1c60c28dbc
4 changed files with 6 additions and 93 deletions

View file

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

View file

@ -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

View file

@ -78,7 +78,7 @@ import com.raytheon.viz.ui.personalities.awips.CAVE;
* Dec 04, 2015 5169 bsteffen Allow ProductAlertObserver to send messages * Dec 04, 2015 5169 bsteffen Allow ProductAlertObserver to send messages
* to the AutoUpdater * to the AutoUpdater
* Feb 08, 2016, 5281 tjensen Combined Data and Menu Refresh Intervals * Feb 08, 2016, 5281 tjensen Combined Data and Menu Refresh Intervals
* * May 05, 2017 mjames Removed thinclient blacklist
* </pre> * </pre>
* *
* @author njensen * @author njensen
@ -117,34 +117,6 @@ public class ThinClientComponent extends CAVE implements IThinClientComponent {
ThinClientURICatalog.getInstance(); ThinClientURICatalog.getInstance();
ThinClientDataUpdateTree.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 @Override

View file

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