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

12.12.1-12 baseline

Browse source 
Former-commit-id: e8e41630e8 [formerly e8e41630e8 [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]]
Former-commit-id: 6d610f8e8a
Former-commit-id: 7bb37caa23
This commit is contained in:
Steve Harris 2012-12-06 09:18:28 -06:00
parent 8ada406bfe
commit 190378beeb
47 changed files with 362 additions and 202 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cave/build/static/common/cave/etc/menus/upperair/baseAlaska.xml
View file

@ -20,7 +20,7 @@
--> -->
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Adark/Davis AFB, AK (70454)" id="raobDavisAFB_AK" menuText="Adak/Davis AFB, AK (70454)" id="raobDavisAFB_AK"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor"> editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="70454"/> <substitute key="stationId" value="70454"/>
</contribute> </contribute>

2
cave/build/static/common/cave/etc/menus/upperair/baseCanadaEastern.xml
View file

@ -65,7 +65,7 @@
<substitute key="stationId" value="71815"/> <substitute key="stationId" value="71815"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Inoucdjouac, QC (CYPH)" id="raobInoucdjouac_QC" menuText="Inoucdjouac, QB (CYPH)" id="raobInoucdjouac_QC"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor"> editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="71907"/> <substitute key="stationId" value="71907"/>
</contribute> </contribute>

2
cave/build/static/common/cave/etc/menus/upperair/baseCanadaNorth.xml
View file

@ -20,7 +20,7 @@
--> -->
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Eueka, NW (CWEU)" id="raobEueka_NW" menuText="Eureka, NW (CWEU)" id="raobEueka_NW"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor"> editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="71917"/> <substitute key="stationId" value="71917"/>
</contribute> </contribute>

6
cave/build/static/common/cave/etc/menus/upperair/baseEastNPN.xml
View file

@ -41,7 +41,7 @@
<substitute key="productURI" value="/profiler/%/3000/74550/%"/> <substitute key="productURI" value="/profiler/%/3000/74550/%"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="De Queen AR (DQUA4)" id="profDeQueen_AR" menuText="DeQueen AR (DQUA4)" id="profDeQueen_AR"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor"> editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<dataURI>/profiler/%/3000/74752/%</dataURI> <dataURI>/profiler/%/3000/74752/%</dataURI>
<substitute key="wmoid" value="74752"/> <substitute key="wmoid" value="74752"/>
@ -55,7 +55,7 @@
<substitute key="productURI" value="/profiler/%/3000/74440/%"/> <substitute key="productURI" value="/profiler/%/3000/74440/%"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Haskell OK (LMN02)" id="profHaskell_OK" menuText="Haskell OK (HKL02)" id="profHaskell_OK"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor"> editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<dataURI>/profiler/%/3000/74648/%</dataURI> <dataURI>/profiler/%/3000/74648/%</dataURI>
<substitute key="wmoid" value="74648"/> <substitute key="wmoid" value="74648"/>
@ -118,7 +118,7 @@
<substitute key="productURI" value="/profiler/%/3000/74379/%"/> <substitute key="productURI" value="/profiler/%/3000/74379/%"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml"
menuText="Winchester IL (WNFL1)" id="profWinchester_IL" menuText="Winchester IL (WNCI2)" id="profWinchester_IL"
editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor"> editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
<dataURI>/profiler/%/3000/74556/%</dataURI> <dataURI>/profiler/%/3000/74556/%</dataURI>
<substitute key="wmoid" value="74556"/> <substitute key="wmoid" value="74556"/>

10
cave/build/static/common/cave/etc/menus/upperair/baseJapan.xml
View file

@ -30,9 +30,9 @@
<substitute key="stationId" value="47646"/> <substitute key="stationId" value="47646"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Shionomisaki (47776)" id="raobShionomisaki" menuText="Shionomisaki (47778)" id="raobShionomisaki"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor"> editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="47776"/> <substitute key="stationId" value="47778"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Fukuoka (47807)" id="raobFukuoka" menuText="Fukuoka (47807)" id="raobFukuoka"
@ -71,7 +71,7 @@
<substitute key="stationId" value="589680"/> <substitute key="stationId" value="589680"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Chichi Jima (RJAO)" id="raobChichijima" menuText="Chichijima (RJAO)" id="raobChichijima"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor"> editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="47971"/> <substitute key="stationId" value="47971"/>
</contribute> </contribute>
@ -158,12 +158,12 @@
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Ishigaki Jima (ROIG)" id="raobIshigakijima " menuText="Ishigakijima (ROIG)" id="raobIshigakijima "
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor"> editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="47918"/> <substitute key="stationId" value="47918"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Minamidaito Jima (ROMD)" id="raobMinamidaltojima" menuText="Minamidaitojima (ROMD)" id="raobMinamidaltojima"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor"> editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="47945"/> <substitute key="stationId" value="47945"/>
</contribute> </contribute>

2
cave/build/static/common/cave/etc/menus/upperair/baseMexico.xml
View file

@ -82,7 +82,7 @@
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Guadalajara, MX (MMGL)" id="raobGuadalajara_MX" menuText="Guadalajara, MX (MMGL)" id="raobGuadalajara_MX"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor"> editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="72226"/> <substitute key="stationId" value="76612"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Guaymas (MMGM)" id="raobGuaymas" menuText="Guaymas (MMGM)" id="raobGuaymas"

2
cave/build/static/common/cave/etc/menus/upperair/basePacificEast.xml
View file

@ -81,7 +81,7 @@
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Midway Island (Nayv) (PMDY)" id="raobPortland_ME" menuText="Midway Island (Navy) (PMDY)" id="raobPortland_ME"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor"> editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="91066"/> <substitute key="stationId" value="91066"/>
</contribute> </contribute>

2
cave/build/static/common/cave/etc/menus/upperair/basePacificWest.xml
View file

@ -27,7 +27,7 @@
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Honiara (AGGH)" id="raobHonlara" menuText="Honiara (AGGH)" id="raobHonlara"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor"> editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="91520"/> <substitute key="stationId" value="91517"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"

12
cave/build/static/common/cave/etc/menus/upperair/baseRussia.xml
View file

@ -40,7 +40,7 @@
<substitute key="stationId" value="31168"/> <substitute key="stationId" value="31168"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Nikolayevsk-n Amur (31369)" id="raobNikolayevsk-nAmur" menuText="Nikolayevsk-na Amur (31369)" id="raobNikolayevsk-nAmur"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor"> editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="31369"/> <substitute key="stationId" value="31369"/>
</contribute> </contribute>
@ -75,7 +75,7 @@
<substitute key="stationId" value="31873"/> <substitute key="stationId" value="31873"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Ternej (31909)" id="raobTernej" menuText="Terney (31909)" id="raobTernej"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor"> editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="31909"/> <substitute key="stationId" value="31909"/>
</contribute> </contribute>
@ -90,7 +90,7 @@
<substitute key="stationId" value="32098"/> <substitute key="stationId" value="32098"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Juzhno-Kurilsk (32165)" id="raobJuzhno-Kurilsk" menuText="Yuzhno-Kuril'SK (32165)" id="raobJuzhno-Kurilsk"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor"> editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="32165"/> <substitute key="stationId" value="32165"/>
</contribute> </contribute>
@ -100,7 +100,7 @@
<substitute key="stationId" value="32186"/> <substitute key="stationId" value="32186"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Yuzhno-Kuril'SK (32217)" id="raobYuzhno-KurilSK" menuText="Severo-Kuril'SK (32217)" id="raobYuzhno-KurilSK"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor"> editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="32217"/> <substitute key="stationId" value="32217"/>
</contribute> </contribute>
@ -115,9 +115,9 @@
<substitute key="stationId" value="32477"/> <substitute key="stationId" value="32477"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Nikol'skoye (32616)" id="raobNikol'skoye" menuText="Nikol'skoye (32618)" id="raobNikol'skoye"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor"> editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="32616"/> <substitute key="stationId" value="32618"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Khabarovsk (RUHB)" id="raobKhabarovsk" menuText="Khabarovsk (RUHB)" id="raobKhabarovsk"

4
cave/build/static/common/cave/etc/menus/upperair/baseUSEastern.xml
View file

@ -65,7 +65,7 @@
<substitute key="stationId" value="72632"/> <substitute key="stationId" value="72632"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Key West, FL (KEYW)" id="raobKeyWest_FL" menuText="Key West, FL (KKEY)" id="raobKeyWest_FL"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor"> editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="72201"/> <substitute key="stationId" value="72201"/>
</contribute> </contribute>
@ -110,7 +110,7 @@
<substitute key="stationId" value="72233"/> <substitute key="stationId" value="72233"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Wash-Dulles, VA (KIAD)" id="raobWash-Dulles" menuText="Wash-Dulles, VA (KLWX)" id="raobWash-Dulles"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor"> editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="72403"/> <substitute key="stationId" value="72403"/>
</contribute> </contribute>

2
cave/build/static/common/cave/etc/menus/upperair/baseUSWestern.xml
View file

@ -40,7 +40,7 @@
<substitute key="stationId" value="74005"/> <substitute key="stationId" value="74005"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Yuma PG Site 2, AZ (K1Y9)" id="raobYuma_AZ" menuText="Yuma PG Site 3, AZ (K1Y9)" id="raobYuma_AZ"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor"> editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="74006"/> <substitute key="stationId" value="74006"/>
</contribute> </contribute>

2
cave/build/static/common/cave/etc/menus/upperair/index.xml
View file

@ -21,7 +21,7 @@
<menuContributionFile> <menuContributionFile>
<include installTo="menu:upperAir?before=PROFILER" fileName="menus/upperair/baseUpperAir.xml" /> <include installTo="menu:upperAir?before=PROFILER" fileName="menus/upperair/baseUpperAir.xml" />
<include subMenu="Alaska NPN time-heigh" installTo="menu:upperAir?after=PROFILER" fileName="menus/upperair/baseAlaskaNPN.xml" /> <include subMenu="Alaska NPN time-height" installTo="menu:upperAir?after=PROFILER" fileName="menus/upperair/baseAlaskaNPN.xml" />
<include subMenu="West NPN time-height" installTo="menu:upperAir?before=ProfilerMenuEnd" <include subMenu="West NPN time-height" installTo="menu:upperAir?before=ProfilerMenuEnd"
fileName="menus/upperair/baseWestNPN.xml" /> fileName="menus/upperair/baseWestNPN.xml" />
<include subMenu="East NPN time-height" installTo="menu:upperAir?before=ProfilerMenuEnd" <include subMenu="East NPN time-height" installTo="menu:upperAir?before=ProfilerMenuEnd"

12
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
View file

@ -129,8 +129,6 @@ public class LocalizationManager implements IPropertyChangeListener {
/** The current localization site */ /** The current localization site */
private String currentSite; private String currentSite;
private boolean nationalCenter;
private boolean overrideSite; private boolean overrideSite;
@ -394,12 +392,6 @@ public class LocalizationManager implements IPropertyChangeListener {
.getString("-site").toUpperCase(); .getString("-site").toUpperCase();
this.overrideSite = true; this.overrideSite = true;
} }
this.nationalCenter = false;
if (ProgramArguments.getInstance().getString("-nc") != null) {
this.nationalCenter = true;
}
} }
private void checkForServerOverride() { private void checkForServerOverride() {
@ -954,8 +946,4 @@ public class LocalizationManager implements IPropertyChangeListener {
public boolean isOverrideSite() { public boolean isOverrideSite() {
return overrideSite; return overrideSite;
} }
public boolean isNationalCenter() {
return nationalCenter;
}
} }

7
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/SideView.java
View file

@ -93,6 +93,8 @@ import com.vividsolutions.jts.geom.Coordinate;
* Oct 22, 2009 #3348 bsteffen limit number of frames in sidepane rather than reseting * Oct 22, 2009 #3348 bsteffen limit number of frames in sidepane rather than reseting
* Jul 1, 2010 #6146 bkowal Updates the legend mode so that smaller panes will * Jul 1, 2010 #6146 bkowal Updates the legend mode so that smaller panes will
* now include a legend * now include a legend
* Nov 20, 2012 DR 15524 M.Porricelli Changed so interactive screens still editable when
* swapped to side panel
* *
* </pre> * </pre>
* *
@ -602,11 +604,12 @@ public class SideView extends ViewPart implements IMultiPaneEditor,
if (editableResource != null) { if (editableResource != null) {
EditableManager.makeEditable(editableResource, false); EditableManager.makeEditable(editableResource, false);
} }
this.editableResource = editableResource;
if (this.editableResource != null) { if (this.editableResource != null) {
EditableManager.makeEditable(this.editableResource, true); EditableManager.makeEditable(this.editableResource, true);
} }
this.editableResource = editableResource;
theEditor.getBackgroundColor().setColor(BGColorMode.EDITOR, theEditor.getBackgroundColor().setColor(BGColorMode.EDITOR,
myRenderables[0].getBackgroundColor()); myRenderables[0].getBackgroundColor());

7
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TP6hr.xml
View file

@ -22,8 +22,11 @@
<Method models="SREF212" name="Alias"> <Method models="SREF212" name="Alias">
<Field abbreviation="TP6mean"/> <Field abbreviation="TP6mean"/>
</Method> </Method>
<Method name="Alias" models="RFCqpf"> <Method name="Alias" models="RFCqpf HPCqpf">
<Field abbreviation="tpHPC"/> <Field abbreviation="tpHPC"/>
</Method>
<Method name="Alias" models="HPCqpfNDFD">
<Field abbreviation="tpHPCndfd"/>
</Method> </Method>
<Method name="Alias"> <Method name="Alias">
<Field abbreviation="QPE06"/> <Field abbreviation="QPE06"/>

2
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/WD.xml
View file

@ -18,7 +18,7 @@
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information. further_licensing_information.
--> -->
<DerivedParameter abbreviation="WD" name="Wind directionn" unit="deg"> <DerivedParameter abbreviation="WD" name="Wind direction" unit="deg">
<Method name="RaobParam" models="bufrua"> <Method name="RaobParam" models="bufrua">
<Field abbreviation="Raob"/> <Field abbreviation="Raob"/>
<ConstantField value="5"/> <ConstantField value="5"/>

28
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/guidance/PythonGuidanceJob.java
View file

@ -29,9 +29,6 @@ import jep.JepException;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.Status;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
import org.eclipse.ui.PlatformUI;
import com.raytheon.uf.common.localization.IPathManager; import com.raytheon.uf.common.localization.IPathManager;
import com.raytheon.uf.common.localization.PathManagerFactory; import com.raytheon.uf.common.localization.PathManagerFactory;
@ -62,6 +59,9 @@ import com.raytheon.viz.aviation.monitor.AvnPyUtil;
* Apr 14, 2011 8065 rferrel Implemented enqueue to place * Apr 14, 2011 8065 rferrel Implemented enqueue to place
* Alerts at the front of the queue * Alerts at the front of the queue
* and work with data caching. * and work with data caching.
* Nov 28, 2012 1363 rferrel No longer add a dispose listner so the
* creation of instance can be done on
* any thread.
* *
* </pre> * </pre>
* *
@ -107,7 +107,6 @@ public class PythonGuidanceJob extends AbstractQueueJob<GuidanceRequest> {
super(name); super(name);
suspendMonitor = new Object(); suspendMonitor = new Object();
suspendJob = false; suspendJob = false;
setupDispose();
} }
/** /**
@ -147,6 +146,13 @@ public class PythonGuidanceJob extends AbstractQueueJob<GuidanceRequest> {
return instance; return instance;
} }
public final static synchronized void dispose() {
if (instance != null) {
instance.shutdown();
instance = null;
}
}
/** /**
* Shutdowns the running instance and cleans up any threads. * Shutdowns the running instance and cleans up any threads.
*/ */
@ -197,20 +203,6 @@ public class PythonGuidanceJob extends AbstractQueueJob<GuidanceRequest> {
} }
} }
/**
* Set up dispose listener to clean up when Cave goes away.
*/
private void setupDispose() {
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()
.addDisposeListener(new DisposeListener() {
@Override
public void widgetDisposed(DisposeEvent e) {
shutdown();
}
});
}
/* /*
* (non-Javadoc) * (non-Javadoc)
* *

9
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
View file

@ -53,11 +53,13 @@ import org.eclipse.ui.actions.ActionFactory;
import com.raytheon.uf.common.localization.IPathManager; import com.raytheon.uf.common.localization.IPathManager;
import com.raytheon.uf.common.localization.PathManagerFactory; import com.raytheon.uf.common.localization.PathManagerFactory;
import com.raytheon.viz.alerts.observers.ProductAlertObserver; import com.raytheon.viz.alerts.observers.ProductAlertObserver;
// import com.raytheon.viz.aviation.cachedata.PythonCacheGuidanceJob;
import com.raytheon.viz.aviation.climatology.ClimateMenuDlg; import com.raytheon.viz.aviation.climatology.ClimateMenuDlg;
import com.raytheon.viz.aviation.climatology.WeatherPlotDialog; import com.raytheon.viz.aviation.climatology.WeatherPlotDialog;
import com.raytheon.viz.aviation.editor.ITafSettable; import com.raytheon.viz.aviation.editor.ITafSettable;
import com.raytheon.viz.aviation.editor.TafViewerEditorDlg; import com.raytheon.viz.aviation.editor.TafViewerEditorDlg;
import com.raytheon.viz.aviation.editor.TafViewerEditorDlg.TafSettings; import com.raytheon.viz.aviation.editor.TafViewerEditorDlg.TafSettings;
import com.raytheon.viz.aviation.guidance.PythonGuidanceJob;
import com.raytheon.viz.aviation.guidance.ViewerTab; import com.raytheon.viz.aviation.guidance.ViewerTab;
import com.raytheon.viz.aviation.model.ForecastModel; import com.raytheon.viz.aviation.model.ForecastModel;
import com.raytheon.viz.aviation.monitor.CcfpMonitorObserver; import com.raytheon.viz.aviation.monitor.CcfpMonitorObserver;
@ -139,6 +141,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
* 10/11/2012 1229 jkorman Changes for BackupDialog to support non-blocking. * 10/11/2012 1229 jkorman Changes for BackupDialog to support non-blocking.
* 10/11/2012 1229 rferrel Changes for non-blocking TafViewerEditorDlg. * 10/11/2012 1229 rferrel Changes for non-blocking TafViewerEditorDlg.
* 10/15/2012 1229 rferrel Changes for non-blocking HelpUsageDlg. * 10/15/2012 1229 rferrel Changes for non-blocking HelpUsageDlg.
* 11/28/2012 1363 rferrel Dispose of PythonGuidanceJob when closing.
* </pre> * </pre>
* *
* @author grichard * @author grichard
@ -892,9 +895,9 @@ public class TafMonitorDlg extends CaveSWTDialog {
} }
tveDlg.disposeDialog(); tveDlg.disposeDialog();
// shell.dispose(); // PythonCacheGuidanceJob.dispose();
close(); PythonGuidanceJob.dispose();
return true; return close();
} }
private void populateStationsOfInterest() { private void populateStationsOfInterest() {

11
cave/com.raytheon.viz.gfe/help/GFEStartup.html
View file

@ -23,7 +23,7 @@ Table of Contents<br>
<p><br> <p><br>
<tt>cave.sh [-server hostname:port/services] [-mode TEST|PRACTICE|OPERATIONAL] [-site xxx] <tt>cave.sh [-server hostname:port/services] [-mode TEST|PRACTICE|OPERATIONAL] [-site xxx]
[-u user] [-component componentName] [-perspective perspecitiveName] [-noredirect] [-u user] [-component componentName] [-perspective perspecitiveName] [-noredirect]
[-consoleLog] [-nc TRUE]<br> [-consoleLog]<br>
<br> <br>
<table nosave="" border="1" width="100%"> <table nosave="" border="1" width="100%">
<tbody> <tbody>
@ -77,15 +77,6 @@ Table of Contents<br>
<td>Causes the CAVE log to be output to the console for monitoring/debugging. <td>Causes the CAVE log to be output to the console for monitoring/debugging.
</td> </td>
</tr> </tr>
<tr>
<td>-nc</td>
<td>YES</td>
<td>This option is only used by Service backup. It is used to indicate that the site is
a national center, consequently a non-primary site gets special permission to export
site configuration to the central server via the Service Backup GUI. This option should
be set to 'true', i.e., -nc true.
</td>
</tr>
</tbody> </tbody>
</table> </table>
</p> </p>

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

@ -256,11 +256,6 @@
<command id="com.raytheon.viz.gfe.actions.showISCSampleOfficial" <command id="com.raytheon.viz.gfe.actions.showISCSampleOfficial"
name="showIscSampleOfficial"> name="showIscSampleOfficial">
</command> </command>
<command id="com.raytheon.viz.gfe.showSendISCDialog" name="showSendISCDialog">
</command>
<command id="com.raytheon.viz.gfe.actions.showISCRequest"
name="showISCRequest">
</command>
<command id="com.raytheon.viz.gfe.actions.SelectGridsWhenStepping" <command id="com.raytheon.viz.gfe.actions.SelectGridsWhenStepping"
name="SelectGridsWhenStepping"> name="SelectGridsWhenStepping">
</command> </command>
@ -847,20 +842,6 @@
<activeWhen> <activeWhen>
<reference definitionId="com.raytheon.viz.gfe.inGFEActionSet"> <reference definitionId="com.raytheon.viz.gfe.inGFEActionSet">
</reference> </reference>
</activeWhen>
</handler>
<handler class="com.raytheon.viz.gfe.actions.ShowSendISCDialog"
commandId="com.raytheon.viz.gfe.showSendISCDialog">
<activeWhen>
<reference definitionId="com.raytheon.viz.gfe.inGFEActionSet">
</reference>
</activeWhen>
</handler>
<handler class="com.raytheon.viz.gfe.actions.ShowISCRequestAction"
commandId="com.raytheon.viz.gfe.actions.showISCRequest">
<activeWhen>
<reference definitionId="com.raytheon.viz.gfe.inGFEActionSet">
</reference>
</activeWhen> </activeWhen>
</handler> </handler>
<handler class="com.raytheon.viz.gfe.actions.SelectGridsWhenStepping" <handler class="com.raytheon.viz.gfe.actions.SelectGridsWhenStepping"
@ -1300,20 +1281,6 @@
visible="true"> visible="true">
</separator> </separator>
<dynamic class="com.raytheon.viz.gfe.menu.ISCMenuEnabler" id="com.raytheon.viz.gfe.menu.ISCMenuEnabler"/> <dynamic class="com.raytheon.viz.gfe.menu.ISCMenuEnabler" id="com.raytheon.viz.gfe.menu.ISCMenuEnabler"/>
<!--<command commandId="com.raytheon.viz.gfe.showSendISCDialog"
label="Send Intersite Grids..." style="push">
</command>
<command commandId="com.raytheon.viz.gfe.actions.showISCRequest"
label="ISC Request/Reply..." style="push">
</command>
<command
commandId="com.raytheon.viz.gfe.iscSendEnable"
label="ISC Send Enable"
style="toggle">
</command>
-->
</menu> </menu>
<menu label="Products" mnemonic="P"> <menu label="Products" mnemonic="P">
<visibleWhen> <visibleWhen>

19
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
View file

@ -53,6 +53,8 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* 02/22/2008 Eric Babin Initial Creation * 02/22/2008 Eric Babin Initial Creation
* 04/17/2009 #2282 rjpeter Added confirmation message on delete. * 04/17/2009 #2282 rjpeter Added confirmation message on delete.
* 11/20/2012 DR 15532 jzeng Added popup dialog to make sure group saved with
* valid characters
* </pre> * </pre>
* *
* @author ebabin * @author ebabin
@ -193,9 +195,9 @@ public class WeatherElementGroupDialog extends CaveJFACEDialog {
@Override @Override
protected void okPressed() { protected void okPressed() {
boolean ok = true; boolean ok = true;
String groupName = getSelectedItem();
if (!saveType) {
String groupName = getSelectedItem(); if (!saveType) {
if (!FileUtil.isValidFilename(groupName)) { if (!FileUtil.isValidFilename(groupName)) {
MessageBox mb = new MessageBox(super.getShell(), SWT.ICON_ERROR MessageBox mb = new MessageBox(super.getShell(), SWT.ICON_ERROR
| SWT.OK); | SWT.OK);
@ -226,6 +228,17 @@ public class WeatherElementGroupDialog extends CaveJFACEDialog {
+ " is protected or an invalid name."); + " is protected or an invalid name.");
ok = false; ok = false;
} }
if (!FileUtil.isValidFilename(groupName)) {
MessageBox mb = new MessageBox(super.getShell(), SWT.ICON_ERROR
| SWT.OK);
mb.setText("Invalid Group Name");
mb.setMessage("Group name may only contain the following characters: "
+ FileUtil.VALID_FILENAME_CHARS);
mb.open();
ok = false;
}
} }
if (ok) { if (ok) {

8
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/isc/ISCRequestReplyDlg.java
View file

@ -54,6 +54,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* 08/20/09 1995 lvenable Initial port * 08/20/09 1995 lvenable Initial port
* 10/24/2008 1287 rferrel Made dialog non-blocking.
* *
* </pre> * </pre>
* *
@ -61,7 +62,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
* @version 1 * @version 1
*/ */
public class ISCRequestReplyDlg extends CaveSWTDialog { public class ISCRequestReplyDlg extends CaveSWTDialog {
private static final transient IUFStatusHandler statusHandler = UFStatus private final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(ISCRequestReplyDlg.class); .getHandler(ISCRequestReplyDlg.class);
private ListManager domainList; private ListManager domainList;
@ -78,8 +79,6 @@ public class ISCRequestReplyDlg extends CaveSWTDialog {
private Map<String, Map<String, List<Map<String, String>>>> domainDict; private Map<String, Map<String, List<Map<String, String>>>> domainDict;
private Map<String, String> serverDictS2T;
private Map<String, Map<String, String>> serverDictT2S; private Map<String, Map<String, String>> serverDictT2S;
private String xml; private String xml;
@ -93,7 +92,7 @@ public class ISCRequestReplyDlg extends CaveSWTDialog {
* Parent shell. * Parent shell.
*/ */
public ISCRequestReplyDlg(Shell parent) { public ISCRequestReplyDlg(Shell parent) {
super(parent, SWT.DIALOG_TRIM | SWT.RESIZE); super(parent, SWT.DIALOG_TRIM | SWT.RESIZE, CAVE.DO_NOT_BLOCK);
setText("ISC Request/Reply"); setText("ISC Request/Reply");
dataMgr = DataManager.getCurrentInstance(); dataMgr = DataManager.getCurrentInstance();
@ -228,7 +227,6 @@ public class ISCRequestReplyDlg extends CaveSWTDialog {
this.weList = (List<String>) response[1]; this.weList = (List<String>) response[1];
Collections.sort(this.weList); Collections.sort(this.weList);
domainDict = (Map<String, Map<String, List<Map<String, String>>>>) response[2]; domainDict = (Map<String, Map<String, List<Map<String, String>>>>) response[2];
serverDictS2T = (Map<String, String>) response[3];
serverDictT2S = (Map<String, Map<String, String>>) response[4]; serverDictT2S = (Map<String, Map<String, String>>) response[4];
// output the list of servers and their priority // output the list of servers and their priority

15
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/isc/SendISCDialog.java
View file

@ -65,6 +65,7 @@ import com.raytheon.viz.ui.widgets.ToggleSelectList;
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* 08/20/09 1995 lvenable Initial creation * 08/20/09 1995 lvenable Initial creation
* 09/02/09 #1370 randerso Make the same as PublishDialog * 09/02/09 #1370 randerso Make the same as PublishDialog
* 10/26/2012 1287 rferrel Code cleanup for non-blocking dialog.
* *
* </pre> * </pre>
* *
@ -73,9 +74,9 @@ import com.raytheon.viz.ui.widgets.ToggleSelectList;
*/ */
public class SendISCDialog extends CaveJFACEDialog { public class SendISCDialog extends CaveJFACEDialog {
private static final int MAX_LIST_HEIGHT = 10; private final int MAX_LIST_HEIGHT = 10;
private static final PythonPreferenceStore prefs = Activator.getDefault() private final PythonPreferenceStore prefs = Activator.getDefault()
.getPreferenceStore(); .getPreferenceStore();
private DataManager dataManager; private DataManager dataManager;
@ -284,16 +285,6 @@ public class SendISCDialog extends CaveJFACEDialog {
} }
} }
// Sort the user defined WEList in the GFEConfig file if it
// exists
String[] weGroupList = prefs.getStringArray("WEList");
if (weGroupList != null) {
// orderedSort = OrderedSort.OrderedSort(weGroupList);
// filtGroupInv.sort(orderedSort.compare);
//
// Collections.sort
}
Menu menu = new Menu(getShell(), SWT.POP_UP); Menu menu = new Menu(getShell(), SWT.POP_UP);
for (String group : filtGroupInv) { for (String group : filtGroupInv) {
MenuItem item = new MenuItem(menu, SWT.PUSH); MenuItem item = new MenuItem(menu, SWT.PUSH);

21
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/CheckPermissions.java
View file

@ -21,6 +21,7 @@ package com.raytheon.viz.gfe.dialogs.sbu;
import com.raytheon.uf.common.auth.user.IUser; import com.raytheon.uf.common.auth.user.IUser;
import com.raytheon.uf.common.dataplugin.gfe.request.CheckPermissionsRequest; import com.raytheon.uf.common.dataplugin.gfe.request.CheckPermissionsRequest;
import com.raytheon.uf.common.dataplugin.gfe.request.NcCheckRequest;
import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse; import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
import com.raytheon.uf.common.site.requests.GetPrimarySiteRequest; import com.raytheon.uf.common.site.requests.GetPrimarySiteRequest;
import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.IUFStatusHandler;
@ -40,6 +41,7 @@ import com.raytheon.uf.viz.core.requests.ThriftClient;
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Aug 11, 2011 bphillip Initial creation * Aug 11, 2011 bphillip Initial creation
* Nov 14, 2012 jdynina Added check for national center
* *
* </pre> * </pre>
* *
@ -71,6 +73,25 @@ public class CheckPermissions {
} }
return authorized; return authorized;
} }
@SuppressWarnings("unchecked")
public static boolean isNationalCenter() {
boolean isNationalCenter = false;
NcCheckRequest request = new NcCheckRequest();
try {
ServerResponse<String> obj = (ServerResponse<String>) ThriftClient
.sendRequest(request);
if (obj.isOkay()) {
isNationalCenter = true;
} else {
isNationalCenter = false;
}
} catch (VizException e) {
statusHandler.error("Error checking site type!", e);
isNationalCenter = false;
}
return isNationalCenter;
}
public static boolean runningAsPrimary() { public static boolean runningAsPrimary() {
boolean isPrimary = false; boolean isPrimary = false;

9
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
View file

@ -88,8 +88,9 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Aug 4, 2011 randerso Initial creation * Aug 4, 2011 randerso Initial creation
* Sep 19, 2011 10955 rferrel Use RunProcess * Sep 19,2011 10955 rferrel Use RunProcess
* Oct 25, 2012 1287 rferrel Code clean up for non-blocking dialog. * Oct 25, 2012 1287 rferrel Code clean up for non-blocking dialog.
* Nov 15,2012 15614 jdynina Added check for national center
* *
* </pre> * </pre>
* *
@ -155,6 +156,8 @@ public class ServiceBackupDlg extends CaveJFACEDialog {
private Job updateJob; private Job updateJob;
private boolean authorized; private boolean authorized;
private boolean nationalCenter;
private SVCBU_OP currentOperation = SVCBU_OP.no_backup; private SVCBU_OP currentOperation = SVCBU_OP.no_backup;
@ -165,6 +168,7 @@ public class ServiceBackupDlg extends CaveJFACEDialog {
super(parentShell); super(parentShell);
authorized = CheckPermissions.getAuthorization(); authorized = CheckPermissions.getAuthorization();
this.site = LocalizationManager.getInstance().getCurrentSite(); this.site = LocalizationManager.getInstance().getCurrentSite();
this.nationalCenter = CheckPermissions.isNationalCenter();
this.runningAsPrimary = CheckPermissions.runningAsPrimary(); this.runningAsPrimary = CheckPermissions.runningAsPrimary();
if (!ServiceBackupJobManager.getInstance().isRunning()) { if (!ServiceBackupJobManager.getInstance().isRunning()) {
ServiceBackupJobManager.getInstance().start(); ServiceBackupJobManager.getInstance().start();
@ -1199,8 +1203,7 @@ public class ServiceBackupDlg extends CaveJFACEDialog {
+ UserController.getUserObject().uniqueId()); + UserController.getUserObject().uniqueId());
} }
if ((!runningAsPrimary) if ((!runningAsPrimary) & (!nationalCenter)) {
&& (!LocalizationManager.getInstance().isNationalCenter())) {
doExCon.setEnabled(false); doExCon.setEnabled(false);
} }
} }

36
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/menu/ISCMenuEnabler.java
View file

@ -44,6 +44,8 @@ import com.raytheon.viz.gfe.dialogs.isc.SendISCDialog;
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Jun 20, 2011 bphillip Initial creation * Jun 20, 2011 bphillip Initial creation
* Oct 25, 2012 1287 rferrel Changes for non-blocking SendISCDialog
* and ISCRequestReplyDlg.
* *
* </pre> * </pre>
* *
@ -52,6 +54,9 @@ import com.raytheon.viz.gfe.dialogs.isc.SendISCDialog;
*/ */
public class ISCMenuEnabler extends CompoundContributionItem { public class ISCMenuEnabler extends CompoundContributionItem {
private SendISCDialog sendISCDlg;
private ISCRequestReplyDlg iscRequestDlg;
/* /*
* (non-Javadoc) * (non-Javadoc)
@ -61,7 +66,6 @@ public class ISCMenuEnabler extends CompoundContributionItem {
*/ */
@Override @Override
protected IContributionItem[] getContributionItems() { protected IContributionItem[] getContributionItems() {
ActionContributionItem sendIntersiteItem = new ActionContributionItem( ActionContributionItem sendIntersiteItem = new ActionContributionItem(
new Action("Send Intersite Grids") { new Action("Send Intersite Grids") {
public void run() { public void run() {
@ -69,10 +73,17 @@ public class ISCMenuEnabler extends CompoundContributionItem {
.getActiveWorkbenchWindow().getShell(); .getActiveWorkbenchWindow().getShell();
DataManager dm = DataManager.getCurrentInstance(); DataManager dm = DataManager.getCurrentInstance();
if (dm != null) { if (dm == null) {
SendISCDialog dialog = new SendISCDialog(shell, dm); return;
dialog.setBlockOnOpen(true); }
dialog.open();
if (sendISCDlg == null || sendISCDlg.getShell() == null
|| sendISCDlg.isDisposed()) {
sendISCDlg = new SendISCDialog(shell, dm);
sendISCDlg.setBlockOnOpen(false);
sendISCDlg.open();
} else {
sendISCDlg.bringToTop();
} }
} }
@ -108,11 +119,16 @@ public class ISCMenuEnabler extends CompoundContributionItem {
@Override @Override
public void run() { public void run() {
Shell shell = PlatformUI.getWorkbench() if (iscRequestDlg == null
.getActiveWorkbenchWindow().getShell(); || iscRequestDlg.getShell() == null
ISCRequestReplyDlg dialog = new ISCRequestReplyDlg( || iscRequestDlg.isDisposed()) {
shell); Shell shell = PlatformUI.getWorkbench()
dialog.open(); .getActiveWorkbenchWindow().getShell();
iscRequestDlg = new ISCRequestReplyDlg(shell);
iscRequestDlg.open();
} else {
iscRequestDlg.bringToTop();
}
} }
}); });

2
cave/com.raytheon.viz.hydro/localization/menus/hydro/baseHPCStation.xml
View file

@ -24,7 +24,7 @@
menuText="MaxT/MinT" id="HPCmaxTminT" > menuText="MaxT/MinT" id="HPCmaxTminT" >
<substitute key="model" value="HPC"/> <substitute key="model" value="HPC"/>
<substitute key="plotModel" value="bufrmos/maxmin.svg"/> <substitute key="plotModel" value="bufrmos/maxmin.svg"/>
<substitute key="title" value="HPC MaxT/MinT"/> <substitute key="title" value="HPC MaxT/MinT ( F )"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml" <contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml"
menuText="POP 24hr" id="HPCpop24hr" > menuText="POP 24hr" id="HPCpop24hr" >

16
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/AddModifyLocationDlg.java
View file

@ -77,6 +77,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
* case in Location box. * case in Location box.
* 10 May 2011 9309 djingtao the elevation fields should be defaults as 0.0 when user * 10 May 2011 9309 djingtao the elevation fields should be defaults as 0.0 when user
* wipe out the field (e.g. blank) * wipe out the field (e.g. blank)
* 26 Nov 2012 15440 lbousaidi display lat/lon in the GUI in decimal degrees
* *
* *
* </pre> * </pre>
@ -817,7 +818,7 @@ public class AddModifyLocationDlg extends CaveSWTDialog implements
Group stationGroup = new Group(parentComp, SWT.NONE); Group stationGroup = new Group(parentComp, SWT.NONE);
stationGroup.setLayout(new GridLayout(3, false)); stationGroup.setLayout(new GridLayout(3, false));
stationGroup.setLayoutData(gd); stationGroup.setLayoutData(gd);
stationGroup.setText(" Station Characteritics (View-Only) "); stationGroup.setText(" Station Characteristics (View-Only) ");
// ----------------------------------------------- // -----------------------------------------------
// Create Station Type controls // Create Station Type controls
@ -1322,13 +1323,12 @@ public class AddModifyLocationDlg extends CaveSWTDialog implements
basinTF.setText(locData.getRiverBasin()); basinTF.setText(locData.getRiverBasin());
// Only Display Lat/Lon if not missing // Only Display Lat/Lon if not missing
latTF.setText((locData.getLatitude() != HydroConstants.MISSING_VALUE) ? GeoUtil
.getInstance().cvt_latlon_from_double(locData.getLatitude()) latTF.setText((locData.getLatitude() != HydroConstants.MISSING_VALUE) ?
: ""); String.valueOf(locData.getLatitude()): "");
lonTF.setText((locData.getLongitude() != HydroConstants.MISSING_VALUE) ? GeoUtil lonTF.setText((locData.getLongitude() != HydroConstants.MISSING_VALUE) ?
.getInstance().cvt_latlon_from_double(locData.getLongitude()) String.valueOf(locData.getLongitude()): "");
: "");
// Only display elevation if it isn't missing, i.e. null in DB // Only display elevation if it isn't missing, i.e. null in DB
elevationTF elevationTF
.setText((locData.getElevation() != HydroConstants.MISSING_VALUE) ? String .setText((locData.getElevation() != HydroConstants.MISSING_VALUE) ? String

4
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/util/GraphicDataUtil.java
View file

@ -50,6 +50,8 @@ import com.vividsolutions.jts.geom.Envelope;
* Jun 04 2012 14710 Xiaochuan The rank value should take * Jun 04 2012 14710 Xiaochuan The rank value should take
* from STRENGTH_RANK instead * from STRENGTH_RANK instead
* of 2D_STRENGTH_RANK. * of 2D_STRENGTH_RANK.
* Nov 09 2012 15586 Xiaochuan In dataRowFormat, set MSI maximum
* size to 5.
* *
* </pre> * </pre>
* *
@ -135,7 +137,7 @@ public class GraphicDataUtil {
RadarDataPoint currPoint = symbologyData.get(key); RadarDataPoint currPoint = symbologyData.get(key);
if (currPoint.isVisible() || !checkVisibility) { if (currPoint.isVisible() || !checkVisibility) {
String dataRowFormat = " %4.4s %7.7s@%3.3s %9.9s %7.7s r%-2.2s %4.4s %8.8s %8.8s %8.8s %8.8s"; String dataRowFormat = " %4.4s %7.7s@%3.3s %9.9s %7.7s r%-2.2s %5.5s %8.8s %8.8s %8.8s %8.8s";
AreaComponent currFeature; AreaComponent currFeature;
HashMap<Integer, HashMap<Integer, GenericDataComponent>> currPointData = currPoint HashMap<Integer, HashMap<Integer, GenericDataComponent>> currPointData = currPoint

2
edexOsgi/com.raytheon.edex.plugin.bufrua/utility/edex_static/base/distribution/bufrua.xml
View file

@ -19,6 +19,6 @@
further_licensing_information. further_licensing_information.
--> -->
<requestPatterns xmlns:ns2="group"> <requestPatterns xmlns:ns2="group">
<regex>^IUSZ[4-9][123468].*</regex> <regex>^IUSZ[0-9][123468].*</regex>
<regex>^IUSY4[123468].*</regex> <regex>^IUSY4[123468].*</regex>
</requestPatterns> </requestPatterns>

8
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
View file

@ -349,6 +349,14 @@
value="com.raytheon.uf.common.dataplugin.gfe.request.CheckPermissionsRequest" /> value="com.raytheon.uf.common.dataplugin.gfe.request.CheckPermissionsRequest" />
<constructor-arg ref="CheckPermissionsRequestHandler" /> <constructor-arg ref="CheckPermissionsRequestHandler" />
</bean> </bean>
<bean id="NcCheckRequestHandler"
class="com.raytheon.edex.plugin.gfe.server.handler.svcbu.NcCheckRequestHandler" />
<bean factory-bean="handlerRegistry" factory-method="register">
<constructor-arg
value="com.raytheon.uf.common.dataplugin.gfe.request.NcCheckRequest" />
<constructor-arg ref="NcCheckRequestHandler" />
</bean>
<bean id="ExportConfRequestHandler" <bean id="ExportConfRequestHandler"
class="com.raytheon.edex.plugin.gfe.server.handler.svcbu.ExportConfRequestHandler" /> class="com.raytheon.edex.plugin.gfe.server.handler.svcbu.ExportConfRequestHandler" />

58
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/svcbu/NcCheckRequestHandler.java Normal file
View file

@ -0,0 +1,58 @@
/**
* This software was developed and / or modified by Raytheon Company,
* pursuant to Contract DG133W-05-CQ-1067 with the US Government.
*
* U.S. EXPORT CONTROLLED TECHNICAL DATA
* This software product contains export-restricted data whose
* export/transfer/disclosure is restricted by U.S. law. Dissemination
* to non-U.S. persons whether in the United States or abroad requires
* an export license or other authorization.
*
* Contractor Name: Raytheon Company
* Contractor Address: 6825 Pine Street, Suite 340
* Mail Stop B8
* Omaha, NE 68106
* 402.291.0100
*
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
package com.raytheon.edex.plugin.gfe.server.handler.svcbu;
import com.raytheon.edex.plugin.gfe.svcbackup.SvcBackupUtil;
import com.raytheon.uf.common.dataplugin.gfe.request.NcCheckRequest;
import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
import com.raytheon.uf.common.serialization.comm.IRequestHandler;
/**
* TODO Add Description
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Nov 14, 2012 jdynina Initial creation
*
* </pre>
*
* @author jdynina
* @version 1.0
*/
public class NcCheckRequestHandler implements IRequestHandler<NcCheckRequest>{
public Object handleRequest(NcCheckRequest request)
throws Exception {
ServerResponse<String> sr = new ServerResponse<String>();
if (!isNationalCenter()) {
sr.addMessage("Site is not a national center.");
}
return sr;
}
public boolean isNationalCenter() {
return SvcBackupUtil.ncCheck();
}
}

11
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
View file

@ -53,6 +53,7 @@ import com.raytheon.uf.edex.core.props.PropertiesFactory;
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Oct 9, 2009 bphillip Initial creation * Oct 9, 2009 bphillip Initial creation
* Sep 19,2011 10955 rferrel make sure process destroy is called. * Sep 19,2011 10955 rferrel make sure process destroy is called.
* Nov 15,2012 15614 jdynina Added check for national center
* *
* </pre> * </pre>
* *
@ -249,9 +250,19 @@ public class SvcBackupUtil {
if (role != null && role.validForUser(user)) { if (role != null && role.validForUser(user)) {
return new AuthorizationResponse(true); return new AuthorizationResponse(true);
} }
return new AuthorizationResponse(false, "User, " + user.uniqueId() return new AuthorizationResponse(false, "User, " + user.uniqueId()
+ ", is not authorized to perform request needing role: " + ", is not authorized to perform request needing role: "
+ roleId); + roleId);
} }
public static boolean ncCheck() {
String nationalCenter = SvcBackupUtil.getSvcBackupProperties()
.getProperty("NATIONAL_CENTER");
if (nationalCenter.equals("1")) {
return true;
}
return false;
}
} }

4
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
View file

@ -47,6 +47,8 @@ import com.raytheon.uf.edex.decodertools.time.TimeTools;
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* 9/22 #1553 mnash Initial implementation of GagePP * 9/22 #1553 mnash Initial implementation of GagePP
* 6/1/09 #2432 jsanchez Updated value magnitude for hourlypp/pc. * 6/1/09 #2432 jsanchez Updated value magnitude for hourlypp/pc.
* 26 Nov 2012 #15554 lbousaidi used obstime instead of system time in isNear12Z
* routine.
* </pre> * </pre>
* *
* @author mnash * @author mnash
@ -621,7 +623,7 @@ public class GagePP {
timeTObs.setTime(yearsec_ansi); timeTObs.setTime(yearsec_ansi);
// Create a 12Z object // Create a 12Z object
Calendar pStructTm = TimeTools.getSystemCalendar(); Calendar pStructTm = TimeTools.newCalendar(yearsec_ansi.getTime());
pStructTm.set(Calendar.HOUR_OF_DAY, 12); pStructTm.set(Calendar.HOUR_OF_DAY, 12);
pStructTm.set(Calendar.MINUTE, 0); pStructTm.set(Calendar.MINUTE, 0);
pStructTm.set(Calendar.SECOND, 0); pStructTm.set(Calendar.SECOND, 0);

2
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GFERecord.java
View file

@ -97,7 +97,7 @@ public class GFERecord extends PluginDataObject {
}; };
/** The name of the parm parameter */ /** The name of the parm parameter */
@Column(length = 32) @Column(length = 100)
@XmlAttribute @XmlAttribute
@DynamicSerializeElement @DynamicSerializeElement
private String parmName; private String parmName;

47
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java Normal file
View file

@ -0,0 +1,47 @@
/**
* This software was developed and / or modified by Raytheon Company,
* pursuant to Contract DG133W-05-CQ-1067 with the US Government.
*
* U.S. EXPORT CONTROLLED TECHNICAL DATA
* This software product contains export-restricted data whose
* export/transfer/disclosure is restricted by U.S. law. Dissemination
* to non-U.S. persons whether in the United States or abroad requires
* an export license or other authorization.
*
* Contractor Name: Raytheon Company
* Contractor Address: 6825 Pine Street, Suite 340
* Mail Stop B8
* Omaha, NE 68106
* 402.291.0100
*
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
package com.raytheon.uf.common.dataplugin.gfe.request;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
/**
* TODO Add Description
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Nov 14, 2012 jdynina Initial creation
*
* </pre>
*
* @author jdynina
* @version 1.0
*/
@DynamicSerialize
public class NcCheckRequest extends AbstractGfeRequest {
public NcCheckRequest() {
}
}

18
edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/process/CompositeReflectivityProduct.java
View file

@ -65,12 +65,14 @@ import com.raytheon.uf.edex.core.EDEXUtil;
* <pre> * <pre>
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ --------- ---------- --------------------------
* 05/07/2009 2037 dhladky Initial Creation. * 05/07/2009 2037 dhladky Initial Creation.
* 02/22/2012 DR14414 mgamazay Added initializing the ScanTableData table * 02/22/2012 DR14414 mgamazay Added initializing the ScanTableData table
* to an empty map if no features are present. * to an empty map if no features are present.
* 09/06/2012 14727 Xiaochuan setIsNew(false) for the storm id should based * 09/06/2012 14727 Xiaochuan setIsNew(false) for the storm id should based
* on FCSTRAN, FCSTDIR values. * on FCSTRAN, FCSTDIR values.
* 11/13/2012 14368 Xiaochuan Required to set alarm time in a quiet time period
* from the last event to new event (new storm come in).
* *
* </pre> * </pre>
* *
@ -216,7 +218,7 @@ public class CompositeReflectivityProduct extends RadarProduct {
if (previousTime == null) { if (previousTime == null) {
previousTime = rec.getDataTime().getRefTime(); previousTime = rec.getDataTime().getRefTime();
} }
if (alarms != null && newIds.size() > 0 && previousTime != null) { if (alarms != null && newIds.size() > 0 && previousTime != null) {
if (((alarms.getCellAlarmTime() * 60 * 1000) <= (rec if (((alarms.getCellAlarmTime() * 60 * 1000) <= (rec
.getDataTime().getRefTime().getTime() - previousTime .getDataTime().getRefTime().getTime() - previousTime
@ -227,8 +229,8 @@ public class CompositeReflectivityProduct extends RadarProduct {
alarmString.append("NEW cell for " + filter.icao alarmString.append("NEW cell for " + filter.icao
+ " over the last " + alarms.getCellAlarmTime() + " over the last " + alarms.getCellAlarmTime()
+ " minutes."); + " minutes.");
previousTime = rec.getDataTime().getRefTime();
} }
previousTime = rec.getDataTime().getRefTime();
} }
// add new rows last // add new rows last
for (String id : newIds) { for (String id : newIds) {

12
edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/process/DigitalMesoCycloneTabularProduct.java
View file

@ -55,8 +55,11 @@ import com.raytheon.uf.edex.core.EDEXUtil;
* <pre> * <pre>
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ -------- ---------- --------------------------
* 05/07/2009 2037 dhladky Initial Creation. * 05/07/2009 2037 dhladky Initial Creation.
* 11/13/2012 14368 Xiaochuan Required to set alarm time in a quiet time period
* from the last event to new event (new storm come in).
*
* *
* </pre> * </pre>
* *
@ -144,13 +147,12 @@ public class DigitalMesoCycloneTabularProduct extends RadarProduct {
} else { } else {
for (String fid : getDeletions(dmdKeys, table)) { for (String fid : getDeletions(dmdKeys, table)) {
table.removeRow(fid); table.removeRow(fid);
// System.out.println("Removed DMD fid: " + fid);
} }
for (String fid : getUpdates(dmdKeys, table)) { for (String fid : getUpdates(dmdKeys, table)) {
table.updateRow(fid, table.updateRow(fid,
write(table.getRow(fid), rec, fid)); write(table.getRow(fid), rec, fid));
// System.out.println("Updating DMD fid: " + fid);
} }
} }
} }
@ -173,8 +175,8 @@ public class DigitalMesoCycloneTabularProduct extends RadarProduct {
alarmString.append("NEW DMDcirculation for " alarmString.append("NEW DMDcirculation for "
+ filter.icao + " over the last " + filter.icao + " over the last "
+ alarms.getDmdAlarmTime() + " minutes."); + alarms.getDmdAlarmTime() + " minutes.");
previousTime = rec.getDataTime().getRefTime();
} }
previousTime = rec.getDataTime().getRefTime();
} }
for (String fid : newIds) { for (String fid : newIds) {

19
edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/process/MesoCycloneTabularProduct.java
View file

@ -55,13 +55,14 @@ import com.vividsolutions.jts.geom.Coordinate;
* <pre> * <pre>
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ -------- ----------- --------------------------
* 05/07/2009 2037 dhladky Initial Creation. * 05/07/2009 2037 dhladky Initial Creation.
* 02/23/2012 14536 Xiaochuan Add method getIdsFromGraphicBlock() to * 02/23/2012 14536 Xiaochuan Add method getIdsFromGraphicBlock() to
* hold the ids that have the same order * hold the ids that have the same order
* as the ids in source file. * as the ids in source file.
* * 11/13/2012 14368 Xiaochuan Required to set alarm time in a quiet time period
* * from the last event to new event (new storm come in).
*
* </pre> * </pre>
* *
* @author dhladky * @author dhladky
@ -132,12 +133,12 @@ public class MesoCycloneTabularProduct extends RadarProduct {
+ " over the last " + alarms.getMesoAlarmTime() + " over the last " + alarms.getMesoAlarmTime()
+ " minutes."); + " minutes.");
previousTime = rec.getDataTime().getRefTime();
EDEXUtil.sendMessageAlertViz(Priority.SIGNIFICANT, EDEXUtil.sendMessageAlertViz(Priority.SIGNIFICANT,
RadarConstants.PLUGIN_ID, SCAN, "RADAR", RadarConstants.PLUGIN_ID, SCAN, "RADAR",
alarmString.toString(), null, null); alarmString.toString(), null, null);
} }
previousTime = rec.getDataTime().getRefTime();
} }
} }

10
edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/process/TVSTabularProduct.java
View file

@ -49,8 +49,10 @@ import com.raytheon.uf.edex.core.EDEXUtil;
* <pre> * <pre>
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ -------- ---------- --------------------------
* 05/07/2009 2037 dhladky Initial Creation. * 05/07/2009 2037 dhladky Initial Creation.
* 11/13/2012 14368 Xiaochuan Required to set alarm time in a quiet time period
* from the last event to new event (new storm come in).
* *
* </pre> * </pre>
* *
@ -138,9 +140,9 @@ public class TVSTabularProduct extends RadarProduct {
EDEXUtil.sendMessageAlertViz(Priority.CRITICAL, EDEXUtil.sendMessageAlertViz(Priority.CRITICAL,
RadarConstants.PLUGIN_ID, SCAN, "RADAR", RadarConstants.PLUGIN_ID, SCAN, "RADAR",
alarmString.toString(), null, null); alarmString.toString(), null, null);
previousTime = rec.getDataTime().getRefTime();
} }
previousTime = rec.getDataTime().getRefTime();
} }
} }

49
edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/export_grids
View file

@ -118,13 +118,18 @@ perform_export() {
#check if the netcdf file is there;if not,exit #check if the netcdf file is there;if not,exit
if [ $? -ne 0 ] if [ $? -ne 0 ]
then then
$LOGGER "ifpnetCDF failed. Export exits."
rm -f ${lockFile}
$LOGGER 100
NETCDF_SUCCESS=0 NETCDF_SUCCESS=0
if [ $NATIONAL_CENTER != 1 ] && [ "$1" != "-c" ] if [ $NATIONAL_CENTER != 1 ] && [ "$1" != "-c" ]
then then
exit 1 netcdf_error=`grep "Some of the requested time ranges are not in the inventory" $logfile`
if [ "$netcdf_error" != "" ]; then
NETCDF_SUCCESS=1
else
$LOGGER "ifpnetCDF failed. Export exits."
rm -f ${lockFile}
$LOGGER 100
exit 1
fi
fi fi
fi fi
else else
@ -136,13 +141,18 @@ perform_export() {
#check if the netcdf file is there;if not,exit #check if the netcdf file is there;if not,exit
if [ $? -ne 0 ] if [ $? -ne 0 ]
then then
$LOGGER "ifpnetCDF failed. Export exits."
rm -f ${lockFile}
$LOGGER 100
NETCDF_SUCCESS=0 NETCDF_SUCCESS=0
if [ $NATIONAL_CENTER != 1 ] && [ "$1" != "-c" ] if [ $NATIONAL_CENTER != 1 ] && [ "$1" != "-c" ]
then then
exit 1 netcdf_error=`grep "Some of the requested time ranges are not in the inventory" $logfile`
if [ "$netcdf_error" != "" ]; then
NETCDF_SUCCESS=1
else
$LOGGER "ifpnetCDF failed. Export exits."
rm -f ${lockFile}
$LOGGER 100
exit 1
fi
fi fi
fi fi
fi fi
@ -153,14 +163,19 @@ perform_export() {
#check if the netcdf file is there;if not,exit before we call msg_send #check if the netcdf file is there;if not,exit before we call msg_send
if [ $? -ne 0 ] if [ $? -ne 0 ]
then then
$LOGGER ifpnetCDF failed. NETCDF_SUCCESS=0
rm -f ${lockFile} if [ $NATIONAL_CENTER != 1 ] && [ "$1" != "-c" ]
$LOGGER 100 then
NETCDF_SUCCESS=0 netcdf_error=`grep "Some of the requested time ranges are not in the inventory" $logfile`
if [ $NATIONAL_CENTER != 1 ] && [ "$1" != "-c" ] if [ "$netcdf_error" != "" ]; then
then NETCDF_SUCCESS=1
exit 1 else
fi $LOGGER "ifpnetCDF failed."
rm -f ${lockFile}
$LOGGER 100
exit 1
fi
fi
fi fi
fi fi

2
rpms/awips2.core/Installer.ldm/component.spec
View file

@ -5,7 +5,7 @@
Name: awips2-ldm Name: awips2-ldm
Summary: AWIPS II LDM Distribution Summary: AWIPS II LDM Distribution
Version: 6.8.1 Version: 6.8.1
Release: 25 Release: 26
Group: AWIPSII Group: AWIPSII
BuildRoot: /tmp BuildRoot: /tmp
URL: N/A URL: N/A

1
rpms/awips2.core/Installer.ldm/patch/etc/ldmd.conf.gum
View file

@ -135,6 +135,7 @@ ALLOW NIMAGE ^.* .* TIT[EQ].*
ALLOW HDS ^.* .* [IJ]UTX0[0-689].*|JUSX4[0-689].* ALLOW HDS ^.* .* [IJ]UTX0[0-689].*|JUSX4[0-689].*
ALLOW EXP ^.* .* ALLOW EXP ^.* .*
ALLOW IDS|DDPLUS ^.* .* SXUS2[03-9].KWOH|SXUS[3-9].KWOH|SXUS8[0-3].KWOH|SRUS[2-8].KWOH ALLOW IDS|DDPLUS ^.* .* SXUS2[03-9].KWOH|SXUS[3-9].KWOH|SXUS8[0-3].KWOH|SRUS[2-8].KWOH
ALLOW NOTHER ^.* .*
# #
# Give permission to the Unidata Program Center # Give permission to the Unidata Program Center
ALLOW ANY ^[a-z].*\.unidata\.ucar\.edu\.?$ .* ALLOW ANY ^[a-z].*\.unidata\.ucar\.edu\.?$ .*

1
rpms/awips2.core/Installer.ldm/patch/etc/ldmd.conf.hfo
View file

@ -135,6 +135,7 @@ ALLOW NIMAGE ^.* .* TIT[EQ].*
ALLOW HDS ^.* .* [IJ]UTX0[0-689].*|JUSX4[0-689].* ALLOW HDS ^.* .* [IJ]UTX0[0-689].*|JUSX4[0-689].*
ALLOW EXP ^.* .* ALLOW EXP ^.* .*
ALLOW IDS|DDPLUS ^.* .* SXUS2[03-9].KWOH|SXUS[3-9].KWOH|SXUS8[0-3].KWOH|SRUS[2-8].KWOH ALLOW IDS|DDPLUS ^.* .* SXUS2[03-9].KWOH|SXUS[3-9].KWOH|SXUS8[0-3].KWOH|SRUS[2-8].KWOH
ALLOW NOTHER ^.* .*
# #
# Give permission to the Unidata Program Center # Give permission to the Unidata Program Center
ALLOW ANY ^[a-z].*\.unidata\.ucar\.edu\.?$ .* ALLOW ANY ^[a-z].*\.unidata\.ucar\.edu\.?$ .*

1
rpms/awips2.core/Installer.ldm/patch/etc/ldmd.conf.pbp
View file

@ -135,6 +135,7 @@ ALLOW NIMAGE ^.* .* TIT[EQ].*
ALLOW HDS ^.* .* [IJ]UTX0[0-689].*|JUSX4[0-689].* ALLOW HDS ^.* .* [IJ]UTX0[0-689].*|JUSX4[0-689].*
ALLOW EXP ^.* .* ALLOW EXP ^.* .*
ALLOW IDS|DDPLUS ^.* .* SXUS2[03-9].KWOH|SXUS[3-9].KWOH|SXUS8[0-3].KWOH|SRUS[2-8].KWOH ALLOW IDS|DDPLUS ^.* .* SXUS2[03-9].KWOH|SXUS[3-9].KWOH|SXUS8[0-3].KWOH|SRUS[2-8].KWOH
ALLOW NOTHER ^.* .*
# #
# Give permission to the Unidata Program Center # Give permission to the Unidata Program Center
ALLOW ANY ^[a-z].*\.unidata\.ucar\.edu\.?$ .* ALLOW ANY ^[a-z].*\.unidata\.ucar\.edu\.?$ .*

2
rpms/awips2.core/Installer.ldm/patch/etc/ldmd.conf.vrh
View file

@ -142,6 +142,8 @@ ALLOW EXP ^.* .*
ALLOW IDS|DDPLUS ^.* .* SXUS2[03-9].KWOH|SXUS[3-9].KWOH|SXUS8[0-3].KWOH|SRUS[2-8].KWOH ALLOW IDS|DDPLUS ^.* .* SXUS2[03-9].KWOH|SXUS[3-9].KWOH|SXUS8[0-3].KWOH|SRUS[2-8].KWOH
ALLOW NOTHER ^.* .*
# #
# Give permission to the Unidata Program Center # Give permission to the Unidata Program Center
ALLOW ANY ^[a-z].*\.unidata\.ucar\.edu\.?$ .* ALLOW ANY ^[a-z].*\.unidata\.ucar\.edu\.?$ .*

30
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
View file

@ -164,15 +164,17 @@ HDS ^(YVW[ABCDGJM][0-9][0-9]) KKCI (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/
FILE -overwrite -log -close -edex /data_store/\5/(\2:yyyy)(\2:mm)\2/\3/\6/GRID\7/\9Z_\(10)_\(11)-\1_KKCI_\2\3\4_(seq).\5.%Y%m%d%H FILE -overwrite -log -close -edex /data_store/\5/(\2:yyyy)(\2:mm)\2/\3/\6/GRID\7/\9Z_\(10)_\(11)-\1_KKCI_\2\3\4_(seq).\5.%Y%m%d%H
# AWIPS1: GRID ^[LM].[ABDHMNRSTU].*KWB.* /Grid/SBN/rawGrib2 # AWIPS1: GRID ^[LM].[ABDHMNRSTU].*KWB.* /Grid/SBN/rawGrib2
# AWIPS1 OCONUS: GRID ^[LM].[ABCDGHMNORSTUVX].*KWB.* /Grid/SBN/rawGrib2
# LTHO70 KWBC 011800 !grib2/ncep/GFS/#213/201102011800F120/TMPK/700 hPa PRES # LTHO70 KWBC 011800 !grib2/ncep/GFS/#213/201102011800F120/TMPK/700 hPa PRES
NGRID ^([LM].[ABDHMNRSTU].{1,3}) (KWB.) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) NGRID ^([LM].[ABCDGHMNORSTUVX].{1,3}) (KWB.) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*)
FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H
# MosGuidance, perhaps others? # MosGuidance, perhaps others?
# LVUC00 KWBQ 271200 !grib2/ncep/GFS/#197/FHRS//LVL # LVUC00 KWBQ 271200 !grib2/ncep/GFS/#197/FHRS//LVL
# Maint : fixed pattern at F... # Maint : fixed pattern at F...
HDS ^([LM].[ABDHMNRSTU].{1,3}) (KWB.) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) # OCONUS: Added CEFG
HDS ^([LM].[ABCDEFGHMNRSTU].{1,3}) (KWB.) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*)
FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H
# AWIPS1: GRID ^[LM].[MN].98.*KWNH /Grid/SBN/rawGrib2 # AWIPS1: GRID ^[LM].[MN].98.*KWNH /Grid/SBN/rawGrib2
@ -183,9 +185,15 @@ NGRID ^([LM].[MN].98) (KWNH) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]
HDS ^([LM].[MN].98) (KWNH) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) HDS ^([LM].[MN].98) (KWNH) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*)
FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H
# AWIPS1 OCONUS: GRID ^L.R....*KWNH /Grid/SBN/rawGrib2
NGRID ^(L.R...) (KWNH) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*)
FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H
# AWIPS1: GRID ^[LM].E.*KWBD* /Grid/SBN/rawGrib2 # AWIPS1: GRID ^[LM].E.*KWBD* /Grid/SBN/rawGrib2
# AWIPS1 OCONUS: GRID ^[LM].[EF].*KWBD* /Grid/SBN/rawGrib2
# MUEU98 KWBD 020600 !grib2/ncep/DGEX_115/#185/201102020600F090/UREL/10 m HGHT # MUEU98 KWBD 020600 !grib2/ncep/DGEX_115/#185/201102020600F090/UREL/10 m HGHT
NGRID ^([LM].E.{1,3}) (KWBD) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) NGRID ^([LM].[EF].{1,3}) (KWBD) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*)
FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H
# AWIPS1: GRID ^L.U.*KWBN* /Grid/SBN/rawGrib2 # AWIPS1: GRID ^L.U.*KWBN* /Grid/SBN/rawGrib2
@ -251,15 +259,17 @@ EXP (.*ecmwf_decrypted.*)
FILE -overwrite -log -close -edex \1 FILE -overwrite -log -close -edex \1
# AWIPS1: GRID ^E.[ABCGHI].*KWBJ /Grid/SBN/rawGrib2 # AWIPS1: GRID ^E.[ABCGHI].*KWBJ /Grid/SBN/rawGrib2
# AWIPS1 OCONUS: GRID ^E.[ABCDEFGHI].*KWBJ /Grid/SBN/rawGrib2
# EWAW88 KWBJ 021200 !grib2/ncep/GMGWM/#255/201102021200F180/WSTP/0 - NONE # EWAW88 KWBJ 021200 !grib2/ncep/GMGWM/#255/201102021200F180/WSTP/0 - NONE
NGRID ^(E.[ABCGHI].{1,3}) (KWBJ) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) NGRID ^(E.[ABCDEFGHI].{1,3}) (KWBJ) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*)
FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H
# AWIPS1: GRID ^[LM].[AB].*KWBS* /Grid/SBN/rawGrib2 # AWIPS1: GRID ^[LM].[AB].*KWBS* /Grid/SBN/rawGrib2
# AWIPS1 OCONUS: GRID ^[LM].[ABCDE].*KWBS* /Grid/SBN/rawGrib2
# LMDA98 KWBS 160000 !grib2/ncep/WRF_EM/#130/201012160000F000/WXTZ/0 - NONE # LMDA98 KWBS 160000 !grib2/ncep/WRF_EM/#130/201012160000F000/WXTZ/0 - NONE
ANY ^([LM].[AB].{1,3}) (KWBS) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) ANY ^([LM].[ABCDE].{1,3}) (KWBS) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*)
FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H
# AWIPS1: GRID ^LGXT[0-2][0-9].*KNHC /Grid/SBN/rawGrib2 # AWIPS1: GRID ^LGXT[0-2][0-9].*KNHC /Grid/SBN/rawGrib2
@ -302,11 +312,12 @@ HDS ^(IUPT0[1-4]|IUPT40|IUAK01) (.{4}) (..)(..)(..)
FILE -overwrite -log -close -edex /data_store/profiler/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).bufr.%Y%m%d%H FILE -overwrite -log -close -edex /data_store/profiler/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).bufr.%Y%m%d%H
# AWIPS1: POINT ^IUSZ[4-9][0-9].* /ispan/bufr/raob # AWIPS1: POINT ^IUSZ[4-9][0-9].* /ispan/bufr/raob
# AWIPS1 OCONUS: POINT ^IUSZ[0-9][0-9].* /ispan/bufr/raob
# IUSZ53 KWBC 020205 # IUSZ53 KWBC 020205
# AWIPS1: POINT ^IUSY[4][0-9].* /ispan/bufr/raob # AWIPS1: POINT ^IUSY[4][0-9].* /ispan/bufr/raob
# IUSY41 KWBC 020030 # IUSY41 KWBC 020030
HDS ^(IUS(Z[4-9]|Y4)[0-9]) ([A-Z]{4}) (..)(..)(..) HDS ^(IUS(Z[0-9]|Y4)[0-9]) ([A-Z]{4}) (..)(..)(..)
FILE -overwrite -log -close -edex /data_store/bufrua/(\4:yyyy)(\4:mm)\4/\5/\1_\3_\4\5\6_(seq).bufr.%Y%m%d%H FILE -overwrite -log -close -edex /data_store/bufrua/(\4:yyyy)(\4:mm)\4/\5/\1_\3_\4\5\6_(seq).bufr.%Y%m%d%H
# AWIPS1: TEXT ^SFUS41.* /ispan/binLightning # AWIPS1: TEXT ^SFUS41.* /ispan/binLightning
@ -545,8 +556,9 @@ IDS|DDPLUS ^(W[CSV]PN0[1-6]) (KKCI) (..)(..)(..)
# JSML30 KWNO 021800 # JSML30 KWNO 021800
# AWIPS1: POINT ^JSMF1[1-6].KWNO.* /ispan/bufr/GFSLAMP # AWIPS1: POINT ^JSMF1[1-6].KWNO.* /ispan/bufr/GFSLAMP
# AWIPS1 OCONUS: POINT ^JSMF1[0-7].KWNO.* /ispan/bufr/GFSLAMP
# JSMF12 KWNO 022200 # JSMF12 KWNO 022200
HDS ^(JSM([TL]..|F1[1-6])) (....) (..)(..)(..) HDS ^(JSM([TL]..|F1[0-7])) (....) (..)(..)(..)
FILE -overwrite -log -close -edex /data_store/bufrmos/(\4:yyyy)(\4:mm)\4/\5/\1_\3_\4\5\6_(seq).bufr.%Y%m%d%H FILE -overwrite -log -close -edex /data_store/bufrmos/(\4:yyyy)(\4:mm)\4/\5/\1_\3_\4\5\6_(seq).bufr.%Y%m%d%H
# AWIPS1: POINT ^IUAX0[12].* /ispan/bufr/acars # AWIPS1: POINT ^IUAX0[12].* /ispan/bufr/acars
@ -625,3 +637,7 @@ HDS ^(JSXX(0[1-9]|10)) (.{4}) (..)(..)(..)
# AWIPS2 distribution file bufrmthdw.xml: ^JUTX(([2-4]1)|53).* # AWIPS2 distribution file bufrmthdw.xml: ^JUTX(([2-4]1)|53).*
HDS ^(JUTX(([2-4]1)|53)) (.{4}) (..)(..)(..) HDS ^(JUTX(([2-4]1)|53)) (.{4}) (..)(..)(..)
FILE -overwrite -log -close -edex /data_store/bufrmthdw/(\5:yyyy)(\5:mm)\5/\6/\1_\4_\5\6\7_(seq).bufr.%Y%m%d%H FILE -overwrite -log -close -edex /data_store/bufrmthdw/(\5:yyyy)(\5:mm)\5/\6/\1_\4_\5\6\7_(seq).bufr.%Y%m%d%H
# New NPP/VIIRS data
NOTHER ^(TIP...) (KNES) (..)(..)(..)
FILE -overwrite -log -close -edex /data_store/sat/%Y%m\(3)/\(4)/VIIRS/\1_\2_\3\4\5_(seq).%Y%m%d