Merge branch 'omaha_13.5.1' (13.5.1-8) into development
Conflicts: RadarServer/build.rcm/build.xml cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarMLResource.java Former-commit-id:f97a27796d[formerly26df62db53[formerly d72693a1db1cd55392c7d171a67918e2bbe5daed]] Former-commit-id:26df62db53Former-commit-id:464352f731
This commit is contained in:
Richard Peter
commit
e439ecafe6
13 changed files with 262544 additions and 130800 deletions
|
|
@ -56,6 +56,10 @@
|
|||
</and>
|
||||
</condition>
|
||||
|
||||
<condition property="cots.dir" value="${basedir}/.." else="${basedir}/../../cots">
|
||||
<available file="${basedir}/../org.springframework" />
|
||||
</condition>
|
||||
|
||||
<!-- Set default EDEX install location for copy filter -->
|
||||
<property name="def.edex.install.dir" value="/awips" />
|
||||
<condition property="edex.home" value="$EdexBaseDir" else="${def.edex.install.dir}">
|
||||
|
|
@ -117,28 +121,28 @@
|
|||
</chmod>
|
||||
|
||||
<copy todir="${deploy.dir}/lib" flatten="true">
|
||||
<fileset dir="../../cots/org.apache.activemq" includes="**/*.jar" />
|
||||
<fileset dir="../../cots/org.apache.qpid" includes="**/*.jar" />
|
||||
<fileset dir="../../cots/org.slf4j">
|
||||
<include name="**/jcl-over-slf4j*.jar" />
|
||||
<include name="**/jul-to-slf4j*.jar" />
|
||||
<include name="**/slf4j-api*.jar" />
|
||||
</fileset>
|
||||
<fileset dir="../../cots/org.apache.commons.beanutils" includes="**/*.jar" />
|
||||
<fileset dir="../../cots/org.apache.commons.codec" includes="**/*.jar" />
|
||||
<fileset dir="../../cots/org.apache.commons.collections" includes="**/*.jar" />
|
||||
<fileset dir="../../cots/org.apache.commons.lang" includes="**/*.jar" />
|
||||
<fileset dir="../../cots/org.apache.commons.logging" includes="**/*.jar" />
|
||||
<fileset dir="../../cots/org.apache.mina" includes="**/*.jar" />
|
||||
<fileset dir="../../cots/org.apache.log4j" includes="**/*.jar" />
|
||||
<fileset dir="../../cots/javax.jms" includes="**/*.jar" />
|
||||
<fileset dir="../../cots/org.springframework">
|
||||
<fileset dir="${cots.dir}/org.apache.activemq" includes="**/*.jar" />
|
||||
<fileset dir="${cots.dir}/org.apache.qpid" includes="**/*.jar" />
|
||||
<fileset dir="${cots.dir}/org.slf4j" includes="**/*.jar">
|
||||
<include name="**/jcl-over-slf4j*.jar" />
|
||||
<include name="**/jul-to-slf4j*.jar" />
|
||||
<include name="**/slf4j-api*.jar" />
|
||||
</fileset>
|
||||
<fileset dir="${cots.dir}/org.apache.commons.beanutils" includes="**/*.jar" />
|
||||
<fileset dir="${cots.dir}/org.apache.commons.codec" includes="**/*.jar" />
|
||||
<fileset dir="${cots.dir}/org.apache.commons.collections" includes="**/*.jar" />
|
||||
<fileset dir="${cots.dir}/org.apache.commons.lang" includes="**/*.jar" />
|
||||
<fileset dir="${cots.dir}/org.apache.commons.logging" includes="**/*.jar" />
|
||||
<fileset dir="${cots.dir}/org.apache.mina" includes="**/*.jar" />
|
||||
<fileset dir="${cots.dir}/org.apache.log4j" includes="**/*.jar" />
|
||||
<fileset dir="${cots.dir}/javax.jms" includes="**/*.jar" />
|
||||
<fileset dir="${cots.dir}/org.springframework">
|
||||
<include name="**/*spring*beans*.jar" />
|
||||
<include name="**/*spring*context*.jar" />
|
||||
</fileset>
|
||||
<fileset dir="../../cots/org.itadaki.bzip2" includes="**/*.jar" />
|
||||
<fileset dir="../../cots/org.quartz" includes="**/*.jar" />
|
||||
<fileset dir="lib" includes="**/*.jar" />
|
||||
<fileset dir="${cots.dir}/org.itadaki.bzip2" includes="**/*.jar" />
|
||||
<fileset dir="${cots.dir}/org.quartz" includes="**/*.jar" />
|
||||
<fileset dir="lib" includes="**/*.jar" />
|
||||
</copy>
|
||||
|
||||
<delete dir="bin" />
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -10,13 +10,14 @@
|
|||
|
||||
Modify:
|
||||
|
||||
06/14/2013 Xiaochuan DR 15733 Initial creation
|
||||
06/14/2013 Xiaochuan DR 15733 Initial creation
|
||||
07/18/2013 B. Hebbard per G. Hull DR 15733 Update highlightBG & FG
|
||||
|
||||
-->
|
||||
|
||||
<textColorsCfg>
|
||||
<TextColorElement paramName="textBG" color="255, 255, 255"/>
|
||||
<TextColorElement paramName="textFG" color="0, 0,0"/>
|
||||
<TextColorElement paramName="highlightBG" color="RED"/>
|
||||
<TextColorElement paramName="highlightFG" color="BLACK"/>
|
||||
<TextColorElement paramName="highlightBG" color="85, 152, 215"/>
|
||||
<TextColorElement paramName="highlightFG" color="255, 255, 255"/>
|
||||
</textColorsCfg>
|
||||
|
|
@ -25,6 +25,7 @@ import com.raytheon.uf.common.dataplugin.gfe.request.CheckServiceBackupPrimarySi
|
|||
import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
|
||||
import com.raytheon.uf.common.status.IUFStatusHandler;
|
||||
import com.raytheon.uf.common.status.UFStatus;
|
||||
import com.raytheon.uf.viz.core.VizApp;
|
||||
import com.raytheon.uf.viz.core.auth.UserController;
|
||||
import com.raytheon.uf.viz.core.exception.VizException;
|
||||
import com.raytheon.uf.viz.core.requests.ThriftClient;
|
||||
|
|
@ -42,6 +43,9 @@ import com.raytheon.uf.viz.core.requests.ThriftClient;
|
|||
* Nov 14, 2012 jdynina Added check for national center
|
||||
* May 02, 2013 #1762 dgilling Replace national center check with
|
||||
* a svcbu PRIMARY_SITES check.
|
||||
* Jul 22, 2013 #1762 dgilling Ensure all fields of
|
||||
* CheckServiceBackupPrimarySiteRequest are
|
||||
* filled.
|
||||
*
|
||||
* </pre>
|
||||
*
|
||||
|
|
@ -85,8 +89,10 @@ public class CheckPermissions {
|
|||
return authorized;
|
||||
}
|
||||
|
||||
public static boolean runningAsPrimary() {
|
||||
public static boolean runningAsPrimary(String siteId) {
|
||||
CheckServiceBackupPrimarySiteRequest request = new CheckServiceBackupPrimarySiteRequest();
|
||||
request.setSiteID(siteId);
|
||||
request.setWorkstationID(VizApp.getWsId());
|
||||
try {
|
||||
@SuppressWarnings("unchecked")
|
||||
ServerResponse<Boolean> sr = (ServerResponse<Boolean>) ThriftClient
|
||||
|
|
|
|||
|
|
@ -93,6 +93,7 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
|
|||
* Mar 20, 2013 1447 dgilling Port troubleshooting mode changes
|
||||
* from A1 DR 21404, some code cleanup.
|
||||
* May 01, 2013 1762 dgilling Remove national center check.
|
||||
* Jul 22, 2013 1762 dgilling Fix running as primary check.
|
||||
*
|
||||
* </pre>
|
||||
*
|
||||
|
|
@ -168,7 +169,7 @@ public class ServiceBackupDlg extends CaveJFACEDialog {
|
|||
super(parentShell);
|
||||
authorized = CheckPermissions.getAuthorization();
|
||||
this.site = LocalizationManager.getInstance().getCurrentSite();
|
||||
this.runningAsPrimary = CheckPermissions.runningAsPrimary();
|
||||
this.runningAsPrimary = CheckPermissions.runningAsPrimary(this.site);
|
||||
if (!ServiceBackupJobManager.getInstance().isRunning()) {
|
||||
ServiceBackupJobManager.getInstance().start();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -60,6 +60,7 @@ import com.vividsolutions.jts.geom.Geometry;
|
|||
* Sep 27, 2012 1149 jsanchez Refactored methods from AbstractWarningsResource into this class.
|
||||
* Apr 18, 2013 1877 jsanchez Ordered the records the same for update and initial load.
|
||||
* Removed no longer needed frameAltered. Do not set wire frame for a CAN.
|
||||
* Jul 24, 2013 DR16350 mgamazaychikov Fix the problem with plotting EXP warning
|
||||
* </pre>
|
||||
*
|
||||
* @author jsanchez
|
||||
|
|
@ -233,7 +234,7 @@ public class WarningsResource extends AbstractWWAResource {
|
|||
for (AbstractWarningRecord warnrec : recordsToLoad) {
|
||||
WarningAction act = WarningAction.valueOf(warnrec.getAct());
|
||||
if (act == WarningAction.CON || act == WarningAction.CAN
|
||||
|| act == WarningAction.EXP || act == WarningAction.EXT) {
|
||||
|| act == WarningAction.EXT) {
|
||||
AbstractWarningRecord createShape = null;
|
||||
for (String key : entryMap.keySet()) {
|
||||
WarningEntry entry = entryMap.get(key);
|
||||
|
|
|
|||
|
|
@ -19,6 +19,8 @@
|
|||
**/
|
||||
package com.raytheon.uf.common.dataplugin.gfe.request;
|
||||
|
||||
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
|
||||
|
||||
/**
|
||||
* Request to determine whether specified site id is one of the server's
|
||||
* configured primary sites for service backup.
|
||||
|
|
@ -30,6 +32,7 @@ package com.raytheon.uf.common.dataplugin.gfe.request;
|
|||
* Date Ticket# Engineer Description
|
||||
* ------------ ---------- ----------- --------------------------
|
||||
* May 02, 2013 dgilling Initial creation
|
||||
* Jul 22, 2013 dgilling Add missing DynamicSerialize annotation.
|
||||
*
|
||||
* </pre>
|
||||
*
|
||||
|
|
@ -37,6 +40,7 @@ package com.raytheon.uf.common.dataplugin.gfe.request;
|
|||
* @version 1.0
|
||||
*/
|
||||
|
||||
@DynamicSerialize
|
||||
public class CheckServiceBackupPrimarySiteRequest extends AbstractGfeRequest {
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<requestPatterns xmlns:ns2="group">
|
||||
<regex></regex>
|
||||
</requestPatterns>
|
||||
|
|
|
|||
|
|
@ -38,9 +38,10 @@ HURR_LOCAL stations.tbl W $TEXT_DATA2/tropical/HLS HLS
|
|||
DAY_1 day1.bull B $TEXT_DATA/spc/day1 day1
|
||||
DAY_2 day2.bull B $TEXT_DATA/spc/day2 day2
|
||||
DAY_3 day3.bull B $TEXT_DATA/spc/day3 day3
|
||||
DAY_1_PT day1pts.bull B $TEXT_DATA/spc/otlkpts ptsdy1
|
||||
DAY_2_PT day2pts.bull B $TEXT_DATA/spc/otlkpts ptsdy2
|
||||
DAY_3_PT day3pts.bull B $TEXT_DATA/spc/otlkpts ptsdy3
|
||||
DAY_3_8_OLK stations.tbl B $TEXT_DATA/../all_prods/forecast/land fwddy38
|
||||
DAY_1_PT day1pts.bull B $TEXT_DATA/watch_warn/tstrm_warn ptsdy1
|
||||
DAY_2_PT day2pts.bull B $TEXT_DATA/watch_warn/tstrm_warn ptsdy2
|
||||
DAY_3_PT day3pts.bull B $TEXT_DATA/watch_warn/tstrm_warn ptsdy3
|
||||
WATCH_BOX watndsc.bull B $TEXT_DATA/spc/watch2 wtch2
|
||||
ALL_WBOX watbox.bull B $TEXT_DATA/spc/watch watch
|
||||
WATCH_NDSC watndsc.bull B $TEXT_DATA/spc/watch2 wtch2
|
||||
|
|
@ -177,4 +178,4 @@ CSPS stations.tbl W $TEXT_DATA/canada/sps sps
|
|||
CWATCH stations.tbl W $TEXT_DATA/canada/warwatch warwatch
|
||||
CWARNSUMM stations.tbl W $TEXT_DATA/canada/warnsumm warnsumm
|
||||
COUTLOOK stations.tbl W $TEXT_DATA/canada/coutlook coutlook
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -176,3 +176,4 @@ INSERT INTO awips.nctext_inputfile_type VALUES (176,'sps','W');
|
|||
INSERT INTO awips.nctext_inputfile_type VALUES (177,'warwatch','W');
|
||||
INSERT INTO awips.nctext_inputfile_type VALUES (178,'warnsumm','W');
|
||||
INSERT INTO awips.nctext_inputfile_type VALUES (179,'coutlook','W');
|
||||
INSERT INTO awips.nctext_inputfile_type VALUES (180,'fwddy38','W');
|
||||
|
|
|
|||
|
|
@ -164,12 +164,14 @@ public final class NctextRegexMatcher {
|
|||
//split above pattern to the following 3 patterns so matchFileRegex() can be coded in a generic way.
|
||||
thisMap.put(Pattern.compile("^FXHW60 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "area");
|
||||
thisMap.put(Pattern.compile("^FXPN60 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "area");
|
||||
thisMap.put(Pattern.compile("^FXPS60 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "area");
|
||||
|
||||
thisMap.put(Pattern.compile("^FXPS60 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "area");
|
||||
thisMap.put(Pattern.compile("^...... .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).*(\n|\r)FA[0-9].*"), "area"); //aviation forecasts
|
||||
thisMap.put(Pattern.compile("^WWUS30 KWNS (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"),"wtch2");
|
||||
thisMap.put(Pattern.compile("^FNUS21 KWNS (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"),"fwddy1");
|
||||
thisMap.put(Pattern.compile("^FNUS22 KWNS (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"),"fwddy2");
|
||||
thisMap.put(Pattern.compile("^FNUS28 KWNS (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"),"fwddy38");
|
||||
thisMap.put(Pattern.compile("^FNUS21 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).*(\n|\r)FWDDY1.*"),"fire1"); //spc uses this regex for fwddy1 also
|
||||
thisMap.put(Pattern.compile("^FNUS22 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).*(\n|\r)FWDDY2.*"),"fire2"); //spc uses this regex for fwddy2 also
|
||||
thisMap.put(Pattern.compile("^WOUS64 KWNS (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "wou");
|
||||
thisMap.put(Pattern.compile("^ABNT20 KNHC (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "outlk"); //clashes with TWO
|
||||
thisMap.put(Pattern.compile("^ACPN50 PHFO (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "outlk");
|
||||
|
|
@ -267,14 +269,13 @@ public final class NctextRegexMatcher {
|
|||
thisMap.put(Pattern.compile("^WAUS1 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "airm"); //no data to test
|
||||
thisMap.put(Pattern.compile("^WAAK01 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "airm"); //no data to test
|
||||
thisMap.put(Pattern.compile("^WOUS20 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "stat");
|
||||
thisMap.put(Pattern.compile("^FVXX2[0-4] .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "volc");
|
||||
thisMap.put(Pattern.compile("^FVXX2[0-7] .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "volc");
|
||||
thisMap.put(Pattern.compile("^FVCN0[0-4] .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "volc");
|
||||
thisMap.put(Pattern.compile("^FVAU0[2-4] .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "volc");
|
||||
thisMap.put(Pattern.compile("^ACUS4[1-5] .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "storm");
|
||||
thisMap.put(Pattern.compile("^FSUS02 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "srp");
|
||||
thisMap.put(Pattern.compile("^ASUS01 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "sus");
|
||||
thisMap.put(Pattern.compile("^FXPA00 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "expac"); //no folder for raw data in server
|
||||
thisMap.put(Pattern.compile("^FVXX2[0-7] .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "vlcf"); //clashes with volc FVXX2[0-4]
|
||||
thisMap.put(Pattern.compile("^ACUS48 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "day48");
|
||||
thisMap.put(Pattern.compile("^FNUS31 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).*(\n|\r)PFWFD1.*"), "pfwfd1");
|
||||
thisMap.put(Pattern.compile("^FNUS32 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).*(\n|\r)PFWFD2.*"), "pfwfd2");
|
||||
|
|
@ -288,9 +289,6 @@ public final class NctextRegexMatcher {
|
|||
thisMap.put(Pattern.compile("^ACUS01 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "day1");
|
||||
thisMap.put(Pattern.compile("^ACUS02 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "day2");
|
||||
thisMap.put(Pattern.compile("^ACUS03 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "day3");
|
||||
thisMap.put(Pattern.compile("^WWUS01 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"),"ptsdy1"); //no data to test
|
||||
thisMap.put(Pattern.compile("^WWUS02 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"),"ptsdy2");//no data to test
|
||||
thisMap.put(Pattern.compile("^WWUS03 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"),"ptsdy3");//no data to test
|
||||
thisMap.put(Pattern.compile("^WWUS20 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"),"watch");
|
||||
thisMap.put(Pattern.compile("^WWUS50 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).*(\n|\r)SEV[0-9].*"),"sev");
|
||||
thisMap.put(Pattern.compile("^WWUS60 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).*(\n|\r)SEVSPC.*"),"sevmkc");
|
||||
|
|
@ -299,8 +297,6 @@ public final class NctextRegexMatcher {
|
|||
thisMap.put(Pattern.compile("^ACUS11 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"),"meso");
|
||||
thisMap.put(Pattern.compile("^NWUS20 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).*(\n|\r)STADTS"),"dts");
|
||||
thisMap.put(Pattern.compile("^NWUS20 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"),"svr");
|
||||
thisMap.put(Pattern.compile("^FNUS21 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).*(\n|\r)FWDDY1.*"),"fire1"); //spc uses this regex for fwddy1 also
|
||||
thisMap.put(Pattern.compile("^FNUS22 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).*(\n|\r)FWDDY2.*"),"fire2"); //spc uses this regex for fwddy2 also
|
||||
thisMap.put(Pattern.compile("^WHXX9[09] .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "mdl"); // not sure if this regex is correct - no test data to verify
|
||||
thisMap.put(Pattern.compile("^WHXX0[1-4] .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "mdl");
|
||||
thisMap.put(Pattern.compile("^URNT10 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "antreco");
|
||||
|
|
@ -341,13 +337,14 @@ public final class NctextRegexMatcher {
|
|||
thisMap.put(Pattern.compile("^W[CSV]AK[01][0-9] KKCI (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "intl"); //regexes clash for intl and sgmt
|
||||
thisMap.put(Pattern.compile("^W[CSV]AK[01][0-9] PHFO (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "intl"); //regexes clash for intl and sgmt
|
||||
thisMap.put(Pattern.compile("^W[CSV]AK[01][0-9] PAWU (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "intl"); //regexes clash for intl and sgmt
|
||||
|
||||
|
||||
thisMap.put(Pattern.compile("^WUUS01 KWNS (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "ptsdy1"); //regexes clash for convective outlook point product day1
|
||||
thisMap.put(Pattern.compile("^WUUS02 KWNS (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "ptsdy2"); //regexes clash for convective outlook point product day2
|
||||
thisMap.put(Pattern.compile("^WUUS03 KWNS (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "ptsdy3"); //regexes clash for convective outlook point product day3
|
||||
thisMap.put(Pattern.compile("^WSUS4[012] .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "conv");
|
||||
thisMap.put(Pattern.compile("^W[CSV]US0[1-6] KKCI (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "sgmt");
|
||||
thisMap.put(Pattern.compile("^WSUK.. .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "sgmt");
|
||||
thisMap.put(Pattern.compile("^WS[^U]... .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+"), "sgmt"); //regexes clash for intl and sgmt
|
||||
thisMap.put(Pattern.compile("^FT.... .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)*TAF[A-Z]{3}(.|\r|\n)*"), "taf"); //observed TAFS
|
||||
thisMap.put(Pattern.compile("^FT.... .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)*TAF[A-Z]{3}(.|\r|\n)*"), "taf"); //aviation TAFS
|
||||
thisMap.put(Pattern.compile("^FT.... .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9])(.|\r|\n)+TAF( |\r|\n){1}(.|\r|\n)*"), "fts"); //aviation TAFS
|
||||
thisMap.put(Pattern.compile("^...... KWBC (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).*(\n|\r)(HSF).*"), "HSF"); //conflicts with FLN
|
||||
thisMap.put(Pattern.compile("^...... PHFO (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).*(\n|\r)(HSF).*"), "HSF");
|
||||
|
|
|
|||
|
|
@ -128,14 +128,13 @@
|
|||
<regex>^WAUS1 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).+</regex>
|
||||
<regex>^WAAK01 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).+</regex>
|
||||
<regex>^WOUS20 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).+</regex>
|
||||
<regex>^FVXX2[0-4] .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).+</regex>
|
||||
<regex>^FVCN0[0-4] .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).+</regex>
|
||||
<regex>^FVAU0[2-4] .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).+</regex>
|
||||
<regex>^FVXX2[0-7] .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).+</regex>
|
||||
<regex>^ACUS4[1-5] .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).+</regex>
|
||||
<regex>^FSUS02 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).+</regex>
|
||||
<regex>^ASUS01 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).+</regex>
|
||||
<regex>^FXPA00 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).+</regex>
|
||||
<regex>^FVXX2[0-7] .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).+</regex>
|
||||
<regex>^ACUS48 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).+</regex>
|
||||
<regex>^FNUS31 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).*PFWFD1.*</regex>
|
||||
<regex>^FNUS32 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).*PFWFD2.*</regex>
|
||||
|
|
@ -149,9 +148,14 @@
|
|||
<regex>^ACUS01 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).+</regex>
|
||||
<regex>^ACUS02 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).+</regex>
|
||||
<regex>^ACUS03 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).+</regex>
|
||||
<regex>^WWUS01 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).+</regex>
|
||||
<regex>^WWUS02 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).+</regex>
|
||||
<regex>^WWUS03 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).+</regex>
|
||||
<regex>^FNUS2[1|2] .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).+</regex>
|
||||
<regex>^FNUS28 KWNS (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).+</regex>
|
||||
<regex>^FNUS5[1-6] .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).+</regex>
|
||||
<regex>^FNUS6[1-6] .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).+</regex>
|
||||
<regex>^FNUS8[1-6] .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).+</regex>
|
||||
<regex>^FNCA5[1-6] .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).+</regex>
|
||||
<regex>^FNHW5[1-6] .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).+</regex>
|
||||
<regex>^WWUS8[2-6] .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).+</regex>
|
||||
<regex>^WWUS20 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).+</regex>
|
||||
<regex>^WWUS50 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).*SEV[0-9].*</regex>
|
||||
<regex>^WWUS60 .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).*SEVSPC.*</regex>
|
||||
|
|
@ -191,6 +195,9 @@
|
|||
<regex>^WSUS4[012] .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).+</regex>
|
||||
<regex>^WSUK.. .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).*</regex>
|
||||
<regex>^WS[^U]... .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).*</regex>
|
||||
<regex>^WUUS01 KWNS (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).*</regex>
|
||||
<regex>^WUUS02 KWNS (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).*</regex>
|
||||
<regex>^WUUS03 KWNS (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).*</regex>
|
||||
<regex>^FT.... .... (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).+</regex>
|
||||
<regex>^...... KWBC (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).*HSF.*</regex>
|
||||
<regex>^...... PHFO (0[1-9]|[12][0-9]|3[01])([01][0-9]|2[0-3])([0-5][0-9]).*HSF.*</regex>
|
||||
|
|
|
|||
|
|
@ -362,10 +362,10 @@ fi
|
|||
|
||||
if [ "${1}" = "-edex" ]; then
|
||||
#buildRPM "awips2"
|
||||
buildRPM "awips2-common-base"
|
||||
buildRPM "awips2-adapt-native"
|
||||
buildRPM "awips2-python-qpid"
|
||||
buildRPM "awips2-cli"
|
||||
#buildRPM "awips2-common-base"
|
||||
#buildRPM "awips2-adapt-native"
|
||||
#buildRPM "awips2-python-qpid"
|
||||
#buildRPM "awips2-cli"
|
||||
buildRPM "awips2-gfesuite-client"
|
||||
buildRPM "awips2-gfesuite-server"
|
||||
buildEDEX
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue