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

Merge branch 'asm_16.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_16.1.1

Browse source 
Former-commit-id: d0edf23a2e9fc05d5300b48073b917f7cf45ccb6
This commit is contained in:
Shawn.Hooper 2015-09-18 14:57:56 -04:00
commit dc6e80b24b
7 changed files with 29 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cave/build/static/linux/cave/caveUtil.sh
View file

@ -39,6 +39,7 @@
# Oct 13, 2014 #3675 bclement logExitStatus() waits for child to start and renames log with child PID # Oct 13, 2014 #3675 bclement logExitStatus() waits for child to start and renames log with child PID
# Jul 23, 2015 ASM#13849 D. Friedman Use a unique Eclipse configuration directory # Jul 23, 2015 ASM#13849 D. Friedman Use a unique Eclipse configuration directory
# Aug 03, 2015 #4694 dlovely Fixed path for log file cleanup # Aug 03, 2015 #4694 dlovely Fixed path for log file cleanup
# Sep 16, 2015 #18041 lshi Purge CAVE logs after 30 days instead of 7
source /awips2/cave/iniLookup.sh source /awips2/cave/iniLookup.sh
RC=$? RC=$?
@ -383,10 +384,10 @@ function deleteOldCaveLogs()
local mybox=$(hostname) local mybox=$(hostname)
echo -e "Cleaning consoleLogs: " echo -e "Cleaning consoleLogs: "
echo -e "find $HOME/$BASE_LOGDIR -type f -name "*.log" -mtime +7 -exec rm {} \;" echo -e "find $HOME/$BASE_LOGDIR -type f -name "*.log" -mtime +30 -exec rm {} \;"
find "$HOME/$BASE_LOGDIR" -type f -name "*.log" -mtime +7 -exec rm {} \; find "$HOME/$BASE_LOGDIR" -type f -name "*.log" -mtime +30 -exec rm {} \;
exit 0 exit 0

5
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/EditPrecipStationsDialog.java
View file

@ -86,6 +86,7 @@ import com.vividsolutions.jts.geom.Coordinate;
* Nov 26, 2014 16889 snaples Updated to fix SNOTEL display * Nov 26, 2014 16889 snaples Updated to fix SNOTEL display
* Jun 18, 2015 14298,17388 ptilles Updated to fix problem with mpe_dqc_6hr_24hr_ste_bad token and problem * Jun 18, 2015 14298,17388 ptilles Updated to fix problem with mpe_dqc_6hr_24hr_ste_bad token and problem
* with changing a 6hr value in 24hr mode * with changing a 6hr value in 24hr mode
* Sep 11, 2015 17986 snaples Updated q45bnames array to correct order issue, with Screened and Questionable being reversed.
* *
* </pre> * </pre>
* *
@ -208,8 +209,8 @@ public class EditPrecipStationsDialog extends AbstractMPEDialog implements
private String[] q2bnames = { "Manual", "Reset to Original" }; private String[] q2bnames = { "Manual", "Reset to Original" };
private String[] q45bnames = { "Verified", "Screened (Forced)", private String[] q45bnames = { "Verified", "Questionable", "Screened (Forced)",
"Questionable", "Bad" }; "Bad" };
private int initial_qual = F_MANUAL; private int initial_qual = F_MANUAL;

7
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcPrecipOptionsDialog.java
View file

@ -67,6 +67,7 @@ import com.raytheon.viz.mpe.util.DailyQcUtils;
* Sep 11, 2013 #2353 lvenable Fixed cursor memory leak. * Sep 11, 2013 #2353 lvenable Fixed cursor memory leak.
* Mar 10, 2015 14575 snaples Added additional status flag. * Mar 10, 2015 14575 snaples Added additional status flag.
* Jul 9, 2015 14618 snaples Cleaned up code issues. * Jul 9, 2015 14618 snaples Cleaned up code issues.
* Sep 11, 2015 17988 snaples Fixed issue with wait cursor not showing when Rendering Grids.
* </pre> * </pre>
* *
* @author snaples * @author snaples
@ -489,7 +490,7 @@ public class QcPrecipOptionsDialog extends AbstractMPEDialog {
} }
}); });
Composite renderComp = new Composite(dataOptionsGroup, SWT.NONE); final Composite renderComp = new Composite(dataOptionsGroup, SWT.NONE);
GridLayout renderCompLayout = new GridLayout(2, false); GridLayout renderCompLayout = new GridLayout(2, false);
renderCompLayout.marginHeight = 0; renderCompLayout.marginHeight = 0;
renderCompLayout.marginWidth = 0; renderCompLayout.marginWidth = 0;
@ -507,10 +508,10 @@ public class QcPrecipOptionsDialog extends AbstractMPEDialog {
renderGridsBtn.addSelectionListener(new SelectionAdapter() { renderGridsBtn.addSelectionListener(new SelectionAdapter() {
@Override @Override
public void widgetSelected(SelectionEvent event) { public void widgetSelected(SelectionEvent event) {
shell.setCursor(waitCursor); renderComp.setCursor(waitCursor);
opo.render_options(0); opo.render_options(0);
shell.setCursor(prevCursor);
renderGridsBtn.setEnabled(false); renderGridsBtn.setEnabled(false);
renderComp.setCursor(prevCursor);
} }
}); });

7
edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-ingest.xml
View file

@ -39,10 +39,13 @@
<to uri="jms-durable:queue:Ingest.Radar" /> <to uri="jms-durable:queue:Ingest.Radar" />
</route> </route>
--> -->
<endpoint id="radarJmsEndpoint" uri="jms-durable:queue:Ingest.Radar?concurrentConsumers=${radar-decode.sbn.threads}"/>
<endpoint id="radarRadarServerJmsEndpoint" uri="jms-durable:queue:Ingest.RadarRadarServer?concurrentConsumers=${radar-decode.local.threads}"/>
<!-- Begin Radar routes --> <!-- Begin Radar routes -->
<route id="radarIngestRoute"> <route id="radarIngestRoute">
<from uri="jms-durable:queue:Ingest.Radar"/> <from ref="radarJmsEndpoint"/>
<setHeader headerName="dataType"> <setHeader headerName="dataType">
<constant>radar-sbn</constant> <constant>radar-sbn</constant>
</setHeader> </setHeader>
@ -50,7 +53,7 @@
</route> </route>
<route id="radarRadarServerIngestRoute"> <route id="radarRadarServerIngestRoute">
<from uri="jms-durable:queue:Ingest.RadarRadarServer"/> <from ref="radarRadarServerJmsEndpoint"/>
<setHeader headerName="dataType"> <setHeader headerName="dataType">
<constant>radar-local</constant> <constant>radar-local</constant>
</setHeader> </setHeader>

4
edexOsgi/com.raytheon.edex.plugin.radar/resources/com.raytheon.edex.plugin.radar.properties Normal file
View file

@ -0,0 +1,4 @@
# Number threads for radar products ingested from the SBN
radar-decode.sbn.threads=1
# Number threads for radar products ingested locally
radar-decode.local.threads=1

17
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm
View file

@ -20,6 +20,7 @@
##### Fixed dupCounties.vm not working due a variable switch in HeadlineLocList and ZoneHeadlineLocList ##### Fixed dupCounties.vm not working due a variable switch in HeadlineLocList and ZoneHeadlineLocList
##### Evan Bookbinder 3-23/24-2015 Changes for mixed case (including new capitalize function) ##### Evan Bookbinder 3-23/24-2015 Changes for mixed case (including new capitalize function)
##### D. Friedman 08-11-2015 ASM #17841. Handle possibly duplicate second time zone time. ##### D. Friedman 08-11-2015 ASM #17841. Handle possibly duplicate second time zone time.
##### Qinglu Lin 09-11-2015 ASM #17890. Updated headlineExpire.
#################################################################################################### ####################################################################################################
#* #*
Mile Marker Test Code Mile Marker Test Code
@ -1264,21 +1265,17 @@ Until #formatTwoTimes($time1, $time2)##
######### STATEMENTS. THIS WILL BE ALL CAPS ########## ######### STATEMENTS. THIS WILL BE ALL CAPS ##########
#macro(headlineExpire $dateUtil $expire $timeFormat $localtimezone $secondtimezone $duration) #macro(headlineExpire $dateUtil $expire $timeFormat $localtimezone $secondtimezone $duration)
#if(${duration} >= 360) #if(${duration} >= 360)
#set($timevar = ${dateUtil.formatUseNoonMidnight(${expire}, ${timeFormat.plain}, 15, ${localtimezone})}) #set($timevar1 = ${dateUtil.formatUseNoonMidnight(${expire}, ${timeFormat.plain}, 15, ${localtimezone})})
#capitalize(${timevar} "ALL")##
#else #else
#set($timevar = ${dateUtil.formatUseNoonMidnight(${expire}, ${timeFormat.clock}, 15, ${localtimezone})}) #set($timevar1 = ${dateUtil.formatUseNoonMidnight(${expire}, ${timeFormat.clock}, 15, ${localtimezone})})
#capitalize(${timevar} "ALL")##
#end #end
#if(${secondtimezone})
#if(${duration} >= 360) #if(${duration} >= 360)
#set($timevar = ${dateUtil.formatUseNoonMidnight(${expire}, ${timeFormat.plain}, 15, ${secondtimezone})}) #set($timevar2 = ${dateUtil.formatUseNoonMidnight(${expire}, ${timeFormat.plain}, 15, ${secondtimezone})})
/#capitalize(${timevar} "ALL")/##
#else #else
#set($timevar = ${dateUtil.formatUseNoonMidnight(${expire}, ${timeFormat.clock}, 15, ${secondtimezone})}) #set($timevar2 = ${dateUtil.formatUseNoonMidnight(${expire}, ${timeFormat.clock}, 15, ${secondtimezone})})
/#capitalize(${timevar} "ALL")/##
#end
#end #end
#set($timevar = "#formatTwoTimes($timevar1 $timevar2)")
#capitalize(${timevar} "ALL")##
#end #end
########END MACRO ########END MACRO

3
rpms/awips2.core/Installer.rcm/component.spec
View file

@ -129,6 +129,9 @@ rm -rf ${RPM_BUILD_ROOT}
%dir /awips2/rcm %dir /awips2/rcm
%dir /awips2/rcm/data %dir /awips2/rcm/data
/awips2/rcm/data/* /awips2/rcm/data/*
%config(noreplace) /awips2/rcm/data/config/drop-ins/elevationLists.txt
%config(noreplace) /awips2/rcm/data/config/drop-ins/tdwrElevations.txt
%config(noreplace) /awips2/rcm/data/config/drop-ins/ssssElevationLists.txt
%docdir /awips2/rcm/licenses %docdir /awips2/rcm/licenses
%dir /awips2/rcm/licenses %dir /awips2/rcm/licenses