Issue #1782 - Merge branch 'master_13.3.1' (13.3.1-14) into omaha_13.3.1
Conflicts: cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java edexOsgi/com.raytheon.uf.edex.datadelivery.request/.classpath edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE Change-Id: I6b2513155d566aa09571c280b46cf309028a9861 Former-commit-id:d997aeaee4
[formerly2a0e399dc8
[formerly 6f42195bd8f6087fb8bb55232082c0ec5f867e12]] Former-commit-id:2a0e399dc8
Former-commit-id:979d6a5d8c
This commit is contained in:
commit
bb88c2133a
18 changed files with 522 additions and 52 deletions
|
@ -392,6 +392,7 @@ public class MPEDisplayManager {
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
private final Set<IEditTimeChangedListener> timeChangedListeners = new LinkedHashSet<IEditTimeChangedListener>();
|
private final Set<IEditTimeChangedListener> timeChangedListeners = new LinkedHashSet<IEditTimeChangedListener>();
|
||||||
|
|
||||||
private final Set<IDisplayFieldChangedListener> fieldChangedListeners = new LinkedHashSet<IDisplayFieldChangedListener>();
|
private final Set<IDisplayFieldChangedListener> fieldChangedListeners = new LinkedHashSet<IDisplayFieldChangedListener>();
|
||||||
|
@ -706,6 +707,7 @@ public class MPEDisplayManager {
|
||||||
// Remove old resource
|
// Remove old resource
|
||||||
list.removeRsc(displayedFieldResource);
|
list.removeRsc(displayedFieldResource);
|
||||||
}
|
}
|
||||||
|
|
||||||
fieldResourceData.setFieldData(fieldToDisplay);
|
fieldResourceData.setFieldData(fieldToDisplay);
|
||||||
fieldResourceData.setArealDisplay(arealDisplay);
|
fieldResourceData.setArealDisplay(arealDisplay);
|
||||||
fieldResourceData.setAccumulationInterval(accumulationHrs);
|
fieldResourceData.setAccumulationInterval(accumulationHrs);
|
||||||
|
@ -723,6 +725,7 @@ public class MPEDisplayManager {
|
||||||
listener.displayFieldChanged(oldField, fieldToDisplay);
|
listener.displayFieldChanged(oldField, fieldToDisplay);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// reset gages
|
// reset gages
|
||||||
List<MPEGageResource> rscs = display.getDescriptor()
|
List<MPEGageResource> rscs = display.getDescriptor()
|
||||||
.getResourceList()
|
.getResourceList()
|
||||||
|
|
|
@ -109,8 +109,6 @@ public class MPEGageResource extends AbstractMPEInputResource implements
|
||||||
|
|
||||||
private static final double POINT_RADIUS = 2;
|
private static final double POINT_RADIUS = 2;
|
||||||
|
|
||||||
private static final RGB WHITE = new RGB(255, 255, 255);
|
|
||||||
|
|
||||||
private final SimpleDateFormat sdf;
|
private final SimpleDateFormat sdf;
|
||||||
|
|
||||||
private final Object mutex = new Object();
|
private final Object mutex = new Object();
|
||||||
|
@ -363,10 +361,7 @@ public class MPEGageResource extends AbstractMPEInputResource implements
|
||||||
for (Coordinate point : dataMap.keySet()) {
|
for (Coordinate point : dataMap.keySet()) {
|
||||||
if (extent.contains(new double[] { point.x, point.y })) {
|
if (extent.contains(new double[] { point.x, point.y })) {
|
||||||
MPEGageData gageData = dataMap.get(point);
|
MPEGageData gageData = dataMap.get(point);
|
||||||
RGB gageColor = WHITE;
|
RGB gageColor = getGageColor(gageData);
|
||||||
if (displayIsEdit) {
|
|
||||||
gageColor = getGageColor(gageData);
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean isReportedMissing = gageData.isReported_missing();
|
boolean isReportedMissing = gageData.isReported_missing();
|
||||||
boolean isMissing = ((gageData.getGval() == -999.f || gageData
|
boolean isMissing = ((gageData.getGval() == -999.f || gageData
|
||||||
|
|
|
@ -297,7 +297,6 @@ public class RegenHrFlds {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Clear gage edits */
|
|
||||||
MPEDataManager.getInstance().clearEditGages();
|
MPEDataManager.getInstance().clearEditGages();
|
||||||
shell.setCursor(null);
|
shell.setCursor(null);
|
||||||
}
|
}
|
||||||
|
|
|
@ -53,6 +53,7 @@ import com.raytheon.viz.warngen.gis.AffectedAreas;
|
||||||
* moved the following methods from InitialLockingBehavior to this class:
|
* moved the following methods from InitialLockingBehavior to this class:
|
||||||
* bulletIndices(), header(), firstBullet(), secondBullet(), getImmediateCausesPtrn();
|
* bulletIndices(), header(), firstBullet(), secondBullet(), getImmediateCausesPtrn();
|
||||||
* updated body(), header(), and secondBullet();
|
* updated body(), header(), and secondBullet();
|
||||||
|
* Mar 13, 2013 DR 15892 D. Friedman Fix bullet parsing.
|
||||||
*
|
*
|
||||||
* </pre>
|
* </pre>
|
||||||
*
|
*
|
||||||
|
@ -141,10 +142,13 @@ abstract public class AbstractLockingBehavior implements ICommonPatterns {
|
||||||
private Integer[] bulletIndices() {
|
private Integer[] bulletIndices() {
|
||||||
List<Integer> bulletIndices = new ArrayList<Integer>();
|
List<Integer> bulletIndices = new ArrayList<Integer>();
|
||||||
|
|
||||||
int index = text.indexOf("* ");
|
/* Assumes first line cannot be a bullet and that the '*' is
|
||||||
|
* at the start of a line.
|
||||||
|
*/
|
||||||
|
int index = text.indexOf("\n* ");
|
||||||
while (index >= 0) {
|
while (index >= 0) {
|
||||||
bulletIndices.add(index);
|
bulletIndices.add(index + 1);
|
||||||
index = text.indexOf("* ", index + 2);
|
index = text.indexOf("\n* ", index + 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
return bulletIndices.toArray(new Integer[bulletIndices.size()]);
|
return bulletIndices.toArray(new Integer[bulletIndices.size()]);
|
||||||
|
|
|
@ -39,6 +39,8 @@ import com.raytheon.viz.warngen.gis.AffectedAreas;
|
||||||
* ------------ ---------- ----------- --------------------------
|
* ------------ ---------- ----------- --------------------------
|
||||||
* Sep 24, 2012 15322 jsanchez Initial creation
|
* Sep 24, 2012 15322 jsanchez Initial creation
|
||||||
* Jan 8, 2013 15664 Qinglu Lin Updated body().
|
* Jan 8, 2013 15664 Qinglu Lin Updated body().
|
||||||
|
* Mar 13, 2013 15892 D. Friedman Fix headline locking. Do not
|
||||||
|
* lock "AND" or "FOR".
|
||||||
*
|
*
|
||||||
* </pre>
|
* </pre>
|
||||||
*
|
*
|
||||||
|
@ -51,10 +53,8 @@ public class FollowUpLockingBehavior extends AbstractLockingBehavior {
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void body() {
|
public void body() {
|
||||||
if (action != WarningAction.COR)
|
headlines();
|
||||||
headlines();
|
super.body();
|
||||||
else
|
|
||||||
super.body();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -66,7 +66,7 @@ public class FollowUpLockingBehavior extends AbstractLockingBehavior {
|
||||||
// should be blank.
|
// should be blank.
|
||||||
Pattern headlinePtrn = Pattern
|
Pattern headlinePtrn = Pattern
|
||||||
.compile(
|
.compile(
|
||||||
"^\\.\\.\\.(A|THE) (.*) (WARNING|ADVISORY) .*(REMAINS|EXPIRE|CANCELLED).*(\\.\\.\\.)$",
|
"^\\.\\.\\.(AN?|THE) (.*) (WARNING|ADVISORY) .*(REMAINS|EXPIRE|CANCELLED).*(\\.\\.\\.)$",
|
||||||
Pattern.MULTILINE);
|
Pattern.MULTILINE);
|
||||||
Matcher m = headlinePtrn.matcher(text);
|
Matcher m = headlinePtrn.matcher(text);
|
||||||
|
|
||||||
|
@ -187,16 +187,8 @@ public class FollowUpLockingBehavior extends AbstractLockingBehavior {
|
||||||
+ LOCK_START + "..." + LOCK_END;
|
+ LOCK_START + "..." + LOCK_END;
|
||||||
}
|
}
|
||||||
// Locks warning type (i.e. SEVERE THUNDERSTORM)
|
// Locks warning type (i.e. SEVERE THUNDERSTORM)
|
||||||
headline = headline.replaceAll("(A|THE) (" + warningType + ")",
|
headline = headline.replaceAll("(AN?|THE)( [\\w\\s]*?)(" + warningType + ")",
|
||||||
LOCK_START + "$0" + LOCK_END);
|
LOCK_START + "$1" + LOCK_END + "$2" + LOCK_START + "$3" + LOCK_END);
|
||||||
|
|
||||||
// Locks the 'FOR' in the headline
|
|
||||||
headline = headline.replaceFirst(" FOR ", " " + LOCK_START + "FOR"
|
|
||||||
+ LOCK_END + " ");
|
|
||||||
|
|
||||||
// Locks the 'AND' in the headline
|
|
||||||
headline = headline.replaceFirst(" AND ", " " + LOCK_START + "AND"
|
|
||||||
+ LOCK_END + " ");
|
|
||||||
|
|
||||||
return headline;
|
return headline;
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,6 +32,7 @@ import java.util.regex.Pattern;
|
||||||
* ------------ ---------- ----------- --------------------------
|
* ------------ ---------- ----------- --------------------------
|
||||||
* Sep 24, 2012 15332 jsanchez Initial creation
|
* Sep 24, 2012 15332 jsanchez Initial creation
|
||||||
* Oct 18, 2012 15332 jsanchez Replaced listOfAreaNamesPtrn with String pattern.
|
* Oct 18, 2012 15332 jsanchez Replaced listOfAreaNamesPtrn with String pattern.
|
||||||
|
* Mar 13, 2013 DR 15892 D. Friedman Allow some punctuation in area names.
|
||||||
*
|
*
|
||||||
* </pre>
|
* </pre>
|
||||||
*
|
*
|
||||||
|
@ -55,7 +56,7 @@ public interface ICommonPatterns {
|
||||||
// LOCK_END can be added at the start of the line if a previous line has
|
// LOCK_END can be added at the start of the line if a previous line has
|
||||||
// been locked.
|
// been locked.
|
||||||
public static final String listOfAreaName = "^((" + LOCK_END
|
public static final String listOfAreaName = "^((" + LOCK_END
|
||||||
+ "){0,1}(((\\w+\\s{1})+\\w{2}-)*((\\w+\\s{1})+\\w{2}-)))";
|
+ "){0,1}((([\\?\\(\\)\\w\\.,/'-]+\\s{1})+\\w{2}-)*(([\\?\\(\\)\\w\\.,/'-]+\\s{1})+\\w{2}-)))";
|
||||||
|
|
||||||
// LOCK_END should not be found at the beginning of a first bullet since the
|
// LOCK_END should not be found at the beginning of a first bullet since the
|
||||||
// previous line should be blank.
|
// previous line should be blank.
|
||||||
|
|
|
@ -346,7 +346,7 @@ public class FipsUtil {
|
||||||
* @param fips
|
* @param fips
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private static ArrayList<String> getListCounties(String fips) {
|
public static ArrayList<String> getListCounties(String fips) {
|
||||||
ArrayList<String> rval = new ArrayList<String>();
|
ArrayList<String> rval = new ArrayList<String>();
|
||||||
String matchStr = "";
|
String matchStr = "";
|
||||||
|
|
||||||
|
|
|
@ -28,6 +28,7 @@ import com.raytheon.viz.warngen.text.ICommonPatterns;
|
||||||
* ------------ ---------- ----------- --------------------------
|
* ------------ ---------- ----------- --------------------------
|
||||||
* Jul 22, 2008 #1284 bwoodle Initial creation
|
* Jul 22, 2008 #1284 bwoodle Initial creation
|
||||||
* Oct 18, 2012 15332 jsanchez Fixed refactor bugs.
|
* Oct 18, 2012 15332 jsanchez Fixed refactor bugs.
|
||||||
|
* Mar 13, 2013 DR 15892 D. Friedman Handle SMW format in canceledAreasFromText
|
||||||
*
|
*
|
||||||
* </pre>
|
* </pre>
|
||||||
*
|
*
|
||||||
|
@ -43,6 +44,8 @@ public class FollowUpUtil {
|
||||||
public static final Pattern vtecPtrn = Pattern
|
public static final Pattern vtecPtrn = Pattern
|
||||||
.compile("/[OTEX]\\.([A-Z]{3})\\.[A-Za-z0-9]{4}\\.[A-Z]{2}\\.[WAYSFON]\\.\\d{4}\\.\\d{6}T\\d{4}Z-\\d{6}T\\d{4}Z/");
|
.compile("/[OTEX]\\.([A-Z]{3})\\.[A-Za-z0-9]{4}\\.[A-Z]{2}\\.[WAYSFON]\\.\\d{4}\\.\\d{6}T\\d{4}Z-\\d{6}T\\d{4}Z/");
|
||||||
|
|
||||||
|
private static final String SMW_CANCELED_AREAS_HEADER = "THE AFFECTED AREAS WERE...";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This method checks whether a particular followup should be available
|
* This method checks whether a particular followup should be available
|
||||||
* given a Warning Record, a vtec Action, and a template configuration
|
* given a Warning Record, a vtec Action, and a template configuration
|
||||||
|
@ -173,7 +176,8 @@ public class FollowUpUtil {
|
||||||
String headline = "";
|
String headline = "";
|
||||||
Pattern listOfAreaNamePtrn = Pattern
|
Pattern listOfAreaNamePtrn = Pattern
|
||||||
.compile(ICommonPatterns.listOfAreaName);
|
.compile(ICommonPatterns.listOfAreaName);
|
||||||
for (String line : originalText.trim().split("\n")) {
|
String[] splitLines = originalText.trim().split("\n");
|
||||||
|
for (String line : splitLines) {
|
||||||
if (line.contains("TEST") || line.trim().length() == 0) {
|
if (line.contains("TEST") || line.trim().length() == 0) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -198,8 +202,15 @@ public class FollowUpUtil {
|
||||||
headline += line;
|
headline += line;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
String[] ugcs = ugcLine.split("-");
|
String[] ugcs = FipsUtil.getListCounties(ugcLine).toArray(new String[0]);
|
||||||
String[] names = namesLine.split("-");
|
String[] names;
|
||||||
|
boolean smwAreas = false;
|
||||||
|
if (namesLine.length() > 0)
|
||||||
|
names = namesLine.split("-");
|
||||||
|
else {
|
||||||
|
names = parseSMWCanceledAreas(splitLines);
|
||||||
|
smwAreas = true;
|
||||||
|
}
|
||||||
String[] areas = headline.split("\\.\\.\\.");
|
String[] areas = headline.split("\\.\\.\\.");
|
||||||
|
|
||||||
ArrayList<AffectedAreas> al = new ArrayList<AffectedAreas>();
|
ArrayList<AffectedAreas> al = new ArrayList<AffectedAreas>();
|
||||||
|
@ -222,13 +233,21 @@ public class FollowUpUtil {
|
||||||
areasNotation = "COUNTIES";
|
areasNotation = "COUNTIES";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (ugc.length() < 3)
|
||||||
|
continue; // TODO: log?
|
||||||
|
|
||||||
fips = ugc.substring(ugc.length() - 3);
|
fips = ugc.substring(ugc.length() - 3);
|
||||||
|
|
||||||
if (i < names.length) {
|
if (i < names.length) {
|
||||||
name = names[i].substring(0, names[i].length() - 3);
|
if (!smwAreas && names[i].length() >= 3) {
|
||||||
stateAbbreviation = names[i].substring(names[i].length() - 2);
|
name = names[i].substring(0, names[i].length() - 3);
|
||||||
}
|
stateAbbreviation = names[i].substring(names[i].length() - 2);
|
||||||
|
} else {
|
||||||
|
name = names[i];
|
||||||
|
}
|
||||||
|
} else
|
||||||
|
break;
|
||||||
|
|
||||||
if (name != null) {
|
if (name != null) {
|
||||||
for (String area : areas) {
|
for (String area : areas) {
|
||||||
|
@ -334,4 +353,32 @@ public class FollowUpUtil {
|
||||||
|
|
||||||
return rval;
|
return rval;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Parses the canceled areas of an SMW, which have a different format
|
||||||
|
* from other products.
|
||||||
|
*/
|
||||||
|
private static String[] parseSMWCanceledAreas(String[] splitLines) {
|
||||||
|
StringBuilder text = new StringBuilder(64);
|
||||||
|
boolean inAreas = false;
|
||||||
|
for (String line : splitLines) {
|
||||||
|
String trimmedLine = line.trim();
|
||||||
|
if (SMW_CANCELED_AREAS_HEADER.equals(trimmedLine))
|
||||||
|
inAreas = true;
|
||||||
|
else if (inAreas) {
|
||||||
|
if (trimmedLine.length() > 0) {
|
||||||
|
text.append(trimmedLine);
|
||||||
|
text.append('\n');
|
||||||
|
} else
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
int len = text.length();
|
||||||
|
if (len >= 4 && "...\n".equals(text.substring(len - 4)))
|
||||||
|
text.delete(len - 4, len);
|
||||||
|
String[] areas = text.toString().split("\\.\\.\\.\\n");
|
||||||
|
// Unwrap lines.
|
||||||
|
for (int i = 0; i < areas.length; ++i)
|
||||||
|
areas[i] = areas[i].replace("\n", " ");
|
||||||
|
return areas;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
##### Qinglu Lin 08-13-2012 DR 14493. Use corToNewMarker and corEventtime.
|
##### Qinglu Lin 08-13-2012 DR 14493. Use corToNewMarker and corEventtime.
|
||||||
##### D. Friedman 11-09-2012 DR 15430. Rework included watches.
|
##### D. Friedman 11-09-2012 DR 15430. Rework included watches.
|
||||||
##### QINGLU LIN 12-27-2012 DR 15594. Added $lock to headlineLocList.
|
##### QINGLU LIN 12-27-2012 DR 15594. Added $lock to headlineLocList.
|
||||||
|
##### D. Friedman 03-13-2013 DR 15892. Do not lock portion of state in firstBullet.
|
||||||
####################################################################################################
|
####################################################################################################
|
||||||
Mile Marker Test Code
|
Mile Marker Test Code
|
||||||
macro "mmarkers" use (called out of VM_global_library.vm):
|
macro "mmarkers" use (called out of VM_global_library.vm):
|
||||||
|
@ -750,7 +751,7 @@ THE ${area.name}##
|
||||||
#if(${intFIPS.parseInt($FIPS)} < 500 || ${area.stateabbr} == "TX")
|
#if(${intFIPS.parseInt($FIPS)} < 500 || ${area.stateabbr} == "TX")
|
||||||
<L>${area.name} ${area.areaNotation}</L> IN #areaFormat(${area.partOfParentRegion} true false) <L>${area.parentRegion}...</L>
|
<L>${area.name} ${area.areaNotation}</L> IN #areaFormat(${area.partOfParentRegion} true false) <L>${area.parentRegion}...</L>
|
||||||
#else
|
#else
|
||||||
<L>${area.name}</L> IN <L>#areaFormat(${area.partOfParentRegion} true false) ${area.parentRegion}...</L>
|
<L>${area.name}</L> IN #areaFormat(${area.partOfParentRegion} true false) <L>${area.parentRegion}...</L>
|
||||||
#end
|
#end
|
||||||
#end
|
#end
|
||||||
## COMMENTED OUT 5 LINES BELOW THIS IS GENERALLY NOT UTILIZED - you can unREMARK if desired
|
## COMMENTED OUT 5 LINES BELOW THIS IS GENERALLY NOT UTILIZED - you can unREMARK if desired
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
## Evan Bookbinder 4-25-2012 for OB 12.3.1 (corText)
|
## Evan Bookbinder 4-25-2012 for OB 12.3.1 (corText)
|
||||||
## QINGLU LIN 7-31-2012 DR 15217 use roundAndPad
|
## QINGLU LIN 7-31-2012 DR 15217 use roundAndPad
|
||||||
## Qinglu Lin 12-27-2012 DR 15594. Appended true to headlineLocList's parameter list.
|
## Qinglu Lin 12-27-2012 DR 15594. Appended true to headlineLocList's parameter list.
|
||||||
|
## D. Friedman 03-13-2013 DR 15892. Use printcoords.
|
||||||
################################################
|
################################################
|
||||||
##
|
##
|
||||||
### CREATE PHRASING DEPENDING ON WHETHER WE ISSUE EXP PRIOR TO EXPIRATION TIME OR NOT
|
### CREATE PHRASING DEPENDING ON WHETHER WE ISSUE EXP PRIOR TO EXPIRATION TIME OR NOT
|
||||||
|
@ -482,10 +483,7 @@ THIS IS A TEST MESSAGE.##
|
||||||
THIS IS A TEST MESSAGE. DO NOT TAKE ACTION BASED ON THIS MESSAGE.
|
THIS IS A TEST MESSAGE. DO NOT TAKE ACTION BASED ON THIS MESSAGE.
|
||||||
|
|
||||||
#end
|
#end
|
||||||
LAT...LON ##
|
#printcoords(${areaPoly}, ${list})
|
||||||
#foreach(${coord} in ${areaPoly})
|
|
||||||
#llFormat(${coord.y}) #llFormat(${coord.x}) ##
|
|
||||||
#end
|
|
||||||
|
|
||||||
TIME...MOT...LOC ##
|
TIME...MOT...LOC ##
|
||||||
${dateUtil.format(${event}, ${timeFormat.time})}Z ##
|
${dateUtil.format(${event}, ${timeFormat.time})}Z ##
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
## Evan Bookbinder 4-25-2012 for OB 12.3.1 (MND)
|
## Evan Bookbinder 4-25-2012 for OB 12.3.1 (MND)
|
||||||
## QINGLU LIN 7-31-2012 DR 15217 use roundAndPad ##
|
## QINGLU LIN 7-31-2012 DR 15217 use roundAndPad ##
|
||||||
## Qinglu Lin 12-27-2012 DR 15594. Appended true to headlineLocList's parameter list.
|
## Qinglu Lin 12-27-2012 DR 15594. Appended true to headlineLocList's parameter list.
|
||||||
|
## D. Friemdan 13-03-2013 DR 15892. Do not lock locations in headline.
|
||||||
######################################################
|
######################################################
|
||||||
##
|
##
|
||||||
##SET SOME INITIAL VARIABLES
|
##SET SOME INITIAL VARIABLES
|
||||||
|
@ -120,7 +121,7 @@ THIS IS A TEST MESSAGE. ##
|
||||||
#end
|
#end
|
||||||
#if(${windSpeed} >= 40 || ${hailSize} >= 0.70)
|
#if(${windSpeed} >= 40 || ${hailSize} >= 0.70)
|
||||||
...SIGNIFICANT WEATHER ADVISORY FOR ##
|
...SIGNIFICANT WEATHER ADVISORY FOR ##
|
||||||
#headlineLocList(${areas} true false true false true) #secondBullet(${dateUtil},${expire},${timeFormat},${localtimezone},${secondtimezone})
|
#headlineLocList(${areas} true false true false false) #secondBullet(${dateUtil},${expire},${timeFormat},${localtimezone},${secondtimezone})
|
||||||
...##
|
...##
|
||||||
#elseif(${windSpeed} == 0 && ${hailSize} == 0)
|
#elseif(${windSpeed} == 0 && ${hailSize} == 0)
|
||||||
!** YOU DID NOT SELECT ANY WIND OR HAIL THREATS. PLEASE RE-GENERATE THIS ADVISORY **!
|
!** YOU DID NOT SELECT ANY WIND OR HAIL THREATS. PLEASE RE-GENERATE THIS ADVISORY **!
|
||||||
|
|
|
@ -1,7 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<classpath>
|
|
||||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" />
|
|
||||||
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
|
|
||||||
<classpathentry kind="src" path="src"/>
|
|
||||||
<classpathentry kind="output" path="bin"/>
|
|
||||||
</classpath>
|
|
|
@ -70,6 +70,7 @@ import com.raytheon.uf.edex.plugin.grid.dao.GridDao;
|
||||||
* ------------ ---------- ----------- --------------------------
|
* ------------ ---------- ----------- --------------------------
|
||||||
* Dec 3, 2010 rjpeter Initial creation
|
* Dec 3, 2010 rjpeter Initial creation
|
||||||
* Mar 07, 2013 1587 bsteffen rewrite static data generation.
|
* Mar 07, 2013 1587 bsteffen rewrite static data generation.
|
||||||
|
* Mar 14, 2013 1587 bsteffen Fix persisting to datastore.
|
||||||
*
|
*
|
||||||
* </pre>
|
* </pre>
|
||||||
*
|
*
|
||||||
|
@ -267,7 +268,7 @@ public class StaticDataGenerator {
|
||||||
for (GridRecord staticRecord : datastoreRecords) {
|
for (GridRecord staticRecord : datastoreRecords) {
|
||||||
populateMessageData(staticRecord);
|
populateMessageData(staticRecord);
|
||||||
}
|
}
|
||||||
dao.persistToHDF5(databaseRecords.toArray(new PluginDataObject[0]));
|
dao.persistToHDF5(datastoreRecords.toArray(new PluginDataObject[0]));
|
||||||
}
|
}
|
||||||
if (!databaseRecords.isEmpty()) {
|
if (!databaseRecords.isEmpty()) {
|
||||||
dao.persistToDatabase(databaseRecords
|
dao.persistToDatabase(databaseRecords
|
||||||
|
@ -423,7 +424,8 @@ public class StaticDataGenerator {
|
||||||
datasets = Collections.emptyList();
|
datasets = Collections.emptyList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (datasets.contains(missing)) {
|
if (!datasets.contains(staticRecord.getParameter()
|
||||||
|
.getAbbreviation())) {
|
||||||
missing.add(staticRecord);
|
missing.add(staticRecord);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,8 +8,8 @@
|
||||||
|
|
||||||
<bean id="ffmpThreadPool"
|
<bean id="ffmpThreadPool"
|
||||||
class="org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor">
|
class="org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor">
|
||||||
<property name="corePoolSize" value="2" />
|
<property name="corePoolSize" value="1" />
|
||||||
<property name="maxPoolSize" value="4" />
|
<property name="maxPoolSize" value="1" />
|
||||||
<property name="keepAliveSeconds" value="60000" />
|
<property name="keepAliveSeconds" value="60000" />
|
||||||
</bean>
|
</bean>
|
||||||
|
|
||||||
|
|
|
@ -733,11 +733,21 @@ public class FFMPGenerator extends CompositeProductGenerator implements
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
if (!source.getSourceType().equals(
|
||||||
|
SOURCE_TYPE.GUIDANCE.getSourceType())) {
|
||||||
|
String sourceSiteDataKey = getSourceSiteDataKey(source,
|
||||||
|
dataKey, ffmpRec);
|
||||||
|
ffmpData.remove(sourceSiteDataKey);
|
||||||
|
statusHandler.info("Removing from memory: "+sourceSiteDataKey);
|
||||||
|
|
||||||
|
}
|
||||||
|
} // ffmp.isFFTI
|
||||||
} // record not null
|
} // record not null
|
||||||
} // end sitekey for loop
|
} // end sitekey for loop
|
||||||
} // end datakey loop
|
} // end datakey loop
|
||||||
} // end process
|
} // end process
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1819,6 +1829,7 @@ public class FFMPGenerator extends CompositeProductGenerator implements
|
||||||
}
|
}
|
||||||
|
|
||||||
ffmpData.remove(siteDataKey);
|
ffmpData.remove(siteDataKey);
|
||||||
|
statusHandler.info("Removing from memory: "+siteDataKey);
|
||||||
accumulator.setReset(false);
|
accumulator.setReset(false);
|
||||||
writeFFTIData(siteDataKey, accumulator);
|
writeFFTIData(siteDataKey, accumulator);
|
||||||
}
|
}
|
||||||
|
|
|
@ -67,6 +67,7 @@ import com.raytheon.uf.edex.database.plugin.PluginDao;
|
||||||
* Date Ticket# Engineer Description
|
* Date Ticket# Engineer Description
|
||||||
* ------------ ---------- ----------- --------------------------
|
* ------------ ---------- ----------- --------------------------
|
||||||
* 4/7/09 1994 bphillip Initial Creation
|
* 4/7/09 1994 bphillip Initial Creation
|
||||||
|
* Mar 14, 2013 1587 bsteffen Fix static data persisting to datastore.
|
||||||
* Mar 27, 2013 1821 bsteffen Speed up GridInfoCache.
|
* Mar 27, 2013 1821 bsteffen Speed up GridInfoCache.
|
||||||
*
|
*
|
||||||
* </pre>
|
* </pre>
|
||||||
|
@ -101,10 +102,13 @@ public class GridDao extends PluginDao {
|
||||||
long[] sizes = new long[] { location.getNx(), location.getNy() };
|
long[] sizes = new long[] { location.getNx(), location.getNy() };
|
||||||
String abbrev = gridRec.getParameter().getAbbreviation();
|
String abbrev = gridRec.getParameter().getAbbreviation();
|
||||||
String group = gridRec.getDataURI();
|
String group = gridRec.getDataURI();
|
||||||
|
String datasetName = "Data";
|
||||||
if (GridPathProvider.STATIC_PARAMETERS.contains(abbrev)) {
|
if (GridPathProvider.STATIC_PARAMETERS.contains(abbrev)) {
|
||||||
group = "/" + location.getId();
|
group = "/" + location.getId();
|
||||||
|
datasetName = abbrev;
|
||||||
}
|
}
|
||||||
AbstractStorageRecord storageRecord = new FloatDataRecord("Data",
|
AbstractStorageRecord storageRecord = new FloatDataRecord(
|
||||||
|
datasetName,
|
||||||
group, (float[]) messageData, 2, sizes);
|
group, (float[]) messageData, 2, sizes);
|
||||||
|
|
||||||
storageRecord.setCorrelationObject(gridRec);
|
storageRecord.setCorrelationObject(gridRec);
|
||||||
|
|
|
@ -333,6 +333,7 @@ fi
|
||||||
if [ "${1}" = "-viz" ]; then
|
if [ "${1}" = "-viz" ]; then
|
||||||
buildRPM "awips2"
|
buildRPM "awips2"
|
||||||
buildCAVE
|
buildCAVE
|
||||||
|
buildRPM "awips2-rcm"
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
418
rpms/build/i386/build.sh_preRCM
Normal file
418
rpms/build/i386/build.sh_preRCM
Normal file
|
@ -0,0 +1,418 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
function buildRPM()
|
||||||
|
{
|
||||||
|
# Arguments:
|
||||||
|
# ${1} == the name of the rpm.
|
||||||
|
lookupRPM "${1}"
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
echo "ERROR: '${1}' is not a recognized AWIPS II RPM."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
/usr/bin/rpmbuild -ba \
|
||||||
|
--define '_topdir %(echo ${AWIPSII_TOP_DIR})' \
|
||||||
|
--define '_baseline_workspace %(echo ${WORKSPACE})' \
|
||||||
|
--define '_uframe_eclipse %(echo ${UFRAME_ECLIPSE})' \
|
||||||
|
--define '_awipscm_share %(echo ${AWIPSCM_SHARE})' \
|
||||||
|
--define '_build_root %(echo ${AWIPSII_BUILD_ROOT})' \
|
||||||
|
--define '_component_version %(echo ${AWIPSII_VERSION})' \
|
||||||
|
--define '_component_release %(echo ${AWIPSII_RELEASE})' \
|
||||||
|
--define '_component_build_date %(echo ${COMPONENT_BUILD_DATE})' \
|
||||||
|
--define '_component_build_time %(echo ${COMPONENT_BUILD_TIME})' \
|
||||||
|
--define '_component_build_system %(echo ${COMPONENT_BUILD_SYSTEM})' \
|
||||||
|
--buildroot ${AWIPSII_BUILD_ROOT} \
|
||||||
|
${RPM_SPECIFICATION}/component.spec
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
echo "ERROR: Failed to build RPM ${1}."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
# This script will build all of the 32-bit rpms.
|
||||||
|
# Ensure that we are on a machine with the correct architecture.
|
||||||
|
|
||||||
|
architecture=`uname -i`
|
||||||
|
if [ ! "${architecture}" = "i386" ]; then
|
||||||
|
echo "ERROR: This build can only be performed on a 32-bit Operating System."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Determine which directory we are running from.
|
||||||
|
path_to_script=`readlink -f $0`
|
||||||
|
dir=$(dirname $path_to_script)
|
||||||
|
|
||||||
|
common_dir=`cd ${dir}/../common; pwd;`
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
echo "ERROR: Unable to find the common functions directory."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
# source the common functions.
|
||||||
|
source ${common_dir}/lookupRPM.sh
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
echo "ERROR: Unable to source the common functions."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
source ${common_dir}/usage.sh
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
echo "ERROR: Unable to source the common functions."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
source ${common_dir}/rpms.sh
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
echo "ERROR: Unable to source the common functions."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
source ${common_dir}/systemInfo.sh
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
echo "ERROR: Unable to retrieve the system information."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# prepare the build environment.
|
||||||
|
source ${dir}/buildEnvironment.sh
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
echo "ERROR: Unable to prepare the build environment."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
export LIGHTNING=true
|
||||||
|
# Determine if the optional '-nobinlightning' argument has been specified.
|
||||||
|
if [ "${2}" = "-nobinlightning" ]; then
|
||||||
|
LIGHTNING=false
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "${1}" = "-python-qpid" ]; then
|
||||||
|
buildRPM "awips2"
|
||||||
|
buildRPM "awips2-python-qpid"
|
||||||
|
buildRPM "awips2-python"
|
||||||
|
buildRPM "awips2-python-cherrypy"
|
||||||
|
buildRPM "awips2-python-dynamicserialize"
|
||||||
|
buildRPM "awips2-python-nose"
|
||||||
|
buildRPM "awips2-python-numpy"
|
||||||
|
buildRPM "awips2-python-h5py"
|
||||||
|
buildRPM "awips2-python-jimporter"
|
||||||
|
buildRPM "awips2-python-matplotlib"
|
||||||
|
buildRPM "awips2-python-pil"
|
||||||
|
buildRPM "awips2-python-pmw"
|
||||||
|
buildRPM "awips2-python-pupynere"
|
||||||
|
buildRPM "awips2-python-scientific"
|
||||||
|
buildRPM "awips2-python-scipy"
|
||||||
|
buildRPM "awips2-python-tables"
|
||||||
|
buildRPM "awips2-python-thrift"
|
||||||
|
buildRPM "awips2-python-tpg"
|
||||||
|
buildRPM "awips2-python-ufpy"
|
||||||
|
buildRPM "awips2-python-werkzeug"
|
||||||
|
buildRPM "awips2-python-pygtk"
|
||||||
|
buildRPM "awips2-python-pycairo"
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
buildQPID
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
#buildRPM "awips2-ant"
|
||||||
|
#unpackHttpdPypies
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
#buildRPM "awips2-httpd-pypies"
|
||||||
|
#buildRPM "awips2-java"
|
||||||
|
#buildRPM "awips2-ldm"
|
||||||
|
#buildRPM "awips2-postgresql"
|
||||||
|
#buildRPM "awips2-psql"
|
||||||
|
#buildRPM "awips2-tools"
|
||||||
|
buildRPM "awips2-python-shapely"
|
||||||
|
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
if [ "${1}" = "-delta" ]; then
|
||||||
|
buildCAVE
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
buildRPM "awips2-alertviz"
|
||||||
|
buildEDEX
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
buildRPM "awips2"
|
||||||
|
buildRPM "Installer.ncep-database"
|
||||||
|
buildRPM "awips2-gfesuite-client"
|
||||||
|
buildRPM "awips2-gfesuite-server"
|
||||||
|
buildRPM "awips2-python-dynamicserialize"
|
||||||
|
buildRPM "awips2-python-ufpy"
|
||||||
|
buildRPM "awips2-python-qpid"
|
||||||
|
|
||||||
|
buildRPM "awips2-adapt-native"
|
||||||
|
buildRPM "awips2-aviation-shared"
|
||||||
|
buildRPM "awips2-cli"
|
||||||
|
buildRPM "awips2-database"
|
||||||
|
buildRPM "awips2-database-server-configuration"
|
||||||
|
buildRPM "awips2-database-standalone-configuration"
|
||||||
|
buildRPM "awips2-data.hdf5-gfe.climo"
|
||||||
|
buildRPM "awips2-hydroapps-shared"
|
||||||
|
buildRPM "awips2-localapps-environment"
|
||||||
|
buildRPM "awips2-maps-database"
|
||||||
|
buildRPM "awips2-notification"
|
||||||
|
buildRPM "awips2-pypies"
|
||||||
|
buildRPM "awips2-data.hdf5-topo"
|
||||||
|
buildRPM "awips2-data.gfe"
|
||||||
|
buildRPM "awips2-rcm"
|
||||||
|
buildRPM "awips2-edex-environment"
|
||||||
|
buildLocalizationRPMs
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "${1}" = "-full" ]; then
|
||||||
|
buildCAVE
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
buildRPM "Installer.ncep-database"
|
||||||
|
buildRPM "awips2-alertviz"
|
||||||
|
buildEDEX
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
buildRPM "awips2-python"
|
||||||
|
buildRPM "awips2-python-cherrypy"
|
||||||
|
buildRPM "awips2-python-dynamicserialize"
|
||||||
|
buildRPM "awips2-python-h5py"
|
||||||
|
buildRPM "awips2-python-jimporter"
|
||||||
|
buildRPM "awips2-python-matplotlib"
|
||||||
|
buildRPM "awips2-python-nose"
|
||||||
|
buildRPM "awips2-python-numpy"
|
||||||
|
buildRPM "awips2-python-pil"
|
||||||
|
buildRPM "awips2-python-pmw"
|
||||||
|
buildRPM "awips2-python-pupynere"
|
||||||
|
buildRPM "awips2-python-qpid"
|
||||||
|
buildRPM "awips2-python-scientific"
|
||||||
|
buildRPM "awips2-python-scipy"
|
||||||
|
buildRPM "awips2-python-tables"
|
||||||
|
buildRPM "awips2-python-thrift"
|
||||||
|
buildRPM "awips2-python-tpg"
|
||||||
|
buildRPM "awips2-python-ufpy"
|
||||||
|
buildRPM "awips2-python-werkzeug"
|
||||||
|
buildRPM "awips2-python-pygtk"
|
||||||
|
buildRPM "awips2-python-pycairo"
|
||||||
|
|
||||||
|
buildRPM "awips2"
|
||||||
|
buildRPM "awips2-adapt-native"
|
||||||
|
buildRPM "awips2-aviation-shared"
|
||||||
|
buildRPM "awips2-cli"
|
||||||
|
buildRPM "awips2-database"
|
||||||
|
buildRPM "awips2-database-server-configuration"
|
||||||
|
buildRPM "awips2-database-standalone-configuration"
|
||||||
|
buildRPM "awips2-data.hdf5-gfe.climo"
|
||||||
|
buildRPM "awips2-data.gfe"
|
||||||
|
buildRPM "awips2-gfesuite-client"
|
||||||
|
buildRPM "awips2-gfesuite-server"
|
||||||
|
buildRPM "awips2-hydroapps-shared"
|
||||||
|
buildRPM "awips2-localapps-environment"
|
||||||
|
buildRPM "awips2-maps-database"
|
||||||
|
buildRPM "awips2-notification"
|
||||||
|
buildRPM "awips2-pypies"
|
||||||
|
buildRPM "awips2-data.hdf5-topo"
|
||||||
|
buildRPM "awips2-rcm"
|
||||||
|
buildLocalizationRPMs
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
buildQPID
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
buildRPM "awips2-ant"
|
||||||
|
unpackHttpdPypies
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
buildRPM "awips2-httpd-pypies"
|
||||||
|
buildRPM "awips2-java"
|
||||||
|
#buildRPM "awips2-ldm"
|
||||||
|
buildRPM "awips2-postgresql"
|
||||||
|
buildRPM "awips2-psql"
|
||||||
|
buildRPM "awips2-tools"
|
||||||
|
buildRPM "awips2-edex-environment"
|
||||||
|
buildRPM "awips2-openfire"
|
||||||
|
buildRPM "awips2-httpd-collaboration"
|
||||||
|
buildRPM "awips2-python-shapely"
|
||||||
|
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "${1}" = "-ade" ]; then
|
||||||
|
buildRPM "awips2-eclipse"
|
||||||
|
buildRPM "awips2-java"
|
||||||
|
buildRPM "awips2-ant"
|
||||||
|
buildRPM "awips2-python"
|
||||||
|
buildRPM "awips2-python-cherrypy"
|
||||||
|
buildRPM "awips2-python-dynamicserialize"
|
||||||
|
buildRPM "awips2-python-h5py"
|
||||||
|
buildRPM "awips2-python-jimporter"
|
||||||
|
buildRPM "awips2-python-matplotlib"
|
||||||
|
buildRPM "awips2-python-nose"
|
||||||
|
buildRPM "awips2-python-numpy"
|
||||||
|
buildRPM "awips2-python-pil"
|
||||||
|
buildRPM "awips2-python-pmw"
|
||||||
|
buildRPM "awips2-python-pupynere"
|
||||||
|
buildRPM "awips2-python-qpid"
|
||||||
|
buildRPM "awips2-python-scientific"
|
||||||
|
buildRPM "awips2-python-scipy"
|
||||||
|
buildRPM "awips2-python-tables"
|
||||||
|
buildRPM "awips2-python-thrift"
|
||||||
|
buildRPM "awips2-python-tpg"
|
||||||
|
buildRPM "awips2-python-ufpy"
|
||||||
|
buildRPM "awips2-python-werkzeug"
|
||||||
|
buildRPM "awips2-python-pygtk"
|
||||||
|
buildRPM "awips2-python-pycairo"
|
||||||
|
buildRPM "awips2-python-shapely"
|
||||||
|
buildQPID -ade
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Package the ade.
|
||||||
|
# Create the containing directory.
|
||||||
|
ade_directory="awips2-ade-${AWIPSII_VERSION}-${AWIPSII_RELEASE}"
|
||||||
|
if [ -d ${WORKSPACE}/${ade_directory} ]; then
|
||||||
|
rm -rf ${WORKSPACE}/${ade_directory}
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
mkdir -p ${WORKSPACE}/${ade_directory}
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Copy the rpms to the directory.
|
||||||
|
cp -v ${AWIPSII_TOP_DIR}/RPMS/i386/* \
|
||||||
|
${AWIPSII_TOP_DIR}/RPMS/noarch/* \
|
||||||
|
${WORKSPACE}/${ade_directory}
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
awips2_ade_directory="${WORKSPACE}/rpms/awips2.ade"
|
||||||
|
# Copy the install and uninstall script to the directory.
|
||||||
|
cp -v ${awips2_ade_directory}/tar.ade/scripts/*.sh \
|
||||||
|
${WORKSPACE}/${ade_directory}
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Tar the directory.
|
||||||
|
pushd . > /dev/null 2>&1
|
||||||
|
cd ${WORKSPACE}
|
||||||
|
tar -cvf ${ade_directory}.tar ${ade_directory}
|
||||||
|
popd > /dev/null 2>&1
|
||||||
|
RC=$?
|
||||||
|
if [ ${RC} -ne 0 ]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "${1}" = "-viz" ]; then
|
||||||
|
buildRPM "awips2"
|
||||||
|
buildCAVE
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
buildRPM "awips2-alertviz"
|
||||||
|
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "${1}" = "-edex" ]; then
|
||||||
|
buildRPM "awips2"
|
||||||
|
buildRPM "awips2-cli"
|
||||||
|
buildRPM "awips2-gfesuite-client"
|
||||||
|
buildRPM "awips2-gfesuite-server"
|
||||||
|
buildRPM "Installer.ncep-database"
|
||||||
|
buildEDEX
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "${1}" = "-qpid" ]; then
|
||||||
|
buildQPID
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "${1}" = "-ldm" ]; then
|
||||||
|
# Ensure that the user has root privileges.
|
||||||
|
if [ ! ${UID} = 0 ]; then
|
||||||
|
echo "ERROR: You must have root privileges to build ldm."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
buildRPM "awips2-ldm"
|
||||||
|
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "${1}" = "-package" ]; then
|
||||||
|
repository_directory="awips2-repository-${AWIPSII_VERSION}-${AWIPSII_RELEASE}"
|
||||||
|
if [ -d ${WORKSPACE}/${repository_directory} ]; then
|
||||||
|
rm -rf ${WORKSPACE}/${repository_directory}
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
mkdir -p ${WORKSPACE}/${repository_directory}/${AWIPSII_VERSION}-${AWIPSII_RELEASE}
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
cp -r ${AWIPSII_TOP_DIR}/RPMS/* \
|
||||||
|
${WORKSPACE}/${repository_directory}/${AWIPSII_VERSION}-${AWIPSII_RELEASE}
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
rpms_directory="${WORKSPACE}/rpms"
|
||||||
|
comps_xml="${rpms_directory}/common/yum/arch.x86/comps.xml"
|
||||||
|
cp -v ${comps_xml} ${WORKSPACE}/${repository_directory}
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
pushd . > /dev/null
|
||||||
|
cd ${WORKSPACE}
|
||||||
|
tar -cvf ${repository_directory}.tar ${repository_directory}
|
||||||
|
RC=$?
|
||||||
|
popd > /dev/null
|
||||||
|
if [ ${RC} -ne 0 ]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
usage
|
||||||
|
exit 0
|
Loading…
Add table
Reference in a new issue