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

Merge branch 'omaha_16.1.1' into omaha_16.2.1

Browse source 
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDataManager.java


Former-commit-id: 15f842700f3c6919ca3d29e5bd393913143cdde9
This commit is contained in:
Steve Harris 2015-08-19 13:45:47 -05:00
commit a9c82d6eb5
9 changed files with 119 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cave/com.raytheon.uf.viz.coopprecip/src/com/raytheon/uf/viz/coopprecip/CoopPrecipDataCubeAdapter.java
View file

@ -65,7 +65,7 @@ import com.vividsolutions.jts.geom.Coordinate;
* Aug 14,2012 #1055 dgilling Fix getData regression from
* fxatext schema changes.
* Sep 9, 2013 #2277 mschenke Got rid of ScriptCreator references
*
* Aug 18, 2015 4763 rjpeter Use Number in blind cast.
* </pre>
*
* @author bsteffen
@ -190,7 +190,7 @@ public class CoopPrecipDataCubeAdapter implements IDataCubeAdapter {
List<Long> times = new ArrayList<Long>(queryResult.size());
List<String> products = new ArrayList<String>(queryResult.size());
for (Object[] objArr : queryResult) {
times.add((Long) objArr[0]);
times.add(((Number) objArr[0]).longValue());
products.add((String) objArr[1]);
}
if (FFG.equals(nnnid)) {

122
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
View file

@ -1,19 +1,19 @@
/**
* 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.
**/
@ -122,10 +122,10 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
/**
* Composite containing the product editor controls.
*
*
* <pre>
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 18 APR 2008 ### lvenable Initial creation
* 19 JAN 2010 4085 ryu Save and load draft
@ -146,8 +146,8 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
* Changes for non-blocking StoreTransmitDlg.
* Changes for non-blocking WrapLengthDialog.
* 08 Feb 2013 12851 jzeng Add menuToAddTo in create*Menu
* Create createEditorPopupMenu()
* Add mouselistener in createTextControl() for StyledText
* Create createEditorPopupMenu()
* Add mouselistener in createTextControl() for StyledText
* 28 Feb 2013 15889 ryu Removed detachAttributionPhrase and getVTECActionCodes
* 02/12/2013 #1597 randerso Code cleanup. Fixed possible widget disposed errors on shut down.
* 05/08/2013 #1842 dgilling Add alternate setProductText(), fix
@ -167,14 +167,15 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
* 02/04/2014 17039 ryu Removed menu item related to the HighlighFramingCodes feature.
* 04/20/2015 4027 randerso Renamed ProductStateEnum with an initial capital
* Expunged Calendar from ActiveTableRecord
* 07/02/2015 13753 lshi Update times for products in Product Editor
* 07/02/2015 13753 lshi Update times for products in Product Editor
* 07/22/2015 13753 lshi Keeps issue time unchanged
* 07/28/2015 4263 dgilling Support changes to TextProductManager.
* 08/06/2015 13753 lshi removed updateTime flag, undo the change of updateIssueExpireTimes, etc.
* </pre>
*
*
* @author lvenable
* @version 1.0
*
*
*/
public class ProductEditorComp extends Composite implements
INotificationObserver {
@ -186,7 +187,7 @@ public class ProductEditorComp extends Composite implements
/**
* Parent composite.
*/
private Composite parent;
private final Composite parent;
/**
* Toolbar used to mimic a menu bar.
@ -290,7 +291,7 @@ public class ProductEditorComp extends Composite implements
/**
* Date & time formatter.
*/
private SimpleDateFormat expireLabelFmt = new SimpleDateFormat(
private final SimpleDateFormat expireLabelFmt = new SimpleDateFormat(
"HH:mm'Z' dd-MMM-yy");
/**
@ -312,9 +313,9 @@ public class ProductEditorComp extends Composite implements
private ProductDefinition productDefinition;
private String productName;
private final String productName;
private boolean editorCorrectionMode;
private final boolean editorCorrectionMode;
private boolean testVTEC;
@ -356,7 +357,7 @@ public class ProductEditorComp extends Composite implements
* Product transmission callback to report the state of transmitting a
* product.
*/
private ITransmissionState transmissionCB;
private final ITransmissionState transmissionCB;
private final SimpleDateFormat purgeTimeFmt = new SimpleDateFormat("ddHHmm");
@ -375,12 +376,12 @@ public class ProductEditorComp extends Composite implements
*/
private ChangeTimesJob timeUpdater;
private Listener visibilityListener;
private final Listener visibilityListener;
/**
* Enumeration of product types.
*
*
* @author lvenable
*/
public enum productTypeEnum {
@ -424,12 +425,10 @@ public class ProductEditorComp extends Composite implements
private String prodEditorDirectory = null;
private final DataManager dm;
private boolean updateTime = false;
/**
* Constructor.
*
*
* @param parent
* Parent composite.
*/
@ -1081,7 +1080,7 @@ public class ProductEditorComp extends Composite implements
/**
* Store or Transmit text product.
*
*
* @param action
* STORE: show the Store dialog TRANSMITT: shows the Transmit
* dialog. AUTOSTORE: implement autoStore
@ -1192,16 +1191,14 @@ public class ProductEditorComp extends Composite implements
return true;
}
private synchronized boolean changeTimes() {
private boolean changeTimes() {
Calendar GMT = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
GMT.setTime(SimulatedTime.getSystemTime().getTime());
GMT.set(Calendar.SECOND, 0);
Date tt = GMT.getTime();
updateTime = true;
tweakVTEC(tt);
updateIssueExpireTimes(tt);
updateTime = false;
return true;
}
@ -1539,7 +1536,7 @@ public class ProductEditorComp extends Composite implements
/**
* Decodes the start and end times of VTEC, return null if all zeros.
*
*
* @param vt
* The VTEC date string in "yyMMdd'T'HHmm'Z'" format
* @return Date object that corresponds to the specified VTEC time or null
@ -1707,6 +1704,7 @@ public class ProductEditorComp extends Composite implements
textComp.startUpdate();
textComp.patchMND(txt, true);
textComp.updatePType(val);
textComp.endUpdate();
}
@ -1867,7 +1865,7 @@ public class ProductEditorComp extends Composite implements
/**
* Returns a Date from an encoded YYMMDD and hhmm string. Function name is a
* misnomer, but kept from porting AWIPS1 equivalent function.
*
*
* @param day
* The "calendar day" of the time in Java's "yyMMdd" format.
* @param time
@ -1891,7 +1889,7 @@ public class ProductEditorComp extends Composite implements
/**
* Convert time string in DDHHMM format to a Date.
*
*
* @param dtgString
* time string in DDHHMM format
* @return time converted from input string
@ -1966,29 +1964,34 @@ public class ProductEditorComp extends Composite implements
// I know this time string has been replaced. If the lengths of the
// before and after strings are different, a reParse() will be made,
// else it will continue on.
if (textComp != null) {
// Update Issue time -- removed
// Update MND time
// Update Issue time
try {
textComp.startUpdate();
ProductDataStruct pds = textComp.getProductDataStruct();
if (pds != null) {
TextIndexPoints tip = pds.getMndMap().get("nwstime");
if (tip != null) {
SimpleDateFormat fmt = new SimpleDateFormat(
longLocalFmtStr);
fmt.setTimeZone(localTimeZone);
String issueTime = fmt.format(now).toUpperCase();
if (tip != null) {
textComp.replaceText(tip, issueTime);
if (!textComp.isCorMode()) {
if (pds != null) {
TextIndexPoints pit = pds.getPIT();
if (pit != null) {
String time = purgeTimeFmt.format(now);
textComp.replaceText(pit, time);
}
}
}
// Update MND time
TextIndexPoints tip = pds.getMndMap().get("nwstime");
if (tip != null) {
SimpleDateFormat fmt = new SimpleDateFormat(
longLocalFmtStr);
fmt.setTimeZone(localTimeZone);
String issueTime = fmt.format(now).toUpperCase();
if (tip != null) {
textComp.replaceText(tip, issueTime);
}
}
} finally {
textComp.endUpdate();
}
@ -1999,8 +2002,8 @@ public class ProductEditorComp extends Composite implements
// StyledTextComp to re-evaluate whether a reParse() is needed and
// ask it for the segment information each time through the loop (in
// case we're at one of the 4 transition points).
// Update segments' time
// Update segments' time
try {
ProductDataStruct pds = textComp.getProductDataStruct();
@ -2012,7 +2015,7 @@ public class ProductEditorComp extends Composite implements
fmt.setTimeZone(localTimeZone);
String officeIssueTime = fmt.format(now).toUpperCase();
for (int i = 0; i < numSegments; i++) {
textComp.startUpdate();
HashMap<String, TextIndexPoints> segMap = pds
@ -2081,14 +2084,14 @@ public class ProductEditorComp extends Composite implements
* returns the appropriate expiration time. Expiration time is the earliest
* of the specified expiration time, 1 hr if a CAN code is detected, or the
* ending time of ongoing events (CON, EXT, EXB, NEW).
*
*
* @param issTime
* issue time
* @param expTime
* expire time
* @param vtecStr
* vtec string
*
*
* @return expire time
*/
public Date getExpireTime(Date issTime, Date expTime, String vtecStr) {
@ -2171,6 +2174,8 @@ public class ProductEditorComp extends Composite implements
*/
private void loadPrevious() {
String initialValue;
textComp.setCorMode(true);
if (!testVTEC) {
initialValue = "cccnnnxxx";
} else {
@ -2215,9 +2220,10 @@ public class ProductEditorComp extends Composite implements
}
parseIDs();
revive();
// Enter res mode
setPTypeCategory(PTypeCategory.PE);
textComp.setCorMode(true);
}
/**
@ -2354,7 +2360,7 @@ public class ProductEditorComp extends Composite implements
/**
* Get the directory.
*
*
* @return The directory
*/
private String getDir() {
@ -2492,7 +2498,7 @@ public class ProductEditorComp extends Composite implements
/**
* Display the Find or Find & Replace dialog.
*
*
* @param findAndReplace
* If true show the Find & Replace dialog, false shows the Find
* dialog.
@ -2734,7 +2740,7 @@ public class ProductEditorComp extends Composite implements
/*
* (non-Javadoc)
*
*
* @seecom.raytheon.uf.common.jms.notification.INotificationObserver#
* notificationArrived
* (com.raytheon.uf.common.jms.notification.NotificationMessage[])
@ -2916,7 +2922,7 @@ public class ProductEditorComp extends Composite implements
/**
* Word-wrap the text selected by the user.
*
*
*/
private void doWrapSelection() {
StyledText styledText = textComp.getTextEditorST();
@ -2992,7 +2998,7 @@ public class ProductEditorComp extends Composite implements
/*
* (non-Javadoc)
*
*
* @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.
* IProgressMonitor)
*/
@ -3063,9 +3069,5 @@ public class ProductEditorComp extends Composite implements
callToActionsMI.setMenu(callToActionsSubMenu);
createCallToActionsMenu(callToActionsSubMenu);
}
protected boolean isUpdateTime() {
return updateTime;
}
}

71
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
View file

@ -70,7 +70,7 @@ import com.raytheon.viz.gfe.textformatter.TextFmtParserUtil;
/**
* Composite containing the product editor.
*
*
* <pre>
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
@ -87,16 +87,18 @@ import com.raytheon.viz.gfe.textformatter.TextFmtParserUtil;
* 28 JAN 2015 4018 randerso Code cleanup. Fixed reparsing when framing codes are cut
* or pasted instead of just typed over.
* Added logging of text changes to help diagnose future issues.
* 04 FEB 2015 17039 ryu Removed HighlightFramingCodes feature which prevented
* 04 FEB 2015 17039 ryu Removed HighlightFramingCodes feature which prevented
* editing of framing codes.
* 07/02/2015 13753 lshi Update times for products in Product Editor
*
* 08/06/2015 13753 lshi use isSystemTextChange instead of isUpdateTime
*
* </pre>
*
*
* @author lvenable
* @version 1.0
*
*
*/
public class StyledTextComp extends Composite {
private static final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(StyledTextComp.class);
@ -130,7 +132,7 @@ public class StyledTextComp extends Composite {
/**
* Parent composite.
*/
private ProductEditorComp parent;
private final ProductEditorComp parent;
/**
* Styled text editor.
@ -178,7 +180,7 @@ public class StyledTextComp extends Composite {
private boolean updatingForCor = false;
private ProductEditorLogger peLog;
private final ProductEditorLogger peLog;
private static final String NORM_SEP = "^\\s*$";
@ -199,7 +201,7 @@ public class StyledTextComp extends Composite {
/**
* Constructor.
*
*
* @param parent
* Parent composite.
* @param wrapMode
@ -303,7 +305,7 @@ public class StyledTextComp extends Composite {
updateTextStyle(event);
checkAutoWrap(event);
if (corMode && !updatingForCor) {
if (corMode && !updatingForCor && !isSystemTextChange()) {
updatingForCor = true;
try {
makeCorrections();
@ -321,7 +323,7 @@ public class StyledTextComp extends Composite {
/**
* Get the StyledText editor.
*
*
* @return The StyledText editor.
*/
public StyledText getTextEditorST() {
@ -330,17 +332,15 @@ public class StyledTextComp extends Composite {
/**
* Set the product text.
*
*
* @param text
* The product text.
*/
public void setProductText(String text) {
newProduct = true;
textEditorST.setText(EMPTY);
textEditorST.setStyleRange(null);
try {
parseProductText(text);
textEditorST.setStyleRange(null);
textEditorST.setText(text);
lockText();
findFramingCodes();
@ -348,6 +348,7 @@ public class StyledTextComp extends Composite {
newProduct = false;
} catch (JepException e) {
statusHandler.error(PRODUCT_PARSE_ERROR, e);
textEditorST.setText(EMPTY);
}
}
@ -501,7 +502,7 @@ public class StyledTextComp extends Composite {
/**
* Parse the product text string.
*
*
* @param productText
* Complete product text.
* @throws JepException
@ -597,7 +598,7 @@ public class StyledTextComp extends Composite {
/**
* Replacement of the text in the given range with new text.
*
*
* @param tip
* the range of text to be replaced
* @param text
@ -626,11 +627,7 @@ public class StyledTextComp extends Composite {
}
private void makeCorrections() {
if (!parent.isUpdateTime()) {
parent.setPTypeCategory(PTypeCategory.COR);
}
if (prodDataStruct == null)
return;
parent.setPTypeCategory(PTypeCategory.COR);
List<SegmentData> segs = prodDataStruct.getSegmentsArray();
for (SegmentData seg : segs) {
if (seg.getSementMap().keySet().contains("vtec")) {
@ -710,7 +707,7 @@ public class StyledTextComp extends Composite {
* A verify event occurs after the user has done something to modify the
* text (typically typed a key), but before the text is modified. The doit
* field in the verify event indicates whether or not to modify the text.
*
*
* @param event
* Verify event that was fired.
*/
@ -800,7 +797,7 @@ public class StyledTextComp extends Composite {
/**
* Check if there is selected text and if there is locked text in the
* selected text.
*
*
* @return True if there is selected text that contains locked text.
*/
private boolean selectionHasLockedText() {
@ -814,12 +811,12 @@ public class StyledTextComp extends Composite {
/**
* Check if there is locked text in the specified range of text.
*
*
* @param offset
* The starting point of the locked text search.
* @param length
* The length of the search.
*
*
* @return Whether or not there is text in the range that contains locked
* text.
*/
@ -837,7 +834,7 @@ public class StyledTextComp extends Composite {
/**
* Check if the key being pressed is a "non-edit" key.
*
*
* @param event
* Verify event.
* @return True if the key is an arrow or "non-edit" key.
@ -871,7 +868,7 @@ public class StyledTextComp extends Composite {
/**
* Handle the mouse down event.
*
*
* @param e
* Event fired.
*/
@ -986,7 +983,7 @@ public class StyledTextComp extends Composite {
/**
* Checks if the system is editing, e.g. updating the issue time every
* minute, vs a user typing text in the text area
*
*
* @return
*/
private boolean isSystemTextChange() {
@ -1142,7 +1139,7 @@ public class StyledTextComp extends Composite {
/**
* Getter for the column at which wrap and auto-wrap will wrap the text.
*
*
* @return the column number
*/
public int getWrapColumn() {
@ -1151,7 +1148,7 @@ public class StyledTextComp extends Composite {
/**
* Getter for the column at which wrap and auto-wrap will wrap the text.
*
*
* @param wrapColumn
* the column number
*/
@ -1190,7 +1187,7 @@ public class StyledTextComp extends Composite {
/**
* Query the prefs for setting. If it does not exist, use colorDft as its
* value. Create an SWT Color for display from the value and return it.
*
*
* @param prefs
* A preference store which might have config values.
* @param display
@ -1213,7 +1210,7 @@ public class StyledTextComp extends Composite {
/**
* Send a PROBLEM message if color1 is exactly equal to color2.
*
*
* @param color1
* the first color
* @param color2
@ -1240,7 +1237,7 @@ public class StyledTextComp extends Composite {
* <p>
* The getter name is different to avoid confusion with the getFgColor()
* method of Control.
*
*
* @return the foreground Color
*/
public Color getFgndColor() {
@ -1251,7 +1248,7 @@ public class StyledTextComp extends Composite {
* Get the framed text color of the StyledTextComp. This is the actual
* color, not a copy. It will be disposed when the StyledTextComp is, and
* should not be disposed before then.
*
*
* @return the frameColor
*/
public Color getFrameColor() {
@ -1262,7 +1259,7 @@ public class StyledTextComp extends Composite {
* Get the insert color of the StyledTextComp. This is the actual color, not
* a copy. It will be disposed when the StyledTextComp is, and should not be
* disposed before then.
*
*
* @return the insertColor
*/
public Color getInsertColor() {
@ -1273,7 +1270,7 @@ public class StyledTextComp extends Composite {
* Get the locked text color of the StyledTextComp. This is the actual
* color, not a copy. It will be disposed when the StyledTextComp is, and
* should not be disposed before then.
*
*
* @return the lockColor
*/
public Color getLockColor() {
@ -1283,7 +1280,7 @@ public class StyledTextComp extends Composite {
/**
* Word wrap the text in the block around cursorIndex. Adjust the cursor
* position to account for inserted or deleted whitespace.
*
*
* @param st
* The StyledText in which word wrap is to be performed
* @param cursorIndex

3
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDataManager.java
View file

@ -74,6 +74,7 @@ import com.raytheon.viz.hydrocommon.util.DbUtils;
* Dec 14, 2014 16388 xwei updated the insertion of rejecteddata table.
* Jul 21, 2015 4500 rjpeter Use Number in blind cast.
* Aug 05, 2015 4486 rjpeter Changed Timestamp to Date.
* Aug 18, 2015 4793 rjpeter Use Number in blind cast.
* </pre>
*
* @author dhladky
@ -948,7 +949,7 @@ public class TimeSeriesDataManager extends HydroDataManager {
productID = dr.getProductID();
}
Integer qualityCode = (Integer) getDataFromDB(dr, "quality_code");
Integer qualityCode = ((Number) getDataFromDB(dr, "quality_code")).intValue();
if (qualityCode == null) {
qualityCode = new Integer(dr.getQualityCode());
}

6
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/data/GeoDataManager.java
View file

@ -40,9 +40,9 @@ import com.raytheon.viz.hydrocommon.datamanager.HydroDataManager;
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Sep 12, 2009 2772 mpduff Initial creation
* Sep 12, 2009 2772 mpduff Initial creation
* 30 June 2015 17360 xwei Fixed : basins.dat import failed if the first line does not have Lat Lon
*
* Aug 18, 2015 4763 rjpeter Use Number in blind cast.
* </pre>
*
* @author mpduff
@ -257,7 +257,7 @@ public class GeoDataManager extends HydroDataManager {
query.append("select count(*) from linesegs ");
query.append(where.toString());
ArrayList<Object[]> rs = runQuery(query.toString());
count = (Long) (rs.get(0)[0]);
count = ((Number) (rs.get(0)[0])).longValue();
if (count == 0) {
// insert the record
query.setLength(0);

3
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/gfeLevelMappingFile.xml
View file

@ -2,6 +2,7 @@
<!--
Mar 31, 2014 #2934 dgilling Added new FHAG0 level needed for pSurge2.0.
Jun 24, 2015 #4537 rferrel Added new FHAG80 and BL levels needed for HRRR.
Aug 17, 2015 #4753 rferrel Fixed accidental renaming of BL0180.
-->
<LevelMappings>
<Level key="BL030">
@ -10,7 +11,7 @@
<Level key="BL090">
<DatabaseLevel levelName="BL" levelOneValue="0.0" levelTwoValue="90.0" unit="hPa"/>
</Level>
<Level key="BL180">
<Level key="BL0180">
<DatabaseLevel levelName="BL" levelOneValue="0.0" levelTwoValue="180.0" unit="hPa"/>
</Level>
<Level key="BL0255">

18
edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/export_configuration
View file

@ -31,6 +31,8 @@
# Mar 23, 2015 #4308 dgilling Export mixedCaseProductIds.txt.
# Apr 28, 2015 #4427 dgilling Support subdomains of the
# primary domains.
# Aug 10, 2015 #17443 lshi Bug in scripts results in rsync_parms.ccc
# file not getting used
#
##
@ -73,7 +75,7 @@ echo "Preparing configuration files for export..."
edexDest=${OUTPUT_DIR}/GFEconfig/edex_static
commonDest=${OUTPUT_DIR}/GFEconfig/common_static
caveDest=${OUTPUT_DIR}/GFEconfig/cave_static
rsyncParms=GFEConfig # DR 16464
rsyncParmsDest=${OUTPUT_DIR}/GFEConfig/site # DR 16464/17443
echo "Making temporary edex configuration directories..."
mkdir -p $edexDest/site
@ -86,7 +88,7 @@ mkdir -p $caveDest/site
# DR 16464
echo "Making temporary rsync_parms directory"
mkdir -p $rsyncParms/site
mkdir -p $rsyncParmsDest
CP_COMMAND="rsync -aq --exclude=*.pyo --exclude=*.pyc --exclude=*.md5"
@ -112,10 +114,10 @@ ${CP_COMMAND} ${LOCALIZATION_PATH}/cave_static/site/${CAPS_SITE}/bundles/maps $c
echo "Copying cave site colormaps configuration for site ${CAPS_SITE} to temporary directory..."
${CP_COMMAND} ${LOCALIZATION_PATH}/common_static/site/${CAPS_SITE}/colormaps $commonDest/site
# DR 16464
if [ -f ${IFPS_DATA}/rsync_parms.${CAPS_SITE} ]; then
echo "Copying the rsync_parms file for site ${CAPS_SITE} to temporary directory..."
cp -a ${IFPS_DATA}/rsync_parms.${CAPS_SITE} $rsyncParms/site
# DR 16464, 17443: CAPS_SITE->SITE (lower case)
if [ -f ${IFPS_DATA}/rsync_parms.${SITE} ]; then
echo "Copying the rsync_parms file for site ${SITE} to temporary directory..."
cp -a ${IFPS_DATA}/rsync_parms.${SITE} $rsyncParmsDest
fi
# Determine if we're exporting for this site or for its subdomains
@ -152,9 +154,9 @@ do
sed -i "s/$ORIG_SITEID/$NEW_SITEID/" ${config}
# rename rsync_parms to use sub-domain site ID
if [ -f ${site_dir}/GFEConfig/site/rsync_parms.${CAPS_SITE} ]
if [ -f ${site_dir}/GFEConfig/site/rsync_parms.${SITE} ]
then
mv ${site_dir}/GFEConfig/site/rsync_parms.${CAPS_SITE} ${site_dir}/GFEConfig/site/rsync_parms.${siteid_caps}
mv ${site_dir}/GFEConfig/site/rsync_parms.${SITE} ${site_dir}/GFEConfig/site/rsync_parms.${siteid_lc}
fi
fi

4
edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/process_configuration
View file

@ -19,7 +19,7 @@
# 04/29/15 #4427 dgilling Code cleanup.
# 06/24/15 #16831 bhunder Copy colormaps directory into localization
# directory.
# 06/30/15 #17443 lshi Bug in scripts results in rsync_parms.ccc
# 08/10/15 #17443 lshi Bug in scripts results in rsync_parms.ccc
# file not getting used
##############################################################################
@ -182,7 +182,7 @@ cp -r GFEconfig/cave_static/site/* ${cave_site_dest}
cp -r GFEconfig/common_static/site/colormaps ${common_site_dest}
# DR 17443
cp -a GFEConfig/site/rsync_parms.${SITE_ID_CAPS} ${rsync_parms_dest}
cp -a GFEConfig/site/rsync_parms.${SITE_ID} ${rsync_parms_dest}
echo "Files successfully copied!"
echo "Changing ownership of received configuration"

4
edexOsgi/gov.noaa.nws.sr.oun.edex.mping.feature/feature.xml
View file

@ -21,14 +21,14 @@
id="gov.noaa.nws.sr.oun.dataplugin.mping"
download-size="0"
install-size="0"
version="1.0.0"
version="0.0.0"
unpack="false"/>
<plugin
id="gov.noaa.nws.sr.oun.edex.plugin.mping"
download-size="0"
install-size="0"
version="1.0.0"
version="0.0.0"
unpack="false"/>
</feature>