xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'remotes/origin/unidata_16.2.2' into unidata_16.2.2-osx

Browse source 
Conflicts:
	cave/build/alertviz/customTargets.xml
	cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/index.xml
	cave/com.raytheon.uf.viz.d2d.ui.upperair/plugin.xml
	cave/com.raytheon.uf.viz.dat.feature/feature.xml
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cm/AWIPS2_NWS/edex/gov.noaa.nws.ost.edex.plugin.binlightning/src/gov/noaa/nws/ost/edex/plugin/binlightning/BinLightningAESKey.java
	cm/AWIPS2_NWS/edex/gov.noaa.nws.ost.edex.plugin.binlightning/src/gov/noaa/nws/ost/edex/plugin/binlightning/BinLightningAESKey.properties
	edexOsgi/build.edex/deploy.edex.awips2/.project
	edexOsgi/build.edex/deploy.edex.awips2/.pydevproject
	edexOsgi/build.edex/esb/etc/centralRegistry.sh
	edexOsgi/build.edex/esb/etc/dataprovideragent.sh
	edexOsgi/com.raytheon.edex.plugin.binlightning/utility/edex_static/base/distribution/binlightning.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satFog.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satMoisture.xml
	edexOsgi/com.raytheon.uf.edex.binlightning.feature/.project
	rpms/awips2.core/Installer.localization/utility/cave_static/bundles/scales/States.xml
This commit is contained in:
Michael James 2016-11-01 13:21:00 -06:00
commit 4a4c2df792
809 changed files with 20875 additions and 77053 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
build/deploy.edex.awips2/esb/conf/logback-edex-appenders.xml
View file

@ -9,17 +9,4 @@
<appender-ref ref="console" /> <appender-ref ref="console" />
</appender> </appender>
<!-- Performance log -->
<!--
<appender name="PerformanceLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="com.raytheon.uf.common.logback.policy.StdTimeBasedRollingPolicy">
<name>performance</name>
</rollingPolicy>
<encoder class="com.raytheon.uf.common.logback.encoder.UFStdEncoder"/>
</appender>
<appender name="PerformanceLogAsync" class="ch.qos.logback.classic.AsyncAppender">
<appender-ref ref="PerformanceLog" />
</appender>
-->
</included> </included>

7
build/deploy.edex.awips2/esb/conf/logback-edex-loggers.xml
View file

@ -4,11 +4,6 @@
<level value="INFO"/> <level value="INFO"/>
</logger> </logger>
<logger name="PerformanceLogger" additivity="false">
<level value="DEBUG"/>
<appender-ref ref="PerformanceLogAsync" />
</logger>
<!-- used by c3p0 --> <!-- used by c3p0 -->
<logger name="com.mchange"> <logger name="com.mchange">
<level value="ERROR"/> <level value="ERROR"/>
@ -46,4 +41,4 @@
<logger name="org.apache.cxf"> <logger name="org.apache.cxf">
<level value="ERROR"/> <level value="ERROR"/>
</logger> </logger>
</included> </included>

11
build/deploy.edex/DeployEdexSiteLocalization.groovy
View file

@ -50,14 +50,7 @@ class DeployEdexSiteLocalization
public static void deploy(String edexRootDirectory, ProjectInformation projectInformation, String site) public static void deploy(String edexRootDirectory, ProjectInformation projectInformation, String site)
{ {
if (projectInformation == null)
{
log.log(java.util.logging.Level.WARNING,
"Unable to find the localization project associated with site " + site +
"; skipping localization deployment")
return
}
String localizationDestination = edexRootDirectory + File.separator + EDEX_LOCALIZATION_DIRECTORY String localizationDestination = edexRootDirectory + File.separator + EDEX_LOCALIZATION_DIRECTORY
new File(localizationDestination).mkdirs() new File(localizationDestination).mkdirs()
@ -67,7 +60,7 @@ class DeployEdexSiteLocalization
log.info "Deploying localization for site ... " + site log.info "Deploying localization for site ... " + site
ant.copy( todir : localizationDestination, overwrite : true ) ant.copy( todir : localizationDestination, overwrite : true )
{ {
fileset( dir : projectInformation.projectFullLocation + File.separator + "utility" ) fileset( dir : "../../localization/localization/utility" )
} }
} }
} }

14
build/deploy.edex/RunDeployInstall.groovy
View file

@ -143,15 +143,11 @@ class DeployInstall
DeployPythonPackages.deploy(this.pythonRootDirectory, DeployPythonPackages.deploy(this.pythonRootDirectory,
this.projectInformationMap["pythonPackages"], this.pythonPackagesToDeploy) this.projectInformationMap["pythonPackages"], this.pythonPackagesToDeploy)
} }
if (this.localizationSitesToDeploy.length > 0)
{ String localizationProject = "localization"
for (String localizationSite : this.localizationSitesToDeploy) DeployEdexSiteLocalization.deploy(this.edexRootDirectory,
{ this.projectInformationMap[localizationProject], "BOU")
String localizationProject = "localization." + localizationSite
DeployEdexSiteLocalization.deploy(this.edexRootDirectory,
this.projectInformationMap[localizationProject], localizationSite)
}
}
} }
// remove the existing deployment // remove the existing deployment

2
cave/build/alertviz/customTargets.xml
View file

@ -187,8 +187,6 @@
<fileset dir="${buildDirectory}/../../static/win32.amd64" <fileset dir="${buildDirectory}/../../static/win32.amd64"
excludes="cave/**" /> excludes="cave/**" />
<zipfileset dir="${buildDirectory}/../../../rpms/legal"
includes="Master_Rights_File.pdf" prefix="alertviz"/>
</zip> </zip>
</target> </target>

2
cave/build/build.properties.p2
View file

@ -21,7 +21,7 @@ javacFailOnError=true
javacVerbose=true javacVerbose=true
javacSource=1.7 javacSource=1.7
javacTarget=1.7 javacTarget=1.7
compilerArg=-g:lines,source compilerArg=-g:lines,source -nowarn
generate.p2.metadata=true generate.p2.metadata=true
p2.metadata.repo=file:/${buildDirectory}/repository p2.metadata.repo=file:/${buildDirectory}/repository

86
cave/build/build.sh Executable file
View file

@ -0,0 +1,86 @@
#!/bin/sh
##
# This software was developed and / or modified by Raytheon Company,
# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
#
# U.S. EXPORT CONTROLLED TECHNICAL DATA
# This software product contains export-restricted data whose
# export/transfer/disclosure is restricted by U.S. law. Dissemination
# to non-U.S. persons whether in the United States or abroad requires
# an export license or other authorization.
#
# Contractor Name: Raytheon Company
# Contractor Address: 6825 Pine Street, Suite 340
# Mail Stop B8
# Omaha, NE 68106
# 402.291.0100
#
# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
# further licensing information.
##
USAGE="Usage: `basename $0` [options]\nOptions:\n
\t-eclipse=ECLIPSEPATH\tSets the full path to the eclipse directory REQUIRED\n"
OPTS_FOR_ANT=""
for i in $*
do
case $i in
-D*)
OPTS_FOR_ANT=`echo "$OPTS_FOR_ANT $i "`
;;
-eclipse=*)
ECLIPSE_HOME=`echo $i | sed 's/[-a-zA-Z0-9]*=//'`
;;
-vvv)
VERBOSE=true
;;
*)
# unknown option
;;
esac
done
if [ -z $ECLIPSE_HOME ]; then
echo -e $USAGE
exit 1
fi
if [ -n $VERBOSE ]; then
echo "AntOpts: '$OPTS_FOR_ANT'"
fi
rm -rf `pwd`/cave/tmp
rm -rf `pwd`/alertviz/tmp
export BUILDER=`pwd`/cave
export BUILDER_ALERTVIZ=`pwd`/alertviz
#get name of org.eclipse.equinox.launcher_*.jar in ECLIPSE_HOME with version label
export LAUNCHER_JAR=`ls $ECLIPSE_HOME/plugins/org.eclipse.equinox.launcher_*.jar`
#get name of org.eclipse.pde.build in ECLIPSE_HOME with version label
export PDE_BUILD=`ls -d $ECLIPSE_HOME/plugins/org.eclipse.pde.build_*`
#Execute the build
java -jar $LAUNCHER_JAR -application org.eclipse.ant.core.antRunner \
-buildfile ${PDE_BUILD}/scripts/productBuild/productBuild.xml \
-DbaseLocation=$ECLIPSE_HOME \
-Dbuilder=$BUILDER \
-DbuildDirectory=${BUILDER}/tmp \
-Dbase=$BUILDER \
-Dproduct=awips.product \
$OPTS_FOR_ANT
rc=$?
if [[ $rc != 0 ]] ; then
exit $rc
fi
java -jar $LAUNCHER_JAR -application org.eclipse.ant.core.antRunner \
-buildfile ${PDE_BUILD}/scripts/productBuild/productBuild.xml \
-DbaseLocation=$ECLIPSE_HOME \
-Dbuilder=$BUILDER_ALERTVIZ \
-DbuildDirectory=${BUILDER_ALERTVIZ}/tmp \
-Dbase=$BUILDER_ALERTVIZ \
$OPTS_FOR_ANT

464
cave/build/cave/memorySettings.xml Normal file
View file

@ -0,0 +1,464 @@
<?xml version="1.0" encoding="UTF-8"?>
<cave-memory-settings>
<!-- The version should be incremented whenever
the file layout changes. -->
<file-version>4.0</file-version>
<!-- Example Entry ... See Below. -->
<!--
<memory-setting>
<command-line-args>
CURRENTLY, ONE OF: {-component, -perspective}
<first-arg>-component</first-arg>
THE ARGUMENT THAT CORRESPONDS TO THE FIRST ARGUMENT.
ALSO USED TO DETERMINE THE NAME OF THE ini FILE.
<second-arg>avnsetup</second-arg>
</command-line-args>
<ini-substitutions>
<max-memory>
<value>1536M</value>
</max-memory>
<max-perm>
<value>4046m</value>
</max-perm>
</ini-substitutions>
</memory-setting>
-->
<default-memory-setting>
<default-max-memory>
<jvm-arg>Xmx</jvm-arg>
<value>2048M</value>
</default-max-memory>
<default-max-perm>
<jvm-arg>XX:MaxPermSize=</jvm-arg>
<value>128m</value>
</default-max-perm>
</default-memory-setting>
<arch.x86>
<memory-setting>
<command-line-args>
<first-arg>-perspective</first-arg>
<second-arg>GFE</second-arg>
</command-line-args>
<ini-substitutions>
<max-memory>
<value>1536M</value>
</max-memory>
<max-perm>
<value>DEFAULT</value>
</max-perm>
</ini-substitutions>
</memory-setting>
<memory-setting>
<command-line-args>
<first-arg>-component</first-arg>
<second-arg>textws</second-arg>
</command-line-args>
<ini-substitutions>
<max-memory>
<value>128M</value>
</max-memory>
<max-perm>
<value>64m</value>
</max-perm>
</ini-substitutions>
</memory-setting>
<memory-setting>
<command-line-args>
<first-arg>-component</first-arg>
<second-arg>avnmenu</second-arg>
</command-line-args>
<ini-substitutions>
<max-memory>
<value>128M</value>
</max-memory>
<max-perm>
<value>64m</value>
</max-perm>
</ini-substitutions>
</memory-setting>
<memory-setting>
<command-line-args>
<first-arg>-component</first-arg>
<second-arg>gfeclient</second-arg>
</command-line-args>
<ini-substitutions>
<max-memory>
<value>1536M</value>
</max-memory>
<max-perm>
<value>DEFAULT</value>
</max-perm>
</ini-substitutions>
</memory-setting>
<memory-setting>
<command-line-args>
<first-arg>-component</first-arg>
<second-arg>servicebackup</second-arg>
</command-line-args>
<ini-substitutions>
<max-memory>
<value>256M</value>
</max-memory>
<max-perm>
<value>128m</value>
</max-perm>
</ini-substitutions>
</memory-setting>
<memory-setting>
<command-line-args>
<first-arg>-perspective</first-arg>
<second-arg>NCP</second-arg>
</command-line-args>
<ini-substitutions>
<max-memory>
<value>1536M</value>
</max-memory>
<max-perm>
<value>DEFAULT</value>
</max-perm>
</ini-substitutions>
</memory-setting>
</arch.x86>
<arch.x86_64>
<!--
Since this may be increased for GFE in the future,
the following memory setting will remain even though
it is the same as the default.
-->
<memory-setting>
<command-line-args>
<first-arg>-perspective</first-arg>
<second-arg>GFE</second-arg>
</command-line-args>
<ini-substitutions>
<max-memory>
<value>3072M</value>
</max-memory>
<max-perm>
<value>256m</value>
</max-perm>
</ini-substitutions>
</memory-setting>
<memory-setting>
<command-line-args>
<first-arg>-component</first-arg>
<second-arg>textws</second-arg>
</command-line-args>
<ini-substitutions>
<max-memory>
<value>384M</value>
</max-memory>
<max-perm>
<value>96M</value>
</max-perm>
</ini-substitutions>
</memory-setting>
<memory-setting>
<command-line-args>
<first-arg>-component</first-arg>
<second-arg>avnmenu</second-arg>
</command-line-args>
<ini-substitutions>
<max-memory>
<value>512M</value>
</max-memory>
<max-perm>
<value>128M</value>
</max-perm>
</ini-substitutions>
</memory-setting>
<memory-setting>
<command-line-args>
<first-arg>-component</first-arg>
<second-arg>gfeclient</second-arg>
</command-line-args>
<ini-substitutions>
<max-memory>
<value>2048M</value>
</max-memory>
<max-perm>
<value>DEFAULT</value>
</max-perm>
</ini-substitutions>
</memory-setting>
<memory-setting>
<command-line-args>
<first-arg>-component</first-arg>
<second-arg>servicebackup</second-arg>
</command-line-args>
<ini-substitutions>
<max-memory>
<value>256M</value>
</max-memory>
<max-perm>
<value>64M</value>
</max-perm>
</ini-substitutions>
</memory-setting>
<memory-setting>
<command-line-args>
<first-arg>-perspective</first-arg>
<second-arg>NCP</second-arg>
</command-line-args>
<ini-substitutions>
<max-memory>
<value>2048M</value>
</max-memory>
<max-perm>
<value>DEFAULT</value>
</max-perm>
</ini-substitutions>
</memory-setting>
<memory-setting>
<command-line-args>
<first-arg>-component</first-arg>
<second-arg>activatesite</second-arg>
</command-line-args>
<ini-substitutions>
<max-memory>
<value>256M</value>
</max-memory>
<max-perm>
<value>64M</value>
</max-perm>
</ini-substitutions>
</memory-setting>
<memory-setting>
<command-line-args>
<first-arg>-component</first-arg>
<second-arg>avnsetup</second-arg>
</command-line-args>
<ini-substitutions>
<max-memory>
<value>256M</value>
</max-memory>
<max-perm>
<value>64M</value>
</max-perm>
</ini-substitutions>
</memory-setting>
<memory-setting>
<command-line-args>
<first-arg>-component</first-arg>
<second-arg>metar</second-arg>
</command-line-args>
<ini-substitutions>
<max-memory>
<value>256M</value>
</max-memory>
<max-perm>
<value>64M</value>
</max-perm>
</ini-substitutions>
</memory-setting>
<memory-setting>
<command-line-args>
<first-arg>-component</first-arg>
<second-arg>windrose</second-arg>
</command-line-args>
<ini-substitutions>
<max-memory>
<value>256M</value>
</max-memory>
<max-perm>
<value>64M</value>
</max-perm>
</ini-substitutions>
</memory-setting>
<memory-setting>
<command-line-args>
<first-arg>-component</first-arg>
<second-arg>cigvisdist</second-arg>
</command-line-args>
<ini-substitutions>
<max-memory>
<value>256M</value>
</max-memory>
<max-perm>
<value>64M</value>
</max-perm>
</ini-substitutions>
</memory-setting>
<memory-setting>
<command-line-args>
<first-arg>-component</first-arg>
<second-arg>cigvistrend</second-arg>
</command-line-args>
<ini-substitutions>
<max-memory>
<value>256M</value>
</max-memory>
<max-perm>
<value>64M</value>
</max-perm>
</ini-substitutions>
</memory-setting>
<memory-setting>
<command-line-args>
<first-arg>-component</first-arg>
<second-arg>hydroTimeSeries</second-arg>
</command-line-args>
<ini-substitutions>
<max-memory>
<value>256M</value>
</max-memory>
<max-perm>
<value>64M</value>
</max-perm>
</ini-substitutions>
</memory-setting>
<memory-setting>
<command-line-args>
<first-arg>-component</first-arg>
<second-arg>hydroXdat</second-arg>
</command-line-args>
<ini-substitutions>
<max-memory>
<value>256M</value>
</max-memory>
<max-perm>
<value>64M</value>
</max-perm>
</ini-substitutions>
</memory-setting>
<memory-setting>
<command-line-args>
<first-arg>-component</first-arg>
<second-arg>autodqc</second-arg>
</command-line-args>
<ini-substitutions>
<max-memory>
<value>256M</value>
</max-memory>
<max-perm>
<value>64M</value>
</max-perm>
</ini-substitutions>
</memory-setting>
<!-- memory default overrides for a particular site type (wfo, ncep, etc) -->
<!-- site-type names need to be all lower case -->
<site-type-override>
<site-type>wfo</site-type>
<ini-substitutions>
<max-memory>
<value>2560M</value>
</max-memory>
<max-perm>
<value>DEFAULT</value>
</max-perm>
</ini-substitutions>
</site-type-override>
<site-type-override>
<site-type>rfc</site-type>
<ini-substitutions>
<max-memory>
<value>2048M</value>
</max-memory>
<max-perm>
<value>DEFAULT</value>
</max-perm>
</ini-substitutions>
</site-type-override>
<site-type-override>
<site-type>ncep</site-type>
<ini-substitutions>
<max-memory>
<value>3072M</value>
</max-memory>
<max-perm>
<value>DEFAULT</value>
</max-perm>
</ini-substitutions>
</site-type-override>
<site-type-override>
<site-type>cwsu</site-type>
<ini-substitutions>
<max-memory>
<value>2560M</value>
</max-memory>
<max-perm>
<value>DEFAULT</value>
</max-perm>
</ini-substitutions>
</site-type-override>
</arch.x86_64>
</cave-memory-settings>

2
cave/build/p2-build-strict.xml
View file

@ -332,4 +332,4 @@
<taskdef resource="net/sf/antcontrib/antlib.xml" <taskdef resource="net/sf/antcontrib/antlib.xml"
classpath="${basedir}/lib/ant/ant-contrib-1.0b3.jar" /> classpath="${basedir}/lib/ant/ant-contrib-1.0b3.jar" />
</project> </project>

9
cave/build/p2-build.xml
View file

@ -187,9 +187,6 @@
<antcall target="p2.build.repo"> <antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.uf.viz.kml.export.feature" /> <param name="feature" value="com.raytheon.uf.viz.kml.export.feature" />
</antcall> </antcall>
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.uf.viz.nwsauth.feature" />
</antcall>
<antcall target="p2.build.repo"> <antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.viz.gfe.feature" /> <param name="feature" value="com.raytheon.viz.gfe.feature" />
</antcall> </antcall>
@ -229,15 +226,9 @@
<antcall target="p2.build.repo"> <antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.uf.viz.thinclient.feature" /> <param name="feature" value="com.raytheon.uf.viz.thinclient.feature" />
</antcall> </antcall>
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.uf.viz.useradmin.feature" />
</antcall>
<antcall target="p2.build.repo"> <antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.uf.viz.registry.feature" /> <param name="feature" value="com.raytheon.uf.viz.registry.feature" />
</antcall> </antcall>
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.uf.viz.datadelivery.feature" />
</antcall>
<antcall target="p2.build.repo"> <antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.uf.viz.npp.feature" /> <param name="feature" value="com.raytheon.uf.viz.npp.feature" />
</antcall> </antcall>

49
cave/build/static/linux/cave/run.sh
View file

@ -88,11 +88,6 @@ export HYDRO_APPS_DIR="/awips2/edex/data/share/hydroapps"
export EDEX_HOME=/awips2/edex export EDEX_HOME=/awips2/edex
export LOCALIZATION_ROOT=~/caveData/common export LOCALIZATION_ROOT=~/caveData/common
export PGSQL_DRIVER_DIR=`ls -1d /awips2/cave/plugins/org.postgres_*`
if [ $? -ne 0 ]; then
echo "FATAL: Unable to locate the PostgreSQL JDBC Driver."
exit 1
fi
export apps_dir=${HYDRO_APPS_DIR} export apps_dir=${HYDRO_APPS_DIR}
SWITCHES=($SWITCHES) SWITCHES=($SWITCHES)
@ -113,6 +108,47 @@ export TEXTWS=`hostname`
hostName=`hostname -s` hostName=`hostname -s`
# check number of running caves
if [[ -z $IGNORE_NUM_CAVES ]]; then
# get total memory on system in bytes
mem=( `free -b | grep "Mem:"` )
mem=${mem[1]}
# get max amount of system memory used before we warn
memThreshold=$(echo "$mem * $MAX_MEM_PROPORTION" | bc)
# remove decimal
printf -v memThreshold "%.0f" "$memThreshold"
# get launcher.ini argument determined by user arguments
lookupINI "$@"
launcherRegex='--launcher.ini\s(.+\.ini)'
# default to cave.ini
targetIni="/awips2/cave/cave.ini"
if [[ $CAVE_INI_ARG =~ $launcherRegex ]]
then
targetIni="${BASH_REMATCH[1]}"
fi
# read max memory that could be used by this instance
memOfLaunchingCave=$(readMemFromIni "$targetIni")
# read total max memory of caves already running
getTotalMemOfRunningCaves
# add them together
_totalAfterStart=$(($memOfLaunchingCave + $_totalRunningMem))
if [[ "$_totalAfterStart" -ge "$memThreshold" ]]; then
# convert to megs for display
memOfLaunchingCave=$(($memOfLaunchingCave / $BYTES_IN_MB))
_totalRunningMem=$(($_totalRunningMem / $BYTES_IN_MB))
getPidsOfMyRunningCaves
memMsg="$_numPids CAVE applications already running with a combined max memory of ${_totalRunningMem}MB. "
memMsg+="The requested application has a max memory requirement of ${memOfLaunchingCave}MB. "
memMsg+="Starting may impact system performance and stability.\n\nProceed?"
zenity --question --title "Low Available Memory for Application" --text "$memMsg"
cancel="$?"
if [[ "$cancel" == "1" ]]; then
exit
fi
fi
fi
#check for gtk-2.0 value #check for gtk-2.0 value
gtkResource=.gtkrc-2.0 gtkResource=.gtkrc-2.0
includeLine="include \"$HOME/.gtkrc.mine\"" includeLine="include \"$HOME/.gtkrc.mine\""
@ -158,7 +194,7 @@ if [ ! -d $FULL_LOGDIR ]; then
fi fi
# delete any old disk caches in the background # delete any old disk caches in the background
deleteOldCaveLogs & #deleteOldCaveLogs &
curTime=`date +%Y%m%d_%H%M%S` curTime=`date +%Y%m%d_%H%M%S`
@ -217,3 +253,4 @@ TMP_VMARGS="--launcher.appendVmargs -vmargs -Djava.io.tmpdir=${eclipseConfigurat
pid=$! pid=$!
logExitStatus $pid $LOGFILE_STARTUP_SHUTDOWN logExitStatus $pid $LOGFILE_STARTUP_SHUTDOWN

66
cave/com.raytheon.uf.viz.alertviz/plugin.xml
View file

@ -31,72 +31,6 @@
id="com.raytheon.viz.notification.statusHandler"> id="com.raytheon.viz.notification.statusHandler">
</statusHandler> </statusHandler>
</extension> </extension>
<extension
point="com.raytheon.uf.viz.localization.localizationpath">
<path
application="Alertviz"
localizationType="CAVE_STATIC"
name="Configurations"
value="alertViz/configurations"
recursive="false"
extensionFilter=".xml">
</path>
</extension>
<extension
point="com.raytheon.uf.viz.localization.localizationpath">
<path
application="Alertviz"
localizationType="CAVE_STATIC"
name="Python"
value="alertViz/python"
recursive="false"
extensionFilter=".py">
</path>
</extension>
<extension
point="com.raytheon.uf.viz.localization.localizationpath">
<path
application="Alertviz"
localizationType="CAVE_STATIC"
name="Audio"
value="alertVizAudio"
recursive="false"
extensionFilter=".wav">
</path>
</extension>
<extension
point="com.raytheon.uf.viz.localization.localizationpath">
<path
application="Alertviz"
localizationType="CAVE_STATIC"
name="Monitor Icons"
value="monitorIcons"
recursive="false"
extensionFilter=".png">
</path>
</extension>
<extension
point="com.raytheon.uf.viz.localization.localizationpath">
<path
application="Alertviz"
localizationType="CAVE_STATIC"
name="Forced configuration"
value="alertViz"
recursive="false"
extensionFilter=".xml">
</path>
</extension>
<extension
point="com.raytheon.uf.viz.localization.localizationpath">
<path
application="Alertviz"
localizationType="CAVE_STATIC"
name="Custom Repository"
value="alertViz/customizations"
recursive="false"
extensionFilter=".xml">
</path>
</extension>
<!--extension <!--extension
point="org.eclipse.ui.editors"> point="org.eclipse.ui.editors">
<editor <editor

19
cave/com.raytheon.uf.viz.archive/plugin.xml
View file

@ -20,25 +20,6 @@
--> -->
<?eclipse version="3.2"?> <?eclipse version="3.2"?>
<plugin> <plugin>
<extension
point="com.raytheon.uf.viz.localization.localizationpath">
<path
application="Archive"
localizationType="COMMON_STATIC"
name="Configuration"
value="archiver/purger"
recursive="false"
extensionFilter=".xml">
</path>
<path
application="Archive"
localizationType="COMMON_STATIC"
name="gui"
value="archiver/gui"
recursive="false"
extensionFilter=".xml">
</path>
</extension>
<extension <extension
point="org.eclipse.ui.menus"> point="org.eclipse.ui.menus">
<menuContribution <menuContribution

10
cave/com.raytheon.uf.viz.cwat/plugin.xml
View file

@ -31,14 +31,4 @@
<!-- for making CWAT available on Localization Perspective in CAVE: 2012-05-14 from DHladky --> <!-- for making CWAT available on Localization Perspective in CAVE: 2012-05-14 from DHladky -->
<extension
point="com.raytheon.uf.viz.localization.localizationpath">
<path
application="D2D"
localizationType="common_static"
name="CWAT"
recursive="true"
value="cwat">
</path>
</extension>
</plugin> </plugin>

10
cave/com.raytheon.uf.viz.d2d.ui.popupskewt/plugin.xml
View file

@ -20,16 +20,6 @@
--> -->
<?eclipse version="3.3"?> <?eclipse version="3.3"?>
<plugin> <plugin>
<extension
point="com.raytheon.uf.viz.localization.localizationpath">
<path
application="D2D"
localizationType="CAVE_STATIC"
name="Cloud Height"
value="cloudheight"
recursive="true">
</path>
</extension>
<extension <extension
point="com.raytheon.viz.ui.displayCustomizer"> point="com.raytheon.viz.ui.displayCustomizer">
<displayCustomizer <displayCustomizer

103
cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseNPNPlot.xml
View file

@ -1,103 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<contribute xsi:type="subMenu" menuText="NPN Plot">
<contribute xsi:type="bundleItem" file="bundles/NPNPlot.xml"
menuText="150hPa" id="npn150hPa">
<substitute key="level" value="150MB"/>
<substitute key="legend" value="150mb Profiler"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/NPNPlot.xml"
menuText="200hPa" id="npn200hPa">
<substitute key="level" value="200MB"/>
<substitute key="legend" value="200mb Profiler"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/NPNPlot.xml"
menuText="250hPa" id="npn250hPa">
<substitute key="level" value="250MB"/>
<substitute key="legend" value="250mb Profiler"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/NPNPlot.xml"
menuText="300hPa" id="npn300hPa">
<substitute key="level" value="300MB"/>
<substitute key="legend" value="300mb Profiler"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/NPNPlot.xml"
menuText="400hPa" id="npn400hPa">
<substitute key="level" value="400MB"/>
<substitute key="legend" value="400mb Profiler"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/NPNPlot.xml"
menuText="500hPa" id="npn500hPa">
<substitute key="level" value="500MB"/>
<substitute key="legend" value="500mb Profiler"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/NPNPlot.xml"
menuText="700hPa" id="npn700hPa">
<substitute key="level" value="700MB"/>
<substitute key="legend" value="700mb Profiler"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/NPNPlot.xml"
menuText="850hPa" id="npn850hPa">
<substitute key="level" value="850MB"/>
<substitute key="legend" value="850mb Profiler"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/NPNPlot.xml"
menuText="925hPa" id="npn925hPa">
<substitute key="level" value="925MB"/>
<substitute key="legend" value="925mb Profiler"/>
</contribute>
<contribute xsi:type="separator" id="MySeparatorId"/>
<contribute xsi:type="bundleItem" file="bundles/NPNPlot.xml"
menuText="1500m AGL" id="npn1500mAGL">
<substitute key="level" value="1.5kmAgl"/>
<substitute key="legend" value="1500m AGL Profiler"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/NPNPlot.xml"
menuText="1250m AGL" id="npn1250mAGL">
<substitute key="level" value="1250mAgl"/>
<substitute key="legend" value="1250m AGL Profiler"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/NPNPlot.xml"
menuText="1000m AGL" id="npn1000mAGL">
<substitute key="level" value="1kmAgl"/>
<substitute key="legend" value="1000m AGL Profiler"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/NPNPlot.xml"
menuText="750m AGL" id="npn750mAGL">
<substitute key="level" value="750mAgl"/>
<substitute key="legend" value="750m AGL Profiler"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/NPNPlot.xml"
menuText="500m AGL" id="npn500mAGL">
<substitute key="level" value="0.5kmAgl"/>
<substitute key="legend" value="500m AGL Profiler"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/NPNPlot.xml"
menuText="Surface" id="npnSurface">
<substitute key="level" value="Surface"/>
<substitute key="legend" value="Sfc Profiler"/>
</contribute>
</contribute>
<contribute xsi:type="separator" id="npnPerspective"/>
<contribute xsi:type="separator" id="MySeparatorId1"/>
</menuTemplate>

8
cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/index.xml
View file

@ -19,13 +19,13 @@
further_licensing_information. further_licensing_information.
--> -->
<menuContributionFile> <menuContributionFile>
<include installTo="menu:upperAir?before=PROFILER" fileName="menus/upperair/baseUpperAir.xml" /> <include installTo="menu:upperAir?before=RADAR" fileName="menus/upperair/baseUpperAir.xml" />
<include installTo="menu:upperAir?before=ProfilerMenuEnd" <include installTo="menu:upperAir?after=RADAR" fileName="menus/upperair/baseRadar.xml" />
fileName="menus/upperair/baseNPNPlot.xml" /> <include subMenu="PIREP plots" installTo="menu:upperAir?after=AIRCRAFT" fileName="menus/upperair/basePirep.xml" />
<include subMenu="MDCRS plots" installTo="menu:upperAir?before=AircraftMenuEnd" <include subMenu="MDCRS plots" installTo="menu:upperAir?before=AircraftMenuEnd"
fileName="menus/upperair/baseMDCRS.xml" /> fileName="menus/upperair/baseMDCRS.xml" />
<include installTo="menu:upperAir?before=AircraftMenuEnd" <include installTo="menu:upperAir?before=AircraftMenuEnd"
fileName="menus/upperair/baseAviation.xml" /> fileName="menus/upperair/baseAviation.xml" />
<include installTo="menu:upperAir?after=RAOB" fileName="menus/upperair/baseRAOB.xml" /> <include installTo="menu:upperAir?after=RAOB" fileName="menus/upperair/baseRAOB.xml" />
<include installTo="menu:upperAir?before=RAOBMenuMiddle" fileName="menus/upperair/baseAddedFeatures.xml" /> <include installTo="menu:upperAir?before=RAOBMenuMiddle" fileName="menus/upperair/baseAddedFeatures.xml" />
</menuContributionFile> </menuContributionFile>

4
cave/com.raytheon.uf.viz.d2d.ui.upperair/plugin.xml
View file

@ -42,9 +42,9 @@
<command <command
commandId="com.raytheon.viz.ui.actions.titleAction" commandId="com.raytheon.viz.ui.actions.titleAction"
label="------ Profiler ------" id="PROFILER"> label="------ Radar ------" id="RADAR">
</command> </command>
<separator name="ProfilerMenuEnd" visible="false"/>
<command <command
commandId="com.raytheon.viz.ui.actions.titleAction" commandId="com.raytheon.viz.ui.actions.titleAction"
label="------ Aircraft ------" id="AIRCRAFT"> label="------ Aircraft ------" id="AIRCRAFT">

59
cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
View file

@ -85,6 +85,10 @@
label="New Window" label="New Window"
style="push"> style="push">
</command> </command>
<menu
id="import"
label="Import">
</menu>
<separator <separator
name="saveSeparator" name="saveSeparator"
visible="true"> visible="true">
@ -104,23 +108,29 @@
label="Save Bundle Locally" label="Save Bundle Locally"
style="push"> style="push">
</command> </command>
<separator <separator
name="importExportSeparator" name="exportSeparator"
visible="true"> visible="true">
</separator> </separator>
<menu <command
id="import" commandId="com.raytheon.uf.viz.image.export.save"
label="Import"> label="Save Image"
</menu> style="push">
<menu </command>
id="export" <command
label="Export"> commandId="com.raytheon.uf.viz.kml.export.exportKML"
<command label="Save KML"
commandId="com.raytheon.viz.ui.saveBundle" style="push">
label="Map Window" </command>
style="push"> <command
</command> commandId="com.raytheon.uf.viz.image.export.print"
</menu> label="Print Screen"
style="push">
<parameter
name="frameSelection"
value="current">
</parameter>
</command>
</menu> </menu>
<menu <menu
id="view" id="view"
@ -588,11 +598,13 @@
</reference> </reference>
</visibleWhen> </visibleWhen>
</command> </command>
<!--
<command <command
commandId="SetBrowserViewType" commandId="SetBrowserViewType"
label="Plot Type" label="Plot Type"
style="pulldown"> style="pulldown">
</command> </command>
-->
</toolbar> </toolbar>
</menuContribution> </menuContribution>
@ -843,6 +855,7 @@
id="com.raytheon.uf.viz.d2d.ui.densityPopulator"> id="com.raytheon.uf.viz.d2d.ui.densityPopulator">
</dynamic> </dynamic>
</menuContribution> </menuContribution>
<!--
<menuContribution <menuContribution
allPopups="false" allPopups="false"
locationURI="menu:SetBrowserViewType"> locationURI="menu:SetBrowserViewType">
@ -887,6 +900,7 @@
</parameter> </parameter>
</command> </command>
</menuContribution> </menuContribution>
-->
</extension> </extension>
@ -1568,10 +1582,12 @@
categoryId="com.raytheon.uf.viz.d2d.ui" categoryId="com.raytheon.uf.viz.d2d.ui"
description="Toggles a blended resource" description="Toggles a blended resource"
name="Toggle Layer"/> name="Toggle Layer"/>
<!--
<command <command
id="SetBrowserViewType" id="SetBrowserViewType"
name="Set Volume Browser View Type"> name="Set Volume Browser View Type">
</command> </command>
-->
</extension> </extension>
<extension <extension
point="com.raytheon.viz.ui.perspectiveManager"> point="com.raytheon.viz.ui.perspectiveManager">
@ -1655,13 +1671,6 @@
</extension> </extension>
<extension <extension
point="com.raytheon.uf.viz.localization.localizationpath"> point="com.raytheon.uf.viz.localization.localizationpath">
<path
application="D2D"
localizationType="CAVE_STATIC"
name="Procedures"
value="procedures"
recursive="true">
</path>
<path <path
application="D2D" application="D2D"
localizationType="CAVE_STATIC" localizationType="CAVE_STATIC"
@ -1669,12 +1678,6 @@
value="bundles/scales" value="bundles/scales"
recursive="true"> recursive="true">
</path> </path>
<path
application="D2D"
localizationType="COMMON_STATIC"
name="Purge Rules"
value="purge">
</path>
<path <path
application="D2D" application="D2D"
localizationType="CAVE_STATIC" localizationType="CAVE_STATIC"

11
cave/com.raytheon.uf.viz.damagepath/plugin.xml
View file

@ -29,15 +29,4 @@
</contextualMenu> </contextualMenu>
</extension> </extension>
<extension
point="com.raytheon.uf.viz.localization.localizationpath">
<path
application="D2D"
extensionFilter=".xml"
localizationType="COMMON_STATIC"
name="Damage Path"
recursive="false"
value="damagepath">
</path>
</extension>
</plugin> </plugin>

36
cave/com.raytheon.uf.viz.dat.feature/feature.xml
View file

@ -52,12 +52,6 @@
install-size="0" install-size="0"
version="0.0.0"/> version="0.0.0"/>
<plugin
id="com.raytheon.uf.viz.monitor.ffmp"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin <plugin
id="com.raytheon.uf.common.dataplugin.fssobs" id="com.raytheon.uf.common.dataplugin.fssobs"
download-size="0" download-size="0"
@ -100,12 +94,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="com.raytheon.uf.viz.monitor.scan"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin <plugin
id="com.raytheon.uf.common.dataplugin.vil" id="com.raytheon.uf.common.dataplugin.vil"
download-size="0" download-size="0"
@ -134,30 +122,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="com.raytheon.uf.viz.monitor"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="com.raytheon.uf.viz.monitor.fog"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="com.raytheon.uf.viz.monitor.safeseas"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="com.raytheon.uf.viz.monitor.snow"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin <plugin
id="com.raytheon.viz.xdat" id="com.raytheon.viz.xdat"
download-size="0" download-size="0"

20
cave/com.raytheon.uf.viz.image.export/plugin.xml
View file

@ -62,24 +62,4 @@
commandId="com.raytheon.uf.viz.image.export.save"> commandId="com.raytheon.uf.viz.image.export.save">
</handler> </handler>
</extension> </extension>
<extension
point="org.eclipse.ui.menus">
<menuContribution
locationURI="menu:export">
<command
commandId="com.raytheon.uf.viz.image.export.save"
label="Image"
style="push">
</command>
<command
commandId="com.raytheon.uf.viz.image.export.print"
label="Print Screen"
style="push">
<parameter
name="frameSelection"
value="current">
</parameter>
</command>
</menuContribution>
</extension>
</plugin> </plugin>

11
cave/com.raytheon.uf.viz.kml.export/plugin.xml
View file

@ -1,17 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?> <?eclipse version="3.4"?>
<plugin> <plugin>
<extension
point="org.eclipse.ui.menus">
<menuContribution
locationURI="menu:export">
<command
commandId="com.raytheon.uf.viz.kml.export.exportKML"
label="KML"
style="push">
</command>
</menuContribution>
</extension>
<extension <extension
point="org.eclipse.ui.commands"> point="org.eclipse.ui.commands">
<command <command

2
cave/com.raytheon.uf.viz.localization.perspective/plugin.xml
View file

@ -387,7 +387,7 @@
<extension <extension
point="com.raytheon.uf.viz.localization.localizationpath"> point="com.raytheon.uf.viz.localization.localizationpath">
<path <path
application="CAVE" application="D2D"
localizationType="CAVE_CONFIG" localizationType="CAVE_CONFIG"
name="Plugin Configs" name="Plugin Configs"
value="/" value="/"

7
cave/com.raytheon.uf.viz.monitor.ffmp/plugin.xml
View file

@ -108,13 +108,6 @@
recursive="true" recursive="true"
value="ffmp"> value="ffmp">
</path> </path>
<path
application="D2D"
localizationType="common_static"
name="Monitoring"
recursive="true"
value="monitoring">
</path>
<path <path
application="D2D" application="D2D"
localizationType="cave_static" localizationType="cave_static"

10
cave/com.raytheon.uf.viz.monitor.fog/plugin.xml
View file

@ -78,14 +78,4 @@
commandId="com.raytheon.uf.viz.monitor.fog.ui.actions.fogThresholdAlertVisConfig"> commandId="com.raytheon.uf.viz.monitor.fog.ui.actions.fogThresholdAlertVisConfig">
</handler> </handler>
</extension> </extension>
<extension
point="com.raytheon.uf.viz.localization.localizationpath">
<path
application="D2D"
localizationType="common_static"
name="Fog"
recursive="true"
value="fog">
</path>
</extension>
</plugin> </plugin>

10
cave/com.raytheon.uf.viz.monitor.safeseas/plugin.xml
View file

@ -62,14 +62,4 @@
commandId="com.raytheon.uf.viz.monitor.safeseas.ui.actions.safeseasThresholdAlertVisConfig"> commandId="com.raytheon.uf.viz.monitor.safeseas.ui.actions.safeseasThresholdAlertVisConfig">
</handler> </handler>
</extension> </extension>
<extension
point="com.raytheon.uf.viz.localization.localizationpath">
<path
application="D2D"
localizationType="common_static"
name="SafeSeas"
recursive="true"
value="safeseas">
</path>
</extension>
</plugin> </plugin>

17
cave/com.raytheon.uf.viz.monitor.scan/plugin.xml
View file

@ -44,21 +44,4 @@
renderingOrderId="CONTOUR"> renderingOrderId="CONTOUR">
</resource> </resource>
</extension> </extension>
<extension
point="com.raytheon.uf.viz.localization.localizationpath">
<path
application="D2D"
localizationType="cave_static"
name="SCAN"
recursive="true"
value="scan">
</path>
<path
application="D2D"
localizationType="common_static"
name="SCAN COMMON"
recursive="true"
value="scan">
</path>
</extension>
</plugin> </plugin>

10
cave/com.raytheon.uf.viz.monitor.snow/plugin.xml
View file

@ -62,14 +62,4 @@
commandId="com.raytheon.uf.viz.monitor.snow.ui.actions.snowThresholdAlertVisConfig"> commandId="com.raytheon.uf.viz.monitor.snow.ui.actions.snowThresholdAlertVisConfig">
</handler> </handler>
</extension> </extension>
<extension
point="com.raytheon.uf.viz.localization.localizationpath">
<path
application="D2D"
localizationType="common_static"
name="Snow"
recursive="true"
value="snow">
</path>
</extension>
</plugin> </plugin>

2
cave/com.raytheon.uf.viz.plugin.nwsauth/.project
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<projectDescription> <projectDescription>
<name>com.raytheon.uf.viz.plugin.nwsauth</name> <name>com.raytheon.uf.viz.plugin.userauth</name>
<comment></comment> <comment></comment>
<projects> <projects>
</projects> </projects>

4
cave/com.raytheon.uf.viz.plugin.nwsauth/META-INF/MANIFEST.MF
View file

@ -1,7 +1,7 @@
Manifest-Version: 1.0 Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: Nws Auth Plug-in Bundle-Name: Nws Auth Plug-in
Bundle-SymbolicName: com.raytheon.uf.viz.plugin.nwsauth;singleton:=true Bundle-SymbolicName: com.raytheon.uf.viz.plugin.userauth;singleton:=true
Bundle-Version: 1.14.0.qualifier Bundle-Version: 1.14.0.qualifier
Bundle-Vendor: RAYTHEON Bundle-Vendor: RAYTHEON
Require-Bundle: org.eclipse.core.runtime, Require-Bundle: org.eclipse.core.runtime,
@ -10,4 +10,4 @@ Require-Bundle: org.eclipse.core.runtime,
com.raytheon.uf.viz.core com.raytheon.uf.viz.core
Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Export-Package: com.raytheon.uf.viz.plugin.nwsauth Export-Package: com.raytheon.uf.viz.plugin.userauth

0
cave/com.raytheon.uf.viz.plugin.nwsauth/com.raytheon.uf.viz.plugin.nwsauth.ecl → cave/com.raytheon.uf.viz.plugin.nwsauth/com.raytheon.uf.viz.plugin.userauth.ecl
View file

2
cave/com.raytheon.uf.viz.plugin.nwsauth/plugin.xml
View file

@ -4,7 +4,7 @@
<extension <extension
point="com.raytheon.uf.viz.core.userManager"> point="com.raytheon.uf.viz.core.userManager">
<userManager <userManager
class="com.raytheon.uf.viz.plugin.nwsauth.NwsUserManager"> class="com.raytheon.uf.viz.core.auth.BasicUserManager">
</userManager> </userManager>
</extension> </extension>

79
cave/com.raytheon.uf.viz.plugin.nwsauth/src/com/raytheon/uf/viz/plugin/nwsauth/NwsUserManager.java
View file

@ -1,79 +0,0 @@
/**
* This software was developed and / or modified by Raytheon Company,
* pursuant to Contract DG133W-05-CQ-1067 with the US Government.
*
* U.S. EXPORT CONTROLLED TECHNICAL DATA
* This software product contains export-restricted data whose
* export/transfer/disclosure is restricted by U.S. law. Dissemination
* to non-U.S. persons whether in the United States or abroad requires
* an export license or other authorization.
*
* Contractor Name: Raytheon Company
* Contractor Address: 6825 Pine Street, Suite 340
* Mail Stop B8
* Omaha, NE 68106
* 402.291.0100
*
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
package com.raytheon.uf.viz.plugin.nwsauth;
import java.util.List;
import com.raytheon.uf.common.auth.user.IPermission;
import com.raytheon.uf.common.auth.user.IRole;
import com.raytheon.uf.viz.core.auth.BasicUserManager;
import com.raytheon.uf.viz.core.requests.INotAuthHandler;
/**
* Implementation of IUserManager
*
* <pre>
*
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* May 27, 2010 rgeorge Initial creation
* Jun 07, 2013 1981 mpduff Add an IUser field.
* Oct 06, 2014 3398 bclement now extends BasicUserManager
*
* </pre>
*
* @author rgeorge
* @version 1.0
*/
public class NwsUserManager extends BasicUserManager {
private final NwsNotAuthHandler notAuthHandler = new NwsNotAuthHandler();
/*
* (non-Javadoc)
*
* @see com.raytheon.uf.viz.core.auth.IUserManager#getNotAuthHandler()
*/
@Override
public INotAuthHandler getNotAuthHandler() {
return notAuthHandler;
}
/**
* {@inheritDoc}
*/
@Override
public List<IPermission> getPermissions(String application) {
// TODO: Should this pass through to EDEX to get this stuff?
return NwsRoleDataManager.getInstance().getPermissions(application);
}
/**
* {@inheritDoc}
*/
@Override
public List<IRole> getRoles(String application) {
// TODO: Should this pass through to EDEX to get this stuff?
return NwsRoleDataManager.getInstance().getRoles(application);
}
}

8
cave/com.raytheon.uf.viz.plugin.nwsauth/src/com/raytheon/uf/viz/plugin/nwsauth/NwsNotAuthHandler.java → cave/com.raytheon.uf.viz.plugin.nwsauth/src/com/raytheon/uf/viz/plugin/userauth/UserNotAuthHandler.java
View file

@ -17,7 +17,7 @@
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information. * further licensing information.
**/ **/
package com.raytheon.uf.viz.plugin.nwsauth; package com.raytheon.uf.viz.plugin.userauth;
import com.raytheon.uf.common.auth.req.AbstractPrivilegedRequest; import com.raytheon.uf.common.auth.req.AbstractPrivilegedRequest;
import com.raytheon.uf.common.auth.resp.UserNotAuthenticated; import com.raytheon.uf.common.auth.resp.UserNotAuthenticated;
@ -44,7 +44,7 @@ import com.raytheon.uf.viz.core.requests.INotAuthHandler;
* @version 1.0 * @version 1.0
*/ */
public class NwsNotAuthHandler implements INotAuthHandler { public class UserNotAuthHandler implements INotAuthHandler {
/* /*
* (non-Javadoc) * (non-Javadoc)
@ -61,7 +61,7 @@ public class NwsNotAuthHandler implements INotAuthHandler {
String message = "User: <" + user.uniqueId() String message = "User: <" + user.uniqueId()
+ "> is not authenticated to perform request:" + "> is not authenticated to perform request:"
+ request.getClass(); + request.getClass();
UFStatus.getHandler(NwsNotAuthHandler.class).handle(Priority.PROBLEM, UFStatus.getHandler(UserNotAuthHandler.class).handle(Priority.PROBLEM,
message); message);
throw new VizException(message); throw new VizException(message);
} }
@ -80,7 +80,7 @@ public class NwsNotAuthHandler implements INotAuthHandler {
message = "Error sending request for user: " message = "Error sending request for user: "
+ response.getRequest().getUser().uniqueId().toString(); + response.getRequest().getUser().uniqueId().toString();
} }
UFStatus.getHandler(NwsNotAuthHandler.class).handle(Priority.PROBLEM, UFStatus.getHandler(UserNotAuthHandler.class).handle(Priority.PROBLEM,
message); message);
throw new VizException(message); throw new VizException(message);
} }

12
cave/com.raytheon.uf.viz.plugin.nwsauth/src/com/raytheon/uf/viz/plugin/nwsauth/NwsRoleDataManager.java → cave/com.raytheon.uf.viz.plugin.nwsauth/src/com/raytheon/uf/viz/plugin/userauth/UserRoleDataManager.java
View file

@ -17,7 +17,7 @@
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information. * further licensing information.
**/ **/
package com.raytheon.uf.viz.plugin.nwsauth; package com.raytheon.uf.viz.plugin.userauth;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -60,16 +60,16 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
* @version 1.0 * @version 1.0
*/ */
public class NwsRoleDataManager { public class UserRoleDataManager {
/** Status handler */ /** Status handler */
private static final IUFStatusHandler statusHandler = UFStatus private static final IUFStatusHandler statusHandler = UFStatus
.getHandler(NwsRoleDataManager.class); .getHandler(UserRoleDataManager.class);
private static final NwsRoleDataManager instance = new NwsRoleDataManager(); private static final UserRoleDataManager instance = new UserRoleDataManager();
private Map<String, NwsRoleData> roleDataMap = new HashMap<String, NwsRoleData>(); private Map<String, NwsRoleData> roleDataMap = new HashMap<String, NwsRoleData>();
private NwsRoleDataManager() { private UserRoleDataManager() {
retrieveRoleDataFromServer(); retrieveRoleDataFromServer();
} }
@ -78,7 +78,7 @@ public class NwsRoleDataManager {
* *
* @return an instance * @return an instance
*/ */
public static NwsRoleDataManager getInstance() { public static UserRoleDataManager getInstance() {
return instance; return instance;
} }

28
cave/com.raytheon.uf.viz.profiler/localization/menus/profiler/index.xml
View file

@ -1,28 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<menuContributionFile>
<include subMenu="East NPN time-height" installTo="menu:upperAir?after=PROFILER"
fileName="menus/upperair/baseEastNPN.xml" />
<include subMenu="West NPN time-height" installTo="menu:upperAir?after=PROFILER"
fileName="menus/upperair/baseWestNPN.xml" />
<include subMenu="Alaska NPN time-height" installTo="menu:upperAir?after=PROFILER"
fileName="menus/upperair/baseAlaskaNPN.xml" />
</menuContributionFile>

41
cave/com.raytheon.uf.viz.profiler/localization/menus/upperair/baseAlaskaNPN.xml
View file

@ -1,41 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Central AK (CENA2)" id="profCentral_AK"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="70197"/>
<substitute key="productURI" value="/profiler/%/3000/70197/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Glennallen AK (GNAA2)" id="profGlennallen_AK"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="70268"/>
<substitute key="productURI" value="/profiler/%/3000/70268/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Talkeetna AK (TLKA2)" id="profTalkeetna_AK"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="70252"/>
<substitute key="productURI" value="/profiler/%/3000/70252/%"/>
</contribute>
</menuTemplate>

130
cave/com.raytheon.uf.viz.profiler/localization/menus/upperair/baseEastNPN.xml
View file

@ -1,130 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Bloomfield MO (BLMM7)" id="profBloomfield_MO"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="74662"/>
<substitute key="productURI" value="/profiler/%/3000/74662/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Blue River WI (BLRW3)" id="profBlueRiver_WI"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="74357"/>
<substitute key="productURI" value="/profiler/%/3000/74357/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Conway MO (CNWM7)" id="profConway_MO"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="74550"/>
<substitute key="productURI" value="/profiler/%/3000/74550/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="DeQueen AR (DQUA4)" id="profDeQueen_AR"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="74752"/>
<substitute key="productURI" value="/profiler/%/3000/74752/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Fairbury NE (FBYN1)" id="profFairbury_NE"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="74440"/>
<substitute key="productURI" value="/profiler/%/3000/74440/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Haskell OK (HKL02)" id="profHaskell_OK"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="74648"/>
<substitute key="productURI" value="/profiler/%/3000/74648/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Lamont OK (LMNO2)" id="profLamont_OK"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="74647"/>
<substitute key="productURI" value="/profiler/%/3000/74647/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Lathrop MO (LTHM7)" id="profLathrop_MO"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="74551"/>
<substitute key="productURI" value="/profiler/%/3000/74551/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Ledbetter TX (LDBT2)" id="profLedbetter_TX"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="72246"/>
<substitute key="productURI" value="/profiler/%/3000/72246/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Neodesha KS (NDSK1)" id="profNeodesha_KS"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="74542"/>
<substitute key="productURI" value="/profiler/%/3000/74542/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Okolona MS (OKOM6)" id="profOkolona_MS"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="74769"/>
<substitute key="productURI" value="/profiler/%/3000/74769/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Palestine TX (PATT2)" id="profPalestine_TX"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="74750"/>
<substitute key="productURI" value="/profiler/%/3000/74750/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Slater IA (SLAI4)" id="profSlater_IA"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="74449"/>
<substitute key="productURI" value="/profiler/%/3000/74449/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Syracuse NY (SYCN6)" id="profSyracuse_NY"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="74379"/>
<substitute key="productURI" value="/profiler/%/3000/74379/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Winchester IL (WNCI2)" id="profWinchester_IL"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="74556"/>
<substitute key="productURI" value="/profiler/%/3000/74556/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Winfield LA (WNFL1)" id="profWinfield_LA"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="74753"/>
<substitute key="productURI" value="/profiler/%/3000/74753/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Wolcott IN (WLCI3)" id="profWolcott_IN"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="74466"/>
<substitute key="productURI" value="/profiler/%/3000/74466/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Wood Lake MN (WDLM5)" id="profWoodLake_MN"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="74341"/>
<substitute key="productURI" value="/profiler/%/3000/74341/%"/>
</contribute>
</menuTemplate>

112
cave/com.raytheon.uf.viz.profiler/localization/menus/upperair/baseWestNPN.xml
View file

@ -1,112 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Aztec NM (AZCN5)" id="profAztec_NM"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="74630"/>
<substitute key="productURI" value="/profiler/%/3000/74630/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Granada CO (GDAC2)" id="profGranada_CO"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="74530"/>
<substitute key="productURI" value="/profiler/%/3000/74530/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Haviland KS (HVLK1)" id="profHaviland_KS"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="74541"/>
<substitute key="productURI" value="/profiler/%/3000/74541/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Hillsboro KS (HBRK1)" id="profHillsboro_KS"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="74546"/>
<substitute key="productURI" value="/profiler/%/3000/74546/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Jayton TX (JTNT2)" id="profJayton_TX"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="74735"/>
<substitute key="productURI" value="/profiler/%/3000/74735/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="McCook NE (RWDN1)" id="profMcCook_NE"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="74433"/>
<substitute key="productURI" value="/profiler/%/3000/74433/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Medicine Bow WY (MBWW4)" id="profMedicineBow_WY"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="74431"/>
<substitute key="productURI" value="/profiler/%/3000/74431/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Merriman NE (MRRN1)" id="profMerriman_NE"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="74437"/>
<substitute key="productURI" value="/profiler/%/3000/74437/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Neligh NE (NLGN1)" id="profNeligh_NE"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="74445"/>
<substitute key="productURI" value="/profiler/%/3000/74445/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Platteville CO (PLTC2)" id="profPlatteville_CO"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="74533"/>
<substitute key="productURI" value="/profiler/%/3000/74533/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Purcell OK (PRCO2)" id="profPurcell_OK"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="74649"/>
<substitute key="productURI" value="/profiler/%/3000/74649/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Tucumcari NM (TCUN5)" id="profTucumcari_NM"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="74731"/>
<substitute key="productURI" value="/profiler/%/3000/74731/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Vandenberg CA (VBGC1)" id="profVandenberg_CA"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="74604"/>
<substitute key="productURI" value="/profiler/%/3000/74604/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Vici OK (VCIO2)" id="profVici_OK"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="74640"/>
<substitute key="productURI" value="/profiler/%/3000/74640/%"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="White Sands NM (WSMN5)" id="profWhiteSands_NM"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<substitute key="wmoid" value="74629"/>
<substitute key="productURI" value="/profiler/%/3000/74629/%"/>
</contribute>
</menuTemplate>

2
cave/com.raytheon.uf.viz.radarapps.core/src/com/raytheon/uf/viz/radarapps/products/ui/ExtProductsUI.java
View file

@ -189,7 +189,7 @@ public class ExtProductsUI extends Composite implements RadarEventListener,
List<String> sites = RadarsInUseUtil.getSite(site, List<String> sites = RadarsInUseUtil.getSite(site,
RadarsInUseUtil.LOCAL_CONSTANT); RadarsInUseUtil.LOCAL_CONSTANT);
sites.addAll(RadarsInUseUtil.getSite(site, sites.addAll(RadarsInUseUtil.getSite(site,
RadarsInUseUtil.DIAL_CONSTANT)); RadarsInUseUtil.MOSAIC_CONSTANT));
for (RadarConfig rc : cfgReply.config) { for (RadarConfig rc : cfgReply.config) {
if (rc.getRadarID().equals(currentSelection)) if (rc.getRadarID().equals(currentSelection))
newSelection = rc; newSelection = rc;

11
cave/com.raytheon.uf.viz.spellchecker/plugin.xml
View file

@ -20,15 +20,4 @@
--> -->
<?eclipse version="3.8"?> <?eclipse version="3.8"?>
<plugin> <plugin>
<extension
point="com.raytheon.uf.viz.localization.localizationpath">
<path
application="TextWS"
extensionFilter=".txt"
localizationType="CAVE_STATIC"
name="Spell Checker"
recursive="false"
value="spellchecker">
</path>
</extension>
</plugin> </plugin>

2
cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/ui/ThinClientConnectivityDialog.java
View file

@ -93,7 +93,7 @@ public class ThinClientConnectivityDialog extends ConnectivityPreferenceDialog {
private String proxyAddress; private String proxyAddress;
public ThinClientConnectivityDialog(boolean checkAlertViz) { public ThinClientConnectivityDialog(boolean checkAlertViz) {
super(checkAlertViz, "AWIPS Connectivity Preferences"); super(checkAlertViz, "Unidata AWIPS");
IPreferenceStore store = Activator.getDefault().getPreferenceStore(); IPreferenceStore store = Activator.getDefault().getPreferenceStore();
dataRefreshMethod = store dataRefreshMethod = store
.getString(ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD); .getString(ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD);

14
cave/com.raytheon.uf.viz.useradmin.feature/feature.xml
View file

@ -36,4 +36,18 @@
install-size="0" install-size="0"
version="0.0.0"/> version="0.0.0"/>
<plugin
id="com.raytheon.uf.common.plugin.nwsauth"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.viz.plugin.userauth"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature> </feature>

2
cave/com.raytheon.uf.viz.useradmin/META-INF/MANIFEST.MF
View file

@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui,
com.raytheon.uf.viz.localization;bundle-version="1.12.1174", com.raytheon.uf.viz.localization;bundle-version="1.12.1174",
com.raytheon.uf.common.auth;bundle-version="1.12.1174", com.raytheon.uf.common.auth;bundle-version="1.12.1174",
com.raytheon.uf.common.useradmin;bundle-version="1.0.0", com.raytheon.uf.common.useradmin;bundle-version="1.0.0",
com.raytheon.uf.viz.plugin.nwsauth;bundle-version="1.12.1174" com.raytheon.uf.viz.plugin.userauth;bundle-version="1.12.1174"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Import-Package: com.raytheon.uf.common.plugin.nwsauth.xml Import-Package: com.raytheon.uf.common.plugin.nwsauth.xml

8
cave/com.raytheon.uf.viz.useradmin/src/com/raytheon/uf/viz/useradmin/ui/ManageUserDlg.java
View file

@ -36,14 +36,14 @@ import org.eclipse.swt.widgets.Shell;
import com.raytheon.uf.common.plugin.nwsauth.xml.NwsRoleData; import com.raytheon.uf.common.plugin.nwsauth.xml.NwsRoleData;
import com.raytheon.uf.common.plugin.nwsauth.xml.RoleXML; import com.raytheon.uf.common.plugin.nwsauth.xml.RoleXML;
import com.raytheon.uf.common.plugin.nwsauth.xml.UserXML; import com.raytheon.uf.common.plugin.nwsauth.xml.UserXML;
import com.raytheon.uf.viz.plugin.nwsauth.NwsRoleDataManager; import com.raytheon.uf.viz.plugin.userauth.UserRoleDataManager;
import com.raytheon.viz.ui.dialogs.CaveSWTDialog; import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
import com.raytheon.viz.ui.widgets.duallist.DualList; import com.raytheon.viz.ui.widgets.duallist.DualList;
import com.raytheon.viz.ui.widgets.duallist.DualListConfig; import com.raytheon.viz.ui.widgets.duallist.DualListConfig;
import com.raytheon.viz.ui.widgets.duallist.IUpdate; import com.raytheon.viz.ui.widgets.duallist.IUpdate;
/** /**
* Edit user di * Edit user dialog.
* *
* <pre> * <pre>
* *
@ -178,7 +178,7 @@ public class ManageUserDlg extends CaveSWTDialog implements IUpdate {
stackComp.setLayout(stackLayout); stackComp.setLayout(stackLayout);
stackComp.setLayoutData(gd); stackComp.setLayoutData(gd);
NwsRoleDataManager manager = NwsRoleDataManager.getInstance(); UserRoleDataManager manager = UserRoleDataManager.getInstance();
ArrayList<String> selectedList = new ArrayList<String>(); ArrayList<String> selectedList = new ArrayList<String>();
ArrayList<String> fullList = new ArrayList<String>(); ArrayList<String> fullList = new ArrayList<String>();
String availableLabel = "Available Roles:"; String availableLabel = "Available Roles:";
@ -309,7 +309,7 @@ public class ManageUserDlg extends CaveSWTDialog implements IUpdate {
String[] permissions = permDualList.getSelectedListItems(); String[] permissions = permDualList.getSelectedListItems();
String[] roles = roleDualList.getSelectedListItems(); String[] roles = roleDualList.getSelectedListItems();
NwsRoleDataManager man = NwsRoleDataManager.getInstance(); UserRoleDataManager man = UserRoleDataManager.getInstance();
NwsRoleData roleData = man.getRoleData(application); NwsRoleData roleData = man.getRoleData(application);
if (type.equalsIgnoreCase("User")) { if (type.equalsIgnoreCase("User")) {

4
cave/com.raytheon.uf.viz.useradmin/src/com/raytheon/uf/viz/useradmin/ui/NewDlg.java
View file

@ -31,7 +31,7 @@ import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.Text;
import com.raytheon.uf.common.plugin.nwsauth.xml.NwsRoleData; import com.raytheon.uf.common.plugin.nwsauth.xml.NwsRoleData;
import com.raytheon.uf.viz.plugin.nwsauth.NwsRoleDataManager; import com.raytheon.uf.viz.plugin.userauth.UserRoleDataManager;
import com.raytheon.viz.ui.dialogs.CaveSWTDialog; import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
/** /**
@ -154,7 +154,7 @@ public class NewDlg extends CaveSWTDialog {
private void handleOK() { private void handleOK() {
if (newTextField.getText() != null && newTextField.getText().length() > 0) { if (newTextField.getText() != null && newTextField.getText().length() > 0) {
NwsRoleDataManager manager = NwsRoleDataManager.getInstance(); UserRoleDataManager manager = UserRoleDataManager.getInstance();
NwsRoleData roleData = manager.getRoleData(application); NwsRoleData roleData = manager.getRoleData(application);
if (type.equalsIgnoreCase("User")) { if (type.equalsIgnoreCase("User")) {
roleData.addUser(newTextField.getText().trim()); roleData.addUser(newTextField.getText().trim());

22
cave/com.raytheon.uf.viz.useradmin/src/com/raytheon/uf/viz/useradmin/ui/UserAdminSelectDlg.java
View file

@ -50,7 +50,7 @@ import com.raytheon.uf.common.plugin.nwsauth.xml.RoleXML;
import com.raytheon.uf.common.useradmin.request.UserAdminConstants; import com.raytheon.uf.common.useradmin.request.UserAdminConstants;
import com.raytheon.uf.viz.core.VizApp; import com.raytheon.uf.viz.core.VizApp;
import com.raytheon.uf.viz.core.notification.jobs.NotificationManagerJob; import com.raytheon.uf.viz.core.notification.jobs.NotificationManagerJob;
import com.raytheon.uf.viz.plugin.nwsauth.NwsRoleDataManager; import com.raytheon.uf.viz.plugin.userauth.UserRoleDataManager;
import com.raytheon.viz.ui.dialogs.CaveSWTDialog; import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
/** /**
@ -131,7 +131,7 @@ public class UserAdminSelectDlg extends CaveSWTDialog implements
*/ */
@Override @Override
protected void initializeComponents(Shell shell) { protected void initializeComponents(Shell shell) {
NwsRoleDataManager man = NwsRoleDataManager.getInstance(); UserRoleDataManager man = UserRoleDataManager.getInstance();
GridData gd = new GridData(SWT.CENTER, SWT.DEFAULT, true, false); GridData gd = new GridData(SWT.CENTER, SWT.DEFAULT, true, false);
GridLayout gl = new GridLayout(1, false); GridLayout gl = new GridLayout(1, false);
shell.setLayout(gl); shell.setLayout(gl);
@ -214,7 +214,7 @@ public class UserAdminSelectDlg extends CaveSWTDialog implements
+ "Are you sure you want to close without saving?"); + "Are you sure you want to close without saving?");
int answer = messageDialog.open(); int answer = messageDialog.open();
if (answer == SWT.YES) { if (answer == SWT.YES) {
NwsRoleDataManager.getInstance().reloadRoleData(); UserRoleDataManager.getInstance().reloadRoleData();
close(); close();
return; return;
} }
@ -495,7 +495,7 @@ public class UserAdminSelectDlg extends CaveSWTDialog implements
* Populates Lists * Populates Lists
*/ */
private void populateLists() { private void populateLists() {
NwsRoleDataManager man = NwsRoleDataManager.getInstance(); UserRoleDataManager man = UserRoleDataManager.getInstance();
if (appCombo.isDisposed() || userList.isDisposed() if (appCombo.isDisposed() || userList.isDisposed()
|| userTab.isDisposed() || roleTab.isDisposed() || userTab.isDisposed() || roleTab.isDisposed()
|| roleList.isDisposed()) { || roleList.isDisposed()) {
@ -544,7 +544,7 @@ public class UserAdminSelectDlg extends CaveSWTDialog implements
* Populates User Role List. * Populates User Role List.
*/ */
private void populateUserRoleList() { private void populateUserRoleList() {
NwsRoleDataManager man = NwsRoleDataManager.getInstance(); UserRoleDataManager man = UserRoleDataManager.getInstance();
if (appCombo.isDisposed() || userList.isDisposed() if (appCombo.isDisposed() || userList.isDisposed()
|| userPermList.isDisposed()) { || userPermList.isDisposed()) {
return; return;
@ -576,7 +576,7 @@ public class UserAdminSelectDlg extends CaveSWTDialog implements
* Populates Permission List. * Populates Permission List.
*/ */
private void populatePermissionList() { private void populatePermissionList() {
NwsRoleDataManager man = NwsRoleDataManager.getInstance(); UserRoleDataManager man = UserRoleDataManager.getInstance();
rolePermList.removeAll(); rolePermList.removeAll();
String app = appCombo.getItem(appCombo.getSelectionIndex()); String app = appCombo.getItem(appCombo.getSelectionIndex());
if (roleList.getSelectionIndex() != -1) { if (roleList.getSelectionIndex() != -1) {
@ -611,7 +611,7 @@ public class UserAdminSelectDlg extends CaveSWTDialog implements
int response = messageDialog.open(); int response = messageDialog.open();
if (response == SWT.YES) { if (response == SWT.YES) {
NwsRoleDataManager man = NwsRoleDataManager.getInstance(); UserRoleDataManager man = UserRoleDataManager.getInstance();
String app = appCombo.getItem(appCombo.getSelectionIndex()); String app = appCombo.getItem(appCombo.getSelectionIndex());
man.deleteUser(user, app); man.deleteUser(user, app);
dirty = true; dirty = true;
@ -646,7 +646,7 @@ public class UserAdminSelectDlg extends CaveSWTDialog implements
int response = messageDialog.open(); int response = messageDialog.open();
if (response == SWT.YES) { if (response == SWT.YES) {
NwsRoleDataManager man = NwsRoleDataManager.getInstance(); UserRoleDataManager man = UserRoleDataManager.getInstance();
String app = appCombo.getItem(appCombo.getSelectionIndex()); String app = appCombo.getItem(appCombo.getSelectionIndex());
man.deleteRole(role, app); man.deleteRole(role, app);
dirty = true; dirty = true;
@ -700,7 +700,7 @@ public class UserAdminSelectDlg extends CaveSWTDialog implements
String selection = list.getItem(list.getSelectionIndex()); String selection = list.getItem(list.getSelectionIndex());
StringBuilder messageText = new StringBuilder(); StringBuilder messageText = new StringBuilder();
boolean roleFlag = false; boolean roleFlag = false;
NwsRoleDataManager man = NwsRoleDataManager.getInstance(); UserRoleDataManager man = UserRoleDataManager.getInstance();
for (RoleXML role : man.getRoleData(selectedApplication) for (RoleXML role : man.getRoleData(selectedApplication)
.getRoleList()) { .getRoleList()) {
if (selection.equals(role.getRoleId())) { if (selection.equals(role.getRoleId())) {
@ -778,7 +778,7 @@ public class UserAdminSelectDlg extends CaveSWTDialog implements
* Handle OK button. * Handle OK button.
*/ */
private void handleOK() { private void handleOK() {
NwsRoleDataManager manager = NwsRoleDataManager.getInstance(); UserRoleDataManager manager = UserRoleDataManager.getInstance();
manager.save(selectedApplication); manager.save(selectedApplication);
dirty = false; dirty = false;
} }
@ -798,7 +798,7 @@ public class UserAdminSelectDlg extends CaveSWTDialog implements
VizApp.runAsync(new Runnable() { VizApp.runAsync(new Runnable() {
@Override @Override
public void run() { public void run() {
NwsRoleDataManager.getInstance().reloadRoleData(); UserRoleDataManager.getInstance().reloadRoleData();
if (!UserAdminSelectDlg.this.isDisposed()) { if (!UserAdminSelectDlg.this.isDisposed()) {
populateLists(); populateLists();

2
cave/com.raytheon.uf.viz.volumebrowser.dataplugin/plugin.xml
View file

@ -58,7 +58,7 @@
</productCreator> </productCreator>
<productCreator <productCreator
creatorClass="com.raytheon.viz.volumebrowser.loader.TimeSeriesProductCreator" creatorClass="com.raytheon.viz.volumebrowser.loader.TimeSeriesProductCreator"
plugins="goessounding,poessounding,profiler,bufrmosLAMP,modelsounding,radar,ldadmesonet" plugins="goessounding,poessounding,profiler,bufrmosLAMP,modelsounding,radar"
resourceType="time_series"> resourceType="time_series">
</productCreator> </productCreator>
<productCreator <productCreator

30
cave/com.raytheon.viz.feature.awips.developer/feature.xml
View file

@ -76,7 +76,11 @@
<includes <includes
id="com.raytheon.uf.viz.grid.feature" id="com.raytheon.uf.viz.grid.feature"
version="0.0.0"/> version="0.0.0"/>
<includes
id="com.raytheon.viz.gfe.feature"
version="0.0.0"/>
<includes <includes
id="com.raytheon.uf.viz.displays.feature" id="com.raytheon.uf.viz.displays.feature"
version="0.0.0"/> version="0.0.0"/>
@ -85,6 +89,10 @@
id="com.raytheon.viz.satellite.feature" id="com.raytheon.viz.satellite.feature"
version="0.0.0"/> version="0.0.0"/>
<includes
id="com.raytheon.uf.viz.dat.feature"
version="0.0.0"/>
<includes <includes
id="com.raytheon.uf.viz.ncep.core.feature" id="com.raytheon.uf.viz.ncep.core.feature"
version="0.0.0"/> version="0.0.0"/>
@ -113,6 +121,10 @@
id="com.raytheon.uf.viz.archive.feature" id="com.raytheon.uf.viz.archive.feature"
version="0.0.0"/> version="0.0.0"/>
<includes
id="com.raytheon.uf.viz.ncep.perspective.feature"
version="0.0.0"/>
<includes <includes
id="com.raytheon.uf.viz.thinclient.feature" id="com.raytheon.uf.viz.thinclient.feature"
version="0.0.0"/> version="0.0.0"/>
@ -161,10 +173,6 @@
id="com.raytheon.uf.viz.aviation.advisory.feature" id="com.raytheon.uf.viz.aviation.advisory.feature"
version="0.0.0"/> version="0.0.0"/>
<includes
id="edu.wisc.ssec.cimss.viz.convectprob.feature"
version="0.0.0"/>
<includes <includes
id="gov.noaa.gsd.viz.ensemble.feature" id="gov.noaa.gsd.viz.ensemble.feature"
version="0.0.0"/> version="0.0.0"/>
@ -185,6 +193,18 @@
id="gov.noaa.nws.mdl.viz.boundaryTool.common.feature" id="gov.noaa.nws.mdl.viz.boundaryTool.common.feature"
version="0.0.0"/> version="0.0.0"/>
<includes
id="com.raytheon.uf.viz.satellite.goesr.feature"
version="0.0.0"/>
<includes
id="com.raytheon.uf.viz.useradmin.feature"
version="0.0.0"/>
<includes
id="com.raytheon.viz.hydro.feature"
version="0.0.0"/>
<requires> <requires>
<import feature="com.raytheon.uf.viz.application.feature" version="1.0.0.qualifier"/> <import feature="com.raytheon.uf.viz.application.feature" version="1.0.0.qualifier"/>
</requires> </requires>

72
cave/com.raytheon.viz.gfe/plugin.xml
View file

@ -1931,30 +1931,6 @@
id="GFE" id="GFE"
name="GFE" name="GFE"
point="com.raytheon.uf.viz.localization.localizationpath"> point="com.raytheon.uf.viz.localization.localizationpath">
<path
application="GFE"
extensionFilter=".py"
localizationAdapter="com.raytheon.viz.gfe.config.ConfigAdapter"
localizationType="CAVE_STATIC"
name="Config Files"
value="gfe/userPython/gfeConfig">
</path>
<path
application="GFE"
extensionFilter=".xml"
localizationType="COMMON_STATIC"
name="Edit Areas"
recursive="false"
value="gfe/editAreas">
</path>
<path
application="GFE"
extensionFilter=".txt"
localizationType="COMMON_STATIC"
name="Edit Area Groups"
recursive="false"
value="gfe/editAreaGroups">
</path>
<path <path
application="GFE" application="GFE"
extensionFilter=".xml" extensionFilter=".xml"
@ -1963,31 +1939,6 @@
recursive="true" recursive="true"
value="gfe/sampleSets"> value="gfe/sampleSets">
</path> </path>
<path
application="GFE"
extensionFilter=".py"
localizationAdapter="com.raytheon.viz.gfe.procedures.ProceduresAdapter"
localizationType="CAVE_STATIC"
name="Procedures"
value="gfe/userPython/procedures">
</path>
<path
application="GFE"
extensionFilter=".py"
localizationAdapter="com.raytheon.viz.gfe.smarttool.SmartToolAdapter"
localizationType="CAVE_STATIC"
name="Smart Tools"
value="gfe/userPython/smartTools">
</path>
<path
application="GFE"
extensionFilter=".py"
localizationAdapter="com.raytheon.viz.gfe.textproduct.TextProductAdapter"
localizationType="CAVE_STATIC"
name="Text Products"
recursive="false"
value="gfe/userPython/textProducts">
</path>
<path <path
application="GFE" application="GFE"
extensionFilter=".SELECTTR" extensionFilter=".SELECTTR"
@ -1996,29 +1947,6 @@
recursive="true" recursive="true"
value="gfe/text/selecttr"> value="gfe/text/selecttr">
</path> </path>
<path
application="GFE"
extensionFilter=".py"
localizationAdapter="com.raytheon.viz.gfe.textproduct.TextUtilityAdapter"
localizationType="CAVE_STATIC"
name="Text Utilities"
recursive="false"
value="gfe/userPython/textUtilities/regular">
</path>
<path
application="GFE"
extensionFilter=".py"
localizationAdapter="com.raytheon.viz.gfe.smarttool.UtilityAdapter"
localizationType="CAVE_STATIC"
name="Utilities"
value="gfe/userPython/utilities">
</path>
<path
application="GFE"
localizationType="COMMON_STATIC"
name="ISC Utilities"
value="isc/utilities">
</path>
<path <path
application="GFE" application="GFE"
extensionFilter=".xml" extensionFilter=".xml"

10
cave/com.raytheon.viz.hydro/plugin.xml
View file

@ -971,17 +971,11 @@
<extension <extension
point="com.raytheon.uf.viz.localization.localizationpath"> point="com.raytheon.uf.viz.localization.localizationpath">
<path <path
application="Hydro Apps" application="Hydro"
localizationType="COMMON_STATIC" localizationType="COMMON_STATIC"
name="Hydro" name="Hydro Apps"
value="hydro"> value="hydro">
</path> </path>
<path
application="Hydro Apps"
localizationType="COMMON_STATIC"
name="SHEF"
value="shef">
</path>
</extension> </extension>
<extension <extension
point="com.raytheon.uf.viz.core.component"> point="com.raytheon.uf.viz.core.component">

1
cave/com.raytheon.viz.lightning/localization/bundles/USPLNSeq60min.xml
View file

@ -180,7 +180,6 @@
</resourceData> </resourceData>
</resource> </resource>
</descriptor> </descriptor>
<numberOfFrames>100</numberOfFrames>
</displays> </displays>
</displayList> </displayList>
</bundle> </bundle>

20
cave/com.raytheon.viz.pointdata/localization/menus/obs/baseLocalData.xml
View file

@ -26,15 +26,6 @@
<substitute key="posOffset" value="900"/> <substitute key="posOffset" value="900"/>
<substitute key="negOffset" value="900"/> <substitute key="negOffset" value="900"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/LDADMesoQCPlot.xml"
menuText="30 min stn plot + QC" id="local30minstnQCplot">
<substitute key="svgPrefix" value="ldadQC"/>
<substitute key="legend" value="30 min LDAD QC Plot"/>
<substitute key="posOffset" value="900"/>
<substitute key="negOffset" value="900"/>
<substitute key="plugin" value="qc"/>
<substitute key="qcType" value="ldadmesonet"/>
</contribute>
<contribute xsi:type="subMenu" menuText="Other Local Plots"> <contribute xsi:type="subMenu" menuText="Other Local Plots">
<contribute xsi:type="bundleItem" file="bundles/LDADMesoPlot.xml" <contribute xsi:type="bundleItem" file="bundles/LDADMesoPlot.xml"
menuText="15 min stn plot" id="local15minstnplot"> menuText="15 min stn plot" id="local15minstnplot">
@ -43,15 +34,6 @@
<substitute key="posOffset" value="450"/> <substitute key="posOffset" value="450"/>
<substitute key="negOffset" value="450"/> <substitute key="negOffset" value="450"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/LDADMesoQCPlot.xml"
menuText="15 min stn plot + QC" id="local15minstnQCplot">
<substitute key="svgPrefix" value="ldadQC"/>
<substitute key="legend" value="15 min LDAD QC Plot"/>
<substitute key="posOffset" value="450"/>
<substitute key="negOffset" value="450"/>
<substitute key="plugin" value="qc"/>
<substitute key="qcType" value="ldadmesonet"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/LDADMesoPlot.xml" <contribute xsi:type="bundleItem" file="bundles/LDADMesoPlot.xml"
menuText="5 min stn plot" id="local5minstnplot"> menuText="5 min stn plot" id="local5minstnplot">
<substitute key="svg" value="ldadMesoDesign.svg"/> <substitute key="svg" value="ldadMesoDesign.svg"/>
@ -114,4 +96,4 @@
<substitute key="negOffset" value="150"/> <substitute key="negOffset" value="150"/>
</contribute> </contribute>
</contribute> </contribute>
</menuTemplate> </menuTemplate>

0
cave/com.raytheon.viz.radar/localization/menus/radar/dialAllRadars.xml → cave/com.raytheon.viz.radar/localization/menus/radar/allRadars.xml
View file

10
cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarMenu.xml
View file

@ -10,15 +10,9 @@
<contribute xsi:type="bundleItem" file="bundles/nexradAvailability.xml" <contribute xsi:type="bundleItem" file="bundles/nexradAvailability.xml"
menuText="NEXRAD Display" id="NEXRADDisplay"> menuText="NEXRAD Display" id="NEXRADDisplay">
</contribute> </contribute>
<contribute xsi:type="titleItem" titleText="------ Stations ------" <contribute xsi:type="subMenu" menuText="NEXRAD Stations"
id="RadarMosaic" />
<contribute xsi:type="subMenu" menuText="NEXRAD - Local"
id="RadarMenuDialRadarsSubMenu">
<contribute xsi:type="subinclude" fileName="menus/radar/dialRadars.xml" />
</contribute>
<contribute xsi:type="subMenu" menuText="NEXRAD - All"
id="RadarMenuDialAllRadarsSubMenu"> id="RadarMenuDialAllRadarsSubMenu">
<contribute xsi:type="subinclude" fileName="menus/radar/dialAllRadars.xml" /> <contribute xsi:type="subinclude" fileName="menus/radar/allRadars.xml" />
</contribute> </contribute>
<contribute xsi:type="subMenu" menuText="TDWR Stations" <contribute xsi:type="subMenu" menuText="TDWR Stations"
id="RadarMenuTwdrRadarsSubMenu"> id="RadarMenuTwdrRadarsSubMenu">

2
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/RadarAlterBundleContributor.java
View file

@ -103,7 +103,7 @@ public class RadarAlterBundleContributor extends AlterBundleContributorAdapter {
List<String> radars = new ArrayList<String>(RadarsInUseUtil.getSite( List<String> radars = new ArrayList<String>(RadarsInUseUtil.getSite(
site, RadarsInUseUtil.LOCAL_CONSTANT)); site, RadarsInUseUtil.LOCAL_CONSTANT));
radars.addAll(RadarsInUseUtil.getSite(site, radars.addAll(RadarsInUseUtil.getSite(site,
RadarsInUseUtil.DIAL_CONSTANT)); RadarsInUseUtil.MOSAIC_CONSTANT));
radars.addAll(RadarsInUseUtil.getSite(site, radars.addAll(RadarsInUseUtil.getSite(site,
RadarsInUseUtil.ARSR_CONSTANT)); RadarsInUseUtil.ARSR_CONSTANT));
radars.addAll(RadarsInUseUtil.getSite(site, radars.addAll(RadarsInUseUtil.getSite(site,

13885
cave/com.raytheon.viz.spi/localization/basemaps/modelBufr.spi Normal file
View file

File diff suppressed because it is too large Load diff

2
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/AfosBrowserModel.java
View file

@ -231,7 +231,7 @@ public final class AfosBrowserModel {
radarIDList.addAll(RadarsInUseUtil.getSite(curSite, radarIDList.addAll(RadarsInUseUtil.getSite(curSite,
RadarsInUseUtil.ASR_CONSTANT)); RadarsInUseUtil.ASR_CONSTANT));
radarIDList.addAll(RadarsInUseUtil.getSite(curSite, radarIDList.addAll(RadarsInUseUtil.getSite(curSite,
RadarsInUseUtil.DIAL_CONSTANT)); RadarsInUseUtil.MOSAIC_CONSTANT));
radarIDList.addAll(RadarsInUseUtil.getSite(curSite, radarIDList.addAll(RadarsInUseUtil.getSite(curSite,
RadarsInUseUtil.LOCAL_CONSTANT)); RadarsInUseUtil.LOCAL_CONSTANT));
List<String> radarIDListTrunc = new ArrayList<String>(); List<String> radarIDListTrunc = new ArrayList<String>();

124
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
View file

@ -125,10 +125,6 @@ import com.raytheon.uf.common.dataplugin.text.request.RemoteRetrievalRequest;
import com.raytheon.uf.common.dataplugin.text.request.StdTextProductServerRequest; import com.raytheon.uf.common.dataplugin.text.request.StdTextProductServerRequest;
import com.raytheon.uf.common.dataplugin.text.request.TextProductInfoCreateRequest; import com.raytheon.uf.common.dataplugin.text.request.TextProductInfoCreateRequest;
import com.raytheon.uf.common.dataplugin.text.util.AFOSParser; import com.raytheon.uf.common.dataplugin.text.util.AFOSParser;
import com.raytheon.uf.common.dissemination.OUPRequest;
import com.raytheon.uf.common.dissemination.OUPResponse;
import com.raytheon.uf.common.dissemination.OUPTestRequest;
import com.raytheon.uf.common.dissemination.OfficialUserProduct;
import com.raytheon.uf.common.jms.notification.INotificationObserver; import com.raytheon.uf.common.jms.notification.INotificationObserver;
import com.raytheon.uf.common.jms.notification.NotificationException; import com.raytheon.uf.common.jms.notification.NotificationException;
import com.raytheon.uf.common.jms.notification.NotificationMessage; import com.raytheon.uf.common.jms.notification.NotificationMessage;
@ -5112,27 +5108,7 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener,
inEditMode = false; inEditMode = false;
} }
if (!resend) { if (!resend) {
OUPTestRequest testReq = new OUPTestRequest();
testReq.setOupRequest(createOUPRequest(prod,
prod.getProduct()));
try {
OUPResponse checkResponse = (OUPResponse) ThriftClient
.sendRequest(testReq);
if (checkResponse.hasFailure()) {
statusHandler.handle(Priority.PROBLEM,
"Error during text product transmission check: "
+ checkResponse.getMessage());
inEditMode = true;
return;
}
} catch (VizException e) {
statusHandler.handle(Priority.PROBLEM,
"Error during text product transmission check",
e);
inEditMode = true;
return;
}
/* /*
* Update the vtec string in the message. It looks wrong to * Update the vtec string in the message. It looks wrong to
* do this after saveEditedProduct, but it works because for * do this after saveEditedProduct, but it works because for
@ -5152,15 +5128,8 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener,
textEditor.setText(prod.getProduct()); textEditor.setText(prod.getProduct());
} }
String product = prod.getProduct();
OUPRequest req = createOUPRequest(prod, product);
if (notify != null) {
notify.add(product);
}
// Code in Run statement goes here! // Code in Run statement goes here!
new Thread(new ThriftClientRunnable(req)).start(); //new Thread(new ThriftClientRunnable(req)).start();
} catch (VizException e) { } catch (VizException e) {
statusHandler.handle(Priority.PROBLEM, statusHandler.handle(Priority.PROBLEM,
"Error transmitting text product", e); "Error transmitting text product", e);
@ -5256,36 +5225,6 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener,
return result; return result;
} }
private OUPRequest createOUPRequest(StdTextProduct prod, String text) {
OUPRequest req = new OUPRequest();
OfficialUserProduct oup = new OfficialUserProduct();
String awipsWanPil = prod.getSite() + prod.getNnnid() + prod.getXxxid();
String awipsID = prod.getNnnid() + prod.getXxxid();
oup.setAwipsWanPil(awipsWanPil);
oup.setNeedsWmoHeader(false);
oup.setProductText(text);
oup.setSource("TextWS");
oup.setWmoType(fixNOR(prod.getBbbid()));
oup.setUserDateTimeStamp(prod.getHdrtime());
StringBuilder fileName = new StringBuilder();
// The .wan extension followed by the 10 digit epoch seconds
// of simulated time is used in EDEX's WarningDecoder to
// determine the base time.
fileName.append(awipsID).append(".wan")
.append(TimeUtil.getUnixTime(TimeUtil.newDate()));
oup.setFilename(fileName.toString());
oup.setAddress(addressee);
if (attachedFile != null && attachedFilename != null) {
oup.setAttachedFile(attachedFile);
oup.setAttachedFilename(attachedFilename);
}
req.setCheckBBB(true);
req.setProduct(oup);
req.setUser(UserController.getUserObject());
return req;
}
/** /**
* Recreates the original message by combining the header and the body from * Recreates the original message by combining the header and the body from
@ -7819,65 +7758,6 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener,
} }
} }
/*
* This class handles sending a request to a Thrift Client.
*/
private class ThriftClientRunnable implements Runnable {
private final OUPRequest request;
public ThriftClientRunnable(OUPRequest request) {
this.request = request;
}
@Override
public void run() {
try {
final OUPResponse response = (OUPResponse) ThriftClient
.sendRequest(request);
// if (response.isAcknowledged()) {
if (response.hasFailure()) {
Priority p = Priority.EVENTA;
if (!response.isAttempted()) {
// if was never attempted to send or store even locally
p = Priority.CRITICAL;
} else if (!response.isSendLocalSuccess()) {
// if send/store locally failed
p = Priority.CRITICAL;
} else if (!response.isSendWANSuccess()) {
// if send to WAN failed
if (response.getNeedAcknowledgment()) {
// if ack was needed, if it never sent then no ack
// was recieved
p = Priority.CRITICAL;
} else {
// if no ack was needed
p = Priority.EVENTA;
}
} else if (response.getNeedAcknowledgment()
&& !response.isAcknowledged()) {
// if sent but not acknowledged when acknowledgement is
// needed
p = Priority.CRITICAL;
}
statusHandler.handle(p, response.getMessage());
} else {
// no failure
// As of DR 15418, nothing is done with
// response.getChangedBBB()
}
Thread.interrupted();
} catch (VizException e) {
statusHandler.handle(Priority.PROBLEM,
"Error transmitting text product", e);
}
}
}
/* /*
* (non-Javadoc) * (non-Javadoc)
* *

7
cave/com.raytheon.viz.textworkstation/plugin.xml
View file

@ -47,13 +47,6 @@
value="textws/gui" value="textws/gui"
recursive="true"> recursive="true">
</path> </path>
<path
application="TextWS"
localizationType="COMMON_STATIC"
name="Mixed Case"
value="mixedCase"
recursive="false">
</path>
</extension> </extension>
</plugin> </plugin>

0
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/2mTemperature.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/2mTemperature.xml
View file

2
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/30mbMeanDewpoint.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/30mbMeanDewpoint.xml
View file

@ -58,7 +58,7 @@
<capability xsi:type="densityCapability" density="1.0"/> <capability xsi:type="densityCapability" density="1.0"/>
<capability xsi:type="outlineCapability" outlineWidth="1" outlineOn="true" lineStyle="DOTTED"/> <capability xsi:type="outlineCapability" outlineWidth="1" outlineOn="true" lineStyle="DOTTED"/>
<capability xsi:type="magnificationCapability" magnification="1.25"/> <capability xsi:type="magnificationCapability" magnification="1.25"/>
<capability xsi:type="colorableCapability" colorAsString="black"/> <capability xsi:type="colorableCapability" colorAsString="gray30"/>
<capability xsi:type="displayTypeCapability" displayType="CONTOUR"/> <capability xsi:type="displayTypeCapability" displayType="CONTOUR"/>
</capabilities> </capabilities>
</loadProperties> </loadProperties>

0
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/500Height.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/500Height.xml
View file

0
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/Buoyancy.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/Buoyancy.xml
View file

94
cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/CMCHelicity.xml Normal file
View file

@ -0,0 +1,94 @@
<bundle xmlns:ns2="group">
<displayList>
<displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="d2DMapRenderableDisplay" scale="CONUS" density="1.0" magnification="1.0" zoomLevel="1.0" mapCenter="-79.09835514095181 33.915979250804455 0.0">
<descriptor xsi:type="mapDescriptor">
<resource>
<loadProperties xsi:type="gridLoadProperties" displayType="IMAGE" loadWithoutData="false">
<resourceType>PLAN_VIEW</resourceType>
<perspectiveProperty xsi:type="d2dLoadProperties" loadMode="VALID_TIME_SEQ" timeMatchBasis="true"/>
<capabilities>
<capability xsi:type="displayTypeCapability" displayType="IMAGE"/>
<capability xsi:type="colorableCapability" colorAsString="white"/>
<capability xsi:type="imagingCapability" contrast="1.0" brightness="1.0" interpolationState="true" alpha="0.8"/>
<capability xsi:type="colorMapCapability">
<colorMapParameters colorMapName="Grid/Helicity">
<persisted>
<colorMapMin>0.0</colorMapMin>
<colorMapMax>2250.0</colorMapMax>
</persisted>
</colorMapParameters>
</capability>
</capabilities>
</loadProperties>
<properties isVisible="true" isHoverOn="false" isMapLayer="false" isBlinking="false" isSystemResource="false" renderingOrderId="IMAGE_WORLD">
<pdProps minDisplayWidth="0" maxDisplayWidth="100000000"/>
</properties>
<resourceData xsi:type="gridResourceData" sampling="true" spatial="false" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
<metadataMap>
<mapping key="info.level.levelonevalue">
<constraint constraintType="EQUALS" constraintValue="10000.0"/>
</mapping>
<mapping key="info.level.masterLevel.name">
<constraint constraintType="EQUALS" constraintValue="ETA"/>
</mapping>
<mapping key="info.parameter.abbreviation">
<constraint constraintType="EQUALS" constraintValue="Heli"/>
</mapping>
<mapping key="info.datasetId">
<constraint constraintType="EQUALS" constraintValue="CMC"/>
</mapping>
<mapping key="info.level.leveltwovalue">
<constraint constraintType="EQUALS" constraintValue="-999999.0"/>
</mapping>
<mapping key="pluginName">
<constraint constraintType="EQUALS" constraintValue="grid"/>
</mapping>
</metadataMap>
<alertParser xsi:type="gribDataCubeAlertMessageParser"/>
</resourceData>
</resource>
<resource>
<loadProperties xsi:type="gridLoadProperties" displayType="CONTOUR" loadWithoutData="false">
<resourceType>PLAN_VIEW</resourceType>
<perspectiveProperty xsi:type="d2dLoadProperties" loadMode="VALID_TIME_SEQ" timeMatchBasis="false"/>
<capabilities>
<capability xsi:type="densityCapability" density="1.0"/>
<capability xsi:type="outlineCapability" outlineWidth="1" outlineOn="true" lineStyle="DEFAULT"/>
<capability xsi:type="displayTypeCapability" displayType="CONTOUR"/>
<capability xsi:type="colorableCapability" colorAsString="white"/>
<capability xsi:type="magnificationCapability" magnification="1.0"/>
</capabilities>
</loadProperties>
<properties isVisible="true" isHoverOn="false" isMapLayer="false" isBlinking="false" isSystemResource="false" renderingOrderId="CONTOUR">
<pdProps minDisplayWidth="0" maxDisplayWidth="100000000"/>
</properties>
<resourceData xsi:type="gridResourceData" sampling="false" spatial="false" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
<metadataMap>
<mapping key="info.level.levelonevalue">
<constraint constraintType="EQUALS" constraintValue="10000.0"/>
</mapping>
<mapping key="info.level.masterLevel.name">
<constraint constraintType="EQUALS" constraintValue="ETA"/>
</mapping>
<mapping key="info.parameter.abbreviation">
<constraint constraintType="EQUALS" constraintValue="Heli"/>
</mapping>
<mapping key="info.datasetId">
<constraint constraintType="EQUALS" constraintValue="CMC"/>
</mapping>
<mapping key="info.level.leveltwovalue">
<constraint constraintType="EQUALS" constraintValue="-999999.0"/>
</mapping>
<mapping key="pluginName">
<constraint constraintType="EQUALS" constraintValue="grid"/>
</mapping>
</metadataMap>
<alertParser xsi:type="gribDataCubeAlertMessageParser"/>
</resourceData>
</resource>
<timeMatcher xsi:type="d2DTimeMatcher" deltaFilter="0" forecastFilter="0"/>
<numberOfFrames>${frameCount}</numberOfFrames>
</descriptor>
</displays>
</displayList>
</bundle>

0
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/CeilingHeight.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/CeilingHeight.xml
View file

0
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ConvectionPotential.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/ConvectionPotential.xml
View file

0
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ConvectionProbability.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/ConvectionProbability.xml
View file

0
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultFamily.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/DefaultFamily.xml
View file

0
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultFourPanel.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/DefaultFourPanel.xml
View file

0
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultMesoFamily.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/DefaultMesoFamily.xml
View file

0
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultStdEnv.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/DefaultStdEnv.xml
View file

0
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultStormScaleFamily.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/DefaultStormScaleFamily.xml
View file

0
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultSurface.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/DefaultSurface.xml
View file

2
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DewpointTemp.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/DewpointTemp.xml
View file

@ -57,7 +57,7 @@
<capability xsi:type="densityCapability" density="0.5"/> <capability xsi:type="densityCapability" density="0.5"/>
<capability xsi:type="outlineCapability" outlineWidth="1" outlineOn="true" lineStyle="DEFAULT"/> <capability xsi:type="outlineCapability" outlineWidth="1" outlineOn="true" lineStyle="DEFAULT"/>
<capability xsi:type="magnificationCapability" magnification="1.0"/> <capability xsi:type="magnificationCapability" magnification="1.0"/>
<capability xsi:type="colorableCapability" colorAsString="black"/> <capability xsi:type="colorableCapability" colorAsString="gray30"/>
<capability xsi:type="displayTypeCapability" displayType="CONTOUR"/> <capability xsi:type="displayTypeCapability" displayType="CONTOUR"/>
</capabilities> </capabilities>
</loadProperties> </loadProperties>

2
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DewpointTempError.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/DewpointTempError.xml
View file

@ -57,7 +57,7 @@
<capability xsi:type="densityCapability" density="0.5"/> <capability xsi:type="densityCapability" density="0.5"/>
<capability xsi:type="outlineCapability" outlineWidth="1" outlineOn="true" lineStyle="DEFAULT"/> <capability xsi:type="outlineCapability" outlineWidth="1" outlineOn="true" lineStyle="DEFAULT"/>
<capability xsi:type="magnificationCapability" magnification="1.0"/> <capability xsi:type="magnificationCapability" magnification="1.0"/>
<capability xsi:type="colorableCapability" colorAsString="black"/> <capability xsi:type="colorableCapability" colorAsString="gray30"/>
<capability xsi:type="displayTypeCapability" displayType="CONTOUR"/> <capability xsi:type="displayTypeCapability" displayType="CONTOUR"/>
</capabilities> </capabilities>
</loadProperties> </loadProperties>

0
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ECMWFHiRes.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/ECMWFHiRes.xml
View file

0
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ECMWFHiResFourPanel.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/ECMWFHiResFourPanel.xml
View file

0
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ECMWFLowRes.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/ECMWFLowRes.xml
View file

0
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ELEV.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/ELEV.xml
View file

0
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ETCWL.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/ETCWL.xml
View file

0
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ETSRG.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/ETSRG.xml
View file

0
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/Frontogenesis.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/Frontogenesis.xml
View file

0
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/HFR.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/HFR.xml
View file

0
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/HRRR.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/HRRR.xml
View file

0
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/HRRRFamily.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/HRRRFamily.xml
View file

0
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/Hail.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/Hail.xml
View file

0
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/HeavyRainFamily.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/HeavyRainFamily.xml
View file

0
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/HeightComparison.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/HeightComparison.xml
View file

2
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/Isentropic.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/Isentropic.xml
View file

@ -356,7 +356,7 @@
<capability xsi:type="magnificationCapability" magnification="1.0"/> <capability xsi:type="magnificationCapability" magnification="1.0"/>
<capability xsi:type="displayTypeCapability" displayType="CONTOUR"/> <capability xsi:type="displayTypeCapability" displayType="CONTOUR"/>
<capability xsi:type="densityCapability" density="0.5"/> <capability xsi:type="densityCapability" density="0.5"/>
<capability xsi:type="colorableCapability" colorAsString="black"/> <capability xsi:type="colorableCapability" colorAsString="gray30"/>
</capabilities> </capabilities>
</loadProperties> </loadProperties>
<properties isVisible="true" isHoverOn="false" isMapLayer="false" isBlinking="false" isSystemResource="false" renderingOrderId="CONTOUR"> <properties isVisible="true" isHoverOn="false" isMapLayer="false" isBlinking="false" isSystemResource="false" renderingOrderId="CONTOUR">

0
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/LightningPotential.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/LightningPotential.xml
View file

0
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/LightningProbability.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/LightningProbability.xml
View file

0
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/LightningThreat.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/LightningThreat.xml
View file

0
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/LimitedFamily.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/LimitedFamily.xml
View file

0
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/MCS.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/MCS.xml
View file

0
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/MSLPComparison.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/MSLPComparison.xml
View file

0
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/MSLPress.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/MSLPress.xml
View file

0
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/MidLevelDivergence.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/MidLevelDivergence.xml
View file

0
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyA.xml → cave/com.raytheon.viz.volumebrowser/localization/bundles/grid/ModelFamilyA.xml
View file

Some files were not shown because too many files have changed in this diff Show more