diff --git a/RadarServer/build.rcm/build.xml b/RadarServer/build.rcm/build.xml index 41a367fc02..cf06797a46 100644 --- a/RadarServer/build.rcm/build.xml +++ b/RadarServer/build.rcm/build.xml @@ -22,175 +22,180 @@ ]> - - &substitute-targets; + + &substitute-targets; - - Builds a deployment of the RCM for packaging - + + Builds a deployment of the RCM for packaging + - - + + - - - + + + - - + + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - + + - - - - - - + + + + + + - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - \ No newline at end of file + + + + diff --git a/RadarServer/build.rcm/customTargets.xml b/RadarServer/build.rcm/customTargets.xml index a139f30981..6ab11e7ec0 100644 --- a/RadarServer/build.rcm/customTargets.xml +++ b/RadarServer/build.rcm/customTargets.xml @@ -80,6 +80,9 @@ + + + diff --git a/RadarServer/build.rcm/lib/slf4j-log4j12-1.7.5.jar b/RadarServer/build.rcm/lib/slf4j-log4j12-1.7.5.jar new file mode 100644 index 0000000000..afce5c21f1 Binary files /dev/null and b/RadarServer/build.rcm/lib/slf4j-log4j12-1.7.5.jar differ diff --git a/cave/build/alertviz/customTargets.xml b/cave/build/alertviz/customTargets.xml index 36655dac31..3d836a9565 100644 --- a/cave/build/alertviz/customTargets.xml +++ b/cave/build/alertviz/customTargets.xml @@ -112,6 +112,10 @@ + + + + diff --git a/cave/build/p2-build.xml b/cave/build/p2-build.xml index f33b5d2b33..b32ed5abe2 100644 --- a/cave/build/p2-build.xml +++ b/cave/build/p2-build.xml @@ -119,6 +119,12 @@ + + + + + diff --git a/cave/build/static/common/cave/etc/gfe/userPython/utilities/CombinationsInterface.py b/cave/build/static/common/cave/etc/gfe/userPython/utilities/CombinationsInterface.py index f7cebeb983..fcc8c8ab4f 100644 --- a/cave/build/static/common/cave/etc/gfe/userPython/utilities/CombinationsInterface.py +++ b/cave/build/static/common/cave/etc/gfe/userPython/utilities/CombinationsInterface.py @@ -28,39 +28,24 @@ # Date Ticket# Engineer Description # ------------ ---------- ----------- -------------------------- # 07/25/08 njensen Initial Creation. -# 09/05/13 #2329 randerso Added error handling +# # # -import sys, traceback, os, time, LogStream +import sys from java.util import ArrayList def getCombinations(comboName): - try: - outercombos = ArrayList() - md = __import__(comboName) - comList = md.Combinations - for i in comList: - combos = ArrayList() - innerList = i[0] - for zone in innerList: - combos.add(zone) - outercombos.add(combos) - return outercombos - - except AttributeError as e: - filename = md.__file__ - if filename.endswith("pyc") or filename.endswith("pyo"): - filename = filename[:-1] - with open(filename,'r') as fd: - filecontents = fd.read() - - LogStream.logProblem("\nERROR loading combinations file: "+ comboName + - "\nmd.__file__: " + md.__file__ + - "\ndir(md): " + str(dir(md)) + - "\n" + md.__file__ + " last modified: " + time.strftime("%Y-%m-%d %H:%M:%S",time.gmtime(os.path.getmtime(md.__file__))) + - "\n" + filename + " last modified: " + time.strftime("%Y-%m-%d %H:%M:%S",time.gmtime(os.path.getmtime(filename))) + - "\nContents of " + filename + "\n" + filecontents) - raise e + outercombos = ArrayList() + cmd = "md = __import__(\"" + comboName + "\")" + exec cmd + comList = md.Combinations + for i in comList: + combos = ArrayList() + innerList = i[0] + for zone in innerList: + combos.add(zone) + outercombos.add(combos) + return outercombos diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-470mb_rh_rs_t_700_vv.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-470mb_rh_rs_t_700_vv.attr index 9669048933..3e7cca1dfa 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-470mb_rh_rs_t_700_vv.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-470mb_rh_rs_t_700_vv.attr @@ -22,7 +22,6 @@ FINT=50;70;90 FLINE=0;24;23;22 HILO=0 HLSYM=0 -CLRBAR=1 WIND= TITLE=1/-1/~ 1000-470 MB RH, TEMP (BL yel,850 red), 700 Omega!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-470mb_rh_rs_t_700mb_vv.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-470mb_rh_rs_t_700mb_vv.attr index 272221dc47..f0b826e0b2 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-470mb_rh_rs_t_700mb_vv.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-470mb_rh_rs_t_700mb_vv.attr @@ -20,7 +20,6 @@ FINT=50;70;90 FLINE=0;24;23;22 HILO=0 HLSYM=0 -CLRBAR=1 WIND= TITLE=1/-1/~ 1000-440 MB RH, TEMP (BL yel,850 red), 700 Omega!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-470mb_rh_rs_t_700mb_vv_global.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-470mb_rh_rs_t_700mb_vv_global.attr index c3f17241a1..a2b3ce3cfd 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-470mb_rh_rs_t_700mb_vv_global.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-470mb_rh_rs_t_700mb_vv_global.attr @@ -20,7 +20,7 @@ FINT = 50;70;90 FLINE = 0;24;23;22 HILO = 0 HLSYM = 0 -CLRBAR=1 +!CLRBAR= 1 WIND = TITLE = 1/-2/~ 1000-440 MB RH, TEMP (BL yel,850 red), 700 Omega!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-500_THKN.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-500_THKN.attr index 8958583263..3889ccf8a1 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-500_THKN.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-500_THKN.attr @@ -11,7 +11,6 @@ FINT=5000;5050;5100;5150;5200 FLINE=0;18;17;16;15;14 HILO= HLSYM= -CLRBAR=0 WIND=18/1/1 TITLE=5/-1/~ 1000-500 MB THICKNESS COLORS=3 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-500_thkn.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-500_thkn.attr index 8fcb966cfc..8df6f36f97 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-500_thkn.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-500_thkn.attr @@ -17,7 +17,6 @@ FINT= FLINE= HILO= HLSYM= -CLRBAR=0 WIND= TITLE=5/-1/~ 1000-500 MB THICKNESS!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-500mb_rh.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-500mb_rh.attr index 2b91402122..d869b7d9fc 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-500mb_rh.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-500mb_rh.attr @@ -18,7 +18,6 @@ FINT=10;30;70;90 FLINE=18;8;0;22;23 HILO=0 HLSYM=0 -CLRBAR=1 WIND= TITLE=1/-2/~ @ MEAN LAYER RELATIVE HUMIDITY!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-850_thkn.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-850_thkn.attr index 9554ed1464..7aa9b880e9 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-850_thkn.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-850_thkn.attr @@ -17,7 +17,6 @@ FINT= FLINE= HILO= HLSYM= -CLRBAR=0 WIND= TITLE=1/-1/~ 1000-850 MB THKN!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-850thk_only.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-850thk_only.attr index 23477e0e5c..2642642881 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-850thk_only.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-850thk_only.attr @@ -17,7 +17,6 @@ FINT= FLINE= HILO= HLSYM=1;1//22;22/1.4;1.4/hw -CLRBAR=1 WIND= TITLE=1/-1/~ PMSL, 1000-850mb THKN COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000mb_hght_absv.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000mb_hght_absv.attr index 980c91f83e..0561361cff 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000mb_hght_absv.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000mb_hght_absv.attr @@ -17,7 +17,6 @@ FINT=08;12;16;20;24;28;32;36;40;44 FLINE=0;23-12 HILO=2;0/X/10-99!! HLSYM= -CLRBAR=1/V/LL WIND=0 !0 !0 !bk1/0.8/1 TITLE=1/-1/~ ^ @ HEIGHTS, AbsVORT AND WIND!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000mb_hght_tmp_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000mb_hght_tmp_wind.attr index 90f9afe594..a159d47133 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000mb_hght_tmp_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000mb_hght_tmp_wind.attr @@ -18,7 +18,6 @@ FINT=-24;-18;-12;-6;0;18 FLINE=24;30;28;29;25;0;17 HILO= HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ ^ @ HGHTS, TEMPERATURE AND WIND (KTS)! COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000mb_streamlines.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000mb_streamlines.attr index 3ead8cf2a6..4d9b2f663c 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000mb_streamlines.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000mb_streamlines.attr @@ -17,7 +17,6 @@ FINT=20;35;50;65 FLINE=0;18;17;16;15 HILO= HLSYM= -CLRBAR=1 WIND=bk0 TITLE=1/-2/~ 1000 MB STREAMLINES, WIND|~1000 MB STMLNS!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/100mb_hght_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/100mb_hght_wind.attr index dd8a56ac4d..18b4db77c8 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/100mb_hght_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/100mb_hght_wind.attr @@ -17,7 +17,6 @@ FINT=70;90;110;130;150 FLINE=0;25;24;29;7;15 HILO= HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ @ HEIGHTS, ISOTACHS AND WIND (KTS)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/150mb_hght_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/150mb_hght_wind.attr index 3c75dcff26..1ae4fdbb43 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/150mb_hght_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/150mb_hght_wind.attr @@ -17,7 +17,6 @@ FINT=70;90;110;130;150 FLINE=0;25;24;29;7;15 HILO= HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ @ HEIGHTS, ISOTACHS AND WIND (KTS)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/150mb_hght_wind_rap.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/150mb_hght_wind_rap.attr index a0fa468ff5..1d7200060b 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/150mb_hght_wind_rap.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/150mb_hght_wind_rap.attr @@ -17,7 +17,7 @@ FINT = 70;90;110;130;150 FLINE = 0;25;24;29;7;15 HILO = HLSYM = -CLRBAR = 1 +!CLRBAR = 1 WIND = 18/1/1 TITLE = 5/-1/~ @ HEIGHTS, ISOTACHS AND WIND (KTS)!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_absv_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_absv_wind.attr index 5755eda687..8dfdd70988 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_absv_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_absv_wind.attr @@ -17,7 +17,6 @@ FINT=16;20;24;28;32;36;40;44 FLINE=0;23;22;21;20;19;18;17;16 HILO=2;6/X;N/10-99;10-99!0 HLSYM= -CLRBAR=1 WIND= TITLE=5/-1/~ @ WINDS and VORTICITY!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_div_isotachs.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_div_isotachs.attr index e122652e61..5e8f848920 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_div_isotachs.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_div_isotachs.attr @@ -17,7 +17,6 @@ FINT=!70;90;110;130;150;170;190!3;5;7;9;11;13! FLINE=!0;24;25;29;7;15;14;2!0;23;22;21;17;16;2! HILO=0!0!0!0!1/H#;L#/3 HLSYM=0!0!0!0!1.5;1.5//22;22/2;2/hw -CLRBAR=0!0!1/V/LL!0 WIND=0 TITLE=1/-1/~ @ DIVERGENCE AND ISOTACHS!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_div_isotachs_rap.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_div_isotachs_rap.attr index af48f3c3e6..e8465141bc 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_div_isotachs_rap.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_div_isotachs_rap.attr @@ -17,7 +17,7 @@ FINT = !70;90;110;130;150;170;190!3;5;7;9;11;13! FLINE = !0;24;25;29;7;15;14;2!0;23;22;21;17;16;2! HILO = 0!0!0!0!1/H#;L#/3 HLSYM = 0!0!0!0!1.5;1.5//22;22/2;2/hw -CLRBAR = 0!0!1/V/LL!0 +!CLRBAR = 0!0!1/V/LL!0 WIND = 0 TITLE = 1/-1/~ @ DIVERGENCE AND ISOTACHS!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_hght_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_hght_wind.attr index b1f3e0c46f..14f5b615f8 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_hght_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_hght_wind.attr @@ -20,7 +20,6 @@ FINT=70;90;110;130;150 FLINE=0;25;24;29;7;15 HILO= HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ @ HEIGHTS, ISOTACHS AND WIND (KTS)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_hght_wind_al.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_hght_wind_al.attr index 88174b2656..09032b6b32 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_hght_wind_al.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_hght_wind_al.attr @@ -18,7 +18,6 @@ FINT=70;90;110;130;150 FLINE=0;25;24;29;7;15 HILO= HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ ^ @ HEIGHTS, ISOTACHS AND WIND (KTS)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_vorticity_pw.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_vorticity_pw.attr index 2336784893..025fa74bcd 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_vorticity_pw.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_vorticity_pw.attr @@ -18,7 +18,6 @@ FINT=!0.5;1.0;1.5;2.0 FLINE=!0;23;22;30;14 HILO=!!2;6/X;N/10-99;10-99 ! ! HLSYM= -CLRBAR=1 WIND=9/.8/2/112 TITLE=1/-1/~ 200mb HGHT, VORTICITY, PW AND 850 WIND (KTS)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_wind.attr index e0307251d8..51e51b905e 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_wind.attr @@ -18,7 +18,6 @@ FINT=70;90;110;130;150 FLINE=0;25;24;29;7;15 HILO= HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ ^ @ HEIGHTS, ISOTACHS AND WIND (KTS)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_wind_div_isotachs.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_wind_div_isotachs.attr index f3cbfd8e7a..59513082c2 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_wind_div_isotachs.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_wind_div_isotachs.attr @@ -19,7 +19,6 @@ FINT=!70;90;110;130;150;170;190!3;5;7;9;11;13! FLINE=!0;24;25;29;7;15;14;2!0;23;22;21;17;16;2! HILO=0 HLSYM=0 -CLRBAR=0!0!1/V/LL!0 WIND=9/1/2/112 TITLE=1/-1/~ @ HGHTS, ISOTACHS (KTS), AND DIVERGENCE!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_wnd.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_wnd.attr index b080a68c52..b0956266cc 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_wnd.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/200mb_wnd.attr @@ -18,7 +18,6 @@ FINT=70;90;110;130;150 FLINE=0;25;24;29;7;15 HILO= HLSYM= -CLRBAR=1 WIND=0 !18//1 TITLE=5/-2/~ @ ISOTACHS AND WIND (KTS)|~@ WIND! COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/24-hr_obs_pcpn_al.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/24-hr_obs_pcpn_al.attr index 10fae6bbf0..eabbcb81ec 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/24-hr_obs_pcpn_al.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/24-hr_obs_pcpn_al.attr @@ -17,7 +17,7 @@ FINT = .01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.25;2.5;2.75;3;3.25;3.5;3.75;4 FLINE = 0;21-30;14-20;5 HILO = 31;0/x#2////y HLSYM = 1.5 -CLRBAR = 1 +!CLRBAR = 1 WIND = 0 TITLE = 1/-1/~ 24-HR OBS PRECIP (RFC, 40km avg) !0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/24-hr_obs_pcpn_spc_al.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/24-hr_obs_pcpn_spc_al.attr index c89198b8d2..b2a012d72d 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/24-hr_obs_pcpn_spc_al.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/24-hr_obs_pcpn_spc_al.attr @@ -17,7 +17,7 @@ FINT = .01;.10;.25;.5;1;1.5;2;2.5;3;3.5;4;4.5;5;6;8;10.0 FLINE = 0;11;18;8;6;25;21;22;7;30;4;24;20;17;15;14;31 HILO = 0 HLSYM = 0 -CLRBAR = 1//CL/0;.5/.75;.01 +!CLRBAR = 1//CL/0;.5/.75;.01 WIND = TITLE = 1/-1/COOPERATIVE RAINFALL REPORTS FOR 24 hrs ENDING 12 UTC: ~ COLORS = diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_ageo_div_isotachs.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_ageo_div_isotachs.attr index b9fe9bc712..95f6bdcd60 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_ageo_div_isotachs.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_ageo_div_isotachs.attr @@ -18,7 +18,6 @@ FINT=!70;90;110;130;150;170;190!2;4;6;8;10;12! FLINE=!0;24;25;30;28;14;2!0;23;22;21;17;16;2! HILO=0!0!0!0!1/H#;L#/3 HLSYM=0!0!0!0!1.5;1.5//22;22/2;2/hw -CLRBAR=0!0!1/V/LL!0 WIND=16/0.7//211/0.5 TITLE=1/-1/~ @ DIVERGENCE, ISOTACHS (KTS), and AGEOSTROPHIC WIND!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_ageo_div_isotachs_al.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_ageo_div_isotachs_al.attr index 634ced2eac..ba056e5ed2 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_ageo_div_isotachs_al.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_ageo_div_isotachs_al.attr @@ -18,7 +18,6 @@ FINT=!70;90;110;130;150;170;190!2;4;6;8;10;12! FLINE=!0;24;25;30;28;14;2!0;23;22;21;17;16;2! HILO=0!0!0!0!1/H#;L#/3 HLSYM=0!0!0!0!1.5;1.5//22;22/2;2/hw -CLRBAR=0!0!1/V/LL!0 WIND=16/0.7//211/0.5 TITLE=1/-1/~ @ DIV, ISOTACHS, and AGEOSTROPHIC WIND!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_hght_absv.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_hght_absv.attr index 60f7b0ccf1..703a74fd4d 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_hght_absv.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_hght_absv.attr @@ -18,7 +18,6 @@ FINT=16;20;24;28;32;36;40;44 FLINE=0;23;22;21;20;19;18;17;16 HILO=2;6/X;N/10-99;10-99!0 HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ @ HEIGHTS AND ABS VORTICITY$!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_hght_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_hght_wind.attr index 6f3bffe954..2c8f77128f 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_hght_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_hght_wind.attr @@ -20,7 +20,6 @@ FINT=70;90;110;130;150 FLINE=0;25;24;29;7;15 HILO= HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ @ HEIGHTS, ISOTACHS AND WIND (KTS)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_hght_wind_ncf.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_hght_wind_ncf.attr index b6c60731da..65d76a8d29 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_hght_wind_ncf.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_hght_wind_ncf.attr @@ -17,7 +17,6 @@ FINT=70;90;110;130;150 FLINE=0;25;24;29;7;15 HILO= HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ @ HEIGHTS, ISOTACHS AND WIND (KTS)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_streamlines.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_streamlines.attr index e5a00d842f..5a9bf5a527 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_streamlines.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_streamlines.attr @@ -17,7 +17,6 @@ FINT=70;90;110;130 FLINE=0;18;17;16;15 HILO= HLSYM= -CLRBAR=1 WIND=bk0 TITLE=1/-2/~ 250 MB STREAMLINES, WIND|~250 MB STMLNS!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_vorticity_pw.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_vorticity_pw.attr index 1d476d44f6..7ba5f55539 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_vorticity_pw.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_vorticity_pw.attr @@ -18,7 +18,6 @@ FINT=!0.5;1.0;1.5;2.0 FLINE=!0;23;22;30;14 HILO=!!2;6/X;N/10-99;10-99 ! ! HLSYM= -CLRBAR=1 WIND=9/.8/2/112 TITLE=1/-1/~ 250mb HGHT, VORTICITY, PW AND 850 WIND (KTS)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_wind_and_rel_vort.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_wind_and_rel_vort.attr index 9844c1af28..53eb026b35 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_wind_and_rel_vort.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_wind_and_rel_vort.attr @@ -17,7 +17,6 @@ FINT=4;6;8;10;12;14;16;18 FLINE=0;14;15;16;17;18;19;20;3 HILO=2;6/X;N/-99--4;4-99 ! 0 HLSYM=0 -CLRBAR=1/V/LL!0 WIND=6/.8/2/112 TITLE=1/-1/~ @ WIND AND RELATIVE VORTICITY!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_wind_and_rel_vort_rap.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_wind_and_rel_vort_rap.attr index 2f242898e2..3af750c27b 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_wind_and_rel_vort_rap.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/250mb_wind_and_rel_vort_rap.attr @@ -18,7 +18,7 @@ FINT = 4;6;8;10;12;14;16;18 FLINE = 0;14-20;3 HILO = 2;6/X;N/-99--4;4-99 ! 0 HLSYM = 0 -CLRBAR = 1/V/LL!0 +!CLRBAR = 1/V/LL!0 WIND = 6/.8/2/112 TITLE = 1/-1/~ @ WIND AND RELATIVE VORTICITY!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/296thta_pres_wnd_pres_adv.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/296thta_pres_wnd_pres_adv.attr index 608509661a..9c073c0f88 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/296thta_pres_wnd_pres_adv.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/296thta_pres_wnd_pres_adv.attr @@ -18,7 +18,6 @@ FINT=2;4;6;8;10 FLINE=0;23;22;28;15;2 HILO=0 HLSYM=0 -CLRBAR=1 WIND=9/0.7/2/212 TITLE=1/-1/~ @ PRESSURE, WIND AND PRES ADV (omega)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300-200mb_pv.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300-200mb_pv.attr index d43281bf20..bc2fa956d2 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300-200mb_pv.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300-200mb_pv.attr @@ -18,7 +18,7 @@ FINT = 332;348;364!1;2;3;4 FLINE = 0;23;22;14!0;0;24;30;13 HILO = 0!0!0!0!0!0!20/H#;L#/1020-1070;900-1012 HLSYM = 0!0!0!0!0!0!1.5;1.5//22;22/3;3/hw -CLRBAR= 0!1/V/LL!0!0 +!CLRBAR= 0!1/V/LL!0!0 WIND = 9/0.9/2/112 TITLE = 1/-1/~ 300-200mb PV, 300mb WIND (KTS) ,PMSL, BL THTAE!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300-700_q-vctrs_thkn.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300-700_q-vctrs_thkn.attr index 0fa55e492e..6a8db83362 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300-700_q-vctrs_thkn.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300-700_q-vctrs_thkn.attr @@ -18,7 +18,6 @@ FINT= FLINE= HILO=3/W;K HLSYM= -CLRBAR=0 WIND=27/.1/2//.5 TITLE=1/-1/~ @ Q-VECTORS and THICKNESS !0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300-700_qn-vectrs.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300-700_qn-vectrs.attr index 4c5d052c4e..75dcd019d6 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300-700_qn-vectrs.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300-700_qn-vectrs.attr @@ -18,7 +18,6 @@ FINT=!70;90;110;130;150;170;190!0 FLINE=!0;24;25;30;28;14;2!0;23;22;21;17;16;2! HILO=!0!0!3/W;K!0 HLSYM= -CLRBAR=0 WIND=27/.2/2//.5 TITLE=1/-1/~ 300:700 Qn-VECTORS, THICKNESS AND 300mb ISOTACHS!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_Divergence.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_Divergence.attr index 98a9e6cca1..56ae4d0772 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_Divergence.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_Divergence.attr @@ -11,7 +11,6 @@ FINT=-4;-2;0;2;4 FLINE=0;18;17;16;15;14 HILO=1/H#;L#/3 HLSYM=1.5;1.5//22;22/2;2/hw -CLRBAR=1 WIND=18/1/1 TITLE=1/-1/~ @ DIVERGENCE COLORS=3 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_ageo_div_isotachs.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_ageo_div_isotachs.attr index 93cce04304..080b9e0126 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_ageo_div_isotachs.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_ageo_div_isotachs.attr @@ -18,7 +18,6 @@ FINT=!70;90;110;130;150;170;190!2;4;6;8;10;12! FLINE=!0;24;25;30;28;14;2!0;23;22;21;17;16;2! HILO=0!0!0!0!1/H#;L#/3 HLSYM=0!0!0!0!1.5;1.5//22;22/2;2/hw -CLRBAR=0!0!1/V/LL!0 WIND=2/0.8/1.2/211/0.5 TITLE=1/-1/~ @ DIVERGENCE, ISOTACHS (KTS), and AGEOSTROPHIC WIND!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_div_isotachs.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_div_isotachs.attr index 334ca95b65..6cc4909220 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_div_isotachs.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_div_isotachs.attr @@ -18,7 +18,6 @@ FINT=!70;90;110;130;150;170;190!3;5;7;9;11;13! FLINE=!0;24;25;29;7;15;14;2!0;23;22;21;17;16;2! HILO=0!0!0!0!1/H#;L#/3 HLSYM=0!0!0!0!1.5;1.5//22;22/2;2/hw -CLRBAR=0!0!1/V/LL!0 WIND=0 TITLE=1/-1/~ @ DIVERGENCE AND ISOTACHS!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_hght_absv.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_hght_absv.attr index 23fe8cb179..99dbf5971d 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_hght_absv.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_hght_absv.attr @@ -20,7 +20,6 @@ FINT=16;20;24;28;32;36;40;44 FLINE=0;23;22;21;20;19;18;17;16 HILO=2;6/X;N/10-99;10-99! HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ @ HEIGHTS AND ABS VORTICITY$!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_hght_absv_adv.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_hght_absv_adv.attr index b655af6f0b..ff45f51192 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_hght_absv_adv.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_hght_absv_adv.attr @@ -18,7 +18,6 @@ FINT=-12;-9;-6;-3;3;6;9;12 FLINE=29;30;25;24;0;14;15;17;5 HILO=!2;6/X;N/10-99;10-99! HLSYM=0 -CLRBAR=1 WIND=18/1/1 TITLE=5/0/~ @ HEIGHT, VORTICITY, VORTICITY ADV|~ @ HGHT, VORT ADV!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_hght_absv_al.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_hght_absv_al.attr index d69fc9ddea..a4cfdf28f2 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_hght_absv_al.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_hght_absv_al.attr @@ -18,7 +18,6 @@ FINT=16;20;24;28;32;36;40;44 FLINE=0;23;22;21;20;19;18;17;16 HILO=2;6/X;N/10-99;10-99!0 HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ $ @ HEIGHTS AND ABS VORTICITY!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_hght_absv_rap.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_hght_absv_rap.attr index c3cab7b946..87aac6cc1f 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_hght_absv_rap.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_hght_absv_rap.attr @@ -20,7 +20,7 @@ FINT = 16;20;24;28;32;36;40;44 FLINE = 0;23-15 HILO = 2;6/X;N/10-99;10-99! HLSYM = -CLRBAR = 1 +!CLRBAR = 1 WIND = 18/1/1 TITLE = 5/-1/~ @ HEIGHTS AND ABS VORTICITY$!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_hght_tmp_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_hght_tmp_wind.attr index a246715d7c..8fc95e9e8c 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_hght_tmp_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_hght_tmp_wind.attr @@ -18,7 +18,6 @@ FINT=-60;-54;-48;-42;-36 FLINE=24;30;28;29;25;0 HILO= HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ ^ @ HEIGHTS, TEMPERATURE AND WIND (KTS)! COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_hght_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_hght_wind.attr index 5ba3b99d2b..e30369addf 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_hght_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_hght_wind.attr @@ -19,7 +19,6 @@ FINT=70;90;110;130;150 FLINE=0;25;24;29;7;15 HILO= HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ @ HEIGHTS, ISOTACHS AND WIND (KTS)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_hght_wind_al.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_hght_wind_al.attr index 4fbd43de57..16b67906e1 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_hght_wind_al.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_hght_wind_al.attr @@ -18,7 +18,6 @@ FINT=70;90;110;130;150 FLINE=0;25;24;29;7;15 HILO= HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ ^ @ HEIGHTS, ISOTACHS AND WIND (KTS)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_vorticity_pw.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_vorticity_pw.attr index f9a8aed2a5..e3333c50d0 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_vorticity_pw.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300mb_vorticity_pw.attr @@ -19,7 +19,6 @@ FINT=!0.5;1.0;1.5;2.0 FLINE=!0;23;22;30;14 HILO=!!2;6/X;N/10-99;10-99 ! ! HLSYM= -CLRBAR=1 WIND=9/.8/2/112 TITLE=1/-1/~ 300mb HGHT, VORTICITY, PW AND 850 WIND (KTS)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300thta_pres_wnd_pres_adv.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300thta_pres_wnd_pres_adv.attr index fef57b7164..9af22675b3 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300thta_pres_wnd_pres_adv.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300thta_pres_wnd_pres_adv.attr @@ -18,7 +18,6 @@ FINT=2;4;6;8;10 FLINE=0;23;22;28;15;2 HILO=0 HLSYM=0 -CLRBAR=1 WIND=9/0.7/2/212 TITLE=1/-1/~ @ PRESSURE, WIND AND PRES ADV (omega)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300thta_pres_wnd_pres_adv_al.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300thta_pres_wnd_pres_adv_al.attr index 8e6c69f5be..c77b0b6689 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300thta_pres_wnd_pres_adv_al.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/300thta_pres_wnd_pres_adv_al.attr @@ -11,7 +11,6 @@ FINT=2;4;6;8;10 FLINE=0;23;22;28;15;2 HILO=0 HLSYM=0 -CLRBAR=1 WIND=9/0.7/2/212 TITLE=1/-1/~ @ PRESSURE, WIND, PRES, ADV!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/304thta_pres_wnd_pres_adv.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/304thta_pres_wnd_pres_adv.attr index e5a7998245..65ef9a0659 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/304thta_pres_wnd_pres_adv.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/304thta_pres_wnd_pres_adv.attr @@ -18,7 +18,6 @@ FINT=2;4;6;8;10 FLINE=0;23;22;28;15;2 HILO=0 HLSYM=0 -CLRBAR=1 WIND=9/0.7/2/212 TITLE=1/-1/~ @ PRESSURE, WIND AND PRES ADV (omega)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/308thta_pres_wnd_pres_adv.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/308thta_pres_wnd_pres_adv.attr index b1a4cf9fa9..2670169009 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/308thta_pres_wnd_pres_adv.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/308thta_pres_wnd_pres_adv.attr @@ -18,7 +18,6 @@ FINT=2;4;6;8;10 FLINE=0;23;22;28;15;2 HILO=0 HLSYM=0 -CLRBAR=1 WIND=9/0.7/2/212 TITLE=1/-1/~ @ PRESSURE, WIND AND PRES ADV (omega)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/312thta_pres_wnd_pres_adv.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/312thta_pres_wnd_pres_adv.attr index cb98008062..4a66f1d347 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/312thta_pres_wnd_pres_adv.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/312thta_pres_wnd_pres_adv.attr @@ -18,7 +18,6 @@ FINT=2;4;6;8;10 FLINE=0;23;22;28;15;2 HILO=0 HLSYM=0 -CLRBAR=1 WIND=9/0.7/2/212 TITLE=1/-1/~ @ PRESSURE, WIND AND PRES ADV (omega)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/316thta_pres_wnd_pres_adv.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/316thta_pres_wnd_pres_adv.attr index 4af3e35d58..7f28c76839 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/316thta_pres_wnd_pres_adv.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/316thta_pres_wnd_pres_adv.attr @@ -18,7 +18,6 @@ FINT=2;4;6;8;10 FLINE=0;23;22;28;15;2 HILO=0 HLSYM=0 -CLRBAR=1 WIND=9/0.7/2/212 TITLE=1/-1/~ @ PRESSURE, WIND AND PRES ADV (omega)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/400-200mb_pv.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/400-200mb_pv.attr index 45a31b76c2..0041b3b3ce 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/400-200mb_pv.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/400-200mb_pv.attr @@ -18,7 +18,7 @@ FINT = 332;348;364!1;2;3;4 FLINE = 0;23;22;14!0;0;24;30;13 HILO = 0!0!0!0!0!0!20/H#;L#/1020-1070;900-1012 HLSYM = 0!0!0!0!0!0!1.5;1.5//22;22/3;3/hw -CLRBAR= 0!1/V/LL!0!0 +!CLRBAR= 0!1/V/LL!0!0 WIND = 9/0.9/2/112 TITLE = 1/-1/~ 400-200mb PV, 300mb WIND (KTS), PMSL, BL THTAE!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/400-250mb_pv.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/400-250mb_pv.attr index a8b128deb2..70356afddf 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/400-250mb_pv.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/400-250mb_pv.attr @@ -20,7 +20,6 @@ FINT=332;348;364!1;2;3;4 FLINE=0;23;22;14!0;0;24;30;13 HILO=0!0!0!0!0!0!20/H#;L#/1020-1070;900-1008 HLSYM=0!0!0!0!0!0!1.5;1.5//22;22/3;3/hw -CLRBAR=0!1/V/LL!0!0 WIND=9/0.9/2/112 TITLE=1/-1/~ 400-250mb PV,300mb WIND (KTS),PMSL,BL THTAE!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/400-250mb_pv_global.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/400-250mb_pv_global.attr index ed5cd4fa84..bc42e268f9 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/400-250mb_pv_global.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/400-250mb_pv_global.attr @@ -18,7 +18,7 @@ FINT = 332;348;364!1;2;3;4 FLINE = 0;23;22;14!0;0;24;30;13 HILO = 0!0!0!0!0!0!20/H#;L#/1020-1070;900-1012 HLSYM = 0!0!0!0!0!0!1.5;1.5//22;22/3;3/hw -CLRBAR= 0!1/V/LL!0!0 +!CLRBAR= 0!1/V/LL!0!0 WIND = 9/0.9/2/112 TITLE = 1/-1/~ 400-250mb PV, 300mb WIND (KTS), PMSL, BL THTAE!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/400mb_avg_rh_ncf.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/400mb_avg_rh_ncf.attr index 9fa5afd009..bbb01a68dc 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/400mb_avg_rh_ncf.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/400mb_avg_rh_ncf.attr @@ -17,7 +17,7 @@ FINT = FLINE = HILO = HLSYM = -CLRBAR= 1 +!CLRBAR= 1 WIND = TITLE = 5/-1/~ @ HEIGHTS AND 500-300mb RH$!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500-250mb_pv.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500-250mb_pv.attr index 38df05eefb..d4341222c2 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500-250mb_pv.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500-250mb_pv.attr @@ -18,7 +18,7 @@ FINT = 332;348;364!1;2;3;4 FLINE = 0;23;22;14!0;0;24;30;13 HILO = 0!0!0!0!0!0!20/H#;L#/1020-1070;900-1012 HLSYM = 0!0!0!0!0!0!1.5;1.5//22;22/3;3/hw -CLRBAR= 0!1/V/LL!0!0 +!CLRBAR= 0!1/V/LL!0!0 WIND = 9/0.9/2/112 TITLE = 1/-1/~ 500-250mb PV, 300mb WIND (KTS), PMSL, BL THTAE!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500-300mb_pv.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500-300mb_pv.attr index cec17a73a2..e789af0173 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500-300mb_pv.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500-300mb_pv.attr @@ -18,7 +18,7 @@ FINT = 332;348;364!1;2;3;4 FLINE = 0;23;22;14!0;0;24;30;13 HILO = 0!0!0!0!0!0!20/H#;L#/1020-1070;900-1012 HLSYM = 0!0!0!0!0!0!1.5;1.5//22;22/3;3/hw -CLRBAR= 0!1/V/LL!0!0 +!CLRBAR= 0!1/V/LL!0!0 WIND = 9/0.9/2/112 TITLE = 1/-1/~ 500-300mb PV, 400mb WIND (KTS), PMSL, BL THTAE!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500_vort_only.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500_vort_only.attr index 5cec792c57..78b6bab933 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500_vort_only.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500_vort_only.attr @@ -17,7 +17,6 @@ FINT=16;20;24;28;32;36;40;44 FLINE=0;23;22;21;20;19;18;17;16 HILO=2;6/X;N/10-99;10-99!0 HLSYM= -CLRBAR=1 WIND= TITLE=5/-1/~ @ ABS VORTICITY$!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_absv_ncf.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_absv_ncf.attr index 38f519e278..f8ddd2b247 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_absv_ncf.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_absv_ncf.attr @@ -18,7 +18,6 @@ FINT= FLINE= HILO=2;6/X;N/10-99;10-99!0 HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ @ ABS VORTICITY$!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_absv_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_absv_wind.attr index bb4cd85e6b..11ac1d1006 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_absv_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_absv_wind.attr @@ -17,7 +17,6 @@ FINT=16;20;24;28;32;36;40;44 FLINE=0;23;22;21;20;19;18;17;16 HILO=2;6/X;N/10-99;10-99!0 HLSYM= -CLRBAR=1 WIND= TITLE=5/-1/~ @ WINDS and VORTICITY!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght.attr index faf59aeb2b..97b53b3dee 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght.attr @@ -17,7 +17,6 @@ FINT= FLINE= HILO= HLSYM= -CLRBAR=0 WIND= TITLE=5/-1/~ @ HEIGHTS!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_absv.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_absv.attr index 803fbcc38e..bd2eda0a67 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_absv.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_absv.attr @@ -20,7 +20,6 @@ FINT=16;20;24;28;32;36;40;44 FLINE=0;23;22;21;20;19;18;17;16 HILO=2;6/X;N/10-99;10-99!0 HLSYM= -CLRBAR=1 SKIP=2 WIND=18/1/1 TITLE=5/-1/~ @ HEIGHT AND ABS VORTICITY!0 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_absv_adv.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_absv_adv.attr index 3a8ee9c136..25d7573dc7 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_absv_adv.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_absv_adv.attr @@ -18,7 +18,7 @@ FINT = -12;-9;-6;-3;3;6;9;12 FLINE = 29;30;25;24;0;14;15;17;5 HILO = !2;6/X;N/10-99;10-99! HLSYM = 0 -CLRBAR= 1 +!CLRBAR= 1 WIND = 18/1/1 TITLE = 5/0/~ @ HEIGHT, VORTICITY AND VORTICITY ADV|~ @ HGHT AND VORT ADV!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_absv_adv_rap.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_absv_adv_rap.attr index d4ce6f07ba..19056d250b 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_absv_adv_rap.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_absv_adv_rap.attr @@ -18,7 +18,7 @@ FINT = -12;-9;-6;-3;3;6;9;12 FLINE = 29;30;25;24;0;14;15;17;5 HILO = !2;6/X;N/10-99;10-99! HLSYM = 0 -CLRBAR = 1 +!CLRBAR = 1 WIND = 18/1/1 TITLE = 5/0/~ @ HEIGHT, VORTICITY AND VORTICITY ADV|~ @ HGHT AND VORT ADV!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_absv_al.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_absv_al.attr index 650b4d16d8..2bf83490c6 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_absv_al.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_absv_al.attr @@ -18,7 +18,6 @@ FINT=16;20;24;28;32;36;40;44 FLINE=0;23;22;21;20;19;18;17;16 HILO=2;6/X;N/10-99;10-99!0 HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ $ @ HEIGHTS AND ABS VORTICITY!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_absv_ncf.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_absv_ncf.attr index 19c76acb2c..ef32059d8d 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_absv_ncf.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_absv_ncf.attr @@ -20,7 +20,6 @@ FINT= FLINE= HILO=2;6/X;N/10-99;10-99!0 HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ @ HEIGHT AND ABS VORTICITY$!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_absv_rap.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_absv_rap.attr index 520b87bbb1..2c6d3541d2 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_absv_rap.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_absv_rap.attr @@ -20,7 +20,7 @@ FINT = 16;20;24;28;32;36;40;44 FLINE = 0;23-15 HILO = 2;6/X;N/10-99;10-99!0 HLSYM = -CLRBAR = 1 +!CLRBAR = 1 WIND = 18/1/1 TITLE = 5/-1/~ @ HEIGHT AND ABS VORTICITY!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_absv_wnd.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_absv_wnd.attr index 61c35e2ab8..a112190f9f 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_absv_wnd.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_absv_wnd.attr @@ -17,7 +17,6 @@ FINT=16;20;24;28;32;36;40;44 FLINE=0;23;22;21;20;19;18;17;16 HILO=2;6/X;N/10-99;10-99!0 HLSYM= -CLRBAR=1 WIND=0 ! ! !18/1/1 TITLE=1/-1/~ @ HEIGHTS, ABS VORTICITY AND WIND!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_avg.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_avg.attr index 643551bfab..2aa6b546d3 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_avg.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_avg.attr @@ -17,7 +17,6 @@ FINT= FLINE= HILO= HLSYM= -CLRBAR=0 WIND= TITLE=5/-1/~ @ HEIGHTS!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_color.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_color.attr index c1aaf55827..6f09612567 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_color.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_color.attr @@ -19,7 +19,6 @@ FINT=504;510;516;522;528;534;540;546;552;558;564;570;576;582;588;594 FLINE=30;29;28;27;26;25;24;23;22;21;20;19;18;17;16;15;14 HILO= HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=1/-1/~ 500mb HEIGHTS !0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_color_rap.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_color_rap.attr index b28cc6a4fd..ddf7b2d17c 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_color_rap.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_color_rap.attr @@ -19,7 +19,7 @@ FINT = 504;510;516;522;528;534;540;546;552;558;564;570;576;582;588;594 FLINE = 30-14 HILO = HLSYM = -CLRBAR = 1 +!CLRBAR = 1 WIND = 18/1/1 TITLE = 1/-1/~ 500mb HEIGHTS !0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_geoabsv.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_geoabsv.attr index e46535dafe..0bd45c781f 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_geoabsv.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_geoabsv.attr @@ -20,7 +20,7 @@ FINT = 16;20;24;28;32;36;40;44 FLINE = 0;23-15 HILO = 2;6/X;N/10-99;10-99! ! HLSYM = -CLRBAR= 1 +!CLRBAR= 1 WIND = 18/1/1 TITLE = 5/0/~ @ HEIGHTS AND GEO ABS VORTICITY!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_geoabsv_rap.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_geoabsv_rap.attr index c55c295dd2..cb58966372 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_geoabsv_rap.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_geoabsv_rap.attr @@ -20,7 +20,7 @@ FINT = 16;20;24;28;32;36;40;44 FLINE = 0;23-15 HILO = 2;6/X;N/10-99;10-99! ! HLSYM = -CLRBAR = 1 +!CLRBAR = 1 WIND = 18/1/1 TITLE = 5/0/~ @ HEIGHTS AND GEO ABS VORTICITY!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_rh_omega.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_rh_omega.attr index 61286e6012..bcdb664136 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_rh_omega.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_rh_omega.attr @@ -18,7 +18,6 @@ FINT=70;90 FLINE=0;23;22 HILO= HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ @ HEIGHTS, REL HUMIDITY AND OMEGA! COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_tmp_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_tmp_wind.attr index 878c04197d..e3102c24e5 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_tmp_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_tmp_wind.attr @@ -18,7 +18,6 @@ FINT=-36;-30;-24;-18;-12 FLINE=24;30;28;29;25;0 HILO= HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ ^ @ HEIGHTS, TEMPERATURE AND WIND (KTS)! COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_tmpc_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_tmpc_wind.attr index 079e4b8724..32c42faf25 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_tmpc_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_tmpc_wind.attr @@ -11,7 +11,6 @@ FINT=-36;-30;-24;-18;-12 FLINE=24;30;28;29;25;0 HILO= HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ ^ @ HEIGHT, TEMPERATURE AND WIND (KTS) COLORS=3 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_wind.attr index 9feea8f899..3ce326ecb5 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_hght_wind.attr @@ -17,7 +17,6 @@ FINT=70;90;110;130;150 FLINE=0;25;24;29;7;15 HILO= HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ @ HEIGHTS, ISOTACHS AND WIND (KTS)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_mean_hght.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_mean_hght.attr index 70e9f8e572..9fc87f14fb 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_mean_hght.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_mean_hght.attr @@ -17,7 +17,6 @@ FINT= FLINE= HILO= HLSYM= -CLRBAR=0 WIND= TITLE=5/-1/~ @ MEAN HEIGHT AT 500 mb!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_streamlines.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_streamlines.attr index ecefffd8ae..aa9687fd72 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_streamlines.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_streamlines.attr @@ -17,7 +17,6 @@ FINT=50;70;90;110 FLINE=0;18;17;16;15 HILO= HLSYM= -CLRBAR=1 WIND=bk0 TITLE=1/-2/~ 500 MB STREAMLINES, WIND|~500 MB STMLNS!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_tmpc.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_tmpc.attr index d39ca1f84c..c97ae10d90 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_tmpc.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_tmpc.attr @@ -11,7 +11,6 @@ FINT=-36;-30;-24;-18;-12 FLINE=24;30;28;29;25;0 HILO= HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ ^ @ TEMPERATURE COLORS=3 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_windBarb.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_windBarb.attr index 93e6d6bbd1..234d01e3ed 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_windBarb.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_windBarb.attr @@ -11,7 +11,6 @@ FINT=3000;3050;3100;3150;3200 FLINE=0;18;17;16;15;14 HILO=2;6/X;N/10-99;10-99 HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ @ WIND BARB COLORS=3 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_wind_and_rel_vort.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_wind_and_rel_vort.attr index f7e7a69b53..306010884c 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_wind_and_rel_vort.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mb_wind_and_rel_vort.attr @@ -18,7 +18,6 @@ FINT=4;6;8;10;12;14;16;18 FLINE=0;14;15;16;17;18;19;20;3 HILO=2;6/X;N/-99--4;4-99 ! 0 HLSYM=0 -CLRBAR=1/V/LL!0 WIND=6/.8/2/112 TITLE=1/-1/~ @ WIND (KTS) AND RELATIVE VORTICITY$!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mbcomponly.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mbcomponly.attr index 2f3ddefdbb..3f8a55de7e 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mbcomponly.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/500mbcomponly.attr @@ -18,7 +18,6 @@ FINT= FLINE= HILO= HLSYM= -CLRBAR=0 WIND= TITLE=5/-3/~ @ ETA HEIGHTS!6/0/~ NGM HEIGHTS!3/-2/~ GFS HEIGHTS COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/50mb_hght_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/50mb_hght_wind.attr index 8db7880e2f..258e597c80 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/50mb_hght_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/50mb_hght_wind.attr @@ -17,7 +17,6 @@ FINT=70;90;110;130;150 FLINE=0;25;24;29;7;15 HILO= HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ @ HEIGHTS, ISOTACHS AND WIND (KTS)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/550mb_hght_absv.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/550mb_hght_absv.attr index 41ab3de93a..75a214b576 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/550mb_hght_absv.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/550mb_hght_absv.attr @@ -11,7 +11,6 @@ FINT=16;20;24;28;32;36;40;44 FLINE=0;23;22;21;20;19;18;17;16 HILO=2;6/X;N/10-99;10-99 HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ @ HEIGHT AND ABS VORTICITY COLORS=3 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/600mb_hght_rh_omega.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/600mb_hght_rh_omega.attr index e6aec473d0..2c4a2c7876 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/600mb_hght_rh_omega.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/600mb_hght_rh_omega.attr @@ -17,7 +17,6 @@ FINT=70;90 FLINE=0;23;22 HILO= HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/0/~ @ HEIGHTS, REL HUMIDITY AND OMEGA! COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/600mb_hght_rh_omega_rap.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/600mb_hght_rh_omega_rap.attr index c0e17f8362..daec984696 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/600mb_hght_rh_omega_rap.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/600mb_hght_rh_omega_rap.attr @@ -17,7 +17,7 @@ FINT = 70;90 FLINE = 0;23;22 HILO = HLSYM = -CLRBAR = 1 +!CLRBAR = 1 WIND = 18/1/1 TITLE = 5/0/~ @ HEIGHTS, REL HUMIDITY AND OMEGA! COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_absv_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_absv_wind.attr index c045528ea6..fa12ac9ef0 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_absv_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_absv_wind.attr @@ -17,7 +17,6 @@ FINT=16;20;24;28;32;36;40;44 FLINE=0;23;22;21;20;19;18;17;16 HILO=2;6/X;N/10-99;10-99!0 HLSYM= -CLRBAR=1 WIND= TITLE=5/-1/~ @ WINDS and VORTICITY!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_hght_avg.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_hght_avg.attr index 938d9bca5f..929e4c40ba 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_hght_avg.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_hght_avg.attr @@ -17,7 +17,6 @@ FINT= FLINE= HILO= HLSYM= -CLRBAR=0 WIND= TITLE=5/-1/~ @ HEIGHTS!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_hght_rh_al.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_hght_rh_al.attr index 8d76f19658..45f951a17b 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_hght_rh_al.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_hght_rh_al.attr @@ -18,7 +18,6 @@ FINT=70;90 FLINE=0;23;22 HILO= HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ @ HGHTS, REL HUMIDITY!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_hght_rh_omega.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_hght_rh_omega.attr index 9651ce5a6e..8154406e2f 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_hght_rh_omega.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_hght_rh_omega.attr @@ -20,7 +20,6 @@ FINT=70;90 FLINE=0;23;22 HILO= HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/0/~ @ HEIGHTS, REL HUMIDITY AND OMEGA! COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_hght_rh_omega_ncf.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_hght_rh_omega_ncf.attr index baf208622d..eb5590dfc5 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_hght_rh_omega_ncf.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_hght_rh_omega_ncf.attr @@ -19,6 +19,6 @@ FINT = FLINE = HILO = 0 HLSYM = 0 -CLRBAR= 1 +!CLRBAR= 1 WIND = TITLE = 5/0/~ @ HEIGHT, REL HUMIDITY AND OMEGA! diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_hght_rh_omega_rap.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_hght_rh_omega_rap.attr index 31455126d0..c00ab0d992 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_hght_rh_omega_rap.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_hght_rh_omega_rap.attr @@ -20,7 +20,7 @@ FINT = 70;90 FLINE = 0;23;22 HILO = HLSYM = -CLRBAR = 1 +!CLRBAR = 1 WIND = 18/1/1 TITLE = 5/0/~ @ HEIGHTS, REL HUMIDITY AND OMEGA! COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_hght_tmp_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_hght_tmp_wind.attr index 39fffef215..40a14f56fc 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_hght_tmp_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_hght_tmp_wind.attr @@ -18,7 +18,6 @@ FINT=-24;-18;-12;-6;0;18 FLINE=24;30;28;29;25;0;17 HILO= HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ ^ @ HEIGHTS, TEMPERATURE AND WIND (KTS)! COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_hght_wind_dwpt.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_hght_wind_dwpt.attr index c5590bcb78..ff3a7874bf 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_hght_wind_dwpt.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_hght_wind_dwpt.attr @@ -18,7 +18,7 @@ FINT = 0;4;8;12;16 FLINE = 0;23;22;30;14;2 HILO = 0!0!6/H#;L# HLSYM = 0!0!1.5;1.5//22;22/2;2/hw -CLRBAR= 1/V/LL!0 +!CLRBAR= 1/V/LL!0 WIND = 9/0.9/2/212 TITLE = 1/-1/~ @ DEW POINT (GREATER THAN -8), WIND (KTS), AND HEIGHT!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_rh_rs_temp.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_rh_rs_temp.attr index 232ef6a4f7..56c3aaa774 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_rh_rs_temp.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_rh_rs_temp.attr @@ -19,7 +19,6 @@ FINT=70;90;95 FLINE=0;24;23;22 HILO=0 HLSYM=0 -CLRBAR=1 WIND= TITLE=1/-1/~ 700 MB RH, TEMPERATURES (BL yel, 850 red, 700 cyan)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_rh_rs_temp_al.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_rh_rs_temp_al.attr index 7dc1c3ab22..8ad525e74a 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_rh_rs_temp_al.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_rh_rs_temp_al.attr @@ -18,7 +18,6 @@ FINT=70;90;95 FLINE=0;24;23;22 HILO=0 HLSYM=0 -CLRBAR=1 WIND= TITLE=1/-1/~ @ RH, near-0 TEMPERATURES (BL yel, 850 red, 700 cyan)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_rh_rs_temp_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_rh_rs_temp_nam.attr index 770f6d72d5..0d87a17459 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_rh_rs_temp_nam.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_rh_rs_temp_nam.attr @@ -20,7 +20,7 @@ FINT=70;90;95 FLINE=0;24;23;22 HILO=0 HLSYM=0 -CLRBAR=1 +!CLRBAR=1 WIND= TITLE=1/-1/~ 700 MB RH, TEMPERATURES (BL yel, 850 red, 700 cyan)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_streamlines.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_streamlines.attr index 5e8c3daedf..1486df5c9f 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_streamlines.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_streamlines.attr @@ -17,7 +17,6 @@ FINT=30;40;50;60 FLINE=0;18;17;16;15 HILO= HLSYM= -CLRBAR=1 WIND=bk0 TITLE=1/-2/~ 700 MB STREAMLINES, WIND|~700 MB STMLNS!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_wind_and_rel_vort.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_wind_and_rel_vort.attr index 7602c01da5..285b401e97 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_wind_and_rel_vort.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/700mb_wind_and_rel_vort.attr @@ -19,7 +19,6 @@ FINT=4;6;8;10;12;14;16;18 FLINE=0;14;15;16;17;18;19;20;3 HILO=2;6/X;N/-99--4;4-99 ! 0 HLSYM=0 -CLRBAR=1/V/LL!0 WIND=6/.8/2/112 TITLE=1/-1/~ @ WIND AND RELATIVE VORTICITY$!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/70mb_hght_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/70mb_hght_wind.attr index 86aa6c4939..a363ed3398 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/70mb_hght_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/70mb_hght_wind.attr @@ -17,7 +17,6 @@ FINT=70;90;110;130;150 FLINE=0;25;24;29;7;15 HILO= HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ @ HEIGHTS, ISOTACHS AND WIND (KTS)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850-300mb_wind_shear.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850-300mb_wind_shear.attr index beabc0355f..ad6e688699 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850-300mb_wind_shear.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850-300mb_wind_shear.attr @@ -21,7 +21,6 @@ FINT=5/25 FLINE=0;24;30;29;23;22;14;15;16;17;20;5 HILO= HLSYM= -CLRBAR=1 WIND=! 7/.4/1/221/.4 ! 6/.4/1/221/.4 TITLE=1/-1/~ @ WIND SHEAR (850mb magenta, 300mb cyan)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850-700_thkn.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850-700_thkn.attr index cc47c56c2a..a4b65791af 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850-700_thkn.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850-700_thkn.attr @@ -17,7 +17,6 @@ FINT= FLINE= HILO= HLSYM= -CLRBAR=0 WIND= TITLE=1/-1/~ 850-700 MB THKN!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_absv_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_absv_wind.attr index afcaab8117..65ee0affc9 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_absv_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_absv_wind.attr @@ -17,7 +17,6 @@ FINT=16;20;24;28;32;36;40;44 FLINE=0;23;22;21;20;19;18;17;16 HILO=2;6/X;N/10-99;10-99!0 HLSYM= -CLRBAR=1 WIND= TITLE=5/-1/~ @ WINDS and VORTICITY!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_h2o_transport.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_h2o_transport.attr index a195ad81b6..19ecfeb59d 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_h2o_transport.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_h2o_transport.attr @@ -23,7 +23,6 @@ FINT=6;12;18;24;30;36 FLINE=0;23;22;21;14;15;2 HILO=0 !5/H#;L#!0 HLSYM=0 !1;1//22;22/2;2/hw!0 -CLRBAR=1/V/LL!0 WIND=16/0.9/2/211/0.5 TITLE=1/-1/~ @ MOISTURE TRANSPORT, HGHT, BL THTAE!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_h2o_transport_al.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_h2o_transport_al.attr index 19998c377b..bb3115423e 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_h2o_transport_al.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_h2o_transport_al.attr @@ -18,7 +18,6 @@ FINT=6;12;18;24;30;36 FLINE=0;23;22;21;14;15;2 HILO=0!5/H#;L#!0 HLSYM=0!1;1//22;22/2;2/hw!0 -CLRBAR=1/V/LL!0 WIND=16/0.9/2/211/0.5 TITLE=1/-1/~ @ MOISTURE TRANSPORT, HGHT, BL THTAE!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_h2o_transport_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_h2o_transport_nam.attr index 53ed889fd7..6cdd352ad2 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_h2o_transport_nam.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_h2o_transport_nam.attr @@ -22,7 +22,7 @@ FINT = 6;12;18;24;30;36 FLINE = 0;23;22;21;14;15;2 HILO = 0 !5/H#;L#!0 HLSYM = 0 !1;1//22;22/2;2/hw!0 -CLRBAR = 1/V/LL!0 +!CLRBAR = 1/V/LL!0 WIND = 16/0.9/2/211/0.5 TITLE = 1/-1/~ @ MOISTURE TRANSPORT, HGHT, BL THTAE!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hght_absv.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hght_absv.attr index 1d4ac923df..7b93062247 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hght_absv.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hght_absv.attr @@ -17,7 +17,6 @@ FINT=08;12;16;20;24;28;32;36;40;44 FLINE=0;23-12 HILO=2;0/X/10-99!! HLSYM= -CLRBAR=1/V/LL WIND=0 !0 !0 !bk1/0.8/1 TITLE=1/-1/~ ^ @ HEIGHTS, AbsVORT AND WIND!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hght_avg.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hght_avg.attr index 2f299d1702..6d754ed3d7 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hght_avg.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hght_avg.attr @@ -17,7 +17,6 @@ FINT= FLINE= HILO= HLSYM= -CLRBAR=0 WIND= TITLE=5/-1/~ @ HEIGHTS!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hght_rh_omega.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hght_rh_omega.attr index 0bc6bfdc46..8256f5a7ca 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hght_rh_omega.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hght_rh_omega.attr @@ -19,7 +19,6 @@ FINT=70;90 FLINE=0;23;22 HILO= HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ @ HEIGHTS, REL HUMIDITY AND OMEGA! COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hght_tmp_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hght_tmp_wind.attr index 8da4785894..6d5f0e5f40 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hght_tmp_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hght_tmp_wind.attr @@ -18,7 +18,6 @@ FINT=-24;-18;-12;-6; 0 FLINE=24; 30; 28;29;25; 0 HILO=0 HLSYM=0 -CLRBAR=1 WIND=3/.9/1 TITLE=1/-2/~ @ HEIGHTS, TEMPERATURE AND WIND (KTS)! COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hght_tmp_wind_al.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hght_tmp_wind_al.attr index c6b488d53d..633e4e1dbb 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hght_tmp_wind_al.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hght_tmp_wind_al.attr @@ -18,7 +18,6 @@ FINT=-24;-18;-12;-6;0;18 FLINE=24;30;28;29;25;0;17 HILO= HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ ^ @ HGHTS, TEMPERATURE AND WIND (KTS)! COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hght_tmp_wind_ncf.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hght_tmp_wind_ncf.attr index 21c4a79433..14c17902b6 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hght_tmp_wind_ncf.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hght_tmp_wind_ncf.attr @@ -17,7 +17,6 @@ FINT= FLINE= HILO=0 HLSYM=0 -CLRBAR=1 WIND=3/.9/1 TITLE=1/0/~ @ HEIGHT, TEMPERATURE AND WIND (KTS)! COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hght_wind_dwpt.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hght_wind_dwpt.attr index e4c6562fd0..8bb286f790 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hght_wind_dwpt.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hght_wind_dwpt.attr @@ -19,7 +19,6 @@ FINT=4;8;12;16;20 FLINE=0;23;22;30;14;2 HILO=0!0!6/H#;L# HLSYM=0!0!1.5;1.5//22;22/2;2/hw -CLRBAR=1/V/LL!0 WIND=9/0.9/2/112 TITLE=1/-1/~ @ DEW POINT (GREATER THAN -4), WIND (KTS), AND HEIGHT!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hght_wind_dwpt_al.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hght_wind_dwpt_al.attr index be37367a86..dbb8672f4e 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hght_wind_dwpt_al.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hght_wind_dwpt_al.attr @@ -18,7 +18,6 @@ FINT=4;8;12;16;20 FLINE=0;23;22;30;14;2 HILO=0!0!6/H#;L# HLSYM=0!0!1.5;1.5//22;22/2;2/hw -CLRBAR=1/V/LL!0 WIND=9/0.9/2/112 TITLE=1/-1/~ @ DEW POINT, WIND (KTS), AND HGHT!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hgt_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hgt_wind.attr index fe8c221748..588404a4df 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hgt_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_hgt_wind.attr @@ -17,7 +17,7 @@ FINT = 20;35;50;65 FLINE = 0;24;25;30;15 HILO = 0 !20/H#;L#/ HLSYM = 0 !1.5;1.5//22;22/3;3/hw -CLRBAR = 1/V/LL!0 +!CLRBAR = 1/V/LL!0 WIND = 9/0.7/2/112 TITLE = 1/-1/~ @HGT, WIND (KTS) COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_streamlines.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_streamlines.attr index 7e90a65227..72600950e3 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_streamlines.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_streamlines.attr @@ -17,7 +17,6 @@ FINT=20;35;50;65 FLINE=0;18;17;16;15 HILO= HLSYM= -CLRBAR=1 WIND=bk0 TITLE=1/-2/~ 850 MB STREAMLINES, WIND|~850 MB STMLNS!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_thtae_advection.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_thtae_advection.attr index fde80c29dd..a48411c0c3 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_thtae_advection.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_thtae_advection.attr @@ -20,7 +20,6 @@ FINT=-14;-10;-6;-2;2;6;10;14 FLINE=7;29;30;24;0;14;15;18;5 HILO=0 HLSYM=0 -CLRBAR=1/V/LL!0 WIND=9/0.8/2/112 TITLE=1/-1/~ @ HGHT, THTAE ADVECTION, THTAE, WIND (KTS)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_thtae_ncf.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_thtae_ncf.attr index fc5cc185e1..dc76def2b6 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_thtae_ncf.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_thtae_ncf.attr @@ -17,7 +17,6 @@ FINT= FLINE= HILO=0 HLSYM=0 -CLRBAR=0 WIND= TITLE=1/-1/~ @ THTAE!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_tmp.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_tmp.attr index c385cdcaeb..de1247d8cb 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_tmp.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_tmp.attr @@ -17,7 +17,6 @@ FINT=-24;-18;-12;-6;0;18 FLINE=24;30;28;29;25;0;17 HILO= HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ @ TEMPERATURE! COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_tmpc.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_tmpc.attr index fe2727bc6a..80dcc501a8 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_tmpc.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_tmpc.attr @@ -11,7 +11,6 @@ FINT=-36;-30;-24;-18;-12 FLINE=24;30;28;29;25;0 HILO= HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ ^ @ TEMPERATURE COLORS=3 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wind.attr index 7bc317ae78..0f71d74aac 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wind.attr @@ -18,7 +18,6 @@ FINT=70;90;110;130;150 FLINE=0;25;24;29;7;15 HILO= HLSYM= -CLRBAR=0 WIND=18/1/1 TITLE=5/-1/~ ^ @ HEIGHTS, ISOTACHS AND WIND (KTS)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wind_and_rel_vort.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wind_and_rel_vort.attr index 2a411840a2..1b949c5172 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wind_and_rel_vort.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wind_and_rel_vort.attr @@ -19,7 +19,6 @@ FINT=4;6;8;10;12;14;16;18 FLINE=0;14;15;16;17;18;19;20;3 HILO=2;6/X;N/-99--4;4-99 ! 0 HLSYM=0 -CLRBAR= WIND=6/.8/2/112 TITLE=1/-1/~ @ WIND AND RELATIVE VORTICITY$!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wind_pw.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wind_pw.attr index 12e7dd2e3a..e530a05ce5 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wind_pw.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wind_pw.attr @@ -19,7 +19,6 @@ FINT=!0.5;1.0;1.5;2.0 FLINE=!0;23;22;21;2 HILO=0 HLSYM=0 -CLRBAR=0 !1/V/LL WIND=9/0.8/2/112 TITLE=1/-1/~ 850mb WIND (KTS) and PRECIPITABLE WATER COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wind_pw_mm.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wind_pw_mm.attr index 5a23f1a61e..6545d312bb 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wind_pw_mm.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wind_pw_mm.attr @@ -18,7 +18,6 @@ FINT=!13;25;38;50 FLINE=!0;23;22;21;2 HILO=0 HLSYM=0 -CLRBAR=0 !1/V/LL WIND=! !9/0.9/2/112 TITLE=1/-1/~ 850 mb WIND (KTS) and PRECIP WATER (MM)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wind_pw_mm_ncf.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wind_pw_mm_ncf.attr index 10c0ae5bb8..2d93535fdd 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wind_pw_mm_ncf.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wind_pw_mm_ncf.attr @@ -17,7 +17,7 @@ FINT = FLINE = HILO = 0 HLSYM = 0 -CLRBAR= 0 +!CLRBAR= 0 WIND = ! ! !9/0.9/2/112 TITLE = 1/-1/~ 850mb WIND (KTS) and PRECIP WATER (MM) !0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wind_pw_ncf.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wind_pw_ncf.attr index 61bb152d86..dd271a577d 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wind_pw_ncf.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wind_pw_ncf.attr @@ -18,7 +18,7 @@ FINT = FLINE = HILO = 0 HLSYM = 0 -CLRBAR= 0 +!CLRBAR= 0 WIND = 9/0.9/2/112 TITLE = 1/-1/~ 850mb WIND (KTS) and PRECIP WATER COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wind_pw_ncf_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wind_pw_ncf_nam.attr index 834c0d0832..70e6cee265 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wind_pw_ncf_nam.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wind_pw_ncf_nam.attr @@ -18,7 +18,7 @@ FINT = FLINE = HILO = 0 HLSYM = 0 -CLRBAR = 0 +!CLRBAR = 0 WIND = 9/0.9/2/112 TITLE = 1/-1/~ 850mb WIND (KTS) and PRECIP WATER COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wnd.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wnd.attr index 16b49a3315..ca5a941615 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wnd.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wnd.attr @@ -17,7 +17,6 @@ FINT= FLINE= HILO= HLSYM= -CLRBAR=0 WIND=18/.8 TITLE=5/-1/~ @ WIND! COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/900mb_hght_rh_omega.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/900mb_hght_rh_omega.attr index 513c9e2ebb..8e2d3d7f30 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/900mb_hght_rh_omega.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/900mb_hght_rh_omega.attr @@ -19,7 +19,6 @@ FINT=70;90 FLINE=0;23;22 HILO= HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ @ HEIGHTS, REL HUMIDITY AND OMEGA! COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/925mb_hght_rh_omega.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/925mb_hght_rh_omega.attr index 05771d2f93..bad8168ea2 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/925mb_hght_rh_omega.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/925mb_hght_rh_omega.attr @@ -19,7 +19,6 @@ FINT=70;90 FLINE=0;23;22 HILO= HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ @ HEIGHTS, REL HUMIDITY AND OMEGA! COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/925mb_hght_tmp_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/925mb_hght_tmp_wind.attr index 476edbd8e0..5111329272 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/925mb_hght_tmp_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/925mb_hght_tmp_wind.attr @@ -18,7 +18,6 @@ FINT=-24;-18;-12;-6;0;18 FLINE=24;30;28;29;25;0;17 HILO= HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ ^ @ HEIGHTS, TEMPERATURE AND WIND (KTS)! COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/925mb_streamlines.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/925mb_streamlines.attr index ee2f959f43..ce6d444ebd 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/925mb_streamlines.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/925mb_streamlines.attr @@ -17,7 +17,6 @@ FINT=20;35;50;65 FLINE=0;18;17;16;15 HILO= HLSYM= -CLRBAR=1 WIND=bk0 TITLE=1/-2/~ 925 MB STREAMLINES, WIND|~925 MB STMLNS!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/FFG0124hr.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/FFG0124hr.attr index cdae49a68a..81909a1894 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/FFG0124hr.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/FFG0124hr.attr @@ -16,7 +16,6 @@ FINT=50;60;70;80;90 FLINE=0;29;28;27;26;0 HILO= HLSYM= -CLRBAR= WIND=18/1/1 TITLE=1/-1/~ FFG0124hr !0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ICIP.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ICIP.attr index 8878b286bc..a1d68ac080 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ICIP.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ICIP.attr @@ -16,7 +16,6 @@ FINT= FLINE=0;29;28;27;26;0 HILO= HLSYM= -CLRBAR=0 WIND= TITLE=1/-1/~ ICIP COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/MOS_TMPF_AK.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/MOS_TMPF_AK.attr index 5b05e31cda..5091954c3b 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/MOS_TMPF_AK.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/MOS_TMPF_AK.attr @@ -16,7 +16,6 @@ FINT=50;60;70;80;90 FLINE=0;29;28;27;26;0 HILO= HLSYM= -CLRBAR=0 WIND=18/1/1 TITLE=1/-1/~ Temperature (in F) COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/P48M.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/P48M.attr index e19c61798c..ec3c07ade1 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/P48M.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/P48M.attr @@ -20,7 +20,7 @@ FINT = .01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.5;3;4;5;6;7;8;9 FLINE = 0;21-30;14-20;5 HILO = 31;0/x#2/0.1-99//100;0/y HLSYM = 1.5 -CLRBAR= 1 +!CLRBAR= 1 WIND = TITLE = 5/-1/~ 48-HR TOTAL PRECIPITATION! COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/SBT122.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/SBT122.attr index 7868580afa..73586e9a20 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/SBT122.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/SBT122.attr @@ -16,7 +16,6 @@ FINT=10;15;20;25;30 FLINE=0;20;21;22;23;0 HILO= HLSYM= -CLRBAR=0 WIND=0 TITLE=1/-1/~ Simulated Brightness Temperature for GOES12 channel 2 !0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/TP1hr.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/TP1hr.attr index 50fe47b11e..21cbc11fcf 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/TP1hr.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/TP1hr.attr @@ -16,7 +16,6 @@ FINT=50;60;70;80;90 FLINE=0;29;28;27;26;0 HILO= HLSYM= -CLRBAR= WIND=18/1/1 TITLE=1/-1/~ TP1HR !0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/TP6hr.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/TP6hr.attr index 4df46b0e77..d31785e314 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/TP6hr.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/TP6hr.attr @@ -16,7 +16,6 @@ FINT=50;60;70;80;90 FLINE=0;29;28;27;26;0 HILO= HLSYM= -CLRBAR= WIND=18/1/1 TITLE=1/-1/~ TP6HR !0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/WS-25000E3.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/WS-25000E3.attr index cc96924721..cdd3ac2713 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/WS-25000E3.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/WS-25000E3.attr @@ -17,7 +17,6 @@ FINT=50;60;70;80;90 FLINE=0;29;28;27;26;0 HILO= HLSYM= -CLRBAR= WIND=18/1/1 TITLE=1/-1/~ WS-25000E3 !0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/best_li.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/best_li.attr index 074ca25de9..8fd05bb03f 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/best_li.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/best_li.attr @@ -17,7 +17,6 @@ FINT=0 FLINE=0 HILO=0 HLSYM=0 -CLRBAR=0 WIND=0 TITLE=1/-2/~ BEST LI (0-180 MB AGL)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bestcape_cin.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bestcape_cin.attr index 982f9ef7b1..749122d4c4 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bestcape_cin.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bestcape_cin.attr @@ -20,7 +20,6 @@ FINT=1000;2000;3000;4000;5000 FLINE=0;23;30;15;2;5 HILO=0!0 HLSYM=1;1//22;22/2;2/hw -CLRBAR=1/V/LL!0 WIND=0 TITLE=1/-1/~ 0-180 MB AGL BEST CAPE (jkg-1), CIN (cyan)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bestcape_cin_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bestcape_cin_nam.attr index bde2083732..f6ae31f681 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bestcape_cin_nam.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bestcape_cin_nam.attr @@ -19,7 +19,7 @@ FINT = 1000;2000;3000;4000;5000 FLINE = 0;23;30;15;2;5 HILO = 0!0 HLSYM = 1;1//22;22/2;2/hw -CLRBAR= 1/V/LL!0 +!CLRBAR= 1/V/LL!0 WIND = 0 TITLE = 1/-1/~ 0-180 MB AGL BEST CAPE (jkg-1) AND CIN (cyan)!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bestcape_cin_ncf.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bestcape_cin_ncf.attr index d17ba12a44..6f2547184e 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bestcape_cin_ncf.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bestcape_cin_ncf.attr @@ -20,7 +20,6 @@ FINT=0 FLINE=0 HILO=0!0 HLSYM=0 -CLRBAR=0 WIND=0 TITLE=1/-1/~ BEST CAPE (0-180 MB AGL)(jkg-1) CIN (cyan)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bestcape_cin_ncf_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bestcape_cin_ncf_nam.attr index 31a63273d6..b34c1c923c 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bestcape_cin_ncf_nam.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bestcape_cin_ncf_nam.attr @@ -19,7 +19,7 @@ FINT = 0 FLINE = 0 HILO = 0!0 HLSYM = 0 -CLRBAR= 0 +!CLRBAR= 0 WIND = 0 TITLE = 1/-1/~ BEST CAPE (0-180 MB AGL)(jkg-1) AND CIN (cyan)!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl1_rh.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl1_rh.attr index 42ba569119..552a812191 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl1_rh.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl1_rh.attr @@ -20,7 +20,6 @@ FINT=70;80;90;95 FLINE=0;24;23;22;14 HILO=0 HLSYM=0 -CLRBAR=1/V/LL!0 WIND=9/0.8/2/112 TITLE=1/-1/~ 0-30MB AGL RELH AND WIND (KTS) AND 60-90MB AGL OMEGA!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl1_rh_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl1_rh_nam.attr index 1ac6858600..a63256055c 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl1_rh_nam.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl1_rh_nam.attr @@ -22,7 +22,7 @@ FLINE=0;24;23;22;14 HILO=0 HLSYM=0 WIND=9/0.8/2/112 -CLRBAR=1/V/LL!0 +!CLRBAR=1/V/LL!0 TITLE=1/-1/~ 0-30MB AGL RELH AND WIND (KTS) AND 60-90MB AGL OMEGA!0 COLORS=2 MARKER=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl2-5_rh.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl2-5_rh.attr index c548bfc062..fad75639f3 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl2-5_rh.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl2-5_rh.attr @@ -21,7 +21,6 @@ FINT=70;80;90;95 FLINE=0;24;23;22;14 HILO=0!0!0 HLSYM=0!0!0 -CLRBAR=1/V/LL!0 WIND=9/0.8/2/112 TITLE=1/-1/~ 20-160MB AGL RH, 60-90MB AGL OMEGA, WND (0-30MB AGL)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_1000mb_temp.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_1000mb_temp.attr index 79626647d7..0f2dbd86ba 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_1000mb_temp.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_1000mb_temp.attr @@ -17,7 +17,6 @@ FINT= FLINE= HILO=0 HLSYM=0 -CLRBAR=0 WIND= TITLE=1/-2/~ 1000 MB TEMPERATURE (F)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_2-meter_12hrmax_temp.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_2-meter_12hrmax_temp.attr index 243304b447..b32b6a0aa7 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_2-meter_12hrmax_temp.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_2-meter_12hrmax_temp.attr @@ -19,7 +19,6 @@ FINT= FLINE= HILO=0 HLSYM=0 -CLRBAR=0 WIND= TITLE=1/-2/~ 2-METER 12-HR MAX TEMPERATURE (F)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_2-meter_12hrmax_temp_c.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_2-meter_12hrmax_temp_c.attr index 0e7daf5008..7305ef395d 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_2-meter_12hrmax_temp_c.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_2-meter_12hrmax_temp_c.attr @@ -17,7 +17,6 @@ FINT= FLINE= HILO=0 HLSYM=0 -CLRBAR=0 WIND= TITLE=1/-2/~ 2-METER 12-HR MAX TEMPERATURE (C)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_2-meter_12hrmin_temp.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_2-meter_12hrmin_temp.attr index cf195b0e1f..3b368f17a2 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_2-meter_12hrmin_temp.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_2-meter_12hrmin_temp.attr @@ -19,7 +19,6 @@ FINT= FLINE= HILO=0 HLSYM=0 -CLRBAR=0 WIND= TITLE=1/-2/~ 2-METER 12-HR MIN TEMPERATURE (F)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_2-meter_12hrmin_temp_c.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_2-meter_12hrmin_temp_c.attr index 67a40c3eef..6222a8a0a6 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_2-meter_12hrmin_temp_c.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_2-meter_12hrmin_temp_c.attr @@ -17,7 +17,6 @@ FINT= FLINE= HILO=0 HLSYM=0 -CLRBAR=0 WIND= TITLE=1/-2/~ 2-METER 12-HR MIN TEMPERATURE (C)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_2-meter_temp.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_2-meter_temp.attr index faa3eeac93..31c6bc5de4 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_2-meter_temp.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_2-meter_temp.attr @@ -17,7 +17,6 @@ FINT= FLINE= HILO=0 HLSYM=0 -CLRBAR=0 WIND= TITLE=1/-2/~ 2-METER TEMPERATURE (F)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_2-meter_temp_c.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_2-meter_temp_c.attr index 3d7cfd0fa4..fe19780473 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_2-meter_temp_c.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_2-meter_temp_c.attr @@ -17,7 +17,6 @@ FINT= FLINE= HILO=0 HLSYM=0 -CLRBAR=0 WIND= TITLE=1/-2/~ 2-METER TEMPERATURE (C)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_dwpt_c.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_dwpt_c.attr index 8f506d2504..39a69b90b4 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_dwpt_c.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_dwpt_c.attr @@ -17,7 +17,6 @@ FINT=0 FLINE=0 HILO=0 HLSYM=0 -CLRBAR=0 WIND=9/0.7/2/112 TITLE=1/-1/~ BL WIND (KTS) AND DEW POINT!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_h2o_conv.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_h2o_conv.attr index 1cdae2420d..1ccae467f3 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_h2o_conv.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_h2o_conv.attr @@ -21,7 +21,6 @@ FINT=-9;-7;-5;-3;-1 FLINE=2;15;21;22;23;0 HILO=!!!!6/H#;L#/1020-1070;900-1016 HLSYM=1;1/2//4;1.5/0 -CLRBAR=1 WIND=10/0.75/1.5/112 TITLE=1/-1/~ BL (18MB AGL)MOISTURE CONVERGENCE, WIND (KTS) and THTAE!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_h2o_conv_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_h2o_conv_nam.attr index 75e0af2958..a2ade5506d 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_h2o_conv_nam.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_h2o_conv_nam.attr @@ -20,7 +20,7 @@ FINT = -9;-7;-5;-3;-1 FLINE = 2;15;21;22;23;0 HILO = !!!!6/H#;L#/1020-1070;900-1016 HLSYM = 1;1/2//4;1.5/0 -CLRBAR = 1 +!CLRBAR = 1 WIND = 10/0.75/1.5/112 TITLE = 1/-1/~ BL (18MB AGL)MOISTURE CONVERGENCE, WIND (KTS) and THTAE!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_h2o_conv_ncf.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_h2o_conv_ncf.attr index 3d98515802..10b4d59247 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_h2o_conv_ncf.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_h2o_conv_ncf.attr @@ -19,7 +19,7 @@ FINT = 0 FLINE = 0 HILO = 0 HLSYM = 0 -CLRBAR= 1 +!CLRBAR= 1 WIND = 10/0.75/1.5/112 TITLE = 1/-1/~ BL (18MB AGL) MOIST CONV, WIND (KTS) and THTAE!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_h2o_conv_ncf_global.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_h2o_conv_ncf_global.attr index f3ce2dcaa4..844c674419 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_h2o_conv_ncf_global.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_h2o_conv_ncf_global.attr @@ -18,7 +18,7 @@ FINT = 0 FLINE = 0 HILO = 0 HLSYM = 0 -CLRBAR= 1 +!CLRBAR= 1 WIND = 10/0.75/1.5/112 TITLE = 1/-1/~ (~995 MB) BL MOIST CONV, WIND (KTS) and THTAE!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_h2o_conv_ncf_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_h2o_conv_ncf_nam.attr index a02b4345eb..cc5c0ff048 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_h2o_conv_ncf_nam.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_h2o_conv_ncf_nam.attr @@ -19,7 +19,7 @@ FINT = 0 FLINE = 0 HILO = 0 HLSYM = 0 -CLRBAR = 1 +!CLRBAR = 1 WIND = 10/0.75/1.5/112 TITLE = 1/-1/~ BL (18MB AGL) MOIST CONV, WIND (KTS) and THTAE!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_h2o_trnsp_omgq.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_h2o_trnsp_omgq.attr index 003308394a..eec0e6ae53 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_h2o_trnsp_omgq.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_h2o_trnsp_omgq.attr @@ -18,7 +18,6 @@ FINT=1;3;5;7;9 FLINE=0;23;22;28;15;2 HILO=0 HLSYM=0 -CLRBAR=1/V/LL!0 WIND=6/0.6/2/222/0.4 TITLE=1/-1/~ BL H2O TRNSP,OROG OMG*MIXR,SFC HT!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_moist_conv.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_moist_conv.attr index 1139bc679c..e0d6d36708 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_moist_conv.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_moist_conv.attr @@ -17,6 +17,5 @@ FINT=-7;-5;-3;-1 FLINE=2;23;22;3;0 HILO=0 HLSYM=0!1;1//22;22/2;2/hw -CLRBAR=1/V/LL!0 WIND=bk0!bk0!bk0!bk0!bk9/0.7/2/112 TITLE=1/-2/~ RUC2 1000 MB MOIST CONV,SFC DEWPOINT, WIND|~1000 MB MST CONV!0 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_moistconv_wind_dwpt.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_moistconv_wind_dwpt.attr index 9fd05fe443..c27155e0eb 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_moistconv_wind_dwpt.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_moistconv_wind_dwpt.attr @@ -20,7 +20,6 @@ FINT=-7;-5;-3;-1 FLINE=2;23;22;3;0 HILO=0 HLSYM=0!1;1//22;22/2;2/hw -CLRBAR=1/V/LL!0 WIND=9/0.9/2/112 TITLE=1/-1/~ 18 MB AGL MOIST CONVERGENCE, WIND (KTS), DEW POINT!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_moistconv_wind_dwpt_global.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_moistconv_wind_dwpt_global.attr index 5b534df2ed..b4e4564422 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_moistconv_wind_dwpt_global.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_moistconv_wind_dwpt_global.attr @@ -18,7 +18,7 @@ FINT = -7;-5;-3;-1 FLINE = 2;23;22;3;0 HILO = 0 HLSYM = 0!1;1//22;22/2;2/hw -CLRBAR= 1/V/LL!0 +!CLRBAR= 1/V/LL!0 WIND = 9/0.7/2/112 TITLE = 1/-1/~ BL MOIST FLUX CONVERGENCE, WIND (KTS), DEW POINT!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_moisture_conv.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_moisture_conv.attr index 39dc3ff7b1..246f66be54 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_moisture_conv.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_moisture_conv.attr @@ -18,7 +18,6 @@ FINT=-8;-6;-4;-2 FLINE=2;16;24;3;0 HILO=0 HLSYM=0 -CLRBAR=1 WIND=9/0.8/2/112 TITLE=1/-1/~ 40m AGL MOISTURE CONVERGENCE AND WIND (KTS)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_moisture_conv_thtae.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_moisture_conv_thtae.attr index a1980c826e..0b83f3ba88 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_moisture_conv_thtae.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_moisture_conv_thtae.attr @@ -18,7 +18,7 @@ FINT = -9;-7;-5;-3;-1 FLINE = 2;15;21;22;23;0 HILO = !!!!6/H#;L#/1020-1070;900-1012 HLSYM = 1;1/2//4;1.5/0 -CLRBAR= 1 +!CLRBAR= 1 WIND = 10/0.75/1.5/112 TITLE = 1/-1/~ (~995 MB) MOISTURE CONVERGENCE, WIND (KTS), THTAE!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_rh.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_rh.attr index 039b487775..f60323223a 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_rh.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_rh.attr @@ -19,7 +19,6 @@ FINT=70;80;90 FLINE=0;23;22;3 HILO=0 HLSYM=0 -CLRBAR=1/V/LL!0 WIND=9/0.9/2/112 TITLE=1/0/~ BL (~30 MB MEAN AGL) RH, WIND (KTS)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_rh_lake.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_rh_lake.attr index e17d5ab852..e4a677bfae 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_rh_lake.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_rh_lake.attr @@ -19,7 +19,6 @@ FINT=80;90 FLINE=0;23;22 HILO=0 HLSYM=0 -CLRBAR=1/V/LL!0 WIND=9/0.9/2/112 TITLE=1/-1/~ BL3-6 RH, BL1 WIND (KTS), BL6 OMG, 850-2m dT (YEL), 850 T (RED)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_sgma_9950_temp.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_sgma_9950_temp.attr index 84f3de4d42..0950f7d397 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_sgma_9950_temp.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_sgma_9950_temp.attr @@ -17,7 +17,6 @@ FINT= FLINE= HILO=0 HLSYM=0 -CLRBAR=0 WIND= TITLE=1/-2/~ BL (9950 SGMA) TEMPERATURE (F)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_ncf.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_ncf.attr index e7a60c1a6c..9151ad3e15 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_ncf.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_ncf.attr @@ -17,7 +17,7 @@ FINT = FLINE = HILO = 0 HLSYM = 0 -CLRBAR= 1/V/LL +!CLRBAR= 1/V/LL WIND = TITLE = 1/-1/~ BL THTE!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_ncf_cmc.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_ncf_cmc.attr index 43a01dd23e..9f19cc2152 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_ncf_cmc.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_ncf_cmc.attr @@ -17,7 +17,7 @@ FINT = FLINE = HILO = 0 HLSYM = 0 -CLRBAR = 1/V/LL +!CLRBAR = 1/V/LL WIND = TITLE = 1/-1/~ BL THTE!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_ncf_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_ncf_nam.attr index 79ad11faa2..11ae503949 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_ncf_nam.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_ncf_nam.attr @@ -17,7 +17,7 @@ FINT = 0 FLINE = 0 HILO = 0 HLSYM = 0 -CLRBAR = 1 +!CLRBAR = 1 WIND = TITLE = 1/-1/~ BL (18MB AGL) THTAE!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_wind.attr index 99062dada2..621bb5075e 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_wind.attr @@ -20,7 +20,6 @@ FINT=328;336;344;352;360;368 FLINE=0;24;30;29;15;18;20 HILO=0 HLSYM=0 -CLRBAR=1/V/LL!0 WIND=9/0.7/2/112 TITLE=1/-1/~ BL (0-30 MB AGL) THTE AND WIND (KTS)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_wind_global.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_wind_global.attr index d3eb449ef6..dd5eab5a35 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_wind_global.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_wind_global.attr @@ -22,7 +22,7 @@ HILO= 0 HLSYM= 0 WIND= 9/0.7/2/112 TITLE= 1/-1/~ BL (5 MB AGL) THTE AND WIND (KTS)!0 -CLRBAR= 1/V/LL!0 +!CLRBAR= 1/V/LL!0 COLORS= 2 MARKER= 2 GRDLBL= 5 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_wind_mono.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_wind_mono.attr index 641ee39e10..c12f450cd3 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_wind_mono.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_wind_mono.attr @@ -17,7 +17,6 @@ FINT=0 FLINE=00 HILO=0 HLSYM=0 -CLRBAR=1/V/LL!0 WIND=18/0.8/1/112 TITLE=1/-1/~ BL (18MB AGL) THTE AND WIND (KTS)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_wind_mono_global.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_wind_mono_global.attr index 920df81142..06fbffe9cb 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_wind_mono_global.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_wind_mono_global.attr @@ -17,7 +17,7 @@ FINT = 0 FLINE = 00 HILO = 0 HLSYM = 0 -CLRBAR= 1/V/LL!0 +!CLRBAR= 1/V/LL!0 WIND = 18/0.8/1/112 TITLE = 1/-1/~ BL (5 MB AGL) THTE AND WIND (KTS)!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_wind_mono_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_wind_mono_nam.attr index af3014c3fd..34f859f3e6 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_wind_mono_nam.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_wind_mono_nam.attr @@ -17,7 +17,7 @@ FINT = 0 FLINE = 00 HILO = 0 HLSYM = 0 -CLRBAR = 1/V/LL!0 +!CLRBAR = 1/V/LL!0 WIND = 18/0.8/1/112 TITLE = 1/-1/~ BL (18MB AGL) THTE AND WIND (KTS)!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_wind.attr index 6ba6851c04..81c545681d 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_wind.attr @@ -17,7 +17,6 @@ FINT= FLINE= HILO=0 HLSYM=0 -CLRBAR=1/V/LL!0 WIND=18/1/1 TITLE=1/-2/~TEMPERATURE (F)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_winds_only.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_winds_only.attr index d03d510e5f..aab71d057f 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_winds_only.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_winds_only.attr @@ -17,7 +17,6 @@ FINT= FLINE= HILO= HLSYM= -CLRBAR= WIND=9/0.7/1.5/112 TITLE=1/-1/~ BL WIND (40m; KTS) COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_winds_only_global.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_winds_only_global.attr index 81a7546039..9cc6aec420 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_winds_only_global.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_winds_only_global.attr @@ -17,7 +17,7 @@ FINT = FLINE = HILO = HLSYM = -CLRBAR= 0 +!CLRBAR= 0 WIND = 9/0.7/1.5/112 TITLE = 1/-1/~ BL WIND (40m; KTS) COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_winds_only_nogaps.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_winds_only_nogaps.attr index 30605f5aec..718e65d480 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_winds_only_nogaps.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_winds_only_nogaps.attr @@ -18,7 +18,7 @@ FINT = FLINE = HILO = HLSYM = -CLRBAR = 0 +!CLRBAR = 0 WIND = 9/0.7/1.5/112 TITLE = 1/-1/~ BL WIND (10m; KTS) COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_winds_only_ukmet.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_winds_only_ukmet.attr index db4bcb8230..b95de84fb9 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_winds_only_ukmet.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_winds_only_ukmet.attr @@ -17,7 +17,7 @@ FINT = FLINE = HILO = HLSYM = -CLRBAR= 0 +!CLRBAR= 0 WIND = 9/0.7/1.5/112 TITLE = 1/-1/~ SFC WIND (KTS) COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/categorical_rain.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/categorical_rain.attr index 82afa21fe5..3c9f64dd14 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/categorical_rain.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/categorical_rain.attr @@ -17,7 +17,6 @@ FINT=1 FLINE=0;21-30;14-20;5 HILO=0 HLSYM=0 -CLRBAR=0 WIND= TITLE=5/-1/~ CRAIN COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ct_index.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ct_index.attr index 62c7c46f23..a470b45e74 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ct_index.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ct_index.attr @@ -17,7 +17,6 @@ FINT=16;20;24;28 FLINE=0;24;30;14;2 HILO=0!0!0!6/H#;L# HLSYM=!!!1.5;1.5//22;22/3;3/hw -CLRBAR=1 WIND=bk0 TITLE=1/0/~ CT INDEX, 700mb TEMP (GREATER THAN 6 C), BL DWPT AND MSLP|~CT INDEX COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ct_index_global.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ct_index_global.attr index 9a475988f4..953cb6c815 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ct_index_global.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ct_index_global.attr @@ -18,7 +18,7 @@ FINT = 16;20;24;28 FLINE = 0;24;30;14;2 HILO = 0!0!0!6/H#;L# HLSYM = !!!1.5;1.5//22;22/3;3/hw -CLRBAR= 1 +!CLRBAR= 1 WIND = bk0 TITLE = 1/0/~ CT INDEX, 700mb TEMP (GREATER THAN 6 C), BL DWPT AND MSLP|~CT INDEX FILTER= 1 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/dewpoint.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/dewpoint.attr index f7ef65d8d6..27858e7aa3 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/dewpoint.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/dewpoint.attr @@ -16,7 +16,6 @@ FINT=50;60;70;80;90 FLINE=0;29;28;27;26;0 HILO= HLSYM= -CLRBAR=1 WIND=18/1/1 TITLE=1/-1/~ Dewpoint (in Kelvin) COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/direction_of_wind_wave.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/direction_of_wind_wave.attr index ab280de576..e1b6361462 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/direction_of_wind_wave.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/direction_of_wind_wave.attr @@ -16,7 +16,6 @@ FINT= FLINE= HILO= HLSYM= -CLRBAR=0 WIND= TITLE=1/-1/~ Direction Of Wind Wave !0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/directional_width_of_wind_wave.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/directional_width_of_wind_wave.attr index bb90f01192..3b429773b6 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/directional_width_of_wind_wave.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/directional_width_of_wind_wave.attr @@ -16,7 +16,6 @@ FINT=50;60;70;80;90 FLINE=0;29;28;27;26;0 HILO= HLSYM= -CLRBAR= WIND=18/1/1 TITLE=1/-1/~ Directional width Of Wind Wave !0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/emsl_and_10m_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/emsl_and_10m_wind.attr index 98631ebd19..c8eddc6bcb 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/emsl_and_10m_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/emsl_and_10m_wind.attr @@ -18,7 +18,7 @@ FINT = 20;35;50;65 FLINE = 0;24;25;30;15 HILO = 0!20/H#;L#/1020-1070;900-1012 HLSYM = 0!1.5;1.5//22;22/3;3/hw -CLRBAR = 1/V/LL!0 +!CLRBAR = 1/V/LL!0 WIND = 9/0.7/2/112 TITLE = 1/-1/~ EMSL, 10m WIND (AGL; KTS) COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/emsl_and_bl_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/emsl_and_bl_wind.attr index a009939c3d..04c3d510fe 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/emsl_and_bl_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/emsl_and_bl_wind.attr @@ -18,7 +18,7 @@ FINT = 20;35;50;65 FLINE = 0;24;25;30;15 HILO = 0!20/H#;L#/1020-1070;900-1012 HLSYM = 0!1.5;1.5//22;22/3;3/hw -CLRBAR = 1/V/LL!0 +!CLRBAR = 1/V/LL!0 WIND = 9/0.6/2/112 TITLE = 1/-1/~ EMSL, BL WIND (0-30 MB AGL; KTS) COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/emsl_and_ll_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/emsl_and_ll_wind.attr index e9d7d328f2..2049cf283e 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/emsl_and_ll_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/emsl_and_ll_wind.attr @@ -18,7 +18,7 @@ FINT = 20;35;50;65 FLINE = 0;24;25;30;15 HILO = 0!20/H#;L#/1020-1070;900-1012 HLSYM = 0!1.5;1.5//22;22/3;3/hw -CLRBAR = 1/V/LL!0 +!CLRBAR = 1/V/LL!0 WIND = 9/0.6/2/112 TITLE = 1/-1/~ EMSL, LL WIND (2nd Eta LVL 30-60 MB ABOVE SFC; KTS) COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/emsl_bl1_wind_850mb_tad.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/emsl_bl1_wind_850mb_tad.attr index ff43e79ece..c041528677 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/emsl_bl1_wind_850mb_tad.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/emsl_bl1_wind_850mb_tad.attr @@ -20,7 +20,7 @@ FINT=-7;-5;-3;-1;1;3;5;7 FLINE=7;29;30;24;0;14;15;18;5 HILO=0!0!1/H#;L#/1020-1070;900-1012 HLSYM=0!0!1.5;1.5//22;22/3;3/hw -CLRBAR=1/V/LL!0 +!CLRBAR=1/V/LL!0 WIND=9/0.8/2/112 TITLE=1/-1/~ EMSL, (0-30MB AGL) WIND (KTS) AND 850 MB TMP ADV!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/emsl_bl_tempc_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/emsl_bl_tempc_wind.attr index 2aa724c4de..fa576e4e8d 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/emsl_bl_tempc_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/emsl_bl_tempc_wind.attr @@ -20,7 +20,6 @@ FINT=-24;-12;0 ! FLINE=29;30;24;0 ! HILO=0!0!0!20/H#;L#/1020-1070;900-1012 HLSYM=0!0!0!1.5;1.5//22;22/3;3/hw -CLRBAR=1/V/LL!0 WIND=9/0.7/2/112 TITLE=1/-1/~ EMSL PRESSURE, BL TEMPERATURE (0-30MB AGL, WIND (KTS)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/emsl_bl_tempf_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/emsl_bl_tempf_wind.attr index 75958e7071..8290382f48 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/emsl_bl_tempf_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/emsl_bl_tempf_wind.attr @@ -17,7 +17,7 @@ FINT = 20;32;0! FLINE = 29;30;24;0! HILO = 0!0!0!20/H#;L#/1020-1070;900-1012 HLSYM = 0!0!0!1.5;1.5//22;22/3;3/hw -CLRBAR = 1/V/LL!0 +!CLRBAR = 1/V/LL!0 WIND = 9/0.7/2/112 TITLE = 1/-1/~ EMSL PRESSURE, BL TEMPERATURE (0-30MB AGL), WIND (KTS)!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/emsl_thkn.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/emsl_thkn.attr index 34f90bc884..f14c2bbec0 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/emsl_thkn.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/emsl_thkn.attr @@ -18,7 +18,6 @@ FINT= FLINE= HILO=!! 26;2/H#;L#/1018-1070;900-1012//30;30/y HLSYM=2;1.5//21//hw -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ EMSL, 1000-500 MB THICKNESS!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/emsl_thkn_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/emsl_thkn_wind.attr index 5b40f8c118..558f2dc195 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/emsl_thkn_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/emsl_thkn_wind.attr @@ -17,7 +17,7 @@ FINT = FLINE = HILO = !! 26;2/H#;L#/1018-1070;900-1012//30;30/y HLSYM = 2;1.5//21//hw -CLRBAR = 1 +!CLRBAR = 1 WIND = 9/0.8/2/112 TITLE = 5/-1/~ EMSL, 1000-500 MB THICKNESS, BL WIND !0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ethkn.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ethkn.attr index 809e90570f..ab3b2baa6c 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ethkn.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ethkn.attr @@ -18,7 +18,6 @@ FINT= FLINE= HILO=! !26;2/H#;L#///30;30/y HLSYM=! !2;1.5//21//hw -CLRBAR=1 WIND=0 TITLE=1/-2/~ EST 1000-500 MB THICKNESS|~EST 1000-500 THKN! COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/extra_tropical_storm_surge.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/extra_tropical_storm_surge.attr index eb99b968bb..c309d4f0a0 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/extra_tropical_storm_surge.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/extra_tropical_storm_surge.attr @@ -16,7 +16,6 @@ FINT= FLINE= HILO= HLSYM= -CLRBAR= WIND= TITLE=1/-1/~ ETSRG !0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ffg1224hr.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ffg1224hr.attr index 9a055ecce6..16b96072dd 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ffg1224hr.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ffg1224hr.attr @@ -16,7 +16,6 @@ FINT=50;60;70;80;90 FLINE=0;29;28;27;26;0 HILO= HLSYM= -CLRBAR= WIND=18/1/1 TITLE=1/-1/~ FFG1224HR !0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/frzg_lvl_hght.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/frzg_lvl_hght.attr index 73ae5d01a7..e7bb440709 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/frzg_lvl_hght.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/frzg_lvl_hght.attr @@ -20,7 +20,6 @@ FINT=20;40;60;80;100;120 FLINE=0;12;19;18; 17; 23;0 HILO=0 HLSYM=0 -CLRBAR=1!0 WIND=0 TITLE=1/-1/~ FRZNG LEVEL HGHT, 0-30MB AGL 0C TEMP!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/frzg_lvl_hght_and_rh.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/frzg_lvl_hght_and_rh.attr index 6e74eec5f2..52fbec3cd0 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/frzg_lvl_hght_and_rh.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/frzg_lvl_hght_and_rh.attr @@ -19,7 +19,6 @@ FINT=70;90;95 !!!-100;25! FLINE=0;24;23;22 !!!8;8;0! HILO=0 HLSYM=0 -CLRBAR=1!0 WIND=0 TITLE=1/-1/~ FRZNG LEVEL HGHT, RH and 0-30MB AGL 0C TEMP!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/frzg_lvl_hght_ncf.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/frzg_lvl_hght_ncf.attr index 451d36c9f9..0ded67ced5 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/frzg_lvl_hght_ncf.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/frzg_lvl_hght_ncf.attr @@ -17,7 +17,6 @@ FINT= FLINE= HILO=0 HLSYM=0 -CLRBAR=1 WIND=0 TITLE=1/-1/~ FRZNG LEVEL HGHT, 0-30MB AGL 0C TEMP!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/great_lakes_snow.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/great_lakes_snow.attr index 18dd05040a..99ab9cf0cd 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/great_lakes_snow.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/great_lakes_snow.attr @@ -21,7 +21,6 @@ FINT=80;90 FLINE=0;23;22 HILO=0 HLSYM=0 -CLRBAR=1/V/LL!0 WIND=9/0.9/2/112 TITLE=1/-1/~ 60-90MB(AGL) RH,0-30MB WND,150-180MB OMG,850-2m dT (YEL),850 T(RED)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/great_lakes_snow2.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/great_lakes_snow2.attr index bb48401c12..441981e60f 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/great_lakes_snow2.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/great_lakes_snow2.attr @@ -17,7 +17,6 @@ FINT=80;90 FLINE=0;23;22 HILO=0 HLSYM=0 -CLRBAR=1/V/LL!0 WIND=9/0.9/2/112 TITLE=1/-1/~ 60-90MB(AGL) RH,0-30MB STRM,150-180MB OMG,850-2m dT (YEL),850 T(RED)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/great_lakes_snow2_global.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/great_lakes_snow2_global.attr index 069184b9d7..2d830ae37e 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/great_lakes_snow2_global.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/great_lakes_snow2_global.attr @@ -17,7 +17,7 @@ FINT = 80;90 FLINE = 0;23;22 HILO = 0 HLSYM = 0 -CLRBAR= 1/V/LL!0 +!CLRBAR= 1/V/LL!0 WIND = 9/0.9/2/112 TITLE = 1/-1/~ 720-940 MB RH,9950 SG STRM,850 MB OMG,850-2m dT (YEL),850 T(RED)!0 COLORS= 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/great_lakes_snow_global.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/great_lakes_snow_global.attr index 80e57159e0..dc1e45ffed 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/great_lakes_snow_global.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/great_lakes_snow_global.attr @@ -17,7 +17,7 @@ FINT = 80;90 FLINE = 0;23;22 HILO = 0 HLSYM = 0 -CLRBAR= 1/V/LL!0 +!CLRBAR= 1/V/LL!0 WIND = 9/0.9/2/112 TITLE = 1/-1/~ 720-940 MB RH,9950 SG WIND,850 MB OMG,850-2m dT (YEL),850 T(RED)!0 COLORS= 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/iceg.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/iceg.attr index 8d0d31c891..f448b2de21 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/iceg.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/iceg.attr @@ -17,7 +17,6 @@ FINT= FLINE=0;29;28;27;26;0 HILO= HLSYM= -CLRBAR=0 WIND= TITLE=1/-1/~ ICEG COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/icprb_6400.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/icprb_6400.attr index c674eba011..928669d1cb 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/icprb_6400.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/icprb_6400.attr @@ -16,7 +16,6 @@ FINT=5;6;7;8;9 FLINE=0;20;21;22;23;0 HILO= HLSYM= -CLRBAR=1/V/LL!0 WIND=18/1/1 TITLE=1/-1/~ Icing Probability !0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/icsev_6400.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/icsev_6400.attr index aac52fb59e..3b0885b60b 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/icsev_6400.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/icsev_6400.attr @@ -16,7 +16,6 @@ FINT=10;15;20;25;30 FLINE=0;20;21;22;23;0 HILO= HLSYM= -CLRBAR=1/V/LL!0 WIND=18/1/1 TITLE=1/-1/~ Icing Severity !0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/kindex_700mbtemp_bldwpt_mslp.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/kindex_700mbtemp_bldwpt_mslp.attr index 9326ec32d8..42625693ad 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/kindex_700mbtemp_bldwpt_mslp.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/kindex_700mbtemp_bldwpt_mslp.attr @@ -20,7 +20,6 @@ FINT=15;24;33;42 FLINE=0;24;30;14;2 HILO=0!0!0!6/H#;L#/1020-1070;900-1012 HLSYM=!!!1.5;1.5//22;22/3;3/hw -CLRBAR=1/V/LL!0 WIND= TITLE=1/-1/~ K INDEX, 700mb TMP (GREATER THAN 6 C), BL (0-30 MB AGL) DWPT (deg F), EMSL!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/kindex_700mbtemp_bldwpt_mslp_global.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/kindex_700mbtemp_bldwpt_mslp_global.attr index c4571da995..5e95db9fd2 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/kindex_700mbtemp_bldwpt_mslp_global.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/kindex_700mbtemp_bldwpt_mslp_global.attr @@ -18,7 +18,7 @@ FINT = 15;24;33;42 FLINE = 0;24;30;14;2 HILO = 0!0!0!6/H#;L#/1020-1070;900-1012 HLSYM = !!!1.5;1.5//22;22/3;3/hw -CLRBAR= 1/V/LL!0 +!CLRBAR= 1/V/LL!0 WIND = TITLE = 1/-1/~ K INDEX, 700mb TEMP (GREATER THAN 6 C), BL DWPT AND MSLP!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/lifted_index.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/lifted_index.attr index 025db086c6..0be16514d2 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/lifted_index.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/lifted_index.attr @@ -19,7 +19,6 @@ FINT=-8;-6;-4;-2;0.05;10 FLINE=2;15;21;22;23;0;24 HILO=0!0 HLSYM=1;1//22;22/2;2/hw -CLRBAR=1/V/LL!0 WIND=10/0.9/2/112 TITLE=1/-1/~ BEST LI (0-180 MB AGL) AND BL (0-30 MB AGL) WIND (KTS)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/lifted_index_global.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/lifted_index_global.attr index d59e4a30e1..3f2b24b464 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/lifted_index_global.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/lifted_index_global.attr @@ -20,7 +20,7 @@ FINT =-8;-6;-4;-2;0;10 FLINE =2;15;21;22;23;0;24 HILO =0 HLSYM =1;1//22;22/2;2/hw -CLRBAR=1/V/LL!0 +!CLRBAR=1/V/LL!0 WIND =!!!10/0.9/2/112 TITLE =1/-2/~ Best LIFTED INDEX AND BL WINDS (KTS)!0 COLORS =2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/lifted_index_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/lifted_index_nam.attr index 24bb38711c..13ea6bb521 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/lifted_index_nam.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/lifted_index_nam.attr @@ -18,7 +18,7 @@ FINT = -8;-6;-4;-2;0.05;10 FLINE = 2;15;21;22;23;0;24 HILO = 0!0 HLSYM = 1;1//22;22/2;2/hw -CLRBAR = 1/V/LL!0 +!CLRBAR = 1/V/LL!0 WIND = 10/0.9/2/112 TITLE = 1/-1/~ BEST LI (0-180 MB AGL) AND BL (0-30 MB AGL) WIND (KTS)!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/lifted_index_ncf.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/lifted_index_ncf.attr index 375023e671..e4b6a8fc0c 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/lifted_index_ncf.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/lifted_index_ncf.attr @@ -16,7 +16,7 @@ FINT = FLINE = HILO = 0 HLSYM = 0 -CLRBAR= 1/V/LL!0 +!CLRBAR= 1/V/LL!0 WIND = 10/0.9/2/112 TITLE = 1/-1/~ Best LIFTED INDEX AND BL WIND (KTS)!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/lifted_index_ncf_global.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/lifted_index_ncf_global.attr index 2d4afb2f57..d3ab6f050d 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/lifted_index_ncf_global.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/lifted_index_ncf_global.attr @@ -17,7 +17,7 @@ FINT = FLINE = HILO = 0 HLSYM = 0 -CLRBAR = 1/V/LL!0 +!CLRBAR = 1/V/LL!0 WIND = 10/0.9/2/112 TITLE = 1/-1/~ Best LIFTED INDEX AND BL WIND (KTS)!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/lifted_index_ncf_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/lifted_index_ncf_nam.attr index a497809e5f..2e8c6233af 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/lifted_index_ncf_nam.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/lifted_index_ncf_nam.attr @@ -18,7 +18,7 @@ FINT = FLINE = HILO = 0 HLSYM = 0 -CLRBAR = 1/V/LL!0 +!CLRBAR = 1/V/LL!0 WIND = 10/0.9/2/112 TITLE = 1/-1/~ BEST LI (0-180 MB AGL) AND BL (0-30 MB AGL)WIND (KTS)!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ll_turb.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ll_turb.attr index 8c7aa850f0..796d37da71 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ll_turb.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ll_turb.attr @@ -19,7 +19,6 @@ FINT=-7;-5;-3;-1;1;3;5;7 FLINE=7;29;30;24;0;14;15;18;5 HILO=0!0!1/H#;L#/1020-1070;900-1012 HLSYM=0!0!1.5;1.5//22;22/3;3/hw -CLRBAR=1/V/LL!0 WIND=9/0.8/2/112 TITLE=1/-1/~ EMSL, BL1 (sfc-240m) WIND (KTS) AND 850 mb T ADV!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/marine_fronts.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/marine_fronts.attr index 3ad5cf4a0b..1747c18419 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/marine_fronts.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/marine_fronts.attr @@ -17,7 +17,6 @@ FINT=-9;-7;-5;-3;-1 ! FLINE=2;15;21;22;23;0 ! HILO= HLSYM= -CLRBAR= WIND=9/0.7/1.5/112 TITLE=1/-1/~ 1000-850mb THK, BL MOISTURE CONVERGENCE AND WIND (KT)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/marine_fronts_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/marine_fronts_nam.attr index 51da0e4e84..b947d6ffee 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/marine_fronts_nam.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/marine_fronts_nam.attr @@ -17,7 +17,7 @@ FINT = -9;-7;-5;-3;-1 ! FLINE = 2;15;21;22;23;0 ! HILO = HLSYM = -CLRBAR= 1 +!CLRBAR= 1 WIND = 9/0.7/1.5/112 TITLE = 1/-1/~ 1000-850mb THK, BL MOISTURE CONVERGENCE AND WIND (KT)!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/mean_layer_rh.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/mean_layer_rh.attr index 3e2e96d3df..7a4cb6116b 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/mean_layer_rh.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/mean_layer_rh.attr @@ -18,7 +18,6 @@ FINT=10;30;70;90 FLINE=18;8;0;22;23 HILO= HLSYM= -CLRBAR=0 WIND= TITLE=5/-1/~ @ MEAN LAYER RELATIVE HUMIDITY!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/minpres_1000mb_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/minpres_1000mb_wind.attr index 5e9d8b3f95..92136a56f7 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/minpres_1000mb_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/minpres_1000mb_wind.attr @@ -17,7 +17,6 @@ FINT=20;35;65 FLINE=0;25;17;2 HILO=! !;31/;L#1//3//yes HLSYM=2;1.5//21//hw -CLRBAR=1 WIND= TITLE=5/-1/~ 1000MB WINDS (KTS), MIN PRESSURE !0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/minpres_35m_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/minpres_35m_wind.attr index dcdd4ec794..3ed1d7c770 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/minpres_35m_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/minpres_35m_wind.attr @@ -17,7 +17,6 @@ FINT=20;35;65 FLINE=0;25;17;2 HILO=! !;31/;L#1//3//yes HLSYM=2;1.5//21//hw -CLRBAR=1 WIND= TITLE=5/-1/~ 35M WINDS (KTS), MIN PRESSURE !0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/mlw_pmsl.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/mlw_pmsl.attr index a496df02ea..306e41f4a2 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/mlw_pmsl.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/mlw_pmsl.attr @@ -17,7 +17,7 @@ FINT = FLINE = HILO = 0!26;2/H#;L#/1020-1070;900-1012//30;30/y HLSYM = 0!2;1.5//21//hw -CLRBAR= 0 +!CLRBAR= 0 WIND = bk10/0.9/1.4/112!bk0 TITLE = 1/-2/~ 850-400 MB MLW and MSLP|~850-400mb MLW AND MSLP!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/mmsl.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/mmsl.attr index f50799f70c..c31f6e3abb 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/mmsl.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/mmsl.attr @@ -18,7 +18,6 @@ FINT= FLINE= HILO=4;2/H#;L#/1020-1060;900-1012 HLSYM=1.3;1.3//22/3/hw -CLRBAR=0 WIND= TITLE=1/-2/~ MMSL!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/mslp_thkn_850mb_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/mslp_thkn_850mb_wind.attr index 4f36901fab..807878f1d3 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/mslp_thkn_850mb_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/mslp_thkn_850mb_wind.attr @@ -17,7 +17,6 @@ LINE=3/3/2 ! 20//3 FINT= FLINE= HILO=! 26;2/H#;L#///30;30/y -CLRBAR=0 HLSYM=2;1.5//21//hw WIND=9/0.9/2/112 TITLE=5/-1/~ MSL PRESSURE, 1000-500mb THICKNESS AND 850mb WIND (KTS)!0 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ndfd_12hr.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ndfd_12hr.attr index b75e607880..0a437ae146 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ndfd_12hr.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ndfd_12hr.attr @@ -17,7 +17,6 @@ FINT=.01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.5;3;4;5;6;7;8;9 FLINE=0;21-30;14-20;5 HILO= HLSYM= -CLRBAR=1 !HILO 31;0/x#2/0.2-99/10/100;0/y !HLSYM 1.5 WIND= diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ndfd_24hr.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ndfd_24hr.attr index 4894a917fc..2d8f22c63f 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ndfd_24hr.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ndfd_24hr.attr @@ -17,7 +17,6 @@ FINT=.01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.5;3;4;5;6;7;8;9 FLINE=0;21-30;14-20;5 HILO= HLSYM= -CLRBAR=1 !HILO 31;0/x#2/0.2-99/10/100;0/y !HLSYM 1.5 WIND= diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ndfd_6hr.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ndfd_6hr.attr index 131534f55c..05d277593a 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ndfd_6hr.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ndfd_6hr.attr @@ -17,7 +17,6 @@ FINT=.01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.5;3;4;5;6;7;8;9 FLINE=0;21-30;14-20;5 HILO= HLSYM= -CLRBAR=1 !HILO 31;0/x#2/0.2-99/10/100;0/y !HLSYM 1.5 WIND= diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pcpn_potential.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pcpn_potential.attr index 1377f75ebf..fb27379b72 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pcpn_potential.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pcpn_potential.attr @@ -19,7 +19,6 @@ FINT=.6;.8;1;1.2;1.4;1.6 FLINE=0;23;22;21;2;30;7 HILO=0 HLSYM=0 -CLRBAR=1 WIND= TITLE=1/-2/~ PCPN POTENTIAL (PW X (1000-470 MB RH)) INCHES OF PW!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pcpn_potential_global.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pcpn_potential_global.attr index 337c44324d..eca2281792 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pcpn_potential_global.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pcpn_potential_global.attr @@ -17,7 +17,7 @@ FINT = .6;.8;1;1.2;1.4;1.6 FLINE = 0;23;22;21;2;30;7 HILO = 0 HLSYM = 0 -CLRBAR= 1 +!CLRBAR= 1 WIND = TITLE = 1/-2/~ PCPN POTENTIAL (PW X (1000-440 MB RH)) INCHES OF PW!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pcpn_potential_ncf.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pcpn_potential_ncf.attr index 6df425d112..4fd7a6b22c 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pcpn_potential_ncf.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pcpn_potential_ncf.attr @@ -19,7 +19,6 @@ FINT= FLINE= HILO=0 HLSYM=0 -CLRBAR=1 WIND= TITLE=1/-2/~ PCPN POTENTIAL (PW X (1000-470 MB RH)) INCHES OF PW!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pcpn_potential_ncf_global.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pcpn_potential_ncf_global.attr index 7de33f8ac7..e6e46f34e1 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pcpn_potential_ncf_global.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pcpn_potential_ncf_global.attr @@ -17,7 +17,7 @@ FINT = FLINE = HILO = 0 HLSYM = 0 -CLRBAR= 1 +!CLRBAR= 1 WIND = TITLE = 1/-2/~ PCPN POTENTIAL (PW X (1000-440 MB RH)) INCHES OF PW!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pcpn_potential_ncf_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pcpn_potential_ncf_nam.attr index 61cac030dc..941fbdc23d 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pcpn_potential_ncf_nam.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pcpn_potential_ncf_nam.attr @@ -18,7 +18,7 @@ FINT = FLINE = HILO = 0 HLSYM = 0 -CLRBAR = 1 +!CLRBAR = 1 WIND = TITLE = 1/-2/~ PCPN POTENTIAL (PW X (1000-470 MB RH)) INCHES OF PW!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/peak_swell_per_gridded.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/peak_swell_per_gridded.attr index 210ad1d880..594c69c6b9 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/peak_swell_per_gridded.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/peak_swell_per_gridded.attr @@ -17,7 +17,7 @@ FINT = FLINE = HILO = 0 HLSYM = -CLRBAR = +!CLRBAR = WIND = TITLE = 5/-1/~ GRIDPOINT PEAK SWELL PERIOD (sec)!0 COLORS = 1 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/peak_swell_period_contoured.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/peak_swell_period_contoured.attr index 729e2a5ba9..c1b5d5c76d 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/peak_swell_period_contoured.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/peak_swell_period_contoured.attr @@ -17,7 +17,7 @@ FINT = FLINE = HILO = 0 HLSYM = -CLRBAR = +!CLRBAR = WIND = !!!ak31/.7/1.2/112/.5 TITLE = 5/-1/~ PEAK SWELL PERIOD (sec) and DIRECTION!0 COLORS = 1 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl.attr index 786d6c5084..1aaf88d1ee 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl.attr @@ -17,7 +17,7 @@ FINT = FLINE = HILO = 26;2/H#;L#/1018-1070;900-1012//30;30/y HLSYM = 2;1.5//21//hw -CLRBAR= 1 +!CLRBAR= 1 WIND = TITLE = 5/-1/~ MEAN SEA LEVEL PRESSURE COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-500thk.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-500thk.attr index 39bdc24ba8..9321437b73 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-500thk.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-500thk.attr @@ -17,7 +17,6 @@ FINT= FLINE= HILO=!26;2/H#;L#/1020-1070;900-1012/3/30;30/y HLSYM=1;1//22;22/1.4;1.4/hw -CLRBAR=1 WIND= TITLE=1/-1/~ PMSL, 1000-500mb THKN !0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-500thk_global.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-500thk_global.attr index dd12b4809d..8981b5d7fa 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-500thk_global.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-500thk_global.attr @@ -18,7 +18,7 @@ FINT = FLINE = HILO = !26;2/H#;L#/1020-1070;900-1012/3/30;30/y HLSYM = 1;1//22;22/1.4;1.4/hw -CLRBAR= 1 +!CLRBAR= 1 WIND = TITLE = 1/-1/~ PMSL, 1000-500mb THKN !0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-500thk_nogaps.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-500thk_nogaps.attr index dd12b4809d..8981b5d7fa 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-500thk_nogaps.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-500thk_nogaps.attr @@ -18,7 +18,7 @@ FINT = FLINE = HILO = !26;2/H#;L#/1020-1070;900-1012/3/30;30/y HLSYM = 1;1//22;22/1.4;1.4/hw -CLRBAR= 1 +!CLRBAR= 1 WIND = TITLE = 1/-1/~ PMSL, 1000-500mb THKN !0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850_thk.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850_thk.attr index d496e044a5..f9630120d1 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850_thk.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850_thk.attr @@ -20,7 +20,6 @@ FINT= FLINE= HILO=!26;2/H#;L#/1020-1070;900-1012/3/30;30/y HLSYM=2;1.5//21//hw -CLRBAR=1 WIND=9/0.7/2/112 TITLE=1/-1/~ PMSL, 1000-850mb THKN AND BL (0-30 MB AGL) WIND (KTS)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850_thk_global.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850_thk_global.attr index 3fccbb2599..9d156ecc3e 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850_thk_global.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850_thk_global.attr @@ -20,7 +20,7 @@ FINT = FLINE = HILO =!26;2/H#;L#/1020-1070;900-1012/3/30;30/y HLSYM =!2;1.5//21//hw -CLRBAR=1 +!CLRBAR=1 WIND =!!22/0.7/2/112 TITLE =1/-1/~ PMSL, 1000-850mb THKN AND BL (~995 MB) WIND (KTS)!0 COLORS =2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850_thk_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850_thk_nam.attr index 72429eb2b4..87cf004522 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850_thk_nam.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850_thk_nam.attr @@ -19,7 +19,7 @@ FINT = FLINE = HILO = !26;2/H#;L#/1020-1070;900-1012/3/30;30/y HLSYM = 2;1.5//21//hw -CLRBAR= 1 +!CLRBAR= 1 WIND = 9/0.7/2/112 TITLE = 1/-1/~ PMSL, 1000-850mb THKN AND BL (0-30 MB AGL) WIND (KTS)!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850_thk_nogaps.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850_thk_nogaps.attr index 1a86df5e39..02b396eec6 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850_thk_nogaps.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850_thk_nogaps.attr @@ -21,7 +21,7 @@ FINT = FLINE = HILO = !26;2/H#;L#/1020-1070;900-1012/3/30;30/y HLSYM = !2;1.5//21//hw -CLRBAR= 1 +!CLRBAR= 1 WIND = !!9/0.7/2/112 TITLE = 1/-1/~ PMSL, 1000-850mb THKN AND BL (~10m) WIND (KTS)!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850thk.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850thk.attr index fcb54f788a..cf06c722c5 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850thk.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850thk.attr @@ -17,7 +17,6 @@ FINT= FLINE= HILO=!26;2/H#;L#/1020-1070;900-1012/3/30;30/y HLSYM=1;1//22;22/1.4;1.4/hw -CLRBAR=1 WIND= TITLE=1/-1/~ PMSL, 1000-850mb THKN !0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850thk_global.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850thk_global.attr index 5f9de689ba..ce81e30744 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850thk_global.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850thk_global.attr @@ -17,7 +17,7 @@ FINT = FLINE = HILO = !26;2/H#;L#/1020-1070;900-1012/3/30;30/y HLSYM = 1;1//22;22/1.4;1.4/hw -CLRBAR= 1 +!CLRBAR= 1 WIND = TITLE = 1/-1/~ PMSL, 1000-850mb THKN !0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850thk_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850thk_nam.attr index 84d321dcc4..006b90323f 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850thk_nam.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850thk_nam.attr @@ -17,7 +17,7 @@ FINT = FLINE = HILO = !26;2/H#;L#/1020-1070;900-1012/3/30;30/y HLSYM = 1;1//22;22/1.4;1.4/hw -CLRBAR = 1 +!CLRBAR = 1 WIND = TITLE = 1/-1/~ PMSL, 1000-850mb THKN !0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000mb_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000mb_wind.attr index 3ec70b357c..43a15d8f98 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000mb_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000mb_wind.attr @@ -17,7 +17,6 @@ FINT=20;35;65 FLINE=0;25;17;2 HILO=! !;31/;L#1//3//yes HLSYM=2;1.5//21//hw -CLRBAR=1 WIND= TITLE=5/-1/~ MSLP, 1000MB WINDS (KTS) !0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_and_10m_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_and_10m_wind.attr index 3d12d164d5..36bf6943b2 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_and_10m_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_and_10m_wind.attr @@ -18,7 +18,6 @@ FINT=20;35;50;65 FLINE=0;24;25;30;15 HILO=0!20/H#;L#/1020-1070;900-1012 HLSYM=0!1.5;1.5//22;22/3;3/hw -CLRBAR=1/V/LL!0 WIND=9/0.7/2/112 TITLE=1/-1/~ PMSL, 10m WIND (AGL; KTS) COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_and_10m_wind_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_and_10m_wind_nam.attr index fbc56d7d1a..20d5a919ae 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_and_10m_wind_nam.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_and_10m_wind_nam.attr @@ -17,7 +17,7 @@ FINT = 20;35;50;65 FLINE = 0;24;25;30;15 HILO = 0!20/H#;L#/1020-1070;900-1012 HLSYM = 0!1.5;1.5//22;22/3;3/hw -CLRBAR = 1/V/LL!0 +!CLRBAR = 1/V/LL!0 WIND = 9/0.7/2/112 TITLE = 1/-1/~ PMSL, 10m WIND (AGL; KTS) COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_and_bl_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_and_bl_wind.attr index 25a1bd41c0..a2c1dfdcb4 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_and_bl_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_and_bl_wind.attr @@ -19,7 +19,6 @@ FINT=20;35;50;65 FLINE=0;24;25;30;15 HILO=0!20/H#;L#/1020-1070;900-1012 HLSYM=0!1.5;1.5//22;22/3;3/hw -CLRBAR=1/V/LL!0 WIND=9/0.6/2/112 TITLE=1/-1/~ PMSL, BL WIND (0-30 MB AGL; KTS) COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_and_bl_wind_global.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_and_bl_wind_global.attr index 5fbb14f29c..ca84b73c42 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_and_bl_wind_global.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_and_bl_wind_global.attr @@ -18,7 +18,7 @@ FINT = 20;35;50;65 FLINE = 0;24;25;30;15 HILO = 0!20/H#;L#/1020-1070;900-1012 HLSYM = 0!1.5;1.5//22;22/3;3/hw -CLRBAR= 1/V/LL!0 +!CLRBAR= 1/V/LL!0 WIND = 9/0.7/2/112 TITLE = 1/-1/~ PMSL, BL WIND (40m AGL (~995 MB); KTS) COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_and_bl_wind_nogaps.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_and_bl_wind_nogaps.attr index a73d9920bd..bd3ab581fc 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_and_bl_wind_nogaps.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_and_bl_wind_nogaps.attr @@ -20,7 +20,7 @@ FINT = 20;35;50;65 FLINE = 0;24;25;30;15 HILO = 0!20/H#;L#/1020-1070;900-1012 HLSYM = 0!1.5;1.5//22;22/3;3/hw -CLRBAR = 1/V/LL!0 +!CLRBAR = 1/V/LL!0 WIND = 9/0.7/2/112 TITLE = 1/-1/~ PMSL, BL WIND (10m, KTS) COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_and_ll_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_and_ll_wind.attr index 06c724ebe5..01ac2df7b9 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_and_ll_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_and_ll_wind.attr @@ -19,7 +19,6 @@ FINT=20;35;50;65 FLINE=0;24;25;30;15 HILO=0!20/H#;L#/1020-1070;900-1012 HLSYM=0!1.5;1.5//22;22/3;3/hw -CLRBAR=1/V/LL!0 WIND=9/0.6/2/112 TITLE=1/-1/~ PMSL, LL WIND (2nd Eta LVL 30-60 MB AGL; KTS) COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_and_ll_wind_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_and_ll_wind_nam.attr index 811c9eef15..76958a45da 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_and_ll_wind_nam.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_and_ll_wind_nam.attr @@ -18,7 +18,7 @@ FINT = 20;35;50;65 FLINE = 0;24;25;30;15 HILO = 0!20/H#;L#/1020-1070;900-1012 HLSYM = 0!1.5;1.5//22;22/3;3/hw -CLRBAR = 1/V/LL!0 +!CLRBAR = 1/V/LL!0 WIND = 9/0.6/2/112 TITLE = 1/-1/~ PMSL, LL WIND (2nd Eta LVL 30-60 MB AGL; KTS) COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_and_sfc_temp.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_and_sfc_temp.attr index 7b42bde98c..a362e0a20a 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_and_sfc_temp.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_and_sfc_temp.attr @@ -19,7 +19,6 @@ FINT=-24;-12;0 ! FLINE=29;30;24;0 ! HILO=0!0!0!20/H#;L#////y HLSYM=0!0!0!1.5;1.5//22;22/3;3/hw -CLRBAR=1/V/LL!0 WIND=9/0.6/2/112 TITLE=1/-1/~ MSL PRESSURE, SFC TEMPERATURE AND WIND (KTS)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_bl_temp_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_bl_temp_wind.attr index 04e79e15c3..0be8b47ccc 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_bl_temp_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_bl_temp_wind.attr @@ -18,7 +18,7 @@ FINT = -24;-12;0 ! FLINE = 29;30;24;0 ! HILO = 0!0!0!20/H#;L#/1020-1070;900-1012 HLSYM = 0!0!0!1.5;1.5//22;22/3;3/hw -CLRBAR= 1/V/LL!0 +!CLRBAR= 1/V/LL!0 WIND = 9/0.8/2/112 TITLE = 1/-1/~ PMSL, BL TEMPERATURE (C), WIND (KTS)!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_estthkn.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_estthkn.attr index b31b599131..aea9f1369d 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_estthkn.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_estthkn.attr @@ -18,7 +18,6 @@ FINT= FLINE= HILO=!! 26;2/H#;L#///30;30/y HLSYM=2;1.5//21//hw -CLRBAR=1 WIND=18/1/1 TITLE=5/-1/~ ^ MEAN SEA LEVEL PRESSURE, EST 1000-500 MB THICKNESS!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_ethkn.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_ethkn.attr index 97bdb1f70b..a5e66dd206 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_ethkn.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_ethkn.attr @@ -18,7 +18,6 @@ FINT= FLINE= HILO=! !26;2/H#;L#///30;30/y HLSYM=! !2;1.5//21//hw -CLRBAR=1 WIND=0 TITLE=5/-2/~ PMSL, EST 1000-500 MB THICKNESS|~MSLP, EST 1000-500 THKN! COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_only.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_only.attr index 5ba9dddf10..69c47ebd18 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_only.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_only.attr @@ -11,7 +11,7 @@ FINT = FLINE = HILO = 26;2/H#;L#/1020-1070;900-1012 HLSYM = 1;1//22;22/1.4;1.4/hw -CLRBAR= 0 +!CLRBAR= 0 WIND = TITLE = 1/-1/~ PMSL COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_only_nogaps.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_only_nogaps.attr index 55d3a1b471..1c7f333bd4 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_only_nogaps.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_only_nogaps.attr @@ -11,7 +11,7 @@ FINT = FLINE = HILO = 26;2/H#;L#/1020-1070;900-1012 HLSYM = 1;1//22;22/1.4;1.4/hw -CLRBAR = 0 +!CLRBAR = 0 WIND = TITLE = 1/-1/~ PMSL COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_thkn.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_thkn.attr index 7cd29470f5..1cf823c835 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_thkn.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_thkn.attr @@ -21,7 +21,7 @@ FINT = FLINE = HILO = !! 26;2/H#;L#/1018-1070;900-1012//30;30/y HLSYM = 2;1.5//21//hw -CLRBAR= 1 +!CLRBAR= 1 WIND = TITLE = 5/-1/~ PMSL, 1000-500 MB THICKNESS!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_thkn_850mb_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_thkn_850mb_wind.attr index 11f8c87dd2..8b6a0e0973 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_thkn_850mb_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_thkn_850mb_wind.attr @@ -17,7 +17,7 @@ FINT = FLINE = HILO = ! 26;2/H#;L#///30;30/y HLSYM = 2;1.5//21//hw -CLRBAR= 1 +!CLRBAR= 1 WIND = 9/0.9/2/112 TITLE = 5/-1/~ MSL PRESSURE, 1000-500mb THICKNESS AND 850mb WIND (KTS)!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_thkn_wind.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_thkn_wind.attr index b994af6873..38c18fbc34 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_thkn_wind.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_thkn_wind.attr @@ -18,7 +18,6 @@ FINT= FLINE= HILO=!! 26;2/H#;L#/1018-1070;900-1012//30;30/y HLSYM=2;1.5//21//hw -CLRBAR=1 WIND=3/0.8/1/112 TITLE=1/-2/~ PMSL, 1000-500 MB THICKNESS, BL WIND!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_thkn_wind_mono.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_thkn_wind_mono.attr index 79853542ac..23e62c64fc 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_thkn_wind_mono.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_thkn_wind_mono.attr @@ -18,7 +18,6 @@ FINT= FLINE= HILO=!! 23;23/H#;L#/1018-1070;900-1012//30;30/y HLSYM=2;1.5//21//hw -CLRBAR=1 WIND=23/0.8/1/112 TITLE=23/-1/~ PMSL, 1000-500 MB THICKNESS, BL WIND!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_thkn_wind_mono_global.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_thkn_wind_mono_global.attr index b3ec8edb2a..5aa67fb07c 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_thkn_wind_mono_global.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_thkn_wind_mono_global.attr @@ -18,7 +18,7 @@ FINT = FLINE = HILO = !! 23;23/H#;L#/1018-1070;900-1012//30;30/y HLSYM = 2;1.5//21//hw -CLRBAR= 1 +!CLRBAR= 1 WIND = 23/0.8/1/112 TITLE = 23/-1/~ PMSL, 1000-500 MB THICKNESS, BL (~995 MB)WIND !0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_thkn_wind_mono_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_thkn_wind_mono_nam.attr index 066d224486..be828e1c9c 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_thkn_wind_mono_nam.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_thkn_wind_mono_nam.attr @@ -18,7 +18,7 @@ FINT = FLINE = HILO = !! 23;23/H#;L#/1018-1070;900-1012//30;30/y HLSYM = 2;1.5//21//hw -CLRBAR = 1 +!CLRBAR = 1 WIND = 23/0.8/1/112 TITLE = 23/-1/~ PMSL, 1000-500 MB THICKNESS, BL WIND !0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_thkn_wind_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_thkn_wind_nam.attr index b994af6873..881a5ec013 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_thkn_wind_nam.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_thkn_wind_nam.attr @@ -18,7 +18,7 @@ FINT= FLINE= HILO=!! 26;2/H#;L#/1018-1070;900-1012//30;30/y HLSYM=2;1.5//21//hw -CLRBAR=1 +!CLRBAR=1 WIND=3/0.8/1/112 TITLE=1/-2/~ PMSL, 1000-500 MB THICKNESS, BL WIND!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmslcomponly.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmslcomponly.attr index 10046f4778..eebfd8c4b6 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmslcomponly.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmslcomponly.attr @@ -18,7 +18,6 @@ FINT= FLINE= HILO=5/H#;L#/1020-1070;900-1012!6/H#;L#/1020-1070;900-1012!3/H#;L#/1020-1070;900-1012 HLSYM=1;1//22;22/1;1/hw -CLRBAR=0 WIND= TITLE=5/-3/~ ETA PMSL!6/0/~ NGM PMSL!3/-2/~ GFS PMSL COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pop_p1.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pop_p1.attr index af508c4fd9..5d77652d94 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pop_p1.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pop_p1.attr @@ -17,7 +17,6 @@ FINT=.01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.5;3;4;5;6;7;8;9 FLINE=0;21-30;14-20;5 HILO=0 HLSYM=0 -CLRBAR=0 WIND= TITLE=5/-1/~ POP COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/potvort_400-250mb.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/potvort_400-250mb.attr index c1546dc582..73997698d9 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/potvort_400-250mb.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/potvort_400-250mb.attr @@ -20,7 +20,6 @@ FINT=332;348;364!1;2;3;4 FLINE=0;23;22;14!0;0;24;30;13 HILO=0!0!0!0!0!0!20/H#;L#/1020-1070;900-1008 HLSYM=0!0!0!0!0!0!1.5;1.5//22;22/3;3/hw -CLRBAR=0!1/V/LL!0!0 WIND=9/0.9/2/112 TITLE=1/-1/~ 400-250mb PV,300mb WIND (KTS),PMSL,BL THTAE!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/potvort_400-250mb_al.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/potvort_400-250mb_al.attr index 5987ea4682..f9b8122f63 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/potvort_400-250mb_al.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/potvort_400-250mb_al.attr @@ -19,7 +19,6 @@ FINT=332;348;364!1;2;3;4 FLINE=0;23;22;21!0;0;24;30;13 HILO=0!0!0!0!0!0!20/H#;L# HLSYM=0!0!0!0!0!0!1.5;1.5//22;22/3;3/hw -CLRBAR=0!1/V/LL!0!0 WIND=9/0.9/2/112 TITLE=1/-1/~ 400-250mb PV,300mb WIND (KTS) and 850mb THTAE!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/potvort_400-250mb_rap.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/potvort_400-250mb_rap.attr index 888d666842..1b51c1c90d 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/potvort_400-250mb_rap.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/potvort_400-250mb_rap.attr @@ -18,7 +18,7 @@ FINT = 332;348;364!1;2;3;4 FLINE = 0;23;22;21!0;0;24;30;13 HILO = 0!0!0!0!0!0!20/H#;L# HLSYM = 0!0!0!0!0!0!1.5;1.5//22;22/3;3/hw -CLRBAR = 0!1/V/LL!0!0 +!CLRBAR = 0!1/V/LL!0!0 WIND = 9/0.9/2/112 TITLE = 1/-1/~ 400-250mb PV,300mb WIND (KTS) and 850mb THTAE!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_12hr.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_12hr.attr index 6bd165d44a..f27cdf6d52 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_12hr.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_12hr.attr @@ -20,7 +20,7 @@ FINT = .01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.5;3;4;5;6;7;8;9 FLINE = 0;21-30;14-20;5 HILO = 31;0/x#2/0.1-99//100;0/y HLSYM = 1.5 -CLRBAR= 1 +!CLRBAR= 1 WIND = TITLE = 5/-1/~ 12-HR TOTAL PRECIPITATION ! 0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_12hr_avg.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_12hr_avg.attr index 57cdc2634d..918b4bc7d4 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_12hr_avg.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_12hr_avg.attr @@ -17,7 +17,6 @@ FINT=.01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.5;3;4;5;6;7;8;9 FLINE=0;21-30;14-20;5 HILO=31;0/x#2/0.1-99//100;0/y HLSYM=1.5 -CLRBAR=1 WIND= TITLE=5/-1/~ 12-HR AVERAGE PRECIPITATION ! 0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_12hr_mm.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_12hr_mm.attr index 59aab83923..1b54a76ef1 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_12hr_mm.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_12hr_mm.attr @@ -20,7 +20,7 @@ FINT = 2;4;7;13;19;26;32;39;45;52;58;65;72;78;84;91;98;104 FLINE = 0;21-30;14-20;5 HILO = 31;0/x#/3-200//100;0/y HLSYM = 1.5 -CLRBAR= 1 +!CLRBAR= 1 WIND = TITLE = 5/-1/~ 12-HR TOTAL PRECIPITATION (MM)! 0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_12hr_mm_cmc.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_12hr_mm_cmc.attr index 70e84bbaf2..502c852dce 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_12hr_mm_cmc.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_12hr_mm_cmc.attr @@ -20,7 +20,7 @@ FINT = 2;4;7;13;19;26;32;39;45;52;58;65;72;78;84;91;98;104 FLINE = 0;21-30;14-20;5 HILO = 31;0/x#/3-200//100;0/y HLSYM = 1.5 -CLRBAR = 1 +!CLRBAR = 1 WIND = TITLE = 5/-1/~ 12-HR TOTAL PRECIPITATION (MM)! 0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_12hr_mm_nogaps.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_12hr_mm_nogaps.attr index ac3e62cda0..3f929b16a2 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_12hr_mm_nogaps.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_12hr_mm_nogaps.attr @@ -17,7 +17,7 @@ FINT = 1;5;10;15;20;25;30;35;40;45;50;55;60;65;70;75;80;85 FLINE = 0;21-30;14-20;5 HILO = 31;0/x#/5-500///y HLSYM = 1.5 -CLRBAR = 1 +!CLRBAR = 1 WIND = TITLE = 5/-1/~ 12-HR TOTAL PRECIPITATION!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_12hr_nogaps.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_12hr_nogaps.attr index 7e25c80ee9..d4fbb74d77 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_12hr_nogaps.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_12hr_nogaps.attr @@ -17,7 +17,7 @@ FINT = .01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.25;2.5;2.75;3;3.25;3.5;3.75;4 FLINE = 0;21-30;14-20;5 HILO = 0!31;0/x#2/0.1-99//100;0/y HLSYM = 0!1.5 -CLRBAR = 1 +!CLRBAR = 1 WIND = TITLE = 5/-1/~ 12-HR TOTAL PRECIPITATION ! 0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_24hr.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_24hr.attr index a62c583248..e13521fbbf 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_24hr.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_24hr.attr @@ -20,7 +20,7 @@ FINT = .01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.5;3;4;5;6;7;8;9 FLINE = 0;21-30;14-20;5 HILO = 31;0/x#2/0.1-99//100;0/y HLSYM = 1.5 -CLRBAR= 1 +!CLRBAR= 1 WIND = TITLE = 5/-1/~ 24-HR TOTAL PRECIPITATION ! 0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_24hr_avg.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_24hr_avg.attr index b9904651b0..d6f8761652 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_24hr_avg.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_24hr_avg.attr @@ -17,7 +17,6 @@ FINT=.01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.5;3;4;5;6;7;8;9 FLINE=0;21-30;14-20;5 HILO=31;0/x#2/0.1-99//100;0/y HLSYM=1.5 -CLRBAR=1 WIND= TITLE=5/-1/~ 24-HR AVERAGE PRECIPITATION ! 0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_24hr_mm.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_24hr_mm.attr index 9f40566915..a3c6c3ebc1 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_24hr_mm.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_24hr_mm.attr @@ -20,7 +20,7 @@ FINT = 2;4;7;13;19;26;32;39;45;52;58;65;72;78;84;91;98;104 FLINE = 0;21-30;14-20;5 HILO = 31;0/x#/3-200//100;0/y HLSYM = 1.5 -CLRBAR= 1 +!CLRBAR= 1 WIND = TITLE = 5/-1/~ 24-HR TOTAL PRECIPITATION (MM)! 0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_3-day.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_3-day.attr index 951781a076..881da258ce 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_3-day.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_3-day.attr @@ -19,7 +19,7 @@ FINT = .01;.1;.25;.5;.75;1;1.5;2;2.5;3;4;5;6;7;8;9;10 FLINE = 0;21-30;14-20;5 HILO = 31;0/x#2/0.1-99//100;0/y HLSYM = 1.5 -CLRBAR= 1/V/LL!0 +!CLRBAR= 1/V/LL!0 WIND = TITLE = 5/-1/3-day (F72-F144) PCPN ! 0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_3hr.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_3hr.attr index aa7ab0e496..fcbf0ea6a1 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_3hr.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_3hr.attr @@ -20,7 +20,6 @@ FINT=.01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.5;3;4;5;6;7;8;9 FLINE=0;21-30;14-20;5 HILO=31;0/x#2/0.1-99//100;0/y HLSYM=1.5 -CLRBAR=1 WIND= TITLE=5/-1/~ 3hr TOTAL PRECIPITATION (IN) COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_3hr_emsl.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_3hr_emsl.attr index 8f5562ad82..ed3715ea03 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_3hr_emsl.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_3hr_emsl.attr @@ -20,7 +20,6 @@ FINT=.01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.5;3;4;5;6;7;8;9 FLINE=0;21-30;14-20;5 HILO=!26;2/H#;L#//5/50;50/y HLSYM=!2;1.5//21//hw -CLRBAR=1 WIND= TITLE=5/-1/~ 3-HR TOTAL PRECIPITATION, MSLP (ETA REDUCTION)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_3hr_rap.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_3hr_rap.attr index e41c00ff03..fbd38923b8 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_3hr_rap.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_3hr_rap.attr @@ -20,7 +20,7 @@ FINT = .01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.5;3;4;5;6;7;8;9 FLINE = 0;21-30;14-20;5 HILO = 31;0/x#2/0.1-99//100;0/y HLSYM = 1.5 -CLRBAR = 1 +!CLRBAR = 1 WIND = TITLE = 5/-1/~ 3hr TOTAL PRECIPITATION (IN) COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_4-day.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_4-day.attr index c32aac2791..dffa8da868 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_4-day.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_4-day.attr @@ -19,7 +19,7 @@ FINT = .01;.1;.25;.5;.75;1;1.5;2;2.5;3;4;5;6;7;8;9;10 FLINE = 0;21-30;14-20;5 HILO = 31;0/x#2/0.1-99//100;0/y HLSYM = 1.5 -CLRBAR= 1/V/LL!0 +!CLRBAR= 1/V/LL!0 WIND = TITLE = 5/-1/~ 4-day (F24-F120) PCPN!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_48hr.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_48hr.attr index da67b44631..4272d57b80 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_48hr.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_48hr.attr @@ -20,7 +20,7 @@ FINT = .01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.5;3;4;5;6;7;8;9 FLINE = 0;21-30;14-20;5 HILO = 31;0/x#2/0.1-99//100;0/y HLSYM = 1.5 -CLRBAR= 1 +!CLRBAR= 1 WIND = TITLE = 5/-1/~ 48-HR TOTAL PRECIPITATION!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_5-day.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_5-day.attr index 9873c98598..21a1ad92dc 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_5-day.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_5-day.attr @@ -20,7 +20,7 @@ FINT = .01;.1;.25;.5;.75;1;1.5;2;2.5;3;4;5;6;7;8;9;10 FLINE = 0;21-30;14-20;5 HILO = 31;0/x#2/0.1-99//100;0/y HLSYM = 1.5 -CLRBAR= 1/V/LL!0 +!CLRBAR= 1/V/LL!0 WIND = TITLE = 5/-1/~ 5-day (120-HR) PCPN!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_54hr.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_54hr.attr index 09e09f2ec7..2d64ec81ff 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_54hr.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_54hr.attr @@ -20,7 +20,7 @@ FINT = .01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.5;3;4;5;6;7;8;9 FLINE = 0;21-30;14-20;5 HILO = 31;0/x#2/0.1-99//100;0/y HLSYM = 1.5 -CLRBAR= 1 +!CLRBAR= 1 WIND = TITLE = 5/-1/~ 54-HR TOTAL PRECIPITATION ! 0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_60hr.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_60hr.attr index aa60771633..121ae9e036 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_60hr.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_60hr.attr @@ -20,7 +20,7 @@ FINT = .01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.5;3;4;5;6;7;8;9 FLINE = 0;21-30;14-20;5 HILO = 31;0/x#2/0.1-99//100;0/y HLSYM = 1.5 -CLRBAR= 1 +!CLRBAR= 1 WIND = TITLE = 5/-1/~ 60-HR TOTAL PRECIPITATION ! 0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_66hr.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_66hr.attr index dcc5a558c9..851470d3d9 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_66hr.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_66hr.attr @@ -19,7 +19,7 @@ FINT = .01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.5;3;4;5;6;7;8;9 FLINE = 0;21-30;14-20;5 HILO = 31;0/x#2/0.1-99//100;0/y HLSYM = 1.5 -CLRBAR= 1 +!CLRBAR= 1 WIND = TITLE = 5/-1/~ 66-HR TOTAL PRECIPITATION ! 0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr.attr index 4562bdb081..cdbfcd4bce 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr.attr @@ -25,7 +25,7 @@ FINT = .01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.5;3;4;5;6;7;8;9 FLINE = 0;21-30;14-20;5 HILO = 31;0/x#2/0.1-99//100;0/y HLSYM = 1.5 -CLRBAR= 1 +!CLRBAR= 1 WIND = TITLE = 5/-1/~ 6hr TOTAL PRECIPITATION (IN) COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_1000-500_thkn.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_1000-500_thkn.attr index c0b37b7a82..3672dbf90f 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_1000-500_thkn.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_1000-500_thkn.attr @@ -21,7 +21,6 @@ FINT=.01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.5;3;4;5;6;7;8;9 FLINE=0;21-30;14-20;5 HILO=0!0!0!5/H#;L#/1020-1070;900-1012 HLSYM=0!0!0!1.5;1.5//22;22/3;3/hw -CLRBAR=1 WIND= TITLE=1/-1/~ 6-H TOTAL PRECIPITATION, PMSL, 1000-500mb THICKNESS!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_emsl.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_emsl.attr index 9e02093210..0487a51373 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_emsl.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_emsl.attr @@ -20,7 +20,6 @@ FINT=.01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.5;3;4;5;6;7;8;9 FLINE=0;21-30;14-20;5 HILO=!26;2/H#;L#//6/20;20/y HLSYM=!2;1.5//21//hw -CLRBAR=1 WIND= TITLE=5/-1/~ 6-HOUR TOTAL PRECIPITATION, MSLP (ETA REDUCTION)!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_emsl_rap.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_emsl_rap.attr index e6628b1a71..23f76b9140 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_emsl_rap.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_emsl_rap.attr @@ -20,7 +20,7 @@ FINT = .01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.5;3;4;5;6;7;8;9 FLINE = 0;21-30;14-20;5 HILO = !26;2/H#;L#//6/20;20/y HLSYM = !2;1.5//21//hw -CLRBAR = 1 +!CLRBAR = 1 WIND = TITLE = 5/-1/~ 6-HOUR TOTAL PRECIPITATION, MSLP (ETA REDUCTION)!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_mdl_topography.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_mdl_topography.attr index 4b140c1795..1865a632f2 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_mdl_topography.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_mdl_topography.attr @@ -18,7 +18,6 @@ FINT=.01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.25;2.5;2.75;3;3.25;3.5;3.75;4 FLINE=0;21-30;14-20;5 HILO=0!31;0/x#2/0.1-99//100;0/y!5/H#;L#/1020-1070;900-1012!0 HLSYM=0!1.5!1;1//22;22/2;2/hw!0 -CLRBAR=1 WIND= TITLE=5/-1/~ 6-HR TOTAL PCPN, MSLP, MDL TOPOGRAPHY!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_mslp.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_mslp.attr index 0fd19554a6..04f39018fa 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_mslp.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_mslp.attr @@ -20,7 +20,7 @@ FINT = .01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.5;3;4;5;6;7;8;9 FLINE = 0;21-30;14-20;5 HILO = !26;2////30;30/y HLSYM = !2;1.5//21//hw -CLRBAR= 1 +!CLRBAR= 1 WIND = TITLE = 5/-1/~ 6-HOUR TOTAL PCPN, MSLP!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_mslp_rap.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_mslp_rap.attr index a1a50f03c7..725ead3957 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_mslp_rap.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_mslp_rap.attr @@ -20,7 +20,7 @@ FINT = .01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.5;3;4;5;6;7;8;9 FLINE = 0;21-30;14-20;5 HILO = !26;2////30;30/y HLSYM = !2;1.5//21//hw -CLRBAR = 1 +!CLRBAR = 1 WIND = TITLE = 5/-1/~ 6-HOUR TOTAL PCPN, MSLP!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_mslp_sfchght.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_mslp_sfchght.attr index fb4adfddea..f8d1743f65 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_mslp_sfchght.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_mslp_sfchght.attr @@ -20,7 +20,7 @@ FINT = .01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.5;3;4;5;6;7;8;9 FLINE = 0;21-30;14-20;5 HILO = 31;0/x#2/0.1-99//100;0/y!5/H#;L#/1020-1070;900-1012!0 HLSYM = 1.5!1;1//22;22/2;2/hw!0 -CLRBAR= 1 +!CLRBAR= 1 WIND = TITLE = 5/-1/~ 6-HR TOTAL PCPN, MSLP, MDL TOPOGRAPHY!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_mslp_sfchght_rap.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_mslp_sfchght_rap.attr index ab10937d53..144bc7677b 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_mslp_sfchght_rap.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_mslp_sfchght_rap.attr @@ -20,7 +20,7 @@ FINT = .01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.5;3;4;5;6;7;8;9 FLINE = 0;21-30;14-20;5 HILO = 31;0/x#2/0.1-99//100;0/y!5/H#;L#/1020-1070;900-1012!0 HLSYM = 1.5!1;1//22;22/2;2/hw!0 -CLRBAR = 1 +!CLRBAR = 1 WIND = TITLE = 5/-1/~ 6-HR TOTAL PCPN, MSLP, MDL TOPOGRAPHY!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_mslphilo.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_mslphilo.attr index 147832531e..ef2ec44189 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_mslphilo.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_mslphilo.attr @@ -20,7 +20,7 @@ FINT = .01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.5;3;4;5;6;7;8;9 FLINE = 0;21-30;14-20;5 HILO = 31;0/x#2/0.1-99//100;0/y!17/H#;L# HLSYM = 1.5 !1;1//22;22/2;2/hw -CLRBAR= 1 +!CLRBAR= 1 WIND = TITLE = 5/-1/~ 6-HR TOTAL PCPN, MSLP!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_mslphilo_rap.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_mslphilo_rap.attr index 9bd4e97b1e..7851bb670e 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_mslphilo_rap.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_mslphilo_rap.attr @@ -20,7 +20,7 @@ FINT = .01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.5;3;4;5;6;7;8;9 FLINE = 0;21-30;14-20;5 HILO = 31;0/x#2/0.1-99//100;0/y!17/H#;L# HLSYM = 1.5 !1;1//22;22/2;2/hw -CLRBAR = 1 +!CLRBAR = 1 WIND = TITLE = 5/-1/~ 6-HR TOTAL PCPN, MSLP!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_rap.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_rap.attr index 53bcc48975..229dd045b7 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_rap.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_6hr_rap.attr @@ -25,7 +25,7 @@ FINT = .01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.5;3;4;5;6;7;8;9 FLINE = 0;21-30;14-20;5 HILO = 31;0/x#2/0.1-99//100;0/y HLSYM = 1.5 -CLRBAR = 1 +!CLRBAR = 1 WIND = TITLE = 5/-1/~ 6hr TOTAL PRECIPITATION (IN) COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_72hr.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_72hr.attr index 65cc1d240c..1f69ebe37e 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_72hr.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_72hr.attr @@ -20,7 +20,7 @@ FINT = .01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.5;3;4;5;6;7;8;9 FLINE = 0;21-30;14-20;5 HILO = 31;0/x#2/0.1-99//100;0/y HLSYM = 1.5 -CLRBAR= 1 +!CLRBAR= 1 WIND = TITLE = 5/-1/~ 72-HR TOTAL PRECIPITATION!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_78hr.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_78hr.attr index 52662cdf64..ec003bcd5e 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_78hr.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_78hr.attr @@ -20,7 +20,7 @@ FINT = .01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.5;3;4;5;6;7;8;9 FLINE = 0;21-30;14-20;5 HILO = 31;0/x#2/0.1-99//100;0/y HLSYM = 1.5 -CLRBAR= 1 +!CLRBAR= 1 WIND = TITLE = 5/-1/~ 78-HR TOTAL PRECIPITATION!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type.attr index 6747aec642..69e9762db9 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type.attr @@ -17,7 +17,6 @@ FINT=50;200 !50;200 !50;200 !50;200 FLINE=0;23;23 !0;25;25 !0;30;30 !0;15;15 HILO=0 HLSYM=0 -CLRBAR=0 WIND=9/0.7/2/112 TITLE=1/-1/~ PCPN TYPE!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_12hr_amounts.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_12hr_amounts.attr index 7aaca12349..2eea639725 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_12hr_amounts.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_12hr_amounts.attr @@ -19,7 +19,6 @@ FINT=.1;.25;.5;.75!.05;1000! FLINE=0;6;26;25;24!0;11! HILO=31/x#2/.15-7///y!7/x#2/.1-7///y!2/x#2/.1-7///y!22/x#2/.1-7///y HLSYM=1.2//22/2/hw!1.4//22;22/2;2/hw!1.4//22;22/2;2/hw!1.1//22;22/2;2/hw -CLRBAR=1 WIND= TITLE=1/-2/~ 12-HR PCPN BY TYPE (INST)|~ 12-HR PCPN BY TYPE!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_24hr_amounts.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_24hr_amounts.attr index 25da97d110..961b760249 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_24hr_amounts.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_24hr_amounts.attr @@ -18,7 +18,6 @@ FINT=.1;.25;.5;.75!.05;1000! FLINE=0;6;26;25;24!0;11! HILO=31/x#2/.15-7///y!7/x#2/.1-7///y!2/x#2/.1-7///y!22/x#2/.1-7///y HLSYM=1.2//22/2/hw!1.4//22;22/2;2/hw!1.4//22;22/2;2/hw!1.1//22;22/2;2/hw -CLRBAR=1 WIND= TITLE=1/-2/~ 24-HR PCPN BY TYPE (INST)|~ 24-HR PCPN BY TYPE!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_48hr_amounts.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_48hr_amounts.attr index ecafb80278..3cadd102dd 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_48hr_amounts.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_48hr_amounts.attr @@ -18,7 +18,6 @@ FINT=.1;.25;.5;.75!.05;1000! FLINE=0;6;26;25;24!0;11! HILO=31/x#2/.15-7///y!7/x#2/.1-7///y!2/x#2/.1-7///y!22/x#2/.1-7///y HLSYM=1.2//22/2/hw!1.4//22;22/2;2/hw!1.4//22;22/2;2/hw!1.1//22;22/2;2/hw -CLRBAR=1 WIND= TITLE=1/-2/~ 48-HR PCPN BY TYPE (INST)|~ 48-HR PCPN BY TYPE!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_6hr_amounts.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_6hr_amounts.attr index b25f48aa46..81ee01f678 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_6hr_amounts.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_6hr_amounts.attr @@ -18,7 +18,6 @@ FINT=.1;.25;.5;.75!.05;1000! FLINE=0;6;26;25;24!0;11! HILO=31/x#2/.15-7///y!7/x#2/.1-7///y!2/x#2/.1-7///y!22/x#2/.1-7///y HLSYM=1.2//22/2/hw!1.4//22;22/2;2/hw!1.4//22;22/2;2/hw!1.1//22;22/2;2/hw -CLRBAR=1 WIND= TITLE=1/-2/~ ETA 6-HR PCPN BY TYPE (INST)|~ 6-HR PCPN BY TYPE!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_global.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_global.attr index 199e2c0376..60954b026b 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_global.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_global.attr @@ -17,7 +17,7 @@ FINT = 50;200 !50;200 !50;200 !50;200 FLINE = 0;23;23 !0;25;25 !0;30;30 !0;15;15 HILO = 0 HLSYM = 0 -CLRBAR= 0 +!CLRBAR= 0 WIND = 9/0.7/2/112 TITLE = 1/-2/~ PCPN TYPE |~PCPN TYPE AND VV!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_vv.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_vv.attr index f26fe724f2..4217642861 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_vv.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_vv.attr @@ -23,7 +23,6 @@ FINT=50;200!50;200!50;200!50;200 FLINE=0;23;23!0;25;25!0;30;30!0;15;15 HILO=0 HLSYM=0 -CLRBAR=0 WIND=9/0.7/2/112 TITLE=1/-1/~ PCPN Type, 1000-470 MB RH AND 700-500 MB VV!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_vv_global.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_vv_global.attr index b9e06502a4..4c5add8e9e 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_vv_global.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_vv_global.attr @@ -18,7 +18,7 @@ FINT = 50;200!50;200!50;200!50;200 FLINE = 0;23;23!0;25;25!0;30;30!0;15;15 HILO = 0 HLSYM = 0 -CLRBAR= 0 +!CLRBAR= 0 WIND = 9/0.7/2/112 TITLE = 1/-2/~ GFS PCPN TYPE, 1000-500 RH AND 700-500 VV|~PCPN TYPE AND VV!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_vv_ncf.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_vv_ncf.attr index 2021b483fb..ea91d565d3 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_vv_ncf.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_vv_ncf.attr @@ -18,7 +18,6 @@ FINT=50;200!50;200!50;200!50;200 FLINE=0;23;23!0;25;25!0;30;30!0;15;15 HILO=0 HLSYM=0 -CLRBAR=0 WIND=9/0.7/2/112 TITLE=1/-1/~ Precip Type, 1000-470 MB RH AND 700-500 MB Vertical Velocity!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_vv_ncf_global.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_vv_ncf_global.attr index b1509db28e..2f4e6c8109 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_vv_ncf_global.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_vv_ncf_global.attr @@ -18,7 +18,7 @@ FINT = FLINE = HILO = 0 HLSYM = 0 -CLRBAR= 0 +!CLRBAR= 0 WIND = 9/0.7/2/112 TITLE = 1/-2/~ GFS PCPN TYPE, 1000-500 RH AND 700-500 VV|~PCPN TYPE AND VV!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_vv_ncf_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_vv_ncf_nam.attr index 3943d9e12e..ddaf6ce524 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_vv_ncf_nam.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_vv_ncf_nam.attr @@ -18,7 +18,7 @@ FINT = 50;200!50;200!50;200!50;200 FLINE = 0;23;23!0;25;25!0;30;30!0;15;15 HILO = 0 HLSYM = 0 -CLRBAR= 1/V/LL!0 +!CLRBAR= 1/V/LL!0 WIND = 9/0.7/2/112 TITLE = 1/-1/~ Precip Type, 1000-470 MB RH AND 700-500 MB Vertical Velocity!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_water_mslp.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_water_mslp.attr index b441c52745..31702725ac 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_water_mslp.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_water_mslp.attr @@ -18,7 +18,6 @@ FINT=1.0;1.5;2.0;2.5! FLINE=0;23;22;14;2! HILO=0!0!0!0!6/H#;L# HLSYM=0!0!0!0!1.5;1.5//22;22/3;3/hw -CLRBAR=1/V/LL!0!0!0 WIND=18/1/1 TITLE=5/-1/~ PRECIPITABLE WATER, EST MSL PRESSURE, THICKNESS!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_water_pmsl.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_water_pmsl.attr index dd62d27f68..383cd1a525 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_water_pmsl.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_water_pmsl.attr @@ -18,7 +18,7 @@ FINT = 1.0;1.5;2.0;2.5! FLINE = 0;23;22;14;2! HILO = 0!0!0!0!6/H#;L#/1020-1070;900-1012 HLSYM = 0!0!0!0!1;1//22;22/3;3/hw -CLRBAR= 1/V/LL!0!0!0 +!CLRBAR= 1/V/LL!0!0!0 WIND = 0 TITLE = 1/-1/~ PW, PMSL, THICKNESS!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_water_pmsl_mm.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_water_pmsl_mm.attr index 318688155b..308c577748 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_water_pmsl_mm.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_water_pmsl_mm.attr @@ -17,7 +17,7 @@ FINT = !13;25;38;50 ! FLINE = !0;23;22;21;2 ! HILO = 0 !0 !0 !0 !6/H#;L#/1020-1080;900-1012 HLSYM = 0 !0 !0 !0 !1.5;1.5//22;22/3;3/hw -CLRBAR= !1/V/LL !0 +!CLRBAR= !1/V/LL !0 WIND = 18/1/1 TITLE = 5/-1/~ PRECIPITABLE WATER, PMSL, THICKNESS!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/primary_wave_dir.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/primary_wave_dir.attr index 8bc10b1094..1fab0d2758 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/primary_wave_dir.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/primary_wave_dir.attr @@ -16,7 +16,6 @@ FINT=50;60;70;80;90 FLINE=0;29;28;27;26;0 HILO= HLSYM= -CLRBAR=0 WIND=18/1/1 TITLE=1/-1/~ Direction Of Primary Wave !0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/prob_precip_above_normal.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/prob_precip_above_normal.attr index 21346979c2..a5bbd9b85f 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/prob_precip_above_normal.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/prob_precip_above_normal.attr @@ -16,7 +16,6 @@ FINT= FLINE=0;29;28;27;26;0 HILO= HLSYM= -CLRBAR=0 WIND= TITLE=1/-1/~ PPAN COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/probability_of_precip.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/probability_of_precip.attr index 164f8bfeaa..b2942c0423 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/probability_of_precip.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/probability_of_precip.attr @@ -17,7 +17,6 @@ FINT=.01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.5;3;4;5;6;7;8;9 FLINE=0;21-30;14-20;5 HILO=0 HLSYM=0 -CLRBAR=1 WIND= TITLE=5/-1/~ POP COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/probability_of_precip_3hr.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/probability_of_precip_3hr.attr index c68f4ff16c..94178678cb 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/probability_of_precip_3hr.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/probability_of_precip_3hr.attr @@ -17,7 +17,6 @@ FINT=.01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.5;3;4;5;6;7;8;9 FLINE=0;21-30;14-20;5 HILO=0 HLSYM=0 -CLRBAR=1 WIND= TITLE=5/-1/~ POP 3hr COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pw_emsl_c-vec.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pw_emsl_c-vec.attr index bb5b171dc8..86f1c8a245 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pw_emsl_c-vec.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pw_emsl_c-vec.attr @@ -20,7 +20,6 @@ FINT=!0.5;1.0;1.5;2.0 FLINE=!0;23;22;30;14 HILO=0!0!6/H#;L#/1020-1070;900-1012!0 HLSYM=0!0!1.5;1.5//22;22/3;3/hw!0 -CLRBAR=0!1/V/LL!0!0 WIND=9/0.9/2/112 TITLE=1/-1/~ PW, EMSL, 1000-500 THICKNESS, C-VEC!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pw_mslp_c-vec.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pw_mslp_c-vec.attr index 8e0bed61d7..d3388a37ec 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pw_mslp_c-vec.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pw_mslp_c-vec.attr @@ -17,7 +17,7 @@ FINT = !0.5;1.0;1.5;2.0 FLINE = !0;23;22;30;14 HILO = 0!0!6/H#;L#/1020-1070;900-1012!0 HLSYM = 0!0!1.5;1.5//22;22/3;3/hw!0 -CLRBAR= 0!1/V/LL!0!0 +!CLRBAR= 0!1/V/LL!0!0 WIND = 9/0.9/2/112 TITLE = 1/-1/~ PW, MSL PRESSURE, THICKNESS, C-VEC!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pws50.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pws50.attr index abd11ef079..05461b8d87 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pws50.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pws50.attr @@ -17,7 +17,6 @@ FINT=50;60;70;80;90 FLINE=0;29;28;27;26;0 HILO= HLSYM= -CLRBAR=0 WIND=18/1/1 TITLE=1/-1/~ PWS50 !0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/q-vectrs_thkn.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/q-vectrs_thkn.attr index 46d5754b89..1c1df28298 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/q-vectrs_thkn.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/q-vectrs_thkn.attr @@ -19,7 +19,6 @@ FINT= FLINE= HILO=3/W;K HLSYM= -CLRBAR=0 WIND=27/.1/2//.5 TITLE=1/-1/~ @ Q-VECTORS and THICKNESS!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/radar_spectra1.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/radar_spectra1.attr index 1b3548e32f..b0deb79926 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/radar_spectra1.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/radar_spectra1.attr @@ -17,7 +17,6 @@ FINT= FLINE= HILO= HLSYM= -CLRBAR=0 WIND= TITLE=5/-1/~ Radar Spectra 1! COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ransnocsi_500-850.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ransnocsi_500-850.attr index ff4714fd81..67e540d4f5 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ransnocsi_500-850.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ransnocsi_500-850.attr @@ -18,6 +18,6 @@ FINT = 70;80;90 FLINE = 0;24;23;22 HILO = HLSYM = -CLRBAR= 1 +!CLRBAR= 1 WIND = TITLE = 1/-2/~ 850-700 RH,T(BL y,850 r,700 cyan),850-500 EPV|~ 850-700 RH, R/S T, EPV!0 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ransnocsi_600-800.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ransnocsi_600-800.attr index f86c2c68af..87742bfec7 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ransnocsi_600-800.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ransnocsi_600-800.attr @@ -18,7 +18,6 @@ FINT=70;80;90 FLINE=0;24;23;22 HILO= HLSYM= -CLRBAR=1 WIND= TITLE=1/-2/~ 850-700 RH,T(BL y,850 r,700 cyan),800-600 EPV|~ 850-700 RH, R/S T, EPV!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ransnocsi_700-850.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ransnocsi_700-850.attr index 1545947f48..d83a729942 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ransnocsi_700-850.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ransnocsi_700-850.attr @@ -18,7 +18,6 @@ FINT=70;80;90 FLINE=0;24;23;22 HILO= HLSYM= -CLRBAR=1 WIND= TITLE=1/-2/~ 850-700 RH,T(BL y,850 r,700 cyan),850-700 EPV|~ 850-700 RH, R/S T, EPV!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/remotely_sensed_snow_cover.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/remotely_sensed_snow_cover.attr index 20060430d3..097e03c20f 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/remotely_sensed_snow_cover.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/remotely_sensed_snow_cover.attr @@ -17,7 +17,6 @@ FINT=50;60;70;80;90 FLINE=0;29;28;27;26;0 HILO= HLSYM= -CLRBAR=0 WIND=18/1/1 TITLE=1/-1/~ Remotely Sensed Snow Cover COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ri3hr.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ri3hr.attr index 9bf212f092..d0292dc847 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ri3hr.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ri3hr.attr @@ -17,7 +17,6 @@ FINT=50;60;70;80;90 FLINE=0;29;28;27;26;0 HILO= HLSYM= -CLRBAR=0 WIND=18/1/1 TITLE=1/-1/~ RI3hr COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/seaice.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/seaice.attr index dd565e1868..1b29ed2ac9 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/seaice.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/seaice.attr @@ -17,7 +17,6 @@ FINT=50;60;70;80;90 FLINE=0;29;28;27;26;0 HILO= HLSYM= -CLRBAR=0 WIND=18/1/1 TITLE=1/-1/~ Sea Ice !0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/seaice_points.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/seaice_points.attr index 7e7007af70..ed03b71bf6 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/seaice_points.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/seaice_points.attr @@ -17,7 +17,6 @@ FINT=50;60;70;80;90 FLINE=0;29;28;27;26;0 HILO= HLSYM= -CLRBAR=0 WIND=18/1/1 TITLE=1/-1/~ Sea Ice !0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sfclifted_index.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sfclifted_index.attr index f3cfb08637..4485000e04 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sfclifted_index.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sfclifted_index.attr @@ -18,7 +18,6 @@ FINT=-8;-6;-4;-2;0;10 FLINE=2;15;21;22;23;0;24 HILO=0 HLSYM=0 -CLRBAR=1 WIND=!!!bk10/0.9/2/112 TITLE=1/-2/~ SFC LIFTED INDEX, BL WINDS|~SFC LIFTED INDEX!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_and_mslp_feet.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_and_mslp_feet.attr index e81cf5dfcd..1f4ec13766 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_and_mslp_feet.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_and_mslp_feet.attr @@ -20,7 +20,7 @@ FINT = 6;12;18;24;30 FLINE = 0;24;25;30;14;2 HILO = ! ! 26;2/H#;L#///30;30/y HLSYM = ! ! 1.2;0.8//21//hw -CLRBAR = 1 +!CLRBAR = 1 WIND = 17/0.9/1.5/112 TITLE = 5/-1/~ SIG WAVE HEIGHT (ft) with GFS PMSL and BL WIND!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_and_mslp_meters.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_and_mslp_meters.attr index 5fd5a28055..1911097429 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_and_mslp_meters.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_and_mslp_meters.attr @@ -20,7 +20,7 @@ FINT = 2;4;6;8;10 FLINE = 0;24;25;30;14;2 HILO = ! !26;2/H#;L#///30;30/y HLSYM = ! !1.2;0.8//21//hw -CLRBAR = 1 +!CLRBAR = 1 WIND = 17/0.9/1.5/112 TITLE = 5/-1/~ SIG WAVE HEIGHT (m) with GFS PMSL and BL WIND!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_cont_fill_feet.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_cont_fill_feet.attr index 9a846539e8..ba5737a3ea 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_cont_fill_feet.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_cont_fill_feet.attr @@ -18,7 +18,7 @@ FINT = 6;12;18;24;30 FLINE = 0;24;25;30;14;2 HILO = 0 HLSYM = 0 -CLRBAR = 1 +!CLRBAR = 1 WIND = 17/0.9/1.5/112 TITLE = 5/-1/~ SIG WAVE HEIGHT (ft) and NWW3 10m WIND!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_cont_fill_meters.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_cont_fill_meters.attr index 0f6d4bc60d..c6eff6c440 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_cont_fill_meters.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_cont_fill_meters.attr @@ -18,7 +18,7 @@ FINT = 2;4;6;8;10 FLINE = 0;24;25;30;14;2 HILO = 0 HLSYM = 0 -CLRBAR = 1 +!CLRBAR = 1 WIND = 17/0.9/1.5/112 TITLE = 5/-1/~ SIG WAVE HEIGHT (m) and NWW3 10m WIND!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_dir_only.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_dir_only.attr index 14b2230092..97cc8270bf 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_dir_only.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_dir_only.attr @@ -19,7 +19,7 @@ FINT = FLINE = HILO = HLSYM = -CLRBAR = +!CLRBAR = WIND = 3/.7/.6/212/.6 TITLE = 5/-1/~ GRIDPOINT PEAK SWELL DIR!0 COLORS = 1 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_feet.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_feet.attr index f62d433023..d5802cfed2 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_feet.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_feet.attr @@ -19,7 +19,7 @@ FINT = FLINE = HILO = 0 HLSYM = 0 -CLRBAR = 1 +!CLRBAR = 1 WIND = 17/.8/1.8/112 TITLE = 5/-1/~ GRIDDED SIG WAVE HEIGHT (ft) and NWW3 10m WIND!0 COLORS = 1 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_feet_dir.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_feet_dir.attr index 3ff4bfc2e3..750527c1df 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_feet_dir.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_feet_dir.attr @@ -20,7 +20,7 @@ FINT = FLINE = HILO = HLSYM = -CLRBAR = +!CLRBAR = WIND = 3/.7/.6/212/.6 TITLE = 5/-1/~ GRIDDED SIG WAVE HEIGHT (ft) and PEAK SWELL DIR!0 COLORS = 1 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_feet_only.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_feet_only.attr index f970371f7b..e10275da74 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_feet_only.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_feet_only.attr @@ -19,7 +19,7 @@ FINT = FLINE = HILO = 0 HLSYM = 0 -CLRBAR = 0 +!CLRBAR = 0 WIND = TITLE = 5/-1/~ GRIDDED SIG WAVE HEIGHT (ft)!0 COLORS = 1 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_feet_opc.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_feet_opc.attr index 8b791f5577..13c23b7a81 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_feet_opc.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_feet_opc.attr @@ -18,7 +18,7 @@ FINT = FLINE = HILO = 0 HLSYM = 0 -CLRBAR = 1 +!CLRBAR = 1 WIND = 17/.8/1.8/112 TITLE = 5/-1/~ GRIDDED SIG WAVE HEIGHT (ft) COLORS = 1 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_meters.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_meters.attr index fe962635f9..9d44946a20 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_meters.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_meters.attr @@ -19,7 +19,7 @@ FINT = FLINE = HILO = 0 HLSYM = 0 -CLRBAR = 0 +!CLRBAR = 0 WIND = 17/0.8/1.8/112 TITLE = 5/-1/~ GRIDDED SIG WAVE HEIGHT (m) and NWW3 10m WIND!0 COLORS = 1 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_meters_dir.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_meters_dir.attr index a33bdbe8ef..201de23650 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_meters_dir.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_meters_dir.attr @@ -20,7 +20,7 @@ FINT = FLINE = HILO = HLSYM = -CLRBAR = +!CLRBAR = WIND = 3/.7/.6/212/.6 TITLE = 5/-1/~ GRIDDED SIG WAVE HEIGHT (m) and PEAK SWELL DIR!0 COLORS = 1 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_meters_only.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_meters_only.attr index 14a049918f..d4f88c082b 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_meters_only.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_meters_only.attr @@ -19,7 +19,7 @@ FINT = FLINE = HILO = 0 HLSYM = 0 -CLRBAR = 0 +!CLRBAR = 0 WIND = TITLE = 5/-1/~ GRIDDED SIG WAVE HEIGHT (m)!0 COLORS = 1 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_mslp_feet.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_mslp_feet.attr index 9202e02e37..a7666239e6 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_mslp_feet.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_mslp_feet.attr @@ -21,7 +21,7 @@ FINT = FLINE = HILO = ! !26;2/H#;L#///30;30/y HLSYM = ! !1.2;0.8//21//hw -CLRBAR = 1 +!CLRBAR = 1 WIND = !17/0.8/1.8/112 TITLE = 5/-1/~ GRIDDED SIG WAVE HEIGHT (ft) with GFS PMSL and BL Winds!0 COLORS = 1 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_mslp_feet_nw.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_mslp_feet_nw.attr index 773dd8118a..db1198e689 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_mslp_feet_nw.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_mslp_feet_nw.attr @@ -21,7 +21,7 @@ FINT = FLINE = HILO = !26;2/H#;L#///30;30/y HLSYM = !1.2;0.8//21//hw -CLRBAR = 1 +!CLRBAR = 1 WIND = TITLE = 5/-1/~ GRIDDED SIG WAVE HEIGHT (ft) with GFS PMSL!0 COLORS = 1 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_mslp_meters.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_mslp_meters.attr index cca650d7d8..ee2ced5cab 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_mslp_meters.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_mslp_meters.attr @@ -21,7 +21,7 @@ FINT = FLINE = HILO = ! !26;2/h#;l#///30;30/y HLSYM = ! !.9;0.8//21//hw -CLRBAR = 1 +!CLRBAR = 1 WIND = 17/1/1.4/112 TITLE = 5/-1/~ GRIDDED SIG WAVE HEIGHT (m) with GFS PMSL and BL WIND!0 COLORS = 1 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_mslp_meters_nw.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_mslp_meters_nw.attr index 0a7924e4b9..37a3cdf9a5 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_mslp_meters_nw.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_mslp_meters_nw.attr @@ -21,7 +21,7 @@ FINT = FLINE = HILO = !26;2/h#;l#///30;30/y HLSYM = !.9;0.8//21//hw -CLRBAR = 1 +!CLRBAR = 1 WIND = TITLE = 5/-1/~ GRIDDED SIG WAVE HEIGHT (m) with GFS PMSL!0 COLORS = 1 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sipd_6400.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sipd_6400.attr index 6d37c8bd16..c50914ddf1 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sipd_6400.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sipd_6400.attr @@ -16,7 +16,6 @@ FINT=5;6;7;8;9 FLINE=0;20;21;22;23;0 HILO= HLSYM= -CLRBAR= WIND=18/1/1 TITLE=1/-1/~ Supercooled Large Droplet Icing COLORS=21 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/slight_risk_conv_outlook.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/slight_risk_conv_outlook.attr index b7331ba28f..a70e2895fa 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/slight_risk_conv_outlook.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/slight_risk_conv_outlook.attr @@ -17,7 +17,6 @@ FINT=50;60;70;80;90 FLINE=0;29;28;27;26;0 HILO= HLSYM= -CLRBAR= WIND=18/1/1 TITLE=1/-1/~ tp12c1 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/stability_850mb_wnd.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/stability_850mb_wnd.attr index 8307c783a2..7849f3786c 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/stability_850mb_wnd.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/stability_850mb_wnd.attr @@ -20,7 +20,6 @@ FINT=35;50;65 FLINE=0;25;30;15 HILO=0!20/;N#/;-30--12!0!20/H#;L#/1018-1070;900-1014 HLSYM=0!1.2;1.2//21;21/2;2/hw!0!1.2;1.2//21;21/2;2/hw -CLRBAR=0 WIND=9/0.8/1.8/112 TITLE=1/-1/~ 850mb Wind, Lapse Rate (850-SFC) [Unstable less than -12 (SOLID)]!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/stability_850mb_wnd_global.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/stability_850mb_wnd_global.attr index d04bf2dc49..94540f4bf1 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/stability_850mb_wnd_global.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/stability_850mb_wnd_global.attr @@ -17,7 +17,7 @@ FINT = 35;50;65 FLINE = 0;25;30;15 HILO = 0!7/;N#/;-30--12!0!20/H#;L#/1018-1070;900-1014 HLSYM = 0!1.2;1.2//21;21/2;2/hw!0!1.2;1.2//21;21/2;2/hw -CLRBAR= 0 +!CLRBAR= 0 WIND = 9/0.8/1.8/112 TITLE = 1/-1/~ 850mb Wind, Lapse Rate (850-SFC) [Unstable less than -12 (SOLID)]!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/stability_900mb_wnd.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/stability_900mb_wnd.attr index 524e726765..03b17b886a 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/stability_900mb_wnd.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/stability_900mb_wnd.attr @@ -17,7 +17,6 @@ FINT=35;50;65 FLINE=0;25;30;15 HILO=0!20/;N#/;-30--8!0!20/H#;L#/1018-1070;900-1014 HLSYM=0!1.2;1.2//21;21/2;2/hw!0!1.2;1.2//21;21/2;2/hw -CLRBAR=0 WIND=9/0.8/1.8/112 TITLE=1/-1/~ 900mb Wind, Lapse Rate (900-SFC) [Unstable less than -8 (SOLID)]!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/stability_925mb_wnd.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/stability_925mb_wnd.attr index 1dd2413da6..03ff00f9a7 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/stability_925mb_wnd.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/stability_925mb_wnd.attr @@ -18,7 +18,6 @@ FINT=35;50;65 FLINE=0;25;30;15 HILO=0!7/;N#/;-30--6!0!20/H#;L#/1018-1070;900-1014 HLSYM=0!1.2;1.2//21;21/2;2/hw!0!1.2;1.2//21;21/2;2/hw -CLRBAR=0 WIND=9/0.8/1.8/112 TITLE=1/-1/~ 925mb Wind, Lapse Rate (925-SFC) [Unstable less than -6 (SOLID)]!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/stability_950mb_wnd.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/stability_950mb_wnd.attr index 3106c6a2aa..dd484f3e67 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/stability_950mb_wnd.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/stability_950mb_wnd.attr @@ -17,7 +17,7 @@ FINT = 35;50;65 FLINE = 0;25;30;15 HILO = 0!20/;N#/;-30--4!0!20/H#;L#/1018-1070;900-1014 HLSYM = 0!1.2;1.2//21;21/2;2/hw!0!1.2;1.2//21;21/2;2/hw -CLRBAR= 0 +!CLRBAR= 0 WIND = 9/0.8/1.8/112 TITLE = 1/-1/~ 950mb Wind, Lapse Rate (950-SFC) [Unstable less than -4 (SOLID)]!0 COLORS = 2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/surface_pressure.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/surface_pressure.attr index c4a30951b1..79ffc74042 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/surface_pressure.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/surface_pressure.attr @@ -17,7 +17,6 @@ FINT= FLINE= HILO= HLSYM= -CLRBAR= WIND= TITLE=5/-1/~ SURFACE PRESSURE! COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/surface_temperature.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/surface_temperature.attr index aca89d39da..6a02e65f68 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/surface_temperature.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/surface_temperature.attr @@ -17,7 +17,6 @@ FINT= FLINE= HILO= HLSYM= -CLRBAR= WIND= TITLE=5/-1/~ SURFACE TEMPERATURE! COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/surface_temperature_as_points.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/surface_temperature_as_points.attr index 3a0e1cf413..af55a989ce 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/surface_temperature_as_points.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/surface_temperature_as_points.attr @@ -17,7 +17,6 @@ FINT= FLINE= HILO= HLSYM= -CLRBAR= WIND= TITLE=5/-1/~ @ SURFACE TEMPERATURE! COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/svrwx.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/svrwx.attr index e8501e2a73..5afb7cbf14 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/svrwx.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/svrwx.attr @@ -21,7 +21,6 @@ FINT=0;50 !50;56;62;68;74 FLINE=0;8;0 !0;23;22;30;14;2 HILO=0!0!0!0!5/H#;L#/1080-2000;900-1012!0 HLSYM=!!!!!1.5;1.5//22/3/hw! -CLRBAR=0!1/V/LL!0 WIND=!!!!!!9/0.8/2/112!6/.3/2/221/.4 TITLE=1/-2/~ BL (0-30 MB AGL)DWPT AND WIND, 700mb TEMP, RH AND WND, EMSL!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/svrwx_global.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/svrwx_global.attr index 5351126741..d475c6c376 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/svrwx_global.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/svrwx_global.attr @@ -17,6 +17,6 @@ FINT = 0;50 !50;56;62;68;74 FLINE = 0;8;0 !0;23;22;30;14;2 HILO = 0!0!0!0!5/H#;L#/1080-2000;900-1012!0 HLSYM = !!!!!1.5;1.5//22/3/hw! -CLRBAR= 0!1/V/LL!0 +!CLRBAR= 0!1/V/LL!0 WIND = !!!!!!9/0.8/2/112!6/.3/2/221/.4 TITLE = 1/-2/~ BL DWPT AND WIND, 700mb TEMP, RH AND WND, PMSL!0 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/svrwx_intl.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/svrwx_intl.attr index 14d938d47d..4cfd9decec 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/svrwx_intl.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/svrwx_intl.attr @@ -17,7 +17,6 @@ FINT=0;50 !15;18;21;24;27 FLINE=0;8;0 !0;23;22;30;14;2 HILO=0!0!0!0!5/H#;L#/1080-2000;900-1012!0 HLSYM=!!!!!1.5;1.5//22/3/hw! -CLRBAR=0!1/V/LL!0 WIND=!!!!!!9/0.8/2/112!6/.3/2/221/.4 TITLE=1/-2/~ BL DWPT AND WIND, 700mb TEMP, RH AND WND, PMSL!0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/svrwx_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/svrwx_nam.attr index 12ea8ac97a..758756d9d8 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/svrwx_nam.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/svrwx_nam.attr @@ -20,6 +20,6 @@ FINT = 0;50 !50;56;62;68;74 FLINE = 0;8;0 !0;23;22;30;14;2 HILO = 0!0!0!0!5/H#;L#/1080-2000;900-1012!0 HLSYM = !!!!!1.5;1.5//22/3/hw! -CLRBAR= 0!1/V/LL!0 +!CLRBAR= 0!1/V/LL!0 WIND = !!!!!!9/0.8/2/112!6/.3/2/221/.4 TITLE = 1/-2/~ BL (0-30 MB AGL)DWPT AND WIND, 700mb TEMP, RH AND WND, EMSL!0 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/tmxk.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/tmxk.attr index ae62effa33..02a3836e08 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/tmxk.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/tmxk.attr @@ -17,7 +17,6 @@ FINT=.01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.5;3;4;5;6;7;8;9 FLINE=0;21-30;14-20;5 HILO=0 HLSYM=0 -CLRBAR= WIND= TITLE=5/-1/~ TMXK COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/total_cloud_cover.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/total_cloud_cover.attr index 861948b296..81a4e6995f 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/total_cloud_cover.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/total_cloud_cover.attr @@ -16,7 +16,6 @@ FINT=50;60;70;80;90 FLINE=0;29;28;27;26;0 HILO= HLSYM= -CLRBAR= WIND=18/1/1 TITLE=1/-1/~ Total Cloud Cover COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/tp12c1.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/tp12c1.attr index 3f54c18089..cf085bcd1c 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/tp12c1.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/tp12c1.attr @@ -17,7 +17,6 @@ FINT=50;60;70;80;90 FLINE=0;29;28;27;26;0 HILO= HLSYM= -CLRBAR= WIND=18/1/1 TITLE=1/-1/~ tp12c1 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/tpFWR.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/tpFWR.attr index 07484a2a5a..7ece720ece 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/tpFWR.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/tpFWR.attr @@ -17,7 +17,6 @@ FINT=50;60;70;80;90 FLINE=0;29;28;27;26;0 HILO= HLSYM= -CLRBAR= WIND=18/1/1 TITLE=1/-1/~ tpFWR COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/tpHPC.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/tpHPC.attr index ea2cb88c68..645b3ee667 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/tpHPC.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/tpHPC.attr @@ -17,7 +17,6 @@ FINT=50;60;70;80;90 FLINE=0;29;28;27;26;0 HILO= HLSYM= -CLRBAR= WIND=18/1/1 TITLE=1/-1/~ tpHPC COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/tstorm_prob_2hr.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/tstorm_prob_2hr.attr index 3c5f8e75b0..b113b28ac4 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/tstorm_prob_2hr.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/tstorm_prob_2hr.attr @@ -17,7 +17,6 @@ FINT= FLINE=0;29;28;27;26;0 HILO= HLSYM= -CLRBAR= WIND= TITLE=1/-1/~ 2-Hr Thunderstorm Probability COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/turb_6400.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/turb_6400.attr index b99fb64c1a..2e514c87fc 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/turb_6400.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/turb_6400.attr @@ -16,7 +16,6 @@ FINT=50;60;70;80;90 FLINE=0;29;28;27;26;0 HILO= HLSYM= -CLRBAR= WIND=18/1/1 TITLE=1/-1/~ TURBULENCE !0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/water_temperature.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/water_temperature.attr index 63b8686fc0..7e67c1ca86 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/water_temperature.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/water_temperature.attr @@ -17,7 +17,6 @@ FINT=50;60;70;80;90 FLINE=0;29;28;27;26;0 HILO= HLSYM= -CLRBAR= WIND=18/1/1 TITLE=1/-1/~ WATER TEMPERATURE !0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/wave_height.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/wave_height.attr index d86e4dd318..a2b3ef1de2 100644 --- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/wave_height.attr +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/wave_height.attr @@ -16,7 +16,6 @@ FINT=50;60;70;80;90 FLINE=0;29;28;27;26;0 HILO= HLSYM= -CLRBAR= WIND=18/1/1 TITLE=1/-1/~ Wave Height !0 COLORS=2 diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/PGEN/PGEN-PGEN.xml b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/PGEN/PGEN-PGEN.xml new file mode 100644 index 0000000000..3d2a5383c9 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/PGEN/PGEN-PGEN.xml @@ -0,0 +1,6 @@ + + + PGEN + PGEN + default,monocolor-green,monocolor-white + diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/PGEN/default.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/PGEN/default.attr new file mode 100644 index 0000000000..77ce42af86 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/PGEN/default.attr @@ -0,0 +1,6 @@ +! Attributes for PGEN XML +! +color=RGB {155, 155, 155} +monoColorEnable=false +monoColor=RGB {0, 255, 0} +fillModeEnable=true diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/PGEN/monocolor-green.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/PGEN/monocolor-green.attr new file mode 100644 index 0000000000..2b33d0a877 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/PGEN/monocolor-green.attr @@ -0,0 +1,6 @@ +! Attributes for PGEN XML +! +color=RGB {155, 155, 155} +monoColorEnable=true +monoColor=RGB {0, 255, 0} +fillModeEnable=true diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/PGEN/monocolor-white.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/PGEN/monocolor-white.attr new file mode 100644 index 0000000000..eb83b96354 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/PGEN/monocolor-white.attr @@ -0,0 +1,6 @@ +! Attributes for PGEN XML +! +color=RGB {255, 255, 255} +monoColorEnable=true +monoColor=RGB {255, 255, 255} +fillModeEnable=true diff --git a/cave/build/static/common/cave/etc/ncep/ColorMaps/Satellite/wv_tpc.cmap b/cave/build/static/common/cave/etc/ncep/ColorMaps/Satellite/wv_tpc.cmap index d52e70eb01..09ed55f377 100644 --- a/cave/build/static/common/cave/etc/ncep/ColorMaps/Satellite/wv_tpc.cmap +++ b/cave/build/static/common/cave/etc/ncep/ColorMaps/Satellite/wv_tpc.cmap @@ -1,131 +1,131 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/pgen_bufrmos_total_skyc.txt b/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/pgen_bufrmos_total_skyc.txt deleted file mode 100644 index 22e0a2bdb2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/pgen_bufrmos_total_skyc.txt +++ /dev/null @@ -1,5 +0,0 @@ -s2s -default : SKY_COVER_00 -1 : SKY_COVER_00 -4 : SKY_COVER_08 -7 : SKY_COVER_06 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/pgen_clouds_best_cat.txt b/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/pgen_clouds_best_cat.txt deleted file mode 100644 index c95fc03865..0000000000 --- a/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/pgen_clouds_best_cat.txt +++ /dev/null @@ -1,13 +0,0 @@ -s2s -0 : SKY_COVER_00 -1 : SKY_COVER_02 -2 : SKY_COVER_03 -4 : SKY_COVER_08 -5 : SKY_COVER_00 -6 : SKY_COVER_05 -8 : SKY_COVER_09 -9 : SKY_COVER_03 -11 : SKY_COVER_03 -12 : SKY_COVER_02 -13 : SKY_COVER_02 -14 : SKY_COVER_00 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/pgen_icing.txt b/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/pgen_icing.txt deleted file mode 100644 index 9bee2585c2..0000000000 --- a/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/pgen_icing.txt +++ /dev/null @@ -1,11 +0,0 @@ -s2s -SEV : ICING_08 -MODSEV : ICING_06 -MOD : ICING_05 -LGTMOD : ICING_04 -LGT : ICING_03 -TRACELGT: ICING_02 -TRACE : ICING_01 -NEG : ICING_00 - - diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/pgen_pressure_tendency.txt b/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/pgen_pressure_tendency.txt deleted file mode 100644 index 3c80406877..0000000000 --- a/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/pgen_pressure_tendency.txt +++ /dev/null @@ -1,10 +0,0 @@ -s2s -0 : PRESSURE_TENDENCY_00 -1 : PRESSURE_TENDENCY_01 -2 : PRESSURE_TENDENCY_02 -3 : PRESSURE_TENDENCY_03 -4 : PRESSURE_TENDENCY_04 -5 : PRESSURE_TENDENCY_05 -6 : PRESSURE_TENDENCY_06 -7 : PRESSURE_TENDENCY_07 -8 : PRESSURE_TENDENCY_08 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/pgen_skyc.txt b/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/pgen_skyc.txt deleted file mode 100644 index 0b559de136..0000000000 --- a/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/pgen_skyc.txt +++ /dev/null @@ -1,11 +0,0 @@ -s2s -default : SKY_COVER_10 -BLNK : SKY_COVER_10 -SKC : SKY_COVER_00 -CLR : SKY_COVER_00 -FEW : SKY_COVER_02 -SCT : SKY_COVER_03 -BKN : SKY_COVER_06 -OVC : SKY_COVER_08 -OBS : SKY_COVER_09 -VV : SKY_COVER_09 diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/pgen_total_cloud_amount.txt b/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/pgen_total_cloud_amount.txt deleted file mode 100644 index 7b01d5854b..0000000000 --- a/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/pgen_total_cloud_amount.txt +++ /dev/null @@ -1,10 +0,0 @@ -s2s -default : SKY_COVER_10 -1 : SKY_COVER_10 -2 : SKY_COVER_00 -3 : SKY_COVER_00 -4 : SKY_COVER_03 -5 : SKY_COVER_02 -6 : SKY_COVER_06 -7 : SKY_COVER_08 -8 : SKY_COVER_09 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/pgen_turbulence.txt b/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/pgen_turbulence.txt deleted file mode 100644 index fe751ef101..0000000000 --- a/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/pgen_turbulence.txt +++ /dev/null @@ -1,9 +0,0 @@ -s2s -EXTRM :TURBULENCE_7 -SEV :TURBULENCE_6 -MODSEV:TURBULENCE_5 -MOD :TURBULENCE_4 -LGTMOD:TURBULENCE_3 -LGT :TURBULENCE_2 -NEGLGT:TURBULENCE_1 -NEG :TURBULENCE_0 \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/pgen_wsym.txt b/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/pgen_wsym.txt deleted file mode 100644 index 91c9d8f966..0000000000 --- a/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/pgen_wsym.txt +++ /dev/null @@ -1,71 +0,0 @@ -s2s --SHRA : PRESENT_WX_080 -+SHRA : PRESENT_WX_082 -SHRA : PRESENT_WX_081 --SHSN : PRESENT_WX_085 -+SHSN : PRESENT_WX_086 -SHSN : PRESENT_WX_086 --TSRA : PRESENT_WX_095 -+TSRA : PRESENT_WX_097 -TSRA : PRESENT_WX_095 --TSSN : PRESENT_WX_095 -+TSSN : PRESENT_WX_097 -TSSN : PRESENT_WX_095 -FZRASN : PRESENT_WX_066 -BCBR : PRESENT_WX_010 -MIBR : PRESENT_WX_010 -BR : PRESENT_WX_010 -FZFG : PRESENT_WX_048 -BCFG : PRESENT_WX_041 -MIFG : PRESENT_WX_044 -FG : PRESENT_WX_045 -TS : PRESENT_WX_095 -+TS : PRESENT_WX_097 -FC : PRESENT_WX_019 -+FC : PRESENT_WX_019 -PO : PRESENT_WX_008 -DRSN : PRESENT_WX_036 -+DRSN : PRESENT_WX_037 -BLSN : PRESENT_WX_038 -+BLSN : PRESENT_WX_039 -FU : PRESENT_WX_004 -HZ : PRESENT_WX_005 --SH : PRESENT_WX_080 -SH : PRESENT_WX_081 -DU : PRESENT_WX_006 -SA : PRESENT_WX_007 -SS : PRESENT_WX_009 -DS : PRESENT_WX_009 -+SS : PRESENT_WX_009 -+DS : PRESENT_WX_009 --FZRA : PRESENT_WX_066 --FZDZ : PRESENT_WX_056 -FZRA : PRESENT_WX_067 -FZDZ : PRESENT_WX_057 -GR : PRESENT_WX_088 -IC : PRESENT_WX_078 -PE : PRESENT_WX_079 -PL : PRESENT_WX_079 -GS : PRESENT_WX_087 -DZRA : PRESENT_WX_058 -RADZ : PRESENT_WX_058 -RASN : PRESENT_WX_069 -SNRA : PRESENT_WX_069 --RA : PRESENT_WX_061 -+RA : PRESENT_WX_065 -RA : PRESENT_WX_063 --DZ : PRESENT_WX_051 -+DZ : PRESENT_WX_055 -DZ : PRESENT_WX_053 --SN : PRESENT_WX_071 -+SN : PRESENT_WX_075 -SN : PRESENT_WX_073 --UP : PRESENT_WX_203 -+UP : PRESENT_WX_203 -UP : PRESENT_WX_203 -IP : PRESENT_WX_079 -SG : PRESENT_WX_077 -VA : PRESENT_WX_201 -PRFG : PRESENT_WX_044 -SQ : PRESENT_WX_018 -BLDU : PRESENT_WX_007 diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/plotParameters_bufrmosETA.xml b/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/plotParameters_bufrmosETA.xml index 487bdf2fb7..28e1d0e1ba 100644 --- a/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/plotParameters_bufrmosETA.xml +++ b/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/plotParameters_bufrmosETA.xml @@ -149,7 +149,7 @@ + plotLookupTable="ncep_cloudsbestCat.txt" /> \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/plotParameters_bufrmosGFS.xml b/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/plotParameters_bufrmosGFS.xml index 37efd067f6..a809d6533c 100644 --- a/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/plotParameters_bufrmosGFS.xml +++ b/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/plotParameters_bufrmosGFS.xml @@ -117,7 +117,7 @@ + dbParamName="windDir" plotUnit="°" /> + plotLookupTable="ncep_cloudsbestCat.txt" /> diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/plotParameters_bufrmosGFSX.xml b/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/plotParameters_bufrmosGFSX.xml index 8e650deff4..efa5477695 100644 --- a/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/plotParameters_bufrmosGFSX.xml +++ b/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/plotParameters_bufrmosGFSX.xml @@ -120,7 +120,7 @@ + plotLookupTable="ncep_totalSkyCover.txt" /> diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/plotParameters_bufrmosLAMP.xml b/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/plotParameters_bufrmosLAMP.xml index 6c23b40e62..fd66d12e81 100644 --- a/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/plotParameters_bufrmosLAMP.xml +++ b/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/plotParameters_bufrmosLAMP.xml @@ -115,6 +115,6 @@ + plotLookupTable="ncep_cloudsbestCat.txt" /> \ No newline at end of file diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/plotParameters_bufrua.xml b/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/plotParameters_bufrua.xml index 482c4d9c8a..346a4eae80 100644 --- a/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/plotParameters_bufrua.xml +++ b/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/plotParameters_bufrua.xml @@ -68,9 +68,9 @@ - + - + diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/plotParameters_ncairep.xml b/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/plotParameters_ncairep.xml index 50bcd88324..1c7355a089 100644 --- a/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/plotParameters_ncairep.xml +++ b/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/plotParameters_ncairep.xml @@ -62,13 +62,16 @@ wtop top of wx in ft + plotLookupTable="icing_intens_trans.txt"/> - + dbParamName="iceType" + plotMode="table" symbolFont="WxSymbolFont" + plotLookupTable="icing_type_trans.txt"/> + dbParamName="iceType" + plotMode="table" symbolFont="WxSymbolFont" + plotLookupTable="icing_type2_trans.txt"/> - + dbParamName="skyCover" + plotMode="table" symbolFont="StandardFont" + plotLookupTable="cloud_intens_trans.txt" /> - + prioritySelectTable="icing_select.txt" + plotLookupTable="icing_intens_trans.txt"/> + - - + dbParamName="iceType" plotMode="table" + plotLookupTable="icing_type_trans.txt"/> - + prioritySelectTable="turb_select.txt" + plotLookupTable="turb_intens_trans.txt"/> - + dbParamName="turbFreq" + plotMode="table" symbolFont="WxSymbolFont" + prioritySelectTable="turb_select.txt" + plotLookupTable="turb_freq_trans.txt"/> + dbParamName="turbType" plotMode="table" + plotLookupTable="turb_type_trans.txt"/> - - + dbParamName="skyCover1" + plotMode="table" symbolFont="StandardFont" + plotLookupTable="cloud_intens_trans.txt" /> + plotLookupTable="wx_symbol_trans.txt"/> diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/plotParameters_nctaf.xml b/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/plotParameters_nctaf.xml index 593242f664..c8dfe8c55a 100644 --- a/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/plotParameters_nctaf.xml +++ b/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/plotParameters_nctaf.xml @@ -66,7 +66,7 @@ plotMode="table" symbolFont="WxSymbolFont" dbParamName="SCVR_TYPE" prioritySelectTable="cloud_select.txt" - plotLookupTable="pgen_skyc.txt" /> + plotLookupTable="cloud_chars.txt" /> + plotLookupTable="cloud_chars.txt" /> diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/plotParameters_obs.xml b/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/plotParameters_obs.xml index 3e63853f24..c012a3d3fc 100644 --- a/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/plotParameters_obs.xml +++ b/cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/plotParameters_obs.xml @@ -17,21 +17,23 @@ + plotFormat="%4.0f"/> - + + plotMode="table" symbolFont="WxSymbolFont" + arrayIndex="0" + plotLookupTable="wx_symbol_trans.txt"/> @@ -117,9 +117,7 @@ prioritySelectTable="cloud_select.txt" plotLookupTable="cloud_chars.txt" /> --> - + - + diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosMRF/standard.xml b/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosMRF/standard.xml index 1572e755db..0f6a7252f8 100644 --- a/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosMRF/standard.xml +++ b/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosMRF/standard.xml @@ -1,27 +1,25 @@ - + LR - + UR - + UL - ML diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/FFG_TIR_HIRES/FFG_TIR_HIRES.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/FFG_TIR_HIRES/FFG_TIR_HIRES.xml index c2fcbc01d6..e054b089db 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/FFG_TIR_HIRES/FFG_TIR_HIRES.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/FFG_TIR_HIRES/FFG_TIR_HIRES.xml @@ -13,7 +13,7 @@ BasicWX_US pluginName=grid -GDFILE=FFG-TIR +GDFILE=FFG-TIR-HiRes true diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/FFA/FFA.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/FFA/FFA.xml index ea44e2afe9..90228011b7 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/FFA/FFA.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/FFA/FFA.xml @@ -4,7 +4,7 @@ MISC pluginName=aww -reportType=FLASH FLOOD ADVISORY,FLASH FLOOD WARNING,FLASH FLOOD WATCH,FLASH FLOOD STATEMENT,FLOOD WATCH +reportType=FLASH_FLOOD_ADVISORY,FLASH_FLOOD_WARNING,FLASH_FLOOD_WATCH,FLASH_FLOOD_STATEMENT,FLOOD_WATCH legendName=FFA color=RGB {155, 155, 155} diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/LTNG/LTNG.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/LTNG/LTNG.xml index 45cb3d3c8e..5708b00615 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/LTNG/LTNG.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/LTNG/LTNG.xml @@ -4,7 +4,6 @@ MISC pluginName=binlightning -lightSource=NLDN,GLN colorByIntensity=false legendColor=RGB {200, 200, 200} diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/LTNG2/LTNG2.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/LTNG2/LTNG2.xml index f763f9e8bb..4cbc9ee99f 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/LTNG2/LTNG2.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/LTNG2/LTNG2.xml @@ -4,7 +4,6 @@ MISC pluginName=binlightning -lightSource=NLDN,GLN colorByIntensity=true legendColor=RGB {200, 200, 200} diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/SGWH/SGWH.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/SGWH/WaveSat.xml similarity index 100% rename from cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/SGWH/SGWH.xml rename to cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/SGWH/WaveSat.xml diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/SVRL/SVRL.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/SVRL/SVRL.xml index c555a0541a..9e5f1219fb 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/SVRL/SVRL.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/SVRL/SVRL.xml @@ -4,7 +4,7 @@ MISC pluginName=aww -reportType=SEVERE THUNDERSTORM WATCH,TORNADO WATCH OUTLINE UPDATE +reportType=SEVERE_THUNDERSTORM_WATCH,TORNADO_WATCH_OUTLINE_UPDATE color=RGB {155, 155, 155} SVRL diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/WARN/WARN.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/WARN/WARN.xml index 43909acf2b..d54e7f2cce 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/WARN/WARN.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/WARN/WARN.xml @@ -4,7 +4,7 @@ MISC pluginName=aww -reportType=SEVERE THUNDERSTORM WARNING,TORNADO WARNING,FLASH FLOOD WARNING +reportType=SEVERE_THUNDERSTORM_WARNING,TORNADO_WARNING,FLASH_FLOOD_WARNING color=RGB {155, 155, 155} Warn diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/WATCH/WATCH.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/WATCH/WATCH.xml index ba82ca4974..04af7b9c73 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/WATCH/WATCH.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/WATCH/WATCH.xml @@ -4,9 +4,7 @@ MISC pluginName=aww -! There don't appear to be reports for STATUS_REPORT or THUNDERSTORM REPORT -! SEVERE WEATHER STATEMENT and SEVERE THUNDERSTORM WATCH -reportType=THUNDERSTORM REPORT,TORNADO REPORT,STATUS REPORT +reportType=THUNDERSTORM_REPORT,TORNADO_REPORT,STATUS_REPORT color=RGB {155, 155, 155} legendName=WATCH diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/WCN/WCN.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/WCN/WCN.xml index e731ee6af5..4f10e2a6c8 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/WCN/WCN.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/WCN/WCN.xml @@ -4,7 +4,7 @@ MISC pluginName=aww -reportType=WATCH COUNTY NOTIFICATION +reportType=WATCH_COUNTY_NOTIFICATION color=RGB {155, 155, 155} WCN diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/WOU/WOU.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/WOU/WOU.xml index 1ab163e449..40a50e2027 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/WOU/WOU.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/WOU/WOU.xml @@ -4,7 +4,7 @@ MISC pluginName=aww -reportType=SEVERE THUNDERSTORM WATCH,TORNADO WATCH OUTLINE UPDATE +reportType=SEVERE_THUNDERSTORM_WATCH,TORNADO_WATCH_OUTLINE_UPDATE color=RGB {155, 155, 155} WOU diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/WSTM/WSTM.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/WSTM/WSTM.xml index 3505bb4c14..097aabfeaf 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/WSTM/WSTM.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/WSTM/WSTM.xml @@ -4,8 +4,7 @@ MISC pluginName=aww -! removed 'ADVISORY' which seemed to be result of WIND CHILL ADVISORY -reportType=WINTER WEATHER ADVISORY,WINTER STORM WARNING,WINTER STORM WATCH,URGENT WEATHER MESSAGE,WEATHER ADVISORY,WINTER STORM +reportType=WINTER_WEATHER_ADVISORY,WINTER_STORM_WARNING,WINTER_STORM_WATCH,ADVISORY,URGENT_WEATHER_MESSAGE,WEATHER_ADVISORY,WINTER_STORM legendColor=RGB {255, 255, 255} WSTM diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Volcano/Volcano.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Volcano/Volcano.xml new file mode 100644 index 0000000000..c9c8690392 --- /dev/null +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/PGEN/Volcano/Volcano.xml @@ -0,0 +1,19 @@ + + + Volcano + PGEN + +! the sub-directory under the current PGEN working directory +! TODO : may want to change pgenDirectory to productType/activity and get the directory of the productType +pgenDirectory=/home/awp2pgen/activities/Volcano/xml + + PGEN + productName + + CLOSEST_BEFORE_OR_AFTER + 60 + USE_FRAME_INTERVAL + 10 + 24 + BasicWX_US + diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/RADAR/LocalRadar/LocalRadar.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/RADAR/LocalRadar/LocalRadar.xml index 83e44106b1..502a6ed535 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/RADAR/LocalRadar/LocalRadar.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/RADAR/LocalRadar/LocalRadar.xml @@ -5,7 +5,7 @@ RADAR pluginName=radar -format=Radial,Raster +format=Radial,Raster,Graphic legendColor=RGB {200, 200, 200} LocalRadar diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/DPD/DPD.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/DPD/DPD.xml index 686c679f3b..32941ea6c5 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/DPD/DPD.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/DPD/DPD.xml @@ -1,6 +1,5 @@ - true DPD SATELLITE McidasSatellite diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/GINI_Composite.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/GINI_Composite.xml index c68f2c8ebb..7fd62ba2de 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/GINI_Composite.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Composite/GINI_Composite.xml @@ -2,7 +2,6 @@ GINI_Composite SATELLITE - true ! This must match the "creatingEntity" in the ! satellite DB table valid values are diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES10/GINI_GOES10.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES10/GINI_GOES10.xml index 9eccc5ef12..3a36d2a458 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES10/GINI_GOES10.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES10/GINI_GOES10.xml @@ -1,6 +1,5 @@ - true GINI_GOES10 SATELLITE diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/GINI_GOES11.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/GINI_GOES11.xml index b8dfb3a64d..459a7e8306 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/GINI_GOES11.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES11/GINI_GOES11.xml @@ -1,6 +1,5 @@ - true GINI_GOES11 SATELLITE diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/GINI_GOES12.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/GINI_GOES12.xml index ff3ddaa793..728bd7c287 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/GINI_GOES12.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES12/GINI_GOES12.xml @@ -1,6 +1,5 @@ - true GINI_GOES12 SATELLITE diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/GINI_GOES13.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/GINI_GOES13.xml index 0e5a84870a..7584e4be2d 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/GINI_GOES13.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES13/GINI_GOES13.xml @@ -1,6 +1,5 @@ - true GINI_GOES13 SATELLITE diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES14/GINI_GOES14.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES14/GINI_GOES14.xml index 7ba3b77a9f..44a6967f4d 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES14/GINI_GOES14.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES14/GINI_GOES14.xml @@ -1,6 +1,5 @@ - true GINI_GOES14 SATELLITE diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/GINI_GOES15.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/GINI_GOES15.xml index 93992bba18..ba7d1e7d28 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/GINI_GOES15.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_GOES15/GINI_GOES15.xml @@ -1,6 +1,5 @@ - true GINI_GOES15 SATELLITE diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/GINI_Miscellaneous.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/GINI_Miscellaneous.xml index ceed522909..ac2968580c 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/GINI_Miscellaneous.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/GINI_Miscellaneous.xml @@ -1,6 +1,5 @@ - true GINI_Miscellaneous SATELLITE diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/GINI_POES-NPOESS.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/GINI_POES-NPOESS.xml index 03cb20366b..50cd2f82fc 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/GINI_POES-NPOESS.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/GINI_POES-NPOESS.xml @@ -1,6 +1,5 @@ - true GINI_POES-NPOESS SATELLITE diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES12/GOES12.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES12/GOES12.xml index aa35a22d0d..d2c115263a 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES12/GOES12.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES12/GOES12.xml @@ -1,6 +1,5 @@ - true GOES12 SATELLITE diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES13/GOES13.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES13/GOES13.xml index 23fdd83ad4..f4c4400c81 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES13/GOES13.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES13/GOES13.xml @@ -1,6 +1,5 @@ - true GOES13 SATELLITE diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES14/GOES14.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES14/GOES14.xml index f4203eae75..a866fd86b3 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES14/GOES14.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES14/GOES14.xml @@ -1,6 +1,5 @@ - true GOES14 SATELLITE diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES15/GOES15.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES15/GOES15.xml index 84bbb05682..7aa9130e86 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES15/GOES15.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/GOES15/GOES15.xml @@ -1,6 +1,5 @@ - true GOES15 SATELLITE diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/Global/Global.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/Global/Global.xml index 6be83ca260..e778cbeac1 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/Global/Global.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/Global/Global.xml @@ -1,6 +1,5 @@ - true Global SATELLITE diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/IND/IND.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/IND/IND.xml index 13726535c9..c0cb73b9ed 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/IND/IND.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/IND/IND.xml @@ -1,6 +1,5 @@ - true IND SATELLITE McidasSatellite diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT10/METEOSAT10.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT10/METEOSAT10.xml index 9063b930fb..24cba51651 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT10/METEOSAT10.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT10/METEOSAT10.xml @@ -1,6 +1,5 @@ - true METEOSAT10 SATELLITE diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT8/METEOSAT8.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT8/METEOSAT8.xml index 79e5f8c3ca..9ab01f2f31 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT8/METEOSAT8.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT8/METEOSAT8.xml @@ -1,6 +1,5 @@ - true METEOSAT8 SATELLITE diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT9/METEOSAT9.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT9/METEOSAT9.xml index 4b71ec0c80..1915b8cbfb 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT9/METEOSAT9.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/METEOSAT9/METEOSAT9.xml @@ -1,6 +1,5 @@ - true METEOSAT9 SATELLITE diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/MTS/MTS.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/MTS/MTS.xml index ecfc811be2..46effe9a5b 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/MTS/MTS.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/MTS/MTS.xml @@ -1,6 +1,5 @@ - true MTS SATELLITE diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/MTSAT2/MTSAT2.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/MTSAT2/MTSAT2.xml index 2421c4f5df..5d3d207c04 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/MTSAT2/MTSAT2.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/MTSAT2/MTSAT2.xml @@ -1,6 +1,5 @@ - true MTSAT2 SATELLITE diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/VAAC/VAAC.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/VAAC/VAAC.xml index 35b5b437ab..6504014870 100644 --- a/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/VAAC/VAAC.xml +++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/SATELLITE/VAAC/VAAC.xml @@ -1,6 +1,5 @@ - true VAAC SATELLITE diff --git a/cave/com.raytheon.uf.viz.core.rsc/src/com/raytheon/uf/viz/core/rsc/tools/GenericToolsResourceData.java b/cave/com.raytheon.uf.viz.core.rsc/src/com/raytheon/uf/viz/core/rsc/tools/GenericToolsResourceData.java index 94ff2abc70..dfc28e204f 100644 --- a/cave/com.raytheon.uf.viz.core.rsc/src/com/raytheon/uf/viz/core/rsc/tools/GenericToolsResourceData.java +++ b/cave/com.raytheon.uf.viz.core.rsc/src/com/raytheon/uf/viz/core/rsc/tools/GenericToolsResourceData.java @@ -48,7 +48,6 @@ import com.raytheon.viz.core.ColorUtil; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Mar 21, 2013 1638 mschenke Renamed to better represent purpose - * Aug 29, 2103 DR 16550 D. Friedman Fix reflection constructor args * * * @@ -102,7 +101,7 @@ public class GenericToolsResourceData> public T construct(LoadProperties loadProperties, IDescriptor descriptor) throws VizException { try { - Class[] ctorParams = new Class[] { GenericToolsResourceData.class, + Class[] ctorParams = new Class[] { this.getClass(), LoadProperties.class }; Object[] ctorArgs = new Object[] { this, loadProperties }; @@ -111,7 +110,7 @@ public class GenericToolsResourceData> ctor = classT.getConstructor(ctorParams); } catch (NoSuchMethodException e) { // check for ctor with additional descriptor parameter - ctorParams = new Class[] { GenericToolsResourceData.class, + ctorParams = new Class[] { this.getClass(), LoadProperties.class, MapDescriptor.class }; ctorArgs = new Object[] { this, loadProperties, descriptor }; ctor = classT.getConstructor(ctorParams); diff --git a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractAWTFont.java b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractAWTFont.java index 699e3335f6..667e9374f4 100644 --- a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractAWTFont.java +++ b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractAWTFont.java @@ -34,8 +34,6 @@ import java.util.List; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Jul 24, 2013 2189 mschenke Initial creation - * Sep 13, 2013 16581 kshrestha Variables scaleFont and smoothing - * initialized to true. * * * @@ -47,9 +45,9 @@ public abstract class AbstractAWTFont implements IFont { protected Font font; - protected boolean scaleFont = true; + protected boolean scaleFont; - protected boolean smoothing = true; + protected boolean smoothing; protected AbstractAWTFont(String fontName, float fontSize, Style[] styles) { this(new Font(fontName, toAwtStyle(styles), (int) fontSize)); diff --git a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/tile/TileSetRenderable.java b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/tile/TileSetRenderable.java index 7ca384ffae..90b1801cc1 100644 --- a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/tile/TileSetRenderable.java +++ b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/tile/TileSetRenderable.java @@ -446,15 +446,12 @@ public class TileSetRenderable implements IRenderable { TileLevel level = tileSet.getTileLevel(lastPaintedLevel); double[] grid = level.crsToGrid(localX, localY); Tile tile = level.getTile(grid[0], grid[1]); - if (tile != null) { - DrawableImage di = imageMap.get(tile); - if (di != null) { - IImage image = di.getImage(); - if (image instanceof IColormappedImage) { - return ((IColormappedImage) image).getValue( - (int) grid[0] % tileSize, (int) grid[1] - % tileSize); - } + DrawableImage di = imageMap.get(tile); + if (di != null) { + IImage image = di.getImage(); + if (image instanceof IColormappedImage) { + return ((IColormappedImage) image).getValue((int) grid[0] + % tileSize, (int) grid[1] % tileSize); } } } catch (TransformException e) { diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/ToggleTool.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/ToggleTool.java index bab5c079f6..5e794b1c4e 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/ToggleTool.java +++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/ToggleTool.java @@ -43,7 +43,6 @@ import com.raytheon.viz.ui.tools.AbstractTool; * ------------ ---------- ----------- -------------------------- * Feb 23, 2007 chammack Initial Creation. * Nov 3, 2009 3457 bsteffen Updated to change blend on all DisplayPanes, not just the active ones. - * Aug 30, 2013 DR 16555 D. Friedman Prevent NPE. * * * @@ -66,7 +65,7 @@ public class ToggleTool extends AbstractTool { ResourceList rscs = mapDescriptor.getResourceList(); for (ResourcePair rp : rscs) { AbstractVizResource rsc = rp.getResource(); - if (rsc != null && rsc.getCapabilities().hasCapability( + if (rsc.getCapabilities().hasCapability( BlendableCapability.class)) { rsc.getCapability(BlendableCapability.class).toggle(); } diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/CCP.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/CCP.xml index cf79288958..0286ffc47a 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/CCP.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/CCP.xml @@ -22,7 +22,7 @@ - + diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/P.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/P.xml index 292878fd2f..504cdcaa72 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/P.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/P.xml @@ -77,7 +77,7 @@ + HPCqpfNDFD" name="NoDerivation" /> diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wx.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wx.xml index 10df5ebf26..773145dd25 100644 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wx.xml +++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wx.xml @@ -29,7 +29,7 @@ - + diff --git a/cave/com.raytheon.uf.viz.kml.export/src/com/raytheon/uf/viz/kml/export/graphics/ext/point/KmlPointImageExtension.java b/cave/com.raytheon.uf.viz.kml.export/src/com/raytheon/uf/viz/kml/export/graphics/ext/point/KmlPointImageExtension.java index eac078893e..24e7829b77 100644 --- a/cave/com.raytheon.uf.viz.kml.export/src/com/raytheon/uf/viz/kml/export/graphics/ext/point/KmlPointImageExtension.java +++ b/cave/com.raytheon.uf.viz.kml.export/src/com/raytheon/uf/viz/kml/export/graphics/ext/point/KmlPointImageExtension.java @@ -57,17 +57,15 @@ import de.micromata.opengis.kml.v_2_2_0.Style; * * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- - * Jun 1, 2012 bsteffen Initial creation - * Aug 27, 2013 #2287 randerso Removed 180 degree adjustment required by error - * in Maputil.rotation + * Jun 1, 2012 bsteffen Initial creation * * * * @author bsteffen * @version 1.0 */ -public class KmlPointImageExtension extends - GraphicsExtension implements IPointImageExtension { +public class KmlPointImageExtension extends GraphicsExtension + implements IPointImageExtension { private static final transient IUFStatusHandler statusHandler = UFStatus .getHandler(KmlRasterImageExtension.class); @@ -115,7 +113,7 @@ public class KmlPointImageExtension extends IconStyle iconStyle = style.createAndSetIconStyle(); iconStyle.setScale(options.getPlotIconScale()); - double heading = MapUtil.rotation( + double heading = 180 + MapUtil.rotation( new com.vividsolutions.jts.geom.Coordinate(loc .getLongitude(), loc.getLatitude()), gridGeometry); diff --git a/cave/com.raytheon.uf.viz.objectiveanalysis/src/com/raytheon/uf/viz/objectiveanalysis/rsc/OAResource.java b/cave/com.raytheon.uf.viz.objectiveanalysis/src/com/raytheon/uf/viz/objectiveanalysis/rsc/OAResource.java index a01a68b1f4..3deb89e391 100644 --- a/cave/com.raytheon.uf.viz.objectiveanalysis/src/com/raytheon/uf/viz/objectiveanalysis/rsc/OAResource.java +++ b/cave/com.raytheon.uf.viz.objectiveanalysis/src/com/raytheon/uf/viz/objectiveanalysis/rsc/OAResource.java @@ -79,7 +79,6 @@ import com.raytheon.uf.viz.core.style.VizStyleException; import com.raytheon.uf.viz.core.style.level.SingleLevel; import com.raytheon.viz.core.contours.rsc.displays.GriddedContourDisplay; import com.raytheon.viz.core.contours.rsc.displays.GriddedVectorDisplay; -import com.raytheon.viz.core.contours.util.VectorGraphicsRenderableFactory; import com.raytheon.viz.core.drawables.ColorMapParameterFactory; import com.raytheon.viz.core.rsc.displays.GriddedImageDisplay; import com.raytheon.viz.core.rsc.displays.GriddedImageDisplay.GriddedImagePaintProperties; @@ -94,10 +93,8 @@ import com.vividsolutions.jts.geom.Coordinate; * SOFTWARE HISTORY * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- - * Nov 5, 2009 randerso Initial creation - * Jan 8, 2010 4205 jelkins add equals checking for OA resources - * Aug 27, 2013 2287 randerso Added new parameters to GriddedVectorDisplay - * constructor + * Nov 5, 2009 randerso Initial creation + * Jan 8, 2010 4205 jelkins add equals checking for OA resources * * * @@ -427,10 +424,9 @@ public class OAResource extends FloatBuffer mag = data; data.position(transformer.getNx() * transformer.getNy()); FloatBuffer dir = data.slice(); - VectorGraphicsRenderableFactory factory = new VectorGraphicsRenderableFactory(); GriddedVectorDisplay vector = new GriddedVectorDisplay(mag, - dir, descriptor, transformer.getGridGeom(), 80, 0.75, - true, displayType, factory); + dir, descriptor, transformer.getGridGeom(), 80, + displayType); renderableMap.put(dataTime, vector); break; diff --git a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/cachedata/PythonCacheGuidanceJob.java b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/cachedata/PythonCacheGuidanceJob.java index 7e906888b8..8741bbc213 100644 --- a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/cachedata/PythonCacheGuidanceJob.java +++ b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/cachedata/PythonCacheGuidanceJob.java @@ -55,7 +55,6 @@ import com.raytheon.viz.aviation.monitor.AvnPyUtil; * Nov 11, 2012 1298 rferrel Non-blocking dialog discovered problem * adding dispose listener when not on the * UI thread. - * Aug 26, 2013 #2283 lvenable Cleaned up some synchronized code. * * * @@ -201,7 +200,7 @@ public class PythonCacheGuidanceJob extends * * @param req */ - private void waitAdd(CacheGuidanceRequest req) { + private synchronized void waitAdd(CacheGuidanceRequest req) { synchronized (waitMonitor) { if (waitList.contains(req) == false) { waitList.add(req); @@ -214,7 +213,7 @@ public class PythonCacheGuidanceJob extends * * @param req */ - private void waitRemove(CacheGuidanceRequest req) { + private synchronized void waitRemove(CacheGuidanceRequest req) { synchronized (waitMonitor) { waitList.remove(req); waitMonitor.notify(); @@ -287,13 +286,11 @@ public class PythonCacheGuidanceJob extends * - Unique tag * @return siteObj */ - public String getSiteObj(String siteID, String tag) { + public synchronized String getSiteObj(String siteID, String tag) { String siteObj = null; - synchronized (siteObjMaps) { - Map siteObjs = siteObjMaps.get(siteID); - if (siteObjs != null) { - siteObj = siteObjs.get(tag); - } + Map siteObjs = siteObjMaps.get(siteID); + if (siteObjs != null) { + siteObj = siteObjs.get(tag); } return siteObj; } @@ -306,12 +303,10 @@ public class PythonCacheGuidanceJob extends * @param tag * - Unique tag */ - private void clearSiteObj(String siteID, String tag) { + private synchronized void clearSiteObj(String siteID, String tag) { Map siteObjs = siteObjMaps.get(siteID); - synchronized (siteObjMaps) { - if (siteObjs != null) { - siteObjs.remove(tag); - } + if (siteObjs != null) { + siteObjs.remove(tag); } } @@ -322,7 +317,7 @@ public class PythonCacheGuidanceJob extends * A map with key of stites an array of tags to clear for the * site */ - public void clearSiteObjs(Map> tags) { + public synchronized void clearSiteObjs(Map> tags) { for (Object s : tags.keySet().toArray()) { String siteID = s.toString(); for (String tag : tags.get(siteID)) { @@ -341,15 +336,14 @@ public class PythonCacheGuidanceJob extends * @param siteObj * - Pickle string to cache */ - private void setSiteObj(String siteID, String tag, String siteObj) { - synchronized (siteObjMaps) { - Map siteObjs = siteObjMaps.get(siteID); - if (siteObjs == null) { - siteObjs = new HashMap(); - siteObjMaps.put(siteID, siteObjs); - } - siteObjs.put(tag, siteObj); + private synchronized void setSiteObj(String siteID, String tag, + String siteObj) { + Map siteObjs = siteObjMaps.get(siteID); + if (siteObjs == null) { + siteObjs = new HashMap(); + siteObjMaps.put(siteID, siteObjs); } + siteObjs.put(tag, siteObj); } /* diff --git a/cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/rsc/displays/AbstractGriddedDisplay.java b/cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/rsc/displays/AbstractGriddedDisplay.java index db50729cbe..0d9d1dd4c4 100644 --- a/cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/rsc/displays/AbstractGriddedDisplay.java +++ b/cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/rsc/displays/AbstractGriddedDisplay.java @@ -65,11 +65,6 @@ import com.vividsolutions.jts.geom.Coordinate; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Apr 23, 2010 bsteffen Initial creation - * Aug 27, 2013 #2287 randerso Replaced hard coded constant with densityFactor - * parameter to allow application specific density - * scaling to better match A1 displays - * Sep 10, 2013 DR 16257 MPorricelli Fix so that wind for global grids displays on - * mercator maps. * * * @@ -116,8 +111,6 @@ public abstract class AbstractGriddedDisplay implements IRenderable { protected final int size; - protected final double densityFactor; - protected RGB color; protected double density = 1.0; @@ -135,18 +128,16 @@ public abstract class AbstractGriddedDisplay implements IRenderable { * @param descriptor * @param gridGeometryOfGrid * @param size - * @param densityFactor - * adjustment factor to make density match A1 + * @param plotLocations + * Pre-configured plot locations. If null, they will be created. */ public AbstractGriddedDisplay(IMapDescriptor descriptor, - GeneralGridGeometry gridGeometryOfGrid, int size, - double densityFactor) { + GeneralGridGeometry gridGeometryOfGrid, int size) { this.calculationQueue = new ConcurrentLinkedQueue(); this.descriptor = descriptor; this.gridGeometryOfGrid = gridGeometryOfGrid; this.size = size; - this.densityFactor = densityFactor; this.gridDims = new int[] { this.gridGeometryOfGrid.getGridRange().getSpan(0), @@ -217,31 +208,14 @@ public abstract class AbstractGriddedDisplay implements IRenderable { // space // Linear distance(between (0,0) and (0,1) makes more sense but // looks to sparse. - DirectPosition2D p1 = new DirectPosition2D(); - DirectPosition2D p2 = new DirectPosition2D(); - - boolean doneTryingCoords = false; - int i = -1; - // starting with coords (0,0), (1,1), try until tranform succeeds, - // or until have gone through a set of diagonal coords - do { - try { - i++; - if (i + 1 < gridDims[0] && i + 1 < gridDims[1]) { - p1.x = p1.y = i; - p2.x = p2.y = i + 1; - grid2grid.transform(p1, p1); - grid2grid.transform(p2, p2); - doneTryingCoords = true; - } - } catch (TransformException e) { - if (i + 1 >= gridDims[0] || i + 1 >= gridDims[1]) { - doneTryingCoords = true; - throw new VizException(e); - } - } - } while (!doneTryingCoords); - + DirectPosition2D p1 = new DirectPosition2D(0, 0); + DirectPosition2D p2 = new DirectPosition2D(1, 1); + try { + grid2grid.transform(p1, p1); + grid2grid.transform(p2, p2); + } catch (TransformException e) { + throw new VizException(e); + } pixelSize = p1.distance(p2); IExtent viewPixelExtent = paintProps.getView().getExtent(); @@ -259,8 +233,7 @@ public abstract class AbstractGriddedDisplay implements IRenderable { List renderables = new ArrayList(); int increment = Math.max( - (int) Math.ceil(adjSize * densityFactor / pixelSize / density), - 1); + (int) Math.ceil(adjSize * 0.75 / pixelSize / density), 1); for (int x = 0; x < gridDims[0]; x += increment) { for (int y = 0; y < gridDims[1]; y += increment) { diff --git a/cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/rsc/displays/GriddedVectorDisplay.java b/cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/rsc/displays/GriddedVectorDisplay.java index 321186e971..dd79a5f704 100644 --- a/cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/rsc/displays/GriddedVectorDisplay.java +++ b/cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/rsc/displays/GriddedVectorDisplay.java @@ -34,7 +34,6 @@ import com.raytheon.uf.viz.core.drawables.PaintProperties; import com.raytheon.uf.viz.core.exception.VizException; import com.raytheon.uf.viz.core.map.IMapDescriptor; import com.raytheon.uf.viz.core.rsc.DisplayType; -import com.raytheon.viz.core.contours.util.IVectorGraphicsRenderableFactory; import com.raytheon.viz.core.contours.util.VectorGraphicsRenderable; import com.vividsolutions.jts.geom.Coordinate; @@ -54,17 +53,6 @@ import com.vividsolutions.jts.geom.Coordinate; * Jun 22, 2010 bsteffen Initial creation * Feb 07, 2011 7948 bkowal added a public method to get * the direction. - * Aug 27, 2013 2287 randerso Added VectorGraphicsRenderable Factory to allow - * application specific rendering of wind barbs and - * arrows. - * Added densityFactor to allow application specific - * adjustment of density. - * Added gridRelative flag to indicate whether direction - * data is relative to grid or true north - * Sep 9, 2013 DR16257 MPorricelli When setDestinationGeographicPoint fails (which can - * happen for global lat/lon grid winds displayed on - * Equidistant Cylindrical map) try again with different - * pixel location. * * * @@ -81,43 +69,36 @@ public class GriddedVectorDisplay extends AbstractGriddedDisplay { private LineStyle lineStyle; + private double scale = 0.6; + private IExtent lastExtent; private VectorGraphicsRenderable vectorRenderable; - private boolean gridRelative; - private DisplayType displayType; private GeodeticCalculator gc; - private IVectorGraphicsRenderableFactory factory; - /** * @param magnitude * @param direction + * @param mode * @param descriptor * @param gridGeometryOfGrid - * @param size - * @param densityFactor - * adjustment factor to make density match A1 - * @param gridRelative - * true if direction is grid relative, false if relative to true - * north - * @param displayType - * @param factory + * @param imageSize + * @param gridLocation + * @param forceCircle + * @param plotLocations + * Pre-configured plot locations. If null, they will be created. */ public GriddedVectorDisplay(FloatBuffer magnitude, FloatBuffer direction, IMapDescriptor descriptor, GeneralGridGeometry gridGeometryOfGrid, - int size, double densityFactor, boolean gridRelative, - DisplayType displayType, IVectorGraphicsRenderableFactory factory) { - super(descriptor, gridGeometryOfGrid, size, densityFactor); + int size, DisplayType displayType) { + super(descriptor, gridGeometryOfGrid, size); this.magnitude = magnitude; this.direction = direction; - this.gridRelative = gridRelative; this.displayType = displayType; this.gc = new GeodeticCalculator(descriptor.getCRS()); - this.factory = factory; } @Override @@ -129,8 +110,8 @@ public class GriddedVectorDisplay extends AbstractGriddedDisplay { lastExtent = paintProps.getView().getExtent().clone(); } if (vectorRenderable == null) { - vectorRenderable = factory.createRenderable(descriptor, target, - this.size); + vectorRenderable = new VectorGraphicsRenderable(descriptor, target, + this.size, this.scale); super.paint(target, paintProps); } vectorRenderable.setColor(this.color); @@ -145,13 +126,12 @@ public class GriddedVectorDisplay extends AbstractGriddedDisplay { super.issueRefresh(); } - @Override protected void paint(Coordinate ijcoord, PaintProperties paintProps, Coordinate plotLoc, double adjSize) throws VizException { int idx = (int) (ijcoord.x + (ijcoord.y * this.gridDims[0])); float spd = this.magnitude.get(idx); - float dir = this.direction.get(idx); + float dir = this.direction.get(idx) - 180; if (dir < -999999 || dir > 9999999) { // perhaps this check should limit +/- 180 @@ -161,7 +141,7 @@ public class GriddedVectorDisplay extends AbstractGriddedDisplay { if (Float.isNaN(spd) || Float.isNaN(dir)) { return; } - int tryDiffPixLoc = 0; + try { ReferencedCoordinate rCoord = new ReferencedCoordinate( gridGeometryOfGrid, ijcoord); @@ -173,35 +153,18 @@ public class GriddedVectorDisplay extends AbstractGriddedDisplay { if (stationPixelLocation != null) { stationPixelLocation[1]--; - do { - try { - double[] newWorldLocation = this.descriptor - .pixelToWorld(stationPixelLocation); - this.gc.setStartingGeographicPoint(stationLocation[0], - stationLocation[1]); - this.gc.setDestinationGeographicPoint( - newWorldLocation[0], newWorldLocation[1]); - tryDiffPixLoc = 2; // setting of pts succeeded; do not need to try again - - } catch (Exception e2) { - if (tryDiffPixLoc == 0) { // setting of points failed first time through - stationPixelLocation[1] += 2; // try pixel location in opposite dir of 1st try - tryDiffPixLoc++; - } else - throw new VizException(e2); // failed on second try; give up - } - } while (tryDiffPixLoc < 2); + double[] newWorldLocation = this.descriptor + .pixelToWorld(stationPixelLocation); + this.gc.setStartingGeographicPoint(stationLocation[0], + stationLocation[1]); + this.gc.setDestinationGeographicPoint(newWorldLocation[0], + newWorldLocation[1]); } - if (gridRelative) { - // rotate data from grid up to true north - dir += (float) MapUtil.rotation(latLon, - GridGeometry2D.wrap(gridGeometryOfGrid)); - } - - // rotate dir from true north to display up + dir = dir + + (float) MapUtil.rotation(latLon, + GridGeometry2D.wrap(gridGeometryOfGrid)); dir -= this.gc.getAzimuth(); - } catch (Exception e) { throw new VizException(e); } @@ -222,6 +185,14 @@ public class GriddedVectorDisplay extends AbstractGriddedDisplay { } } + /** + * + * @param color + */ + public void setScale(double scale) { + this.scale = scale; + } + public void setLineWidth(int lineWidth) { this.lineWidth = lineWidth; } @@ -237,7 +208,6 @@ public class GriddedVectorDisplay extends AbstractGriddedDisplay { * @param density * the density to set */ - @Override public boolean setDensity(double density) { if (super.setDensity(density)) { disposeResources(); @@ -253,7 +223,6 @@ public class GriddedVectorDisplay extends AbstractGriddedDisplay { * @param magnification * the magnification to set */ - @Override public boolean setMagnification(double magnification) { if (super.setMagnification(magnification)) { disposeResources(); @@ -276,7 +245,6 @@ public class GriddedVectorDisplay extends AbstractGriddedDisplay { return direction; } - @Override protected void disposeResources() { if (vectorRenderable != null) { vectorRenderable.dispose(); @@ -284,7 +252,6 @@ public class GriddedVectorDisplay extends AbstractGriddedDisplay { } } - @Override protected Coordinate createResource(Coordinate coord) throws VizException { return coord; } diff --git a/cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/rsc/displays/PlotLocationCache.java b/cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/rsc/displays/PlotLocationCache.java index 7495ed6b1e..b38f451b56 100644 --- a/cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/rsc/displays/PlotLocationCache.java +++ b/cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/rsc/displays/PlotLocationCache.java @@ -44,10 +44,6 @@ import org.opengis.referencing.operation.TransformException; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Oct 13, 2011 bsteffen Initial creation - * Sep 10, 2013 DR 16257 MPorricelli Eliminate values that - * fail to be tranformed,e.g. - * when too close to pole for - * mercator projections * * * @@ -150,19 +146,7 @@ public class PlotLocationCache { ConcatenatedTransform.create(grid2crs, crs2crs), crs2grid); - try { - grid2grid.transform(result, 0, result, 0, xDim * yDim); - } catch (TransformException e1) { - // Set values to NaN when fail transform - for (int i = 0; i < result.length; i += 2) { - try { - grid2grid.transform(result, i, result, i, 1); - } catch (TransformException e2) { - result[i] = Float.NaN; - result[i + 1] = Float.NaN; - } - } - } + grid2grid.transform(result, 0, result, 0, xDim * yDim); } catch (FactoryException e) { throw new RuntimeException(e); } catch (InvalidGridGeometryException e) { diff --git a/cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/util/IVectorGraphicsRenderableFactory.java b/cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/util/IVectorGraphicsRenderableFactory.java deleted file mode 100644 index 0084db2e60..0000000000 --- a/cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/util/IVectorGraphicsRenderableFactory.java +++ /dev/null @@ -1,46 +0,0 @@ -/** - * 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.viz.core.contours.util; - -import com.raytheon.uf.viz.core.IGraphicsTarget; -import com.raytheon.uf.viz.core.drawables.IDescriptor; - -/** - * Interface for factory class to create a VectorGraphicsRenderable for - * GriddedVectorDisplay - * - *
- * 
- * SOFTWARE HISTORY
- * 
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Aug 22, 2013     #2287  randerso     Initial creation
- * 
- * 
- * - * @author randerso - * @version 1.0 - */ - -public interface IVectorGraphicsRenderableFactory { - public VectorGraphicsRenderable createRenderable(IDescriptor descriptor, - IGraphicsTarget target, double size); -} diff --git a/cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/util/VectorGraphicsRenderable.java b/cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/util/VectorGraphicsRenderable.java index 4fee99f2d2..7216f7465f 100644 --- a/cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/util/VectorGraphicsRenderable.java +++ b/cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/util/VectorGraphicsRenderable.java @@ -38,8 +38,7 @@ import com.vividsolutions.jts.geom.Coordinate; * * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- - * May 27, 2011 bsteffen Initial creation - * Aug 27, 2013 #2287 randerso Refactored to allow subclassing + * May 27, 2011 bsteffen Initial creation * * * @@ -48,17 +47,17 @@ import com.vividsolutions.jts.geom.Coordinate; */ public class VectorGraphicsRenderable { - protected IWireframeShape lastShape; + private IWireframeShape lastShape; - protected double size = 80; + private double size = 80; - protected double scale = 1.0; + private double scale = 1.0; - protected RGB color; + private RGB color; - protected float lineWidth = 1.0f; + private float lineWidth = 1.0f; - protected LineStyle lineStyle; + private LineStyle lineStyle; public VectorGraphicsRenderable(IDescriptor descriptor, IGraphicsTarget target, double size, double scale) { @@ -90,7 +89,36 @@ public class VectorGraphicsRenderable { public void paintBarb(Coordinate plotLoc, double adjSize, double spd, double dir) { if (spd < 2.5) { - paintPoint(plotLoc, adjSize); + double[][] line = new double[9][2]; + + double aa = adjSize * .030; + double saa = aa * 0.707; + + line[8][0] = line[0][0] = plotLoc.x + aa; + line[8][1] = line[0][1] = plotLoc.y; + line[1][0] = plotLoc.x + saa; + line[1][1] = plotLoc.y + saa; + + line[2][0] = plotLoc.x; + line[2][1] = plotLoc.y + aa; + + line[3][0] = plotLoc.x - saa; + line[3][1] = plotLoc.y + saa; + + line[4][0] = plotLoc.x - aa; + line[4][1] = plotLoc.y; + + line[5][0] = plotLoc.x - saa; + line[5][1] = plotLoc.y - saa; + + line[6][0] = plotLoc.x; + line[6][1] = plotLoc.y - aa; + + line[7][0] = plotLoc.x + saa; + line[7][1] = plotLoc.y - saa; + + lastShape.addLineSegment(line); + return; } @@ -170,38 +198,6 @@ public class VectorGraphicsRenderable { } } - protected void paintPoint(Coordinate plotLoc, double adjSize) { - double[][] line = new double[9][2]; - - double aa = adjSize * .030; - double saa = aa * 0.707; - - line[8][0] = line[0][0] = plotLoc.x + aa; - line[8][1] = line[0][1] = plotLoc.y; - line[1][0] = plotLoc.x + saa; - line[1][1] = plotLoc.y + saa; - - line[2][0] = plotLoc.x; - line[2][1] = plotLoc.y + aa; - - line[3][0] = plotLoc.x - saa; - line[3][1] = plotLoc.y + saa; - - line[4][0] = plotLoc.x - aa; - line[4][1] = plotLoc.y; - - line[5][0] = plotLoc.x - saa; - line[5][1] = plotLoc.y - saa; - - line[6][0] = plotLoc.x; - line[6][1] = plotLoc.y - aa; - - line[7][0] = plotLoc.x + saa; - line[7][1] = plotLoc.y - saa; - - lastShape.addLineSegment(line); - } - public void paintDualArrow(Coordinate plotLoc, double adjSize, double spd, double dir) { if (spd < 4.0) { diff --git a/cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/util/VectorGraphicsRenderableFactory.java b/cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/util/VectorGraphicsRenderableFactory.java deleted file mode 100644 index 2ceddf324d..0000000000 --- a/cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/util/VectorGraphicsRenderableFactory.java +++ /dev/null @@ -1,77 +0,0 @@ -/** - * 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.viz.core.contours.util; - -import com.raytheon.uf.viz.core.IGraphicsTarget; -import com.raytheon.uf.viz.core.drawables.IDescriptor; - -/** - * VectorGraphicsRenderable Factory - * - * Constructs the VectorGraphicsRenderable for D2D usage of GriddedVectorDisplay - * - *
- * 
- * SOFTWARE HISTORY
- * 
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Aug 22, 2013     #2287  randerso     Initial creation
- * 
- * 
- * - * @author randerso - * @version 1.0 - */ - -public class VectorGraphicsRenderableFactory implements - IVectorGraphicsRenderableFactory { - private double scale; - - public VectorGraphicsRenderableFactory() { - this.scale = 0.6; - } - - public VectorGraphicsRenderableFactory(double scale) { - this.scale = scale; - } - - /** - * @param scale - * the scale to set - */ - public void setScale(double scale) { - this.scale = scale; - } - - /* - * (non-Javadoc) - * - * @see - * com.raytheon.viz.core.contours.util.IVectorGraphicsRenderableFactory# - * createRenderable() - */ - @Override - public VectorGraphicsRenderable createRenderable(IDescriptor descriptor, - IGraphicsTarget target, double size) { - return new VectorGraphicsRenderable(descriptor, target, size, scale); - } - -} diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowAutoSaveIntervalDialog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowAutoSaveIntervalDialog.java index ab972e07ac..49746c9c93 100644 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowAutoSaveIntervalDialog.java +++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowAutoSaveIntervalDialog.java @@ -20,12 +20,10 @@ package com.raytheon.viz.gfe.actions; -import java.util.HashMap; -import java.util.Map; - import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; +import org.eclipse.jface.window.Window; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; @@ -44,9 +42,8 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Jan 23, 2008 Eric Babin Initial Creation - * Jul 8, 2008 randerso reworked + * Jul 8, 2008 randerso reworked * Oct 23, 2012 1287 rferrel Changes for non-blocking AutoSaveIntervalDialog. - * Aug 27, 2013 2302 randerso Code clean up for AutoSaveJob changes * * * @@ -54,7 +51,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback; * @version 1.0 */ public class ShowAutoSaveIntervalDialog extends AbstractHandler { - final private Map dialogMap = new HashMap(); + private AutoSaveIntervalDialog dialog; /** * @@ -72,28 +69,47 @@ public class ShowAutoSaveIntervalDialog extends AbstractHandler { */ @Override public Object execute(ExecutionEvent arg0) throws ExecutionException { - final IWorkbenchWindow window = PlatformUI.getWorkbench() - .getActiveWorkbenchWindow(); - DataManager dm = DataManagerUIFactory.findInstance(window); - if (dm == null) { - return null; - } - - AutoSaveIntervalDialog dialog = dialogMap.get(window); if (dialog == null || dialog.getShell() == null || dialog.isDisposed()) { - - AutoSaveJob autoSaveJob = dm.getAutoSaveJob(); - + final IWorkbenchWindow window = PlatformUI.getWorkbench() + .getActiveWorkbenchWindow(); Shell shell = window.getShell(); - dialog = new AutoSaveIntervalDialog(shell, autoSaveJob); - dialogMap.put(window, dialog); + + int interval = AutoSaveJob.getInterval(); + boolean autoSaveEnabled = interval > 0; + if (!autoSaveEnabled) { + interval = AutoSaveJob.MAX_INTERVAL; + } + dialog = new AutoSaveIntervalDialog(shell, interval, + autoSaveEnabled); dialog.setBlockOnOpen(false); dialog.setCloseCallback(new ICloseCallback() { @Override public void dialogClosed(Object returnValue) { - dialogMap.remove(window); + if (returnValue instanceof Integer) { + int returnCode = (Integer) returnValue; + if (returnCode == Window.OK) { + DataManager dm = DataManagerUIFactory + .findInstance(window); + // update + if (dialog.isAutoSaveEnabled()) { + int interval = dialog.getCurrentInterval(); + AutoSaveJob.setInterval(interval); + if (dm != null) { + dm.enableAutoSave(); + } + DataManagerUIFactory.findInstance(window) + .enableAutoSave(); + } else { + AutoSaveJob.setInterval(0); + if (dm != null) { + dm.disableAutoSave(); + } + } + + } + } } }); dialog.open(); diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java index 721d9188a1..a7df8ff665 100644 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java +++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java @@ -96,7 +96,6 @@ import com.raytheon.viz.gfe.textformatter.TextProductManager; * initialized by constructor. * 04/24/2013 1936 dgilling Move initialization of TextProductMgr * to GFE startup. - * 08/27/2013 2302 randerso Code cleanup for AutoSaveJob * * * @@ -272,10 +271,18 @@ public class DataManager { } /** - * @return the autoSaveJob + * Start auto save jobs */ - public AutoSaveJob getAutoSaveJob() { - return autoSaveJob; + public void enableAutoSave() { + autoSaveJob.cancel(); + autoSaveJob.reSchedule(); + } + + /** + * Stop auto save jobs + */ + public void disableAutoSave() { + autoSaveJob.cancel(); } /** diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/Parm.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/Parm.java index 795a4f62f5..69d2335a85 100644 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/Parm.java +++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/Parm.java @@ -84,7 +84,6 @@ import com.raytheon.viz.gfe.GFEServerException; import com.raytheon.viz.gfe.core.DataManager; import com.raytheon.viz.gfe.core.griddata.AbstractGridData; import com.raytheon.viz.gfe.core.griddata.IGridData; -import com.raytheon.viz.gfe.core.parm.ParmSaveJob.ParmSaveStatus; import com.raytheon.viz.gfe.core.parm.ParmState.InterpMode; import com.raytheon.viz.gfe.core.wxvalue.DiscreteWxValue; import com.raytheon.viz.gfe.core.wxvalue.ScalarWxValue; @@ -183,8 +182,6 @@ import com.vividsolutions.jts.geom.Coordinate; * Mar 13, 2013 1792 bsteffen Improve performance of gfe parm average * ant time weighted average. * Apr 02, 2013 #1774 randerso Fixed a possible deadlock issue. - * Aug 27, 2013 #2302 randerso Fix simultaneous save issue - * * * * @author chammack @@ -232,8 +229,6 @@ public abstract class Parm implements Comparable { protected boolean disposed; - private ParmSaveJob saveJob; - /** * The create from scratch mode */ @@ -365,7 +360,6 @@ public abstract class Parm implements Comparable { } this.disposed = false; - this.saveJob = new ParmSaveJob(this); } public void dispose() { @@ -714,7 +708,7 @@ public abstract class Parm implements Comparable { * Save a parameter * * @param all - * @return true if save successful + * @return */ public boolean saveParameter(boolean all) { if (inParmEdit) { @@ -735,16 +729,14 @@ public abstract class Parm implements Comparable { /** * Save a parameter * - * @param times - * TimeRanges to be saved - * @return true if save successful + * @param tr + * @return */ - public boolean saveParameter(List times) { + public boolean saveParameter(List tr) { if (inParmEdit) { return false; } else { - ParmSaveStatus status = this.saveJob.requestSave(times); - return status.isSuccessful(); + return saveParameterSubClass(tr); } } @@ -752,7 +744,7 @@ public abstract class Parm implements Comparable { * Save a parameter * * @param tr - * @return true if save successful + * @return */ public boolean saveParameter(TimeRange tr) { ArrayList trs = new ArrayList(); @@ -764,8 +756,7 @@ public abstract class Parm implements Comparable { * Subclass specific save implementation * * @param tr - * TimeRanges to be saved - * @return true if save successful + * @return */ protected abstract boolean saveParameterSubClass(List tr); diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/ParmSaveJob.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/ParmSaveJob.java deleted file mode 100644 index 94329309a3..0000000000 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/ParmSaveJob.java +++ /dev/null @@ -1,135 +0,0 @@ -/** - * 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.viz.gfe.core.parm; - -import java.util.List; -import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.concurrent.Semaphore; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.Job; - -import com.raytheon.uf.common.time.TimeRange; - -/** - * Job to queue up and work of parm save requests - * - *
- * 
- * SOFTWARE HISTORY
- * 
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Aug 27, 2013     #2302  randerso    Initial creation
- * 
- * 
- * - * @author randerso - * @version 1.0 - */ - -public class ParmSaveJob extends Job { - public static class ParmSaveStatus { - boolean successful = false; - - Semaphore complete = new Semaphore(0); - - /** - * @return the successful - */ - public boolean isSuccessful() { - try { - complete.acquire(); - return successful; - } catch (InterruptedException e) { - return false; - } - } - - /** - * @param successful - * the successful to set - */ - private void setSuccessful(boolean successful) { - this.successful = successful; - complete.release(); - } - - } - - private class ParmSaveRequest { - private List times; - - private ParmSaveStatus status; - - public ParmSaveRequest(List times) { - this.times = times; - this.status = new ParmSaveStatus(); - } - } - - private Parm parm; - - private ConcurrentLinkedQueue saveQueue; - - /** - * @param parm - */ - public ParmSaveJob(Parm parm) { - super("ParmSaveJob"); - this.setSystem(true); - this.parm = parm; - this.saveQueue = new ConcurrentLinkedQueue(); - } - - /** - * Request save. - * - * Caller should call isSuccessful on the returned ParmSaveStatus object to - * await completion and to determine success - * - * @param times - * @return ParmSaveStatus object - */ - public ParmSaveStatus requestSave(List times) { - ParmSaveRequest request = new ParmSaveRequest(times); - this.saveQueue.add(request); - this.schedule(); - return request.status; - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime. - * IProgressMonitor) - */ - @Override - protected IStatus run(IProgressMonitor monitor) { - ParmSaveRequest req = null; - while ((req = this.saveQueue.poll()) != null) { - boolean successful = parm.saveParameterSubClass(req.times); - req.status.setSuccessful(successful); - } - return Status.OK_STATUS; - } -} diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/AutoSaveIntervalDialog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/AutoSaveIntervalDialog.java index 69dc641414..be323b64b4 100644 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/AutoSaveIntervalDialog.java +++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/AutoSaveIntervalDialog.java @@ -29,21 +29,20 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Scale; import org.eclipse.swt.widgets.Shell; import com.raytheon.viz.gfe.jobs.AutoSaveJob; import com.raytheon.viz.ui.dialogs.CaveJFACEDialog; -import com.raytheon.viz.ui.widgets.SpinScale; /** - * The auto save interval dialog. + * The auto save iterval dialog. * *
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Jan 30, 2008            Eric Babin  Initial Creation
- * Aug 27, 2013     #2302  randerso    Code cleanup
+ * 	Jan 30, 2008					Eric Babin Initial Creation
  * 
  * 
* @@ -53,26 +52,98 @@ import com.raytheon.viz.ui.widgets.SpinScale; public class AutoSaveIntervalDialog extends CaveJFACEDialog { - private AutoSaveJob autoSaveJob; + private Composite top = null; + + private Label intervalMinutes; + + private Scale intervalScale; + + private int currentInterval = 1; + + private boolean autoSaveEnabled = false; private Button offButton; private Button onButton; - private Label intervalLabel; - - private SpinScale intervalScale; - - /** - * Constructor - * - * @param parent - * @param currentInterval - * @param isEnabled - */ - public AutoSaveIntervalDialog(Shell parent, AutoSaveJob autoSaveJob) { + public AutoSaveIntervalDialog(Shell parent, int currentInterval, + boolean isEnabled) { super(parent); - this.autoSaveJob = autoSaveJob; + this.setShellStyle(SWT.TITLE | SWT.MODELESS | SWT.CLOSE); + this.currentInterval = currentInterval; + this.autoSaveEnabled = isEnabled; + } + + @Override + protected Control createDialogArea(Composite parent) { + top = (Composite) super.createDialogArea(parent); + + top.setLayout(new GridLayout(2, false)); + loadConfigData(); + initializeComponents(); + + return top; + } + + private void initializeComponents() { + + Group g = new Group(top, SWT.NONE); + g.setLayout(new GridLayout(2, true)); + + offButton = new Button(g, SWT.RADIO); + offButton.setText("Off"); + offButton.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent event) { + autoSaveEnabled = false; + } + }); + offButton.setSelection(!autoSaveEnabled); + + onButton = new Button(g, SWT.RADIO); + onButton.setText("On"); + onButton.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent event) { + autoSaveEnabled = true; + } + }); + onButton.setSelection(autoSaveEnabled); + + Composite c = new Composite(top, SWT.NONE); + GridLayout layout = new GridLayout(2, false); + layout.marginBottom = 10; + + c.setLayout(layout); + c.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL)); + + Label label = new Label(c, SWT.NONE); + label.setText("Save Interval in Minutes"); + GridData data = new GridData(); + data.horizontalSpan = 2; + label.setLayoutData(data); + + intervalScale = new Scale(c, SWT.HORIZONTAL); + intervalScale.setLayoutData(new GridData(120, SWT.DEFAULT)); + intervalScale.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent event) { + autoSaveEnabled = true; + currentInterval = intervalScale.getSelection(); + String s = Integer.toString(currentInterval); + intervalMinutes.setText(s); + intervalMinutes.setToolTipText(s); + onButton.setSelection(autoSaveEnabled); + offButton.setSelection(!autoSaveEnabled); + } + }); + intervalScale.setMinimum(AutoSaveJob.MIN_INTERVAL); + intervalScale.setMaximum(AutoSaveJob.MAX_INTERVAL); + intervalScale.setSelection(this.currentInterval); + + intervalMinutes = new Label(c, SWT.NONE); + intervalMinutes.setLayoutData(new GridData(20, SWT.DEFAULT)); + intervalMinutes.setText(String.valueOf(intervalScale.getSelection())); } /* @@ -83,92 +154,23 @@ public class AutoSaveIntervalDialog extends CaveJFACEDialog { * .Shell) */ @Override - protected void configureShell(Shell newShell) { - super.configureShell(newShell); - newShell.setText("Auto Save Interval Dialog"); + protected void configureShell(Shell shell) { + super.configureShell(shell); + shell.setText("Auto Save Interval Dialog"); } - @Override - protected Control createDialogArea(Composite parent) { - Composite comp = (Composite) super.createDialogArea(parent); - GridLayout layout = (GridLayout) comp.getLayout(); - layout.marginHeight = 0; - layout.marginWidth = 0; - - Group group = new Group(comp, SWT.NONE); - layout = new GridLayout(2, false); - group.setLayout(layout); - GridData layoutData = new GridData(SWT.FILL, SWT.DEFAULT, true, false); - group.setLayoutData(layoutData); - group.setText("Auto Save"); - - int interval = autoSaveJob.getInterval(); - - offButton = new Button(group, SWT.RADIO); - layoutData = new GridData(SWT.FILL, SWT.DEFAULT, true, false); - offButton.setLayoutData(layoutData); - offButton.setText("Off"); - offButton.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent event) { - if (offButton.getSelection()) { - intervalLabel.setEnabled(false); - intervalScale.setEnabled(false); - } - } - }); - offButton.setSelection(interval == 0); - - onButton = new Button(group, SWT.RADIO); - layoutData = new GridData(SWT.FILL, SWT.DEFAULT, true, false); - onButton.setLayoutData(layoutData); - onButton.setText("On"); - onButton.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent event) { - if (onButton.getSelection()) { - intervalLabel.setEnabled(true); - intervalScale.setEnabled(true); - } - } - }); - onButton.setSelection(interval > 0); - - intervalLabel = new Label(group, SWT.CENTER); - intervalLabel.setText("Save Interval in Minutes"); - layoutData = new GridData(SWT.FILL, SWT.DEFAULT, true, false, 2, 1); - intervalLabel.setLayoutData(layoutData); - - intervalScale = new SpinScale(group, SWT.HORIZONTAL); - layoutData = new GridData(SWT.FILL, SWT.DEFAULT, true, false, 2, 1); - layoutData.minimumWidth = 240; - intervalScale.setLayoutData(layoutData); - intervalScale.setMinimum(AutoSaveJob.MIN_INTERVAL); - intervalScale.setMaximum(AutoSaveJob.MAX_INTERVAL); - if (interval > 0) { - intervalScale.setSelection(interval); - } else { - intervalLabel.setEnabled(false); - intervalScale.setEnabled(false); - intervalScale.setSelection(AutoSaveJob.MAX_INTERVAL); - } - - return comp; - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.dialogs.Dialog#okPressed() + /** + * Method for loading the various config data for the dialog. */ - @Override - protected void okPressed() { - if (offButton.getSelection()) { - autoSaveJob.setInterval(0); - } else { - autoSaveJob.setInterval(intervalScale.getSelection()); - } - super.okPressed(); + private void loadConfigData() { + } + public int getCurrentInterval() { + return currentInterval; + } + + public boolean isAutoSaveEnabled() { + return autoSaveEnabled; + } } diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductAreaComp.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductAreaComp.java index c7c33d3408..e3cb55f14f 100644 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductAreaComp.java +++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductAreaComp.java @@ -61,8 +61,6 @@ import com.raytheon.viz.gfe.textformatter.TextProductManager; * 26 SEP 2012 15423 ryu Fix product correction in practice mode * 15 MAY 2013 1842 dgilling Change constructor signature to accept a * DataManager instance. - * 05 SEP 2013 2329 randerso Added call to ZoneCombinerComp.applyZoneCombo when - * when run formatter button is clicked. * * * @@ -388,12 +386,12 @@ public class ProductAreaComp extends Composite implements // use // it, else use the default String dbId = null; - zoneCombiner.applyZoneCombo(); + // zoneCombinerComp.compactList(); dbId = ((FormatterLauncherDialog) productTabCB) .getSelectedDataSource(productName); FormatterUtil.runFormatterScript(textProductMgr, - productName, dbId, vtecMode, - ProductAreaComp.this); + productName, zoneCombiner.getZoneGroupings(), + dbId, vtecMode, ProductAreaComp.this); } } }); diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java index a268e9f543..8ab707c084 100644 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java +++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java @@ -63,6 +63,7 @@ import org.eclipse.swt.events.MouseAdapter; import org.eclipse.swt.events.MouseEvent; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.GC; import org.eclipse.swt.graphics.Image; @@ -151,7 +152,6 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback; * 02/12/2013 #1597 randerso Code cleanup. Fixed possible widget disposed errors on shut down. * 05/08/2013 #1842 dgilling Add alternate setProductText(), fix * warnings. - * 09/03/2013 16534 ryu Refactor; sneak in a change for Ron (RM #1597). * * * @@ -1851,7 +1851,7 @@ public class ProductEditorComp extends Composite implements } // convert to hours and check bounds - Float purgeOffset = offset / ((float) TimeUtil.SECONDS_PER_HOUR); + Float purgeOffset = (float) (offset / TimeUtil.SECONDS_PER_HOUR); purgeOffset = Math.min(purgeOffset, 24F); purgeOffset = Math.max(purgeOffset, 1F); @@ -2868,16 +2868,21 @@ public class ProductEditorComp extends Composite implements } // Look for locked text in the selection - if (textComp.rangeHasLockedText(selectionRange.x, selectionRange.y)) { - String msg2 = "Selection contains locked text\n\n "; - MessageBox mb2 = new MessageBox(getShell(), SWT.OK - | SWT.ICON_WARNING); - mb2.setText("CTA"); - mb2.setMessage(msg2); - mb2.open(); - return; + StyleRange[] styleRanges = styledText.getStyleRanges(selectionRange.x, + selectionRange.y); + Color lockedColor = textComp.getLockColor(); + for (StyleRange styleRange : styleRanges) { + if (lockedColor.equals(styleRange.foreground)) { + String msg2 = "Selection contains locked text\n\n "; + MessageBox mb2 = new MessageBox(getShell(), SWT.OK + | SWT.ICON_WARNING); + mb2.setText("CTA"); + mb2.setMessage(msg2); + mb2.open(); + return; + } } - + // Word-wrap the whole selection. int curLine = styledText.getLineAtOffset(selectionRange.x); int lastSelIdx = selectionRange.x + selectionRange.y - 1; diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java index 2a34c6da9e..453193fa03 100644 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java +++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java @@ -80,7 +80,6 @@ import com.raytheon.viz.gfe.textformatter.TextFmtParserUtil; * 26 Sep 2012 15423 ryu Avoid resetting text when possible. * 03 Dec 2012 15620 ryu Unlock framed cities list for editing. * 30 APR 2013 16095 ryu Modified updateTextStyle() to not lock edited text. - * 04 SEP 2013 16534 ryu Fixed word wrap to not insert duplicate text; refactor. * * * @@ -333,6 +332,19 @@ public class StyledTextComp extends Composite { newProduct = false; } + /** + * computes the logical caret offset within the ProductEditor as a result of + * the CTA insert. + * + * @param newProductText + * The new product text + */ + private int caretOffsetAfterCTAInsert(String newProductText) { + int currentProductTextLength = textEditorST.getText().length(); + int displacement = newProductText.length() - currentProductTextLength; + return displacement + textEditorST.getCaretOffset(); + } + /** * Lock the parts of the text that needs to be uneditable. */ @@ -564,7 +576,7 @@ public class StyledTextComp extends Composite { replaceText(ff, SPC + newfield); } } else { - String s = SPC + newfield; + String s = SPC + newfield; if (!ff.getText().equals(s)) { replaceText(ff, s); } @@ -808,7 +820,7 @@ public class StyledTextComp extends Composite { * @return Whether or not there is text in the range that contains locked * text. */ - protected boolean rangeHasLockedText(int offset, int length) { + private boolean rangeHasLockedText(int offset, int length) { StyleRange[] ranges = textEditorST.getStyleRanges(offset, length); for (StyleRange range : ranges) { @@ -1336,8 +1348,17 @@ public class StyledTextComp extends Composite { line = st.getLine(searchLine); int lineOffset = st.getOffsetAtLine(searchLine); - // if line contains locked text, quit looking. - if (rangeHasLockedText(lineOffset, line.length())) { + // if line contains locked text, quit looking. + StyleRange[] styleRanges = st.getStyleRanges(lineOffset, + line.length()); + boolean locked = false; + for (StyleRange range : styleRanges) { + if (range.foreground.equals(lockColor)) { + locked = true; + break; + } + } + if (locked) { break; } @@ -1369,7 +1390,16 @@ public class StyledTextComp extends Composite { line = st.getLine(searchLine); // don't use locked text - if (rangeHasLockedText(lineStartOffset, line.length())) { + StyleRange[] ranges = st.getStyleRanges(lineStartOffset, + line.length()); + boolean locked = false; + for (StyleRange range : ranges) { + if (range.foreground.equals(lockColor)) { + locked = true; + break; + } + } + if (locked) { break; } @@ -1393,10 +1423,6 @@ public class StyledTextComp extends Composite { if (endIndex >= st.getCharCount()) { endIndex = st.getCharCount() - 1; } - - if (endIndex < startIndex) { - return new int[] { startIndex, endIndex, 0 }; - } // get the block text before the cursor String pre = ""; diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java index 9adb3635b9..fee0b61322 100644 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java +++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java @@ -22,12 +22,16 @@ package com.raytheon.viz.gfe.dialogs.formatterlauncher; import java.io.BufferedReader; import java.io.File; import java.io.FileReader; +import java.io.FilenameFilter; import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; +import java.util.TreeSet; import java.util.regex.Matcher; import org.eclipse.jface.preference.IPreferenceStore; @@ -57,7 +61,6 @@ import org.opengis.referencing.FactoryException; import org.opengis.referencing.operation.TransformException; import com.raytheon.uf.common.dataplugin.gfe.db.objects.GridLocation; -import com.raytheon.uf.common.dataplugin.gfe.exception.GfeException; import com.raytheon.uf.common.localization.FileUpdatedMessage; import com.raytheon.uf.common.localization.FileUpdatedMessage.FileChangeType; import com.raytheon.uf.common.localization.ILocalizationFileObserver; @@ -67,17 +70,21 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType; import com.raytheon.uf.common.localization.LocalizationFile; import com.raytheon.uf.common.localization.PathManagerFactory; +import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException; import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.common.status.UFStatus.Priority; import com.raytheon.uf.common.util.FileUtil; +import com.raytheon.uf.common.util.file.FilenameFilters; import com.raytheon.uf.viz.core.RGBColors; import com.raytheon.uf.viz.core.VizApp; import com.raytheon.uf.viz.core.exception.VizException; import com.raytheon.viz.gfe.Activator; import com.raytheon.viz.gfe.core.DataManagerUIFactory; +import com.raytheon.viz.gfe.textformatter.CombinationsFileGenerator; import com.raytheon.viz.gfe.textformatter.CombinationsFileUtil; import com.raytheon.viz.gfe.textformatter.TextProductManager; +import com.raytheon.viz.gfe.ui.AccessMgr; import com.raytheon.viz.gfe.ui.zoneselector.ZoneSelector; /** @@ -93,9 +100,8 @@ import com.raytheon.viz.gfe.ui.zoneselector.ZoneSelector; * Changes for non-blocking SaveDeleteComboDlg. * Changes for non-blocking ShuffleZoneGroupsDialog. * Changes for non-blocking ZoneColorEditorDlg. - * Mar 14, 2013 1794 djohnson Consolidate common FilenameFilter implementations. - * Sep 05, 2013 2329 randerso Removed obsolete methods, added ApplyZoneCombo method * + * Mar 14, 2013 1794 djohnson Consolidate common FilenameFilter implementations. * * * @author lvenable @@ -301,8 +307,6 @@ public class ZoneCombinerComp extends Composite implements createMapArea(theSaved); createBottomControls(); - - applyButtonState(false); } /** @@ -451,7 +455,6 @@ public class ZoneCombinerComp extends Composite implements @Override public void widgetSelected(SelectionEvent e) { zoneSelector.updateCombos(new HashMap()); - applyButtonState(false); } }); clearMI.setText("Clear"); @@ -728,7 +731,14 @@ public class ZoneCombinerComp extends Composite implements applyZoneComboBtn.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent event) { - applyZoneCombo(); + try { + CombinationsFileGenerator.generateAutoCombinationsFile( + zoneSelector.getZoneGroupings(), + getCombinationsFileName() + ".py"); + } catch (Exception e) { + statusHandler.handle(Priority.PROBLEM, "Unable to save " + + getCombinationsFileName(), e); + } } }); Label label = new Label(controlComp, SWT.CENTER); @@ -744,25 +754,6 @@ public class ZoneCombinerComp extends Composite implements label.setAlignment(SWT.CENTER); } - /** - * Save zone combo - */ - public void applyZoneCombo() { - if (!buttonState()) { - return; - } - - try { - CombinationsFileUtil.generateAutoCombinationsFile( - zoneSelector.getZoneGroupings(), getCombinationsFileName() - + ".py"); - applyButtonState(false); - } catch (Exception e) { - statusHandler.handle(Priority.PROBLEM, "Unable to save " - + getCombinationsFileName(), e); - } - } - /** * Display the Color Editor dialog. */ @@ -854,6 +845,93 @@ public class ZoneCombinerComp extends Composite implements return file; } + /** + * Get the names of the combo files at the given level. If level is null, + * get the names of the combo files at all levels. Otherwise, only get the + * names of the files at the given level. + * + * @param level + * @return the save combo files at the given level + */ + public String[] getSavedCombos(LocalizationLevel level) { + String comboDirName = "saved"; + String[] combos; + File localFile; + // Accept any file whose name ends with ".py". + FilenameFilter filter = FilenameFilters.byFileExtension(".py"); + + if (level == null) { + // Aggregate the filenames for all levels. + // Use a set to keep names unique. + Set comboSet = new TreeSet(); + LocalizationLevel[] levels = PathManagerFactory.getPathManager() + .getAvailableLevels(); + for (int i = levels.length - 1; i >= 0; --i) { + localFile = getLocalization(comboDirName, levels[i]); + if ((localFile != null) && localFile.exists()) { + comboSet.addAll(Arrays.asList(localFile.list(filter))); + } + } + + combos = comboSet.toArray(new String[0]); + } else { + // Get only the filenames for USER level. + localFile = getLocalization(comboDirName); + combos = localFile.list(filter); + } + return combos; + } + + /** + * Load the combinations file called filename if it is in list or + * filename.py is in list, and return the loaded file as a List of Lists of + * Strings. + * + * @param list + * The list of valid filenames + * @param filename + * The filename to load + * @return the contents of the file, as a List of Lists of Strings. + */ + // public List> findCombos(String[] list, String filename) { + // List> listOfCombos = null; + // for (int i = 0; i < list.length; i++) { + // if (list[i].equals(filename) || list[i].equals(filename + ".py")) { + // listOfCombos = loadCombinationsFile(filename); + // } + // } + // return listOfCombos; + // } + + /** + * Deletes the saved file chosen + * + * @param name + * the combo file name + * @throws LocalizationOpFailedException + * if the server copy of the file cannot be deleted + */ + public void deleteSavedCombos(String name) + throws LocalizationOpFailedException { + String searchName = FileUtil.join(CombinationsFileUtil.COMBO_DIR_PATH, + "saved", name + ".py"); + IPathManager pm = PathManagerFactory.getPathManager(); + LocalizationContext userContext = pm.getContext( + LocalizationType.CAVE_STATIC, LocalizationLevel.USER); + LocalizationFile userFile = pm.getLocalizationFile(userContext, + searchName); + + if (AccessMgr.verifyDelete(userFile.getName(), + LocalizationType.CAVE_STATIC, false)) { + if (userFile.isAvailableOnServer()) { + userFile.delete(); + } else if (userFile.exists()) { + File localFile = userFile.getFile(); + localFile.delete(); + } + } + } + /** * Returns the localization for the save and delete functions. This is a * wrapper around getLocalization(String, level). @@ -909,40 +987,34 @@ public class ZoneCombinerComp extends Composite implements } public Map loadCombinationsFile(String comboName) { - Map dict = new HashMap(); + List> combolist = new ArrayList>(); + File localFile = PathManagerFactory.getPathManager().getStaticFile( + FileUtil.join(CombinationsFileUtil.COMBO_DIR_PATH, comboName + + ".py")); + if (localFile != null) { + combolist = CombinationsFileUtil.init(comboName); + } + + // reformat combinations into combo dictionary + Map d = new HashMap(); try { - IPathManager pm = PathManagerFactory.getPathManager(); - LocalizationContext ctx = pm.getContext( - LocalizationType.CAVE_STATIC, LocalizationLevel.SITE); - File localFile = pm.getFile(ctx, FileUtil.join( - CombinationsFileUtil.COMBO_DIR_PATH, comboName + ".py")); - - List> combolist = new ArrayList>(); - if (localFile != null && localFile.exists()) { - combolist = CombinationsFileUtil.init(comboName); - } else { - statusHandler.error("Combinations file does not found: " - + comboName); - } - - // reformat combinations into combo dictionary int group = 1; for (List zonelist : combolist) { for (String z : zonelist) { - dict.put(z, group); + d.put(z, group); } group += 1; } - } catch (GfeException e) { - statusHandler.handle(Priority.SIGNIFICANT, e.getLocalizedMessage(), - e); + } catch (Exception e) { + statusHandler.handle(Priority.SIGNIFICANT, + "Combo file is not in combo format: " + comboName); return new HashMap(); } currentComboFile = FileUtil.join(CombinationsFileUtil.COMBO_DIR_PATH, comboName + ".py"); - return dict; + return d; } /** @@ -988,12 +1060,11 @@ public class ZoneCombinerComp extends Composite implements && message.getFileName().equalsIgnoreCase(currentComboFile)) { File file = new File(message.getFileName()); String comboName = file.getName().replace(".py", ""); - statusHandler - .info("Received FileUpdatedMessage for combinations file: " - + comboName); + if (file.getParent().endsWith("saved")) { + comboName = FileUtil.join("saved", comboName); + } Map comboDict = loadCombinationsFile(comboName); this.zoneSelector.updateCombos(comboDict); - applyButtonState(false); } } @@ -1014,20 +1085,4 @@ public class ZoneCombinerComp extends Composite implements }); } } - - private boolean buttonState() { - final boolean[] state = { false }; - if (this.applyZoneComboBtn != null - && !this.applyZoneComboBtn.isDisposed()) { - VizApp.runSync(new Runnable() { - @Override - public void run() { - state[0] = ZoneCombinerComp.this.applyZoneComboBtn - .isEnabled(); - } - }); - } - - return state[0]; - } } diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/jobs/AutoSaveJob.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/jobs/AutoSaveJob.java index 97eede7351..db6879b963 100644 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/jobs/AutoSaveJob.java +++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/jobs/AutoSaveJob.java @@ -24,14 +24,11 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; -import com.raytheon.uf.common.status.IUFStatusHandler; -import com.raytheon.uf.common.status.UFStatus; -import com.raytheon.uf.common.time.util.TimeUtil; +import com.raytheon.viz.gfe.Activator; import com.raytheon.viz.gfe.GFEPreference; import com.raytheon.viz.gfe.PreferenceConstants; import com.raytheon.viz.gfe.core.DataManager; import com.raytheon.viz.gfe.core.parm.Parm; -import com.raytheon.viz.gfe.ui.HazardUIUtils; /** * Job implementing the auto save functionality. Uses user preferences to @@ -41,8 +38,7 @@ import com.raytheon.viz.gfe.ui.HazardUIUtils; * SOFTWARE HISTORY * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- - * Jun 25, 2008 Eric Babin Initial Creation - * Aug 27, 2013 #2302 randerso Fixed to behave more like A1, code cleanup + * Jun 25, 2008 Eric Babin Initial Creation * * * @@ -51,34 +47,38 @@ import com.raytheon.viz.gfe.ui.HazardUIUtils; */ public class AutoSaveJob extends Job { - private static final transient IUFStatusHandler statusHandler = UFStatus - .getHandler(AutoSaveJob.class); - /** - * Max auto save interval in minutes - */ + private static final int MILLISECONDS_PER_MINUTE = 60 * 1000; + public static final int MAX_INTERVAL = 60; - /** - * Min auto save interval in minutes - */ public static final int MIN_INTERVAL = 1; /** - * auto save interval in milliseconds, 0 = disabled + * auto save interval in minutes, 0 = disabled */ - private long interval; + private static int interval; + static { + int i = 0; + if (GFEPreference.storeAvailable()) { + i = GFEPreference + .getIntPreference(PreferenceConstants.GFE_AUTO_SAVE_INTERVAL); + } + + interval = i; + } /** * Set the auto save interval * - * @param interval + * @param i * desired interval in minutes */ - public void setInterval(int interval) { - this.interval = interval * TimeUtil.MILLIS_PER_MINUTE; - this.cancel(); - this.reSchedule(this.interval); + public static void setInterval(int i) { + interval = i; + + GFEPreference.setPreference(PreferenceConstants.GFE_AUTO_SAVE_INTERVAL, + Integer.toString(i)); } /** @@ -86,8 +86,8 @@ public class AutoSaveJob extends Job { * * @return interval in minutes */ - public int getInterval() { - return (int) (interval / TimeUtil.MILLIS_PER_MINUTE); + public static int getInterval() { + return interval; } private DataManager dataManager; @@ -104,28 +104,17 @@ public class AutoSaveJob extends Job { this.dataManager = dataManager; this.disposed = false; this.setSystem(true); - int pref = GFEPreference - .getIntPreference(PreferenceConstants.GFE_AUTO_SAVE_INTERVAL); - if (pref > MAX_INTERVAL) { - pref = MAX_INTERVAL; - } else if (pref < 0) { - pref = 0; - } - this.interval = pref * TimeUtil.MILLIS_PER_MINUTE; - reSchedule(this.interval); + reSchedule(); } /** - * Schedule this job to run after the desired - * - * @param delay - * interval in milliseconds + * Schedule this job to run after the desired interval */ - public void reSchedule(long delay) { + public void reSchedule() { if (!disposed) { - if (delay > 0) { - this.schedule(delay); + if (interval > 0) { + this.schedule(interval * MILLISECONDS_PER_MINUTE); } } else { dataManager = null; @@ -149,51 +138,53 @@ public class AutoSaveJob extends Job { */ @Override protected IStatus run(IProgressMonitor monitor) { - long delay = this.interval; - if (delay > 0) { - String msg = "GFE Auto Save called. "; - boolean success = false; - try { - Parm modifiedParm = getModifiedParm(); - if (modifiedParm != null) { - msg += "Save of Parm " - + modifiedParm.getParmID().getParmName() + " = "; - - // save the data - success = modifiedParm.saveParameter(false); - msg += (success ? "success" : "failure"); - delay = 1500; - } else { - msg += "Nothing to save."; + IStatus status = Status.OK_STATUS; + try { + Parm[] parms = this.dataManager.getParmManager().getModifiedParms(); + if (parms != null && parms.length != 0) { + String autoSaveResult = "GFE Auto Save called. Save of Parms["; + for (int i = 0; i < parms.length; i++) { + String name = parms[i].getParmID().getParmName(); + if (name.indexOf("Hazards") == -1) { + autoSaveResult += saveParm(parms[i]); + } else { + if (!tempHazardsExist()) { + saveParm(parms[i]); + autoSaveResult += saveParm(parms[i]); + } + } } - statusHandler.info(msg); - } catch (Exception e) { - msg += "failure"; - statusHandler.error(msg, e); + autoSaveResult += "]"; + + Activator.getDefault().getLog().log( + new Status(IStatus.INFO, Activator.PLUGIN_ID, + autoSaveResult)); } - reSchedule(delay); + } catch (Exception e) { + status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, + "GFE auto save failed.", e); } - return Status.OK_STATUS; + reSchedule(); + return status; } /** - * Find the first available modified parm. Skip Hazards if temp hazards - * exist + * If tempHazards exist, then autosave kicked off in the middle of merge + * hazard. (which creates a "temp" hazard with "haz" in the name. * - * @return the first available modified parm or null if none + * So we will ignore the "Hazard" WE parm save... + * + * @return if temp haz exists. */ - private Parm getModifiedParm() { - boolean tempHazDisplayed = HazardUIUtils - .tempHazardsExist(this.dataManager); - for (Parm p : this.dataManager.getParmManager().getModifiedParms()) { - if (p.getParmID().getParmName().contains("Hazards") - && tempHazDisplayed) { - continue; - } else { - return p; + private boolean tempHazardsExist() { + Parm[] parms = this.dataManager.getParmManager().getDisplayedParms(); + for (int i = 0; i < parms.length; i++) { + if (parms[i].getParmID().getParmName().indexOf("haz") != -1) { + return true; } } - return null; + + return false; } /** diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java index 028ced353e..1921b058d2 100644 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java +++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java @@ -161,7 +161,6 @@ import com.vividsolutions.jts.geom.Envelope; * May 11, 2012 njensen Allow rsc to be recycled * Nov 08, 2012 1298 rferrel Changes for non-blocking FuzzValueDialog. * Mar 04, 2013 1637 randerso Fix time matching for ISC grids - * Aug 27, 2013 2287 randerso Fixed scaling and direction of wind arrows * * * @@ -618,7 +617,6 @@ public class GFEResource extends } clearVectorDisplays(); - GFEVectorGraphicsRenderableFactory factory; for (VisualizationType type : visTypes) { switch (type) { case WIND_ARROW: @@ -628,31 +626,24 @@ public class GFEResource extends if (logFactor < 0.0) { logFactor = 0.0; } - factory = new GFEVectorGraphicsRenderableFactory( - logFactor, parm.getGridInfo().getMaxValue()); + // TODO: add logFactor to PointWindDisplay, + // GriddedVectorDisplay this.vectorDisplay.add(new GriddedVectorDisplay( mag, dir, descriptor, MapUtil .getGridGeometry(gs.getGridInfo() .getGridLoc()), getVectorSize("WindArrowDefaultSize"), - 1.36, false, visTypeToDisplayType(type), - factory)); + visTypeToDisplayType(type))); break; case WIND_BARB: - factory = new GFEVectorGraphicsRenderableFactory( - 0.0, parm.getGridInfo().getMaxValue()); - this.vectorDisplay - .add(new GriddedVectorDisplay( - mag, - dir, - descriptor, - MapUtil.getGridGeometry(gs - .getGridInfo().getGridLoc()), - getVectorSize("WindBarbDefaultSize"), - 1.36, false, - visTypeToDisplayType(type), factory)); + this.vectorDisplay.add(new GriddedVectorDisplay( + mag, dir, descriptor, MapUtil + .getGridGeometry(gs.getGridInfo() + .getGridLoc()), + getVectorSize("WindBarbDefaultSize"), + visTypeToDisplayType(type))); break; case IMAGE: @@ -1009,6 +1000,8 @@ public class GFEResource extends size = 60; } + size = (int) (size / 0.8); + int offset = parm.getDisplayAttributes().getFontOffset() + Activator.getDefault().getPreferenceStore() .getInt("Contour_font"); diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEVectorGraphicsRenderable.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEVectorGraphicsRenderable.java deleted file mode 100644 index 80dbbbde26..0000000000 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEVectorGraphicsRenderable.java +++ /dev/null @@ -1,213 +0,0 @@ -/** - * 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.viz.gfe.rsc; - -import com.raytheon.uf.viz.core.IGraphicsTarget; -import com.raytheon.uf.viz.core.drawables.IDescriptor; -import com.raytheon.viz.core.contours.util.VectorGraphicsRenderable; -import com.vividsolutions.jts.geom.Coordinate; - -/** - * GFE version of VectorGraphicsRenderable. Subclassed to better match A1 GFE - * behavior - * - *
- * 
- * SOFTWARE HISTORY
- * 
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Aug 22, 2013     #2287  randerso     Initial creation
- * 
- * 
- * - * @author randerso - * @version 1.0 - */ - -public class GFEVectorGraphicsRenderable extends VectorGraphicsRenderable { - double minLog = 0.0; - - double maxLog = 0.0; - - private double maxLimit; - - /** - * @param descriptor - * @param target - * @param size - * @param logFactor - * @param maxLimit - */ - public GFEVectorGraphicsRenderable(IDescriptor descriptor, - IGraphicsTarget target, double size, double logFactor, - double maxLimit) { - super(descriptor, target, size, logFactor); - - this.maxLimit = maxLimit; - if (logFactor > 0.0) { - minLog = Math.log(logFactor); - maxLog = Math.log(logFactor + 1.0); - } - } - - /** - * - * @param plotLoc - * @param adjSize - * @param spd - * @param dir - * barb direction in radians - */ - @Override - public void paintBarb(Coordinate plotLoc, double adjSize, double spd, - double dir) { - paintPoint(plotLoc, adjSize); - - int speed = (int) (spd + 2.5); - double staff = adjSize * .4; - double barb = staff * 0.30; - double add = staff * 0.105; - // DIRECTIONS - double uudd = -spd * Math.sin(dir); - double vvff = -spd * Math.cos(dir); - double dix = -uudd / spd; - double djy = -vvff / spd; - double dix1 = Math.cos(Math.toRadians(75)) * dix - + Math.sin(Math.toRadians(75)) * djy; - double djy1 = (-1) * Math.sin(Math.toRadians(75)) * dix - + Math.cos(Math.toRadians(75)) * djy; - - // SPEED AND COUNTERS: - int n50 = speed / 50; - int calcSpd = speed - 50 * n50; - int n10 = calcSpd / 10; - calcSpd = calcSpd - 10 * n10; - int n5 = calcSpd / 5; - double sx = ((n50 + n50 + n10 + n5 + 2)) * add; - staff = Math.max(adjSize * .4, sx); - - // DRAW STAFF - double ix2 = plotLoc.x; - double jy2 = plotLoc.y; - double ix1 = ix2 + dix * staff; - double jy1 = jy2 - djy * staff; - lastShape.addLineSegment(new double[][] { { ix2, jy2 }, { ix1, jy1 } }); - - // PLOT LONE HALF-BARB, IF NECESSARY - if (n50 == 0 && n10 == 0) { - ix2 = ix1 - dix * add; - jy2 = jy1 + djy * add; - ix1 = ix2 + dix1 * barb / 2.0; - jy1 = jy2 - djy1 * barb / 2.0; - lastShape.addLineSegment(new double[][] { { ix2, jy2 }, - { ix1, jy1 } }); - return; - } - - // PLOT FLAGS, IF NECESSARY - for (int i = 0; i < n50; i++) { - ix2 = ix1 + dix1 * barb; - jy2 = jy1 - djy1 * barb; - lastShape.addLineSegment(new double[][] { { ix2, jy2 }, - { ix1, jy1 } }); - ix1 = ix1 - dix * add * 2; - jy1 = jy1 + djy * add * 2; - lastShape.addLineSegment(new double[][] { { ix2, jy2 }, - { ix1, jy1 } }); - } - if (n50 > 0) { - ix1 = ix1 - dix * add / 2.0; - jy1 = jy1 + djy * add / 2.0; - } - - // PLOT BARB, IF NECESSARY - for (int i = 0; i < n10; i++) { - ix2 = ix1 + dix1 * barb; - jy2 = jy1 - djy1 * barb; - lastShape.addLineSegment(new double[][] { { ix2, jy2 }, - { ix1, jy1 } }); - ix1 = ix1 - dix * add; - jy1 = jy1 + djy * add; - } - - // PLOT HALF-BARB, IF NECESSARY - if (n5 != 0) { - ix2 = ix1 + dix1 * barb / 2.0; - jy2 = jy1 - djy1 * barb / 2.0; - lastShape.addLineSegment(new double[][] { { ix2, jy2 }, - { ix1, jy1 } }); - } - } - - @Override - public void paintArrow(Coordinate plotLoc, double adjSize, double mag, - double dir) { - paintPoint(plotLoc, adjSize); - - double staff = 0.0; - - double logFactor = this.scale; - - // linear scaling - if (logFactor == 0.00) { - staff = mag * size / maxLimit; - } else { - double pcentRange = mag / maxLimit; - double lg = Math.log(logFactor + pcentRange); - double pcentLog = (lg - minLog) / (maxLog - minLog); - staff = pcentLog * size; - } - - double barb = staff / 7.0; - - // if (staff < barb) { - // return; - // } - - double ratio = adjSize / size; - staff *= ratio; - barb *= ratio; - - // DIRECTIONS - double uudd = -mag * Math.sin(dir); - double vvff = -mag * Math.cos(dir); - double dix = uudd / mag; - double djy = vvff / mag; - double dix1 = -dix - djy; - double djy1 = dix - djy; - double dix2 = -dix + djy; - double djy2 = -dix - djy; - - // DRAW BODY OF ARROW - double ix2 = plotLoc.x; - double jy2 = plotLoc.y; - double ix1 = ix2 + dix * staff; - double jy1 = jy2 - djy * staff; - lastShape.addLineSegment(new double[][] { { ix2, jy2 }, { ix1, jy1 } }); - // DRAW HEAD OF ARROW. - ix2 = ix1 + dix1 * barb; - jy2 = jy1 - djy1 * barb; - double ix3 = ix1 + dix2 * barb; - double jy3 = jy1 - djy2 * barb; - lastShape.addLineSegment(new double[][] { { ix2, jy2 }, { ix1, jy1 }, - { ix3, jy3 } }); - } -} diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEVectorGraphicsRenderableFactory.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEVectorGraphicsRenderableFactory.java deleted file mode 100644 index 9448e8d6c5..0000000000 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEVectorGraphicsRenderableFactory.java +++ /dev/null @@ -1,80 +0,0 @@ -/** - * 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.viz.gfe.rsc; - -import com.raytheon.uf.viz.core.IGraphicsTarget; -import com.raytheon.uf.viz.core.drawables.IDescriptor; -import com.raytheon.viz.core.contours.util.IVectorGraphicsRenderableFactory; -import com.raytheon.viz.core.contours.util.VectorGraphicsRenderable; - -/** - * GFE VectorGraphicsRenderable Factory - * - * Constructs the VectorGraphicsRenderable for GFE usage of GriddedVectorDisplay - * - *
- * 
- * SOFTWARE HISTORY
- * 
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Aug 22, 2013     #2287  randerso     Initial creation
- * 
- * 
- * - * @author randerso - * @version 1.0 - */ - -public class GFEVectorGraphicsRenderableFactory implements - IVectorGraphicsRenderableFactory { - private double logFactor; - - private double maxLimit; - - /** - * Constructor - * - * @param logFactor - * logFactor scaling value from parm_arrowScaling preference - * @param maxLimit - * max allowable value for parm - */ - public GFEVectorGraphicsRenderableFactory(double logFactor, double maxLimit) { - this.logFactor = logFactor; - this.maxLimit = maxLimit; - } - - /* - * (non-Javadoc) - * - * @see - * com.raytheon.viz.core.contours.util.IVectorGraphicsRenderableFactory# - * createRenderable(com.raytheon.uf.viz.core.drawables.IDescriptor, - * com.raytheon.uf.viz.core.IGraphicsTarget, double) - */ - @Override - public VectorGraphicsRenderable createRenderable(IDescriptor descriptor, - IGraphicsTarget target, double size) { - return new GFEVectorGraphicsRenderable(descriptor, target, size, - logFactor, maxLimit); - } - -} diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/GFEColorbarResource.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/GFEColorbarResource.java index 9c47ca94f8..22a6bafaec 100644 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/GFEColorbarResource.java +++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/GFEColorbarResource.java @@ -62,11 +62,9 @@ import com.raytheon.viz.gfe.actions.SetDiscretePickupAction; import com.raytheon.viz.gfe.actions.SetDiscreteWxPickupAction; import com.raytheon.viz.gfe.core.DataManager; import com.raytheon.viz.gfe.core.ISpatialDisplayManager; -import com.raytheon.viz.gfe.core.msgs.GridDataChangedMsg; import com.raytheon.viz.gfe.core.msgs.IDisplayModeChangedListener; import com.raytheon.viz.gfe.core.msgs.IDisplayedParmListChangedListener; import com.raytheon.viz.gfe.core.msgs.IPickupValueChangedListener; -import com.raytheon.viz.gfe.core.msgs.ISpatialEditorTimeChangedListener; import com.raytheon.viz.gfe.core.msgs.Message; import com.raytheon.viz.gfe.core.msgs.Message.IMessageClient; import com.raytheon.viz.gfe.core.msgs.ShowQuickViewDataMsg; @@ -102,7 +100,6 @@ import com.raytheon.viz.ui.input.InputAdapter; * Changes for non-blocking SetValueDialog. * 01/23/2013 #1524 randerso Fix error when clicking on discrete color bar when * no grid exists - * 08/27/2013 #2287 randerso Fixed fitToDataColorTable for Single Grids * * * @@ -113,7 +110,7 @@ public class GFEColorbarResource extends AbstractVizResource implements IContextMenuProvider, IPickupValueChangedListener, IDisplayModeChangedListener, IMessageClient, - IDisplayedParmListChangedListener, ISpatialEditorTimeChangedListener { + IDisplayedParmListChangedListener { public static final double HEIGHT = 25.0; @@ -320,8 +317,6 @@ public class GFEColorbarResource extends dManager.getParmManager().removeDisplayedParmListChangedListener(this); dManager.getSpatialDisplayManager().removeDisplayModeChangedListener( this); - dManager.getSpatialDisplayManager() - .removeSpatialEditorTimeChangedListener(this); IDisplayPaneContainer container = getResourceContainer(); if (container != null) { @@ -329,7 +324,6 @@ public class GFEColorbarResource extends } Message.unregisterInterest(this, ShowQuickViewDataMsg.class); - Message.unregisterInterest(this, GridDataChangedMsg.class); if (colorbarScaleFont != null) { colorbarScaleFont.dispose(); @@ -364,12 +358,9 @@ public class GFEColorbarResource extends @Override protected void initInternal(IGraphicsTarget target) throws VizException { dManager.getSpatialDisplayManager().addDisplayModeChangedListener(this); - dManager.getSpatialDisplayManager() - .addSpatialEditorTimeChangedListener(this); dManager.getParmManager().addDisplayedParmListChangedListener(this); Message.registerInterest(this, ShowQuickViewDataMsg.class); - Message.registerInterest(this, GridDataChangedMsg.class); colorbarScaleFont = GFEFonts.makeGFEIFont(target, "ColorBarScale_font", 1); @@ -689,16 +680,6 @@ public class GFEColorbarResource extends parm = gridId.getParm(); } updateColorbar(parm); - } else if (message instanceof GridDataChangedMsg) { - GridDataChangedMsg msg = (GridDataChangedMsg) message; - if (currentParm != null - && msg.getParmID().equals(currentParm.getParmID()) - && msg.getTimeRange().contains( - currentParm.getDataManager() - .getSpatialDisplayManager() - .getSpatialEditorTime())) { - checkFitToData(); - } } } @@ -708,10 +689,6 @@ public class GFEColorbarResource extends * continuous colorbar range. */ protected void checkFitToData() { - if (currentParm == null) { - return; - } - String parmName = currentParm.getParmID().getParmName(); String fitToDataPref = parmName + "_fitToDataColorTable"; if (GFEPreference.contains(fitToDataPref)) { @@ -859,9 +836,4 @@ public class GFEColorbarResource extends updateColorbar(normalParm); } } - - @Override - public void spatialEditorTimeChanged(Date date) { - checkFitToData(); - } } diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileGenerator.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileGenerator.java new file mode 100644 index 0000000000..d359ff50a8 --- /dev/null +++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileGenerator.java @@ -0,0 +1,108 @@ +/** + * 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. + **/ + +/** + * Creating the combinations file for the TextFormatter + * + *
+ *    
+ * SOFTWARE HISTORY
+ *    
+ * Date         Ticket#     Engineer    Description
+ * ------------ ----------  ----------- --------------------------
+ *6/12/2008                 mnash       Initial creation
+ *     
+ * 
+ * + * @author mnash + * @version 1 + */ +package com.raytheon.viz.gfe.textformatter; + +import java.io.File; +import java.io.IOException; +import java.util.List; + +import com.raytheon.uf.common.dataplugin.gfe.request.SaveCombinationsFileRequest; +import com.raytheon.uf.common.localization.IPathManager; +import com.raytheon.uf.common.localization.LocalizationContext; +import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel; +import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType; +import com.raytheon.uf.common.localization.PathManagerFactory; +import com.raytheon.uf.common.util.FileUtil; +import com.raytheon.viz.gfe.core.DataManager; +import com.raytheon.viz.gfe.core.internal.IFPClient; + +public class CombinationsFileGenerator { + + /** + * Generates combinations files based on just running the formatter + * + * @param zoneGroupList + * @param filename + * @throws IOException + */ + public static void generateAutoCombinationsFile( + List> zoneGroupList, String filename) throws Exception { + generateCombinationsFile(zoneGroupList, filename, ""); + } + + /** + * Generates combinations files based on user wanting to save + * + * @param zoneGroupList + * @param filename + * @throws IOException + */ + public static void generateSavedCombinationsFile( + List> zoneGroupList, String filename) throws Exception { + + if (filename.endsWith(".py")) { + generateCombinationsFile(zoneGroupList, filename, "saved" + + File.separator); + } else { + generateCombinationsFile(zoneGroupList, filename + ".py", "saved" + + File.separator); + } + } + + /** + * Called by both auto and saved functions to actually write file + * + * @param zoneGroupList + * @param filename + * @param loc + * @throws Exception + */ + public static void generateCombinationsFile( + List> zoneGroupList, String filename, String loc) + throws Exception { + IFPClient ifpc = DataManager.getCurrentInstance().getClient(); + SaveCombinationsFileRequest req = new SaveCombinationsFileRequest(); + req.setFileName(FileUtil.join(loc, filename)); + req.setCombos(zoneGroupList); + ifpc.makeRequest(req); + + IPathManager pm = PathManagerFactory.getPathManager(); + LocalizationContext ctx = pm.getContext(LocalizationType.CAVE_STATIC, + LocalizationLevel.SITE); + pm.getFile(ctx, FileUtil.join("gfe", "combinations", filename)); + } +} diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java index aaea4f05be..cb47b506c8 100644 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java +++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java @@ -20,7 +20,6 @@ package com.raytheon.viz.gfe.textformatter; import java.io.File; -import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -34,9 +33,7 @@ import javax.xml.bind.annotation.XmlRootElement; import jep.JepException; -import com.raytheon.uf.common.dataplugin.gfe.exception.GfeException; import com.raytheon.uf.common.dataplugin.gfe.python.GfePyIncludeUtil; -import com.raytheon.uf.common.dataplugin.gfe.request.SaveCombinationsFileRequest; import com.raytheon.uf.common.localization.IPathManager; import com.raytheon.uf.common.localization.LocalizationContext; import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel; @@ -52,9 +49,8 @@ import com.raytheon.uf.common.serialization.SerializationException; import com.raytheon.uf.common.serialization.SerializationUtil; import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.UFStatus; +import com.raytheon.uf.common.status.UFStatus.Priority; import com.raytheon.uf.common.util.FileUtil; -import com.raytheon.viz.gfe.core.DataManagerUIFactory; -import com.raytheon.viz.gfe.core.internal.IFPClient; import com.raytheon.viz.gfe.textformatter.CombinationsFileUtil.ComboData.Entry; /** @@ -64,10 +60,7 @@ import com.raytheon.viz.gfe.textformatter.CombinationsFileUtil.ComboData.Entry; * SOFTWARE HISTORY * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- - * Jul 25, 2008 mnash Initial creation - * Sep 05, 2013 #2329 randerso Moved genereateAutoCombinationsFile here - * Cleaned up error handling - * + * Jul 25, 2008 mnash Initial creation * * * @author mnash @@ -207,7 +200,7 @@ public class CombinationsFileUtil { } @SuppressWarnings("unchecked") - public static List> init(String comboName) throws GfeException { + public static List> init(String comboName) { IPathManager pm = PathManagerFactory.getPathManager(); @@ -218,6 +211,7 @@ public class CombinationsFileUtil { File comboFile = new File(comboName); comboName = comboFile.getName(); + String comboPath = GfePyIncludeUtil.getCombinationsIncludePath(); String scriptPath = FileUtil.join( GfePyIncludeUtil.getUtilitiesLF(baseContext).getFile() .getPath(), "CombinationsInterface.py"); @@ -227,15 +221,13 @@ public class CombinationsFileUtil { map.put("comboName", comboName); PythonScript python = null; try { - python = new PythonScript(scriptPath, PyUtil.buildJepIncludePath( - GfePyIncludeUtil.getCombinationsIncludePath(), - GfePyIncludeUtil.getCommonPythonIncludePath()), - CombinationsFileUtil.class.getClassLoader()); + python = new PythonScript(scriptPath, + PyUtil.buildJepIncludePath(comboPath)); Object com = python.execute("getCombinations", map); combos = (List>) com; } catch (JepException e) { - throw new GfeException("Error loading combinations file: " - + comboName, e); + statusHandler.handle(Priority.CRITICAL, + "Could not get combinations", e); } finally { if (python != null) { python.dispose(); @@ -243,30 +235,4 @@ public class CombinationsFileUtil { } return combos; } - - /** - * Generates combinations files based on just running the formatter - * - * @param zoneGroupList - * @param filename - * @throws Exception - * @throws IOException - */ - public static void generateAutoCombinationsFile( - List> zoneGroupList, String filename) throws Exception { - IFPClient ifpc = DataManagerUIFactory.getCurrentInstance().getClient(); - SaveCombinationsFileRequest req = new SaveCombinationsFileRequest(); - req.setFileName(filename); - req.setCombos(zoneGroupList); - try { - statusHandler.info("Saving combinations file: " + filename); - ifpc.makeRequest(req); - statusHandler.info("Successfully saved combinations file: " - + filename); - } catch (Exception e) { - statusHandler.error("Error saving combinations file: " + filename, - e); - throw e; - } - } } diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/FormatterUtil.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/FormatterUtil.java index 1d0915d84f..1e9df6ba3c 100644 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/FormatterUtil.java +++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/FormatterUtil.java @@ -20,6 +20,7 @@ package com.raytheon.viz.gfe.textformatter; import java.text.SimpleDateFormat; +import java.util.List; import java.util.TimeZone; import com.raytheon.uf.common.status.IUFStatusHandler; @@ -39,9 +40,8 @@ import com.raytheon.viz.gfe.tasks.TaskManager; * SOFTWARE HISTORY * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- - * Sep 8, 2008 njensen Initial creation - * Jan 15, 2010 3395 ryu Fix "issued by" functionality - * Sep 05, 2013 2329 randerso Removed save of combinations file + * Sep 8, 2008 njensen Initial creation + * Jan 15, 2010 3395 ryu Fix "issued by" functionality * * * @@ -63,20 +63,21 @@ public class FormatterUtil { * the formatter instance to use * @param productName * the name of the text product - * @param dbId - * source database - * @param vtecMode - * VTEC mode + * @param zoneList + * the list of zones to produce the product for * @param finish * listener to fire when formatter finishes generating product */ public static void runFormatterScript(TextProductManager productMgr, - String productName, String dbId, String vtecMode, - TextProductFinishListener finish) { + String productName, List> zoneList, String dbId, + String vtecMode, TextProductFinishListener finish) { try { String filename = productMgr.getCombinationsFileName(productName); boolean mapRequired = productMgr.mapRequired(productName); if (filename != null && mapRequired) { + String filenameExt = filename + ".py"; + CombinationsFileGenerator.generateAutoCombinationsFile( + zoneList, filenameExt); productMgr.reloadModule(filename); } } catch (Exception e) { diff --git a/cave/com.raytheon.viz.grid/localization/styleRules/gridReprojectionRules.xml b/cave/com.raytheon.viz.grid/localization/styleRules/gridReprojectionRules.xml deleted file mode 100644 index b996a043eb..0000000000 --- a/cave/com.raytheon.viz.grid/localization/styleRules/gridReprojectionRules.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GriddedIconDisplay.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GriddedIconDisplay.java index 434e44643d..fedefeda79 100644 --- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GriddedIconDisplay.java +++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GriddedIconDisplay.java @@ -50,8 +50,6 @@ import com.vividsolutions.jts.geom.Coordinate; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Apr 23, 2010 bsteffen Initial creation - * Aug 27, 2013 #2287 randerso Added densityFactor to allow application specific - * adjustment of density. * * * @@ -70,17 +68,13 @@ public class GriddedIconDisplay extends AbstractGriddedDisplay { private PointIconFactory iconFactory; /** - * @param values * @param descriptor * @param gridGeometryOfGrid * @param imageSize - * @param densityFactor - * adjustment factor to make density match A1 */ public GriddedIconDisplay(float[] values, IMapDescriptor descriptor, - GeneralGridGeometry gridGeometryOfGrid, int imageSize, - double densityFactor) { - super(descriptor, gridGeometryOfGrid, imageSize, densityFactor); + GeneralGridGeometry gridGeometryOfGrid, int imageSize) { + super(descriptor, gridGeometryOfGrid, imageSize); this.values = values; } @@ -132,7 +126,6 @@ public class GriddedIconDisplay extends AbstractGriddedDisplay { return (int) values[idx]; } - @Override public boolean setColor(RGB color) { if (super.setColor(color)) { iconFactory = null; @@ -173,8 +166,8 @@ public class GriddedIconDisplay extends AbstractGriddedDisplay { if (renderable.resource != empty) { PointImage image = new PointImage(renderable.resource, renderable.plotLocation); - image.setHeight(size * magnification); - image.setWidth(size * magnification); + image.setHeight((double) size * magnification); + image.setWidth((double) size * magnification); images.add(image); } } diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java index f88268818a..ff8574b9c8 100644 --- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java +++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java @@ -87,7 +87,6 @@ import com.raytheon.viz.core.contours.rsc.displays.AbstractGriddedDisplay; import com.raytheon.viz.core.contours.rsc.displays.GriddedContourDisplay; import com.raytheon.viz.core.contours.rsc.displays.GriddedStreamlineDisplay; import com.raytheon.viz.core.contours.rsc.displays.GriddedVectorDisplay; -import com.raytheon.viz.core.contours.util.VectorGraphicsRenderableFactory; import com.raytheon.viz.core.drawables.ColorMapParameterFactory; import com.raytheon.viz.core.rsc.displays.GriddedImageDisplay2; import com.raytheon.viz.core.style.arrow.ArrowPreferences; @@ -112,8 +111,6 @@ import com.vividsolutions.jts.geom.Coordinate; * May 08, 2013 1980 bsteffen Set paint status in GridResources for * KML. * Jul 15, 2013 2107 bsteffen Fix sampling of grid vector arrows. - * Aug 27, 2013 2287 randerso Added new parameters required by GriddedVectorDisplay - * and GriddedIconDisplay * * * @@ -157,14 +154,13 @@ public abstract class AbstractGridResource protected AbstractGridResource(T resourceData, LoadProperties loadProperties) { super(resourceData, loadProperties); resourceData.addChangeListener(new IResourceDataChanged() { - @Override public void resourceChanged(ChangeType type, Object object) { if (type == ChangeType.DATA_UPDATE) { if (object instanceof PluginDataObject) { addDataObject((PluginDataObject) object); } else if (object instanceof PluginDataObject[]) { for (PluginDataObject pdo : (PluginDataObject[]) object) { - addDataObject(pdo); + addDataObject((PluginDataObject) pdo); } } else if (object instanceof Object[]) { for (Object obj : (Object[]) object) { @@ -493,10 +489,9 @@ public abstract class AbstractGridResource case ARROW: case DUALARROW: convertData(data); - VectorGraphicsRenderableFactory factory = new VectorGraphicsRenderableFactory(); GriddedVectorDisplay vectorDisplay = new GriddedVectorDisplay( data.getMagnitude(), data.getDirection(), descriptor, - gridGeometry, 64, 0.75, true, displayType, factory); + gridGeometry, 64, displayType); vectorDisplay.setColor(getCapability(ColorableCapability.class) .getColor()); vectorDisplay.setLineStyle(getCapability(OutlineCapability.class) @@ -509,15 +504,14 @@ public abstract class AbstractGridResource MagnificationCapability.class).getMagnification()); if (stylePreferences != null && stylePreferences instanceof ArrowPreferences) { - factory.setScale(((ArrowPreferences) stylePreferences) + vectorDisplay.setScale(((ArrowPreferences) stylePreferences) .getScale()); } renderable = vectorDisplay; break; case ICON: GriddedIconDisplay iconDisplay = new GriddedIconDisplay(data - .getScalarData().array(), descriptor, gridGeometry, 80, - 0.75); + .getScalarData().array(), descriptor, gridGeometry, 80); iconDisplay.setColor(getCapability(ColorableCapability.class) .getColor()); iconDisplay.setDensity(getCapability(DensityCapability.class) diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java index 53d6333731..6cf9d87158 100644 --- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java +++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java @@ -53,7 +53,6 @@ import com.raytheon.uf.viz.core.datastructure.DataCubeContainer; import com.raytheon.uf.viz.core.exception.VizException; import com.raytheon.uf.viz.core.rsc.AbstractNameGenerator; import com.raytheon.uf.viz.core.rsc.DisplayType; -import com.raytheon.uf.viz.core.rsc.IResourceDataChanged.ChangeType; import com.raytheon.uf.viz.core.rsc.LoadProperties; import com.raytheon.uf.viz.core.rsc.capabilities.DisplayTypeCapability; import com.raytheon.uf.viz.core.rsc.capabilities.ImagingCapability; @@ -61,7 +60,7 @@ import com.raytheon.viz.grid.rsc.GridNameGenerator; import com.raytheon.viz.grid.rsc.GridNameGenerator.IGridNameResource; import com.raytheon.viz.grid.rsc.GridNameGenerator.LegendParameters; import com.raytheon.viz.grid.rsc.GridResourceData; -import com.raytheon.viz.grid.util.ReprojectionUtil; +import com.raytheon.viz.grid.util.ConformalityUtil; import com.raytheon.viz.grid.xml.FieldDisplayTypesFactory; import com.vividsolutions.jts.geom.Coordinate; @@ -80,9 +79,6 @@ import com.vividsolutions.jts.geom.Coordinate; * constructor to avoid duplicate data * requests. * Jul 15, 2013 2107 bsteffen Fix sampling of grid vector arrows. - * Aug 27, 2013 2287 randerso Removed 180 degree adjustment required by error - * in Maputil.rotation - * Sep 24, 2013 DR 15972 D. Friedman Make reprojection of grids configurable. * * * @@ -96,8 +92,6 @@ public class D2DGridResource extends GridResource implements private boolean reprojectedData = false; - private Boolean lastInterpolationState = null; - public D2DGridResource(GridResourceData resourceData, LoadProperties loadProperties) { super(resourceData, loadProperties); @@ -107,10 +101,7 @@ public class D2DGridResource extends GridResource implements for (GridRecord record : resourceData.getRecords()) { addDataObject(record); } - if (this.hasCapability(ImagingCapability.class)) { - lastInterpolationState = this.getCapability(ImagingCapability.class) - .isInterpolationState(); - } + } @Override @@ -150,15 +141,17 @@ public class D2DGridResource extends GridResource implements return null; } } - // For some grids, we may reproject (e.g., world-wide lat/lon grids), - // this is done to match A1, but it also makes the wind barbs look - // more evenly spaced near the pole. + // For world wide lat lon grids we reproject, this is done to match A1, + // but it also makes the wind barbs look more evenly spaced near the + // pole. GridCoverage location = gridRecord.getLocation(); GeneralGridData data = getData(dataRecs, location.getGridGeometry(), dataUnit); - if (ReprojectionUtil.shouldReproject(gridRecord, - getDisplayType(), descriptor.getGridGeometry())) { - data = reprojectData(data); + if (location != null && location.getSpacingUnit().equals("degree")) { + if (!ConformalityUtil.testConformality(location.getGridGeometry(), + descriptor.getGridGeometry())) { + data = reprojectData(data); + } } // Wind Direction(and possibly others) can be set so that we rotate the // direction to be relative to the north pole instead of grid relative. @@ -181,7 +174,7 @@ public class D2DGridResource extends GridResource implements crs2ll.transform(dp, dp); Coordinate ll = new Coordinate(dp.x, dp.y); float rot = (float) MapUtil.rotation(ll, geom); - dir = (dir + rot) % 360; + dir = (dir + rot + 180) % 360; data.getScalarData().put(index, dir); } } @@ -323,19 +316,4 @@ public class D2DGridResource extends GridResource implements super.project(crs); } - @Override - protected void resourceDataChanged(ChangeType type, Object updateObject) { - super.resourceDataChanged(type, updateObject); - if (type == ChangeType.CAPABILITY) { - if (updateObject instanceof ImagingCapability && reprojectedData) { - ImagingCapability capability = (ImagingCapability) updateObject; - if (lastInterpolationState == null - || capability.isInterpolationState() != lastInterpolationState) { - lastInterpolationState = capability.isInterpolationState(); - clearRequestedData(); - } - } - } - } - } diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java index 862861e277..a199f7f0e7 100644 --- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java +++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java @@ -56,9 +56,7 @@ import com.vividsolutions.jts.geom.Coordinate; * * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- - * Mar 9, 2011 bsteffen Initial creation - * Aug 27, 2013 #2287 randerso Removed 180 degree adjustment required by error - * in Maputil.rotation + * Mar 9, 2011 bsteffen Initial creation * * * @@ -249,8 +247,8 @@ public class GeneralGridData { Coordinate ll = new Coordinate(dp.x, dp.y); double rot = MapUtil.rotation(ll, newGeom); double rot2 = MapUtil.rotation(ll, gridGeometry); - double cos = Math.cos(Math.toRadians(rot - rot2)); - double sin = Math.sin(Math.toRadians(rot - rot2)); + double cos = Math.cos(Math.toRadians(180 + rot - rot2)); + double sin = Math.sin(Math.toRadians(180 + rot - rot2)); double u = udata[index]; double v = vdata[index]; udata[index] = (float) (cos * u - sin * v); diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/ConformalityUtil.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/ConformalityUtil.java index f81809bb7e..04bb98c6e4 100644 --- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/ConformalityUtil.java +++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/ConformalityUtil.java @@ -35,8 +35,7 @@ import org.opengis.referencing.operation.TransformException; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * 06/19/2012 14988 D. Friedman Initial revision - * 09/24/2013 DR 15972 D. Friedman Do not require contiguous mapping. - * + * * */ public class ConformalityUtil { @@ -97,17 +96,11 @@ public class ConformalityUtil { if (! evaluateNonContig(evaluatedDomain)) { System.out.format("%s -> %s : not contiguous?\n", sourceGG, destGG); return false; - /* - * This test is not necessary for AWIPS II because it can cope - * with non-contiguous mappings. - */ - /* } else if (maxRatio/minRatio > maxRatioRatio || (minRatio > 0 && maxRatio/minRatio > maxRatioRatio) || // ? (minRatio < 0 && minRatio/maxRatio > maxRatioRatio)) { System.out.format("%s -> %s : not conformal enough somehow\n", sourceGG, destGG); return false; - */ } else { System.out.format("%s -> %s : conformal enough (%f, %f)\n", sourceGG, destGG, rr, maxRatio/minRatio); diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/ReprojectionUtil.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/ReprojectionUtil.java deleted file mode 100644 index 6830ec8725..0000000000 --- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/ReprojectionUtil.java +++ /dev/null @@ -1,159 +0,0 @@ -package com.raytheon.viz.grid.util; - -import java.util.regex.Pattern; - -import org.geotools.coverage.grid.GeneralGridGeometry; -import org.geotools.referencing.CRS; -import org.geotools.referencing.operation.projection.MapProjection; -import org.opengis.referencing.crs.CoordinateReferenceSystem; - -import com.raytheon.uf.common.dataplugin.grid.GridRecord; -import com.raytheon.uf.common.gridcoverage.GridCoverage; -import com.raytheon.uf.common.localization.AutoUpdatingLocalizationFile; -import com.raytheon.uf.common.localization.AutoUpdatingLocalizationFile.AutoUpdatingFileChangedListener; -import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType; -import com.raytheon.uf.common.localization.exception.LocalizationException; -import com.raytheon.uf.common.serialization.JAXBManager; -import com.raytheon.uf.common.status.IUFStatusHandler; -import com.raytheon.uf.common.status.UFStatus; -import com.raytheon.uf.common.status.UFStatus.Priority; -import com.raytheon.uf.viz.core.rsc.DisplayType; -import com.raytheon.viz.grid.xml.GridReprojectionRules; -import com.raytheon.viz.grid.xml.GridReprojectionRules.Reproject; -import com.raytheon.viz.grid.xml.GridReprojectionRules.Rule; - -/** - * Determines if a grid should be reprojected based display properties and - * a configuration file. - * - *
- *
- * SOFTWARE HISTORY
- * Date         Ticket#    Engineer         Description
- * ------------ ---------- ---------------- --------------------------
- * Sep 23, 2013 DR 15972   D. Friedman      Initial creation
- *
- * 
- * - */ -public class ReprojectionUtil { - private static final String RULES_PATH = "styleRules/gridReprojectionRules.xml"; - - private static final transient IUFStatusHandler statusHandler = UFStatus.getHandler(ReprojectionUtil.class); - - private static ReprojectionUtil instance; - - static ReprojectionUtil getInstance() { - if (instance == null) { - synchronized (ReprojectionUtil.class) { - if (instance == null) - instance = new ReprojectionUtil(); - } - } - return instance; - } - - GridReprojectionRules rules; - AutoUpdatingLocalizationFile file; - boolean fileChanged = false; - - public static boolean shouldReproject(GridRecord record, DisplayType displayType, GeneralGridGeometry dstGridGeometry) { - GridReprojectionRules rules = getInstance().getRules(); - if (rules != null) { - for (Rule rule : rules.getRules()) { - if (matches(rule, record, displayType, dstGridGeometry)) { - Reproject reproject = rule.getReproject(); - if (reproject == Reproject.ALWAYS) { - return true; - } else if (reproject == Reproject.NEVER) { - return false; - } else if (reproject == Reproject.TEST || reproject == null) { - return !ConformalityUtil.testConformality(record - .getLocation().getGridGeometry(), - dstGridGeometry); - } else { - throw new RuntimeException( - String.format("Unknown reprojection behavior " - + reproject)); - } - } - } - } - return false; - } - - private static boolean matches(Rule rule, GridRecord record, DisplayType displayType, - GeneralGridGeometry dstGridGeometry) { - return matches(rule.getModelName(), record.getDatasetId()) && - matches(rule.getSrcProjection(), getProjectionName(record.getLocation())) && - matches(rule.getDstProjection(), getProjectionName(dstGridGeometry)) && - matches(rule.getDisplayType(), displayType.toString()); - } - - private static boolean matches(String pattern, String value) { - if (pattern == null) - return true; - return Pattern.matches(pattern, value != null ? value : ""); - } - - private static String getProjectionName(GridCoverage coverage) { - return coverage != null ? getProjectionName(coverage.getCrs()) : null; - } - - private static String getProjectionName(GeneralGridGeometry gridGeometry) { - return gridGeometry != null ? getProjectionName(gridGeometry.getCoordinateReferenceSystem()) : null; - } - - private static String getProjectionName(CoordinateReferenceSystem crs) { - MapProjection projection = CRS.getMapProjection(crs); - return projection != null ? projection.getName() : null; - } - - public GridReprojectionRules getRules() { - try { - synchronized(this) { - if (checkFileChanged()) { - GridReprojectionRules newRules = file.loadObject( - new JAXBManager(GridReprojectionRules.class), - GridReprojectionRules.class); - if (newRules == null) - throw new LocalizationException("No " + RULES_PATH + "found"); - rules = newRules; - } - } - } catch (Exception e) { - statusHandler.handle( - Priority.PROBLEM, - "Error occurred loading grid reproject rules", - e); - } - return rules; - } - - private synchronized boolean checkFileChanged() throws LocalizationException { - if (file == null) { - file = new AutoUpdatingLocalizationFile(RULES_PATH, LocalizationType.CAVE_STATIC); - file.addListener(new AutoUpdatingFileChangedListener() { - @Override - public void fileChanged(AutoUpdatingLocalizationFile file) { - synchronized (ReprojectionUtil.this) { - fileChanged = true; - }; - } - }); - return true; - } else { - /* - * Only return true once per noticed file changed (and not after the - * file has been read.) This is done to prevent a flood of AlertViz - * errors if there is something wrong with the file. - */ - if (fileChanged) { - fileChanged = false; - return true; - } else { - return false; - } - } - } -} diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/xml/GridReprojectionRules.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/xml/GridReprojectionRules.java deleted file mode 100644 index 575397e7d7..0000000000 --- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/xml/GridReprojectionRules.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.raytheon.viz.grid.xml; - -import java.util.ArrayList; -import java.util.List; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; - -/** - * Container for a list of rules that describe how gridded data should be - * re-projected on various map projections. - * - *
- *
- * SOFTWARE HISTORY
- * Date         Ticket#    Engineer         Description
- * ------------ ---------- ---------------- --------------------------
- * Sep 23, 2013 DR 15972   D. Friedman      Initial creation
- *
- * 
- * - */ -@XmlRootElement() -@XmlAccessorType(XmlAccessType.NONE) -public class GridReprojectionRules { - public static enum Reproject { - ALWAYS, NEVER, TEST - } - - @XmlAccessorType(XmlAccessType.NONE) - public static class Rule { - @XmlAttribute - private String modelName; - @XmlAttribute - private String displayType; - @XmlAttribute - private String srcProjection; - @XmlAttribute - private String dstProjection; - @XmlAttribute - private Reproject reproject; - - public String getModelName() { - return modelName; - } - public void setModelName(String modelName) { - this.modelName = modelName; - } - public String getDisplayType() { - return displayType; - } - public void setDisplayType(String displayType) { - this.displayType = displayType; - } - public String getSrcProjection() { - return srcProjection; - } - public void setSrcProjection(String srcProjection) { - this.srcProjection = srcProjection; - } - public String getDstProjection() { - return dstProjection; - } - public void setDstProjection(String dstProjection) { - this.dstProjection = dstProjection; - } - public Reproject getReproject() { - return reproject; - } - public void setReproject(Reproject reproject) { - this.reproject = reproject; - } - } - - @XmlElement(name = "rule") - private List rules = new ArrayList(0); - - public List getRules() { - return rules; - } - -} diff --git a/cave/com.raytheon.viz.hydro/localization/bundles/hydro/FFGLmosaic.xml b/cave/com.raytheon.viz.hydro/localization/bundles/hydro/FFGLmosaic.xml index bf3fa18b8a..d57a5a8bd5 100644 --- a/cave/com.raytheon.viz.hydro/localization/bundles/hydro/FFGLmosaic.xml +++ b/cave/com.raytheon.viz.hydro/localization/bundles/hydro/FFGLmosaic.xml @@ -47,7 +47,7 @@ - @@ -321,7 +321,7 @@ - + diff --git a/cave/com.raytheon.viz.hydro/localization/menus/hydro/baseRFCffg.xml b/cave/com.raytheon.viz.hydro/localization/menus/hydro/baseRFCffg.xml index af67408d8a..32645f7fbf 100644 --- a/cave/com.raytheon.viz.hydro/localization/menus/hydro/baseRFCffg.xml +++ b/cave/com.raytheon.viz.hydro/localization/menus/hydro/baseRFCffg.xml @@ -246,19 +246,19 @@ menuText="1hr FFG" id="OH1hrFFG"> /grib/%/FFG-TIR/FFG0124hr/% - + - /grib/%/FFG-TIR/FFG0324hr/% + /grib/%/FFG-TIR-HiRes/FFG0324hr/% - + - /grib/%/FFG-TIR/FFG0624hr/% + /grib/%/FFG-TIR-HiRes/FFG0624hr/% - + diff --git a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java index e1ee47e9e6..9ef86a4890 100644 --- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java +++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java @@ -76,9 +76,7 @@ import com.raytheon.viz.mpe.ui.rsc.MPEFieldResourceData.MPEFieldFrame; * Nov 29, 2012 mschenke Initial creation * May 28, 2013 15971 lbousaidi change the reading hour for SATPRE * since the start time in the file is one - * hour less than the file time stamp. - * Sep 17, 2013 16563 snaples Updated createFrameImage to handle trace precip - * properly when mapping to screen. + * hour less than the file time stamp. * * * @@ -150,7 +148,6 @@ public class MPEFieldResource extends * @param frame * @return */ - @SuppressWarnings("incomplete-switch") private short[] getEditedData(MPEFieldFrame frame) { short[] editedData = frame.getEditedData(); if (editedData != null) { @@ -416,42 +413,16 @@ public class MPEFieldResource extends .getColorMapParameters(); UnitConverter dataToImage = params.getDataToImageConverter(); short[] data = getEditedData(frame); - DisplayFieldData cvuse = resourceData.getFieldData(); int length = data.length; short[] imageData = new short[length]; - switch (cvuse) { - case Locbias: - case Height: - case Index: - case Locspan: - case mintempPrism: - case maxtempPrism: - for (int i = 0; i < length; ++i) { - short value = data[i]; - if (value == MISSING_VALUE) { - imageData[i] = 0; - } else { - imageData[i] = (short) dataToImage.convert(value); - } - } - break; - - default : - for (int i = 0; i < length; ++i) { - short value = data[i]; - if (value == MISSING_VALUE) { - imageData[i] = 0; - } else if(value <= 0){ - imageData[i] = 1; - } else if(value > 0 && value < 25){ - value = 10; - imageData[i] = (short) dataToImage.convert(value); - } else { - imageData[i] = (short) dataToImage.convert(value); - } - } - break; + for (int i = 0; i < length; ++i) { + short value = data[i]; + if (value == MISSING_VALUE) { + imageData[i] = 0; + } else { + imageData[i] = (short) dataToImage.convert(value); } + } return new GriddedImageDisplay2(ShortBuffer.wrap(imageData), gridGeometry, this); } diff --git a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResourceData.java b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResourceData.java index 65a9deaab5..e6cfaeaee9 100644 --- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResourceData.java +++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResourceData.java @@ -275,9 +275,8 @@ public class MPEFieldResourceData extends AbstractMPEGriddedResourceData { case mintempPrism: case maxtempPrism: return NonSI.FAHRENHEIT; - default: - return NonSI.INCH; } + return NonSI.INCH; } public static Unit getDataUnitsForField(DisplayFieldData fieldData) { @@ -294,9 +293,7 @@ public class MPEFieldResourceData extends AbstractMPEGriddedResourceData { case mintempPrism: case maxtempPrism: return NonSI.FAHRENHEIT.divide(10); - - default : - return SI.MILLIMETER.divide(100); } + return SI.MILLIMETER.divide(100); } } diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java index 41c132c1fb..ddb376e3a2 100644 --- a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java +++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java @@ -96,7 +96,6 @@ import com.vividsolutions.jts.geom.Coordinate; * Jun 06, 2013 2072 bsteffen Fix concurrency problems when init is * called before time matching is done. * Jun 25, 2013 1869 bsteffen Fix plot sampling. - * Sep 04, 2013 16519 kshresth Fix Metar Display Problem * * * @@ -349,19 +348,6 @@ public class PlotResource2 extends plots.put(normTime, list); } list.add(info); - - // Sort this data in "backwards" so that the most recent observation - // for a particular station display correctly - Collections.sort(list, new Comparator() { - - @Override - public int compare(PlotInfo o1, PlotInfo o2) { - return o1.dataTime.compareTo(o2.dataTime); - } - }); - - Collections.reverse(list); - } } @@ -427,7 +413,7 @@ public class PlotResource2 extends samplePlot[0] = plot; List list = new ArrayList(); list.add(samplePlot); - Params params = Params.PLOT_AND_SAMPLE; + Params params = Params.SAMPLE_ONLY; GetDataTask task = new GetDataTask(list, params); generator.queueStation(task); // End DR14996 diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/util/PointDataCubeAdapter.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/util/PointDataCubeAdapter.java index f4b5d0437d..8dc020a32f 100644 --- a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/util/PointDataCubeAdapter.java +++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/util/PointDataCubeAdapter.java @@ -89,7 +89,7 @@ public class PointDataCubeAdapter implements IDataCubeAdapter { "bufrascat", "poessounding", "profiler", "bufrua", "ldadmesonet", "ldadhydro", "qc", "fssobs", "bufrmosAVN", "bufrmosETA", "bufrmosGFS", "bufrmosHPC", "bufrmosLAMP", "bufrmosMRF", - "bufrmosNGM", "ncairep", "ncpirep", "nctaf" }; + "bufrmosNGM" }; protected AbstractPointDataInventory inventory; diff --git a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/EmergencyConfirmationMsg.java b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/EmergencyConfirmationMsg.java index 84ea2d9712..52540b778c 100644 --- a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/EmergencyConfirmationMsg.java +++ b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/EmergencyConfirmationMsg.java @@ -27,7 +27,6 @@ import com.raytheon.uf.common.activetable.ActiveTableMode; import com.raytheon.uf.common.activetable.ActiveTableRecord; import com.raytheon.uf.common.activetable.GetActiveTableRequest; import com.raytheon.uf.common.activetable.GetActiveTableResponse; -import com.raytheon.uf.common.dataplugin.warning.EmergencyType; import com.raytheon.uf.common.dataplugin.warning.WarningRecord.WarningAction; import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.UFStatus; @@ -49,7 +48,6 @@ import com.raytheon.viz.texteditor.util.VtecUtil; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Jul 23, 2013 2176 jsanchez Initial creation - * Sep 4, 2013 2176 jsanchez Moved EmergencyType to a public class. * * * @@ -64,6 +62,38 @@ public class EmergencyConfirmationMsg implements IWarnGenConfirmationable { private String productMessage; + private static class EmergencyType { + + private static final EmergencyType TORNADO = new EmergencyType( + "TORNADO EMERGENCY", "TO.W"); + + private static final EmergencyType FLASH_FLOOD = new EmergencyType( + "FLASH FLOOD EMERGENCY", "FF.W"); + + private final String value; + + private final String phensig; + + private final static EmergencyType[] values = new EmergencyType[] { + TORNADO, FLASH_FLOOD }; + + private EmergencyType(String type, String phensig) { + this.value = type; + this.phensig = phensig; + } + + public static EmergencyType valueOf(String phensig) { + EmergencyType type = null; + for (EmergencyType t : values) { + if (t.phensig.equals(phensig)) { + type = t; + break; + } + } + return type; + } + }; + /** * Orders the ActiveTableRecord based on the issue time (ascending) */ @@ -96,11 +126,11 @@ public class EmergencyConfirmationMsg implements IWarnGenConfirmationable { // Check if the warning product is a valid EmergencyType. if (type != null) { - boolean currentEmergency = EmergencyType.isEmergency(body); + boolean currentEmergency = body.contains("EMERGENCY"); if (action == WarningAction.NEW && currentEmergency) { // Only occurs when the warning is first issued and not any // other action - productMessage = "This is a " + type.getValue(); + productMessage = "This is a " + type.value; } else if (action == WarningAction.CON || action == WarningAction.EXT || action == WarningAction.CANCON) { @@ -129,14 +159,14 @@ public class EmergencyConfirmationMsg implements IWarnGenConfirmationable { new ActiveTableRecordComparator()); ActiveTableRecord record = records .get(records.size() - 1); - boolean wasEmergency = EmergencyType.isEmergency(record - .getRawmessage()); + boolean wasEmergency = record.getRawmessage().contains( + "EMERGENCY"); if (!wasEmergency && currentEmergency) { productMessage = "This is an upgrade of a " - + type.getValue(); + + type.value; } else if (wasEmergency && !currentEmergency) { productMessage = "This is a downgrade of a " - + type.getValue(); + + type.value; } } } catch (VizException e) { diff --git a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java index f933aa7674..6ab357941e 100644 --- a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java +++ b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java @@ -44,6 +44,7 @@ import java.util.Scanner; import java.util.TimeZone; import java.util.Timer; import java.util.TimerTask; +import java.util.concurrent.atomic.AtomicInteger; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -330,7 +331,7 @@ import com.raytheon.viz.ui.dialogs.SWTMessageBox; * 25July2013 15733 GHull Read font and color prefs from TextEditorCfg. * 23Aug2013 DR 16514 D. Friedman Fix handling of completed product requests. Do not change * command history or close browser window for "update obs". - * 04Sep2013 2176 jsanchez Changed the order of the QC check dialogs. + * * * * @author lvenable @@ -2951,23 +2952,20 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener, * The font size sub menu. */ private void createFontSizeSubMenu(Menu fontSizeSubMenu) { - - FontSizeCfg fontSizeCfg = TextEditorCfg.getTextEditorCfg() - .getFontSizeCfg(); - SizeButtonCfg seldFontBtn = TextEditorCfg.getTextEditorCfg() - .getSelectedFontButton(); - + + FontSizeCfg fontSizeCfg = TextEditorCfg.getTextEditorCfg().getFontSizeCfg(); + SizeButtonCfg seldFontBtn = TextEditorCfg.getTextEditorCfg().getSelectedFontButton(); + for (SizeButtonCfg buttonCfg : fontSizeCfg.getButtons()) { MenuItem item = new MenuItem(fontSizeSubMenu, SWT.RADIO); item.setText(buttonCfg.getLabelName()); - item.setSelection(false); + item.setSelection( false ); item.setData(buttonCfg); - + // if this button is the initial selection. - if (seldFontBtn.getLabelName().equals(buttonCfg.getLabelName())) { + if( seldFontBtn.getLabelName().equals( buttonCfg.getLabelName() ) ) { item.setSelection(true); - setDefaultFont(seldFontBtn.getFontSize(), - seldFontBtn.getFontName()); + setDefaultFont( seldFontBtn.getFontSize(), seldFontBtn.getFontName() ); } item.addSelectionListener(new SelectionAdapter() { @@ -2975,12 +2973,10 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener, public void widgetSelected(SelectionEvent event) { MenuItem item = (MenuItem) event.getSource(); if (item.getSelection()) { - int selectFontSize = ((SizeButtonCfg) item.getData()) - .getFontSize(); - String seldFontName = ((SizeButtonCfg) item.getData()) - .getFontName(); - - setDefaultFont(selectFontSize, seldFontName); + int selectFontSize = ( (SizeButtonCfg) item.getData()).getFontSize(); + String seldFontName = ((SizeButtonCfg) item.getData()).getFontName(); + + setDefaultFont( selectFontSize, seldFontName ); textEditor.setFont(dftFont); headerTF.setFont(dftFont); @@ -2991,8 +2987,8 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener, } - public void setDefaultFont(int fontSize, String fontName) { - dftFont = new Font(getDisplay(), fontName, fontSize, SWT.NORMAL); + public void setDefaultFont( int fontSize, String fontName ) { + dftFont = new Font( getDisplay(), fontName, fontSize, SWT.NORMAL); } /** @@ -3727,7 +3723,7 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener, GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true); textEditorComp = new Composite(shell, SWT.NONE); GridLayout gridLayout = new GridLayout(1, false); - // TextColorsCfg textColorCfg = null; +// TextColorsCfg textColorCfg = null; textEditorComp.setLayout(gridLayout); textEditorComp.setLayoutData(gd); @@ -3749,8 +3745,8 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener, airportToolTip = new DefaultToolTip(textEditor, SWT.DEFAULT, true); textEditor.setKeyBinding(SWT.INSERT, SWT.NULL); // DR 7826 - // textColorCfg = getTextColorCfg(); - setDefaultTextColor(TextEditorCfg.getTextEditorCfg()); +// textColorCfg = getTextColorCfg(); + setDefaultTextColor( TextEditorCfg.getTextEditorCfg() ); textEditor.setForeground(textForeground); textEditor.setBackground(textBackground); @@ -3952,46 +3948,42 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener, }); } - // private TextColorsCfg getTextColorCfg() { - // TextColorsCfg textColorsCfg = - // TextEditorCfg.getTextEditorCfg().getTextColorsCfg(); - // - // // Perform Sanity Checks on configuration. - // StringBuilder message = new StringBuilder(); - // - // for (TextColorElement textElm : textColorsCfg.getTextColorElements()) { - // String prmtName = textElm.getParamName(); - // if (prmtName == null) { - // message.append("Item \"paramName\" problem!\n"); - // - // } - // - // if( textElm.getColor() == null ) { - // message.append("Item \"color\" data enter problem!\n"); - // } - // - // if (message.length() > 0) { - // message.insert(0, "TextColorsCfg broblem(s): "); - // IUFStatusHandler statusHandler = UFStatus - // .getHandler(TextEditorDialog.class); - // statusHandler.handle(Priority.PROBLEM, message.toString()); - // } - // - // } - // - // return textColorsCfg; - // } +// private TextColorsCfg getTextColorCfg() { +// TextColorsCfg textColorsCfg = TextEditorCfg.getTextEditorCfg().getTextColorsCfg(); +// +// // Perform Sanity Checks on configuration. +// StringBuilder message = new StringBuilder(); +// +// for (TextColorElement textElm : textColorsCfg.getTextColorElements()) { +// String prmtName = textElm.getParamName(); +// if (prmtName == null) { +// message.append("Item \"paramName\" problem!\n"); +// +// } +// +// if( textElm.getColor() == null ) { +// message.append("Item \"color\" data enter problem!\n"); +// } +// +// if (message.length() > 0) { +// message.insert(0, "TextColorsCfg broblem(s): "); +// IUFStatusHandler statusHandler = UFStatus +// .getHandler(TextEditorDialog.class); +// statusHandler.handle(Priority.PROBLEM, message.toString()); +// } +// +// } +// +// return textColorsCfg; +// } - private void setDefaultTextColor(TextEditorCfg txtClrCfg) { - - textBackground = new Color(shell.getDisplay(), - txtClrCfg.getTextBackgroundColor()); - textForeground = new Color(shell.getDisplay(), - txtClrCfg.getTextForegroundColor()); - highlightBackground = new Color(shell.getDisplay(), - txtClrCfg.getHighlightTextBackgroundColor()); - highlightForeground = new Color(shell.getDisplay(), - txtClrCfg.getHighlightTextForegroundColor()); + + private void setDefaultTextColor(TextEditorCfg txtClrCfg ) { + + textBackground = new Color( shell.getDisplay(), txtClrCfg.getTextBackgroundColor() ); + textForeground = new Color(shell.getDisplay(), txtClrCfg.getTextForegroundColor() ); + highlightBackground = new Color(shell.getDisplay(), txtClrCfg.getHighlightTextBackgroundColor() ); + highlightForeground = new Color(shell.getDisplay(), txtClrCfg.getHighlightTextForegroundColor() ); } /** @@ -4866,14 +4858,14 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener, @Override public void dialogClosed(Object returnValue) { if (Boolean.TRUE.equals(returnValue)) { - finishSendProduct(resend); + checkEmergencyProduct(resend); } } }); wgcd.open(); } else { - finishSendProduct(resend); + checkEmergencyProduct(resend); } } else { finishSendProduct(resend); @@ -4923,7 +4915,7 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener, @Override public void dialogClosed(Object returnValue) { if (Boolean.TRUE.equals(returnValue)) { - checkEmergencyProduct(resend); + warngenCloseCallback(resend); } } }); @@ -4951,14 +4943,14 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener, @Override public void dialogClosed(Object returnValue) { if (Boolean.TRUE.equals(returnValue)) { - warngenCloseCallback(resend); + finishSendProduct(resend); } } }); wgcd.open(); } else { - warngenCloseCallback(resend); + finishSendProduct(resend); } } @@ -5911,7 +5903,7 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener, return; } - if (!isObsUpdated) { + if (! isObsUpdated) { if (browser != null) { browser.close(); browser = null; @@ -6105,7 +6097,7 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener, private void postExecute(boolean hasAttachment, boolean enterEditor, boolean validExecuteCommand, String attachedFilename) { if (!this.isDisposed()) { - if (!productQueryJob.isExpectingRequests()) { + if (! productQueryJob.isExpectingRequests()) { if (hasAttachment) { statusBarLabel.setText("Attachment: " + attachedFilename); } else { diff --git a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml index b4db8bdd7a..dbd226f9bf 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml @@ -80,7 +80,6 @@ - diff --git a/cave/com.raytheon.viz.warngen/plugin.xml b/cave/com.raytheon.viz.warngen/plugin.xml index c64627dc7c..22ea540c16 100644 --- a/cave/com.raytheon.viz.warngen/plugin.xml +++ b/cave/com.raytheon.viz.warngen/plugin.xml @@ -48,7 +48,7 @@ + locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions"> * @@ -59,7 +58,6 @@ import com.raytheon.viz.texteditor.util.SiteAbbreviationUtil; * 01Jun2010 2187 cjeanbap Added operational mode functionality * 02Aug2010 2187 cjeanbap Update variable/method signature to be consistent. * 04Oct2010 7193 cjeanbap Add time-to-live value to MessageProducer. - * Sep 13, 2013 2368 rjpeter Set delivery mode to PERSISTENT. * * * @author mschenke @@ -67,208 +65,209 @@ import com.raytheon.viz.texteditor.util.SiteAbbreviationUtil; */ public class WarningSender implements IWarngenObserver { - private static final transient IUFStatusHandler statusHandler = UFStatus - .getHandler(WarningSender.class); + private static final transient IUFStatusHandler statusHandler = UFStatus + .getHandler(WarningSender.class); - private final String hostName = null; + private String hostName = null; - private boolean notifyError; + private boolean notifyError; - private static final long MILLISECONDS_PER_SECOND = 1000; + private static final long MILLISECONDS_PER_SECOND = 1000; - private static final long SECONDS_PER_MINUTE = 60; + private static final long SECONDS_PER_MINUTE = 60; - private static final long TTL_MINUTES = 5; + private static final long TTL_MINUTES = 5; - private static Pattern PATTERN = Pattern.compile("(\\d{1,1})"); + private static Pattern PATTERN = Pattern.compile("(\\d{1,1})"); - private static final SimpleDateFormat sdf; + private static final SimpleDateFormat sdf; - static { - sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); - sdf.setTimeZone(TimeZone.getTimeZone("GMT")); - } + static { + sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); + sdf.setTimeZone(TimeZone.getTimeZone("GMT")); + } - /* - * (non-Javadoc) Incoming message was not a binary - * - * @see - * com.raytheon.viz.texteditor.msgs.IWarngenObserver#setTextWarngenDisplay - * (java.lang.String) - */ - @Override - public void setTextWarngenDisplay(String warning, boolean ne) { - this.notifyError = ne; + /* + * (non-Javadoc) Incoming message was not a binary + * + * @see + * com.raytheon.viz.texteditor.msgs.IWarngenObserver#setTextWarngenDisplay + * (java.lang.String) + */ + @Override + public void setTextWarngenDisplay(String warning, boolean ne) { + this.notifyError = ne; - String number = "0"; - String host = TextWorkstationConstants.getId(); - long t0 = System.currentTimeMillis(); - String siteNode = SiteAbbreviationUtil.getSiteNode(LocalizationManager - .getInstance().getCurrentSite()); - statusHandler.debug("Get site node time: " - + (System.currentTimeMillis() - t0)); - if (host == null) { - statusHandler.handle(Priority.ERROR, - "Text Workstation host not set in preferences."); - } else { - Matcher m = PATTERN.matcher(host); - if (m.find()) { - number = m.group(); - } - } + String number = "0"; + String host = TextWorkstationConstants.getId(); + long t0 = System.currentTimeMillis(); + String siteNode = SiteAbbreviationUtil.getSiteNode(LocalizationManager + .getInstance().getCurrentSite()); + System.out.println("Get site node time: " + + (System.currentTimeMillis() - t0)); + if (host == null) { + statusHandler.handle(Priority.ERROR, + "Text Workstation host not set in preferences."); + } else { + Matcher m = PATTERN.matcher(host); + if (m.find()) { + number = m.group(); + } + } - String id = siteNode + "WRKWG" + number; - boolean sentToTextDatabase = false; + String id = siteNode + "WRKWG" + number; + boolean sentToTextDatabase = false; - try { - boolean messageNotSent = true; - int connectCount = 0; - t0 = System.currentTimeMillis(); - byte[] data = SerializationUtil.transformToThrift(id + ":" - + warning); - while (messageNotSent && (connectCount < 4)) { - Session s = null; - MessageProducer mp = null; - Connection conn = null; - try { - conn = JMSConnection.getInstance().getFactory() - .createConnection(); - s = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE); - mp = s.createProducer(s - .createQueue(TextWorkstationConstants - .getDestinationTextWorkstationQueueName())); - mp.setTimeToLive(TTL_MINUTES * SECONDS_PER_MINUTE - * MILLISECONDS_PER_SECOND); - BytesMessage m = s.createBytesMessage(); - m.writeBytes(data); - m.setJMSDeliveryMode(DeliveryMode.PERSISTENT); - mp.send(m); - long t1 = System.currentTimeMillis(); - statusHandler.debug(id + " sent to text workstation in " - + (t1 - t0) + "ms in " + (connectCount + 1) - + (connectCount > 0 ? " tries" : " try")); - messageNotSent = false; - } catch (JMSException e) { - if (notifyError) { - statusHandler - .handle(Priority.PROBLEM, - "Error trying to send product [" - + id - + "] to Text Workstation. Attempting to reconnect. ", - e); - notifyError = false; - } - } finally { - if (mp != null) { - try { - mp.close(); - mp = null; - } catch (Exception e) { - mp = null; - } - } - if (s != null) { - try { - s.close(); - s = null; - } catch (Exception e) { - s = null; - } - } - if (conn != null) { - try { - conn.close(); - conn = null; - } catch (Exception e) { - conn = null; - } - } - } - if (messageNotSent) { - if (!sentToTextDatabase) { - try { - sendToTextDatabase(id, warning); - sentToTextDatabase = true; - } catch (Exception e) { - statusHandler.handle(Priority.PROBLEM, - "Error trying to save product [" + id - + "] to Text Database: ", e); - } - } + try { + boolean messageNotSent = true; + int connectCount = 0; + t0 = System.currentTimeMillis(); + byte[] data = SerializationUtil.transformToThrift(id + ":" + + warning); + while (messageNotSent && connectCount < 4) { + Session s = null; + MessageProducer mp = null; + Connection conn = null; + try { + conn = JMSConnection.getInstance().getFactory() + .createConnection(); + s = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE); + mp = s.createProducer(s + .createQueue(TextWorkstationConstants + .getDestinationTextWorkstationQueueName())); + mp.setTimeToLive(TTL_MINUTES * SECONDS_PER_MINUTE + * MILLISECONDS_PER_SECOND); + BytesMessage m = s.createBytesMessage(); + m.writeBytes(data); + mp.send(m); + long t1 = System.currentTimeMillis(); + System.out.println(WarningSender.getCurTimeString() + ": " + + id + " sent to text workstation in " + (t1 - t0) + + "ms in " + (connectCount + 1) + + (connectCount > 0 ? " tries" : " try")); + messageNotSent = false; + } catch (JMSException e) { + if (notifyError) { + statusHandler + .handle(Priority.PROBLEM, + "Error trying to send product [" + + id + + "] to Text Workstation. Attempting to reconnect. ", + e); + notifyError = false; + } + } finally { + if (mp != null) { + try { + mp.close(); + mp = null; + } catch (Exception e) { + mp = null; + } + } + if (s != null) { + try { + s.close(); + s = null; + } catch (Exception e) { + s = null; + } + } + if (conn != null) { + try { + conn.close(); + conn = null; + } catch (Exception e) { + conn = null; + } + } + } + if (messageNotSent) { + if (!sentToTextDatabase) { + try { + sendToTextDatabase(id, warning); + sentToTextDatabase = true; + } catch (Exception e) { + statusHandler.handle(Priority.PROBLEM, + "Error trying to save product [" + id + + "] to Text Database: ", e); + } + } - connectCount++; - switch (connectCount) { - case 1: - Thread.sleep(1000); - break; - case 2: - Thread.sleep(5 * 1000); - break; - case 3: - Thread.sleep(30 * 1000); - break; - case 4: - statusHandler.handle(Priority.PROBLEM, - "Could not reconnect (" + id - + ") after 3 tries: "); - break; - } - } - } + connectCount++; + switch (connectCount) { + case 1: + Thread.sleep(1000); + break; + case 2: + Thread.sleep(5 * 1000); + break; + case 3: + Thread.sleep(30 * 1000); + break; + case 4: + statusHandler.handle(Priority.PROBLEM, + "Could not reconnect (" + id + + ") after 3 tries: "); + break; + } + } + } - if (!sentToTextDatabase) { - try { - sendToTextDatabase(id, warning); - sentToTextDatabase = true; - } catch (Exception e) { - statusHandler.handle(Priority.PROBLEM, - "Error trying to save product [" + id - + "] to Text Database: ", e); - } - } - } catch (UnknownHostException uhe) { - if (notifyError) { - statusHandler.handle(Priority.PROBLEM, - "unable to map hostname, " + hostName - + ", to an ip address", uhe); - notifyError = false; - } + if (!sentToTextDatabase) { + try { + sendToTextDatabase(id, warning); + sentToTextDatabase = true; + } catch (Exception e) { + statusHandler.handle(Priority.PROBLEM, + "Error trying to save product [" + id + + "] to Text Database: ", e); + } + } + } catch (UnknownHostException uhe) { + if (notifyError) { + statusHandler.handle(Priority.PROBLEM, + "unable to map hostname, " + hostName + + ", to an ip address", uhe); + notifyError = false; + } - } catch (Exception e) { - statusHandler.handle(Priority.PROBLEM, - "Error trying to send product [" + id - + "] to Text Workstation: ", e); - } + } catch (Exception e) { + statusHandler.handle(Priority.PROBLEM, + "Error trying to send product [" + id + + "] to Text Workstation: ", e); + } - } + } - /** - * Saves a product to the text database. - * - * @param id - * @param warning - * @throws VizException - */ - public static void sendToTextDatabase(String id, String warning) - throws VizException { - CAVEMode mode = CAVEMode.getMode(); - boolean operationalMode = (CAVEMode.OPERATIONAL.equals(mode) - || CAVEMode.TEST.equals(mode) ? true : false); + /** + * Saves a product to the text database. + * + * @param id + * @param warning + * @throws VizException + */ + public static void sendToTextDatabase(String id, String warning) + throws VizException { + CAVEMode mode = CAVEMode.getMode(); + boolean operationalMode = (CAVEMode.OPERATIONAL.equals(mode) + || CAVEMode.TEST.equals(mode) ? true : false); - // Generate StdTextProduct and insert into db - long t0 = System.currentTimeMillis(); - ThriftClient.sendRequest(new InsertStdTextProductRequest(id, warning, - operationalMode)); + // Generate StdTextProduct and insert into db + long t0 = System.currentTimeMillis(); + ThriftClient.sendRequest(new InsertStdTextProductRequest(id, warning, + operationalMode)); - statusHandler.debug(id + " saved to textdb in " - + (System.currentTimeMillis() - t0) + "ms"); - } + System.out.println(WarningSender.getCurTimeString() + ": " + id + + " saved to textdb in " + (System.currentTimeMillis() - t0) + + "ms"); + } - public static String getCurTimeString() { - String rval = null; - synchronized (sdf) { - rval = sdf.format(new Date()); - } - return rval; - } + public static String getCurTimeString() { + String rval = null; + synchronized (sdf) { + rval = sdf.format(new Date()); + } + return rval; + } } diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java index f9a16efd4c..3e9e82b24f 100644 --- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java +++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java @@ -40,7 +40,6 @@ import com.vividsolutions.jts.geom.prep.PreparedGeometryFactory; * Mar 25, 2013 1605 jsanchez Set ClosestPoint's prepGeom. * Apr 24, 2013 1944 jsanchez Updated calculateLocationPortion visibility to public. * May 2, 2013 1963 jsanchez Referenced calculatePortion from GisUtil if intersection less than DEFAULT_PORTION_TOLERANCE. - * Sep 13, 2013 DR 16601 D. Friedman Fix from jsanchez: Allow cities outside the CWA. * * * @@ -157,6 +156,8 @@ public class DbAreaSourceDataAdaptor extends AbstractDbSourceDataAdaptor { filter = new HashMap(); } + filter.put(cwaField, new RequestConstraint(localizedSite)); + return filter; } diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/CoverageConstants.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/CoverageConstants.java index 64789b2751..f4bdae56b1 100644 --- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/CoverageConstants.java +++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/CoverageConstants.java @@ -29,7 +29,6 @@ package com.raytheon.viz.warngen.gis; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Aug 5, 2013 2177 jsanchez Initial creation - * Sep 22, 2013 2177 jsanchez Updated EW_MASK. * * * @@ -157,7 +156,7 @@ public class CoverageConstants { EW_MASK[i] = XEAST | EAST; } else if (i < 106) { EW_MASK[i] = WEST; - } else if (i > 148) { + } else if (i > 145) { EW_MASK[i] = EAST; } else if (i < 118) { EW_MASK[i] = CENTRAL_EW | WEST; diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java index c7f294da93..a5188b95d6 100644 --- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java +++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java @@ -38,7 +38,6 @@ import com.vividsolutions.jts.geom.Geometry; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Aug 5, 2013 2177 jsanchez Initial creation - * Sep 22, 2013 2177 jsanchez Updated logic. Used GisUtil for very small portions. * * * @@ -48,412 +47,425 @@ import com.vividsolutions.jts.geom.Geometry; public class PortionsUtil { - private GridUtil gridUtil; + private GridUtil gridUtil; - public PortionsUtil(WarngenLayer layer) throws Exception { - gridUtil = new GridUtil(layer, layer.getLocalGridGeometry(), - layer.getlocalToLatLon()); - } + public PortionsUtil(WarngenLayer layer) throws Exception { + gridUtil = new GridUtil(layer, layer.getLocalGridGeometry(), + layer.getlocalToLatLon()); + } - /** - * Determines the the appropriate portion description for the warnedArea - * intersecting the countyOrZone. - * - * @param entityID - * @param countyOrZone - * @param warnedArea - * @param useExtreme - * @return - * @throws Exception - */ - public EnumSet getPortions(String entityID, - Geometry countyOrZone, Geometry warnedArea, boolean useExtreme) - throws Exception { - countyOrZone.getUserData(); - EntityData entityData = gridUtil.calculateGrids(countyOrZone, - warnedArea); - EnumSet portions = null; - if (entityData.getMeanMask() == 0 || entityData.getCoverageMask() == 0 - || entityData.getMeanMask() == entityData.getCoverageMask()) { - // This takes into account the warned areas that are very small - // the convex hull of the warned area is used for case the - // warnedArea is a geometry collection. - portions = GisUtil.calculateLocationPortion(countyOrZone, - warnedArea.convexHull(), useExtreme); - } else { - portions = getAreaDesc(entityData.getMeanMask(), - entityData.getCoverageMask(), entityData.getOctants(), - useExtreme); - } - return suppressPortions(entityID, portions); - } + /** + * Determines the the appropriate portion description for the warnedArea + * intersecting the countyOrZone. + * + * @param entityID + * @param countyOrZone + * @param warnedArea + * @param useExtreme + * @return + * @throws Exception + */ + public EnumSet getPortions(String entityID, + Geometry countyOrZone, Geometry warnedArea, boolean useExtreme) + throws Exception { + countyOrZone.getUserData(); + EntityData entityData = gridUtil.calculateGrids(countyOrZone, + warnedArea); + EnumSet portions = getAreaDesc(entityData.getMeanMask(), + entityData.getCoverageMask(), entityData.getOctants(), + useExtreme); + return suppressPortions(entityID, portions); + } - /** - * Looks up if the designated entity ID has an suppressed directions. For - * example, a county or zone may not need to include the north and sound - * direction description if it was included in the area.suppress file. - * - * @param entityID - * @param portions - * @return - */ - private EnumSet suppressPortions(String entityID, - EnumSet portions) { - Map> suppressedCounties = SuppressMap - .getInstance().getAreas(); - if (entityID != null && suppressedCounties != null - && !suppressedCounties.isEmpty()) { - List suppressedDirections = suppressedCounties - .get(entityID.toUpperCase()); - if (suppressedDirections != null && !suppressedDirections.isEmpty()) { - portions.removeAll(suppressedDirections); - } - } + /** + * Looks up if the designated entity ID has an suppressed directions. For + * example, a county or zone may not need to include the north and sound + * direction description if it was included in the area.suppress file. + * + * @param entityID + * @param portions + * @return + */ + private EnumSet suppressPortions(String entityID, + EnumSet portions) { + Map> suppressedCounties = SuppressMap + .getInstance().getAreas(); + if (entityID != null && suppressedCounties != null + && !suppressedCounties.isEmpty()) { + List suppressedDirections = suppressedCounties + .get(entityID.toUpperCase()); + if (suppressedDirections != null && !suppressedDirections.isEmpty()) { + portions.removeAll(suppressedDirections); + } + } - return portions; - } + return portions; + } - /** - * Port from A1 code of GeoEntityLookupTable::getAreaDesc. - * - * @param meanMask - * @param areaMask - * @param octants - * @param exYes - */ - private static EnumSet getAreaDesc(int meanMask, int areaMask, - int octants, boolean exYes) { - EnumSet portions = EnumSet.noneOf(Direction.class); + /** + * Port from A1 code of GeoEntityLookupTable::getAreaDesc. + * + * @param meanMask + * @param areaMask + * @param octants + * @param exYes + */ + private static EnumSet getAreaDesc(int meanMask, int areaMask, + int octants, boolean exYes) { + EnumSet portions = EnumSet.noneOf(Direction.class); - // Test for case where we cannot do portions - if (meanMask == 0 || areaMask == 0) { - return portions; - } + // Test for case where we cannot do portions + if (meanMask == 0 || areaMask == 0) { + return portions; + } - // The next block of code is the original port of A1 code but prevented - // producing the correct result: - // Test for case where area is completely within one subsection. - // if (meanMask == areaMask) { - // return getPointDesc(meanMask, exYes); - // } + // The next block of code is the original port of A1 code but prevented + // producing the correct result: + // Test for case where area is completely within one subsection. + // if (meanMask == areaMask) { + // return getPointDesc(meanMask, exYes); + // } - // Test for central by not being near adjacent borders. - // Another possible case of a stripe across the middle. - if (octants == 0 - || ((octants & CoverageConstants.EXTREME_YES) == 0) - && (meanMask & CoverageConstants.CENTER) == CoverageConstants.CENTER) { - portions.add(Direction.CENTRAL); - return portions; - } + // Test for central by not being near adjacent borders. + if (octants == 0 + || ((octants & CoverageConstants.EXTREME_YES) == 0) + && (meanMask & CoverageConstants.CENTER) == CoverageConstants.CENTER) { + portions.add(Direction.CENTRAL); + return portions; + } - if ((octants & 0xFFFF) == 0xFFFF) { - return portions; - } + if ((octants & 0xFFFF) == 0xFFFF) { + return portions; + } - // Identify quadrants in use, q is typical, qq is diagonal. - int xoctant = octants >> 8; - int xxoctant = octants >> 16; - int nn, ss, ee, ww, ne, nw, se, sw; - nn = ss = ee = ww = ne = nw = se = sw = 0; - int omerge = xxoctant | xoctant | octants; - if ((omerge & (CoverageConstants.NNE | CoverageConstants.ENE)) != 0) { - ne = 1; - } - if ((omerge & (CoverageConstants.SSE | CoverageConstants.ESE)) != 0) { - se = 1; - } - if ((omerge & (CoverageConstants.NNW | CoverageConstants.WNW)) != 0) { - nw = 1; - } - if ((omerge & (CoverageConstants.SSW | CoverageConstants.WSW)) != 0) { - sw = 1; - } - if ((omerge & (CoverageConstants.NNE | CoverageConstants.NNW)) != 0) { - nn = 1; - } - if ((omerge & (CoverageConstants.SSE | CoverageConstants.SSW)) != 0) { - ss = 1; - } - if ((omerge & (CoverageConstants.WNW | CoverageConstants.WSW)) != 0) { - ww = 1; - } - if ((omerge & (CoverageConstants.ENE | CoverageConstants.ESE)) != 0) { - ee = 1; - } - if ((areaMask & CoverageConstants.NORTH_SOUTH) == 0) { - nn = ss = ne = nw = se = sw = 0; - } - if ((areaMask & CoverageConstants.EAST_WEST) == 0) { - ee = ww = ne = nw = se = sw = 0; - } - int q = ne + nw + se + sw; - int qq = nn + ss + ee + ww; + // Identify quadrants in use, q is typical, qq is diagonal. + int xoctant = octants >> 8; + int xxoctant = octants >> 16; + int nn, ss, ee, ww, ne, nw, se, sw; + nn = ss = ee = ww = ne = nw = se = sw = 0; + int omerge = xxoctant | xoctant | octants; + if ((omerge & (CoverageConstants.NNE | CoverageConstants.ENE)) > 0) { + ne = 1; + } + if ((omerge & (CoverageConstants.SSE | CoverageConstants.ESE)) > 0) { + se = 1; + } + if ((omerge & (CoverageConstants.NNW | CoverageConstants.WNW)) > 0) { + nw = 1; + } + if ((omerge & (CoverageConstants.SSW | CoverageConstants.WSW)) > 0) { + sw = 1; + } + if ((omerge & (CoverageConstants.NNE | CoverageConstants.NNW)) > 0) { + nn = 1; + } + if ((omerge & (CoverageConstants.SSE | CoverageConstants.SSW)) > 0) { + ss = 1; + } + if ((omerge & (CoverageConstants.WNW | CoverageConstants.WSW)) > 0) { + ww = 1; + } + if ((omerge & (CoverageConstants.ENE | CoverageConstants.ESE)) > 0) { + ee = 1; + } + if ((areaMask & CoverageConstants.NORTH_SOUTH) == 0) { + nn = ss = ne = nw = se = sw = 0; + } + if ((areaMask & CoverageConstants.EAST_WEST) == 0) { + ee = ww = ne = nw = se = sw = 0; + } + int q = ne + nw + se + sw; + int qq = nn + ss + ee + ww; - // Identify extremes in use. - int nnx, ssx, eex, wwx; - nnx = ssx = eex = wwx = 0; - if ((areaMask & CoverageConstants.XNORTH) != 0) { - nnx = 1; - } - if ((areaMask & CoverageConstants.XSOUTH) != 0) { - ssx = 1; - } - if ((areaMask & CoverageConstants.XWEST) != 0) { - wwx = 1; - } - if ((areaMask & CoverageConstants.XEAST) != 0) { - eex = 1; - } - int xxx = nnx + ssx + eex + wwx; + // Identify extremes in use. + int nnx, ssx, eex, wwx; + nnx = ssx = eex = wwx = 0; + if ((areaMask & CoverageConstants.XNORTH) > 0) { + nnx = 1; + } + if ((areaMask & CoverageConstants.XSOUTH) > 0) { + ssx = 1; + } + if ((areaMask & CoverageConstants.XWEST) > 0) { + wwx = 1; + } + if ((areaMask & CoverageConstants.XEAST) > 0) { + eex = 1; + } + int xxx = nnx + ssx + eex + wwx; - // Modify masks based on whether we can use extreme. - if ((octants & CoverageConstants.EXTREME_NO) != 0 - && (areaMask & CoverageConstants.EXTREME) != 0) { - areaMask &= CoverageConstants.NOT_EXTREME; - meanMask &= CoverageConstants.NOT_EXTREME; - } + // Modify masks based on whether we can use extreme. + if ((octants & CoverageConstants.EXTREME_NO) > 0 + && (areaMask & CoverageConstants.EXTREME) > 0) { + areaMask &= CoverageConstants.NOT_EXTREME; + meanMask &= CoverageConstants.NOT_EXTREME; + } - // Possible case of a stripe across the middle - if (q == 0) { - ;// Only one direction encoded - } else if (q == 2 && nw == se || q == 2 && ne == sw || qq == 2 - && nn == ss || qq == 2 && ee == ww) { - if ((meanMask & CoverageConstants.CENTRAL) == CoverageConstants.CENTRAL - || nnx == ssx && wwx == eex) { - portions.add(Direction.CENTRAL); - return portions; - } - return getPointDesc2(meanMask, exYes, nn, ss, ee, ww); - } + // Possible case of a stripe across the middle + if (q == 0) { + ;// Only one direction encoded + } else if (q == 2 && nw == se || q == 2 && ne == sw || qq == 2 + && nn == ss || qq == 2 && ee == ww) { + if ((meanMask & CoverageConstants.CENTRAL) == CoverageConstants.CENTRAL + || nnx == ssx && wwx == eex) { + portions.add(Direction.CENTRAL); + return portions; + } + return getPointDesc2(meanMask, exYes, nn, ss, ee, ww); + } - // Modify masks based on whether we can use central. - if (xxx > 2 || nnx != ssx && wwx != eex) { - areaMask &= CoverageConstants.NOT_CENTRAL; - meanMask &= CoverageConstants.NOT_CENTRAL; - } + // Modify masks based on whether we can use central. + if (xxx > 2 || nnx != ssx && wwx != eex) { + areaMask &= CoverageConstants.NOT_CENTRAL; + meanMask &= CoverageConstants.NOT_CENTRAL; + } - // All quadrants in use. - if (q == 4 && qq == 4) { - return EnumSet.noneOf(Direction.class); - } + // Another possible case of a stripe across the middle. + if (q == 4 && (meanMask & CoverageConstants.CENTER) > 0) { + portions.add(Direction.CENTRAL); + return portions; + } - // Only one typical quadrant in use. - if (q == 1) { - return getPointDesc2(meanMask, exYes, nn, ss, ee, ww); - } + // All quadrants in use. + if (q == 4 && qq == 4) { + return EnumSet.noneOf(Direction.class); + } - // Further modify masks based on whether we can use central. - if (xxx >= 2) { - areaMask &= CoverageConstants.NOT_CENTRAL; - meanMask &= CoverageConstants.NOT_CENTRAL; - } + // Only one typical quadrant in use. + if (q == 1) { + // if (ne == 1) { + // portions.add(Direction.NORTH); + // portions.add(Direction.EAST); + // } else if (nw == 1) { + // portions.add(Direction.NORTH); + // portions.add(Direction.WEST); + // } else if (se == 1) { + // portions.add(Direction.SOUTH); + // portions.add(Direction.EAST); + // } else if (sw == 1) { + // portions.add(Direction.SOUTH); + // portions.add(Direction.WEST); + // } + // return portions; + return getPointDesc2(meanMask, exYes, nn, ss, ee, ww); + } - // No more than two quadrants of any kind in use, or all quadrants. - if (q < 3 && qq < 3) { - if (nnx != ssx && wwx != eex - || (meanMask & CoverageConstants.CENTRAL) != 0) { - return getPointDesc2(meanMask, exYes, nn, ss, ee, ww); + // Further modify masks based on whether we can use central. + if (xxx >= 2) { + areaMask &= CoverageConstants.NOT_CENTRAL; + meanMask &= CoverageConstants.NOT_CENTRAL; + } - } else { - return getPointDesc2(areaMask, exYes, nn, ss, ee, ww); - } - } + // No more than two quadrants of any kind in use, or all quadrants. + if (q < 3 && qq < 3) { + if (nnx != ssx && wwx != eex + || (meanMask & CoverageConstants.CENTRAL) > 0) { + return getPointDesc2(meanMask, exYes, nn, ss, ee, ww); - // Three typical quadrants in use. - if (q == 3 && qq != 3) { + } else { + return getPointDesc2(areaMask, exYes, nn, ss, ee, ww); + } + } - if (ne == 0) { - // The next line is the original port of A1 code but prevented - // producing the correct result: - // if (ne == 0 && (xxoctant & (SSW | WSW)) != 0) { - portions.add(Direction.SOUTH); - portions.add(Direction.WEST); + // Three typical quadrants in use. + if (q == 3 && qq != 3) { - } else if (se == 0) { - // The next line is the original port of A1 code but prevented - // producing the correct result: - // } else if (se == 0 && (xxoctant & (NNW | WNW)) != 0) { - portions.add(Direction.NORTH); - portions.add(Direction.WEST); + if (ne == 0) { + // The next line is the original port of A1 code but prevented + // producing the correct result: + // if (ne == 0 && (xxoctant & (SSW | WSW)) > 0) { + portions.add(Direction.SOUTH); + portions.add(Direction.WEST); - } else if (nw == 0) { - // The next line is the original port of A1 code but prevented - // producing the correct result: - // } else if (nw == 0 && (xxoctant & (SSE | ESE)) != 0) { - portions.add(Direction.SOUTH); - portions.add(Direction.EAST); + } else if (se == 0) { + // The next line is the original port of A1 code but prevented + // producing the correct result: + // } else if (se == 0 && (xxoctant & (NNW | WNW)) > 0) { + portions.add(Direction.NORTH); + portions.add(Direction.WEST); - } else if (sw == 0) { - // The next line is the original port of A1 code but prevented - // producing the correct result: - // } else if (sw == 0 && (xxoctant & (NNE | ENE)) != 0) { - portions.add(Direction.NORTH); - portions.add(Direction.EAST); - } - // The next line is the original port of A1 code but prevented - // producing the correct result: - // return getPointDesc(meanMask, exYes); - } + } else if (nw == 0) { + // The next line is the original port of A1 code but prevented + // producing the correct result: + // } else if (nw == 0 && (xxoctant & (SSE | ESE)) > 0) { + portions.add(Direction.SOUTH); + portions.add(Direction.EAST); - // Three diagonal quadrants in use. - if (qq == 3 && portions.isEmpty()) { - if (nn == 0) { - portions.add(Direction.SOUTH); - } else if (ss == 0) { - portions.add(Direction.NORTH); - } else if (ww == 0) { - portions.add(Direction.EAST); - } else if (ee == 0) { - portions.add(Direction.WEST); - } - } + } else if (sw == 0) { + // The next line is the original port of A1 code but prevented + // producing the correct result: + // } else if (sw == 0 && (xxoctant & (NNE | ENE)) > 0) { + portions.add(Direction.NORTH); + portions.add(Direction.EAST); + } + // The next line is the original port of A1 code but prevented + // producing the correct result: + // return getPointDesc(meanMask, exYes); + } - // add extreme for three quadrant case. - if (!portions.isEmpty()) { - if (exYes && ((areaMask & CoverageConstants.EXTREME)) != 0) { - portions.add(Direction.EXTREME); - } - return portions; - } + // Three diagonal quadrants in use. + if (qq == 3 && portions.isEmpty()) { + if (nn == 0) { + portions.add(Direction.SOUTH); + } else if (ss == 0) { + portions.add(Direction.NORTH); + } else if (ww == 0) { + portions.add(Direction.EAST); + } else if (ee == 0) { + portions.add(Direction.WEST); + } + } - // All of either type of quadrant in use. - if (q == 4 || qq == 4) { - return EnumSet.noneOf(Direction.class); - } + // add extreme for three quadrant case. + if (!portions.isEmpty()) { + if (exYes && ((areaMask & CoverageConstants.EXTREME)) > 0) { + portions.add(Direction.EXTREME); + } + return portions; + } - // Case of a pure simple direction. - nn = areaMask & CoverageConstants.NORTHERN; - ss = areaMask & CoverageConstants.SOUTHERN; - ee = areaMask & CoverageConstants.EASTERN; - ww = areaMask & CoverageConstants.WESTERN; - if (ss != 0 && nn != 0 || q == 0) { - if (ee == 0 && ww != 0) { - portions.add(Direction.WEST); - } - if (ww == 0 && ee != 0) { - portions.add(Direction.EAST); - } - } else if (ee != 0 && ww != 0 || q == 0) { - if (nn == 0 && ss != 0) { - portions.add(Direction.SOUTH); - } - if (ss == 0 && nn != 0) { - portions.add(Direction.NORTH); - } - } + // All of either type of quadrant in use. + if (q == 4 || qq == 4) { + return EnumSet.noneOf(Direction.class); + } - // add extreme for simple direction case. - if (!portions.isEmpty()) { - if (exYes && ((areaMask & CoverageConstants.EXTREME)) != 0) { - portions.add(Direction.EXTREME); - } - return portions; - } + // Case of a pure simple direction. + nn = areaMask & CoverageConstants.NORTHERN; + ss = areaMask & CoverageConstants.SOUTHERN; + ee = areaMask & CoverageConstants.EASTERN; + ww = areaMask & CoverageConstants.WESTERN; + if (ss > 0 && nn > 0 || q == 0) { + if (ee == 0 && ww > 0) { + portions.add(Direction.WEST); + } + if (ww == 0 && ee > 0) { + portions.add(Direction.EAST); + } + } else if (ee > 0 && ww > 0 || q == 0) { + if (nn == 0 && ss > 0) { + portions.add(Direction.SOUTH); + } + if (ss == 0 && nn > 0) { + portions.add(Direction.NORTH); + } + } - // Catch with the point descriptor one last time - return getPointDesc2(meanMask, exYes, nn, ss, ee, ww); - } + // add extreme for simple direction case. + if (!portions.isEmpty()) { + if (exYes && ((areaMask & CoverageConstants.EXTREME)) > 0) { + portions.add(Direction.EXTREME); + } + return portions; + } - /** - * Port from A1 code of GeoEntityLookupTable::getPointDesc. - * - * @param mask - * @param exYes - * @return - */ - private static EnumSet getPointDesc(int mask, boolean exYes) { - EnumSet portions = EnumSet.noneOf(Direction.class); + // Catch with the point descriptor one last time + return getPointDesc2(meanMask, exYes, nn, ss, ee, ww); + } - int cc = mask & CoverageConstants.CENTRAL; - if (cc == CoverageConstants.CENTRAL) { - portions.add(Direction.CENTRAL); - return portions; - } + /** + * Port from A1 code of GeoEntityLookupTable::getPointDesc. + * + * @param mask + * @param exYes + * @return + */ + private static EnumSet getPointDesc(int mask, boolean exYes) { + EnumSet portions = EnumSet.noneOf(Direction.class); - if ((mask & CoverageConstants.NORTH_SOUTH) == 0) { - ; - } else if ((mask & CoverageConstants.SOUTHERN) == (mask & CoverageConstants.NORTH_SOUTH)) { - portions.add(Direction.SOUTH); - } else if ((mask & CoverageConstants.NORTHERN) == (mask & CoverageConstants.NORTH_SOUTH)) { - portions.add(Direction.NORTH); - } + if (mask == 0) { + return portions; + } - if ((mask & CoverageConstants.EAST_WEST) == 0) { - ; - } else if ((mask & CoverageConstants.WESTERN) == (mask & CoverageConstants.EAST_WEST)) { - portions.add(Direction.WEST); - } else if ((mask & CoverageConstants.EASTERN) == (mask & CoverageConstants.EAST_WEST)) { - portions.add(Direction.EAST); - } + int cc = mask & CoverageConstants.CENTRAL; + if (cc == CoverageConstants.CENTRAL) { + portions.add(Direction.CENTRAL); + return portions; + } - if (portions.isEmpty()) { - return portions; - } + if ((mask & CoverageConstants.NORTH_SOUTH) == 0) { + ; + } else if ((mask & CoverageConstants.SOUTHERN) == (mask & CoverageConstants.NORTH_SOUTH)) { + portions.add(Direction.SOUTH); + } else if ((mask & CoverageConstants.NORTHERN) == (mask & CoverageConstants.NORTH_SOUTH)) { + portions.add(Direction.NORTH); + } - if (cc != 0) { - portions.add(Direction.CENTRAL); - } + if ((mask & CoverageConstants.EAST_WEST) == 0) { + ; + } else if ((mask & CoverageConstants.WESTERN) == (mask & CoverageConstants.EAST_WEST)) { + portions.add(Direction.WEST); + } else if ((mask & CoverageConstants.EASTERN) == (mask & CoverageConstants.EAST_WEST)) { + portions.add(Direction.EAST); + } - if (exYes && ((int) (mask & CoverageConstants.EXTREME) != 0)) { - portions.add(Direction.EXTREME); - } + if (portions.isEmpty()) { + return portions; + } - return portions; - } + if (cc != 0) { + portions.add(Direction.CENTRAL); + } - /** - * This method is not a direct port from A1. The original getPointDesc did - * not produce the expected results. This method is a modified version of - * getPointDesct that uses the calculated qq values instead of just the - * meanMask. - * - * @param mask - * @param exYes - * @return - */ - private static EnumSet getPointDesc2(int mask, boolean exYes, - int nn, int ss, int ee, int ww) { - EnumSet portions = EnumSet.noneOf(Direction.class); + if (exYes && ((int) (mask & CoverageConstants.EXTREME) > 0)) { + portions.add(Direction.EXTREME); + } - if (mask == 0) { - return portions; - } + return portions; + } - int counter = 0; - if (nn != 0 && ss != 0) { - ; - } else if (ss != 0) { - portions.add(Direction.SOUTH); - counter++; - } else if (nn != 0) { - portions.add(Direction.NORTH); - counter++; - } + /** + * This method is not a direct port from A1. The original getPointDesc did + * not produce the expected results. This method is a modified version of + * getPointDesct that uses the calculated qq values instead of just the + * meanMask. + * + * @param mask + * @param exYes + * @return + */ + private static EnumSet getPointDesc2(int mask, boolean exYes, + int nn, int ss, int ee, int ww) { + EnumSet portions = EnumSet.noneOf(Direction.class); - if (ee != 0 && ww != 0) { - ; - } else if (ww != 0) { - portions.add(Direction.WEST); - counter++; - } else if (ee != 0) { - portions.add(Direction.EAST); - counter++; - } + if (mask == 0) { + return portions; + } - if (portions.isEmpty()) { - return portions; - } + int counter = 0; + if (nn > 0 && ss > 0) { + ; + } else if (ss > 0) { + portions.add(Direction.SOUTH); + counter++; + } else if (nn > 0) { + portions.add(Direction.NORTH); + counter++; + } - int cc = mask & CoverageConstants.CENTRAL; - boolean useCentral = counter < 2; - if (useCentral && cc != 0) { - portions.add(Direction.CENTRAL); - } + if (ee > 0 && ww > 0) { + ; + } else if (ww > 0) { + portions.add(Direction.WEST); + counter++; + } else if (ee > 0) { + portions.add(Direction.EAST); + counter++; + } - if (exYes && ((int) (mask & CoverageConstants.EXTREME) != 0)) { - portions.add(Direction.EXTREME); - } + if (portions.isEmpty()) { + return portions; + } - return portions; - } + int cc = mask & CoverageConstants.CENTRAL; + boolean useCentral = counter < 2; + if (useCentral && cc != 0) { + portions.add(Direction.CENTRAL); + } + + if (exYes && ((int) (mask & CoverageConstants.EXTREME) > 0)) { + portions.add(Direction.EXTREME); + } + + return portions; + } } diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java index ef06609c0c..90abe1fc73 100644 --- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java +++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java @@ -20,7 +20,6 @@ package com.raytheon.viz.warngen.gui; import com.raytheon.uf.common.dataplugin.warning.AbstractWarningRecord; -import com.raytheon.uf.common.dataplugin.warning.EmergencyType; import com.raytheon.uf.common.dataplugin.warning.WarningRecord.WarningAction; import com.raytheon.uf.common.time.SimulatedTime; import com.raytheon.uf.common.time.util.TimeUtil; @@ -40,7 +39,6 @@ import com.raytheon.uf.common.time.util.TimeUtil; * Aug 7, 2013 2243 jsanchez Set all the attributes of an AbstractWarningRecord and added an expiration string. Removed calendar object. * Aug 15,2013 2243 jsanchez Improved the expiration string off by one minute. Fixed for practice mode. * Aug 15,2013 2243 jsanchez Improved the expiration string off by one minute. - * Sep 4,2013 2176 jsanchez Used EmergencyType class to identify emergency products. * * * @author rferrel @@ -98,8 +96,8 @@ public class FollowupData extends AbstractWarningRecord { rval.append(buildExpStr(status, record)); } - if (EmergencyType.isEmergency(record.getRawmessage())) { - rval.append(" " + EmergencyType.EMER); + if (record.getRawmessage().contains("EMERGENCY")) { + rval.append(" EMER"); } equvialentString = rval.substring(0, record.getProductClass().equals("T") ? 20 : 18); diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java index 76519127bc..6525feec70 100644 --- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java +++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java @@ -148,7 +148,6 @@ import com.vividsolutions.jts.geom.Polygon; * Jul 29, 2013 DR 16352 D. Friedman Move 'result' to okPressed(). * Aug 6, 2013 2243 jsanchez Refreshed the follow up list every minute. * Aug 15, 2013 DR 16418 D. Friedman Make dialog visibility match editable state. - * Sep 17, 2013 DR 16496 D. Friedman Make editable state more consistent. * * * @author chammack @@ -1335,9 +1334,11 @@ public class WarngenDialog extends CaveSWTDialog implements * Box was selected, allow editing of box only */ private void boxSelected() { - boxEditable = true; - trackEditable = false; - realizeEditableState(); + boxEditable = !polygonLocked; + trackEditable = true; + warngenLayer.getStormTrackState().editable = trackEditable; + warngenLayer.setBoxEditable(boxEditable); + warngenLayer.issueRefresh(); } /** @@ -1346,16 +1347,20 @@ public class WarngenDialog extends CaveSWTDialog implements private void trackSelected() { boxEditable = false; trackEditable = true; - realizeEditableState(); + warngenLayer.getStormTrackState().editable = trackEditable; + warngenLayer.setBoxEditable(boxEditable); + warngenLayer.issueRefresh(); } /** * Box and track was selected, allow editing of both */ private void boxAndTrackSelected() { - boxEditable = true; + boxEditable = !polygonLocked; trackEditable = true; - realizeEditableState(); + warngenLayer.getStormTrackState().editable = trackEditable; + warngenLayer.setBoxEditable(boxEditable); + warngenLayer.issueRefresh(); } /** @@ -1610,6 +1615,7 @@ public class WarngenDialog extends CaveSWTDialog implements * item from update list selected */ public void updateListSelected() { + warngenLayer.setOldWarningPolygon(null); if (updateListCbo.getSelectionIndex() >= 0) { AbstractWarningRecord oldWarning = null; FollowupData data = (FollowupData) updateListCbo @@ -1660,7 +1666,6 @@ public class WarngenDialog extends CaveSWTDialog implements return; } - warngenLayer.setOldWarningPolygon(null); bulletList.setEnabled(true); durationList.setEnabled(true); totalSegments = 0; @@ -2456,12 +2461,4 @@ public class WarngenDialog extends CaveSWTDialog implements } } - public void realizeEditableState() { - boolean layerEditable = warngenLayer.isEditable(); - // TODO: Note there is no 'is track editing allowed' state yet. - warngenLayer.getStormTrackState().editable = layerEditable && trackEditable; - warngenLayer.setBoxEditable(layerEditable && boxEditable && !polygonLocked); - warngenLayer.issueRefresh(); - } - } diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java index 7bef3b3064..a7e1d400cb 100644 --- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java +++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java @@ -188,7 +188,6 @@ import com.vividsolutions.jts.io.WKTReader; * updated AreaHatcher's run(). * 07/26/2013 DR 16450 D. Friedman Fix logic errors when frame count is one. * 08/19/2013 2177 jsanchez Set a GeneralGridGeometry object in the GeospatialDataList. - * 09/17/2013 DR 16496 D. Friedman Make editable state more consistent. * * * @author mschenke @@ -3011,7 +3010,10 @@ public class WarngenLayer extends AbstractStormTrackResource { final boolean editable = isEditable(); boxEditable = editable; displayState.editable = editable; - dialog.realizeEditableState(); + if (editable) { + boxEditable = dialog.boxEditable(); + displayState.editable = dialog.trackEditable(); + } final WarngenDialog dlg = dialog; dialog.getDisplay().asyncExec(new Runnable() { @Override diff --git a/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java b/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java index c796d18a46..34424f20bd 100644 --- a/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java +++ b/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java @@ -15,7 +15,6 @@ import org.opengis.referencing.crs.CoordinateReferenceSystem; import com.raytheon.uf.common.dataplugin.PluginDataObject; import com.raytheon.uf.common.dataplugin.warning.AbstractWarningRecord; -import com.raytheon.uf.common.dataplugin.warning.EmergencyType; import com.raytheon.uf.common.dataplugin.warning.PracticeWarningRecord; import com.raytheon.uf.common.dataplugin.warning.WarningRecord.WarningAction; import com.raytheon.uf.common.dataquery.requests.RequestConstraint; @@ -81,7 +80,6 @@ import com.vividsolutions.jts.geom.prep.PreparedGeometryFactory; * Remove frameAltered condition in matchesFrame. It prevented entries from being displayed. * Check if geometry is null when inspecting. * Jul 22, 2013 2176 jsanchez Updated the wire frame and text for EMERGENCY warnings. - * Sep 4, 2013 2176 jsanchez Made the polygon line width thicker and made regular text not bold. * * * @author jsanchez @@ -135,9 +133,7 @@ public abstract class AbstractWWAResource extends /** map of dataURI to a warning entry **/ protected Map entryMap; - protected IFont warningsFont = null; - - protected IFont emergencyFont = null; + protected IFont warningsFont; protected RGB color; @@ -372,8 +368,8 @@ public abstract class AbstractWWAResource extends int outlineWidth = getCapability(OutlineCapability.class) .getOutlineWidth(); // Make wire frame outline thicker for EMERGENCY warnings - if (EmergencyType.isEmergency(record.getRawmessage())) { - outlineWidth *= 3; + if (record.getRawmessage().contains("EMERGENCY")) { + outlineWidth *= 2; } target.drawWireframeShape( @@ -402,10 +398,7 @@ public abstract class AbstractWWAResource extends * paintProps.getZoomLevel() / 1000; String[] textToPrint = getText(record, mapWidth); if (warningsFont == null) { - warningsFont = target.initializeFont(target - .getDefaultFont().getFontName(), 11, - new IFont.Style[0]); - emergencyFont = target.getDefaultFont().deriveWithSize( + warningsFont = target.getDefaultFont().deriveWithSize( 11); } // DR14992: reverse the textToPrint array to plot the @@ -425,24 +418,15 @@ public abstract class AbstractWWAResource extends params.verticallAlignment = VerticalAlignment.BOTTOM; params.magnification = getCapability( MagnificationCapability.class).getMagnification(); + target.drawStrings(params); // Draws the string again to have it appear bolder - if (EmergencyType.isEmergency(record.getRawmessage())) { - // moves over text to add EMER in a different font - textToPrintReversed[2] = String.format("%1$-21" + "s", - textToPrintReversed[2]); - params.setText(textToPrintReversed, color); - - DrawableString emergencyString = new DrawableString( - params); - emergencyString.font = emergencyFont; - emergencyString.setText(new String[] { "", "", - " " + EmergencyType.EMER, "" }, color); - target.drawStrings(emergencyString); + if (textToPrintReversed[2].endsWith("EMER")) { + params.setText(new String[] { "", "", "EMER", "" }, + color); + target.drawStrings(params); } - target.drawStrings(params); - } } } @@ -614,7 +598,12 @@ public abstract class AbstractWWAResource extends textToPrint[0] += "." + vid; } textToPrint[0] += "." + record.getEtn(); - textToPrint[1] = record.getPil(); + + if (record.getRawmessage().contains("EMERGENCY")) { + textToPrint[1] = record.getPil() + " EMER"; + } else { + textToPrint[1] = record.getPil(); + } SimpleDateFormat startFormat = DEFAULT_FORMAT; SimpleDateFormat endFormat = DEFAULT_FORMAT; diff --git a/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java b/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java index 45a5567ffa..206f92ce98 100644 --- a/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java +++ b/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java @@ -60,8 +60,7 @@ import com.vividsolutions.jts.geom.Geometry; * Sep 27, 2012 1149 jsanchez Refactored methods from AbstractWarningsResource into this class. * Apr 18, 2013 1877 jsanchez Ordered the records the same for update and initial load. * Removed no longer needed frameAltered. Do not set wire frame for a CAN. - * Jul 24, 2013 DR16350 mgamazaychikov Fix the problem with plotting EXP warning - * Sep 5, 2013 2176 jsanchez Disposed the emergency font. + * Jul 24, 2013 DR16350 mgamazaychikov Fix the problem with plotting EXP warning * * * @author jsanchez @@ -144,10 +143,6 @@ public class WarningsResource extends AbstractWWAResource { if (warningsFont != null) { warningsFont.dispose(); } - - if (emergencyFont != null) { - emergencyFont.dispose(); - } } @Override @@ -239,7 +234,7 @@ public class WarningsResource extends AbstractWWAResource { for (AbstractWarningRecord warnrec : recordsToLoad) { WarningAction act = WarningAction.valueOf(warnrec.getAct()); if (act == WarningAction.CON || act == WarningAction.CAN - || act == WarningAction.EXT) { + || act == WarningAction.EXT) { AbstractWarningRecord createShape = null; for (String key : entryMap.keySet()) { WarningEntry entry = entryMap.get(key); diff --git a/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WatchesResource.java b/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WatchesResource.java index 6b4b755a75..9580cfa9e6 100644 --- a/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WatchesResource.java +++ b/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WatchesResource.java @@ -49,7 +49,6 @@ import com.vividsolutions.jts.geom.GeometryFactory; * Sep 27, 2012 1149 jsanchez Refactored methods from AbstractWarningsResource into this class. * May 06, 2013 1930 bsteffen Check for null in WatchesResource. * May 10, 2013 1951 rjpeter Updated ugcZones references - * Sep 5, 2013 2176 jsanchez Disposed the emergency font. * * * @author jsanchez @@ -141,10 +140,6 @@ public class WatchesResource extends AbstractWWAResource { if (warningsFont != null) { warningsFont.dispose(); } - - if (emergencyFont != null) { - emergencyFont.dispose(); - } } @Override diff --git a/cots/org.jep.linux64/libjep.so b/cots/org.jep.linux64/libjep.so index a584e68866..d09ea2db87 100644 Binary files a/cots/org.jep.linux64/libjep.so and b/cots/org.jep.linux64/libjep.so differ diff --git a/deltaScripts/13.4.1/resetNtransTable.sh b/deltaScripts/13.4.1/resetNtransTable.sh deleted file mode 100644 index 5fd6746b24..0000000000 --- a/deltaScripts/13.4.1/resetNtransTable.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -# This script will drop the ntrans table and remove the ntrans hdf5 files. -# -# This update needs to be performed when going from build 13.3.1 to build 13.4.1 (or 13.5.1). -# - -PSQL="/awips2/psql/bin/psql" -SQL_COMMAND="DROP TABLE IF EXISTS ntrans; UPDATE plugin_info SET initialized='false' WHERE name='ntrans';" - -if [ ! -f ${PSQL} ]; then - echo "ERROR: The PSQL executable does not exist - ${PSQL}." - echo "FATAL: Updated Failed!" - exit 1 -fi - -echo "" -echo "Press Enter to perform the updates Ctrl-C to quit." -read done - -echo "INFO: Dropping the metadata ntrans table." -${PSQL} -U awips -d metadata -c "${SQL_COMMAND}" -if [ $? -ne 0 ]; then - echo "FATAL: Updated Failed!" - exit 1 -fi - -echo "INFO: Purging ntrans hdf5 files." -if [ -d /awips2/edex/data/hdf5/ntrans ]; then - rm -rfv /awips2/edex/data/hdf5/ntrans -fi - -echo "INFO: The update was successfully applied." - -exit 0 diff --git a/deltaScripts/13.5.1/resetNtransTable.sh b/deltaScripts/13.5.1/resetNtransTable.sh deleted file mode 100644 index 5fd6746b24..0000000000 --- a/deltaScripts/13.5.1/resetNtransTable.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -# This script will drop the ntrans table and remove the ntrans hdf5 files. -# -# This update needs to be performed when going from build 13.3.1 to build 13.4.1 (or 13.5.1). -# - -PSQL="/awips2/psql/bin/psql" -SQL_COMMAND="DROP TABLE IF EXISTS ntrans; UPDATE plugin_info SET initialized='false' WHERE name='ntrans';" - -if [ ! -f ${PSQL} ]; then - echo "ERROR: The PSQL executable does not exist - ${PSQL}." - echo "FATAL: Updated Failed!" - exit 1 -fi - -echo "" -echo "Press Enter to perform the updates Ctrl-C to quit." -read done - -echo "INFO: Dropping the metadata ntrans table." -${PSQL} -U awips -d metadata -c "${SQL_COMMAND}" -if [ $? -ne 0 ]; then - echo "FATAL: Updated Failed!" - exit 1 -fi - -echo "INFO: Purging ntrans hdf5 files." -if [ -d /awips2/edex/data/hdf5/ntrans ]; then - rm -rfv /awips2/edex/data/hdf5/ntrans -fi - -echo "INFO: The update was successfully applied." - -exit 0 diff --git a/deltaScripts/13.5.2/addBufrmosDataURI.sh b/deltaScripts/13.5.2/addBufrmosDataURI.sh old mode 100755 new mode 100644 diff --git a/edexOsgi/build.edex/esb/bin/setup.env b/edexOsgi/build.edex/esb/bin/setup.env index 3661f632b4..719bd3ce1c 100644 --- a/edexOsgi/build.edex/esb/bin/setup.env +++ b/edexOsgi/build.edex/esb/bin/setup.env @@ -12,8 +12,8 @@ export IH_DB_NAME=hd_ob92oax ### flag to control grib deprecation ### if [ -z "$gribMode" ]; then # uncomment only one of the following two lines -#export gribMode=deprecated -export gribMode=future +export gribMode=deprecated +#export gribMode=future fi ## end of grib deprecation flag ### diff --git a/edexOsgi/build.edex/esb/bin/yajsw/wrapper.jar b/edexOsgi/build.edex/esb/bin/yajsw/wrapper.jar index f57bb629b5..546a8e4c9b 100644 Binary files a/edexOsgi/build.edex/esb/bin/yajsw/wrapper.jar and b/edexOsgi/build.edex/esb/bin/yajsw/wrapper.jar differ diff --git a/edexOsgi/build.edex/esb/bin/yajsw/wrapperApp.jar b/edexOsgi/build.edex/esb/bin/yajsw/wrapperApp.jar index fda9a7c5bb..a4f58e7912 100644 Binary files a/edexOsgi/build.edex/esb/bin/yajsw/wrapperApp.jar and b/edexOsgi/build.edex/esb/bin/yajsw/wrapperApp.jar differ diff --git a/edexOsgi/build.edex/esb/conf/log4j-ingest.xml b/edexOsgi/build.edex/esb/conf/log4j-ingest.xml index 7c776b833a..0fbbbb3244 100644 --- a/edexOsgi/build.edex/esb/conf/log4j-ingest.xml +++ b/edexOsgi/build.edex/esb/conf/log4j-ingest.xml @@ -251,7 +251,7 @@ - + diff --git a/edexOsgi/build.edex/esb/conf/spring/edex.xml b/edexOsgi/build.edex/esb/conf/spring/edex.xml index 275133fb82..546d3abf49 100644 --- a/edexOsgi/build.edex/esb/conf/spring/edex.xml +++ b/edexOsgi/build.edex/esb/conf/spring/edex.xml @@ -40,19 +40,8 @@ - - - - - - - - - - + factory-bean="jmsConfig" factory-method="copy" /> @@ -82,7 +71,6 @@ - - + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AIREP.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AIREP.xml new file mode 100644 index 0000000000..cc683ff5ca --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AIREP.xml @@ -0,0 +1,13 @@ + + + AIREP + pluginName,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AIRMET.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AIRMET.xml new file mode 100644 index 0000000000..3e7b347674 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AIRMET.xml @@ -0,0 +1,13 @@ + + + AIRMET + pluginName,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ASCT.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ASCT.xml new file mode 100644 index 0000000000..68b766b75a --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ASCT.xml @@ -0,0 +1,13 @@ + + + ASCT + pluginName,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AUTOSPE.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AUTOSPE.xml new file mode 100644 index 0000000000..10ddd55b6d --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AUTOSPE.xml @@ -0,0 +1,13 @@ + + + AUTOSPE + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AVIATION.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AVIATION.xml new file mode 100644 index 0000000000..078edbf002 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AVIATION.xml @@ -0,0 +1,13 @@ + + + AVIATION + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AVN.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AVN.xml new file mode 100644 index 0000000000..50d21a8943 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AVN.xml @@ -0,0 +1,13 @@ + + + AVN + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AVN190AK.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AVN190AK.xml new file mode 100644 index 0000000000..d4a78b51d8 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AVN190AK.xml @@ -0,0 +1,13 @@ + + + AVN190AK + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AVN80PAC.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AVN80PAC.xml new file mode 100644 index 0000000000..2c6904a004 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AVN80PAC.xml @@ -0,0 +1,13 @@ + + + AVN80PAC + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AVN80US.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AVN80US.xml new file mode 100644 index 0000000000..03fbc23e00 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AVN80US.xml @@ -0,0 +1,13 @@ + + + AVN80US + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/CCPA.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/CCPA.xml new file mode 100644 index 0000000000..1b48d971e0 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/CCPA.xml @@ -0,0 +1,13 @@ + + + CCPA + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/CCPA2P5.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/CCPA2P5.xml new file mode 100644 index 0000000000..ad8447e02a --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/CCPA2P5.xml @@ -0,0 +1,13 @@ + + + CCPA2P5 + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/CCPA_US.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/CCPA_US.xml new file mode 100644 index 0000000000..64d1597a0c --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/CCPA_US.xml @@ -0,0 +1,13 @@ + + + CCPA_US + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/CMC.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/CMC.xml new file mode 100644 index 0000000000..8f876091cd --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/CMC.xml @@ -0,0 +1,13 @@ + + + CMC + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/CMCE.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/CMCE.xml new file mode 100644 index 0000000000..2b4f99501a --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/CMCE.xml @@ -0,0 +1,13 @@ + + + CMCE + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/CMCE_ENS.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/CMCE_ENS.xml new file mode 100644 index 0000000000..7323f1ab67 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/CMCE_ENS.xml @@ -0,0 +1,16 @@ + + + CMCE_ENS + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/CPCOUTLK80US.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/CPCOUTLK80US.xml new file mode 100644 index 0000000000..5207531273 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/CPCOUTLK80US.xml @@ -0,0 +1,13 @@ + + + CPCOUTLK80US + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/CSIG.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/CSIG.xml new file mode 100644 index 0000000000..604fe23194 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/CSIG.xml @@ -0,0 +1,13 @@ + + + CSIG + pluginName,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/DGEX_AK.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/DGEX_AK.xml new file mode 100644 index 0000000000..43a7fe4bb3 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/DGEX_AK.xml @@ -0,0 +1,13 @@ + + + DGEX_AK + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/DGEX_US.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/DGEX_US.xml new file mode 100644 index 0000000000..87d875479b --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/DGEX_US.xml @@ -0,0 +1,13 @@ + + + DGEX_US + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/DPD.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/DPD.xml new file mode 100644 index 0000000000..de08fece21 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/DPD.xml @@ -0,0 +1,13 @@ + + + DPD + pluginName,areaName,resolution,imageType,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF.xml new file mode 100644 index 0000000000..68eda13586 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF.xml @@ -0,0 +1,13 @@ + + + ECMWF + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWFG.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWFG.xml new file mode 100644 index 0000000000..29d9d010f5 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWFG.xml @@ -0,0 +1,13 @@ + + + ECMWFG + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWFT.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWFT.xml new file mode 100644 index 0000000000..fe42f06b07 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWFT.xml @@ -0,0 +1,13 @@ + + + ECMWFT + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWFWAVE.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWFWAVE.xml new file mode 100644 index 0000000000..d788cd2409 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWFWAVE.xml @@ -0,0 +1,13 @@ + + + ECMWFWAVE + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_AF.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_AF.xml new file mode 100644 index 0000000000..fdc7b3be97 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_AF.xml @@ -0,0 +1,13 @@ + + + ECMWF_AF + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_ATL.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_ATL.xml new file mode 100644 index 0000000000..dca90fb00b --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_ATL.xml @@ -0,0 +1,13 @@ + + + ECMWF_ATL + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_ATL_EQ.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_ATL_EQ.xml new file mode 100644 index 0000000000..c84fc3942b --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_ATL_EQ.xml @@ -0,0 +1,13 @@ + + + ECMWF_ATL_EQ + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_EPAC.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_EPAC.xml new file mode 100644 index 0000000000..bd8d290af6 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_EPAC.xml @@ -0,0 +1,13 @@ + + + ECMWF_EPAC + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_EPAC_EQ.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_EPAC_EQ.xml new file mode 100644 index 0000000000..619c3aa758 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_EPAC_EQ.xml @@ -0,0 +1,13 @@ + + + ECMWF_EPAC_EQ + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_EU.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_EU.xml new file mode 100644 index 0000000000..4a108bb153 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_EU.xml @@ -0,0 +1,13 @@ + + + ECMWF_EU + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_NH.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_NH.xml new file mode 100644 index 0000000000..71cedea90f --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_NH.xml @@ -0,0 +1,13 @@ + + + ECMWF_NH + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_WPAC.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_WPAC.xml new file mode 100644 index 0000000000..8f9c75099d --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_WPAC.xml @@ -0,0 +1,13 @@ + + + ECMWF_WPAC + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_WPAC_EQ.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_WPAC_EQ.xml new file mode 100644 index 0000000000..2a8945db80 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_WPAC_EQ.xml @@ -0,0 +1,13 @@ + + + ECMWF_WPAC_EQ + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ENS_CYC.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ENS_CYC.xml index 669ad1c353..a9d336bc2e 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ENS_CYC.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ENS_CYC.xml @@ -1,8 +1,6 @@ ENS_CYC - pluginName,dataTime diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ESTOFS_PR.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ESTOFS_PR.xml new file mode 100644 index 0000000000..68df51c8de --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ESTOFS_PR.xml @@ -0,0 +1,13 @@ + + + ESTOFS_PR + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ESTOFS_US.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ESTOFS_US.xml new file mode 100644 index 0000000000..f7344e1398 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ESTOFS_US.xml @@ -0,0 +1,13 @@ + + + ESTOFS_US + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NcScat.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/EXASCT.xml similarity index 66% rename from edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NcScat.xml rename to edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/EXASCT.xml index 975fd9d23b..7c2f235159 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NcScat.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/EXASCT.xml @@ -1,12 +1,12 @@ - NcScat - pluginName,reportType,dataTime + EXASCT + pluginName,dataTime - + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FFA.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FFA.xml new file mode 100644 index 0000000000..37358088cf --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FFA.xml @@ -0,0 +1,13 @@ + + + FFA + pluginName,reportType,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FFG.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FFG.xml new file mode 100644 index 0000000000..16e0fefc3a --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FFG.xml @@ -0,0 +1,13 @@ + + + FFG + pluginName,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FFG_ALR.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FFG_ALR.xml new file mode 100644 index 0000000000..e37b3c726f --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FFG_ALR.xml @@ -0,0 +1,13 @@ + + + FFG_ALR + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FFG_TIR_HIRES.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FFG_TIR_HIRES.xml index f67aadaac8..1ba395db36 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FFG_TIR_HIRES.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FFG_TIR_HIRES.xml @@ -4,7 +4,7 @@ pluginName,info.ensembleId,info.secondaryId,dataTime - + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FNMOCWAVE.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FNMOCWAVE.xml new file mode 100644 index 0000000000..f0e149070b --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FNMOCWAVE.xml @@ -0,0 +1,13 @@ + + + FNMOCWAVE + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FYC.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FYC.xml new file mode 100644 index 0000000000..0cef20fea3 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FYC.xml @@ -0,0 +1,13 @@ + + + FYC + pluginName,areaName,resolution,imageType,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GDAS.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GDAS.xml new file mode 100644 index 0000000000..3908f607f8 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GDAS.xml @@ -0,0 +1,13 @@ + + + GDAS + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GEFS.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GEFS.xml new file mode 100644 index 0000000000..24727d97f1 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GEFS.xml @@ -0,0 +1,16 @@ + + + GEFS + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GEFSC.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GEFSC.xml new file mode 100644 index 0000000000..6136633841 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GEFSC.xml @@ -0,0 +1,16 @@ + + + GEFSC + pluginName,info.ensembleId,dataTime + + + + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GEFS_ENS.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GEFS_ENS.xml new file mode 100644 index 0000000000..f117bafdff --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GEFS_ENS.xml @@ -0,0 +1,13 @@ + + + GEFS_ENS + pluginName,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS.xml new file mode 100644 index 0000000000..6cd6459ca0 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS.xml @@ -0,0 +1,13 @@ + + + GFS + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS40US.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS40US.xml new file mode 100644 index 0000000000..3db0a9b6f4 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS40US.xml @@ -0,0 +1,13 @@ + + + GFS40US + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS95US.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS95US.xml new file mode 100644 index 0000000000..05223a75bf --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS95US.xml @@ -0,0 +1,13 @@ + + + GFS95US + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFSGUIDE.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFSGUIDE.xml new file mode 100644 index 0000000000..0d8e2e4e2f --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFSGUIDE.xml @@ -0,0 +1,13 @@ + + + GFSGUIDE + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFSLAMPTSTORM.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFSLAMPTSTORM.xml new file mode 100644 index 0000000000..536bc15b36 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFSLAMPTSTORM.xml @@ -0,0 +1,13 @@ + + + GFSLAMPTSTORM + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS_AK.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS_AK.xml new file mode 100644 index 0000000000..866f1c642e --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS_AK.xml @@ -0,0 +1,13 @@ + + + GFS_AK + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS_ENS.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS_ENS.xml new file mode 100644 index 0000000000..b1f583c3fa --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS_ENS.xml @@ -0,0 +1,13 @@ + + + GFS_ENS + pluginName,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS_GU.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS_GU.xml new file mode 100644 index 0000000000..c2c2043846 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS_GU.xml @@ -0,0 +1,13 @@ + + + GFS_GU + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS_NH.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS_NH.xml new file mode 100644 index 0000000000..33ff226115 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS_NH.xml @@ -0,0 +1,13 @@ + + + GFS_NH + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS_PAC.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS_PAC.xml new file mode 100644 index 0000000000..32b53ae1ba --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS_PAC.xml @@ -0,0 +1,13 @@ + + + GFS_PAC + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS_PR.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS_PR.xml new file mode 100644 index 0000000000..ac89164aeb --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS_PR.xml @@ -0,0 +1,13 @@ + + + GFS_PR + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GHM.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GHM.xml new file mode 100644 index 0000000000..f602567228 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GHM.xml @@ -0,0 +1,16 @@ + + + GHM + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GHMNEST.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GHMNEST.xml new file mode 100644 index 0000000000..1d6a37bdb0 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GHMNEST.xml @@ -0,0 +1,16 @@ + + + GHMNEST + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_Composite.xml similarity index 64% rename from edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI.xml rename to edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_Composite.xml index 26a618d260..cd73325cb6 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_Composite.xml @@ -1,12 +1,12 @@ - GINI - pluginName,creatingEntity,sectorID,physicalElement,dataTime + GINI_Composite + pluginName,sectorID,physicalElement,dataTime - + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_DMSP.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_DMSP.xml new file mode 100644 index 0000000000..f000c621f4 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_DMSP.xml @@ -0,0 +1,13 @@ + + + GINI_DMSP + pluginName,sectorID,physicalElement,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_ERS-QuickSCAT-Scatterometer.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_ERS-QuickSCAT-Scatterometer.xml new file mode 100644 index 0000000000..7c3fe88605 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_ERS-QuickSCAT-Scatterometer.xml @@ -0,0 +1,13 @@ + + + GINI_ERS-QuickSCAT-Scatterometer + pluginName,sectorID,physicalElement,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GMS.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GMS.xml new file mode 100644 index 0000000000..cc4c671f83 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GMS.xml @@ -0,0 +1,13 @@ + + + GINI_GMS + pluginName,sectorID,physicalElement,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GOES10.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GOES10.xml new file mode 100644 index 0000000000..8faf1124f6 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GOES10.xml @@ -0,0 +1,13 @@ + + + GINI_GOES10 + pluginName,sectorID,physicalElement,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GOES11.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GOES11.xml new file mode 100644 index 0000000000..a3178e3d3f --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GOES11.xml @@ -0,0 +1,13 @@ + + + GINI_GOES11 + pluginName,sectorID,physicalElement,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GOES12.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GOES12.xml new file mode 100644 index 0000000000..dfc7eeefdc --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GOES12.xml @@ -0,0 +1,13 @@ + + + GINI_GOES12 + pluginName,sectorID,physicalElement,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GOES13.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GOES13.xml new file mode 100644 index 0000000000..2fb2ecc2e0 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GOES13.xml @@ -0,0 +1,13 @@ + + + GINI_GOES13 + pluginName,sectorID,physicalElement,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GOES15.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GOES15.xml new file mode 100644 index 0000000000..91763e2c55 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GOES15.xml @@ -0,0 +1,13 @@ + + + GINI_GOES15 + pluginName,sectorID,physicalElement,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GOES7.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GOES7.xml new file mode 100644 index 0000000000..fc070c6f71 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GOES7.xml @@ -0,0 +1,13 @@ + + + GINI_GOES7 + pluginName,sectorID,physicalElement,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GOES8.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GOES8.xml new file mode 100644 index 0000000000..f0f693061b --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GOES8.xml @@ -0,0 +1,13 @@ + + + GINI_GOES8 + pluginName,sectorID,physicalElement,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GOES9.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GOES9.xml new file mode 100644 index 0000000000..adf5c951f5 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GOES9.xml @@ -0,0 +1,13 @@ + + + GINI_GOES9 + pluginName,sectorID,physicalElement,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_JERS.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_JERS.xml new file mode 100644 index 0000000000..7e11a2311d --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_JERS.xml @@ -0,0 +1,13 @@ + + + GINI_JERS + pluginName,sectorID,physicalElement,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_METEOSAT.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_METEOSAT.xml new file mode 100644 index 0000000000..fe468dc0b4 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_METEOSAT.xml @@ -0,0 +1,13 @@ + + + GINI_METEOSTAT + pluginName,sectorID,physicalElement,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_Miscellaneous.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_Miscellaneous.xml new file mode 100644 index 0000000000..91b5b39192 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_Miscellaneous.xml @@ -0,0 +1,13 @@ + + + GINI_Miscellaneous + pluginName,sectorID,physicalElement,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_NOAA16.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_NOAA16.xml new file mode 100644 index 0000000000..8d951d81b1 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_NOAA16.xml @@ -0,0 +1,13 @@ + + + GINI_NOAA16 + pluginName,sectorID,physicalElement,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_NOAA17.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_NOAA17.xml new file mode 100644 index 0000000000..4287200d33 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_NOAA17.xml @@ -0,0 +1,13 @@ + + + GINI_NOAA17 + pluginName,sectorID,physicalElement,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_NOAA18.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_NOAA18.xml new file mode 100644 index 0000000000..311c513292 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_NOAA18.xml @@ -0,0 +1,13 @@ + + + GINI_NOAA18 + pluginName,sectorID,physicalElement,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_NOAA19.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_NOAA19.xml new file mode 100644 index 0000000000..71036bf987 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_NOAA19.xml @@ -0,0 +1,13 @@ + + + GINI_NOAA19 + pluginName,sectorID,physicalElement,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_POES-NPOESS.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_POES-NPOESS.xml new file mode 100644 index 0000000000..e262703657 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_POES-NPOESS.xml @@ -0,0 +1,13 @@ + + + GINI_POES-NPOESS + pluginName,sectorID,physicalElement,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GMS.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GMS.xml new file mode 100644 index 0000000000..42770ecdd6 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GMS.xml @@ -0,0 +1,13 @@ + + + GMS + pluginName,areaName,resolution,imageType,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES10.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES10.xml new file mode 100644 index 0000000000..6ec0f16bb3 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES10.xml @@ -0,0 +1,13 @@ + + + GOES10 + pluginName,areaName,resolution,imageType,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES11.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES11.xml new file mode 100644 index 0000000000..4370576f1b --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES11.xml @@ -0,0 +1,13 @@ + + + GOES11 + pluginName,areaName,resolution,imageType,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES12.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES12.xml new file mode 100644 index 0000000000..08f7c09c38 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES12.xml @@ -0,0 +1,13 @@ + + + GOES12 + pluginName,areaName,resolution,imageType,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES13.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES13.xml new file mode 100644 index 0000000000..a5728e50e2 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES13.xml @@ -0,0 +1,13 @@ + + + GOES13 + pluginName,areaName,resolution,imageType,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES15.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES15.xml new file mode 100644 index 0000000000..43d9469d5d --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES15.xml @@ -0,0 +1,13 @@ + + + GOES15 + pluginName,areaName,resolution,imageType,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES6.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES6.xml new file mode 100644 index 0000000000..d3fe8b6e4e --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES6.xml @@ -0,0 +1,13 @@ + + + GOES6 + pluginName,areaName,resolution,imageType,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES7.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES7.xml new file mode 100644 index 0000000000..4ec1f2a2a1 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES7.xml @@ -0,0 +1,13 @@ + + + GOES7 + pluginName,areaName,resolution,imageType,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES8.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES8.xml new file mode 100644 index 0000000000..938a9f7637 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES8.xml @@ -0,0 +1,13 @@ + + + GOES8 + pluginName,areaName,resolution,imageType,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES9.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES9.xml new file mode 100644 index 0000000000..d17f4414a1 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES9.xml @@ -0,0 +1,13 @@ + + + GOES9 + pluginName,areaName,resolution,imageType,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOESGFS.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOESGFS.xml new file mode 100644 index 0000000000..ce84d46a6d --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOESGFS.xml @@ -0,0 +1,13 @@ + + + GOESGFS + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GRLKWAVE.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GRLKWAVE.xml new file mode 100644 index 0000000000..e42acc3d65 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GRLKWAVE.xml @@ -0,0 +1,13 @@ + + + GRLKWAVE + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GWW.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GWW.xml new file mode 100644 index 0000000000..9d3059f526 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GWW.xml @@ -0,0 +1,13 @@ + + + GWW + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GWW233.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GWW233.xml new file mode 100644 index 0000000000..aa243661f6 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GWW233.xml @@ -0,0 +1,13 @@ + + + GWW233 + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GWWP5.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GWWP5.xml new file mode 100644 index 0000000000..9017ed678e --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GWWP5.xml @@ -0,0 +1,13 @@ + + + GWWP5 + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/McIdas.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/Global.xml similarity index 65% rename from edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/McIdas.xml rename to edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/Global.xml index 5f54fdce36..9220c52862 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/McIdas.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/Global.xml @@ -1,13 +1,13 @@ - McIdas - pluginName,satelliteName,areaName,resolution,imageType,dataTime + Global + pluginName,areaName,resolution,imageType,dataTime - + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_ARW_AK.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_ARW_AK.xml new file mode 100644 index 0000000000..e6023ebb92 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_ARW_AK.xml @@ -0,0 +1,13 @@ + + + HIRESW_ARW_AK + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_ARW_E.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_ARW_E.xml new file mode 100644 index 0000000000..2078ee9e03 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_ARW_E.xml @@ -0,0 +1,13 @@ + + + HIRESW_ARW_E + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_ARW_GU.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_ARW_GU.xml new file mode 100644 index 0000000000..44c1d0477e --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_ARW_GU.xml @@ -0,0 +1,13 @@ + + + HIRESW_ARW_GU + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_ARW_HI.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_ARW_HI.xml new file mode 100644 index 0000000000..12f1fc50d7 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_ARW_HI.xml @@ -0,0 +1,13 @@ + + + HIRESW_ARW_HI + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_ARW_SJU.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_ARW_SJU.xml new file mode 100644 index 0000000000..20d6257913 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_ARW_SJU.xml @@ -0,0 +1,13 @@ + + + HIRESW_ARW_SJU + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_ARW_W.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_ARW_W.xml new file mode 100644 index 0000000000..3c1a6f8dd6 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_ARW_W.xml @@ -0,0 +1,13 @@ + + + HIRESW_ARW_W + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_NMM_AK.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_NMM_AK.xml new file mode 100644 index 0000000000..ebdc697535 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_NMM_AK.xml @@ -0,0 +1,13 @@ + + + HIRESW_NMM_AK + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_NMM_E.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_NMM_E.xml new file mode 100644 index 0000000000..4239678150 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_NMM_E.xml @@ -0,0 +1,13 @@ + + + HIRESW_NMM_E + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_NMM_GU.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_NMM_GU.xml new file mode 100644 index 0000000000..e96d75cab6 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_NMM_GU.xml @@ -0,0 +1,13 @@ + + + HIRESW_NMM_GU + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_NMM_HI.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_NMM_HI.xml new file mode 100644 index 0000000000..1aa1e90a80 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_NMM_HI.xml @@ -0,0 +1,13 @@ + + + HIRESW_NMM_HI + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_NMM_SJU.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_NMM_SJU.xml new file mode 100644 index 0000000000..193d88bfbb --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_NMM_SJU.xml @@ -0,0 +1,13 @@ + + + HIRESW_NMM_SJU + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_NMM_W.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_NMM_W.xml new file mode 100644 index 0000000000..8409a45744 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_NMM_W.xml @@ -0,0 +1,13 @@ + + + HIRESW_NMM_W + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HPCGUIDE_AK.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HPCGUIDE_AK.xml new file mode 100644 index 0000000000..720ba79646 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HPCGUIDE_AK.xml @@ -0,0 +1,13 @@ + + + HPCGUIDE_AK + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HPCQPF.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HPCQPF.xml new file mode 100644 index 0000000000..6ced8cbf93 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HPCQPF.xml @@ -0,0 +1,13 @@ + + + HPCQPF + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HPCQPFNDFD.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HPCQPFNDFD.xml new file mode 100644 index 0000000000..b425f5bb45 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HPCQPFNDFD.xml @@ -0,0 +1,13 @@ + + + HPCQPFNDFD + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HPC_RAIN_CAT_AK.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HPC_RAIN_CAT_AK.xml new file mode 100644 index 0000000000..f791291575 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HPC_RAIN_CAT_AK.xml @@ -0,0 +1,13 @@ + + + HPC_RAIN_CAT_AK + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HPC_RAIN_CAT_US.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HPC_RAIN_CAT_US.xml new file mode 100644 index 0000000000..af751193a7 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HPC_RAIN_CAT_US.xml @@ -0,0 +1,13 @@ + + + HPC_RAIN_CAT_US + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HRCN.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HRCN.xml new file mode 100644 index 0000000000..96a9415a00 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HRCN.xml @@ -0,0 +1,13 @@ + + + HRCN + pluginName,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ICE12NH.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ICE12NH.xml new file mode 100644 index 0000000000..757a4a2710 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ICE12NH.xml @@ -0,0 +1,13 @@ + + + ICE12NH + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ICE12SH.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ICE12SH.xml new file mode 100644 index 0000000000..1d99248482 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ICE12SH.xml @@ -0,0 +1,13 @@ + + + ICE12SH + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ICE12TH.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ICE12TH.xml new file mode 100644 index 0000000000..c5aac23251 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ICE12TH.xml @@ -0,0 +1,13 @@ + + + ICE12TH + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ICE25NH.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ICE25NH.xml new file mode 100644 index 0000000000..704820a70c --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ICE25NH.xml @@ -0,0 +1,13 @@ + + + ICE25NH + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ICE25SH.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ICE25SH.xml new file mode 100644 index 0000000000..e8452f8846 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ICE25SH.xml @@ -0,0 +1,13 @@ + + + ICE25SH + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ICEP5.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ICEP5.xml new file mode 100644 index 0000000000..cccc54f1fd --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ICEP5.xml @@ -0,0 +1,13 @@ + + + ICEP5 + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/IND.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/IND.xml new file mode 100644 index 0000000000..b6727490a6 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/IND.xml @@ -0,0 +1,13 @@ + + + IND + pluginName,areaName,resolution,imageType,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ISIG.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ISIG.xml new file mode 100644 index 0000000000..42e960683f --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ISIG.xml @@ -0,0 +1,13 @@ + + + ISIG + pluginName,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SolarImage.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/LTNG.xml similarity index 52% rename from edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SolarImage.xml rename to edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/LTNG.xml index 2b9066dd82..930418ed60 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SolarImage.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/LTNG.xml @@ -1,10 +1,10 @@ - SolarImage - pluginName,reportType,satellite,instrument,site,wavelength,intTime,dataTime + LTNG + pluginName,dataTime - + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/LTNG2.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/LTNG2.xml new file mode 100644 index 0000000000..9233290ba9 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/LTNG2.xml @@ -0,0 +1,10 @@ + + + LTNG2 + pluginName,dataTime + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/Radar.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/LocalRadar.xml similarity index 73% rename from edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/Radar.xml rename to edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/LocalRadar.xml index 43f4f9043e..63f0fd5eb3 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/Radar.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/LocalRadar.xml @@ -1,14 +1,13 @@ - Radar + LocalRadar pluginName,icao,productCode,elevationNumber,format,dataTime - - + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/METAR.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/METAR.xml new file mode 100644 index 0000000000..f38144df53 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/METAR.xml @@ -0,0 +1,13 @@ + + + METAR + pluginName,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/METEOSAT10.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/METEOSAT10.xml new file mode 100644 index 0000000000..58371775ec --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/METEOSAT10.xml @@ -0,0 +1,13 @@ + + + METEOSAT10 + pluginName,areaName,resolution,imageType,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/METEOSAT3.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/METEOSAT3.xml new file mode 100644 index 0000000000..95f64df880 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/METEOSAT3.xml @@ -0,0 +1,13 @@ + + + METEOSAT3 + pluginName,areaName,resolution,imageType,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/METEOSAT5.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/METEOSAT5.xml new file mode 100644 index 0000000000..14d33c6d19 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/METEOSAT5.xml @@ -0,0 +1,13 @@ + + + METEOSAT5 + pluginName,areaName,resolution,imageType,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/METEOSAT6.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/METEOSAT6.xml new file mode 100644 index 0000000000..f4fab32e10 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/METEOSAT6.xml @@ -0,0 +1,13 @@ + + + METEOSAT6 + pluginName,areaName,resolution,imageType,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/METEOSAT7.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/METEOSAT7.xml new file mode 100644 index 0000000000..9eff698d0a --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/METEOSAT7.xml @@ -0,0 +1,13 @@ + + + METEOSAT7 + pluginName,areaName,resolution,imageType,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/METEOSAT8.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/METEOSAT8.xml new file mode 100644 index 0000000000..62a50d823b --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/METEOSAT8.xml @@ -0,0 +1,13 @@ + + + METEOSAT8 + pluginName,areaName,resolution,imageType,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/METEOSAT9.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/METEOSAT9.xml new file mode 100644 index 0000000000..b8ef533be0 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/METEOSAT9.xml @@ -0,0 +1,13 @@ + + + METEOSAT9 + pluginName,areaName,resolution,imageType,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MOS.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MOS.xml new file mode 100644 index 0000000000..90ed48c623 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MOS.xml @@ -0,0 +1,13 @@ + + + MOS + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MOS_AK.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MOS_AK.xml new file mode 100644 index 0000000000..240c811234 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MOS_AK.xml @@ -0,0 +1,13 @@ + + + MOS_AK + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_ALR.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_ALR.xml new file mode 100644 index 0000000000..17a3d3d505 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_ALR.xml @@ -0,0 +1,13 @@ + + + MPE_LOCAL_ALR + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_FWR.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_FWR.xml new file mode 100644 index 0000000000..a5fc54e4cc --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_FWR.xml @@ -0,0 +1,13 @@ + + + MPE_LOCAL_FWR + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_MSR.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_MSR.xml new file mode 100644 index 0000000000..8f4925b34a --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_MSR.xml @@ -0,0 +1,13 @@ + + + MPE_LOCAL_MSR + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_ORN.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_ORN.xml new file mode 100644 index 0000000000..de4f61b63f --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_ORN.xml @@ -0,0 +1,13 @@ + + + MPE_LOCAL_ORN + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_RHA.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_RHA.xml new file mode 100644 index 0000000000..e47a3ee01f --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_RHA.xml @@ -0,0 +1,13 @@ + + + MPE_LOCAL_RHA + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_RSA.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_RSA.xml new file mode 100644 index 0000000000..5c34aa4fc0 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_RSA.xml @@ -0,0 +1,13 @@ + + + MPE_LOCAL_RSA + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_SJU.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_SJU.xml new file mode 100644 index 0000000000..55b6d1e6b4 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_SJU.xml @@ -0,0 +1,13 @@ + + + MPE_LOCAL_SJU + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_STR.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_STR.xml new file mode 100644 index 0000000000..a28cf67172 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_STR.xml @@ -0,0 +1,13 @@ + + + MPE_LOCAL_STR + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_TAR.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_TAR.xml new file mode 100644 index 0000000000..9407771f09 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_TAR.xml @@ -0,0 +1,13 @@ + + + MPE_LOCAL_TAR + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_TUA.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_TUA.xml new file mode 100644 index 0000000000..5c48b83fd3 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_TUA.xml @@ -0,0 +1,13 @@ + + + MPE_LOCAL_TUA + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_MOSAIC_ALR.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_MOSAIC_ALR.xml new file mode 100644 index 0000000000..0afe6b7947 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_MOSAIC_ALR.xml @@ -0,0 +1,13 @@ + + + MPE_MOSAIC_ALR + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_MOSAIC_FWR.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_MOSAIC_FWR.xml new file mode 100644 index 0000000000..564be773ac --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_MOSAIC_FWR.xml @@ -0,0 +1,13 @@ + + + MPE_MOSAIC_FWR + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_MOSAIC_MSR.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_MOSAIC_MSR.xml new file mode 100644 index 0000000000..8ddb5217b5 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_MOSAIC_MSR.xml @@ -0,0 +1,13 @@ + + + MPE_MOSAIC_MSR + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_MOSAIC_ORN.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_MOSAIC_ORN.xml new file mode 100644 index 0000000000..7735bbdfce --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_MOSAIC_ORN.xml @@ -0,0 +1,13 @@ + + + MPE_MOSAIC_ORN + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_MOSAIC_RHA.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_MOSAIC_RHA.xml new file mode 100644 index 0000000000..4592fd8d4e --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_MOSAIC_RHA.xml @@ -0,0 +1,13 @@ + + + MPE_MOSAIC_RHA + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_MOSAIC_SJU.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_MOSAIC_SJU.xml new file mode 100644 index 0000000000..8726ee8e5b --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_MOSAIC_SJU.xml @@ -0,0 +1,13 @@ + + + MPE_MOSAIC_SJU + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_MOSAIC_TAR.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_MOSAIC_TAR.xml new file mode 100644 index 0000000000..4044b2f2c9 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_MOSAIC_TAR.xml @@ -0,0 +1,13 @@ + + + MPE_MOSAIC_TAR + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MRF.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MRF.xml new file mode 100644 index 0000000000..e3a4a57478 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MRF.xml @@ -0,0 +1,13 @@ + + + MRF + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MRF160HI.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MRF160HI.xml new file mode 100644 index 0000000000..75c692f027 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MRF160HI.xml @@ -0,0 +1,13 @@ + + + MRF160HI + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MRF190AK.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MRF190AK.xml new file mode 100644 index 0000000000..2864ab6062 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MRF190AK.xml @@ -0,0 +1,13 @@ + + + MRF190AK + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MRF190PR.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MRF190PR.xml new file mode 100644 index 0000000000..3d8e9ba68b --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MRF190PR.xml @@ -0,0 +1,13 @@ + + + MRF190PR + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MRF_NH.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MRF_NH.xml new file mode 100644 index 0000000000..68f43b3d47 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MRF_NH.xml @@ -0,0 +1,13 @@ + + + MRF_NH + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MTS.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MTS.xml new file mode 100644 index 0000000000..9ddcf8a97a --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MTS.xml @@ -0,0 +1,13 @@ + + + MTSAT2 + pluginName,areaName,resolution,imageType,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MTSAT2.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MTSAT2.xml new file mode 100644 index 0000000000..e8c2a0e56d --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MTSAT2.xml @@ -0,0 +1,13 @@ + + + MTS + pluginName,areaName,resolution,imageType,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAEFS_AK.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAEFS_AK.xml new file mode 100644 index 0000000000..ccc0468735 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAEFS_AK.xml @@ -0,0 +1,13 @@ + + + NAEFS_AK + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAEFS_BC.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAEFS_BC.xml new file mode 100644 index 0000000000..4437a81733 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAEFS_BC.xml @@ -0,0 +1,13 @@ + + + NAEFS_BC + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAEFS_US.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAEFS_US.xml new file mode 100644 index 0000000000..4874afd82f --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAEFS_US.xml @@ -0,0 +1,13 @@ + + + NAEFS_US + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM.xml new file mode 100644 index 0000000000..ddbea348a5 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM.xml @@ -0,0 +1,13 @@ + + + NAM + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM11.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM11.xml new file mode 100644 index 0000000000..904d684098 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM11.xml @@ -0,0 +1,13 @@ + + + NAM11 + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM11AK.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM11AK.xml new file mode 100644 index 0000000000..0700aa9edd --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM11AK.xml @@ -0,0 +1,13 @@ + + + NAM11AK + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM12_CNTRL_US.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM12_CNTRL_US.xml new file mode 100644 index 0000000000..60ef6d4bf2 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM12_CNTRL_US.xml @@ -0,0 +1,13 @@ + + + NAM12_CNTRL_US + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM20.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM20.xml new file mode 100644 index 0000000000..8e26ee960a --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM20.xml @@ -0,0 +1,13 @@ + + + NAM20 + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM22AK.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM22AK.xml new file mode 100644 index 0000000000..83886f83a8 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM22AK.xml @@ -0,0 +1,13 @@ + + + NAM22AK + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM32PR.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM32PR.xml new file mode 100644 index 0000000000..88ce1ad4a7 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM32PR.xml @@ -0,0 +1,13 @@ + + + NAM32PR + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM45AK.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM45AK.xml new file mode 100644 index 0000000000..b6d8b8c8b8 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM45AK.xml @@ -0,0 +1,13 @@ + + + NAM45AK + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM80.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM80.xml new file mode 100644 index 0000000000..32ccd5e608 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM80.xml @@ -0,0 +1,13 @@ + + + NAM80 + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM95AK.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM95AK.xml new file mode 100644 index 0000000000..a42a33be07 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM95AK.xml @@ -0,0 +1,13 @@ + + + NAM95AK + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAMDNG5.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAMDNG5.xml new file mode 100644 index 0000000000..ad7484d1ec --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAMDNG5.xml @@ -0,0 +1,13 @@ + + + NAMDNG5 + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAMDNG5_AK.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAMDNG5_AK.xml new file mode 100644 index 0000000000..1f7e81afc1 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAMDNG5_AK.xml @@ -0,0 +1,13 @@ + + + NAMDNG5_AK + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAMDNG5_HI.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAMDNG5_HI.xml new file mode 100644 index 0000000000..c7ad9f7626 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAMDNG5_HI.xml @@ -0,0 +1,13 @@ + + + NAMDNG5_HI + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAMDNG5_PR.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAMDNG5_PR.xml new file mode 100644 index 0000000000..3615e97d3e --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAMDNG5_PR.xml @@ -0,0 +1,13 @@ + + + NAMDNG5_PR + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAMNEST_HI.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAMNEST_HI.xml new file mode 100644 index 0000000000..d8cc5a3ffb --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAMNEST_HI.xml @@ -0,0 +1,13 @@ + + + NAMNEST_HI + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ModelSounding.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAMSND.xml similarity index 66% rename from edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ModelSounding.xml rename to edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAMSND.xml index 77ecc2df6f..c1664d597b 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ModelSounding.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAMSND.xml @@ -1,12 +1,12 @@ - ModelSounding - pluginName,reportType,dataTime + NAMSND + pluginName,dataTime - + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM_00.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM_00.xml new file mode 100644 index 0000000000..b75b44a861 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM_00.xml @@ -0,0 +1,13 @@ + + + NAM_00 + pluginName,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NCON.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NCON.xml new file mode 100644 index 0000000000..532b050510 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NCON.xml @@ -0,0 +1,13 @@ + + + NCON + pluginName,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NMM40.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NMM40.xml new file mode 100644 index 0000000000..c81aad66c0 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NMM40.xml @@ -0,0 +1,13 @@ + + + NMM40 + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NOGAPS.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NOGAPS.xml new file mode 100644 index 0000000000..be6b7fa598 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NOGAPS.xml @@ -0,0 +1,13 @@ + + + NOGAPS + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NOHRSC_SNOW.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NOHRSC_SNOW.xml new file mode 100644 index 0000000000..46c3715d5f --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NOHRSC_SNOW.xml @@ -0,0 +1,13 @@ + + + NOHRSC_SNOW + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NWW3.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NWW3.xml new file mode 100644 index 0000000000..dace8d0f59 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NWW3.xml @@ -0,0 +1,13 @@ + + + NWW3 + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NcGridModelParameters.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NcGridInventory.xml similarity index 90% rename from edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NcGridModelParameters.xml rename to edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NcGridInventory.xml index 4cd1e7fc78..8cea92d378 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NcGridModelParameters.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NcGridInventory.xml @@ -1,6 +1,6 @@ - NcGridModelParameters + NcGridInventory pluginName,info.datasetId,info.secondaryId,info.ensembleId,info.parameter.abbreviation,info.level.masterLevel.name,info.level.levelonevalue,info.level.leveltwovalue diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NcGridSoundingInventory.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NcGridSoundingInventory.xml new file mode 100644 index 0000000000..62a9cecaf4 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NcGridSoundingInventory.xml @@ -0,0 +1,13 @@ + + + NcGridSoundingInventory + + + pluginName,info.datasetId,info.secondaryId,dataTime + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NcGridModelTimes.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NsharpGridInventory.xml similarity index 67% rename from edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NcGridModelTimes.xml rename to edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NsharpGridInventory.xml index 1cb9f9f1c4..6cdc8021c6 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NcGridModelTimes.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NsharpGridInventory.xml @@ -1,7 +1,7 @@ - NcGridModelTimes - pluginName,info.datasetId,info.secondaryId,info.ensembleId,dataTime + NsharpGridInventory + pluginName,info.datasetId,dataTime diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/OFSGMEX.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/OFSGMEX.xml new file mode 100644 index 0000000000..24a76d270a --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/OFSGMEX.xml @@ -0,0 +1,13 @@ + + + OFSGMEX + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/OFSWATL.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/OFSWATL.xml new file mode 100644 index 0000000000..13ebdbaddf --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/OFSWATL.xml @@ -0,0 +1,13 @@ + + + OFSWATL + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/OPCWAVE12_ATL.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/OPCWAVE12_ATL.xml new file mode 100644 index 0000000000..250b980b8e --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/OPCWAVE12_ATL.xml @@ -0,0 +1,13 @@ + + + OPCWAVE12_ATL + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/OPCWAVE12_NPAC.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/OPCWAVE12_NPAC.xml new file mode 100644 index 0000000000..5640a8211e --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/OPCWAVE12_NPAC.xml @@ -0,0 +1,13 @@ + + + OPCWAVE12_NPAC + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/OPCWAVE12_SPAC.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/OPCWAVE12_SPAC.xml new file mode 100644 index 0000000000..78592e9011 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/OPCWAVE12_SPAC.xml @@ -0,0 +1,13 @@ + + + OPCWAVE12_SPAC + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/PIREP.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/PIREP.xml new file mode 100644 index 0000000000..5411e2f98c --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/PIREP.xml @@ -0,0 +1,13 @@ + + + PIREP + pluginName,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/PROB3HR.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/PROB3HR.xml new file mode 100644 index 0000000000..78e2349efc --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/PROB3HR.xml @@ -0,0 +1,13 @@ + + + PROB3HR + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_AUTO_TUA.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_AUTO_TUA.xml new file mode 100644 index 0000000000..d182a8f85c --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_AUTO_TUA.xml @@ -0,0 +1,13 @@ + + + QPE_AUTO_TUA + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_RFC_PTR.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_RFC_PTR.xml new file mode 100644 index 0000000000..3f5177f38e --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_RFC_PTR.xml @@ -0,0 +1,13 @@ + + + QPE_RFC_PTR + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_RFC_RSA.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_RFC_RSA.xml new file mode 100644 index 0000000000..d2394943c1 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_RFC_RSA.xml @@ -0,0 +1,13 @@ + + + QPE_RFC_RSA + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_RFC_STR.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_RFC_STR.xml new file mode 100644 index 0000000000..57652cbb9b --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_RFC_STR.xml @@ -0,0 +1,13 @@ + + + QPE_RFC_STR + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_ALR.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_ALR.xml new file mode 100644 index 0000000000..b05729870f --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_ALR.xml @@ -0,0 +1,13 @@ + + + QPE_XNAV_ALR + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_FWR.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_FWR.xml new file mode 100644 index 0000000000..5473bca941 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_FWR.xml @@ -0,0 +1,13 @@ + + + QPE_XNAV_FWR + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_KRF.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_KRF.xml new file mode 100644 index 0000000000..5b6f0e8091 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_KRF.xml @@ -0,0 +1,13 @@ + + + QPE_XNAV_KRF + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_MSR.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_MSR.xml new file mode 100644 index 0000000000..25154444eb --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_MSR.xml @@ -0,0 +1,13 @@ + + + QPE_XNAV_MSR + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_ORN.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_ORN.xml new file mode 100644 index 0000000000..4f785ed75b --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_ORN.xml @@ -0,0 +1,13 @@ + + + QPE_XNAV_ORN + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_RHA.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_RHA.xml new file mode 100644 index 0000000000..29be5d59be --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_RHA.xml @@ -0,0 +1,13 @@ + + + QPE_XNAV_RHA + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_SJU.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_SJU.xml new file mode 100644 index 0000000000..224fff88aa --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_SJU.xml @@ -0,0 +1,13 @@ + + + QPE_XNAV_SJU + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_TAR.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_TAR.xml new file mode 100644 index 0000000000..d24d1f2ff1 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_TAR.xml @@ -0,0 +1,13 @@ + + + QPE_XNAV_TAR + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_TIR.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_TIR.xml new file mode 100644 index 0000000000..e0fa2f7e4b --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_TIR.xml @@ -0,0 +1,13 @@ + + + QPE_XNAV_TIR + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_TUA.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_TUA.xml new file mode 100644 index 0000000000..a194b051e9 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_TUA.xml @@ -0,0 +1,13 @@ + + + QPE_XNAV_TUA + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QSCT.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QSCT.xml new file mode 100644 index 0000000000..c2ed2a964b --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QSCT.xml @@ -0,0 +1,13 @@ + + + QSCT + pluginName,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RAP.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RAP.xml new file mode 100644 index 0000000000..f8eb39a7e4 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RAP.xml @@ -0,0 +1,13 @@ + + + RAP + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RAP32.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RAP32.xml new file mode 100644 index 0000000000..905f664f5a --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RAP32.xml @@ -0,0 +1,13 @@ + + + RAP32 + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + \ No newline at end of file diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RAP40.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RAP40.xml new file mode 100644 index 0000000000..89d8d34c04 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RAP40.xml @@ -0,0 +1,13 @@ + + + RAP40 + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RCM.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RCM.xml new file mode 100644 index 0000000000..abac17c911 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RCM.xml @@ -0,0 +1,13 @@ + + + RCM + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RFCQPF.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RFCQPF.xml new file mode 100644 index 0000000000..875e421cb5 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RFCQPF.xml @@ -0,0 +1,13 @@ + + + RFCQPF + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RTGSST.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RTGSST.xml new file mode 100644 index 0000000000..95e0b7d28a --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RTGSST.xml @@ -0,0 +1,13 @@ + + + RTGSST + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RTGSSTHR.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RTGSSTHR.xml new file mode 100644 index 0000000000..0b2762ef81 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RTGSSTHR.xml @@ -0,0 +1,13 @@ + + + RTGSSTHR + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RTMA.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RTMA.xml new file mode 100644 index 0000000000..9c2679c197 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RTMA.xml @@ -0,0 +1,13 @@ + + + RTMA + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RTMA_AK.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RTMA_AK.xml new file mode 100644 index 0000000000..f3e8426234 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RTMA_AK.xml @@ -0,0 +1,13 @@ + + + RTMA_AK + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RTMA_GU.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RTMA_GU.xml new file mode 100644 index 0000000000..4a7b40c315 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RTMA_GU.xml @@ -0,0 +1,13 @@ + + + RTMA_GU + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RTMA_HI.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RTMA_HI.xml new file mode 100644 index 0000000000..3672f36c3e --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RTMA_HI.xml @@ -0,0 +1,13 @@ + + + RTMA_HI + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RTMA_PR.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RTMA_PR.xml new file mode 100644 index 0000000000..fabc80a63e --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RTMA_PR.xml @@ -0,0 +1,13 @@ + + + RTMA_PR + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RUC.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RUC.xml new file mode 100644 index 0000000000..7b206c101a --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RUC.xml @@ -0,0 +1,16 @@ + + + RUC + pluginName,info.secondaryId,dataTime + + + + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RUC40.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RUC40.xml new file mode 100644 index 0000000000..adb152e4dc --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RUC40.xml @@ -0,0 +1,16 @@ + + + RUC40 + pluginName,info.secondaryId,dataTime + + + + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SCD.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SCD.xml new file mode 100644 index 0000000000..1c717822b8 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SCD.xml @@ -0,0 +1,13 @@ + + + SCD + pluginName,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SGWH.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SGWH.xml index 17c050c15c..076fdbdcdd 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SGWH.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SGWH.xml @@ -1,8 +1,11 @@ SGWH - pluginName,said,dataTime + pluginName,dataTime + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SHIP.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SHIP.xml new file mode 100644 index 0000000000..45890d0497 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SHIP.xml @@ -0,0 +1,13 @@ + + + SHIP + pluginName,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SPCGUIDE.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SPCGUIDE.xml new file mode 100644 index 0000000000..548fb6f370 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SPCGUIDE.xml @@ -0,0 +1,13 @@ + + + SPCGUIDE + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SREF2P5.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SREF2P5.xml new file mode 100644 index 0000000000..0aeba22174 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SREF2P5.xml @@ -0,0 +1,13 @@ + + + SREF2P5 + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SREF40.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SREF40.xml new file mode 100644 index 0000000000..b014017df7 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SREF40.xml @@ -0,0 +1,13 @@ + + + SREF40 + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SREF45.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SREF45.xml new file mode 100644 index 0000000000..83269c8aa5 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SREF45.xml @@ -0,0 +1,13 @@ + + + SREF45 + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AWW.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SVRL.xml similarity index 81% rename from edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AWW.xml rename to edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SVRL.xml index 5e0b08dea9..f47cc4a37f 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AWW.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SVRL.xml @@ -1,12 +1,12 @@ - AWW + SVRL pluginName,reportType,dataTime - + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/TPC_WIND_PROB.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/TPC_WIND_PROB.xml new file mode 100644 index 0000000000..4b9c0702ba --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/TPC_WIND_PROB.xml @@ -0,0 +1,13 @@ + + + TPC_WIND_PROB + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UAIR.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UAIR.xml new file mode 100644 index 0000000000..b9b33c13dd --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UAIR.xml @@ -0,0 +1,13 @@ + + + UAIR + pluginName,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKENS_ASIA.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKENS_ASIA.xml new file mode 100644 index 0000000000..f675601e6e --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKENS_ASIA.xml @@ -0,0 +1,16 @@ + + + UKENS_ASIA + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKENS_CPAC.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKENS_CPAC.xml new file mode 100644 index 0000000000..1930091a94 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKENS_CPAC.xml @@ -0,0 +1,16 @@ + + + UKENS_CPAC + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKENS_NA.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKENS_NA.xml new file mode 100644 index 0000000000..599e83b9ab --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKENS_NA.xml @@ -0,0 +1,16 @@ + + + UKENS_NA + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKENS_NH.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKENS_NH.xml new file mode 100644 index 0000000000..12d569a211 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKENS_NH.xml @@ -0,0 +1,16 @@ + + + UKENS_NH + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET.xml new file mode 100644 index 0000000000..51831ccbf2 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET.xml @@ -0,0 +1,13 @@ + + + UKMET + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_ASIA.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_ASIA.xml new file mode 100644 index 0000000000..2d6232c484 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_ASIA.xml @@ -0,0 +1,13 @@ + + + UKMET_ASIA + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_AU.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_AU.xml new file mode 100644 index 0000000000..e33a9ea5b2 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_AU.xml @@ -0,0 +1,13 @@ + + + UKMET_AU + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_CPAC.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_CPAC.xml new file mode 100644 index 0000000000..2d5f23d58d --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_CPAC.xml @@ -0,0 +1,13 @@ + + + UKMET_CPAC + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_EU.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_EU.xml new file mode 100644 index 0000000000..515844830b --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_EU.xml @@ -0,0 +1,13 @@ + + + UKMET_EU + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_NA.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_NA.xml new file mode 100644 index 0000000000..a33aa34221 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_NA.xml @@ -0,0 +1,13 @@ + + + UKMET_NA + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_NH.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_NH.xml new file mode 100644 index 0000000000..17d69d6c78 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_NH.xml @@ -0,0 +1,13 @@ + + + UKMET_NH + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_SA.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_SA.xml new file mode 100644 index 0000000000..c740803616 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_SA.xml @@ -0,0 +1,13 @@ + + + UKMET_SA + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_SAF.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_SAF.xml new file mode 100644 index 0000000000..e9fe83645a --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_SAF.xml @@ -0,0 +1,13 @@ + + + UKMET_SAF + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_SPAC.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_SPAC.xml new file mode 100644 index 0000000000..346fe47811 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_SPAC.xml @@ -0,0 +1,13 @@ + + + UKMET_SPAC + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/VAAC.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/VAAC.xml new file mode 100644 index 0000000000..d181dfd3d7 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/VAAC.xml @@ -0,0 +1,13 @@ + + + VAAC + pluginName,areaName,resolution,imageType,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WARN.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WARN.xml new file mode 100644 index 0000000000..ac563a202f --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WARN.xml @@ -0,0 +1,13 @@ + + + WARN + pluginName,reportType,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WATCH.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WATCH.xml new file mode 100644 index 0000000000..17ed5a8fd2 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WATCH.xml @@ -0,0 +1,13 @@ + + + WATCH + pluginName,reportType,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE10AK.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE10AK.xml new file mode 100644 index 0000000000..baf6bf7516 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE10AK.xml @@ -0,0 +1,13 @@ + + + WAVE10AK + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE10AK_2.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE10AK_2.xml new file mode 100644 index 0000000000..f799328b45 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE10AK_2.xml @@ -0,0 +1,13 @@ + + + WAVE10AK_2 + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE10EP.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE10EP.xml new file mode 100644 index 0000000000..9c602d6d02 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE10EP.xml @@ -0,0 +1,13 @@ + + + WAVE10EP + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE10EP_2.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE10EP_2.xml new file mode 100644 index 0000000000..de1ffb92f6 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE10EP_2.xml @@ -0,0 +1,13 @@ + + + WAVE10EP_2 + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE10WC.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE10WC.xml new file mode 100644 index 0000000000..db1a210e6f --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE10WC.xml @@ -0,0 +1,13 @@ + + + WAVE10WC + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE10WC_2.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE10WC_2.xml new file mode 100644 index 0000000000..cd780596af --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE10WC_2.xml @@ -0,0 +1,13 @@ + + + WAVE10WC_2 + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE10WNA.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE10WNA.xml new file mode 100644 index 0000000000..1f6b0ab0e3 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE10WNA.xml @@ -0,0 +1,13 @@ + + + WAVE10WNA + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE10WNA_2.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE10WNA_2.xml new file mode 100644 index 0000000000..555c3b2ec3 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE10WNA_2.xml @@ -0,0 +1,13 @@ + + + WAVE10WNA_2 + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE2AK.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE2AK.xml new file mode 100644 index 0000000000..c8e32b2e6f --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE2AK.xml @@ -0,0 +1,13 @@ + + + WAVE2AK + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE30MAO.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE30MAO.xml new file mode 100644 index 0000000000..83f39723c8 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE30MAO.xml @@ -0,0 +1,13 @@ + + + WAVE30MAO + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE30MGLOBAL.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE30MGLOBAL.xml new file mode 100644 index 0000000000..58d4508f0b --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE30MGLOBAL.xml @@ -0,0 +1,13 @@ + + + WAVE30MGLOBAL + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE4AK.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE4AK.xml new file mode 100644 index 0000000000..a2a93ecc67 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE4AK.xml @@ -0,0 +1,13 @@ + + + WAVE4AK + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE4AK_2.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE4AK_2.xml new file mode 100644 index 0000000000..42746cc852 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE4AK_2.xml @@ -0,0 +1,13 @@ + + + WAVE4AK_2 + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE4ENP.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE4ENP.xml new file mode 100644 index 0000000000..9ce23392ba --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE4ENP.xml @@ -0,0 +1,13 @@ + + + WAVE4ENP + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE4ENP_2.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE4ENP_2.xml new file mode 100644 index 0000000000..21ef9e7fcf --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE4ENP_2.xml @@ -0,0 +1,13 @@ + + + WAVE4ENP_2 + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE4WC.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE4WC.xml new file mode 100644 index 0000000000..27cbc7e439 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE4WC.xml @@ -0,0 +1,13 @@ + + + WAVE4WC + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE4WC_2.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE4WC_2.xml new file mode 100644 index 0000000000..51399f20c9 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE4WC_2.xml @@ -0,0 +1,13 @@ + + + WAVE4WC_2 + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE4WNA.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE4WNA.xml new file mode 100644 index 0000000000..99b8a73d44 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE4WNA.xml @@ -0,0 +1,13 @@ + + + WAVE4WNA + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE4WNA_2.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE4WNA_2.xml new file mode 100644 index 0000000000..69965bbe12 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE4WNA_2.xml @@ -0,0 +1,13 @@ + + + WAVE4WNA_2 + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVEP25WNA.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVEP25WNA.xml new file mode 100644 index 0000000000..128155ff67 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVEP25WNA.xml @@ -0,0 +1,13 @@ + + + WAVEP25WNA + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVEP25WNA_2.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVEP25WNA_2.xml new file mode 100644 index 0000000000..040c114af7 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVEP25WNA_2.xml @@ -0,0 +1,13 @@ + + + WAVEP25WNA_2 + pluginName,info.ensembleId,info.secondaryId,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WCN.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WCN.xml new file mode 100644 index 0000000000..dbcbdce7e7 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WCN.xml @@ -0,0 +1,13 @@ + + + WCN + pluginName,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WCP.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WCP.xml new file mode 100644 index 0000000000..777d6cb04b --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WCP.xml @@ -0,0 +1,13 @@ + + + WCP + pluginName,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WOU.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WOU.xml new file mode 100644 index 0000000000..34053fb4a8 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WOU.xml @@ -0,0 +1,13 @@ + + + WOU + pluginName,reportType,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WSAT.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WSAT.xml new file mode 100644 index 0000000000..1d7b2c68a2 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WSAT.xml @@ -0,0 +1,13 @@ + + + WSAT + pluginName,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WSTM.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WSTM.xml new file mode 100644 index 0000000000..d1b6ead951 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WSTM.xml @@ -0,0 +1,13 @@ + + + WSTM + pluginName,reportType,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WSTM2.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WSTM2.xml new file mode 100644 index 0000000000..5dde743f03 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WSTM2.xml @@ -0,0 +1,13 @@ + + + WSTM2 + pluginName,dataTime + + + + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/python/MasterInterface.py b/edexOsgi/build.edex/esb/data/utility/common_static/base/python/MasterInterface.py index 40d6655c57..8710a976dc 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/python/MasterInterface.py +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/python/MasterInterface.py @@ -33,7 +33,6 @@ # ------------ ---------- ----------- -------------------------- # 10/20/08 njensen Initial Creation. # 01/17/13 1486 dgilling Make a new-style class. -# 09/23/13 16614 njensen Fixed reload method # # # @@ -121,8 +120,7 @@ class MasterInterface(object): if self.isInstantiated(moduleName): self.__instanceMap.__delitem__(moduleName) if sys.modules.has_key(moduleName): - self.clearModuleAttributes(moduleName) - sys.modules.pop(moduleName) + sys.modules.__delitem__(moduleName) if moduleName in self.scripts: self.scripts.remove(moduleName) @@ -130,8 +128,7 @@ class MasterInterface(object): # we may be overriding something in self.scripts, so let's # force an import here if moduleName in self.scripts: - self.clearModuleAttributes(moduleName) - sys.modules.pop(moduleName) + sys.modules.__delitem__(moduleName) __import__(moduleName) if not moduleName in self.scripts: self.scripts.append(moduleName) @@ -143,27 +140,10 @@ class MasterInterface(object): def reloadModule(self, moduleName): if sys.modules.has_key(moduleName): - # From the python documentation: - # "When a module is reloaded, its dictionary (containing the module's - # global variables) is retained. Redefinitions of names will override the - # old definitions, so this is generally not a problem. If the new version - # of a module does not define a name that was defined by the old - # version, the old definition remains." - # - # - # Because the user might have removed items - # from the module's dictionary, we cannot trust reload() to - # remove old items. We will manually remove everything - # but built-ins to ensure everything gets re-initialized when - # reload() is called. - self.clearModuleAttributes(moduleName) - reload(sys.modules[moduleName]) - - def clearModuleAttributes(self, moduleName): - if sys.modules.has_key(moduleName): - mod = sys.modules[moduleName] - modGlobalsToRemove = [k for k in mod.__dict__ if not k.startswith('_')] - for k in modGlobalsToRemove: - mod.__dict__.pop(k) + # because the user might have added or removed items + # from the module's dictionary, we cannot trust reload() here. + sys.modules.__delitem__(moduleName) + __import__(moduleName) + - + \ No newline at end of file diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/VM_global_library.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/VM_global_library.vm index ce5032bd03..8386264e1c 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/VM_global_library.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/VM_global_library.vm @@ -9,7 +9,6 @@ ##### Evan Bookbinder 02-06-2013 Added WrapText macro to handle customization of indents ##### like the ~ and % characters in A1. ##### Evan Bookbinder 05-05-2013 handleClosesPoints and 3rd bullet changes (OVER & now) -##### Evan Bookbinder 09-20-2013 Fixed rural area otherPoints in pathcast section, added rural phrase #################################################################################################### #* Mile Marker Test Code @@ -32,7 +31,7 @@ $simplify is a boolean value (true or false) ### AUTHORS: EVAN BOOKBINDER & MIKE DANGELO ### PURPOSE: OUTPUT MILE MARKER, ROAD, INTERSECTION INFO -#macro(mmarkers $markers $id $name $type $simplify) +#macro(mmarkers$markers $id $name $type $simplify) #set($size = ${list.size($markers)}) #if(${type.length()} > 0) #set($singType = "${type} ") @@ -416,7 +415,6 @@ ${mathUtil.round(${motspd})}KT ## ########END MACRO #macro(handleClosestPoints $list, $points1, $points2, $stormType, $nearText, $nearThreshold, $overText, $overThreshold, $units, $useSecondRef) -#if(${list.size($points1)} > 0) #if(${stormType} == "line") #set($used = []) #set($used1 = []) @@ -465,10 +463,6 @@ ${location}## ${location}## #end #end -#else -###NO POINTS FOUND -OVER ${noLocPhrase} OF !** ENTER STORM DOT COUNTY/ZONE PORTION **! -#end #end ########END MACRO @@ -523,7 +517,7 @@ ${closestPoint.roundedDistance} ${units} #direction(${closestPoint.oppositeRound ### CHECK FOR DUPLICATE COUNTY NAMES WITHIN A CWA #parse("dupCounties.vm") #foreach (${area} in ${areas}) -#if(${list.contains($dupcounties, "${area.state_zone}")}) +#if(${list.contains($dupcounties, "${area.fips}")}) #set($useStates = true) #end #end @@ -590,10 +584,8 @@ THE ## #end ${prevCounty}## #if((${prevCountyType} != ${area.areaNotation} || ${useStates} == true) && ${prevStateAbbrev} != "DC") -#if(${prevCountyType.length()} > 0) ${prevCountyType}## #end -#end #if(${useStates} == true && ${prevStateAbbrev} != "DC") IN ## #areaFormat(${prevPartOfState} ${useCentralState} ${useExtremeState} true)## @@ -611,16 +603,12 @@ ${prevCounty}## #if(${prevCountyType} != ${area.areaNotation} || ${useStates} == true) #if(${countyCount} > 1) #if(${prevCountiesType}) -#if(${prevCountiesType.length()} > 0) ${prevCountiesType}## #end -#end #elseif(${prevCountyType}) -#if(${prevCountyType.length()} > 0) ${prevCountyType}## #end #end -#end #if(${useStates} == true && ${prevStateAbbrev} != "DC") IN ## #areaFormat(${prevPartOfState} ${useCentralState} ${useExtremeState} true)## @@ -644,16 +632,12 @@ ${prevCounty}## #if(${prevStateAbbrev} != "DC" && (${prevCountyType} != ${area.areaNotation} || (${prevCountyType} != ${area.areaNotation} || ((${prevState} != ${area.parentRegion} || ${prevPartOfState} != ${partOfState}) && ${useStates} == true)))) #if(${countyCount} > 1) #if(${prevCountiesType}) -#if(${prevCountiesType.length()} > 0) ${prevCountiesType}## #end -#end #elseif(${prevCountyType}) -#if(${prevCountyType.length()} > 0) ${prevCountyType}## #end #end -#end #if((${prevCountyType} != ${area.areaNotation} || ((${prevState} != ${area.parentRegion} || ${prevPartOfState} != ${partOfState}) && ${useStates} == true)) && ${prevStateAbbrev} != "DC") IN ## #areaFormat(${prevPartOfState} ${useCentralState} ${useExtremeState} true)## @@ -668,9 +652,9 @@ THE ## #end ${area.name}## #if(${area.areasNotation}) -#if(${countyCount} >= 1 && ${area.areasNotation.length()} > 0) +#if(${countyCount} >= 1) ${area.areasNotation}## -#elseif(${area.areasNotation.length()} > 0) +#else ${area.areaNotation}## #end #end @@ -693,10 +677,7 @@ THE ## #if(${area.partOfArea}) #areaFormat(${area.partOfArea} ${useCentralCounty} ${useExtremeCounty} true)## #end -${area.name}## -#if(${area.areasNotation.length()} > 0) - ${area.areaNotation}## -#end +${area.name} ${area.areaNotation}## #if(${useStates} == true && ${area.stateabbr} != "DC") IN ## #areaFormat(${partOfState} ${useCentralState} ${useExtremeState} true)## @@ -877,11 +858,7 @@ THE ## #end ${prevZone}## #if(${useStates} == true && ${prevStateAbbrev} != "DC") -#if(${prevStateAbbrev.length()} > 0) IN ## -#else -IN ## -#end #areaFormat(${prevPartOfState} ${useCentralState} ${useExtremeState} true)## ${prevState}## #end @@ -895,11 +872,7 @@ THE ## #end ${prevZone}## #if(${useStates} == true && ${prevStateAbbrev} != "DC") -#if(${prevStateAbbrev.length()} > 0) IN ## -#else -IN ## -#end #areaFormat(${prevPartOfState} ${useCentralState} ${useExtremeState} true)## ${prevState}## #end @@ -919,11 +892,7 @@ THE ## #end ${prevZone}## #if(((${prevState} != ${area.parentRegion} || ${prevPartOfState} != ${partOfState}) && ${useStates} == true)) && ${prevStateAbbrev} != "DC") -#if(${prevStateAbbrev.length()} > 0) IN ## -#else -IN ## -#end #areaFormat(${prevPartOfState} ${useCentralState} ${useExtremeState} true)## ${prevState}## #end @@ -936,11 +905,7 @@ THE ## #end ${area.name}## #if(${useStates} == true && ${prevStateAbbrev} != "DC") -#if(${prevStateAbbrev.length()} > 0) IN ## -#else -IN ## -#end #areaFormat(${partOfState} ${useCentralState} ${useExtremeState} true)## ${area.parentRegion}## #end @@ -956,11 +921,7 @@ THE ## #end ${area.name} ## #if(${useStates} == true && ${area.stateabbr} != "DC") -#if(${area.stateabbr.length()} > 0) IN ## -#else -IN ## -#end #areaFormat(${partOfState} ${useCentralState} ${useExtremeState} true)## ${area.parentRegion}## #end @@ -1007,11 +968,7 @@ ${prevZone}## #if(${area.partOfArea}) #areaFormat(${area.partOfArea} true true true)## #end -#if(${area.areaNotation.length()} > 0) ${area.name} ${area.areaNotation} IN ## -#else -${area.name} IN ## -#end #areaFormat(${area.partOfParentRegion} true false true)## ${area.parentRegion}... ##OUTPUT FOR D.C. @@ -1052,14 +1009,6 @@ ${area.parentRegion}... #elseif(${list.size($areas)} == 1 && ${list.get(${areas},0).stateabbr} == "LA") THE FOLLOWING PARISH... -##ONE LOCATION AND ONLY Alaska -#elseif(${list.size($areas)} == 1 && ${list.get(${areas},0).stateabbr} == "AK") -THE FOLLOWING AREA... - -##ONE LOCATION AND ONLY PR -#elseif(${list.size($areas)} == 1 && ${list.get(${areas},0).stateabbr} == "PR") -THE FOLLOWING MUNICIPALITY... - ##ONE LOCATION OTHERWISE #elseif(${list.size($areas)} == 1) THE FOLLOWING COUNTY... @@ -1071,16 +1020,8 @@ THE FOLLOWING COUNTY... #end #end #if(${parishFlag} == 0) -#if(${area.stateabbr} == "AK") -THE FOLLOWING MUNICIPALITIES... - -#elseif(${area.stateabbr} == "PR") -THE FOLLOWING AREAS... - -#else THE FOLLOWING COUNTIES... -#end #elseif(${list.size($areas)} == ${parishFlag}) THE FOLLOWING PARISHES... @@ -1250,15 +1191,15 @@ ${location}## #if($marineFlag == 1) ${otherLead} WILL REMAIN OVER MAINLY OPEN WATERS. #else -${otherLead} WILL REMAIN OVER ${noLocPhrase} OF ## +${otherLead} WILL REMAIN OVER MAINLY RURAL AREAS OF ## #headlineLocList(${areas} true true true false).## ###NOW SEARCH FOR OTHER POINTS (PRESUMABLY 3s) AND LIST THEM HERE ### NEED TO CODE THIS ONCE SECTION IS ADDED -#set($numOtherPoints = ${list.size($otherPoints)}) +#set($numOtherPoints = ${list.size($thirdTier)}) #if($numOtherPoints > 0) -..INCLUDING THE FOLLOWING LOCATIONS...## +..INCLUDING THE FOLLOWING LOCATIONS ## #set($count = 0) -#foreach(${loc} in ${otherPoints}) +#foreach(${loc} in ${thirdTier}) #set($count = $count + 1) #if(${loc.partOfArea}) #set($location = "#areaFormat(${loc.partOfArea} true false false) ${loc.name}") @@ -1266,7 +1207,7 @@ ${otherLead} WILL REMAIN OVER ${noLocPhrase} OF ## #else #set($location = "${loc.name}") #end -${location}## +${location.name}## #if($count == $numOtherPoints - 1) AND ## #elseif($count < $numOtherPoints) @@ -1435,7 +1376,7 @@ AND ${strOutput} ${ruralPhrase} WILL REMAIN OVER MAINLY OPEN WATERS. #else ## NO MAJOR POINTS FOUND. LIST RURAL AREAS -${ruralPhrase} WILL REMAIN OVER ${noLocPhrase} OF #headlineLocList(${areas} true true true false).## +${ruralPhrase} WILL REMAIN OVER MAINLY RURAL AREAS OF #headlineLocList(${areas} true true true false).## #set($numMinorPoints = ${list.size($otherLocList)}) #if(${numMinorPoints} == 1) ..WHICH INCLUDES ## diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/airportWeatherWarning.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/airportWeatherWarning.vm index 925363999f..6e81ff75e1 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/airportWeatherWarning.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/airportWeatherWarning.vm @@ -2,10 +2,10 @@ ## AIRPORT WEATHER WARNING TEMPLATE ## ## EXAMPLE TEMPLATE USING HUNTSVILLE PRODUCT ## ## CREATED BY PHIL KURIMSKI - WFO DTX ## -## UPDATED EVAN BOOKBINDER 9-18-2013 Implemented config.vm -################################################################## +## VERSION AWIPS II 1.0 -- APR 12 2012 ## +## VERSION AWIPS II 1.1 -- SEP 12 2012 OB12.9.1-12 ## +###################################################### ## -#parse("config.vm") ${WMOId} ${vtecOffice} 000000 ${BBBId} AWW${siteId} #if(${productClass}=="T") @@ -23,14 +23,11 @@ ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} #end ${ugcline} +#set($zoneList = "") #foreach (${area} in ${areas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## +#set($zoneList = "${zoneList}${area.name}-") #end --## -#end - +${zoneList} ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} @@ -111,6 +108,8 @@ FOR THE FOLLOWING THREATS... #end +## parse file command here is to pull in mile marker info +## #parse("mileMarkers.vm") #end ############# ## WATCHES ## diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/airportWeatherWarning.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/airportWeatherWarning.xml index 515b9be7ff..bcfb659b62 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/airportWeatherWarning.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/airportWeatherWarning.xml @@ -2,24 +2,9 @@ + Updated Evan Bookbinder 5-5-13 to change units per Directive --> - - - - - - - - - nmi kn @@ -31,10 +16,9 @@ turned on unless the corresponding .vm file is turned on in a given template's . ACARS Airport Locations Forecast Zones - + - COR @@ -112,4 +96,168 @@ turned on unless the corresponding .vm file is turned on in a given template's . + + + + + + + + + Zone + 0 + AND + 0 + + NAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + STATE_ZONE + + NAME + + parent + + + + + + + 25 + + + + NAME + 1 + AREA + TRACK + true + 10 + 10 + + distance + + + + + + + + + + + + + + NAME + AREA + POINTS + + + + + + + + + 1 + 100 + + distance + warngenlev + + + + + NAME + AREA + POINTS + + + + + + + + + 5 + 100 + + distance + warngenlev + + + + + AREA + true + 8.0 + 5 + 5 + 10 + 8 + Name + + NAME --> + STATE + STATE + countyTypes.txt + + warngenlev + population + distance + + + + + + + + + + + + + NAME + 1 + AREA + TRACK + true + 20 + 10 + + + + + + + + + + warngenlev + population + distance + + + + + + + + + + WarnGenLoc + + Zone + States + TIMEZONES + TIME_ZONE + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodAdvisory.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodAdvisory.vm index d24a1e0afd..ecc8003cf1 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodAdvisory.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodAdvisory.vm @@ -1,21 +1,18 @@ #################### ## FLOOD ADVISORY ## #################### -################################################################################### -## Edited by Phil Kurimski 08-17-2011 for OB11.8.0-4 ## -## Evan Bookbinder 09-16-2011 for OB11.8.0-8 ## -## Mike Dangelo 09-19-2011 at Alaska TIM ## -## Mike Dangelo 01-25-2012 at CRH TIM ## -## Evan Bookbinder 02-24-2012 ## -## Phil Kurimski 02-28-2012 for OB 12.2.1-3 ## -## Evan Bookbinder 04-25-2012 for OB 12.3.1 (MND) ## -## Mike Dangelo 09-13-2012 minor tweaks to ${variables} ## -## Phil Kurimski 09-13-2012 for OB 12.9.1-12 ## -## Phil Kurimski 02-05-2013 for OB13.2.1-3 Added rain so far section ## -## Mike Dangelo 09-18-2013 added code for init pos & pathcasting ## -## Evan Bookbinder 09-18-2013 implemented config.vm -################################################################################### -#parse("config.vm") +################################################################################## +## Edited by Phil Kurimski 8-17-2011 for OB11.8.0-4 ## +## Evan Bookbinder 9-16-2011 for OB11.8.0-8 ## +## Mike Dangelo 9-19-2011 at Alaska TIM ## +## Mike Dangelo 1-25-2012 at CRH TIM ## +## Evan Bookbinder 2-24-2012 ## +## Phil Kurimski 2-28-2012 for OB 12.2.1-3 ## +## Evan Bookbinder 4-25-2012 for OB 12.3.1 (MND) ## +## Mike Dangelo 9-13-2012 minor tweaks to ${variables} ## +## Phil Kurimski 9-13-2012 for OB 12.9.1-12 ## +## Phil Kurimski 2-05-2013 for OB13.2.1-3 Added rain so far section ## +################################################################################## #if(${action} == "EXT") #set($starttime = "000000T0000Z") #set($extend = true) @@ -93,11 +90,7 @@ ${ugcline} /${productClass}.${action}.${vtecOffice}.FA.Y.${etn}.${starttime}-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ /00000.N.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ #foreach (${area} in ${areas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} @@ -156,76 +149,76 @@ ${advType} FOR... #set($rainAmount = "!** RAINFALL AMOUNTS **! INCHES OF RAIN HAVE FALLEN.") #end #if(${list.contains(${bullets}, "doppler")}) - #set($report = "DOPPLER RADAR INDICATED ${cause} THAT WILL CAUSE ${advTypeShort}${report2} IN THE ADVISORY AREA.") + #set($report = "DOPPLER RADAR INDICATED ${cause} THAT WILL CAUSE ${advTypeShort}${report2} IN THE ADVISORY AREA") #end #if(${list.contains(${bullets}, "doppler")} && ${list.contains(${bullets}, "actual")}) - #set($report = "DOPPLER RADAR INDICATED ${cause} CAUSING ${advTypeShort}${report2} IN THE ADVISORY AREA.") + #set($report = "DOPPLER RADAR INDICATED ${cause} CAUSING ${advTypeShort}${report2} IN THE ADVISORY AREA") #end #if(${list.contains(${bullets}, "doppler")} && ${list.contains(${bullets}, "thunder")}) - #set($report = "DOPPLER RADAR INDICATED ${cause} DUE TO THUNDERSTORMS. THIS WILL CAUSE ${advTypeShort}${report2} IN THE ADVISORY AREA.") + #set($report = "DOPPLER RADAR INDICATED ${cause} DUE TO THUNDERSTORMS. THIS WILL CAUSE ${advTypeShort}${report2} IN THE ADVISORY AREA") #end #if(${list.contains(${bullets}, "dopplerGauge")}) - #set($report = "DOPPLER RADAR AND AUTOMATED RAIN GAUGES INDICATED ${cause} WHICH WILL CAUSE ${advTypeShort}${report2} IN THE ADVISORY AREA.") + #set($report = "DOPPLER RADAR AND AUTOMATED RAIN GAUGES INDICATED ${cause} WHICH WILL CAUSE ${advTypeShort}${report2} IN THE ADVISORY AREA") #end #if(${list.contains(${bullets}, "dopplerGauge")} && ${list.contains(${bullets}, "actual")}) - #set($report = "DOPPLER RADAR INDICATED ${cause} CAUSING ${advTypeShort}${report2} IN THE ADVISORY AREA.") + #set($report = "DOPPLER RADAR INDICATED ${cause} CAUSING ${advTypeShort}${report2} IN THE ADVISORY AREA") #end #if(${list.contains(${bullets}, "dopplerGauge")} && ${list.contains(${bullets}, "thunder")}) - #set($report = "DOPPLER RADAR AND AUTOMATED RAIN GAUGES INDICATED ${cause} DUE TO THUNDERSTORMS. THIS WILL CAUSE ${advTypeShort}${report2} IN THE ADVISORY AREA.") + #set($report = "DOPPLER RADAR AND AUTOMATED RAIN GAUGES INDICATED ${cause} DUE TO THUNDERSTORMS. THIS WILL CAUSE ${advTypeShort}${report2} IN THE ADVISORY AREA") #end #if(${list.contains(${bullets}, "trainedSpotters")}) - #set($report = "TRAINED WEATHER SPOTTERS REPORTED ${cause} CAUSING ${advTypeShort} IN !** LOCATION **!${report2}.") + #set($report = "TRAINED WEATHER SPOTTERS REPORTED ${cause} CAUSING ${advTypeShort} IN !** LOCATION **!${report2}") #end #if(${list.contains(${bullets}, "trainedSpotters")} && ${list.contains(${bullets}, "thunder")}) - #set($report = "TRAINED WEATHER SPOTTERS REPORTED ${cause} IN !** LOCATION **! DUE TO THUNDERSTORMS. THIS WILL CAUSE ${advTypeShort}${report2}.") + #set($report = "TRAINED WEATHER SPOTTERS REPORTED ${cause} IN !** LOCATION **! DUE TO THUNDERSTORMS. THIS WILL CAUSE ${advTypeShort}${report2}") #end #if(${list.contains(${bullets}, "trainedSpotters")} && ${list.contains(${bullets}, "actual")}) - #set($report = "TRAINED WEATHER SPOTTERS REPORTED ${cause} CAUSING ${advTypeShort} IN !** LOCATION **!${report2}.") + #set($report = "TRAINED WEATHER SPOTTERS REPORTED ${cause} CAUSING ${advTypeShort} IN !** LOCATION **!${report2}") #end #if(${list.contains(${bullets}, "trainedSpotters")} && ${list.contains(${bullets}, "plainRain")}) - #set($report = "TRAINED WEATHER SPOTTERS REPORTED ${cause} IN !** LOCATION **! THAT WILL CAUSE ${advTypeShort}${report2}.") + #set($report = "TRAINED WEATHER SPOTTERS REPORTED ${cause} IN !** LOCATION **! THAT WILL CAUSE ${advTypeShort}${report2}") #end #if(${list.contains(${bullets}, "lawEnforcement")}) - #set($report = "LOCAL LAW ENFORCEMENT REPORTED ${cause} CAUSING ${advTypeShort} IN !** LOCATION **!${report2}.") + #set($report = "LOCAL LAW ENFORCEMENT REPORTED ${cause} CAUSING ${advTypeShort} IN !** LOCATION **!${report2}") #end #if(${list.contains(${bullets}, "lawEnforcement")} && ${list.contains(${bullets}, "thunder")}) - #set($report = "LOCAL LAW ENFORCEMENT REPORTED ${cause} IN !** LOCATION **! DUE TO THUNDERSTORMS. THIS WILL CAUSE ${advTypeShort}${report2}.") + #set($report = "LOCAL LAW ENFORCEMENT REPORTED ${cause} IN !** LOCATION **! DUE TO THUNDERSTORMS. THIS WILL CAUSE ${advTypeShort}${report2}") #end #if(${list.contains(${bullets}, "lawEnforcement")} && ${list.contains(${bullets}, "actual")}) - #set($report = "LOCAL LAW ENFORCEMENT REPORTED ${cause} CAUSING ${advTypeShort} IN !** LOCATION **!${report2}.") + #set($report = "LOCAL LAW ENFORCEMENT REPORTED ${cause} CAUSING ${advTypeShort} IN !** LOCATION **!${report2}") #end #if(${list.contains(${bullets}, "lawEnforcement")} && ${list.contains(${bullets}, "plainRain")}) - #set($report = "LOCAL LAW ENFORCEMENT REPORTED ${cause} IN !** LOCATION **! THAT WILL CAUSE ${advTypeShort}${report2}.") + #set($report = "LOCAL LAW ENFORCEMENT REPORTED ${cause} IN !** LOCATION **! THAT WILL CAUSE ${advTypeShort}${report2}") #end #if(${list.contains(${bullets}, "emergencyManagement")}) - #set($report = "EMERGENCY MANAGEMENT REPORTED ${cause} CAUSING ${advTypeShort} IN !** LOCATION **!${report2}.") + #set($report = "EMERGENCY MANAGEMENT REPORTED ${cause} CAUSING ${advTypeShort} IN !** LOCATION **!${report2}") #end #if(${list.contains(${bullets}, "emergencyManagement")} && ${list.contains(${bullets}, "thunder")}) - #set($report = "EMERGENCY MANAGEMENT REPORTED ${cause} IN !** LOCATION **! DUE TO THUNDERSTORMS. THIS WILL CAUSE ${advTypeShort}${report2}.") + #set($report = "EMERGENCY MANAGEMENT REPORTED ${cause} IN !** LOCATION **! DUE TO THUNDERSTORMS. THIS WILL CAUSE ${advTypeShort}${report2}") #end #if(${list.contains(${bullets}, "emergencyManagement")} && ${list.contains(${bullets}, "actual")}) - #set($report = "EMERGENCY MANAGEMENT REPORTED ${cause} CAUSING ${advTypeShort} IN !** LOCATION **!${report2}.") + #set($report = "EMERGENCY MANAGEMENT REPORTED ${cause} CAUSING ${advTypeShort} IN !** LOCATION **!${report2}") #end #if(${list.contains(${bullets}, "emergencyManagement")} && ${list.contains(${bullets}, "plainRain")}) - #set($report = "EMERGENCY MANAGEMENT REPORTED ${cause} IN !** LOCATION **! THAT WILL CAUSE ${advTypeShort}${report2}.") + #set($report = "EMERGENCY MANAGEMENT REPORTED ${cause} IN !** LOCATION **! THAT WILL CAUSE ${advTypeShort}${report2}") #end #if(${list.contains(${bullets}, "public")}) - #set($report = "THE PUBLIC REPORTED ${cause} CAUSING ${advTypeShort} IN !** LOCATION **!${report2}.") + #set($report = "THE PUBLIC REPORTED ${cause} CAUSING ${advTypeShort} IN !** LOCATION **!${report2}") #end #if(${list.contains(${bullets}, "public")} && ${list.contains(${bullets}, "thunder")}) - #set($report = "THE PUBLIC REPORTED ${cause} IN !** LOCATION **! DUE TO THUNDERSTORMS. THIS WILL CAUSE ${advTypeShort}${report2}.") + #set($report = "THE PUBLIC REPORTED ${cause} IN !** LOCATION **! DUE TO THUNDERSTORMS. THIS WILL CAUSE ${advTypeShort}${report2}") #end #if(${list.contains(${bullets}, "public")} && ${list.contains(${bullets}, "actual")}) - #set($report = "THE PUBLIC REPORTED ${cause} CAUSING ${advTypeShort} IN !** LOCATION **!${report2}.") + #set($report = "THE PUBLIC REPORTED ${cause} CAUSING ${advTypeShort} IN !** LOCATION **!${report2}") #end #if(${list.contains(${bullets}, "public")} && ${list.contains(${bullets}, "plainRain")}) - #set($report = "THE PUBLIC REPORTED ${cause} IN !** LOCATION **! THAT WILL CAUSE ${advTypeShort}${report2}.") + #set($report = "THE PUBLIC REPORTED ${cause} IN !** LOCATION **! THAT WILL CAUSE ${advTypeShort}${report2}") #end #if(${list.contains(${bullets}, "satelliteEstimates")}) - #set($report = "SATELLITE ESTIMATES INDICATE ${cause} IN !** LOCATION **! THAT WILL CAUSE ${advTypeShort}${report2}.") + #set($report = "SATELLITE ESTIMATES INDICATE ${cause} IN !** LOCATION **! THAT WILL CAUSE ${advTypeShort}${report2}") #end #if(${list.contains(${bullets}, "satelliteEstimates")} && ${list.contains(${bullets}, "thunder")}) - #set($report = "SATELLITE ESTIMATES INDICATE ${cause} FROM THUNDERSTORMS OVER !** LOCATION **! THAT WILL CAUSE ${advTypeShort}${report2}.") + #set($report = "SATELLITE ESTIMATES INDICATE ${cause} FROM THUNDERSTORMS OVER !** LOCATION **! THAT WILL CAUSE ${advTypeShort}${report2}") #end * ## #if(${productClass}=="T") @@ -235,76 +228,21 @@ THIS IS A TEST MESSAGE. ## ###Leave two blank lines here######### -################################# -######## THIRD BULLET ########### -################################# * ## #if(${productClass}=="T") THIS IS A TEST MESSAGE. ## #end -############# IF TRACK IS ENABLED AND stormPosition SELECTED ############################################### -#if(${list.contains(${bullets},"stormPosition")}) #thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) -#if(${stormType} == "line") -...A LINE OF THUNDERSTORMS PRODUCING HEAVY RAIN WAS LOCATED ## -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxLandNearDistance}, ${overPhrase}, ${maxLandOverDistance}, ${landDistanceUnits}, ${useSecondReferenceLine}) -#else -...A THUNDERSTORM PRODUCING HEAVY RAIN WAS LOCATED ## -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxLandNearDistance}, ${overPhrase}, ${maxLandOverDistance}, ${landDistanceUnits}, ${useSecondReferenceCell}) -#end -#if(${movementSpeed} < ${landStationary} || ${stationary}) -...AND IS STATIONARY. ## -#else -#if(${stormType} == "line") -...AND MOVING ## -#else -...MOVING ## -#end -#direction(${movementDirectionRounded}) AT ${mathUtil.roundTo5(${movementSpeed})} MPH. ## -#end -${rainAmount} -#else -###############IF TRACK IS NOT ENABLED OR stormPosition IS NOT SELECTED ####################################### -#thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) -...${report} ${rainAmount} -#end +...${report}. ${rainAmount} -############################################################# -######## FOURTH BULLET (OPTIONAL IN FLOOD PRODUCTS) ######### -############################################################# -############# IF TRACK IS ENABLED AND pathcast AND stormPosition BOTH SELECTED ############################################### -#if(${list.contains(${bullets},"pathcast")} && ${list.contains(${bullets}, "stormPosition")}) +#set($phenomena = "FLOOD") +#set($warningType = "ADVISORY") * ## #if(${productClass}=="T") THIS IS A TEST MESSAGE. ## #end -#if($movementSpeed < 3 ) -#pathCast("HEAVY RAIN WILL CONTINUE OVER THE FOLLOWING LOCATIONS..." "HEAVY RAIN" ${pathCast} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 0) +#locationsList("SOME LOCATIONS THAT WILL EXPERIENCE MINOR FLOODING INCLUDE" "MINOR FLOODING" 0 ${cityList} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 0) -#else -#pathCast("HEAVY RAIN WILL MOVE OVER THE FOLLOWING LOCATIONS..." "HEAVY RAIN" ${pathCast} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 0) - -#end -#end -################ -#if(${list.contains(${bullets}, "listofcities")}) -#set($floodType = "FLOODING") -* ## -#if(${productClass}=="T") -THIS IS A TEST MESSAGE. ## -#end -#### THE THIRD ARGUMENT IS A NUMBER SPECIFYING THE NUMBER OF COLUMNS TO OUTPUT THE CITIES LIST IN -#### 0 IS A ... SEPARATED LIST, 1 IS ONE PER LINE, >1 IS A COLUMN FORMAT -#### IF YOU USE SOMETHING OTHER THAN "LOCATIONS IMPACTED INCLUDE" LEAD IN BELOW, MAKE SURE THE -#### ACCOMPANYING XML FILE PARSE STRING IS CHANGED TO MATCH! -#locationsList("SOME LOCATIONS THAT WILL EXPERIENCE FLOODING INCLUDE..." ${floodType} 0 ${cityList} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 0) - -#end - -########################################## END OF FOURTH BULLET ############################## -###################################### -###### WHERE ADD INFO GOES ########### -###################################### #if(${list.contains(${bullets}, "addRainfall")}) ADDITIONAL RAINFALL OF !** Edit Amount **! INCHES IS EXPECTED OVER THE AREA. THIS ADDITIONAL RAIN WILL MAKE MINOR FLOODING. @@ -317,9 +255,8 @@ ADDITIONAL RAINFALL OF !** Edit Amount **! INCHES IS EXPECTED OVER THE AREA. THI #drainages(${riverdrainages}) #end -## parse file commands here pull in mile marker and/or point marker info +## parse file command here is to pull in mile marker info ## #parse("mileMarkers.vm") -## #parse("pointMarkers.vm") ##################### ## CALL TO ACTIONS ## diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodAdvisory.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodAdvisory.xml index dd7fa2792f..d773113741 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodAdvisory.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodAdvisory.xml @@ -9,25 +9,10 @@ Evan Bookbinder 09-12-2012 Added settings for locations shapefile Added new areaSource object Phil Kurimski 02-05-2013 Added rain so far section - Mike Dangelo 09-18-2013 to optionally allow =true for pathcasting, and add pointMarker.xml 'include' - Phil Kurimski 09-19-2013 added geospatialConfig.xml --> - - - - - - - - - mi mph @@ -62,11 +47,6 @@ turned on unless the corresponding .vm file is turned on in a given template's . true - - false - 180 @@ -122,7 +102,6 @@ Must be paired with proper vm code (also commented out in arealFloodAdvisory.vm) - @@ -130,7 +109,6 @@ Must be paired with proper vm code (also commented out in arealFloodAdvisory.vm) - @@ -172,17 +150,16 @@ Must be paired with proper vm code (also commented out in arealFloodAdvisory.vm) - - - - - + + + + @@ -223,16 +200,16 @@ Must be paired with proper vm code (also commented out in arealFloodAdvisory.vm) - - + + + - @@ -249,6 +226,118 @@ Must be paired with proper vm code (also commented out in arealFloodAdvisory.vm) +false + + + + County + 0 + AND + 0 + COUNTYNAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + FIPS + NAME + + parent + + + + + + + 25 + + + + + true + 8.0 + 5 + 5 + 4 + 8 + Name + AREA + COUNTYNAME + + STATE + STATE + countyTypes.txt + + distance + + + + + + + + + + + + + NAME + 1 + AREA + POINTS + true + 30 + 200 + + + + + + + + + + warngenlev + population + distance + + + + + + NAME + AREA + POINTS + true + 10 + 200 + + distance + + + + + + + + + + + + + + + + WarnGenLoc + County + States + TIMEZONES + TIME_ZONE + + ffmp_basins 0.064 diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodAdvisoryFollowup.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodAdvisoryFollowup.vm index e495c4981c..3f53c37c24 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodAdvisoryFollowup.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodAdvisoryFollowup.vm @@ -2,14 +2,15 @@ ## FLOOD ADVISORY FOLLOW-UP ## ############################## ################################################################################## -## RECENT VERSION HISTORY: +## EDITED BY PHIL KURIMSKI 8-18-2011 FOR OB11.8.0-4 ## +## EVAN BOOKBINDER 9-16-2011 FOR OB11.0.8-8 ## +## Mike Dangelo 9-19-2011 at Alaska TIM ## +## Mike and Phil 1-25-2012 at CRH TIM ## +## Evan Bookbinder 2-24-2012 ## ## Phil Kurimski 2-28-2012 for OB 12.2.1-3 ## ## Mike Dangelo 9-13-2012 minor tweaks to ${variables} ## ## Phil Kurimski 2-05-2013 for OB13.2.1-3 Added rain so far section ## -## Mike Dangelo 9-18-2013 added initial position and pathcasting options -## Evan Bookbinder 9-18-2013 implemented config.vm ################################################################################## -#parse("config.vm") #if(${action} == "EXT") #set($starttime = "000000T0000Z") #set($extend = true) @@ -174,11 +175,7 @@ ${ugcline} /${productClass}.${action}.${vtecOffice}.FA.Y.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ /00000.N.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ #foreach (${area} in ${areas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} @@ -241,67 +238,27 @@ THIS IS A TEST MESSAGE.## #end ...THE ${advType} ${hycType}REMAINS IN EFFECT #secondBullet(${dateUtil},${expire},${timeFormat},${localtimezone},${secondtimezone}) FOR ## #headlineLocList(${areas} true true true false)... -########### END HEADLINE CODE #################### +########### END NEW HEADLINE CODE #################### #if(${productClass}=="T") THIS IS A TEST MESSAGE. ## -#end -############# IF TRACK IS ENABLED AND stormPosition SELECTED ############################################### -#if(${list.contains(${bullets},"stormPosition")}) #thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) -#if(${stormType} == "line") -...A LINE OF THUNDERSTORMS PRODUCING HEAVY RAIN WAS LOCATED ## -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxLandNearDistance}, ${overPhrase}, ${maxLandOverDistance}, ${landDistanceUnits}, ${useSecondReferenceLine}) +...!** warning basis **! #else -...A THUNDERSTORM PRODUCING HEAVY RAIN WAS LOCATED ## -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxLandNearDistance}, ${overPhrase}, ${maxLandOverDistance}, ${landDistanceUnits}, ${useSecondReferenceCell}) -#end -#if(${movementSpeed} < ${landStationary} || ${stationary}) -...AND IS STATIONARY. ## -#else -#if(${stormType} == "line") -...AND MOVING ## -#else -...MOVING ## -#end -#direction(${movementDirectionRounded}) AT ${mathUtil.roundTo5(${movementSpeed})} MPH. ## -#end -${rainAmount} -#else -###############IF TRACK IS NOT ENABLED OR stormPosition IS NOT SELECTED ####################################### #thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) ...${report}. ${rainAmount} - #end -############################################ -######## (CITY LIST) ######### -############################################ -############# IF TRACK IS ENABLED AND pathcast AND stormPosition BOTH SELECTED ############################################### -#if(${list.contains(${bullets},"pathcast")} && ${list.contains(${bullets}, "stormPosition")}) + +#set ($phenomena = "FLASH FLOOD") +#set ($warningType = "ADVISORY") #if(${productClass}=="T") THIS IS A TEST MESSAGE. ## #end -#if($movementSpeed < 3 ) -#pathCast("HEAVY RAIN WILL CONTINUE OVER THE FOLLOWING LOCATIONS..." "HEAVY RAIN" ${pathCast} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 0) +#locationsList("SOME LOCATIONS THAT WILL EXPERIENCE MINOR FLOODING INCLUDE" "THIS FLOODING" 0 ${cityList} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 0) -#else -#pathCast("HEAVY RAIN WILL MOVE OVER THE FOLLOWING LOCATIONS..." "HEAVY RAIN" ${pathCast} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 0) -#end -#end -#if(${list.contains(${bullets}, "listofcities")}) -#if(${productClass}=="T") -THIS IS A TEST MESSAGE. ## -#end -#### THE THIRD ARGUMENT IS A NUMBER SPECIFYING THE NUMBER OF COLUMNS TO OUTPUT THE CITIES LIST IN -#### 0 IS A ... SEPARATED LIST, 1 IS ONE PER LINE, >1 IS A COLUMN FORMAT -#### IF YOU USE SOMETHING OTHER THAN "LOCATIONS IMPACTED INCLUDE" LEAD IN BELOW, MAKE SURE THE -#### ACCOMPANYING XML FILE PARSE STRING IS CHANGED TO MATCH! -#locationsList("SOME LOCATIONS THAT WILL EXPERIENCE FLOODING INCLUDE..." "THIS FLOODING" 0 ${cityList} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 0) - -#end #if(${list.contains(${bullets}, "addRainfall")}) ADDITIONAL RAINFALL OF !** Edit Amount **! INCHES IS EXPECTED OVER THE AREA. THIS ADDITIONAL RAIN WILL MAKE MINOR FLOODING. @@ -392,11 +349,7 @@ ${ugclinecan} /${productClass}.CAN.${vtecOffice}.FA.Y.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ /00000.N.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ #foreach (${area} in ${cancelareas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} @@ -410,8 +363,6 @@ THIS IS A TEST MESSAGE.## #end ...THE ${advType} ${hycType}HAS BEEN CANCELLED FOR ## #headlineLocList(${cancelareas} true true true false)... -###REPLACE headlineLocList ABOVE WITH THE FOLLOWING FOR ZONE BASED PRODUCT W/ COUNTY HEADLINE -###headlineLocList(${cancelaffectedCounties} true true true false)... ########### END NEW HEADLINE CODE #################### !** THE HEAVY RAIN HAS ENDED (AND/OR) FLOOD WATER IS RECEDING. THEREFORE...THE FLOODING THREAT HAS ENDED. **! @@ -429,11 +380,7 @@ ${ugcline} /${productClass}.CON.${vtecOffice}.FA.Y.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ /00000.N.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ #foreach (${area} in ${areas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} @@ -483,8 +430,6 @@ MINOR FLOODING IS OCCURRING NEAR !** Enter Location **!. ## parse file command here is to pull in mile marker info ## #parse("mileMarkers.vm") -## Uncomment below pull in point marker info -## #parse("pointMarkers.vm") ##################### ## CALL TO ACTIONS ## @@ -557,11 +502,7 @@ ${ugclinecan} /${productClass}.COR.${vtecOffice}.FA.Y.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ /00000.N.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ #foreach (${area} in ${cancelareas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} @@ -592,11 +533,7 @@ ${ugcline} /${productClass}.COR.${vtecOffice}.FA.Y.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ /00000.N.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ #foreach (${area} in ${areas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodAdvisoryFollowup.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodAdvisoryFollowup.xml index baf4575499..5c6a5e58a5 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodAdvisoryFollowup.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodAdvisoryFollowup.xml @@ -9,24 +9,9 @@ Evan Bookbinder 09-12-2012 Added settings for locations shapefile Added new areaSource object Phil Kurimski 02-05-2013 Added rain so far section - Mike Dangelo 09-18-2013 to optionally allow =true for pathcasting, and add pointMarker.xml 'include' - Phil Kurimski 09-19-2013 added geospatialConfig.xml --> - - - - - - - - - mi mph @@ -60,11 +45,6 @@ turned on unless the corresponding .vm file is turned on in a given template's . true - - false - 30 @@ -130,16 +110,16 @@ Must be paired with proper vm code (also commented out in arealFloodAdvisoryFoll - - + + + - @@ -175,16 +155,16 @@ Must be paired with proper vm code (also commented out in arealFloodAdvisoryFoll - - + + + - @@ -201,6 +181,117 @@ Must be paired with proper vm code (also commented out in arealFloodAdvisoryFoll +false + + + + County + 0 + AND + 0 + COUNTYNAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + FIPS + NAME + + parent + + + + + + + 25 + + + + + true + 8.0 + 5 + 5 + 4 + 8 + Name + AREA + COUNTYNAME + STATE + STATE + countyTypes.txt + + distance + + + + + + + + + + + + + NAME + 1 + AREA + POINTS + true + 30 + 200 + + + + + + + + + + warngenlev + population + distance + + + + + + NAME + AREA + POINTS + true + 10 + 200 + + distance + + + + + + + + + + + + + + + + WarnGenLoc + County + States + TIMEZONES + TIME_ZONE + + ffmp_basins 0.064 diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.vm new file mode 100644 index 0000000000..d08608219d --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.vm @@ -0,0 +1,826 @@ +#################################### +## FLOOD ADVISORY FOLLOW-UP ZONES ## +#################################### +## Created by Mike Dangelo 09-19-2011 at Alaska TIM for zones +## Edited by Mike Dangelo 01-26-2012 at CRH TIM +## Edited by Phil Kurimski 2-29-2012 +## Mike Dangelo 9-13-2012 minor tweaks to ${variables} +## +#if(${action} == "EXT") + #set($starttime = "000000T0000Z") + #set($extend = true) +#else + #set($starttime = ${dateUtil.format(${start}, ${timeFormat.ymdthmz})}) + #set($extend = false) +#end +## +#if(${list.contains(${bullets}, "uss")}) + #set($advType = "URBAN AND SMALL STREAM FLOOD ADVISORY") + #set($advTypeShort = "URBAN AND SMALL STREAM FLOODING") +#elseif(${list.contains(${bullets}, "small")}) + #set($advType = "SMALL STREAM FLOOD ADVISORY") + #set($advTypeShort = "SMALL STREAM FLOODING") +#elseif(${list.contains(${bullets}, "arroyo")}) + #set($advType = "ARROYO AND SMALL STREAM FLOOD ADVISORY") + #set($advTypeShort = "ARROYO AND SMALL STREAM FLOODING") +#elseif(${list.contains(${bullets}, "hydrologic")}) + #set($advType = "HYDROLOGIC ADVISORY") + #set($advTypeShort = "MINOR FLOODING") +#else + #set($advType = "FLOOD ADVISORY") + #set($advTypeShort = "MINOR FLOODING") +#end +#if(${ic} == "SM") + #set($hycType = "FOR MELTING SNOW IN") +#elseif(${ic} == "RS") + #set($hycType = "FOR RAIN AND MELTING SNOW IN") +#elseif(${ic} == "IJ") + #set($hycType = "FOR ICE JAM FLOODING IN") +#elseif(${ic} == "IC") + #set($hycType = "FOR AN ICE JAM AND RAIN") +#elseif(${list.contains(${bullets}, "ic1")}) + #set($hycType = "FOR RAPID RIVER RISES IN") +#elseif(${list.contains(${bullets}, "ic2")}) + #set($hycType = "FOR MINOR FLOODING OF POOR DRAINAGE AREAS IN") +#end +#set($hycType = "") +#set($report = "!** warning basis **!") +#set($typeofevent = "") +#set($report2 = "") +#set($cause = "HEAVY RAIN") +#if(${list.contains(${bullets}, "rapidRiver")}) + #set($report2 = ". RAPID RIVER RISES WILL RESULT IN MINOR FLOODING") + #set($hycType = "FOR RAPID RIVER RISES ") +#end +#if(${list.contains(${bullets}, "poorDrainage")}) + #set($report2 = ". OVERFLOWING POOR DRAINAGE AREAS WILL RESULT IN MINOR FLOODING") + #set($hycType = "FOR MINOR FLOODING OF POOR DRAINAGE AREAS ") +#end +#if(${ic} == "SM") + #set($cause = "SNOW MELT") + #set($hycType = "FOR MELTING SNOW ") +#end +#if(${ic} == "RS") + #set($cause = "HEAVY RAIN AND SNOW MELT") + #set($hycType = "FOR RAIN AND MELTING SNOW ") +#end +#if(${ic} == "IJ") + #set($cause = "AN ICE JAM") + #set($hycType = "FOR ICE JAM FLOODING ") +#end +#if(${ic} == "IC") + #set($cause = "AN ICE JAM AND HEAVY RAIN") +#end +#if(${list.contains(${bullets}, "rapidRiver")}) + #set($typeofevent = ". RAPID RIVER RISES ARE EXPECTED") +#end +#if(${list.contains(${bullets}, "poorDrainage")}) + #set($typeofevent = ". OVERFLOWING POOR DRAINAGE AREAS WILL RESULT IN MINOR FLOODING") +#end +#if(${list.contains(${bullets}, "glacierOutburst")}) + #set($report = "A GLACIER-DAMMED LAKEOUTBURST FLOOD WILL RESULT IN MINOR FLOODING AT !** LOCATION **!") +#end +#if(${list.contains(${bullets}, "groundWater")}) + #set($report = "RISING GROUND WATER LEVELS WILL RESULT IN MINOR FLOODING AT !** LOCATION **!") +#end +#if(${list.contains(${bullets}, "satellite")}) + #set($report = "SATELLITE ESTIMATES INDICATE HEAVY RAINFALL THAT WILL CAUSE ${advTypeShort}${typeofevent} IN THE ADVISORY AREA") +#end +#if(${list.contains(${bullets}, "satelliteGauge")}) + #set($report = "SATELLITE ESTIMATES AND RAIN GAUGE DATA INDICATE HEAVY RAINFALL THAT WILL CAUSE ${advTypeShort}${typeofevent} IN THE ADVISORY AREA") +#end +#if(${list.contains(${bullets}, "doppler")}) + #set($report = "DOPPLER RADAR INDICATED ${cause} THAT WILL CAUSE ${advTypeShort}${report2} IN THE ADVISORY AREA") +#end +#if(${list.contains(${bullets}, "doppler")} && ${list.contains(${bullets}, "thunder")}) + #set($report = "DOPPLER RADAR INDICATED ${cause} DUE TO A THUNDERSTORM THAT WILL CAUSE ${advTypeShort}${report2} IN THE ADVISORY AREA") +#end +#if(${list.contains(${bullets}, "doppler")} && ${list.contains(${bullets}, "thunder")} && ${stormType} == "line") + #set($report = "DOPPLER RADAR INDICATED ${cause} DUE TO A LINE OF THUNDERSTORMS THAT WILL CAUSE ${advTypeShort}${report2} IN THE ADVISORY AREA") +#end +#if(${list.contains(${bullets}, "dopplerGauge")}) + #set($report = "DOPPLER RADAR AND AUTOMATED RAIN GAUGES INDICATED ${cause} THAT WILL CAUSE ${advTypeShort}${report2} IN THE ADVISORY AREA") +#end +#if(${list.contains(${bullets}, "dopplerGauge")} && ${list.contains(${bullets}, "thunder")}) + #set($report = "DOPPLER RADAR AND AUTOMATED RAIN GAUGES INDICATED ${cause} DUE TO A THUNDERSTORM THAT WILL CAUSE ${advTypeShort}${report2} IN THE ADVISORY AREA") +#end +#if(${list.contains(${bullets}, "dopplerGauge")} && ${list.contains(${bullets}, "thunder")} && ${stormType} == "line") + #set($report = "DOPPLER RADAR AND AUTOMATED RAIN GAUGES INDICATED ${cause} DUE TO A LINE OF THUNDERSTORMS THAT WILL CAUSE ${advTypeShort}${report2} IN THE ADVISORY AREA") +#end +#if(${list.contains(${bullets}, "trainedSpotters")}) + #set($report = "TRAINED WEATHER SPOTTERS REPORTED ${cause} CAUSING ${advTypeShort} IN !** LOCATION **!${report2}") +#end +#if(${list.contains(${bullets}, "trainedSpotters")} && ${list.contains(${bullets}, "thunder")}) + #set($report = "TRAINED WEATHER SPOTTERS REPORTED ${cause} IN !** LOCATION **! DUE TO A THUNDERSTORM THAT WILL CAUSE ${advTypeShort}${report2}") +#end +#if(${list.contains(${bullets}, "trainedSpotters")} && ${list.contains(${bullets}, "actual")}) + #set($report = "TRAINED WEATHER SPOTTERS REPORTED ${cause} CAUSING ${advTypeShort} IN !** LOCATION **!${report2}") +#end +#if(${list.contains(${bullets}, "trainedSpotters")} && ${list.contains(${bullets}, "plainRain")}) + #set($report = "TRAINED WEATHER SPOTTERS REPORTED ${cause} IN !** LOCATION **! THAT WILL CAUSE ${advTypeShort}${report2}") +#end +#if(${list.contains(${bullets}, "trainedSpotters")} && ${list.contains(${bullets}, "glacierOutburst")}) + #set($report = "A TRAINED SPOTTER REPORTED MINOR FLOODING IN !** LOCATION **! DUE TO A GLACIER-DAMMED LAKE OUTBURST FLOOD") +#end +#if(${list.contains(${bullets}, "trainedSpotters")} && ${list.contains(${bullets}, "groundWater")}) + #set($report = "A TRAINED SPOTTER REPORTED MINOR FLOODING IN !** LOCATION **! DUE TO RISING GROUND WATER LEVELS") +#end +#if(${list.contains(${bullets}, "lawEnforcement")}) + #set($report = "LOCAL LAW ENFORCEMENT REPORTED ${cause} CAUSING ${advTypeShort} IN !** LOCATION **!${report2}") +#end +#if(${list.contains(${bullets}, "lawEnforcement")} && ${list.contains(${bullets}, "thunder")}) + #set($report = "LOCAL LAW ENFORCEMENT REPORTED ${cause} IN !** LOCATION **! DUE TO A THUNDERSTORM IN THAT WILL CAUSE ${advTypeShort}${report2}") +#end +#if(${list.contains(${bullets}, "lawEnforcement")} && ${list.contains(${bullets}, "actual")}) + #set($report = "LOCAL LAW ENFORCEMENT REPORTED ${cause} CAUSING ${advTypeShort} IN !** LOCATION **!${report2}") +#end +#if(${list.contains(${bullets}, "lawEnforcement")} && ${list.contains(${bullets}, "plainRain")}) + #set($report = "LOCAL LAW ENFORCEMENT REPORTED ${cause} IN !** LOCATION **! THAT WILL CAUSE ${advTypeShort}${report2}") +#end +#if(${list.contains(${bullets}, "lawEnforcement")} && ${list.contains(${bullets}, "glacierOutburst")}) + #set($report = "LOCAL LAW ENFORCEMENT REPORTED MINOR FLOODING IN !** LOCATION **! DUE TO A GLACIER-DAMMED LAKE OUTBURST FLOOD") +#end +#if(${list.contains(${bullets}, "lawEnforcement")} && ${list.contains(${bullets}, "groundWater")}) + #set($report = "LOCAL LAW ENFORCEMENT REPORTED MINOR FLOODING IN !** LOCATION **! DUE TO RISING GROUND WATER LEVELS") +#end +#if(${list.contains(${bullets}, "emergencyManagement")}) + #set($report = "EMERGENCY MANAGEMENT REPORTED ${cause} CAUSING ${advTypeShort} IN !** LOCATION **!${typeofevent}") +#end +#if(${list.contains(${bullets}, "emergencyManagement")} && ${list.contains(${bullets}, "thunder")}) + #set($report = "EMERGENCY MANAGEMENT REPORTED ${cause} IN !** LOCATION **! DUE TO A THUNDERSTORM IN THAT WILL CAUSE ${advTypeShort}${typeofevent}") +#end +#if(${list.contains(${bullets}, "emergencyManagement")} && ${list.contains(${bullets}, "actual")}) + #set($report = "EMERGENCY MANAGEMENT REPORTED ${cause} CAUSING ${advTypeShort} IN !** LOCATION **!${typeofevent}") +#end +#if(${list.contains(${bullets}, "emergencyManagement")} && ${list.contains(${bullets}, "plainRain")}) + #set($report = "EMERGENCY MANAGEMENT REPORTED ${cause} IN !** LOCATION **! THAT WILL CAUSE ${advTypeShort}${typeofevent}") +#end +#if(${list.contains(${bullets}, "emergencyManagement")} && ${list.contains(${bullets}, "glacierOutburst")}) + #set($report = "EMERGENCY MANAGEMENT REPORTED MINOR FLOODING IN !** LOCATION **! DUE TO A GLACIER-DAMMED LAKE OUTBURST FLOOD") +#end +#if(${list.contains(${bullets}, "emergencyManagement")} && ${list.contains(${bullets}, "groundWater")}) + #set($report = "EMERGENCY MANAGEMENT REPORTED MINOR FLOODING IN !** LOCATION **! DUE TO RISING GROUND WATER LEVELS") +#end +#if(${list.contains(${bullets}, "public")}) + #set($report = "THE PUBLIC REPORTED ${cause} CAUSING ${advTypeShort} IN !** LOCATION **!${report2}") +#end +#if(${list.contains(${bullets}, "public")} && ${list.contains(${bullets}, "thunder")}) + #set($report = "THE PUBLIC REPORTED ${advTypeShort} IN !** LOCATION **! DUE TO A THUNDERSTORM THAT WILL CAUSE ${advTypeShort}") +#end +#if(${list.contains(${bullets}, "public")} && ${list.contains(${bullets}, "actual")}) + #set($report = "THE PUBLIC REPORTED ${cause} CAUSING ${advTypeShort} IN !** LOCATION **!${report2}") +#end +#if(${list.contains(${bullets}, "public")} && ${list.contains(${bullets}, "plainRain")}) + #set($report = "THE PUBLIC REPORTED ${cause} IN !** LOCATION **! THAT WILL CAUSE MINOR FLOODING${report2}") +#end +#if(${list.contains(${bullets}, "public")} && ${list.contains(${bullets}, "glacierOutburst")}) + #set($report = "THE PUBLIC REPORTED MINOR FLOODING IN !** LOCATION **! DUE TO A GLACIER-DAMMED LAKE OUTBURST FLOOD") +#end +#if(${list.contains(${bullets}, "public")} && ${list.contains(${bullets}, "groundWater")}) + #set($report = "THE PUBLIC REPORTED MINOR FLOODING IN !** LOCATION **! DUE TO RISING GROUND WATER LEVELS") +#end +#if(${list.contains(${bullets}, "doppler")} || ${list.contains(${bullets}, "dopplerGauge")}) +#set($estimate = "UP TO !** Number **! INCHES OF RAIN HAS FALLEN IN THE PAST HOUR.") +#else +#set($estimate = "") +#end +########################################## +## FLOOD ADVISORY FOLLOW-UP HEADER INFO ## +########################################## +#if(${action}=="COR" && ${cancelareas}) +#set($CORCAN = "true") +#else +#set($CORCAN = "false") +#end +#if(${action}!="CANCON" && ${CORCAN}!="true") +${WMOId} ${vtecOffice} 000000 ${BBBId} +FLS${siteId} + +#if(${productClass}=="T") +TEST...FLOOD ADVISORY...TEST +#else +FLOOD ADVISORY +#end +NATIONAL WEATHER SERVICE ${officeShort} +#backupText(${backupSite}) +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +#if(${productClass}=="T") +...THIS MESSAGE IS FOR TEST PURPOSES ONLY... + +#end +${ugcline} +/${productClass}.${action}.${vtecOffice}.FA.Y.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ +/00000.N.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ +#set($zoneList = "") +#foreach (${area} in ${areas}) +#set($zoneList = "${zoneList}${area.name}-") +#end +${zoneList} + +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +#if(${productClass}=="T") +...THIS MESSAGE IS FOR TEST PURPOSES ONLY... + +#end +#end +######################## +## FLOOD ADVISORY CAN ## +######################## +#if(${action}=="CAN") +#if(${productClass}=="T") +THIS IS A TEST MESSAGE.## +#end +...THE ${advType} ${hycType}HAS BEEN CANCELLED FOR ## +##REMMED OUT FOR Alaska. This would output the headline in zone format +###zoneHeadlineLocList(${areas} true true true false)... +##REPLACE LINE ABOVE WITH THE FOLLOWING IF YOU USE COUNTY HEADLINE INSTEAD OF ZONES +###headlineLocList(${affectedCounties} true true true false)... +!**INSERT RIVER/STREAM OR AREA**! IN !**INSERT GEO AREA**!... + +########### END NEW HEADLINE CODE #################### + +#if(${list.contains(${bullets}, "recedingWater")}) +THE HIGH WATER IS RECEDING...AND IS NO LONGER EXPECTED TO POSE A THREAT. PLEASE CONTINUE TO HEED ANY ROAD CLOSURES. + +#end +#if(${list.contains(${bullets}, "rainEnded")}) +THE HEAVY RAIN HAS ENDED...AND FLOODING IS NO LONGER EXPECTED TO POSE A THREAT. + +#else +!** THE HEAVY RAIN HAS ENDED. !** OR **! THE FLOOD WATER IS RECEDING. THEREFORE...THE FLOODING THREAT HAS ENDED. **! + +#end +#end +######################## +## FLOOD ADVISORY EXP ## +######################## +#if(${action}=="EXP") +#if(${productClass}=="T") +THIS IS A TEST MESSAGE.## +#end +...THE ${advType} ${hycType}## +#if(${now.compareTo(${expire})} > -1) +EXPIRED AT ${dateUtil.format(${expire}, ${timeFormat.clock}, 15, ${localtimezone})} FOR ## +#else +WILL EXPIRE AT ${dateUtil.format(${expire}, ${timeFormat.clock}, 15, ${localtimezone})} FOR ## +#end +##REMMED OUT FOR Alaska. This would output the headline in zone format +###zoneHeadlineLocList(${areas} true true true false)... +##REPLACE LINE ABOVE WITH THE FOLLOWING IF YOU USE COUNTY HEADLINE INSTEAD OF ZONES +###headlineLocList(${affectedCounties} true true true false)... +!**INSERT RIVER/STREAM OR AREA**! IN !**INSERT GEO AREA**!... + +########### END NEW HEADLINE CODE #################### + +#if(${list.contains(${bullets}, "recedingWater")}) +THE HIGH WATER IS RECEDING...AND IS NO LONGER EXPECTED TO POSE A THREAT. PLEASE CONTINUE TO HEED ANY ROAD CLOSURES. + +#end +#if(${list.contains(${bullets}, "rainEnded")}) +THE HEAVY RAIN HAS ENDED...AND FLOODING IS NO LONGER EXPECTED TO POSE A THREAT. + +#end +#end +######################## +## FLOOD ADVISORY CON ## +######################## +#if(${action}=="CON" || ${action}=="COR") +#if(${productClass}=="T") +THIS IS A TEST MESSAGE.## +#end +...THE ${advType} ${hycType}REMAINS IN EFFECT #secondBullet(${dateUtil},${expire},${timeFormat},${localtimezone},${secondtimezone}) FOR ## +##REMMED OUT FOR Alaska. This would output the headline in zone format +###zoneHeadlineLocList(${areas} true true true false)... +##REPLACE LINE ABOVE WITH THE FOLLOWING IF YOU USE COUNTY HEADLINE INSTEAD OF ZONES +###headlineLocList(${affectedCounties} true true true false)... +!**INSERT RIVER/STREAM OR AREA**! IN !**INSERT GEO AREA**!... + +########### END NEW HEADLINE CODE #################### + +#if(${productClass}=="T") + +THIS IS A TEST MESSAGE. ## +#thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) +...!** warning basis **! +#else + +#thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) +...${report}. ${estimate} +#end + +#set($phenomena = "FLASH FLOOD") +#set($warningType = "ADVISORY") +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +## REMMED OUT FOR Alaska +## #locationsList("SOME LOCATIONS THAT WILL EXPERIENCE MINOR FLOODING INCLUDE" "THE FLOODING IS EXPECTED TO IMPACT MAINLY RURAL AREAS OF" 0 ${cityList} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 0) EXCLUDED FOR ALASKA +#if(${list.contains(${bullets}, "fcstPoint")}) +FOR THE !** insert river name and forecast point **!... +AT ${dateUtil.format(${now}, ${timeFormat.clock}, ${localtimezone})} THE STAGE WAS !** xx.x **! FEET. +FLOOD STAGE IS !** xx.x **! FEET. +FORECAST... !** insert crest stage and time **!. +IMPACTS...!** discussion of expected impacts and flood path **! +#else +!** insert impacts and flood path **! + +#end + +#if(${list.contains(${bullets}, "addRainfall")}) +ADDITIONAL RAINFALL OF !** Edit Amount **! INCHES IS EXPECTED OVER THE AREA. THIS ADDITIONAL RAIN WILL CAUSE MINOR FLOODING. + +#end +#if(${list.contains(${bullets}, "specificPlace")}) +MINOR FLOODING IS OCCURRING NEAR !** Enter Location **!. + +#end +#if(${list.contains(${bullets}, "drainages")}) +#drainages(${riverdrainages}) + +#end + +## parse file command here is to pull in mile marker info +## #parse("mileMarkers.vm") + +##################### +## CALL TO ACTIONS ## +##################### +##Check to see if we've selected any calls to action. In our .xml file +##we ended each CTA bullet ID with "CTA" for this reason as a 'trip' +#foreach (${bullet} in ${bullets}) +#if(${bullet.endsWith("CTA")}) +#set($ctaSelected = "YES") +#end +#end +## +#if(${ctaSelected} == "YES") +PRECAUTIONARY/PREPAREDNESS ACTIONS... + +#end +#if(${list.contains(${bullets}, "dontdrownCTA")}) +MOST FLOOD DEATHS OCCUR IN AUTOMOBILES. NEVER DRIVE YOUR VEHICLE INTO AREAS WHERE THE WATER COVERS THE ROADWAY. FLOOD WATERS ARE USUALLY DEEPER THAN THEY APPEAR. JUST ONE FOOT OF FLOWING WATER IS POWERFUL ENOUGH TO SWEEP VEHICLES OFF THE ROAD. WHEN ENCOUNTERING FLOODED ROADS MAKE THE SMART CHOICE...TURN AROUND...DONT DROWN. + +#end +#if(${list.contains(${bullets}, "urbanCTA")}) +EXCESSIVE RUNOFF FROM HEAVY RAINFALL WILL CAUSE ELEVATED LEVELS ON SMALL CREEKS AND STREAMS...AND PONDING OF WATER IN URBAN AREAS...HIGHWAYS...STREETS AND UNDERPASSES AS WELL AS OTHER POOR DRAINAGE AREAS AND LOW LYING SPOTS. + +#end +#if(${list.contains(${bullets}, "ruralCTA")}) +EXCESSIVE RUNOFF FROM HEAVY RAINFALL WILL CAUSE FLOODING OF SMALL CREEKS AND STREAMS...HIGHWAYS AND UNDERPASSES. ADDITIONALLY...COUNTRY ROADS AND FARMLANDS ALONG THE BANKS OF CREEKS...STREAMS AND OTHER LOW LYING AREAS ARE SUBJECT TO FLOODING. + +#end +#if(${list.contains(${bullets}, "donotdriveCTA")}) +DO NOT DRIVE YOUR VEHICLE INTO AREAS WHERE THE WATER COVERS THE ROADWAY. THE WATER DEPTH MAY BE TOO GREAT TO ALLOW YOUR CAR TO CROSS SAFELY. MOVE TO HIGHER GROUND. + +#end +#if(${list.contains(${bullets}, "lowspotsCTA")}) +IN HILLY TERRAIN THERE ARE HUNDREDS OF LOW WATER CROSSINGS WHICH ARE POTENTIALLY DANGEROUS IN HEAVY RAIN. DO NOT ATTEMPT TO TRAVEL ACROSS FLOODED ROADS. FIND ALTERNATE ROUTES. IT TAKES ONLY A FEW INCHES OF SWIFTLY FLOWING WATER TO CARRY VEHICLES AWAY. + +#end +#if(${list.contains(${bullets}, "powerCTA")}) +DO NOT UNDERESTIMATE THE POWER OF FLOOD WATERS. ONLY A FEW INCHES OF RAPIDLY FLOWING WATER CAN QUICKLY CARRY AWAY YOUR VEHICLE. + +#end +#if(${list.contains(${bullets}, "reportFloodingCTA")}) +TO REPORT FLOODING...HAVE THE NEAREST LAW ENFORCEMENT AGENCY RELAY YOUR REPORT TO THE NATIONAL WEATHER SERVICE FORECAST OFFICE. + +#end +#if(${list.contains(${bullets}, "advisoryMeansCTA")}) +A FLOOD ADVISORY MEANS RIVER OR STREAM FLOWS ARE ELEVATED OR PONDING OF WATER IN URBAN OR OTHER AREAS IS OCCURRING OR IS IMMINENT. KEEP AN EYE ON WATERWAYS AND BE PREPARED TO TAKE ACTION. + +#end +#if(${ctaSelected} == "YES") +&& + +#end +#################################### END OF CTA STUFF ################################### +#end +############################ +## FLOOD ADVISORY CAN/CON ## +############################ +#if(${action}=="CANCON") +${WMOId} ${vtecOffice} 000000 ${BBBId} +FLS${siteId} + +#if(${productClass}=="T") +TEST...FLOOD ADVISORY...TEST +#else +FLOOD ADVISORY +#end +NATIONAL WEATHER SERVICE ${officeShort} +#backupText(${backupSite}) +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +#if(${productClass}=="T") +...THIS MESSAGE IS FOR TEST PURPOSES ONLY... + +#end +${ugclinecan} +/${productClass}.CAN.${vtecOffice}.FA.Y.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ +/00000.N.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ +#set($zoneList = "") +#foreach (${area} in ${cancelareas}) +#set($zoneList = "${zoneList}${area.name}-") +#end +${zoneList} + +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +#if(${productClass}=="T") +...THIS MESSAGE IS FOR TEST PURPOSES ONLY... + +#elseif(${CORCAN} == "true") +${WMOId} ${vtecOffice} 000000 ${BBBId} +FLS${siteId} + +#if(${productClass}=="T") +TEST...FLOOD ADVISORY...TEST +#else +FLOOD ADVISORY +#end +NATIONAL WEATHER SERVICE ${officeShort} +#backupText(${backupSite}) +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +#if(${productClass}=="T") +...THIS MESSAGE IS FOR TEST PURPOSES ONLY... + +#end +${ugclinecan} +/${productClass}.COR.${vtecOffice}.FA.Y.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ +/00000.N.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ +#set($zoneList = "") +#foreach (${area} in ${cancelareas}) +#set($zoneList = "${zoneList}${area.name}-") +#end +${zoneList} + +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +#if(${productClass}=="T") +...THIS MESSAGE IS FOR TEST PURPOSES ONLY... + +#end +#if(${productClass}=="T") +THIS IS A TEST MESSAGE.## +#end +...THE ${advType} ${hycType}HAS BEEN CANCELLED FOR ## +##REMMED OUT FOR Alaska. This would output the headline in zone format +###zoneHeadlineLocList(${cancelareas} true true true false)... +##REPLACE LINE ABOVE WITH THE FOLLOWING IF YOU USE COUNTY HEADLINE INSTEAD OF ZONES +###headlineLocList(${cancelaffectedCounties} true true true false)... +!**INSERT RIVER/STREAM OR AREA**! IN !**INSERT GEO AREA**!... +########### END NEW HEADLINE CODE #################### + +## One line explanation - user can delete the one they don't want +## or delete both and explain why manually +!** THE HEAVY RAIN HAS ENDED. THEREFORE...THE FLOODING THREAT HAS ENDED. **! +!** THE FLOOD WATER IS RECEDING. THEREFORE...THE FLOODING THREAT HAS ENDED. **! + +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. DO NOT TAKE ACTION BASED ON THIS MESSAGE. + +#end +#printcoords(${areaPoly}, ${list}) + + +$$ + +${ugcline} +/${productClass}.CON.${vtecOffice}.FA.Y.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ +/00000.N.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ +#set($zoneList = "") +#foreach (${area} in ${areas}) +#set($zoneList = "${zoneList}${area.name}-") +#end +${zoneList} + +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +#if(${productClass}=="T") +...THIS MESSAGE IS FOR TEST PURPOSES ONLY... + +#end +#if(${productClass}=="T") +THIS IS A TEST MESSAGE.## +#end +...THE ${advType} REMAINS IN EFFECT UNTIL ${dateUtil.format(${expire}, ${timeFormat.clock}, 15, ${localtimezone})} FOR ## +##REMMED OUT FOR Alaska. This would output the headline in zone format +###zoneHeadlineLocList(${areas} true true true false)... +##REPLACE LINE ABOVE WITH THE FOLLOWING IF YOU USE COUNTY HEADLINE INSTEAD OF ZONES +###headlineLocList(${affectedCounties} true true true false)... +!**INSERT RIVER/STREAM OR AREA**! IN !**INSERT GEO AREA**!... +########### END NEW HEADLINE CODE #################### + +#if(${productClass}=="T") + +THIS IS A TEST MESSAGE. ## +#thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) +...!** warning basis **! +#else + +#thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) +...${report}. ${estimate} +#end + +#set($phenomena = "FLASH FLOOD") +#set($warningType = "ADVISORY") + +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +##locationsList("SOME LOCATIONS THAT WILL EXPERIENCE MINOR FLOODING INCLUDE" "THE FLOODING IS EXPECTED TO IMPACT MAINLY RURAL AREAS OF" 0 ${cityList} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 0) EXCLUDED FOR ALASKA +#if(${list.contains(${bullets}, "fcstPoint")}) +FOR THE !** insert river name and forecast point **!... +AT ${dateUtil.format(${now}, ${timeFormat.clock}, ${localtimezone})} THE STAGE WAS !** xx.x **! FEET. +FLOOD STAGE IS !** xx.x **! FEET. +FORECAST... !** insert crest stage and time **!. +IMPACTS...!** discussion of expected impacts and flood path **! +#else +!** insert impacts and flood path **! + +#end +#if(${list.contains(${bullets}, "addRainfall")}) + +ADDITIONAL RAINFALL OF !** Edit Amount **! INCHES IS EXPECTED OVER THE AREA. THIS ADDITIONAL RAIN WILL MAKE MINOR FLOODING. +#end +#if(${list.contains(${bullets}, "specificPlace")}) + +MINOR FLOODING IS OCCURRING NEAR !** Enter Location **!. +#end + +#if(${list.contains(${bullets}, "drainages")}) +#drainages(${riverdrainages}) + +#end +##################### +## CALL TO ACTIONS ## +##################### +#foreach (${bullet} in ${bullets}) +#if(${bullet.endsWith("CTA")}) +#set($ctaSelected = "YES") +#end +#end +## +#if(${ctaSelected} == "YES") +PRECAUTIONARY/PREPAREDNESS ACTIONS... + +#end +#if(${list.contains(${bullets}, "dontdrownCTA")}) +MOST FLOOD DEATHS OCCUR IN AUTOMOBILES. NEVER DRIVE YOUR VEHICLE INTO AREAS WHERE THE WATER COVERS THE ROADWAY. FLOOD WATERS ARE USUALLY DEEPER THAN THEY APPEAR. JUST ONE FOOT OF FLOWING WATER IS POWERFUL ENOUGH TO SWEEP VEHICLES OFF THE ROAD. WHEN ENCOUNTERING FLOODED ROADS MAKE THE SMART CHOICE...TURN AROUND...DONT DROWN. + +#end +#if(${list.contains(${bullets}, "urbanCTA")}) +EXCESSIVE RUNOFF FROM HEAVY RAINFALL WILL CAUSE ELEVATED LEVELS ON SMALL CREEKS AND STREAMS...AND PONDING OF WATER IN URBAN AREAS...HIGHWAYS...STREETS AND UNDERPASSES AS WELL AS OTHER POOR DRAINAGE AREAS AND LOW LYING SPOTS. + +#end +#if(${list.contains(${bullets}, "ruralCTA")}) +EXCESSIVE RUNOFF FROM HEAVY RAINFALL WILL CAUSE FLOODING OF SMALL CREEKS AND STREAMS...HIGHWAYS AND UNDERPASSES. ADDITIONALLY...COUNTRY ROADS AND FARMLANDS ALONG THE BANKS OF CREEKS...STREAMS AND OTHER LOW LYING AREAS ARE SUBJECT TO FLOODING. + +#end +#if(${list.contains(${bullets}, "donotdriveCTA")}) +DO NOT DRIVE YOUR VEHICLE INTO AREAS WHERE THE WATER COVERS THE ROADWAY. THE WATER DEPTH MAY BE TOO GREAT TO ALLOW YOUR CAR TO CROSS SAFELY. MOVE TO HIGHER GROUND. + +#end +#if(${list.contains(${bullets}, "lowspotsCTA")}) +IN HILLY TERRAIN THERE ARE HUNDREDS OF LOW WATER CROSSINGS WHICH ARE POTENTIALLY DANGEROUS IN HEAVY RAIN. DO NOT ATTEMPT TO TRAVEL ACROSS FLOODED ROADS. FIND ALTERNATE ROUTES. IT TAKES ONLY A FEW INCHES OF SWIFTLY FLOWING WATER TO CARRY VEHICLES AWAY. + +#end +#if(${list.contains(${bullets}, "powerCTA")}) +DO NOT UNDERESTIMATE THE POWER OF FLOOD WATERS. ONLY A FEW INCHES OF RAPIDLY FLOWING WATER CAN QUICKLY CARRY AWAY YOUR VEHICLE. + +#end +#if(${list.contains(${bullets}, "reportFloodingCTA")}) +TO REPORT FLOODING...HAVE THE NEAREST LAW ENFORCEMENT AGENCY RELAY YOUR REPORT TO THE NATIONAL WEATHER SERVICE FORECAST OFFICE. + +#end +#if(${list.contains(${bullets}, "advisoryMeansCTA")}) +A FLOOD ADVISORY MEANS RIVER OR STREAM FLOWS ARE ELEVATED...OR PONDING OF WATER IN URBAN OR OTHER AREAS IS OCCURRING OR IS IMMINENT. DO NOT ATTEMPT TO TRAVEL ACROSS FLOODED ROADS. FIND ALTERNATE ROUTES. IT TAKES ONLY A FEW INCHES OF SWIFTLY FLOWING WATER TO CARRY VEHICLES AWAY. + +#end +#if(${ctaSelected} == "YES") +&& + +#end +#################################### END OF CTA STUFF ################################### +#elseif(${CORCAN}=="true") +${WMOId} ${vtecOffice} 000000 ${BBBId} +FLS${siteId} + +#if(${productClass}=="T") +TEST...FLOOD ADVISORY...TEST +#else +FLOOD ADVISORY +#end +NATIONAL WEATHER SERVICE ${officeShort} +#backupText(${backupSite}) +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +#if(${productClass}=="T") +...THIS MESSAGE IS FOR TEST PURPOSES ONLY... + +#end +${ugclinecan} +/${productClass}.COR.${vtecOffice}.FA.Y.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ +/00000.N.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ +#set($zoneList = "") +#foreach (${area} in ${cancelareas}) +#set($zoneList = "${zoneList}${area.name}-") +#end +${zoneList} + +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +#if(${productClass}=="T") +...THIS MESSAGE IS FOR TEST PURPOSES ONLY... + +#elseif(${CORCAN} == "true") +${WMOId} ${vtecOffice} 000000 ${BBBId} +FLS${siteId} + +#if(${productClass}=="T") +TEST...FLOOD ADVISORY...TEST +#else +FLOOD ADVISORY +#end +NATIONAL WEATHER SERVICE ${officeShort} +#backupText(${backupSite}) +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +#if(${productClass}=="T") +...THIS MESSAGE IS FOR TEST PURPOSES ONLY... + +#end +${ugclinecan} +/${productClass}.COR.${vtecOffice}.FA.Y.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ +/00000.N.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ +#set($zoneList = "") +#foreach (${area} in ${cancelareas}) +#set($zoneList = "${zoneList}${area.name}-") +#end +${zoneList} + +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +#if(${productClass}=="T") +...THIS MESSAGE IS FOR TEST PURPOSES ONLY... + +#end +#if(${productClass}=="T") +THIS IS A TEST MESSAGE.## +#end +...THE ${advType} ${hycType}HAS BEEN CANCELLED FOR ## +##REMMED OUT FOR Alaska. This would output the headline in zone format +###zoneHeadlineLocList(${cancelareas} true true true false)... +##REPLACE LINE ABOVE WITH THE FOLLOWING IF YOU USE COUNTY HEADLINE INSTEAD OF ZONES +###headlineLocList(${cancelaffectedCounties} true true true false)... +!**INSERT RIVER/STREAM OR AREA**! IN !**INSERT GEO AREA**!... +########### END NEW HEADLINE CODE #################### + +## One line explanation - user can delete the one they don't want +## or delete both and explain why manually +!** THE HEAVY RAIN HAS ENDED. THEREFORE...THE FLOODING THREAT HAS ENDED. **! +!** THE FLOOD WATER IS RECEDING. THEREFORE...THE FLOODING THREAT HAS ENDED. **! + +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. DO NOT TAKE ACTION BASED ON THIS MESSAGE. + +#end +#printcoords(${areaPoly}, ${list}) + + +$$ + +${ugcline} +/${productClass}.COR.${vtecOffice}.FA.Y.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ +/00000.N.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ +#set($zoneList = "") +#foreach (${area} in ${areas}) +#set($zoneList = "${zoneList}${area.name}-") +#end +${zoneList} + +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +#if(${productClass}=="T") +...THIS MESSAGE IS FOR TEST PURPOSES ONLY... + +#end +#if(${productClass}=="T") +THIS IS A TEST MESSAGE.## +#end +...THE ${advType} REMAINS IN EFFECT UNTIL ${dateUtil.format(${expire}, ${timeFormat.clock}, 15, ${localtimezone})} FOR ## +##REMMED OUT FOR Alaska. This would output the headline in zone format +###zoneHeadlineLocList(${areas} true true true false)... +##REPLACE LINE ABOVE WITH THE FOLLOWING IF YOU USE COUNTY HEADLINE INSTEAD OF ZONES +###headlineLocList(${affectedCounties} true true true false)... +!**INSERT RIVER/STREAM OR AREA**! IN !**INSERT GEO AREA**!... +########### END NEW HEADLINE CODE #################### + +#if(${productClass}=="T") + +THIS IS A TEST MESSAGE. ## +#thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) +...!** warning basis **! +#else + +#thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) +...${report}. ${estimate} +#end + +#set($phenomena = "FLASH FLOOD") +#set($warningType = "ADVISORY") + +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +##locationsList("SOME LOCATIONS THAT WILL EXPERIENCE MINOR FLOODING INCLUDE" "THE FLOODING IS EXPECTED TO IMPACT MAINLY RURAL AREAS OF" 0 ${cityList} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 0) EXCLUDED FOR ALASKA +#if(${list.contains(${bullets}, "fcstPoint")}) +FOR THE !** insert river name and forecast point **!... +AT ${dateUtil.format(${now}, ${timeFormat.clock}, ${localtimezone})} THE STAGE WAS !** xx.x **! FEET. +FLOOD STAGE IS !** xx.x **! FEET. +FORECAST... !** insert crest stage and time **!. +IMPACTS...!** discussion of expected impacts and flood path **! +#else +!** insert impacts and flood path **! + +#end +#if(${list.contains(${bullets}, "addRainfall")}) + +ADDITIONAL RAINFALL OF !** Edit Amount **! INCHES IS EXPECTED OVER THE AREA. THIS ADDITIONAL RAIN WILL MAKE MINOR FLOODING. +#end +#if(${list.contains(${bullets}, "specificPlace")}) + +MINOR FLOODING IS OCCURRING NEAR !** Enter Location **!. +#end + +#if(${list.contains(${bullets}, "drainages")}) +#drainages(${riverdrainages}) + +#end +##################### +## CALL TO ACTIONS ## +##################### +#foreach (${bullet} in ${bullets}) +#if(${bullet.endsWith("CTA")}) +#set($ctaSelected = "YES") +#end +#end +## +#if(${ctaSelected} == "YES") +PRECAUTIONARY/PREPAREDNESS ACTIONS... + +#end +#if(${list.contains(${bullets}, "dontdrownCTA")}) +MOST FLOOD DEATHS OCCUR IN AUTOMOBILES. NEVER DRIVE YOUR VEHICLE INTO AREAS WHERE THE WATER COVERS THE ROADWAY. FLOOD WATERS ARE USUALLY DEEPER THAN THEY APPEAR. JUST ONE FOOT OF FLOWING WATER IS POWERFUL ENOUGH TO SWEEP VEHICLES OFF THE ROAD. WHEN ENCOUNTERING FLOODED ROADS MAKE THE SMART CHOICE...TURN AROUND...DONT DROWN. + +#end +#if(${list.contains(${bullets}, "urbanCTA")}) +EXCESSIVE RUNOFF FROM HEAVY RAINFALL WILL CAUSE ELEVATED LEVELS ON SMALL CREEKS AND STREAMS...AND PONDING OF WATER IN URBAN AREAS...HIGHWAYS...STREETS AND UNDERPASSES AS WELL AS OTHER POOR DRAINAGE AREAS AND LOW LYING SPOTS. + +#end +#if(${list.contains(${bullets}, "ruralCTA")}) +EXCESSIVE RUNOFF FROM HEAVY RAINFALL WILL CAUSE FLOODING OF SMALL CREEKS AND STREAMS...HIGHWAYS AND UNDERPASSES. ADDITIONALLY...COUNTRY ROADS AND FARMLANDS ALONG THE BANKS OF CREEKS...STREAMS AND OTHER LOW LYING AREAS ARE SUBJECT TO FLOODING. + +#end +#if(${list.contains(${bullets}, "donotdriveCTA")}) +DO NOT DRIVE YOUR VEHICLE INTO AREAS WHERE THE WATER COVERS THE ROADWAY. THE WATER DEPTH MAY BE TOO GREAT TO ALLOW YOUR CAR TO CROSS SAFELY. MOVE TO HIGHER GROUND. + +#end +#if(${list.contains(${bullets}, "lowspotsCTA")}) +IN HILLY TERRAIN THERE ARE HUNDREDS OF LOW WATER CROSSINGS WHICH ARE POTENTIALLY DANGEROUS IN HEAVY RAIN. DO NOT ATTEMPT TO TRAVEL ACROSS FLOODED ROADS. FIND ALTERNATE ROUTES. IT TAKES ONLY A FEW INCHES OF SWIFTLY FLOWING WATER TO CARRY VEHICLES AWAY. + +#end +#if(${list.contains(${bullets}, "powerCTA")}) +DO NOT UNDERESTIMATE THE POWER OF FLOOD WATERS. ONLY A FEW INCHES OF RAPIDLY FLOWING WATER CAN QUICKLY CARRY AWAY YOUR VEHICLE. + +#end +#if(${list.contains(${bullets}, "reportFloodingCTA")}) +TO REPORT FLOODING...HAVE THE NEAREST LAW ENFORCEMENT AGENCY RELAY YOUR REPORT TO THE NATIONAL WEATHER SERVICE FORECAST OFFICE. + +#end +#if(${list.contains(${bullets}, "advisoryMeansCTA")}) +A FLOOD ADVISORY MEANS RIVER OR STREAM FLOWS ARE ELEVATED...OR PONDING OF WATER IN URBAN OR OTHER AREAS IS OCCURRING OR IS IMMINENT. DO NOT ATTEMPT TO TRAVEL ACROSS FLOODED ROADS. FIND ALTERNATE ROUTES. IT TAKES ONLY A FEW INCHES OF SWIFTLY FLOWING WATER TO CARRY VEHICLES AWAY. + +#end +#if(${ctaSelected} == "YES") +&& + +#end +#end +#################################### +## END OF FLOOD ADVISORY PRODUCTS ## +#################################### +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. DO NOT TAKE ACTION BASED ON THIS MESSAGE. + +#end + +#printcoords(${areaPoly}, ${list}) + + +$$ + +#parse("forecasterName.vm") diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.xml new file mode 100644 index 0000000000..b1c7b3fd20 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.xml @@ -0,0 +1,348 @@ + + + + + + + + + mi + mph + + + + Forecast Zones + + + + + + + + COR + CAN + CON + EXP + + + + + FA.Y + + + + false + + + true + + + + 30 + + 30 + + +ic,advType + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +false + + + + + + + + + + + Zone + HATCHING + 0 + AND + 0 + NAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + + STATE_ZONE + NAME + + parent + + + + + + + 25 + + + + + County + INTERSECT + 0 + AND + 0 + COUNTYNAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + FIPS + NAME + + parent + + + + + + + 25 + + + + + + + AREA + true + 8.0 + 5 + 5 + 4 + 8 + Name + + NAME + STATE + STATE + countyTypes.txt + + distance + + + + + + + + + + + + + NAME + AREA + 1 + POINTS + true + 30 + 200 + + + + + + + + + + warngenlev + population + distance + + + + + + NAME + AREA + POINTS + true + 10 + 200 + + distance + + + + + + + + + + + + + + + + WarnGenLoc + + Zone + States + TIMEZONES + TIME_ZONE + + + + ffmp_basins + 0.064 + streamname + + + + + + true + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodAdvisory_Zones.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodAdvisory_Zones.vm new file mode 100644 index 0000000000..85ce41f807 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodAdvisory_Zones.vm @@ -0,0 +1,374 @@ +############################ +## FLOOD ADVISORY ZONES ## +############################ +## Created by Mike Dangelo 9-21-2011 at Alaska TIM ## +## Mary-Beth Schreck, Ed Plumb, Aaron Jacobs 9-22-2011 at Alaska TIM +## Mike Dangelo 01-26-2012 at CRH TIM +## Phil Kurimski 2-29-2012 +## Evan Bookbinder 4-25-2012 for OB 12.3.1 (MND) +## Mike Dangelo 9-13-2012 minor tweaks to ${variables} +## Mike Dangelo 2-06-2013 default bullets for advType, advTypeShort, ic and hycType +## +#if(${action} == "EXT") + #set($starttime = "000000T0000Z") + #set($extend = true) +#else + #set($starttime = ${dateUtil.format(${start}, ${timeFormat.ymdthmz})}) + #set($extend = false) +#end +## +#set($advType = "FLOOD ADVISORY") +#set($advTypeShort = "MINOR FLOODING") +#if(${list.contains(${bullets}, "general")}) + #set($advType = "FLOOD ADVISORY") + #set($advTypeShort = "MINOR FLOODING") +#elseif(${list.contains(${bullets}, "small")}) + #set($advType = "SMALL STREAM FLOOD ADVISORY") + #set($advTypeShort = "SMALL STREAM FLOODING") +#elseif(${list.contains(${bullets}, "uss")}) + #set($advType = "URBAN AND SMALL STREAM FLOOD ADVISORY") + #set($advTypeShort = "URBAN AND SMALL STREAM FLOODING") + #set($extend = false) +#elseif(${list.contains(${bullets}, "arroyo")}) + #set($advType = "ARROYO AND SMALL STREAM FLOOD ADVISORY") + #set($advTypeShort = "ARROYO AND SMALL STREAM FLOODING") + #set($extend = false) +#elseif(${list.contains(${bullets}, "hydrologic")}) + #set($advType = "HYDROLOGIC ADVISORY") + #set($advTypeShort = "MINOR FLOODING") + #set($extend = false) +#end +## +#set($ic = "ER") +#set($hycType = "") +#if(${list.contains(${bullets}, "ER")}) + #set($ic = "ER") + #set($hycType = "") +#elseif(${list.contains(${bullets}, "SM")}) + #set($ic = "SM") + #set($hycType = "MELTING SNOW") +#elseif(${list.contains(${bullets}, "RS")}) + #set($ic = "RS") + #set($hycType = "RAIN AND MELTING SNOW") +#elseif(${list.contains(${bullets}, "IJ")}) + #set($ic = "IJ") + #set($hycType = "ICE JAM FLOODING") +#elseif(${list.contains(${bullets}, "IC")}) + #set($ic = "IC") +#elseif(${list.contains(${bullets}, "rapidRiver")}) + #set($hycType = "RAPID RIVER RISES") +#elseif(${list.contains(${bullets}, "poorDrainage")}) + #set($hycType = "MINOR FLOODING OF POOR DRAINAGE AREAS") +#elseif(${list.contains(${bullets}, "GO")}) + #set($ic = "GO") + #set($hycType = "A GLACIER-DAMMED LAKE OUTBURST") +#elseif(${list.contains(${bullets}, "OT")}) + #set($ic = "OT") + #set($hycType = "GROUND WATER FLOODING") +#elseif(${list.contains(${bullets}, "DR")}) + #set($ic = "DR") + #set($hycType = "DAM GATE RELEASE") +#end +## +${WMOId} ${vtecOffice} 000000 ${BBBId} +FLS${siteId} + +#if(${productClass}=="T") +TEST...FLOOD ADVISORY...TEST +#else +FLOOD ADVISORY +#end +NATIONAL WEATHER SERVICE ${officeShort} +#backupText(${backupSite}) +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +${ugcline} +/${productClass}.${action}.${vtecOffice}.FA.Y.${etn}.${starttime}-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ +/00000.N.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ + +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +#if(${productClass}=="T") +...THIS MESSAGE IS FOR TEST PURPOSES ONLY... + +#end +#headlineext(${officeLoc}, ${backupSite}, ${extend}) + +* ## +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +${advType} FOR... +#if(${hycType} != "") +## ${hycType} IN... (EXCLUDED FOR AK) + ${hycType}... +#end +##REMMED OUT FOR ALASKA +###firstBullet(${areas}) +##REPLACE LINE ABOVE WITH THE FOLLOWING IF YOU USE COUNTY HEADLINE INSTEAD OF ZONES +###firstBullet(${affectedCounties}) +!**INSERT RIVER/STREAM OR AREA**! IN !**INSERT GEO AREA**! + +* ## +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +#secondBullet(${dateUtil},${expire},${timeFormat},${localtimezone},${secondtimezone}) + +#set($report = "!** warning basis **!") +#set($typeofevent = "") +#set($cause = "HEAVY RAIN") +#set($rainAmount = "") +#if(${list.contains(${bullets}, "SM")}) + #set($cause = "SNOW MELT") +#end +#if(${list.contains(${bullets}, "RS")}) + #set($cause = "HEAVY RAIN AND SNOW MELT") +#end +#if(${list.contains(${bullets}, "IJ")}) + #set($cause = "AN ICE JAM") +#end +#if(${list.contains(${bullets}, "IC")}) + #set($cause = "AN ICE JAM AND HEAVY RAIN") +#end +#if(${list.contains(${bullets}, "SM")}) + #set($report = "MINOR FLOODING IS !** OCCURRING/EXPECTED **! DUE TO SNOW MELT") +#end +#if(${list.contains(${bullets}, "RS")}) + #set($report = "MINOR FLOODING IS !** OCCURRING/EXPECTED **! DUE TO HEAVY RAIN AND SNOW MELT") +#end +#if(${list.contains(${bullets}, "IJ")}) + #set($report = "MINOR FLOODING IS !** OCCURRING/EXPECTED **! DUE TO AN ICE JAM") +#end +#if(${list.contains(${bullets}, "IC")}) + #set($report = "MINOR FLOODING IS !** OCCURRING/EXPECTED **! DUE TO AN ICE JAM AND HEAVY RAIN") +#end +#if(${list.contains(${bullets}, "rapidRiver")}) + #set($typeofevent = ". RAPID RIVER RISES ARE EXPECTED") +#end +#if(${list.contains(${bullets}, "glacierOutburst")}) + #set($report = "A GLACIER-DAMMED LAKEOUTBURST FLOOD WILL RESULT IN MINOR FLOODING AT !** LOCATION **!") +#end +#if(${list.contains(${bullets}, "groundWater")}) + #set($report = "RISING GROUND WATER LEVELS WILL RESULT IN MINOR FLOODING AT !** LOCATION **!") +#end +#if(${list.contains(${bullets}, "poorDrainage")}) + #set($typeofevent = ". OVERFLOWING POOR DRAINAGE AREAS WILL RESULT IN MINOR FLOODING") +#end +#if(${list.contains(${bullets}, "satellite")}) + #set($report = "SATELLITE ESTIMATES INDICATE HEAVY RAINFALL THAT WILL CAUSE ${advTypeShort}${typeofevent} IN THE ADVISORY AREA") +#end +#if(${list.contains(${bullets}, "satelliteGauge")}) + #set($report = "SATELLITE ESTIMATES AND RAIN GAUGE DATA INDICATE HEAVY RAINFALL THAT WILL CAUSE ${advTypeShort}${typeofevent} IN THE ADVISORY AREA") +#end +#if(${list.contains(${bullets}, "doppler")}) + #set($report = "DOPPLER RADAR INDICATED ${cause} THAT WILL CAUSE ${advTypeShort}${typeofevent} IN THE ADVISORY AREA") +#end +#if(${list.contains(${bullets}, "doppler")} && ${list.contains(${bullets}, "thunder")}) + #set($report = "DOPPLER RADAR INDICATED ${cause} DUE TO A THUNDERSTORM THAT WILL CAUSE ${advTypeShort}${typeofevent} IN THE ADVISORY AREA") +#end +#if(${list.contains(${bullets}, "doppler")} && ${list.contains(${bullets}, "thunder")} && ${stormType} == "line") + #set($report = "DOPPLER RADAR INDICATED ${cause} DUE TO A LINE OF THUNDERSTORMS THAT WILL CAUSE ${advTypeShort}${typeofevent} IN THE ADVISORY AREA") +#end +#if(${list.contains(${bullets}, "dopplerGauge")}) + #set($report = "AUTOMATED RAIN GAUGES INDICATED ${cause} THAT WILL CAUSE ${advTypeShort}${typeofevent} IN THE ADVISORY AREA") +#end +#if(${list.contains(${bullets}, "dopplerGauge")} && ${list.contains(${bullets}, "thunder")}) + #set($report = "DOPPLER RADAR AND AUTOMATED RAIN GAUGES INDICATED ${cause} DUE TO A THUNDERSTORM THAT WILL CAUSE ${advTypeShort}${typeofevent} IN THE ADVISORY AREA") +#end +#if(${list.contains(${bullets}, "dopplerGauge")} && ${list.contains(${bullets}, "thunder")} && ${stormType} == "line") + #set($report = "DOPPLER RADAR AND AUTOMATED RAIN GAUGES INDICATED ${cause} DUE TO A LINE OF THUNDERSTORMS THAT WILL CAUSE ${advTypeShort}${typeofevent} IN THE ADVISORY AREA") +#end +#if(${list.contains(${bullets}, "trainedSpotters")}) + #set($report = "TRAINED WEATHER SPOTTERS REPORTED ${cause} CAUSING ${advTypeShort} IN !** LOCATION **!${typeofevent}") +#end +#if(${list.contains(${bullets}, "trainedSpotters")} && ${list.contains(${bullets}, "thunder")}) + #set($report = "TRAINED WEATHER SPOTTERS REPORTED ${cause} IN !** LOCATION **! DUE TO A THUNDERSTORM THAT WILL CAUSE ${advTypeShort}${typeofevent}") +#end +#if(${list.contains(${bullets}, "trainedSpotters")} && ${list.contains(${bullets}, "actual")}) + #set($report = "TRAINED WEATHER SPOTTERS REPORTED ${cause} CAUSING ${advTypeShort} IN !** LOCATION **!${typeofevent}") +#end +#if(${list.contains(${bullets}, "trainedSpotters")} && ${list.contains(${bullets}, "plainRain")}) + #set($report = "TRAINED WEATHER SPOTTERS REPORTED ${cause} IN !** LOCATION **! THAT WILL CAUSE ${advTypeShort}${typeofevent}") +#end +#if(${list.contains(${bullets}, "lawEnforcement")}) + #set($report = "LOCAL LAW ENFORCEMENT REPORTED ${cause} CAUSING ${advTypeShort} IN !** LOCATION **!${typeofevent}") +#end +#if(${list.contains(${bullets}, "lawEnforcement")} && ${list.contains(${bullets}, "thunder")}) + #set($report = "LOCAL LAW ENFORCEMENT REPORTED ${cause} IN !** LOCATION **! DUE TO A THUNDERSTORM IN THAT WILL CAUSE ${advTypeShort}${typeofevent}") +#end +#if(${list.contains(${bullets}, "lawEnforcement")} && ${list.contains(${bullets}, "actual")}) + #set($report = "LOCAL LAW ENFORCEMENT REPORTED ${cause} CAUSING ${advTypeShort} IN !** LOCATION **!${typeofevent}") +#end +#if(${list.contains(${bullets}, "lawEnforcement")} && ${list.contains(${bullets}, "plainRain")}) + #set($report = "LOCAL LAW ENFORCEMENT REPORTED ${cause} IN !** LOCATION **! THAT WILL CAUSE ${advTypeShort}${typeofevent}") +#end +#if(${list.contains(${bullets}, "emergencyManagement")}) + #set($report = "EMERGENCY MANAGEMENT REPORTED ${cause} CAUSING ${advTypeShort} IN !** LOCATION **!${typeofevent}") +#end +#if(${list.contains(${bullets}, "emergencyManagement")} && ${list.contains(${bullets}, "thunder")}) + #set($report = "EMERGENCY MANAGEMENT REPORTED ${cause} IN !** LOCATION **! DUE TO A THUNDERSTORM IN THAT WILL CAUSE ${advTypeShort}${typeofevent}") +#end +#if(${list.contains(${bullets}, "emergencyManagement")} && ${list.contains(${bullets}, "actual")}) + #set($report = "EMERGENCY MANAGEMENT REPORTED ${cause} CAUSING ${advTypeShort} IN !** LOCATION **!${typeofevent}") +#end +#if(${list.contains(${bullets}, "emergencyManagement")} && ${list.contains(${bullets}, "plainRain")}) + #set($report = "EMERGENCY MANAGEMENT REPORTED ${cause} IN !** LOCATION **! THAT WILL CAUSE ${advTypeShort}${typeofevent}") +#end +#if(${list.contains(${bullets}, "public")}) + #set($report = "THE PUBLIC REPORTED ${cause} CAUSING ${advTypeShort} IN !** LOCATION **!${typeofevent}") +#end +#if(${list.contains(${bullets}, "public")} && ${list.contains(${bullets}, "glacierOutburst")}) + #set($report = "THE PUBLIC REPORTED MINOR FLOODING IN !** LOCATION **! DUE TO A GLACIER-DAMMED LAKE OUTBURST FLOOD") +#end +#if(${list.contains(${bullets}, "public")} && ${list.contains(${bullets}, "groundWater")}) + #set($report = "THE PUBLIC REPORTED MINOR FLOODING IN !** LOCATION **! DUE TO RISING GROUND WATER LEVELS") +#end +#if(${list.contains(${bullets}, "trainedSpotters")} && ${list.contains(${bullets}, "glacierOutburst")}) + #set($report = "A TRAINED SPOTTER REPORTED MINOR FLOODING IN !** LOCATION **! DUE TO A GLACIER-DAMMED LAKE OUTBURST FLOOD") +#end +#if(${list.contains(${bullets}, "trainedSpotters")} && ${list.contains(${bullets}, "groundWater")}) + #set($report = "A TRAINED SPOTTER REPORTED MINOR FLOODING IN !** LOCATION **! DUE TO RISING GROUND WATER LEVELS") +#end +#if(${list.contains(${bullets}, "lawEnforcement")} && ${list.contains(${bullets}, "glacierOutburst")}) + #set($report = "LOCAL LAW ENFORCEMENT REPORTED MINOR FLOODING IN !** LOCATION **! DUE TO A GLACIER-DAMMED LAKE OUTBURST FLOOD") +#end +#if(${list.contains(${bullets}, "lawEnforcement")} && ${list.contains(${bullets}, "groundWater")}) + #set($report = "LOCAL LAW ENFORCEMENT REPORTED MINOR FLOODING IN !** LOCATION **! DUE TO RISING GROUND WATER LEVELS") +#end +#if(${list.contains(${bullets}, "emergencyManagement")} && ${list.contains(${bullets}, "glacierOutburst")}) + #set($report = "EMERGENCY MANAGEMENT REPORTED MINOR FLOODING IN !** LOCATION **! DUE TO A GLACIER-DAMMED LAKE OUTBURST FLOOD") +#end +#if(${list.contains(${bullets}, "emergencyManagement")} && ${list.contains(${bullets}, "groundWater")}) + #set($report = "EMERGENCY MANAGEMENT REPORTED MINOR FLOODING IN !** LOCATION **! DUE TO RISING GROUND WATER LEVELS") +#end +#if(${list.contains(${bullets}, "public")} && ${list.contains(${bullets}, "thunder")}) + #set($report = "THE PUBLIC REPORTED ${advTypeShort} IN !** LOCATION **! DUE TO A THUNDERSTORM THAT WILL CAUSE ${advTypeShort}") +#end +#if(${list.contains(${bullets}, "public")} && ${list.contains(${bullets}, "actual")}) + #set($report = "THE PUBLIC REPORTED ${cause} CAUSING ${advTypeShort} IN !** LOCATION **!${typeofevent}") +#end +#if(${list.contains(${bullets}, "public")} && ${list.contains(${bullets}, "plainRain")}) + #set($report = "THE PUBLIC REPORTED ${cause} IN !** LOCATION **! THAT WILL CAUSE MINOR FLOODING${typeofevent}") +#end +#if(${list.contains(${bullets}, "rain1")} ) + #set($rainAmount = "UP TO ONE INCH OF RAIN HAS ALREADY FALLEN.") +#end +#if(${list.contains(${bullets}, "rain2")} ) + #set($rainAmount = "UP TO TWO INCHES OF RAIN HAS ALREADY FALLEN.") +#end +#if(${list.contains(${bullets}, "rain3")} ) + #set($rainAmount = "UP TO THREE INCHES OF RAIN HAS ALREADY FALLEN.") +#end +#if(${list.contains(${bullets}, "rainEdit")} ) + #set($rainAmount = "!** RAINFALL AMOUNTS **! INCHES OF RAIN HAS ALREADY FALLEN.") +#end +#if(${list.contains(${bullets}, "doppler")} || ${list.contains(${bullets}, "dopplerGauge")}) +#set($estimate = "UP TO !** Number **! INCHES OF RAIN HAS FALLEN IN THE PAST HOUR.") +#else +#set($estimate = "") +#end + +* ## +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +#thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) +...${report}. ${estimate}${rainAmount} + +#set($phenomena = "FLOOD") +#set($warningType = "ADVISORY") +* ## +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +## #locationsList("SOME LOCATIONS THAT WILL EXPERIENCE MINOR FLOODING INCLUDE" "THE FLOODING IS EXPECTED TO IMPACT MAINLY RURAL AREAS OF" 0 ${cityList} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 0) EXCLUDED FOR ALASKA +#if(${list.contains(${bullets}, "fcstPoint")}) +FOR THE !** insert river name and forecast point **!... +AT ${dateUtil.format(${now}, ${timeFormat.clock}, ${localtimezone})} THE STAGE WAS !** xx.x **! FEET. +FLOOD STAGE IS !** xx.x **! FEET. +FORECAST... !** insert crest stage and time **!. +IMPACTS...!** discussion of expected impacts and flood path **! +#else +!** insert impacts and flood path **! + +#end +#if(${list.contains(${bullets}, "addRainfall")}) + +ADDITIONAL RAINFALL OF !** Edit Amount **! INCHES IS EXPECTED OVER THE AREA. THIS ADDITIONAL RAIN WILL CAUSE MINOR FLOODING. +#end +#if(${list.contains(${bullets}, "specificPlace")}) + +MINOR FLOODING IS OCCURRING NEAR !** Enter Location **!. +#end + +#if(${list.contains(${bullets}, "drainages")}) +#drainages(${riverdrainages}) + +#end + +## parse file command here is to pull in mile marker info +## #parse("mileMarkers.vm") + +##################### +## CALL TO ACTIONS ## +##################### +#foreach (${bullet} in ${bullets}) +#if(${bullet.endsWith("CTA")}) +#set($ctaSelected = "YES") +#end +#end +## +#if(${ctaSelected} == "YES") +PRECAUTIONARY/PREPAREDNESS ACTIONS... + +#end +#if(${list.contains(${bullets}, "dontdrownCTA")}) +MOST FLOOD DEATHS OCCUR IN AUTOMOBILES. NEVER DRIVE YOUR VEHICLE INTO AREAS WHERE THE WATER COVERS THE ROADWAY. FLOOD WATERS ARE USUALLY DEEPER THAN THEY APPEAR. JUST ONE FOOT OF FLOWING WATER IS POWERFUL ENOUGH TO SWEEP VEHICLES OFF THE ROAD. WHEN ENCOUNTERING FLOODED ROADS MAKE THE SMART CHOICE...TURN AROUND...DONT DROWN. + +#end +#if(${list.contains(${bullets}, "urbanCTA")}) +EXCESSIVE RUNOFF FROM HEAVY RAINFALL WILL CAUSE ELEVATED LEVELS ON SMALL CREEKS AND STREAMS...AND PONDING OF WATER IN URBAN AREAS...HIGHWAYS...STREETS AND UNDERPASSES AS WELL AS OTHER POOR DRAINAGE AREAS AND LOW LYING SPOTS. + +#end +#if(${list.contains(${bullets}, "ruralCTA")}) +EXCESSIVE RUNOFF FROM HEAVY RAINFALL WILL CAUSE FLOODING OF SMALL CREEKS AND STREAMS...HIGHWAYS AND UNDERPASSES. ADDITIONALLY...COUNTRY ROADS AND FARMLANDS ALONG THE BANKS OF CREEKS...STREAMS AND OTHER LOW LYING AREAS ARE SUBJECT TO FLOODING. + +#end +#if(${list.contains(${bullets}, "donotdriveCTA")}) +DO NOT DRIVE YOUR VEHICLE INTO AREAS WHERE THE WATER COVERS THE ROADWAY. THE WATER DEPTH MAY BE TOO GREAT TO ALLOW YOUR CAR TO CROSS SAFELY. MOVE TO HIGHER GROUND. + +#end +#if(${list.contains(${bullets}, "lowspotsCTA")}) +IN HILLY TERRAIN THERE ARE HUNDREDS OF LOW WATER CROSSINGS WHICH ARE POTENTIALLY DANGEROUS IN HEAVY RAIN. DO NOT ATTEMPT TO TRAVEL ACROSS FLOODED ROADS. FIND ALTERNATE ROUTES. IT TAKES ONLY A FEW INCHES OF SWIFTLY FLOWING WATER TO CARRY VEHICLES AWAY. + +#end +#if(${list.contains(${bullets}, "powerCTA")}) +DO NOT UNDERESTIMATE THE POWER OF FLOOD WATERS. ONLY A FEW INCHES OF RAPIDLY FLOWING WATER CAN QUICKLY CARRY AWAY YOUR VEHICLE. + +#end +#if(${list.contains(${bullets}, "reportFloodingCTA")}) +TO REPORT FLOODING...HAVE THE NEAREST LAW ENFORCEMENT AGENCY RELAY YOUR REPORT TO THE NATIONAL WEATHER SERVICE FORECAST OFFICE. + +#end +#if(${list.contains(${bullets}, "advisoryMeansCTA")}) +A FLOOD ADVISORY MEANS RIVER OR STREAM FLOWS ARE ELEVATED...OR PONDING OF WATER IN URBAN OR OTHER AREAS IS OCCURRING OR IS IMMINENT. DO NOT ATTEMPT TO TRAVEL ACROSS FLOODED ROADS. FIND ALTERNATE ROUTES. IT TAKES ONLY A FEW INCHES OF SWIFTLY FLOWING WATER TO CARRY VEHICLES AWAY. + +#end +#if(${ctaSelected} == "YES") +&& + +#end +#################################### END OF CTA STUFF ################################### + +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. DO NOT TAKE ACTION BASED ON THIS MESSAGE. + +#end +#printcoords(${areaPoly}, ${list}) + + +$$ + +#parse("forecasterName.vm") + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodAdvisory_Zones.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodAdvisory_Zones.xml new file mode 100644 index 0000000000..aaa466f272 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodAdvisory_Zones.xml @@ -0,0 +1,404 @@ + + + + + + + mi + mph + + + + Forecast Zones + + + + + + + + + NEW + COR + EXT + + + + + FA.Y + + + + true + + + true + + + 180 + + 60 + 120 + 180 + 210 + 240 + 270 + 300 + 330 + 360 + 420 + 480 + 540 + 600 + 660 + 720 + 1440 + 2160 + 2880 + 3600 + + +ic,advType + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + Zone + + HATCHING + 0 + AND + 0 + NAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + STATE_ZONE + + NAME + + parent + + + + + + + 25 + + + + + County + INTERSECT + 0 + AND + 0 + COUNTYNAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + FIPS + NAME + + parent + + + + + + + 25 + + + + + AREA + 1 + true + 8.0 + 5 + 5 + 4 + 8 + Name + AREA + COUNTYNAME + + STATE + STATE + countyTypes.txt + + distance + + + + + + + + + + + + + NAME + 1 + AREA + POINTS + true + 30 + 200 + + + + + + + + + + warngenlev + population + distance + + + + + + NAME + AREA + POINTS + true + 10 + 200 + + distance + + + + + + + + + + + + + + + + WarnGenLoc + + Zone + States + TIMEZONES + TIME_ZONE + + + + ffmp_basins + 0.064 + streamname + + + + + + true + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodWarning.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodWarning.vm index 1f501cbff6..47bb0364c8 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodWarning.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodWarning.vm @@ -1,14 +1,17 @@ ############################## ### AREAL FLOOD WARNING ###### ############################## -## RECENT VERSION HISTORY: +############################################################################ +## EDITED BY MIKE DANGELO 7-13-2011 ## +## Edited by Phil Kurimski 8-16-2011 R11.8 ## +## EDITED BY MIKE DANGELO 9-19-2011 at Alaska TIM ## +## EDITED BY Evan Bookbinder 2-24-2012 +## EDITED BY Phil Kurimski 2-28-2012 +## Mike Dangelo 9-13-2012 minor tweaks to ${variables}## +## Phil Kurimski 2-05-2013 ## Mike Dangelo 2-6-2013 added satellite estimate logic -## Mike Dangelo 5-2-2013 removed redundant entry/logic for specific stream -## Mike Dangelo 9-16-2013 fixed name of bullet for specific stream and removed redundant CTA -## Mike Dangelo 09-18-2013 added code for init pos & pathcasting -## Evan Bookbinder 9-18-2013 implemented config.vm +## Mike Dangelo 5-2-2013 removed redundant entry/logic for particular/specific stream #################################### SET SOME VARIABLES ################################### -#parse("config.vm") ## #if(${action} == "EXT") #set($starttime = "000000T0000Z") @@ -77,11 +80,7 @@ ${ugcline} /${productClass}.${action}.${vtecOffice}.FA.W.${etn}.${starttime}-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ /00000.0.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ #foreach (${area} in ${areas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} @@ -114,7 +113,7 @@ THIS IS A TEST MESSAGE. ## #end #secondBullet(${dateUtil},${expire},${timeFormat},${localtimezone},${secondtimezone}) -#set($report = "!**YOU DID NOT SELECT EITHER A /REPORT/ BULLET OR AN /EVENT/ BULLET. PLEASE CLOSE THIS WINDOW AND REGENERATE YOUR WARNING**!") +#set($report = "!**YOU DID NOT SELECT AN /EVENT/ BULLET. PLEASE CLOSE THIS WINDOW AND REGENERATE YOUR WARNING**!") #set($rainAmount = "") #if(${list.contains(${bullets}, "doppler")}) #set($report = "DOPPLER RADAR INDICATED HEAVY RAIN THAT WILL CAUSE FLOODING.") @@ -193,53 +192,15 @@ THIS IS A TEST MESSAGE. ## #if(${productClass}=="T") THIS IS A TEST MESSAGE. ## #end -############# IF TRACK IS ENABLED AND stormPosition SELECTED ############################################### -#if(${list.contains(${bullets},"stormPosition")}) -#thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) -#if(${stormType} == "line") -...A LINE OF THUNDERSTORMS PRODUCING HEAVY RAIN WAS LOCATED ## -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxLandNearDistance}, ${overPhrase}, ${maxLandOverDistance}, ${landDistanceUnits}, ${useSecondReferenceLine}) -#else -...A THUNDERSTORM PRODUCING HEAVY RAIN WAS LOCATED ## -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxLandNearDistance}, ${overPhrase}, ${maxLandOverDistance}, ${landDistanceUnits}, ${useSecondReferenceCell}) -#end -#if(${movementSpeed} < ${landStationary} || ${stationary}) -...AND IS STATIONARY. ## -#else -#if(${stormType} == "line") -...AND MOVING ## -#else -...MOVING ## -#end -#direction(${movementDirectionRounded}) AT ${mathUtil.roundTo5(${movementSpeed})} MPH. ## -#end -${rainAmount} -#else -###############IF TRACK IS NOT ENABLED OR stormPosition IS NOT SELECTED ####################################### #thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) ...${report} ${rainAmount} -#end ############################################################# ######## FOURTH BULLET (OPTIONAL IN FLOOD PRODUCTS) ######### ############################################################# -############# IF TRACK IS ENABLED AND pathcast AND stormPosition BOTH SELECTED ############################################### -#if(${list.contains(${bullets},"pathcast")} && ${list.contains(${bullets}, "stormPosition")}) -* ## -#if(${productClass}=="T") -THIS IS A TEST MESSAGE. ## -#end -#if($movementSpeed < 3 ) -#pathCast("HEAVY RAIN WILL CONTINUE OVER THE FOLLOWING LOCATIONS..." "HEAVY RAIN" ${pathCast} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 0) - -#else -#pathCast("HEAVY RAIN WILL MOVE OVER THE FOLLOWING LOCATIONS..." "HEAVY RAIN" ${pathCast} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 0) - -#end -#end -################ +#set($phenomena = "FLOOD") +#set($warningType = "WARNING") #if(${list.contains(${bullets}, "listofcities")}) -#set($floodType = "FLOODING") * ## #if(${productClass}=="T") THIS IS A TEST MESSAGE. ## @@ -248,7 +209,7 @@ THIS IS A TEST MESSAGE. ## #### 0 IS A ... SEPARATED LIST, 1 IS ONE PER LINE, >1 IS A COLUMN FORMAT #### IF YOU USE SOMETHING OTHER THAN "LOCATIONS IMPACTED INCLUDE" LEAD IN BELOW, MAKE SURE THE #### ACCOMPANYING XML FILE PARSE STRING IS CHANGED TO MATCH! -#locationsList("SOME LOCATIONS THAT WILL EXPERIENCE FLOODING INCLUDE..." ${floodType} 0 ${cityList} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 0) +#locationsList("SOME LOCATIONS THAT WILL EXPERIENCE FLOODING INCLUDE..." "THIS FLOODING" 0 ${cityList} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 0) #end @@ -269,9 +230,8 @@ ADDITIONAL RAINFALL AMOUNTS OF !** EDIT AMOUNT **! ARE POSSIBLE IN THE WARNED AR FLOOD WATERS ARE MOVING DOWN !**name of channel**! FROM !**location**! TO !**location**!. THE FLOOD CREST IS EXPECTED TO REACH !**location(s)**! BY !**time(s)**!. #end -## parse file commands here pull in mile marker and/or point marker info +## parse file command here is to pull in mile marker info ## #parse("mileMarkers.vm") -## #parse("pointMarkers.vm") #################################### END OF ADDITIONAL STUFF ################################### ###################################### diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodWarning.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodWarning.xml index 8c47809de2..b359d03bf6 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodWarning.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodWarning.xml @@ -8,27 +8,11 @@ Evan Bookbinder 09-11-2012 Added settings for locations shapefile Phil Kurimski 02-05-2013 Added additional valid duration times Mike Dangelo 02-06-2013 added default bullet for ic - Mike Dangelo 05-02-2013 removed redundant specific CTA - Mike Dangelo 09-16-2013 fixed specific stream error, and added 6 days to durations - Mike Dangelo 09-18-2013 to optionally allow =true for pathcasting, and add pointMarker.xml 'include' - Phil Kurimski 09-19-2013 added geospatialConfig.xml + 05-02-2013 removed redundant specific CTA --> - - - - - - - - - mi mph @@ -63,11 +47,6 @@ turned on unless the corresponding .vm file is turned on in a given template's . true - - false - 180 @@ -85,7 +64,6 @@ Must be paired with proper vm code (also commented out in arealFloodWarning.vm)! 4320 5760 7200 - 8640 10080 @@ -122,7 +100,6 @@ Must be paired with proper vm code (also commented out in arealFloodWarning.vm)! - @@ -130,14 +107,13 @@ Must be paired with proper vm code (also commented out in arealFloodWarning.vm)! - - + - + @@ -177,23 +153,23 @@ Must be paired with proper vm code (also commented out in arealFloodWarning.vm)! - - - - + + + + - + - + @@ -234,23 +210,23 @@ Must be paired with proper vm code (also commented out in arealFloodWarning.vm)! - - - - + + + + - + - + @@ -263,6 +239,118 @@ Must be paired with proper vm code (also commented out in arealFloodWarning.vm)! +false + + + + County + 0 + AND + 0 + COUNTYNAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + FIPS + NAME + + parent + + + + + + + 25 + + + + NAME + 1 + AREA + POINTS + true + 30 + 200 + + + + + + + + + + warngenlev + population + distance + + + + + + NAME + AREA + POINTS + true + 30 + 200 + + + + + + + + + + distance + + + + + + + + + + true + 8.0 + 5 + 5 + 4 + 8 + Name + AREA + COUNTYNAME + STATE + STATE + countyTypes.txt + + distance + + + + + + + + + + + + + WarnGenLoc + County + States + TIMEZONES + TIME_ZONE + + ffmp_basins 0.064 @@ -273,6 +361,6 @@ Must be paired with proper vm code (also commented out in arealFloodWarning.vm)! true - + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodWarningFollowup.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodWarningFollowup.vm index faa00785c2..99ee662ab0 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodWarningFollowup.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodWarningFollowup.vm @@ -1,16 +1,16 @@ ########################################################### -## AREAL FLOOD WARNING FOLLOWUP TEMPLATE -############################################################# -## RECENT VERSION HISTORY +## EDITED BY MIKE DANGELO 7-12-2011 FOR OB11.7 ## +## Edited by Phil Kurimski 8-18-2011 FOR OB11.8.0-4 ## +## Edited by Evan Bookbinder 9-16-2011 FOR OB11.8.0-8 ## +## EDITED BY MIKE DANGELO 9-19-2011 at Alaska TIM ## +## EDITED BY MIKE DANGELO 1-25-2012 at CRH TIM ## +## EDITED BY EVAN BOOKBINDER 2-24-2012 ## +## EDITED BY PHIL KURIMSKI 2-28-2012 ## ## EDITED BY MIKE REGA 5-02-2012 DR 14885 MND blank line ## ## Mike Dangelo 9-13-2012 minor tweaks to ${variables} ## Phil Kurimski 2-05-2013 FOR OB13.2.1-5 ## Evan Bookbinder 3-1-2013 segment ending $$ issues -## Mike Dangelo 9-16-2013 slight modifications to urbanCTA output -## Mike Dangelo 9-18-2013 added initial position and pathcasting options -## Evan Bookbinder 9-18-2013 implemented config.vm #################################### SET SOME VARs ################################### -#parse("config.vm") #set($hycType = "") #set($floodReason = "") #set($floodType = "FLOODING") @@ -64,39 +64,24 @@ ${ugclinecan} /${productClass}.CAN.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire},${timeFormat.ymdthmz})}/ /00000.0.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ #foreach (${area} in ${cancelareas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## +${area.name} ${area.stateabbr}-## #end --## -#end - #elseif(${CORCAN}=="true") ${ugclinecan} ################### VTEC/COUNTY LINE ################## /${productClass}.COR.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire},${timeFormat.ymdthmz})}/ /00000.0.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ #foreach (${area} in ${cancelareas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## +${area.name} ${area.stateabbr}-## #end --## -#end - #else ${ugcline} ################### VTEC/COUNTY LINE ################## /${productClass}.${action}.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ /00000.0.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ #foreach (${area} in ${areas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## +${area.name} ${area.stateabbr}-## #end --## -#end - #end ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} @@ -123,6 +108,7 @@ ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} ################################ #### CREATE HEADLINES ########## ################################ +## County #if(${action}=="EXP" || ${action}=="CAN") ...THE FLOOD WARNING FOR ## @@ -137,8 +123,6 @@ ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} ${hycType} IN ## #end #headlineLocList(${cancelareas} true true true false) ${expcanHLTag}... -###REPLACE headlineLocList ABOVE WITH THE FOLLOWING FOR ZONE BASED PRODUCT W/ COUNTY HEADLINE -###headlineLocList(${cancelaffectedCounties} true true true false) ${expcanHLTag}... #end ############################ ## END CAN/EXP HEADLINE #### @@ -176,11 +160,7 @@ ${ugcline} /${productClass}.CON.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz})}/ /00000.0.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ #foreach (${area} in ${areas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} @@ -196,11 +176,7 @@ ${ugcline} /${productClass}.COR.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz})}/ /00000.0.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ #foreach (${area} in ${areas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} @@ -262,30 +238,6 @@ REMAINS IN EFFECT #secondBullet(${dateUtil},${expire},${timeFormat},${localtimez #if(${productClass}=="T") THIS IS A TEST MESSAGE. ## #end -############# IF TRACK IS ENABLED AND stormPosition SELECTED ############################################### -#if(${list.contains(${bullets},"stormPosition")}) -#thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) -#if(${stormType} == "line") -...A LINE OF THUNDERSTORMS PRODUCING HEAVY RAIN WAS LOCATED ## -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxLandNearDistance}, ${overPhrase}, ${maxLandOverDistance}, ${landDistanceUnits}, ${useSecondReferenceLine}) -#else -...A THUNDERSTORM PRODUCING HEAVY RAIN WAS LOCATED ## -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxLandNearDistance}, ${overPhrase}, ${maxLandOverDistance}, ${landDistanceUnits}, ${useSecondReferenceCell}) -#end -#if(${movementSpeed} < ${landStationary} || ${stationary}) -...AND IS STATIONARY. ## -#else -#if(${stormType} == "line") -...AND MOVING ## -#else -...MOVING ## -#end -#direction(${movementDirectionRounded}) AT ${mathUtil.roundTo5(${movementSpeed})} MPH. ## -#end -${rainAmount} - -#else -###############IF TRACK IS NOT ENABLED OR stormPosition IS NOT SELECTED ####################################### #set($cityListLead = "RUNOFF FROM THIS EXCESSIVE RAINFALL WILL CAUSE ${floodType} TO OCCUR. ") #thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone})...## #if(${list.contains(${bullets}, "thunder")}) @@ -300,24 +252,9 @@ ${reportBy} ${floodType} ACROSS THE WARNED AREA.${rainAmount}${floodReason} !** !**YOU DID NOT SELECT AN /EVENT/ BULLET. PLEASE CLOSE THIS WINDOW AND REGENERATE YOUR WARNING**! #end -#end - ############################################ ######## (CITY LIST) ######### ############################################ -############# IF TRACK IS ENABLED AND trackStorm AND stormPosition BOTH SELECTED ############################################### -#if(${list.contains(${bullets},"pathcast")} && ${list.contains(${bullets}, "stormPosition")}) -#if(${productClass}=="T") -THIS IS A TEST MESSAGE. ## -#end -#if($movementSpeed < 3 ) -#pathCast("HEAVY RAIN WILL CONTINUE OVER THE FOLLOWING LOCATIONS..." "HEAVY RAIN" ${pathCast} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 0) - -#else -#pathCast("HEAVY RAIN WILL MOVE OVER THE FOLLOWING LOCATIONS..." "HEAVY RAIN" ${pathCast} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 0) - -#end -#end #if(${list.contains(${bullets}, "listofcities")}) #if(${productClass}=="T") THIS IS A TEST MESSAGE. ## @@ -330,16 +267,16 @@ THIS IS A TEST MESSAGE. ## #end ########################################## END OF OPTIONAL FOURTH BULLET ############################## -############################### -###### WHERE ADD INFO GOES #### -############################### +###################################### +###### WHERE ADDITIONAL INFO GOES #### +###################################### #if(${list.contains(${bullets}, "addRainfall")}) ADDITIONAL RAINFALL AMOUNTS OF !** EDIT AMOUNT **! ARE POSSIBLE IN THE WARNED AREA. #end -#if(${list.contains(${bullets}, "specificStream")}) -FLOOD WATERS ARE MOVING DOWN !**name of channel**! FROM !**location**! TO !**location**!. THE FLOOD CREST IS EXPECTED TO REACH !**location(s)**! BY !**time(s)**!. +#if(${list.contains(${bullets}, "particularStream")}) +FLOOD WATERS ARE MOVING DOWN !**name of channel**! FROM !**location**! TO !**location**!. THE FLOOD CREST IS EXPECTED TO REACH !**location(s)**! BY !**time(s)**!. #end #if(${list.contains(${bullets}, "drainages")}) @@ -349,8 +286,6 @@ FLOOD WATERS ARE MOVING DOWN !**name of channel**! FROM !**location**! TO !**loc ## parse file command here is to pull in mile marker info ## #parse("mileMarkers.vm") -## Uncomment below pull in point marker info -## #parse("pointMarkers.vm") #################################### END OF ADDITIONAL STUFF ################################### ###################################### @@ -386,6 +321,10 @@ EXCESSIVE RUNOFF FROM HEAVY RAINFALL WILL CAUSE FLOODING OF SMALL CREEKS AND STR #if(${list.contains(${bullets}, "USS_CTA")}) EXCESSIVE RUNOFF FROM HEAVY RAINFALL WILL CAUSE FLOODING OF SMALL CREEKS AND STREAMS...HIGHWAYS AND UNDERPASSES IN URBAN AREAS. ADDITIONALLY...COUNTRY ROADS AND FARMLANDS ALONG THE BANKS OF CREEKS...STREAMS AND OTHER LOW LYING AREAS ARE SUBJECT TO FLOODING. +#end +#if(${list.contains(${bullets}, "specificCTA")}) +FLOOD WATERS ARE MOVING DOWN !**name of channel**! FROM !**location**! TO !**location**!. THE FLOOD CREST IS EXPECTED TO REACH !**location(s)**! BY !**time(s)**!. + #end #if(${list.contains(${bullets}, "nightCTA")}) BE ESPECIALLY CAUTIOUS AT NIGHT WHEN IT IS HARDER TO RECOGNIZE THE DANGERS OF FLOODING. IF FLOODING IS OBSERVED ACT QUICKLY. MOVE UP TO HIGHER GROUND TO ESCAPE FLOOD WATERS. DO NOT STAY IN AREAS SUBJECT TO FLOODING WHEN WATER BEGINS RISING. diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodWarningFollowup.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodWarningFollowup.xml index e5f20972d0..97413db074 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodWarningFollowup.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodWarningFollowup.xml @@ -6,26 +6,10 @@ Qinglu Lin 04-04-2012 DR 14691. Added tag. Evan Bookbinder 09-11-2012 Added settings for locations shapefile Phil Kurimski 02-05-2013 - Mike Dangelo 09-16-2013 changed name bullets to 'specific' stream, slight urbanCTA modification - Mike Dangelo 09-18-2013 added initial position and pathcasting options - Phil Kurimski 09-19-2013 added geospatialConfig.xml --> - - - - - - - - - mi mph @@ -61,11 +45,6 @@ turned on unless the corresponding .vm file is turned on in a given template's . true - - false - 30 @@ -119,26 +98,27 @@ Must be paired with proper vm code (also commented out in arealFloodWarningFollo - - - - + + + + - + - + + @@ -163,26 +143,27 @@ Must be paired with proper vm code (also commented out in arealFloodWarningFollo - - + + + - - + - + + @@ -193,6 +174,119 @@ Must be paired with proper vm code (also commented out in arealFloodWarningFollo + false + + + + County + 0 + AND + 0 + COUNTYNAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + FIPS + NAME + + parent + + + + + + + 25 + + + + + true + 8.0 + 5 + 5 + 4 + 8 + Name + AREA + COUNTYNAME + + STATE + STATE + countyTypes.txt + + distance + + + + + + + + + + + + + NAME + 1 + AREA + POINTS + true + 30 + 200 + + + + + + + + + + warngenlev + population + distance + + + + + + NAME + AREA + POINTS + true + 30 + 200 + + + + + + + + + + distance + + + + + + + + WarnGenLoc + County + + States + TIMEZONES + TIME_ZONE + + ffmp_basins 0.064 diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.vm new file mode 100644 index 0000000000..88d705f130 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.vm @@ -0,0 +1,436 @@ +### FLOOD WARNING FOLLOW UP in ZONES ###### +########################################### +####################################################################### +## Created BY MIKE DANGELO 9-19-2011 at Alaska TIM for zones coding ## +## Edited by Phil kurimski 2-29-2012 +## Edited by Mike Rega 5-02-2012 DR 14885-MND blank line +## Mike Dangelo 9-13-2012 minor tweaks to ${variables} +#################################### SET SOME VARs ################################### +#set($hycType = "") +#set($floodReason = "") +#set($floodType = "FLOODING") +###OVERRIDE DEFAULT EXECESSIVE RAINFALL IF NECESSARY +#* +#if(${list.contains(${bullets}, "icrs")}) + #set($hycType = "RAIN AND SNOW MELT") + #set($floodReason = " RAPID SNOW MELT IS ALSO OCCURRING AND WILL ADD TO THE ${floodType}.") +#elseif(${list.contains(${bullets}, "icsm")}) + #set($hycType = "RAPID SNOW MELT") + #set($floodReason = " RAPID SNOW MELT IS OCCURRING AND WILL CAUSE ${floodType}.") +#elseif(${list.contains(${bullets}, "icij")}) + #set($hycType = "ICE JAM FLOODING") + #set($floodReason = " AN ICE JAM IS OCCURRING AND WILL CAUSE ${floodType}.") +#elseif(${list.contains(${bullets}, "icicr")}) + #set($hycType = "AN ICE JAM AND HEAVY RAIN") + #set($floodReason = " AN ICE JAM IS ALSO OCCURRING AND WILL CAUSE ${floodType}.") +#elseif(${list.contains(${bullets}, "icics")}) + #set($hycType = "AN ICE JAM AND RAPID SNOW MELT") + #set($floodReason = " AN ICE JAM AND RAPID SNOW MELT ARE ALSO OCCURRING AND WILL CAUSE ${floodType}.") +#elseif(${list.contains(${bullets}, "icerr")}) + #set($hycType = "RAPID RIVER RISES") +#end +*# +#if(${ic} == "SM") + #set($hycType = "RAPID SNOW MELT") + #set($floodReason = " RAPID SNOW MELT IS OCCURRING AND WILL CONTINUE TO CAUSE ${floodType}.") +#elseif(${ic} == "RS") + #set($hycType = "RAIN AND SNOW MELT") + #set($floodReason = " RAPID SNOW MELT IS ALSO OCCURRING AND WILL ADD TO THE ${floodType}.") +#elseif(${ic} == "IJ") + #set($hycType = "ICE JAM FLOODING") + #set($floodReason = " AN ICE JAM IS OCCURRING AND WILL CONTINUE TO CAUSE ${floodType}.") +#elseif(${ic} == "IC") + #set($hycType = "AN ICE JAM AND HEAVY RAIN") + #set($floodReason = " FLOODING DUE TO AN ICE JAM AND HEAVY RAIN WILL CONTINUE.") +#elseif(${ic} == "MC") + #set($hycType = "") + #set($floodReason = "") +#elseif(${ic} == "UU") + #set($hycType = "") + #set($floodReason = "") +#elseif(${ic} == "DM") + #set($hycType = "LEVEE FAILURE") + #set($floodReason = " FLOODING DUE TO A LEVEE FAILURE WILL CONTINUE.") +#elseif(${ic} == "DR") + #set($hycType = "DAM GATE RELEASE") + #set($floodReason = " FLOODING DUE TO A DAM GATE RELEASE.") +#elseif(${ic} == "GO") + #set($hycType = "GLACIER-DAMMED LAKE OUTBURST") + #set($floodReason = " FLOODING DUE TO A GLACIER-DAMMED LAKE OUTBURST.") +#elseif(${ic} == "OT") + #set($hycType = "GROUND WATER FLOODING") + #set($floodReason = " FLOODING DUE TO GROUND WATER.") +#end +## +###################################################################################### +${WMOId} ${vtecOffice} 000000 ${BBBId} +FLS${siteId} + +#if(${productClass}=="T") +TEST...FLOOD STATEMENT...TEST +#else +FLOOD STATEMENT +#end +NATIONAL WEATHER SERVICE ${officeShort} +#backupText(${backupSite}) +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +#if(${action}=="COR" && ${cancelareas}) +#set($CORCAN = "true") +#else +#set($CORCAN = "false") +#end +#if(${action}=="CANCON") +${ugclinecan} +################### VTEC/COUNTY LINE ################## +/${productClass}.CAN.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire},${timeFormat.ymdthmz})}/ +/00000.0.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ +#set($zoneList = "") +#foreach (${area} in ${cancelareas}) +#set($zoneList = "${zoneList}${area.name}-") +#end +${zoneList} +#elseif(${CORCAN}=="true") +${ugclinecan} +################### VTEC/COUNTY LINE ################## +/${productClass}.COR.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire},${timeFormat.ymdthmz})}/ +/00000.0.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ +#set($zoneList = "") +#foreach (${area} in ${cancelareas}) +#set($zoneList = "${zoneList}${area.name}-") +#end +${zoneList} +#else +${ugcline} +################### VTEC/COUNTY LINE ################## +/${productClass}.${action}.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ +/00000.0.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ +#set($zoneList = "") +#foreach (${area} in ${areas}) +#set($zoneList = "${zoneList}${area.name}-") +#end +${zoneList} + +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +#if(${productClass}=="T") +...THIS MESSAGE IS FOR TEST PURPOSES ONLY... + +#end +################################################################# +################################################################# +## LETS START WITH EXPIRATION AND CANCELLATION SEGMENTS ##### +################################################################# +################################################################# +### CREATE PHRASING DEPENDING ON WHETHER WE ISSUE EXP PRIOR TO EXPIRATION TIME OR NOT +#if(${now.compareTo(${expire})} >= 0 && ${action}=="EXP" ) + #set($expcanHLTag = "HAS EXPIRED") + #set($expcanBODYTag = "HAS BEEN ALLOWED TO EXPIRE") +#elseif(${action}=="EXP") + #set($expcanHLTag = "WILL EXPIRE AT ${dateUtil.format(${expire}, ${timeFormat.clock}, 15, ${localtimezone})}") + #set($expcanBODYTag = "WILL BE ALLOWED TO EXPIRE") +#elseif(${action}=="CAN" || ${action}=="CANCON" || ${CORCAN}=="true") + #set($expcanHLTag = "IS CANCELLED") + #set($expcanBODYTag = "HAS BEEN CANCELLED") +#end +################################ +#### CREATE HEADLINES ########## +################################ +## County + +#if(${action}=="EXP" || ${action}=="CAN") +...THE FLOOD WARNING FOR ## +#if(${hycType} != "") +${hycType} IN ## +#end +##REMMED OUT FOR Alaska. This would output the headline in zone format +###zoneHeadlineLocList(${areas} true true true false) +##REPLACE LINE ABOVE WITH THE FOLLOWING IF YOU USE COUNTY HEADLINE INSTEAD OF ZONES +###headlineLocList(${affectedCounties} true true true false) +!**INSERT RIVER/STREAM OR AREA**! IN !**INSERT GEO AREA**! + ${expcanHLTag}... +## SLIGHTLY DIFFERENT VARIABLE FOR PARTIAL CANCELLATION HEADLINE +#elseif(${action}=="CANCON" || ${CORCAN}=="true") +...THE FLOOD WARNING FOR ## +#if(${hycType} != "") +${hycType} IN ## +#end +##REMMED OUT FOR Alaska. This would output the headline in zone format +###zoneHeadlineLocList(${cancelareas} true true true false) +##REPLACE LINE ABOVE WITH THE FOLLOWING IF YOU USE COUNTY HEADLINE INSTEAD OF ZONES +###headlineLocList(${cancelaffectedCounties} true true true false) +!**INSERT RIVER/STREAM OR AREA**! IN !**INSERT GEO AREA**! + ${expcanHLTag}... +#end + +############################ +## END CAN/EXP HEADLINE #### +############################ +####################################### +## EXPIRATION/CANCELLATION STATEMENT ## +####################################### +#if(${action}=="EXP" || ${action} == "CAN" || ${action}=="CANCON" || ${CORCAN}) +#if(${list.contains(${bullets}, "recedingWater")} && ${list.contains(${bullets}, "rainEnded")}) +THE HEAVY RAIN HAS ENDED AND FLOOD WATERS HAVE RECEDED...NO LONGER POSING A THREAT TO LIFE OR PROPERTY. PLEASE CONTINUE TO HEED ANY ROAD CLOSURES. +#elseif(${list.contains(${bullets}, "recedingWater")}) +FLOOD WATERS HAVE RECEDED...AND ARE NO LONGER EXPECTED TO POSE A THREAT TO LIFE OR PROPERTY. PLEASE CONTINUE TO HEED ANY ROAD CLOSURES. +#elseif(${list.contains(${bullets}, "rainEnded")}) +THE HEAVY RAIN HAS ENDED...AND FLOODING IS NO LONGER EXPECTED TO POSE A THREAT. +#else +!** THE HEAVY RAIN HAS ENDED. !** OR **! THE FLOOD WATER IS RECEDING. THEREFORE...THE FLOODING THREAT HAS ENDED. **! +#end + +#printcoords(${areaPoly}, ${list}) + + +#end +#################################### END OF CAN STUFF ################################### +#### IF PARTIAL CANCELLATION, INSERT $$ AND 2ND UGC/MND SECTION PRIOR TO CON PORTION +######################################################################################### +#if(${action}=="CANCON") + + +${ugcline} +/${productClass}.CON.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz})}/ +/00000.0.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ +#set($zoneList = "") +#foreach (${area} in ${areas}) +#set($zoneList = "${zoneList}${area.name}-") +#end +${zoneList} + +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +#if(${productClass}=="T") +...THIS MESSAGE IS FOR TEST PURPOSES ONLY... + +#end +#elseif(${CORCAN}=="true") + + +${ugcline} +/${productClass}.COR.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz})}/ +/00000.0.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ +#set($zoneList = "") +#foreach (${area} in ${areas}) +#set($zoneList = "${zoneList}${area.name}-") +#end +${zoneList} + +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +#if(${productClass}=="T") +...THIS MESSAGE IS FOR TEST PURPOSES ONLY... + +#end +#end +############################ +## CONTINUATION STATEMENT ## +############################ +#if(${action}=="CANCON" || ${action}=="CON" || ${action}=="COR" || ${CORCAN}=="true") +#if(${productClass}=="T") +THIS IS A TEST MESSAGE.## +#end +...THE FLOOD WARNING ## +#if(${hycType} != "") +FOR ${hycType} ## +#end +REMAINS IN EFFECT #secondBullet(${dateUtil},${expire},${timeFormat},${localtimezone},${secondtimezone}) FOR ## +##REMMED OUT FOR Alaska. This would output the headline in zone format +###zoneHeadlineLocList(${areas} true true true false)... +##REPLACE LINE ABOVE WITH THE FOLLOWING IF YOU USE COUNTY HEADLINE INSTEAD OF ZONES +###headlineLocList(${affectedCounties} true true true false)... +!**INSERT RIVER/STREAM OR AREA**! IN !**INSERT GEO AREA**!... + +################################################ +################################# +######## MAIN PARAGRAPH ########### +################################# +#set($rainAmount = "") +#if(${list.contains(${bullets}, "rain1")} ) + #set($rainAmount = " UP TO ONE INCH OF RAIN HAS ALREADY FALLEN.") +#end +#if(${list.contains(${bullets}, "rain2")} ) + #set($rainAmount = " UP TO TWO INCHES OF RAIN HAS ALREADY FALLEN.") +#end +#if(${list.contains(${bullets}, "rain3")} ) + #set($rainAmount = " UP TO THREE INCHES OF RAIN HAS ALREADY FALLEN.") +#end +#if(${list.contains(${bullets}, "rainEdit")} ) + #set($rainAmount = " !** RAINFALL AMOUNTS **! INCHES OF RAIN HAS ALREADY FALLEN.") +#end +#set($reportBy = "!**YOU DID NOT SELECT A /SOURCE/ BULLET. PLEASE CLOSE THIS WINDOW AND REGENERATE YOUR WARNING**!") +#if(${list.contains(${bullets}, "doppler")}) + #set($reportBy = "DOPPLER RADAR INDICATED") +#elseif(${list.contains(${bullets}, "dopplerGauge")}) + #set($reportBy = "DOPPLER RADAR AND AUTOMATED RAIN GAUGES INDICATED") +#elseif(${list.contains(${bullets}, "trainedSpotters")}) + #set($reportBy = "TRAINED WEATHER SPOTTERS REPORTED") +#elseif(${list.contains(${bullets}, "lawEnforcement")}) + #set($reportBy = "LOCAL LAW ENFORCEMENT REPORTED") +#elseif(${list.contains(${bullets}, "public")}) + #set($reportBy = "THE PUBLIC REPORTED") +#elseif(${list.contains(${bullets}, "emergencyManagement")}) + #set($reportBy = "EMERGENCY MANAGEMENT REPORTED") +#elseif(${list.contains(${bullets}, "satellite")}) + #set($reportBy = "SATELLITE ESTIMATES INDICATED") +#elseif(${list.contains(${bullets}, "satelliteGauge")}) + #set($reportBy = "SATELLITE ESTIMATES AND AUTOMATED RAIN GAUGES INDICATED") +#end +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +#set($cityListLead = "RUNOFF FROM THIS EXCESSIVE RAINFALL WILL CAUSE ${floodType} TO OCCUR. ") +#if(${list.contains(${bullets}, "thunder")}) +#thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone})...## +${reportBy} SLOW MOVING THUNDERSTORMS WITH VERY HEAVY RAINFALL ACROSS THE WARNED AREA.${rainAmount}${floodReason} +#elseif(${list.contains(${bullets}, "plainRain")}) +#thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone})...## +${reportBy} AN AREA OF VERY HEAVY RAINFALL ACROSS THE WARNED AREA.${rainAmount}${floodReason} +#elseif(${list.contains(${bullets}, "floodOccurring")}) +#thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone})...## +${reportBy} ${floodType} ACROSS THE WARNED AREA.${rainAmount}${floodReason} !** ENTER SPECIFIC REPORTS OF FLOODING AND EXPECTED RAINFALL AMOUNTS **! +#elseif(${list.contains(${bullets}, "genericFlood")}) +#thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone})...## +!** ENTER REASON AND FORECAST FOR FLOOD **! +#elseif(${list.contains(${bullets}, "glacierOutburst")}) +#thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone})...## +${reportBy} FLOODING DUE TO A GLACIER-DAMMED LAKE OUTBURST ACROSS THE WARNED AREA.${rainAmount} +#elseif(${list.contains(${bullets}, "groundWater")}) +#thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone})...## +${reportBy} FLOODING DUE TO GROUND WATER ACROSS THE WARNED AREA.${rainAmount} +#else +!**YOU DID NOT SELECT AN /EVENT/ BULLET. PLEASE CLOSE THIS WINDOW AND REGENERATE YOUR WARNING**! +#end + +############################################ +######## (CITY LIST) ######### +############################################ +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +#### THE THIRD ARGUMENT IS A NUMBER SPECIFYING THE NUMBER OF COLUMNS TO OUTPUT THE CITIES LIST IN +#### 0 IS A ... SEPARATED LIST, 1 IS ONE PER LINE, >1 IS A COLUMN FORMAT +#### IF YOU USE SOMETHING OTHER THAN "LOCATIONS IMPACTED INCLUDE" LEAD IN BELOW, MAKE SURE THE +#### ACCOMPANYING XML FILE PARSE STRING IS CHANGED TO MATCH! +${cityListLead} +## #locationsList("SOME LOCATIONS THAT WILL EXPERIENCE FLOODING INCLUDE" "${floodType} IS EXPECTED TO OCCUR OVER MAINLY RURAL AREAS OF" 0 ${cityList} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 0) + +########################################## END OF OPTIONAL FOURTH BULLET ############################## +###################################### +###### WHERE ADDITIONAL INFO GOES #### +###################################### +#if(${list.contains(${bullets}, "fcstPoint")}) +FOR THE !** insert river name and forecast point **!: +AT ${dateUtil.format(${now}, ${timeFormat.clock}, ${localtimezone})} THE STAGE WAS !** xx.x **! FEET. +FLOOD STAGE IS !** xx.x **! FEET. +FORECAST... !** insert crest stage and time **!. +IMPACTS...!** discussion of expected impacts and flood path **! + +#else +!** insert impacts and flood path **! + +#end +#if(${list.contains(${bullets}, "addRainfall")}) +ADDITIONAL RAINFALL AMOUNTS OF !** EDIT AMOUNT **! ARE POSSIBLE IN THE WARNED AREA. + +#end +#if(${list.contains(${bullets}, "drainages")}) +#drainages(${riverdrainages}) + +#end + +## parse file command here is to pull in mile marker info +## #parse("mileMarkers.vm") + +#################################### END OF ADDITIONAL STUFF ################################### +###################################### +####### CALL TO ACTIONS ############## +###################################### +##Check to see if we've selected any calls to action. +#foreach (${bullet} in ${bullets}) +#if(${bullet.endsWith("CTA")}) +#set($ctaSelected = "YES") +#end +#end +## +#if(${ctaSelected} == "YES") +PRECAUTIONARY/PREPAREDNESS ACTIONS... + +#end +#if(${list.contains(${bullets}, "warningMeansCTA")}) +A FLOOD WARNING MEANS THAT FLOODING IS IMMINENT OR HAS BEEN REPORTED. STREAM RISES WILL BE SLOW AND FLASH FLOODING IS NOT EXPECTED. HOWEVER...ALL INTERESTED PARTIES SHOULD TAKE NECESSARY PRECAUTIONS IMMEDIATELY. + +#end +#if(${list.contains(${bullets}, "dontdrownCTA")}) +MOST FLOOD DEATHS OCCUR IN AUTOMOBILES. NEVER DRIVE YOUR VEHICLE INTO AREAS WHERE THE WATER COVERS THE ROADWAY. FLOOD WATERS ARE USUALLY DEEPER THAN THEY APPEAR. JUST ONE FOOT OF FLOWING WATER IS POWERFUL ENOUGH TO SWEEP VEHICLES OFF THE ROAD. WHEN ENCOUNTERING FLOODED ROADS MAKE THE SMART CHOICE...TURN AROUND...DONT DROWN. + +#end +#if(${list.contains(${bullets}, "urbanCTA")}) +EXCESSIVE RUNOFF FROM HEAVY RAINFALL WILL CAUSE ELEVATED LEVELS ON SMALL CREEKS AND STREAMS...AND PONDING OF WATER IN URBAN AREAS...HIGHWAYS...STREETS AND UNDERPASSES AS WELL AS OTHER POOR DRAINAGE AREAS AND LOW LYING SPOTS. + +#end +#if(${list.contains(${bullets}, "ruralCTA")}) +EXCESSIVE RUNOFF FROM HEAVY RAINFALL WILL CAUSE ELEVATED LEVELS ON SMALL CREEKS AND STREAMS...AND PONDING OF WATER ON COUNTRY ROADS AND FARMLAND ALONG THE BANKS OF CREEKS AND STREAMS. + +#end +#if(${list.contains(${bullets}, "USS_CTA")}) +EXCESSIVE RUNOFF FROM HEAVY RAINFALL WILL CAUSE FLOODING OF SMALL CREEKS AND STREAMS...HIGHWAYS AND UNDERPASSES IN URBAN AREAS. ADDITIONALLY...COUNTRY ROADS AND FARMLANDS ALONG THE BANKS OF CREEKS...STREAMS AND OTHER LOW LYING AREAS ARE SUBJECT TO FLOODING. + +#end +#if(${list.contains(${bullets}, "particularStreamCTA")}) +FLOOD WATERS ARE MOVING DOWN !**name of channel**! FROM !**location**! TO !**location**!. THE FLOOD CREST IS EXPECTED TO REACH !**location(s)**! BY !**time(s)**!. + +#end +#if(${list.contains(${bullets}, "specificCTA")}) +FLOOD WATERS ARE MOVING DOWN !**name of channel**! FROM !**location**! TO !**location**!. THE FLOOD CREST IS EXPECTED TO REACH !**location(s)**! BY !**time(s)**!. + +#end +#if(${list.contains(${bullets}, "nightCTA")}) +BE ESPECIALLY CAUTIOUS AT NIGHT WHEN IT IS HARDER TO RECOGNIZE THE DANGERS OF FLOODING. IF FLOODING IS OBSERVED ACT QUICKLY. MOVE UP TO HIGHER GROUND TO ESCAPE FLOOD WATERS. DO NOT STAY IN AREAS SUBJECT TO FLOODING WHEN WATER BEGINS RISING. + +#end +#if(${list.contains(${bullets}, "donotdriveCTA")}) +DO NOT DRIVE YOUR VEHICLE INTO AREAS WHERE THE WATER COVERS THE ROADWAY. THE WATER DEPTH MAY BE TOO GREAT TO ALLOW YOUR CAR TO CROSS SAFELY. MOVE TO HIGHER GROUND. + +#end +#if(${list.contains(${bullets}, "autoSafetyCTA")}) +FLOODING IS OCCURRING OR IS IMMINENT. MOST FLOOD RELATED DEATHS OCCUR IN AUTOMOBILES. DO NOT ATTEMPT TO CROSS WATER COVERED BRIDGES...DIPS... OR LOW WATER CROSSINGS. NEVER TRY TO CROSS A FLOWING STREAM...EVEN A SMALL ONE...ON FOOT. TO ESCAPE RISING WATER FIND ANOTHER ROUTE OVER HIGHER GROUND. + +#end +#if(${list.contains(${bullets}, "camperCTA")}) +FLOODING IS OCCURRING OR IS IMMINENT. IT IS IMPORTANT TO KNOW WHERE YOU ARE RELATIVE TO STREAMS...RIVERS...OR CREEKS WHICH CAN BECOME KILLERS IN HEAVY RAINS. CAMPERS AND HIKERS SHOULD AVOID STREAMS OR CREEKS. + +#end +#if(${list.contains(${bullets}, "lowspotsCTA")}) +IN HILLY TERRAIN THERE ARE HUNDREDS OF LOW WATER CROSSINGS WHICH ARE POTENTIALLY DANGEROUS IN HEAVY RAIN. DO NOT ATTEMPT TO TRAVEL ACROSS FLOODED ROADS. FIND ALTERNATE ROUTES. IT TAKES ONLY A FEW INCHES OF SWIFTLY FLOWING WATER TO CARRY VEHICLES AWAY. + +#end +#if(${list.contains(${bullets}, "powerCTA")}) +DO NOT UNDERESTIMATE THE POWER OF FLOOD WATERS. ONLY A FEW INCHES OF RAPIDLY FLOWING WATER CAN QUICKLY CARRY AWAY YOUR VEHICLE. + +#end +#if(${list.contains(${bullets}, "reportFloodingCTA")}) +TO REPORT FLOODING...HAVE THE NEAREST LAW ENFORCEMENT AGENCY RELAY YOUR REPORT TO THE NATIONAL WEATHER SERVICE FORECAST OFFICE. + +#end +#if(${ctaSelected} == "YES") +&& + +#end +#################################### END OF CTA STUFF ################################### + +########################################## +########BOTTOM OF THE PRODUCT############# +########################################## +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. DO NOT TAKE ACTION BASED ON THIS MESSAGE. + +#end +#printcoords(${areaPoly}, ${list}) + +#end + +$$ + +#parse("forecasterName.vm") diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.xml new file mode 100644 index 0000000000..ac8e88d277 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.xml @@ -0,0 +1,363 @@ + + + + + + + + + mi + mph + + + + Forecast Zones + + + + + + + + COR + CON + CAN + EXP + + + + + FA.W + + + + false + + + true + + + + 30 + + 30 + + +ic + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + Zone + HATCHING + 0 + AND + 0 + NAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + + STATE_ZONE + NAME + + parent + + + + + + + 25 + + + + + County + INTERSECT + 0 + AND + 0 + COUNTYNAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + FIPS + NAME + + parent + + + + + + + 25 + + + + + true + 8.0 + 5 + 5 + 4 + 8 + Name + + NAME + AREA + STATE + STATE + countyTypes.txt + + distance + + + + + + + + + + + + + NAME + 1 + AREA + POINTS + true + 30 + 200 + + + + + + + + + + warngenlev + population + distance + + + + + + NAME + AREA + POINTS + true + 10 + 200 + + distance + + + + + + + + + + + + + + + + WarnGenLoc + + Zone + States + TIMEZONES + TIME_ZONE + + + + ffmp_basins + 0.064 + streamname + + + + + + true + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodWarning_Zones.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodWarning_Zones.vm new file mode 100644 index 0000000000..06674f50d8 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodWarning_Zones.vm @@ -0,0 +1,355 @@ +############################################################################### +## Created BY Mike Dangelo 9-19-2011 at Alaska TIM for zone code issuances ## +## Mary-Beth Schreck, Ed Plumb, Aaron Jacobs 9-23-2011 at Alaska TIM +## edited by Mike Dangelo 01-26-2012 at CRH TIM +## edited by Phil Kurimski 2-29-2012 +## Mike Dangelo 9-13-2012 minor tweaks to ${variables} +#################################### SET SOME VARIABLES ################################### +#if(${action} == "EXT") + #set($starttime = "000000T0000Z") + #set($extend = true) +#else + #set($starttime = ${dateUtil.format(${start}, ${timeFormat.ymdthmz})}) + #set($extend = false) +#end +## +#if(${list.contains(${bullets}, "small")}) + #set($advType = "SMALL STREAM FLOOD WARNING") +#elseif(${list.contains(${bullets}, "uss")}) + #set($advType = "URBAN AND SMALL STREAM FLOOD WARNING") +#else + #set($advType = "FLOOD WARNING") +#end +#set($ic = "ER") +#set($hycType = "") +#if(${list.contains(${bullets}, "sm")}) + #set($ic = "SM") + #set($hycType = "SNOW MELT") +#elseif(${list.contains(${bullets}, "rs")}) + #set($ic = "RS") + #set($hycType = "RAIN AND SNOW MELT") +#elseif(${list.contains(${bullets}, "ij")}) + #set($ic = "IJ") + #set($hycType = "AN ICE JAM") +#elseif(${list.contains(${bullets}, "ic")}) + #set($ic = "IC") + #set($hycType = "AN ICE JAM WITH RAIN AND SNOW MELT") +#elseif(${list.contains(${bullets}, "go")}) + #set($ic = "GO") + #set($hycType = "A GLACIER-DAMMED LAKE OUTBURST") +#elseif(${list.contains(${bullets}, "dm")}) + #set($ic = "DM") + #set($hycType = "A LEVEE FAILURE") +#elseif(${list.contains(${bullets}, "dr")}) + #set($ic = "DR") + #set($hycType = "A DAM GATE RELEASE") +#elseif(${list.contains(${bullets}, "OT")}) + #set($ic = "OT") + #set($hycType = "GROUND WATER FLOODING") +#elseif(${list.contains(${bullets}, "mc")}) + #set($ic = "MC") +#elseif(${list.contains(${bullets}, "uu")}) + #set($ic = "UU") +#end +## +${WMOId} ${vtecOffice} 000000 ${BBBId} +FLW${siteId} + +BULLETIN - EAS ACTIVATION REQUESTED +#if(${productClass}=="T") +TEST...FLOOD WARNING...TEST +#else +FLOOD WARNING +#end +NATIONAL WEATHER SERVICE ${officeShort} +#backupText(${backupSite}) +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +${ugcline} +/${productClass}.${action}.${vtecOffice}.FA.W.${etn}.${starttime}-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ +/00000.0.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ + +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +#if(${productClass}=="T") +...THIS MESSAGE IS FOR TEST PURPOSES ONLY... + +#end +#headlineext(${officeLoc}, ${backupSite}, ${extend}) + +################################# +######## FIRST BULLET ########### +################################# +* ## +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +${advType} FOR... +#if(${hycType} != "") +## (EXCLUDED FOR AK) +## ${hycType} IN... + ${hycType}... +#end +##REMMED OUT FOR ALASKA +###firstBullet(${areas}) +##REPLACE LINE ABOVE WITH THE FOLLOWING IF YOU USE COUNTY HEADLINE INSTEAD OF ZONES +###firstBullet(${affectedCounties}) +!**INSERT RIVER/STREAM OR AREA**! IN !**INSERT GEO AREA**! + +################################# +####### SECOND BULLET ########### +################################# +* ## +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +#secondBullet(${dateUtil},${expire},${timeFormat},${localtimezone},${secondtimezone}) + +#set($typeofevent = "") +#set($report = "HEAVY RAIN THAT WILL CAUSE FLOODING.") +#set($rainAmount = "") +#if(${list.contains(${bullets}, "rapidRiver")}) + #set($typeofevent = ". RAPID RIVER RISES ARE EXPECTED.") +#end +#if(${list.contains(${bullets}, "glacierOutburst")}) + #set($report = "A GLACIER-DAMMED LAKE OUTBURST FLOOD WILL RESULT IN MINOR FLOODING AT !** LOCATION **!.") +#end +#if(${list.contains(${bullets}, "groundWater")}) + #set($report = "RISING GROUND WATER LEVELS WILL RESULT IN MINOR FLOODING AT !** LOCATION **!.") +#end +#if(${list.contains(${bullets}, "satellite")}) + #set($report = "SATELLITE ESTIMATES INDICATE HEAVY RAINFALL THAT WILL CAUSE ${advType}${typeofevent} IN THE WARNING AREA.") +#end +#if(${list.contains(${bullets}, "satelliteGauge")}) + #set($report = "SATELLITE ESTIMATES AND RAIN GAUGE DATA INDICATE HEAVY RAINFALL THAT WILL CAUSE ${advType}${typeofevent} IN THE WARNING AREA.") +#end +#if(${list.contains(${bullets}, "doppler")}) + #set($report = "DOPPLER RADAR INDICATED HEAVY RAIN THAT WILL CAUSE FLOODING.") +#end +#if(${list.contains(${bullets}, "doppler")} && ${list.contains(${bullets}, "thunder")}) + #set($report = "DOPPLER RADAR INDICATED HEAVY RAIN DUE TO A THUNDERSTORM THAT WILL CAUSE FLOODING.") +#end +#if(${list.contains(${bullets}, "doppler")} && ${list.contains(${bullets}, "thunder")} && ${stormType} == "line") + #set($report = "DOPPLER RADAR INDICATED HEAVY RAIN DUE TO A LINE OF THUNDERSTORMS. THE HEAVY RAIN WILL CAUSE FLOODING.") +#end +#if(${list.contains(${bullets}, "dopplerGauge")}) + #set($report = "DOPPLER RADAR AND AUTOMATED RAIN GAUGES INDICATED THAT HEAVY RAIN WAS FALLING OVER THE AREA. THAT HEAVY RAIN WILL CAUSE FLOODING.") +#end +#if(${list.contains(${bullets}, "dopplerGauge")} && ${list.contains(${bullets}, "thunder")}) + #set($report = "DOPPLER RADAR AND AUTOMATED RAIN GAUGES INDICATED THAT A THUNDERSTORM IS PRODUCING HEAVY RAIN OVER THE AREA. THAT RAIN WILL CAUSE FLOODING.") +#end +#if(${list.contains(${bullets}, "dopplerGauge")} && ${list.contains(${bullets}, "thunder")} && ${stormType} == "line") + #set($report = "DOPPLER RADAR AND AUTOMATED RAIN GAUGES INDICATED THAT A LINE OF THUNDERSTORMS IS PRODUCING HEAVY RAIN OVER THE AREA. THAT RAIN WILL CAUSE FLOODING.") +#end +#if(${list.contains(${bullets}, "trainedSpotters")} && ${list.contains(${bullets}, "thunder")}) + #set($report = "TRAINED WEATHER SPOTTERS REPORTED HEAVY RAIN IN !** LOCATION **! DUE TO A THUNDERSTORM THAT WILL CAUSE FLOODING.") +#end +#if(${list.contains(${bullets}, "trainedSpotters")} && ${list.contains(${bullets}, "floodReport")}) + #set($report = "TRAINED WEATHER SPOTTERS REPORTED FLOODING IN !** LOCATION **!.") +#end +#if(${list.contains(${bullets}, "trainedSpotters")} && ${list.contains(${bullets}, "plainRain")}) + #set($report = "TRAINED WEATHER SPOTTERS REPORTED HEAVY RAIN IN !** LOCATION **! THAT WILL CAUSE FLOODING.") +#end +#if(${list.contains(${bullets}, "lawEnforcement")} && ${list.contains(${bullets}, "thunder")}) + #set($report = "LOCAL LAW ENFORCEMENT REPORTED HEAVY RAIN DUE TO A THUNDERSTORM OVER !** LOCATION **! THAT WILL CAUSE FLOODING.") +#end +#if(${list.contains(${bullets}, "lawEnforcement")} && ${list.contains(${bullets}, "floodReport")}) + #set($report = "LOCAL LAW ENFORCEMENT REPORTED FLOODING IN !** LOCATION **!.") +#end +#if(${list.contains(${bullets}, "lawEnforcement")} && ${list.contains(${bullets}, "plainRain")}) + #set($report = "LOCAL LAW ENFORCEMENT REPORTED HEAVY RAIN IN !** LOCATION **! THAT WILL CAUSE FLOODING.") +#end +#if(${list.contains(${bullets}, "emergencyManagement")} && ${list.contains(${bullets}, "thunder")}) + #set($report = "EMERGENCY MANAGEMENT REPORTED HEAVY RAIN DUE TO A THUNDERSTORM OVER !** LOCATION **! THAT WILL CAUSE FLOODING.") +#end +#if(${list.contains(${bullets}, "emergencyManagement")} && ${list.contains(${bullets}, "floodReport")}) + #set($report = "EMERGENCY MANAGEMENT REPORTED FLOODING IN !** LOCATION **!.") +#end +#if(${list.contains(${bullets}, "emergencyManagement")} && ${list.contains(${bullets}, "plainRain")}) + #set($report = "EMERGENCY MANAGEMENT REPORTED HEAVY RAIN IN !** LOCATION **! THAT WILL CAUSE FLOODING.") +#end +#if(${list.contains(${bullets}, "public")} && ${list.contains(${bullets}, "thunder")}) + #set($report = "THE PUBLIC REPORTED HEAVY RAIN IN !** LOCATION **! DUE TO A THUNDERSTORM. THE HEAVY RAIN WILL CAUSE FLOODING.") +#end +#if(${list.contains(${bullets}, "public")} && ${list.contains(${bullets}, "floodReport")}) + #set($report = "THE PUBLIC REPORTED FLOODING IN !** LOCATION **!.") +#end +#if(${list.contains(${bullets}, "public")} && ${list.contains(${bullets}, "plainRain")}) + #set($report = "THE PUBLIC REPORTED HEAVY RAIN IN !** LOCATION **!. THAT HEAVY RAIN WILL CAUSE FLOODING.") +#end +#if(${list.contains(${bullets}, "public")} && ${list.contains(${bullets}, "glacierOutburst")}) + #set($report = "THE PUBLIC REPORTED MINOR FLOODING IN !** LOCATION **! DUE TO A GLACIER-DAMMED LAKE OUTBURST FLOOD.") +#end +#if(${list.contains(${bullets}, "public")} && ${list.contains(${bullets}, "groundWater")}) + #set($report = "THE PUBLIC REPORTED MINOR FLOODING IN !** LOCATION **! DUE TO RISING GROUND WATER LEVELS.") +#end +#if(${list.contains(${bullets}, "trainedSpotters")} && ${list.contains(${bullets}, "glacierOutburst")}) + #set($report = "A TRAINED SPOTTER REPORTED MINOR FLOODING IN !** LOCATION **! DUE TO A GLACIER-DAMMED LAKE OUTBURST FLOOD.") +#end +#if(${list.contains(${bullets}, "trainedSpotters")} && ${list.contains(${bullets}, "groundWater")}) + #set($report = "A TRAINED SPOTTER REPORTED MINOR FLOODING IN !** LOCATION **! DUE TO RISING GROUND WATER LEVELS.") +#end +#if(${list.contains(${bullets}, "lawEnforcement")} && ${list.contains(${bullets}, "glacierOutburst")}) + #set($report = "LOCAL LAW ENFORCEMENT REPORTED MINOR FLOODING IN !** LOCATION **! DUE TO A GLACIER-DAMMED LAKE OUTBURST FLOOD.") +#end +#if(${list.contains(${bullets}, "lawEnforcement")} && ${list.contains(${bullets}, "groundWater")}) + #set($report = "LOCAL LAW ENFORCEMENT REPORTED MINOR FLOODING IN !** LOCATION **! DUE TO RISING GROUND WATER LEVELS.") +#end +#if(${list.contains(${bullets}, "emergencyManagement")} && ${list.contains(${bullets}, "glacierOutburst")}) + #set($report = "EMERGENCY MANAGEMENT REPORTED MINOR FLOODING IN !** LOCATION **! DUE TO A GLACIER-DAMMED LAKE OUTBURST FLOOD.") +#end +#if(${list.contains(${bullets}, "emergencyManagement")} && ${list.contains(${bullets}, "groundWater")}) + #set($report = "EMERGENCY MANAGEMENT REPORTED MINOR FLOODING IN !** LOCATION **! DUE TO RISING GROUND WATER LEVELS.") +#end +#if(${list.contains(${bullets}, "rain1")} ) + #set($rainAmount = "UP TO ONE INCH OF RAIN HAS ALREADY FALLEN.") +#end +#if(${list.contains(${bullets}, "rain2")} ) + #set($rainAmount = "UP TO TWO INCHES OF RAIN HAS ALREADY FALLEN.") +#end +#if(${list.contains(${bullets}, "rain3")} ) + #set($rainAmount = "UP TO THREE INCHES OF RAIN HAS ALREADY FALLEN.") +#end +#if(${list.contains(${bullets}, "rainEdit")} ) + #set($rainAmount = "!** RAINFALL AMOUNTS **! INCHES OF RAIN HAS ALREADY FALLEN.") +#end + +################################# +######## THIRD BULLET ########### +################################# +* ## +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +#thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) +...${report} ${rainAmount} + +############################################################# +######## FOURTH BULLET (OPTIONAL IN FLOOD PRODUCTS) ######### +############################################################# +#set($phenomena = "FLOOD") +#set($warningType = "WARNING") +#if(${list.contains(${bullets}, "listofcities")}) +* ## +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +## #locationsList("SOME LOCATIONS THAT WILL EXPERIENCE FLOODING INCLUDE" "FLOODING IS EXPECTED TO OCCUR OVER MAINLY RURAL AREAS OF" 0 ${cityList} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 0) EXCLUDED FOR ALASKA + +#end +########################################## END OF FOURTH BULLET ############################## +###################################### +###### WHERE ADD INFO GOES ########### +###################################### +#if(${list.contains(${bullets}, "fcstPoint")}) +FOR THE !** insert river name and forecast point **!: +AT ${dateUtil.format(${now}, ${timeFormat.clock}, ${localtimezone})} THE STAGE WAS !** xx.x **! FEET. +FLOOD STAGE IS !** xx.x **! FEET. +FORECAST... !** insert crest stage and time **!. +IMPACTS...!** discussion of expected impacts and flood path **! + +#else +!** insert impacts and flood path **! + +#end +#if(${list.contains(${bullets}, "addRainfall")}) +ADDITIONAL RAINFALL AMOUNTS OF !** EDIT AMOUNT **! ARE POSSIBLE IN THE WARNED AREA. + +#end +#if(${list.contains(${bullets}, "drainages")}) +#drainages(${riverdrainages}) + +#end + +## parse file command here is to pull in mile marker info +## #parse("mileMarkers.vm") + +#################################### END OF ADDITIONAL STUFF ################################### +###################################### +####### CALL TO ACTIONS ############## +###################################### +#foreach (${bullet} in ${bullets}) +#if(${bullet.endsWith("CTA")}) +#set($ctaSelected = "YES") +#end +#end +## +#if(${ctaSelected} == "YES") +PRECAUTIONARY/PREPAREDNESS ACTIONS... + +#end +## +#if(${list.contains(${bullets}, "warningMeansCTA")}) +A FLOOD WARNING MEANS THAT FLOODING IS IMMINENT OR HAS BEEN REPORTED. STREAM RISES WILL BE SLOW AND FLASH FLOODING IS NOT EXPECTED. HOWEVER...ALL INTERESTED PARTIES SHOULD TAKE NECESSARY PRECAUTIONS IMMEDIATELY. + +#end +#if(${list.contains(${bullets}, "dontdrownCTA")}) +MOST FLOOD DEATHS OCCUR IN AUTOMOBILES. NEVER DRIVE YOUR VEHICLE INTO AREAS WHERE THE WATER COVERS THE ROADWAY. FLOOD WATERS ARE USUALLY DEEPER THAN THEY APPEAR. JUST ONE FOOT OF FLOWING WATER IS POWERFUL ENOUGH TO SWEEP VEHICLES OFF THE ROAD. WHEN ENCOUNTERING FLOODED ROADS MAKE THE SMART CHOICE...TURN AROUND...DONT DROWN. + +#end +#if(${list.contains(${bullets}, "urbanCTA")}) +EXCESSIVE RUNOFF FROM HEAVY RAINFALL WILL CAUSE ELEVATED LEVELS ON SMALL CREEKS AND STREAMS...AND PONDING OF WATER IN URBAN AREAS...HIGHWAYS...STREETS AND UNDERPASSES AS WELL AS OTHER POOR DRAINAGE AREAS AND LOW LYING SPOTS. + +#end +#if(${list.contains(${bullets}, "ruralCTA")}) +EXCESSIVE RUNOFF FROM HEAVY RAINFALL WILL CAUSE ELEVATED LEVELS ON SMALL CREEKS AND STREAMS...AND PONDING OF WATER ON COUNTRY ROADS AND FARMLAND ALONG THE BANKS OF CREEKS AND STREAMS. + +#end +#if(${list.contains(${bullets}, "USS_CTA")}) +EXCESSIVE RUNOFF FROM HEAVY RAINFALL WILL CAUSE FLOODING OF SMALL CREEKS AND STREAMS...HIGHWAYS AND UNDERPASSES IN URBAN AREAS. ADDITIONALLY...COUNTRY ROADS AND FARMLANDS ALONG THE BANKS OF CREEKS...STREAMS AND OTHER LOW LYING AREAS ARE SUBJECT TO FLOODING. + +#end +#if(${list.contains(${bullets}, "particularStreamCTA")}) +FLOOD WATERS ARE MOVING DOWN !**name of channel**! FROM !**location**! TO !**location**!. THE FLOOD CREST IS EXPECTED TO REACH !**location(s)**! BY !**time(s)**!. + +#end +#if(${list.contains(${bullets}, "specificCTA")}) +FLOOD WATERS ARE MOVING DOWN !**name of channel**! FROM !**location**! TO !**location**!. THE FLOOD CREST IS EXPECTED TO REACH !**location(s)**! BY !**time(s)**!. + +#end +#if(${list.contains(${bullets}, "nightCTA")}) +BE ESPECIALLY CAUTIOUS AT NIGHT WHEN IT IS HARDER TO RECOGNIZE THE DANGERS OF FLOODING. IF FLOODING IS OBSERVED ACT QUICKLY. MOVE UP TO HIGHER GROUND TO ESCAPE FLOOD WATERS. DO NOT STAY IN AREAS SUBJECT TO FLOODING WHEN WATER BEGINS RISING. + +#end +#if(${list.contains(${bullets}, "donotdriveCTA")}) +DO NOT DRIVE YOUR VEHICLE INTO AREAS WHERE THE WATER COVERS THE ROADWAY. THE WATER DEPTH MAY BE TOO GREAT TO ALLOW YOUR CAR TO CROSS SAFELY. MOVE TO HIGHER GROUND. + +#end +#if(${list.contains(${bullets}, "autoSafetyCTA")}) +FLOODING IS OCCURRING OR IS IMMINENT. MOST FLOOD RELATED DEATHS OCCUR IN AUTOMOBILES. DO NOT ATTEMPT TO CROSS WATER COVERED BRIDGES...DIPS... OR LOW WATER CROSSINGS. NEVER TRY TO CROSS A FLOWING STREAM...EVEN A SMALL ONE...ON FOOT. TO ESCAPE RISING WATER FIND ANOTHER ROUTE OVER HIGHER GROUND. + +#end +#if(${list.contains(${bullets}, "camperCTA")}) +FLOODING IS OCCURRING OR IS IMMINENT. IT IS IMPORTANT TO KNOW WHERE YOU ARE RELATIVE TO STREAMS...RIVERS...OR CREEKS WHICH CAN BECOME KILLERS IN HEAVY RAINS. CAMPERS AND HIKERS SHOULD AVOID STREAMS OR CREEKS. + +#end +#if(${list.contains(${bullets}, "lowspotsCTA")}) +IN HILLY TERRAIN THERE ARE HUNDREDS OF LOW WATER CROSSINGS WHICH ARE POTENTIALLY DANGEROUS IN HEAVY RAIN. DO NOT ATTEMPT TO TRAVEL ACROSS FLOODED ROADS. FIND ALTERNATE ROUTES. IT TAKES ONLY A FEW INCHES OF SWIFTLY FLOWING WATER TO CARRY VEHICLES AWAY. + +#end +#if(${list.contains(${bullets}, "powerCTA")}) +DO NOT UNDERESTIMATE THE POWER OF FLOOD WATERS. ONLY A FEW INCHES OF RAPIDLY FLOWING WATER CAN QUICKLY CARRY AWAY YOUR VEHICLE. + +#end +#if(${list.contains(${bullets}, "reportFloodingCTA")}) +TO REPORT FLOODING...HAVE THE NEAREST LAW ENFORCEMENT AGENCY RELAY YOUR REPORT TO THE NATIONAL WEATHER SERVICE FORECAST OFFICE. + +#end +#if(${ctaSelected} == "YES") +&& + +#end +#################################### END OF CTA STUFF ################################### +########################################## +########BOTTOM OF THE PRODUCT############# +########################################## +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. DO NOT TAKE ACTION BASED ON THIS MESSAGE. + +#end +#printcoords(${areaPoly}, ${list}) + + +$$ + +#parse("forecasterName.vm") diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodWarning_Zones.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodWarning_Zones.xml new file mode 100644 index 0000000000..5ef2dc44fe --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/arealFloodWarning_Zones.xml @@ -0,0 +1,420 @@ + + + + + + + + + mi + mph + + + + Forecast Zones + County Warning Areas + + + + + + + NEW + COR + EXT + + + + + FA.W + + + + true + + + true + + + 180 + + 60 + 120 + 150 + 180 + 210 + 240 + 360 + 480 + 600 + 720 + + +ic + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + Zone + HATCHING + 0 + AND + 0 + NAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + + STATE_ZONE + NAME + + parent + + + + + + + 25 + + + + + County + INTERSECT + 0 + AND + 0 + COUNTYNAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + FIPS + NAME + + parent + + + + + + + 25 + + + + + true + 8.0 + 5 + 5 + 4 + 8 + Name + AREA + + NAME + STATE + STATE + countyTypes.txt + + distance + + + + + + + + + + + + + NAME + 1 + AREA + POINTS + true + 30 + 200 + + + + + + + + + + warngenlev + population + distance + + + + + + NAME + AREA + POINTS + true + 10 + 200 + + distance + + + + + + + + + + + + + + + + WarnGenLoc + + Zone + States + TIMEZONES + TIME_ZONE + + + + ffmp_basins + 0.064 + streamname + + + + + + true + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/burnScarFlashFloodWarning.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/burnScarFlashFloodWarning.vm index aa0d01e273..0b7f4a7511 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/burnScarFlashFloodWarning.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/burnScarFlashFloodWarning.vm @@ -2,25 +2,14 @@ ## BURN SCAR FLASH FLOOD WARNING TEMPLATE FOR COUNTY-BASED PRODUCTS ## ###################################################################### ## CREATED BY Phil Kurimski 2-08-2013 OB13.2.1-5 -## Modified by Phil Kurimski 9-18-2013 OB13.5.2-5 for FFW Emergency -## Evan Bookbinder 9-18-2013 Implemented config.vm ###################################################################### ## This template can be used for any pre-defined polygon that a site ## needs to issue a FFW for outside of a dam break. #################################### SET SOME VARIABLES ################################### -#parse("config.vm") #set($hycType = "") #set($burnDrainage = "") #set($burnScar = "") #set($burnCTA = "") -#set($emergencyHeadline = "!** ENTER LOCATION **!") -######################################################################### -## Parse command to include a burnScarInfo.vm file with site specific -## burn scar information. Sites can include this information in a -## separate file or include in the template per the coding below. -######################################################################### -#parse ("burnScarInfo.vm") - ## #if(${action} == "EXT") #set($starttime = "000000T0000Z") @@ -64,10 +53,10 @@ ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} ############################################################################# ## Flash Flood Emergency Headline -- Coming soon to a warning near you! # ############################################################################# -#if(${list.contains(${bullets}, "ffwEmergency")} ) -...FLASH FLOOD EMERGENCY FOR ${emergencyHeadline}... - -#end +###if(${list.contains(${bullets}, "ffwEmergency")} ) +##...FLASH FLOOD EMERGENCY FOR !** LOCATION **!... +## +###end #headlineext(${officeLoc}, ${backupSite}, ${extend}) ################################# @@ -200,6 +189,12 @@ THIS IS A TEST MESSAGE. ## #if(${list.contains(${bullets}, "satelliteGauge")} && ${list.contains(${bullets}, "thunder")}) #set($report = "SATELLITE ESTIMATES AND AUTOMATED RAIN GAUGES INDICATED THUNDERSTORMS WERE PRODUCING HEAVY RAIN OVER THE WARNED AREA.") #end +######################################################################### +## Parse command to include a burnScarInfo.vm file with site specific dam +## information. Sites can include this information in a separate file or +## include in the template per the coding below. +######################################################################### +#parse ("burnScarInfo.vm") * ## #if(${productClass}=="T") @@ -213,7 +208,7 @@ THIS IS A TEST MESSAGE. ## ## Flash Flood Emergency per NWS 10-922 Directive goes with third bullet # ########################################################################## #if(${list.contains(${bullets}, "ffwEmergency")} ) -#wrapText("THIS IS A FLASH FLOOD EMERGENCY FOR ${emergencyHeadline}. SEEK HIGHER GROUND NOW!" 2 2) +#wrapText("THIS IS A FLASH FLOOD EMERGENCY FOR !** LOCATION **!. SEEK HIGHER GROUND NOW! THIS IS A POTENTIALLY LIFE THREATENING SITUATION!" 2 2) #end diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/burnScarFlashFloodWarning.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/burnScarFlashFloodWarning.xml index 873ce06e9e..f9d06b5a71 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/burnScarFlashFloodWarning.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/burnScarFlashFloodWarning.xml @@ -1,25 +1,11 @@ - - - - - - - - - - mi mph @@ -166,7 +152,9 @@ turned on unless the corresponding .vm file is turned on in a given template's . - + + + @@ -224,7 +212,9 @@ turned on unless the corresponding .vm file is turned on in a given template's . --> - + + + @@ -262,6 +252,121 @@ turned on unless the corresponding .vm file is turned on in a given template's . template or listing the dams in a separate file and using the include command --> + + + + County + 0 + AND + 0 + COUNTYNAME + + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + FIPS + + NAME + + parent + + + + + + + 25 + + + + + true + 8.0 + 5 + 5 + 4 + 8 + Name + AREA + COUNTYNAME + + STATE + STATE + countyTypes.txt + + distance + + + + + + + + + + + + + NAME + 1 + AREA + POINTS + true + 30 + 200 + + + + + + + + + + warngenlev + population + distance + + + + + + NAME + AREA + POINTS + true + 50 + 10 + + distance + + + + + + + + + + + + + + + false + + + WarnGenLoc + County + + States + TIMEZONES + TIME_ZONE + + ffmp_basins 0.064 diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/burnScarFlashFloodWarningFollowup.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/burnScarFlashFloodWarningFollowup.vm index 0a4929cd2f..b84926cd1c 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/burnScarFlashFloodWarningFollowup.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/burnScarFlashFloodWarningFollowup.vm @@ -2,13 +2,10 @@ ## BURN SCAR FLASH FLOOD STATEMENT ## #################################################### ## CREATED BY Phil Kurimski 2-07-2013 OB13.2.1-5 -## Modified by Phil Kurimski 9-18-2013 OB13.5.2-5 for FFW Emergency -## Evan Bookbinder 9-18-2013 Implemented config.v, #################################################### ## This template can be used for any pre-defined polygon that a site ## needs to issue a FFW for outside of a dam break. #################################### SET SOME VARs ################################### -#parse("config.vm") #set($hycType = "") #set($snowMelt = "") #set($floodReason = "") @@ -17,7 +14,6 @@ #set($burnScar = "") #set($burnCTA = "") #set($burnScarEnd = "") -#set($emergencyHeadline = "!** ENTER LOCATION **!") ###OVERRIDE DEFAULT EXECESSIVE RAINFALL IF NECESSARY #if(${ic} == "RS") #set($hycType = "RAIN AND SNOW MELT") @@ -25,9 +21,9 @@ #end ## ######################################################################### -## Parse command to include a burnScarInfo.vm file with site specific -## burn scar information. Sites can include this information in a -## separate file or include in the template per the coding below. +## Parse command to include a burnScarInfo.vm file with site specific dam +## information. Sites can include this information in a separate file or +## include in the template per the coding below. ######################################################################### #parse ("burnScarInfo.vm") #set($endwarning = "THE HEAVY RAIN HAS ENDED...AND FLOODING IS NO LONGER EXPECTED TO POSE A THREAT${burnScarEnd}. PLEASE CONTINUE TO HEED ALL ROAD CLOSURES.") @@ -60,11 +56,7 @@ ${ugclinecan} /${productClass}.CAN.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire},${timeFormat.ymdthmz})}/ /00000.0.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ #foreach (${area} in ${cancelareas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end #elseif(${CORCAN}=="true") ${ugclinecan} @@ -72,11 +64,7 @@ ${ugclinecan} /${productClass}.COR.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire},${timeFormat.ymdthmz})}/ /00000.0.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ #foreach (${area} in ${cancelareas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end #else ${ugcline} @@ -84,11 +72,7 @@ ${ugcline} /${productClass}.${action}.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ /00000.0.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ #foreach (${area} in ${areas}) -${s}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end #end @@ -131,8 +115,6 @@ ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} ${hycType} IN ## #end #headlineLocList(${cancelareas} true true true false) ${expcanHLTag}... -###REPLACE headlineLocList ABOVE WITH THE FOLLOWING FOR ZONE BASED PRODUCT W/ COUNTY HEADLINE -###headlineLocList(${cancelaffectedCounties} true true true false) ${expcanHLTag}... #end ############################ ## END CAN/EXP HEADLINE #### @@ -160,11 +142,7 @@ ${ugcline} /${productClass}.CON.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz})}/ /00000.0.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ #foreach (${area} in ${areas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} @@ -180,11 +158,7 @@ ${ugcline} /${productClass}.COR.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz})}/ /00000.0.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ #foreach (${area} in ${areas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} @@ -200,15 +174,6 @@ ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} #if(${action}=="CANCON" || ${action}=="CON" || ${action}=="COR" || ${CORCAN}=="true") #if(${productClass}=="T") THIS IS A TEST MESSAGE.## -#end -################################### -## Flash Flood Emergency headline # -################################### -#if(${list.contains(${bullets}, "ffwEmergency")}) -#set($ctaSelected = "YES") - -...THIS IS A FLASH FLOOD EMERGENCY FOR ${emergencyHeadline}... - #end ...THE FLASH FLOOD WARNING ## #if(${hycType} != "") @@ -216,6 +181,15 @@ FOR ${hycType} ## #end REMAINS IN EFFECT #secondBullet(${dateUtil},${expire},${timeFormat},${localtimezone},${secondtimezone}) FOR ## #headlineLocList(${areas} true true true false)... +############################################################################### +## Flash Flood Emergency per NWS 10-922 Directive goes after initial headline # +############################################################################### +#if(${list.contains(${bullets}, "ffwEmergency")}) +#set($ctaSelected = "YES") + +...THIS IS A FLASH FLOOD EMERGENCY FOR !**ENTER LOCATION**!... + +#end ################################################ ################################# @@ -338,13 +312,6 @@ THIS IS A TEST MESSAGE. ## #thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) ...${report} ${rainAmount} ${isExpected} ${snowMelt} -########################################################################## -## Flash Flood Emergency per NWS 10-922 Directive goes with third bullet # -########################################################################## -#if(${list.contains(${bullets}, "ffwEmergency")}) -THIS IS A FLASH FLOOD EMERGENCY FOR ${emergencyHeadline}. SEEK HIGHER GROUND NOW! - -#end ${burnScar} ############################################ diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/burnScarFlashFloodWarningFollowup.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/burnScarFlashFloodWarningFollowup.xml index e2794a5994..718a4c7dbb 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/burnScarFlashFloodWarningFollowup.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/burnScarFlashFloodWarningFollowup.xml @@ -1,25 +1,11 @@ - - - - - - - - - - mi mph @@ -129,7 +115,9 @@ turned on unless the corresponding .vm file is turned on in a given template's . - + + + @@ -183,7 +171,9 @@ turned on unless the corresponding .vm file is turned on in a given template's . - + + + @@ -216,6 +206,116 @@ turned on unless the corresponding .vm file is turned on in a given template's . false + + + County + 0 + AND + 0 + COUNTYNAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + FIPS + NAME + + parent + + + + + + + 25 + + + + + true + 8.0 + 5 + 5 + 4 + 8 + Name + AREA + COUNTYNAME + + STATE + STATE + countyTypes.txt + + distance + + + + + + + + + + + + + NAME + 1 + AREA + POINTS + true + 30 + 200 + + + + + + + + + + warngenlev + population + distance + + + + + + NAME + AREA + POINTS + true + 10 + 200 + + name + + + + + + + + + + + + + + + + WarnGenLoc + County + + States + TIMEZONES + TIME_ZONE + + ffmp_basins 0.064 diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/burnScarInfo.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/burnScarInfo.vm index 4184299dbc..059dc71c7c 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/burnScarInfo.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/burnScarInfo.vm @@ -10,7 +10,6 @@ #if(${list.contains($bullets, "FourMileBurnArea")}) #set($burnScarName = "FOUR MILE BURN AREA") #set($burnScarEnd = " OVER THE FOUR MILE BURN AREA") - #set($emergencyHeadline = "AREAS IN AND AROUND THE ${burnScarName}") #end #if(${list.contains($bullets, "fourmilelowimpact")}) #set($ctaSelected = "YES") diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/burnScarInfoBullet.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/burnScarInfoBullet.xml index 814754494e..0692cb41c0 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/burnScarInfoBullet.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/burnScarInfoBullet.xml @@ -5,9 +5,9 @@ This process can be done for any pre-configured FFW box. --> \ No newline at end of file diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/config.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/config.vm deleted file mode 100644 index 8a4bdd862f..0000000000 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/config.vm +++ /dev/null @@ -1,59 +0,0 @@ -############################################################################ -## This file contains global WarnGen tempate (.vm) configuration settings -## If you have any questions please contact Evan Bookbinder - WFO EAX -## CREATED 9/20/2013 -############################################################################ -### SET LAND REFERENCE DISTANCE UNITS -#set($landDistanceUnits = "MILES") -### SET MARINE REFERENCE DISTANCE UNITS -#set($marineDistanceUnits = "NM") - -### SET DISTANCE (LAND) AT OR BELOW WHICH STORM REFERENCE MILEAGE WILL BE SHOWN AS "NEAR" -#set($maxLandNearDistance = 6) -### SET DISTANCE (MARINE) AT OR BELOW WHICH STORM REFERENCE MILEAGE WILL BE SHOWN AS "NEAR" -#set($maxMarineNearDistance = 6) -### SET "NEAR" WORDING -#set($nearPhrase = "NEAR") - -### SET DISTANCE (LAND) AT OR BELOW WHICH STORM REFERENCE MILEAGE WILL BE SHOWN AS"OVER" -#set($maxLandOverDistance = 2) -### SET DISTANCE (LAND) AT OR BELOW WHICH STORM REFERENCE MILEAGE WILL BE SHOWN AS"OVER" -#set($maxMarineOverDistance = 2) -### SET "OVER" WORDING -#set($overPhrase = "OVER") - -### SET STORM SPEED (LAND) BELOW WHICH STORM MOVEMENT WILL BE "STATIONARY" .. e.g. < 5 mph -#set($landStationary = 5) -### SET STORM SPEED (MARINE) BELOW WHICH STORM MOVEMENT WILL BE "STATIONARY" .. e.g < 5 knots -#set($marineStationary = 5) - -### USE SECOND STORM REFERENCE? true or false -### DETERMINES WHETHER OR NOT A SECOND STORM REFERENCE IS USED IN THE 3RD BULLET. -### TRUE: -### "A SEVERE THUNDERSTORM WAS LOCATED NEAR PODUNK...OR 40 MILES EAST OF DENVER" -### FALSE: -### "A SEVERE THUNDERSTORM WAS LOCATED NEAR PODUNK" -### ONE VARIABLE IS SET FOR A SINGLE STORM, THE OTHER FOR A LINE OF STORMS -#set ($useSecondReferenceCell = true) -#set ($useSecondReferenceLine = false) - -### INCLUDE STATE ABBREVIATIONS WITH ZONE LISTING IN MND HEADER? true or false -### -### FOR WESTERN REGION/ALASKA, THIS WILL LIKELY BE FALSE...AS WOULD ANY CWA COVERING -### ONLY A SINGLE STATE -### FALSE OPTION: -### AKZ220>224-226-170400 -### YUKON FLAT AND SURROUNDING UPLANDS-CENTRAL INTERIOR- -### MIDDLE TANANA VALLEY-DELTANA AND TANANA FLATS- -### 556 PM AKDT MON SEP 16 2013 -### -### TRUE OPTION: -### AKZ220>224-226-170400 -### YUKON FLAT AND SURROUNDING UPLANDS AK-CENTRAL INTERIOR AK- -### MIDDLE TANANA VALLEY AK-DELTANA AND TANANA FLATS AK- -### 556 PM AKDT MON SEP 16 2013 -#set($includeStateAbbreviation = true) - -### SET RURAL PHRASING WHEN NO WARNGEN LOCATIONS ARE IN THE PATH OF THE STORM TRACK/POLYGON -### THIS STORM WILL REMAIN OVER ___________ OF XXXX COUNTY/ZONE -#set($noLocPhrase = "MAINLY RURAL AREAS") \ No newline at end of file diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/countyTypes.txt b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/countyTypes.txt index 9e22d41d13..f3aa89ad5e 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/countyTypes.txt +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/countyTypes.txt @@ -1,5 +1,5 @@ LA \ PARISH -LOUISIANA \ PARISH +LOUISIANNA \ PARISH LA+ \ PARISHES LOUISIANA+ \ PARISHES DC \ diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/customTemplate.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/customTemplate.vm new file mode 100644 index 0000000000..a3323ebfad --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/customTemplate.vm @@ -0,0 +1,184 @@ +#################################################################### +## CUSTOM TEMPLATE ## +## History +## QINGLU LIN 8-14-2012 DR 14493 use corToNewMarker and TMLtime ## +#################################################################### +${WMOId} ${vtecOffice} 000000 +CUSTOM +${ugcline} +/${productClass}.${action}.${vtecOffice}.SS.W.${etn}.${dateUtil.format(${start}, ${timeFormat.ymdthmz})}-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ + +BULLETIN - EAS ACTIVATION REQUESTED +#if(${productClass}=="T") +TEST...CUSTOM WARNING...TEST +#else +CUSTOM WARNING +#end +NATIONAL WEATHER SERVICE ${officeShort} +${dateUtil.format(${start}, ${timeFormat.header}, ${localtimezone})} + +#if(${productClass}=="T") +...THIS MESSAGE IS FOR TEST PURPOSES ONLY... + +#end +#headline(${officeLoc}, ${backupSite}) + +* ## +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +CUSTOM WARNING FOR... +#foreach (${area} in ${areas}) + ## +#if(${area.partOfArea}) +#areaFormat(${area.partOfArea} true false) ## +#end +${area.name} ${area.areaNotation} IN #areaFormat(${area.partOfParentRegion} true false) ${area.parentRegion}... +#if(${list.size($area.points)} > 0) +#if(${list.size($area.points)} > 1) + THIS INCLUDES THE CITIES OF... #foreach (${city} in ${area.points})${city}... #end + +#else + THIS INCLUDES THE CITY OF ${list.get(${area.points},0)} +#end +#end +#end + +* ## +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +UNTIL ${dateUtil.format(${expire}, ${timeFormat.clock}, 15, ${localtimezone})} + +#set($report = "") +#if(${list.contains($bullets, "much")}) + #set ($report = "NATIONAL WEATHER SERVICE CUSTOM RADAR WAS TRACKING A CUSTOM THING") +#end +#set($closest = ${list.get($closestPoints, 0)}) +#set($secondary = ${list.get($closestPoints, 1)}) +* ## +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +AT ${dateUtil.format(${event}, ${timeFormat.clock}, ${localtimezone})}...${report} ## +#if($closest.roundedDistance <= 4) +OVER ## +#else +${closest.roundedDistance} MILES #direction(${closest.oppositeRoundedAzimuth}) OF ## +#end +${closest.name}## +#if($secondary) +...OR ${secondary.roundedDistance} MILES #direction(${secondary.oppositeRoundedAzimuth}) OF ${secondary.name}## +#end +#if($movementSpeed < 3 || ${stationary}) +. ${reportType2} NEARLY STATIONARY. +#else +...MOVING #direction(${movementDirectionRounded}) AT ${mathUtil.roundTo5(${movementSpeed})} MPH. +#end +## Determine if the pathcast goes over only rural areas +#set($ruralOnly = 1) +#foreach(${pc} in ${pathCast}) +#if(${pc.points}) +#set($ruralOnly = 0) +#end +#end +#set($numOtherCities = ${list.size($otherPoints)}) + +#################### +## BEGIN PATHCAST ## +#################### +#if(${pathCast} && ${ruralOnly} == 0) +#if(${stormType} == "line") +* ## +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +THE CUSTOM THING PRODUCING STORMS WILL BE NEAR... +#else +* ## +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +THE CUSTOM THING WILL BE NEAR... +#end +#set($numRural = 0)## indicates the number of rural points +#foreach (${pc} in ${pathCast}) +#if(${pc.points}) +#set($numRural = 0) +#set($numCities = ${list.size($pc.points)}) +#set($count = 0) + ## +#foreach (${city} in ${pc.points}) +#if(${city.roundedDistance} < 3) +## close enough to not need azran, considered OVER the area +${city.name}## +#else +## needs azran information +${city.roundedDistance} MILES #direction(${city.oppositeRoundedAzimuth}) OF ${city.name}## +#end +#set($count = $count + 1) +#if($count == $numCities - 1) + AND ## +#elseif($count < $numCities) +...## +#end +#end + BY ${dateUtil.format(${pc.time}, ${timeFormat.clock}, ${localtimezone})}... +#else## Handle the rural cases +#set($numRural = $numRural + 1) +#if($numRural > 2) + RURAL ${pc.area} ${pc.areaNotation} AT ${dateUtil.format(${pc.time}, ${timeFormat.clock}, ${localtimezone})}... +#set($numRural = 0) +#end +#end +#end +#elseif(${otherPoints} && ${numOtherCities} > 0) +* OTHER LOCATIONS IN THE WARNING INCLUDE BUT ARE NOT LIMITED TO +#set($count = 0) + ## +#foreach(${point} in ${otherPoints}) +#set($count = $count + 1) +${point}## +#if($count == $numOtherCities - 1) + AND ## +#elseif($count < $numOtherCities) +...## +#end +#end + +#else +* THE CUSTOM THING WILL OTHERWISE REMAIN OVER MAINLY RURAL AREAS OF THE INDICATED COUNTIES. + +#end +#################### +## ENDS PATHCAST ## +#################### + +#if(${list.contains($bullets, "more")}) +IN ADDITION TO THE CUSTOM WARNING... + +## parse file command here is to pull in mile marker info +## #parse("mileMarkers.vm") + +#end +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. DO NOT TAKE ACTION BASED ON THIS MESSAGE. + +#end +#printcoords(${areaPoly}, ${list}) + +TIME...MOT...LOC ## +#if(${corToNewMarker}) +${dateUtil.format(${TMLtime}, ${timeFormat.time})}Z ## +#else +${dateUtil.format(${event}, ${timeFormat.time})}Z ## +#end +${mathUtil.roundAndPad(${movementDirection})}DEG ## +${mathUtil.round(${movementInKnots})}KT ## +#foreach(${eventCoord} in ${eventLocation}) +#llFormat(${eventCoord.y}) #llFormat(${eventCoord.x}) ## +#end + +$$ + +!**NAME/INITIALS**! diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/customTemplate.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/customTemplate.xml new file mode 100644 index 0000000000..5a5af277f5 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/customTemplate.xml @@ -0,0 +1,239 @@ + + + + + + + + + + + + + + + + + XX.W + + + + true + + + true + + + + torWatches + svrWatches + + + + 30 + + 10 + 15 + 20 + 25 + 30 + 40 + 45 + 50 + 60 + 75 + 90 + + + + + + + + + + + + + + + 0.00 + AND + 0 + COUNTYNAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + FIPS + NAME + + parent + + + WARNGENLEV + 1 + INCLUSIVE + + 25 + + 50 + true + true + + warngenlev + population + + + + + + + 2 + mi + mph + NAME + + WARNGENLEV + 0 + EXCLUSIVE + + + distance + warngenlev + + + + + + true + 20 + 45 + 8.0 + 5 + 4 + 8 + Name + + WARNGENLEV + 0 + EXCLUSIVE + + COUNTYNAME + STATE + STATE + countyTypes.txt + + distance + + + + + + + + City + County + States + TIMEZONES + TIME_ZONE + CWA + + WFO + $warngenCWAFilter + INCLUSIVE + + + + \ No newline at end of file diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/damInfo.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/damInfo.vm index 1300d431a1..ed4ec6f9b2 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/damInfo.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/damInfo.vm @@ -61,12 +61,11 @@ #if(${bullet.endsWith("Dam")}) #set($ctaSelected = "YES") #set($sitespecSelected = "YES") - #set($hycType = "THE ${riverName} BELOW ${damName}") - #set($emergencyHeadline = "TOWNS AND CITIES IMMEDIATELY BELOW ${damName} ON THE ${riverName}") - #set($headline = "FOR ${reportType2} ${damName} ON THE ${riverName} ") - #set($reportType1 = "${reportType2} ${damName} ON THE ${riverName}${reportInfo}") - #set($addInfo = "THE NEAREST DOWNSTREAM TOWN IS ${cityInfo} FROM THE DAM.") - #set($sitespecCTA = "IF YOU ARE IN LOW LYING AREAS BELOW THE ${damName} YOU SHOULD MOVE TO HIGHER GROUND IMMEDIATELY.") +## #set($hycType = "THE ${riverName} BELOW ${damName}") +## #set($headline = "FOR ${reportType2} ${damName} ON THE ${riverName} ") +## #set($reportType1 = "${reportType2} ${damName} ON THE ${riverName}${reportInfo}") +## #set($addInfo = "THE NEAREST DOWNSTREAM TOWN IS ${cityInfo} FROM THE DAM.") +## #set($sitespecCTA = "IF YOU ARE IN LOW LYING AREAS BELOW THE ${damName} YOU SHOULD MOVE TO HIGHER GROUND IMMEDIATELY.") #end #end ####################################################################### diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/dssEvents.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/dssEvents.vm deleted file mode 100644 index 670322f246..0000000000 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/dssEvents.vm +++ /dev/null @@ -1,28 +0,0 @@ -#* -CREATED 09-20-2013 BY EVAN BOOKBINDER - -dbTable list should include the pointSource objects created in -dssEvents.xml - -*# - -#if ($dss_events) -#set($size = ${list.size($dss_events)}) -#if ($size > 0) -PEOPLE ATTENDING ## -#set($counter = 1) -#foreach($dss in $dss_events) -#if($counter < $size) -${dss.name}...## -#set($counter = $counter + 1) -#elseif($counter == $size) -#if($size > 1) -AND ## -#end -${dss.name} ## -#end -#end -SHOULD SEEK SAFE SHELTER IMMEDIATELY! - -#end -#end \ No newline at end of file diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/dssEvents.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/dssEvents.xml deleted file mode 100644 index c01ba98673..0000000000 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/dssEvents.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - warngen_dss - NAME - TRACK - true - 10 - 10 - - distance - - diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/dupCounties.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/dupCounties.vm index 29f8f6dfdc..ffc49c6e8d 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/dupCounties.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/dupCounties.vm @@ -1,10 +1,7 @@ ### IF YOU HAVE DUPLICATE COUNTY NAMES IN YOUR CWA -### (e.g. LINN KANSAS AND LINN MISSOURI) INCLUDE FIPS/ZONE CODES BELOW. -### FIPS CODES ARE IN A XXYYY NUMERIC FORMAT WHERE XX = STATE FIPS AND YYY = COUNTY FIPS -### ZONE CODES ARE IN A XXYYY STRING FORMAT WHERE XX = STATE ABBREVIATION AND YYY = ZONE CODE -### For example: For Linn County Kansas and Linn County Missouri, we would have 4 entires: -### the FIPS/Zone pair for Linn Kansas and the FIPS/Zone pair for Linn Missouri -### #set ($dupcounties = ["29115","MO024","20107","KS060"]) +### (e.g. JOHNSON KANSAS AND JOHNSON MISSOURI) INCLUDE FIPS BELOW +### IN THE XXYYY FORMAT WHERE XX = STATE FIPS AND YYY = COUNTY FIPS +### For example: #set ($dupcounties = ["20091","20107","29101","29115"]) ### IF YOU DO NOT HAVE DUPLICATE COUNTY NAMES USE THE FOLLOWING SYNTAX: ### Null example: #set ($dupcounties = [""]) #set ($dupcounties = [""]) \ No newline at end of file diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/extremeWindWarning.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/extremeWindWarning.vm index 49e03ff80b..809df3f0e4 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/extremeWindWarning.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/extremeWindWarning.vm @@ -1,16 +1,16 @@ ################# ############################################################################ ## EXTREME WIND WARNING TEMPLATE ## -## RECENT HISTORY +## (SLIGHTLY) MODIFIED BY TOM BIRCHARD - WFO HFO ## +## VERSION AWIPS II 1.0 -- 15-APRIL-2011 +## MODIFIED EVAN BOOKBINDER 09-16-2011 OB11.0.8-8 ## +## EVAN BOOKBINDER WFO EAX 11-04-2011 OB11.9-3 (DRs) ## ## QINGLU LIN 8-14-2012 DR 14493 use TMLtime ## ## Mike Dangelo 9-13-2012 minor tweaks to ${variables} ## -## Evan Bookbinder 06-07-2013 Fixed CTAs/&& -## Evan Bookbinder 09-18-2013 Implemented config.vm +## Evan Bookbinder 06-07-2013 Fixed CTAs/&& ############################################################################ -################# ## EWW PRODUCT ## ################# -#parse("config.vm") ## ${WMOId} ${vtecOffice} 000000 ${BBBId} EWW${siteId} @@ -115,13 +115,12 @@ THIS IS A TEST MESSAGE. ## #end #thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) ...${reportType}...${reportType1} ## -##Many of the variables passed below are controlled by config.vm #if(${stormType} == "line") -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxLandNearDistance}, ${overPhrase}, ${maxLandOverDistance}, ${landDistanceUnits}, ${useSecondReferenceLine}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "MILES", false) #else -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxLandNearDistance}, ${overPhrase}, ${maxLandOverDistance}, ${landDistanceUnits}, ${useSecondReferenceCell}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "MILES", true) #end -#if(${movementSpeed} < ${landStationary} || ${stationary}) +#if($movementSpeed < 3 || ${stationary}) . ${reportType2} NEARLY STATIONARY.## #else ...MOVING #direction(${movementDirectionRounded}) AT ${mathUtil.roundTo5(${movementSpeed})} MPH.## diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/extremeWindWarning.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/extremeWindWarning.xml index 51dda91a61..eeb8f45585 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/extremeWindWarning.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/extremeWindWarning.xml @@ -4,24 +4,10 @@ Evan Bookbinder 09-12-2012 Added settings for locations shapefile Added new areaSource object Evan Bookbinder 03-1-2013 Fixed group Settings - Evan Bookbinder 06-07-2013 Fixed CTAs - Phil Kurimski 09-19-2013 added geospatialConfig.xml + Evan Bookbinder 06-07-2013 Fixed CTAs --> - - - - - - - - - mi mph @@ -94,8 +80,7 @@ turned on unless the corresponding .vm file is turned on in a given template's . - - + @@ -121,10 +106,161 @@ turned on unless the corresponding .vm file is turned on in a given template's . - - + + + + County + 0 + AND + 0 + COUNTYNAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + FIPS + NAME + + parent + + + + + + + 25 + + + + NAME + AREA + POINTS + + + + + + + + + 1 + 50 + + distance + warngenlev + population + + + + + NAME + AREA + POINTS + + + + + + + + + 5 + 100 + + distance + warngenlev + population + + + + + 1 + true + 8.0 + 5 + 5 + 4 + 8 + Name + COUNTYNAME + AREA + STATE + STATE + countyTypes.txt + + warngenlev + population + distance + + + + + + + + + + + + + NAME + 1 + AREA + TRACK + true + 20 + 10 + + + + + + + + + + warngenlev + population + distance + + + + + NAME + 1 + AREA + TRACK + true + 10 + 10 + + distance + + + + + + + + + + + + + + + + WarnGenLoc + County + States + TIMEZONES + TIME_ZONE + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/extremeWindWarningFollowup.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/extremeWindWarningFollowup.vm index 88b81211e0..9575f728e9 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/extremeWindWarningFollowup.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/extremeWindWarningFollowup.vm @@ -4,10 +4,8 @@ ## Evan Bookbinder 4-25-2012 for OB 12.3.1 (corText) ## Mike Dangelo 9-13-2012 minor tweaks to ${variables} ## Evan Bookbinder 06-07-2013 Fixed CTAs/&& -## Evan Bookbinder 09-18-2013 Implemented config.vm ################################################ ## -#parse("config.vm") ### CREATE PHRASING DEPENDING ON WHETHER WE ISSUE EXP PRIOR TO EXPIRATION TIME OR NOT #if(${action}=="COR" && ${cancelareas}) #set($CORCAN = "true") @@ -44,11 +42,7 @@ ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} ${ugcline} /${productClass}.${action}.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz})}/ #foreach (${area} in ${areas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} @@ -150,11 +144,7 @@ ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} ${ugcline} /${productClass}.${action}.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz})}/ #foreach (${area} in ${areas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} @@ -180,13 +170,12 @@ THIS IS A TEST MESSAGE. ## #thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) ...${reportType}...${reportType1} ## #end -##Many of the variables passed below are controlled by config.vm #if(${stormType} == "line") -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxLandNearDistance}, ${overPhrase}, ${maxLandOverDistance}, ${landDistanceUnits}, ${useSecondReferenceLine}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "MILES", false) #else -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxLandNearDistance}, ${overPhrase}, ${maxLandOverDistance}, ${landDistanceUnits}, ${useSecondReferenceCell}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "MILES", true) #end -#if(${movementSpeed} < ${landStationary} || ${stationary}) +#if($movementSpeed < 3 || ${stationary}) . ${reportType2} NEARLY STATIONARY.## #else ...MOVING #direction(${movementDirectionRounded}) AT ${mathUtil.roundTo5(${movementSpeed})} MPH.## @@ -319,11 +308,7 @@ ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} ${ugclinecan} /${productClass}.CAN.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz})}/ #foreach (${area} in ${cancelareas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} @@ -337,8 +322,6 @@ THIS IS A TEST MESSAGE.## #end ...THE EXTREME WIND WARNING FOR ## #headlineLocList(${cancelareas} true true true false) ${expcanHLTag}... -###REPLACE headlineLocList ABOVE WITH THE FOLLOWING FOR ZONE BASED PRODUCT W/ COUNTY HEADLINE -###headlineLocList(${cancelaffectedCounties} true true true false) ${expcanHLTag}... ## One line explanation !**EXPLANATION**! @@ -366,11 +349,7 @@ $$ ${ugcline} /${productClass}.CON.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz})}/ #foreach (${area} in ${areas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} @@ -392,13 +371,12 @@ THIS IS A TEST MESSAGE. AT ${dateUtil.format(${event}, ${timeFormat.clock}, ${lo AT ${dateUtil.format(${event}, ${timeFormat.clock}, ${localtimezone})}...${reportType}...${reportType1} ## #end -##Many of the variables passed below are controlled by config.vm #if(${stormType} == "line") -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxLandNearDistance}, ${overPhrase}, ${maxLandOverDistance}, ${landDistanceUnits}, ${useSecondReferenceLine}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "MILES", false) #else -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxLandNearDistance}, ${overPhrase}, ${maxLandOverDistance}, ${landDistanceUnits}, ${useSecondReferenceCell}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "MILES", true) #end -#if(${movementSpeed} < ${landStationary} || ${stationary}) +#if($movementSpeed < 3 || ${stationary}) . ${reportType2} NEARLY STATIONARY.## #else ...MOVING #direction(${movementDirectionRounded}) AT ${mathUtil.roundTo5(${movementSpeed})} MPH.## @@ -490,11 +468,7 @@ ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} ${ugcline} /${productClass}.${action}.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz})}/ #foreach (${area} in ${areas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/extremeWindWarningFollowup.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/extremeWindWarningFollowup.xml index 201c1800dc..fc306ee4e1 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/extremeWindWarningFollowup.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/extremeWindWarningFollowup.xml @@ -6,23 +6,9 @@ Added new areaSource object Evan Bookbinder 03-01-2013 Fixed Group Settings Evan Bookbinder 06-07-2013 Fixed CTAs - Phil Kurimski 09-19-2013 added geospatialConfig.xml --> - - - - - - - - - mi mph @@ -108,7 +94,8 @@ turned on unless the corresponding .vm file is turned on in a given template's . - + + @@ -133,10 +120,164 @@ turned on unless the corresponding .vm file is turned on in a given template's . - - + + + + + + + County + 0 + AND + 0 + COUNTYNAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + FIPS + NAME + + parent + + + + + + + 25 + + + + NAME + AREA + POINTS + + + + + + + + + 1 + 100 + + distance + warngenlev + population + + + + + NAME + AREA + POINTS + + + + + + + + + 5 + 100 + + distance + warngenlev + population + + + + + 1 + true + 8.0 + 5 + 5 + 4 + 8 + Name + AREA + COUNTYNAME + STATE + STATE + countyTypes.txt + + warngenlev + population + distance + + + + + + + + + + + + + 1 + NAME + AREA + TRACK + true + 20 + 10 + + + + + + + + + + warngenlev + population + distance + + + + + NAME + 1 + AREA + TRACK + true + 10 + 10 + + distance + + + + + + + + + + + + + + + + WarnGenLoc + County + States + TIMEZONES + TIME_ZONE + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/ffwfaw.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/ffwfaw.vm new file mode 100644 index 0000000000..43ef9d09c8 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/ffwfaw.vm @@ -0,0 +1,311 @@ +################################################################## +## FLASH FLOOD/AREAL WARNING TEMPLATE FOR COUNTY-BASED PRODUCTS ## +################################################################## +## EDITED BY MIKE DANGELO 7-13-2011 ## +## Edited by Phil Kurimski 8-15-2011 for OB11.80-4 ## +## Overhauled by Evan Bookbinder 9-15-2011 for OB11.8.0-8 to combine FFW/FLW +## + +#################################### SET SOME VARIABLES ################################### +#set ($hycType = "") +#set ($ic = "ER") +#set ($floodReason = "") + +#set ($MNDPROD = "!** YOU DID NOT SELECT A WARNING TYPE! CLOSE THIS WINDOW AND REGENERATE YOUR WARNING **!") + +#if(${list.contains($bullets, "ffwSelect")}) + #set($MNDPROD = "FLASH FLOOD WARNING") + #set($EAS = "EAS ACTIVATION REQUEST") + #set($floodType = "FLASH FLOODING") + #set($pil = "FFW") + #set($vtecPhenSig = "FF.W") +#elseif(${list.contains($bullets, "fawSelect")}) + #set($MNDPROD = "FLOOD WARNING") + #set($EAS = "IMMEDIATE BROADCAST REQUEST") + #set($floodType = "FLOODING") + #set($pil = "FLW") + #set($vtecPhenSig = "FA.W") +#end + +## +#if(${action} == "EXT") + #set($starttime = "000000T0000Z") + #set($extend = true) +#else + #set($starttime = ${dateUtil.format(${start}, ${timeFormat.ymdthmz})}) + #set($extend = false) +#end +## +###OVERRIDE DEFAULT EXECESSIVE RAINFALL IF NECESSARY +#if(${list.contains($bullets, "icrs")}) + #set ($ic = "RS") + #set ($hycType = "RAIN AND SNOW MELT IN...") + #set ($floodReason = " RAPID SNOW MELT IS ALSO OCCURRING AND WILL ADD TO THE ${floodType}.") +#elseif(${list.contains($bullets, "icsm")}) + #set ($ic = "SM") + #set ($hycType = "FOR RAPID SNOW MELT IN...") + #set ($floodReason = " RAPID SNOW MELT IS OCCURRING AND WILL CAUSE ${floodType}.") +#elseif(${list.contains($bullets, "icij")}) + #set ($ic = "IJ") + #set ($hycType = "FOR ICE JAM FLOODING IN...") + #set ($floodReason = " AN ICE JAM IS OCCURRING AND WILL CAUSE ${floodType}.") +#elseif(${list.contains($bullets, "icicr")}) + #set ($ic = "IC") + #set ($hycType = "FOR AN ICE JAM AND HEAVY RAIN IN...") + #set ($floodReason = " AN ICE JAM IS ALSO OCCURRING AND WILL CAUSE ${floodType}.") +#elseif(${list.contains($bullets, "icics")}) + #set ($ic = "IC") + #set ($hycType = "FOR AN ICE JAM AND RAPID SNOW MELT IN...") + #set ($floodReason = " AN ICE JAM AND RAPID SNOW MELT ARE ALSO OCCURRING AND WILL CAUSE ${floodType}.") +#elseif(${list.contains($bullets, "icerr")}) + #set ($ic = "ER") + #set ($hycType = "FOR RAPID RIVER RISES IN...") +#end +## +${WMOId} ${vtecOffice} 000000 ${BBBId} +${pil}${siteId} +#if(${specialCorText}) +${specialCorText} +#else +${ugcline} +#################################### VTEC LINE ################################### +/${productClass}.${action}.${vtecOffice}.${vtecPhenSig}.${etn}.${starttime}-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ +/00000.0.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ + +#################################### MND HEADER ################################### +BULLETIN - ${EAS} +#if(${productClass}=="T") +TEST...${MNDPROD}...TEST +#else +${MNDPROD} +#end +NATIONAL WEATHER SERVICE ${officeShort} +#backupText(${backupSite}) +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +#if(${productClass}=="T") +...THIS MESSAGE IS FOR TEST PURPOSES ONLY... + +#end +#headlineext(${officeLoc}, ${backupSite}, ${extend}) + +################################# +######## FIRST BULLET ########### +################################# +* ## +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +${MNDPROD} FOR... +#if (${hycType} != "") + ${hycType} +#end +#firstBullet(${areas}) + +################################# +####### SECOND BULLET ########### +################################# +* ## +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +#secondBullet(${dateUtil},${expire},${timeFormat},${localtimezone},${secondtimezone}) + + +################################################ +################################# +######## THIRD BULLET ########### +################################# +#set ($rainAmount = "") +#if(${list.contains($bullets, "rain1")} ) + #set ($rainAmount = " UP TO ONE INCH OF RAIN HAS ALREADY FALLEN.") +#end +#if(${list.contains($bullets, "rain2")} ) + #set ($rainAmount = " UP TO TWO INCHES OF RAIN HAS ALREADY FALLEN.") +#end +#if(${list.contains($bullets, "rain3")} ) + #set ($rainAmount = " UP TO THREE INCHES OF RAIN HAS ALREADY FALLEN.") +#end +#if(${list.contains($bullets, "rainEdit")} ) + #set ($rainAmount = " !** RAINFALL AMOUNTS **! INCHES OF RAIN HAS ALREADY FALLEN.") +#end +#set ($reportBy = "!**YOU DID NOT SELECT A /SOURCE/ BULLET. PLEASE CLOSE THIS WINDOW AND REGENERATE YOUR WARNING**!") +#if(${list.contains($bullets, "doppler")}) + #set ($reportBy = "NATIONAL WEATHER SERVICE DOPPLER RADAR INDICATED") +#elseif(${list.contains($bullets, "dopplerGauge")}) + #set ($reportBy = "NATIONAL WEATHER SERVICE DOPPLER RADAR AND AUTOMATED RAIN GAUGES INDICATED") +#elseif(${list.contains($bullets, "trainedSpotters")}) + #set ($reportBy = "TRAINED WEATHER SPOTTERS REPORTED") +#elseif(${list.contains($bullets, "lawEnforcement")}) + #set ($reportBy = "LOCAL LAW ENFORCEMENT REPORTED") +#elseif(${list.contains($bullets, "public")}) + #set ($reportBy = "THE PUBLIC REPORTED") +#elseif(${list.contains($bullets, "emergencyManagement")}) + #set ($reportBy = "EMERGENCY MANAGEMENT REPORTED") +#elseif(${list.contains($bullets, "satellite")}) + #set ($reportBy = "SATELLITE ESTIMATES INDICATED") +#elseif(${list.contains($bullets, "satelliteGauge")}) + #set ($reportBy = "SATELLITE ESTIMATES AND AUTOMATED RAIN GAUGES INDICATED") +#end +* ## +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +#set($cityListLead = "") +#if(${list.contains($bullets, "thunder")}) +#thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone})...## +${reportBy} SLOW MOVING THUNDERSTORMS WITH VERY HEAVY RAINFALL ACROSS THE WARNED AREA.${rainAmount}${floodReason} +#set($cityListLead = "RUNOFF FROM THIS EXCESSIVE RAINFALL WILL CAUSE ${floodType} TO OCCUR. ") +#elseif(${list.contains($bullets, "plainRain")}) +#thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone})...## +${reportBy} AN AREA OF VERY HEAVY RAINFALL ACROSS THE WARNED AREA.${rainAmount}${floodReason} +#set($cityListLead = "RUNOFF FROM THIS EXCESSIVE RAINFALL WILL CAUSE ${floodType} TO OCCUR. ") +#elseif(${list.contains($bullets, "floodOccurring")}) +#thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone})...## +${reportBy} ${floodType} ACROSS THE WARNED AREA.${rainAmount}${floodReason} !** ENTER SPECIFIC REPORTS OF FLOODING AND EXPECTED RAINFALL AMOUNTS **! +#elseif(${list.contains($bullets, "genericFlood")}) +#thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone})...## +!** ENTER REASON AND FORECAST FOR FLOOD **! +#else +"!**YOU DID NOT SELECT AN /EVENT/ BULLET. PLEASE CLOSE THIS WINDOW AND REGENERATE YOUR WARNING**! +#end + +########################################################################## +## Flash Flood Emergency per NWS 10-922 Directive goes with third bullet # +########################################################################## +#if(${list.contains($bullets, "ffwEmergency")} ) +#if(${list.contains($bullets, "ffwSelect")}) + THIS IS A FLASH FLOOD EMERGENCY FOR !** LOCATION **!. + +#else + +!** YOU HAVE SELECTED FLASH FLOOD EMERGENCY BUT AN AREAL FLOOD WARNING. PLEASE CLOSE AND REGENERATE YOUR WARNING CORRECTLY **! + +#end +#end +############################################ +######## FOURTH BULLET (CITY LIST) ######### +############################################ +* ## +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +#### THE THIRD ARGUMENT IS A NUMBER SPECIFYING THE NUMBER OF COLUMNS TO OUTPUT THE CITIES LIST IN +#### 0 IS A ... SEPARATED LIST, 1 IS ONE PER LINE, >1 IS A COLUMN FORMAT +#### IF YOU USE SOMETHING OTHER THAN "LOCATIONS IMPACTED INCLUDE" LEAD IN BELOW, MAKE SURE THE +#### ACCOMPANYING XML FILE PARSE STRING IS CHANGED TO MATCH! +${cityListLead}#locationsList("SOME LOCATIONS THAT WILL EXPERIENCE FLOODING INCLUDE" "${floodType} IS EXPECTED TO OCCUR OVER MAINLY RURAL AREAS OF" 0 ${cityList} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 0) + +########################################## END OF OPTIONAL FOURTH BULLET ############################## +###################################### +###### WHERE ADDITIONAL INFO GOES #### +###################################### + +#if(${list.contains($bullets, "addRainfall")}) +ADDITIONAL RAINFALL AMOUNTS OF !** EDIT AMOUNT **! ARE POSSIBLE IN THE WARNED AREA. + +#end +#if(${list.contains($bullets, "drainages")}) +#drainages(${riverdrainages}) + +#end +############################################## +###### mile markers ############## +############################################## +#parse("milemarkers.vm") +#################################### END OF ADDITIONAL STUFF ################################### +###################################### +####### CALL TO ACTIONS ############## +###################################### +##Check to see if we've selected any calls to action. +#foreach ($bullet in $bullets) +#if($bullet.endsWith("CTA")) +#set ($ctaSelected = "YES") +#end +#end +## +#if(${ctaSelected} == "YES") +PRECAUTIONARY/PREPAREDNESS ACTIONS... + +#end +#if(${list.contains($bullets, "urbanFloodingCTA")}) +EXCESSIVE RUNOFF FROM HEAVY RAINFALL WILL CAUSE FLOODING OF SMALL CREEKS AND STREAMS...URBAN AREAS...HIGHWAYS...STREETS AND UNDERPASSES AS WELL AS OTHER DRAINAGE AREAS AND LOW LYING SPOTS. + +#end +#if(${list.contains($bullets, "ruralFloodingCTA")}) +EXCESSIVE RUNOFF FROM HEAVY RAINFALL WILL CAUSE FLOODING OF SMALL CREEKS AND STREAMS...COUNTRY ROADS...AS WELL AS FARMLAND AS WELL AS OTHER DRAINAGE AREAS AND LOW LYING SPOTS. + +#end +#if(${list.contains($bullets, "ruralUrbanCTA")}) +EXCESSIVE RUNOFF FROM HEAVY RAINFALL WILL CAUSE FLOODING OF SMALL CREEKS AND STREAMS...HIGHWAYS AND UNDERPASSES. ADDITIONALLY...COUNTRY ROADS AND FARMLANDS ALONG THE BANKS OF CREEKS...STREAMS AND OTHER LOW LYING AREAS ARE SUBJECT TO FLOODING. + +#end +#if(${list.contains($bullets, "particularStreamCTA")}) +FLOOD WATERS ARE MOVING DOWN !**name of channel**! FROM !**location**! TO !**location**!. THE FLOOD CREST IS EXPECTED TO REACH !**location(s)**! BY !**time(s)**!. + +#end +#if(${list.contains($bullets, "nighttimeCTA")}) +BE ESPECIALLY CAUTIOUS AT NIGHT WHEN IT IS HARDER TO RECOGNIZE THE DANGERS OF FLOODING. IF ${floodType} IS OBSERVED ACT QUICKLY. MOVE UP TO HIGHER GROUND TO ESCAPE FLOOD WATERS. DO NOT STAY IN AREAS SUBJECT TO FLOODING WHEN WATER BEGINS RISING. + +#end +#if(${list.contains($bullets, "dontDriveCTA")}) +DO NOT DRIVE YOUR VEHICLE INTO AREAS WHERE THE WATER COVERS THE ROADWAY. THE WATER DEPTH MAY BE TOO GREAT TO ALLOW YOUR CAR TO CROSS SAFELY. MOVE TO HIGHER GROUND. + +#end +#if(${list.contains($bullets, "turnAroundCTA")}) +MOST FLOOD DEATHS OCCUR IN AUTOMOBILES. NEVER DRIVE YOUR VEHICLE INTO AREAS WHERE THE WATER COVERS THE ROADWAY. FLOOD WATERS ARE USUALLY DEEPER THAN THEY APPEAR. JUST ONE FOOT OF FLOWING WATER IS POWERFUL ENOUGH TO SWEEP VEHICLES OFF THE ROAD. WHEN ENCOUNTERING FLOODED ROADS MAKE THE SMART CHOICE...TURN AROUND...DONT DROWN. + +#end +#if(${list.contains($bullets, "autoSafetyCTA")}) +FLOODING IS OCCURRING OR IS IMMINENT. MOST FLOOD RELATED DEATHS OCCUR IN AUTOMOBILES. DO NOT ATTEMPT TO CROSS WATER COVERED BRIDGES...DIPS... OR LOW WATER CROSSINGS. NEVER TRY TO CROSS A FLOWING STREAM...EVEN A SMALL ONE...ON FOOT. TO ESCAPE RISING WATER FIND ANOTHER ROUTE OVER HIGHER GROUND. + +#end +#if(${list.contains($bullets, "camperSafetyCTA")}) +FLOODING IS OCCURRING OR IS IMMINENT. IT IS IMPORTANT TO KNOW WHERE YOU ARE RELATIVE TO STREAMS...RIVERS...OR CREEKS WHICH CAN BECOME KILLERS IN HEAVY RAINS. CAMPERS AND HIKERS SHOULD AVOID STREAMS OR CREEKS. + +#end +#if(${list.contains($bullets, "lowSpotsCTA")}) +IN HILLY TERRAIN THERE ARE HUNDREDS OF LOW WATER CROSSINGS WHICH ARE POTENTIALLY DANGEROUS IN HEAVY RAIN. DO NOT ATTEMPT TO TRAVEL ACROSS FLOODED ROADS. FIND AN ALTERNATE ROUTE. IT TAKES ONLY A FEW INCHES OF SWIFTLY FLOWING WATER TO CARRY VEHICLES AWAY. + +#end +#if(${list.contains($bullets, "ffwMeansCTA")}) +A ${MNDPROD} MEANS THAT FLOODING IS IMMINENT OR OCCURRING. IF YOU ARE IN THE WARNING AREA MOVE TO HIGHER GROUND IMMEDIATELY. RESIDENTS LIVING ALONG STREAMS AND CREEKS SHOULD TAKE IMMEDIATE PRECAUTIONS TO PROTECT LIFE AND PROPERTY. DO NOT ATTEMPT TO CROSS SWIFTLY FLOWING WATERS OR WATERS OF UNKNOWN DEPTH BY FOOT OR BY AUTOMOBILE. + +#end +#if(${list.contains($bullets, "powerFloodCTA")}) +DO NOT UNDERESTIMATE THE POWER OF FLOOD WATERS. ONLY A FEW INCHES OF RAPIDLY FLOWING WATER CAN QUICKLY CARRY AWAY YOUR VEHICLE. + +#end +#if(${list.contains($bullets, "reportFloodingCTA")}) +TO REPORT FLOODING...HAVE THE NEAREST LAW ENFORCEMENT AGENCY RELAY YOUR REPORT TO THE NATIONAL WEATHER SERVICE. + +#end +#if(${ctaSelected} == "YES") +&& + +#end +#################################### END OF CTA STUFF ################################### + +########################################## +########BOTTOM OF THE PRODUCT############# +########################################## +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. DO NOT TAKE ACTION BASED ON THIS MESSAGE. + +#end +#printcoords(${areaPoly}, ${list}) + + +$$ + +!**NAME/INITIALS**! + +## example of a for-each loop which will include interstate/mile marker information +## #foreach (${local} in ${alpha}) +## spot is ${local.name}... +## #end + +########### EXAMPLES OF PARSE OR INCLUDE STATEMENTS ################################ +## #parse ("test.vm") +## #include ("username.txt") +#end diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/ffwfaw.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/ffwfaw.xml new file mode 100644 index 0000000000..27e6a280ff --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/ffwfaw.xml @@ -0,0 +1,353 @@ + + + + + + + mi + mph + + + + + County Names + County Warning Areas + + + + + + + NEW + COR + EXT + + + + + FF.W + FA.W + + + + true + + + true + + + 360 + + 120 + 180 + 210 + 240 + 270 + 300 + 330 + 360 + 420 + 480 + 540 + 600 + 660 + 720 + 1440 + 2160 + 2880 + 3600 + + +ic + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.00 + AND + 0 + COUNTYNAME + + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + FIPS + + NAME + + parent + + + + + + + 25 + + + + false + + + + true + 8.0 + 5 + 5 + 4 + 8 + Name + COUNTYNAME + STATE + STATE + countyTypes.txt + + distance + + + + + NAME + POINTS + true + 30 + 200 + + warngenlev + population + + + + + + + + + + NAME + POINTS + true + 10 + 200 + + name + + + + + + + + + + City + County + States + TIMEZONES + TIME_ZONE + + + + ffmp_basins + 0.064 + streamname + + + + + + true + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/fireWarning.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/fireWarning.vm index ac579914f4..95cb7569cf 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/fireWarning.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/fireWarning.vm @@ -4,7 +4,6 @@ ## CREATED BOOKBINDER/DANGELO - 2-07-12 - Initial OB12 Write ## ## Mike Dangelo 9-13-2012 minor tweaks to ${variables} ## ############################################################################### -#parse("config.vm") ${WMOId} ${vtecOffice} 000000 ${BBBId} FRW${siteId} ${ugcline} @@ -60,7 +59,6 @@ A FIRE WAS RACING TOWARD !** LOCATIONS **! AND COULD REACH THERE BY !** TIME **! ## parse file command here is to pull in mile marker info ## #parse("mileMarkers.vm") -## #parse("pointMarkers.vm") ##################### ## CALL TO ACTIONS ## diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/fireWarning.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/fireWarning.xml index ebb44f9f77..e7e3d13354 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/fireWarning.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/fireWarning.xml @@ -4,23 +4,9 @@ Modified MIKE REGA 5-10-2012 DR 14525 added timeZoneField DR 14691 added feAreaField Evan Bookbinder 09-12-2012 added new areaSource object - Phil Kurimski 09-19-2013 added geospatialConfig.xml --> - - - - - - - - - mi mph @@ -38,7 +24,7 @@ turned on unless the corresponding .vm file is turned on in a given template's . - COR + @@ -102,4 +88,155 @@ turned on unless the corresponding .vm file is turned on in a given template's . + + + Zone + 0 + AND + 0 + NAME + NAME + FE_AREA + TIME_ZONE + STATE + countyTypes.txt + STATE_ZONE + NAME + + parent + + + + + + + 25 + + + + NAME + AREA + POINTS + + + + + + + + + 1 + 100 + + distance + warngenlev + population + + + + + NAME + AREA + POINTS + + + + + + + + + 5 + 100 + + distance + + + + + 1 + AREA + true + 8.0 + 5 + 5 + 4 + 8 + Name + COUNTYNAME + STATE + STATE + countyTypes.txt + + warngenlev + population + distance + + + + + + + + + + + + + NAME + 1 + AREA + TRACK + true + 20 + 10 + + + + + + + + + + warngenlev + population + distance + + + + + NAME + 1 + AREA + TRACK + true + 10 + 10 + + distance + + + + + + + + + + + + + WarnGenLoc + County + States + TIMEZONES + TIME_ZONE + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/flashFloodWarning.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/flashFloodWarning.vm index 8c4eb87aa5..6417edfdb1 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/flashFloodWarning.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/flashFloodWarning.vm @@ -1,15 +1,19 @@ ############################################################ ## FLASH FLOOD WARNING TEMPLATE FOR COUNTY-BASED PRODUCTS ## ############################################################ -## RECENT VERSION HISTORY: +## EDITED BY MIKE DANGELO 7-13-2011 +## Edited by Phil Kurimski 8-15-2011 for OB11.8.0-4 +## EDITED BY EVAN BOOKBINDER 9-15-2011 for OB11.8.0-8 +## EDITED BY MIKE DANGELO 9-21-2011 at Alaska TIM +## EDITED BY PHIL KURIMSKI 9-23-2011 at Alaska TIM for burn scars and mud slides +## EDITED BY EVAN BOOKBINDER 11-04-11 - OB11.9-3 (DRs) +## EDITED BY MIKE DANGELO 1-25-2012 at CRH TIM +## EDITED BY MIKE DANGELO 2-23-2012 +## EDITED BY EVAN BOOKBINDER 2-24-2012 ## EDITED BY Phil Kurimski 9-13-2012 OB12.9.1-12 to add Flash Flood Emergency Headline ## Mike Dangelo 9-13-2012 minor tweaks to ${variables} ## Phil Kurimski 2-05-2013 revised CTA statements -## Mike Dangelo 09-17-2013 added code for init pos & pathcasting, and added pointMarkers parse line -## Evan Bookbinder 9-18-2013 Implemented config.vm -## Gene Petrescu 09-19-2013 Added Alaska Modifications (GP comments) #################################### SET SOME VARIABLES ################################### -#parse("config.vm") #set($hycType = "") ## #if(${action} == "EXT") @@ -25,7 +29,7 @@ #if(${list.contains(${bullets}, "icrs")}) #set($ic = "RS") #set($hycType = "RAIN AND SNOW MELT IN...") - #set($snowMelt = "RAPID SNOW MELT IS ALSO OCCURRING AND WILL ADD TO THE FLOODING. ") + #set($snowMelt = "RAPID SNOW MELT IS ALSO OCCURRING AND WILL ADD TO THE FLOODING.") #end ## ${WMOId} ${vtecOffice} 000000 ${BBBId} @@ -54,11 +58,11 @@ ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} ############################################################################# ## Flash Flood Emergency Headline -- Coming soon to a warning near you! # ############################################################################# -#if(${list.contains(${bullets}, "ffwEmergency")} ) -#set($ctaSelected = "YES") -...FLASH FLOOD EMERGENCY FOR !** LOCATION **!... - -#end +###if(${list.contains(${bullets}, "ffwEmergency")} ) +###set($ctaSelected = "YES") +##...FLASH FLOOD EMERGENCY FOR !** LOCATION **!... +## +###end #headlineext(${officeLoc}, ${backupSite}, ${extend}) ################################# @@ -72,13 +76,7 @@ FLASH FLOOD WARNING FOR... #if(${hycType} != "") ${hycType} #end -###REMMED OUT FOR ALASKA #firstBullet(${areas}) -###UNCOMMENT NEXT LINE for AK - Temp fix until hydro shapefiles can be created -###!**INSERT RIVER/STREAM OR AREA**! IN !**INSERT GEO AREA**! -###UNCOMMENT BELOW FOR A ZONE BASED PRODUCT USING COUNTY HEADLINES -###firstBullet(${affectedCounties}) -############# GP end ################################# ####### SECOND BULLET ########### @@ -94,15 +92,11 @@ THIS IS A TEST MESSAGE. ## ################################# ######## THIRD BULLET ########### ################################# -#set($s1 = "DOPPLER RADAR ") -#set($s2 = "INDICATED ") -#set($s3 = "HEAVY RAIN") -#set($overPhrase = "OVER") -#set($nearPhrase = "NEAR") +#set($report = "HEAVY RAIN IS OCCURRING. !** ADD MORE DETAIL HERE **!") #if(${list.contains(${bullets}, "flash")} ) - #set($isExpected = "FLASH FLOODING IS ALREADY OCCURRING. ") + #set($isExpected = "FLASH FLOODING IS ALREADY OCCURRING.") #else - #set($isExpected = "FLASH FLOODING IS EXPECTED TO BEGIN SHORTLY. ") + #set($isExpected = "FLASH FLOODING IS EXPECTED TO BEGIN SHORTLY.") #end #if(${list.contains(${bullets}, "burnScar")} ) #set($burnScar = "EXCESSIVE RAINFALL OVER THE BURN SCAR WILL RESULT IN DEBRIS FLOW MOVING THROUGH THE !** DRAINAGE **!. THE DEBRIS FLOW CAN CONSIST OF ROCK...MUD...VEGETATION AND OTHER LOOSE MATERIALS.") @@ -118,278 +112,97 @@ THIS IS A TEST MESSAGE. ## #end #set($rainAmount = "") #if(${list.contains(${bullets}, "rain1")} ) - #set($rainAmount = "UP TO ONE INCH OF RAIN HAS ALREADY FALLEN. ") + #set($rainAmount = "UP TO ONE INCH OF RAIN HAS ALREADY FALLEN.") #end #if(${list.contains(${bullets}, "rain2")} ) - #set($rainAmount = "UP TO TWO INCHES OF RAIN HAVE ALREADY FALLEN. ") + #set($rainAmount = "UP TO TWO INCHES OF RAIN HAVE ALREADY FALLEN.") #end #if(${list.contains(${bullets}, "rain3")} ) - #set($rainAmount = "UP TO THREE INCHES OF RAIN HAVE ALREADY FALLEN. ") + #set($rainAmount = "UP TO THREE INCHES OF RAIN HAVE ALREADY FALLEN.") #end #if(${list.contains(${bullets}, "rainEdit")} ) - #set($rainAmount = "!** RAINFALL AMOUNTS **! INCHES OF RAIN HAVE FALLEN. ") + #set($rainAmount = "!** RAINFALL AMOUNTS **! INCHES OF RAIN HAVE FALLEN.") #end #if(${list.contains(${bullets}, "doppler")}) - #set($s1 = "DOPPLER RADAR ") - #set($s2 = "INDICATED ") - #set($s3 = "HEAVY RAIN") - #set($nearPhrase = "NEAR") - #set($overPhrase = "OVER") + #set($report = "DOPPLER RADAR INDICATED HEAVY RAIN ACROSS THE WARNED AREA.") #end #if(${list.contains(${bullets}, "doppler")} && ${list.contains(${bullets}, "thunder")}) - #set($s1 = "DOPPLER RADAR ") - #set($s2 = "INDICATED ") - #if(${stormType} == "line") - #set($s3 = "THUNDERSTORMS PRODUCING HEAVY RAIN") - #else - #set($s3 = "A THUNDERSTORM PRODUCING HEAVY RAIN") - #end - #set($nearPhrase = "NEAR") - #set($overPhrase = "OVER") + #set($report = "DOPPLER RADAR INDICATED THUNDERSTORMS PRODUCING HEAVY RAIN ACROSS THE WARNED AREA.") #end #if(${list.contains(${bullets}, "dopplerGauge")}) - #set($s1 = "DOPPLER RADAR AND AUTOMATED RAIN GAUGES ") - #set($s2 = "INDICATED ") - #set($s3 = "HEAVY RAIN FALLING") - #set($nearPhrase = "NEAR") - #set($overPhrase = "OVER") + #set($report = "DOPPLER RADAR AND AUTOMATED RAIN GAUGES INDICATED THAT HEAVY RAIN WAS FALLING OVER THE AREA.") #end #if(${list.contains(${bullets}, "dopplerGauge")} && ${list.contains(${bullets}, "thunder")}) - #set($s1 = "DOPPLER RADAR AND AUTOMATED RAIN GAUGES ") - #set($s2 = "INDICATED ") - #if(${stormType} == "line") - #set($s3 = "THUNDERSTORMS PRODUCING HEAVY RAIN") - #else - #set($s3 = "A THUNDERSTORM PRODUCING HEAVY RAIN") - #end - #set($nearPhrase = "NEAR") - #set($overPhrase = "OVER") + #set($report = "DOPPLER RADAR AND AUTOMATED RAIN GAUGES INDICATED THUNDERSTORMS PRODUCING HEAVY RAIN OVER THE AREA.") #end #if(${list.contains(${bullets}, "trainedSpotters")}) - #set($s1 = "TRAINED WEATHER SPOTTERS ") - #set($s2 = "REPORTED ") - #set($s3 = "FLASH FLOODING") - #set($nearPhrase = "IN") - #set($overPhrase = "IN") + #set($report = "TRAINED WEATHER SPOTTERS REPORTED HEAVY RAIN IN !** LOCATION **!.") #end #if(${list.contains(${bullets}, "trainedSpotters")} && ${list.contains(${bullets}, "thunder")}) - #set($s1 = "TRAINED WEATHER SPOTTERS ") - #set($s2 = "REPORTED ") - #if(${stormType} == "line") - #set($s3 = "THUNDERSTORMS PRODUCING HEAVY RAIN") - #else - #set($s3 = "A THUNDERSTORM PRODUCING HEAVY RAIN") - #end - #set($nearPhrase = "IN") - #set($overPhrase = "IN") + #set($report = "TRAINED WEATHER SPOTTERS REPORTED THUNDERSTORMS PRODUCING HEAVY RAIN IN !** LOCATION **!.") #end #if(${list.contains(${bullets}, "trainedSpotters")} && ${list.contains(${bullets}, "flash")}) - #set($s1 = "TRAINED WEATHER SPOTTERS ") - #set($s2 = "REPORTED ") - #set($s3 = "FLASH FLOODING") - #set($nearPhrase = "IN") - #set($overPhrase = "IN") + #set($report = "TRAINED WEATHER SPOTTERS REPORTED FLASH FLOODING OCCURRING IN !** LOCATION **!.") #end #if(${list.contains(${bullets}, "trainedSpotters")} && ${list.contains(${bullets}, "plainRain")}) - #set($s1 = "TRAINED WEATHER SPOTTERS ") - #set($s2 = "REPORTED ") - #set($s3 = "HEAVY RAIN") - #set($nearPhrase = "IN") - #set($overPhrase = "IN") + #set($report = "TRAINED WEATHER SPOTTERS REPORTED HEAVY RAIN IN !** LOCATION **!.") #end #if(${list.contains(${bullets}, "public")}) - #set($s1 = "THE PUBLIC ") - #set($s2 = "REPORTED ") - #set($s3 = "FLASH FLOODING") - #set($nearPhrase = "IN") - #set($overPhrase = "IN") + #set($report = "THE PUBLIC REPORTED HEAVY RAIN IN !** LOCATION **!") #end #if(${list.contains(${bullets}, "public")} && ${list.contains(${bullets}, "thunder")}) - #set($s1 = "THE PUBLIC ") - #set($s2 = "REPORTED ") - #if(${stormType} == "line") - #set($s3 = "THUNDERSTORMS PRODUCING HEAVY RAIN") - #else - #set($s3 = "A THUNDERSTORM PRODUCING HEAVY RAIN") - #end - #set($nearPhrase = "IN") - #set($overPhrase = "IN") + #set($report = "THE PUBLIC REPORTED HEAVY RAIN FROM THUNDERSTORMS IN !** LOCATION **!.") #end #if(${list.contains(${bullets}, "public")} && ${list.contains(${bullets}, "flash")}) - #set($s1 = "THE PUBLIC ") - #set($s2 = "REPORTED ") - #set($s3 = "FLASH FLOODING") - #set($nearPhrase = "IN") - #set($overPhrase = "IN") + #set($report = "THE PUBLIC REPORTED FLASH FLOODING OCCURRING IN !** LOCATION **!.") #end #if(${list.contains(${bullets}, "public")} && ${list.contains(${bullets}, "plainRain")}) - #set($s1 = "THE PUBLIC ") - #set($s2 = "REPORTED ") - #set($s3 = "HEAVY RAIN") - #set($nearPhrase = "IN") - #set($overPhrase = "IN") + #set($report = "THE PUBLIC REPORTED HEAVY RAIN IN !** LOCATION **!.") #end #if(${list.contains(${bullets}, "lawEnforcement")}) - #set($s1 = "LOCAL LAW ENFORCEMENT ") - #set($s2 = "REPORTED ") - #set($s3 = "HEAVY RAIN") - #set($nearPhrase = "IN") - #set($overPhrase = "IN") + #set($report = "LOCAL LAW ENFORCEMENT REPORTED HEAVY RAIN OVER !** LOCATION **!.") #end #if(${list.contains(${bullets}, "lawEnforcement")} && ${list.contains(${bullets}, "thunder")}) - #set($s1 = "LOCAL LAW ENFORCEMENT ") - #set($s2 = "REPORTED ") - #if(${stormType} == "line") - #set($s3 = "THUNDERSTORMS PRODUCING HEAVY RAIN") - #else - #set($s3 = "A THUNDERSTORM PRODUCING HEAVY RAIN") - #end - #set($nearPhrase = "IN") - #set($overPhrase = "IN") + #set($report = "LOCAL LAW ENFORCEMENT REPORTED HEAVY RAIN DUE TO THUNDERSTORMS OVER !** LOCATION **!.") #end #if(${list.contains(${bullets}, "lawEnforcement")} && ${list.contains(${bullets}, "flash")}) - #set($s1 = "LOCAL LAW ENFORCEMENT ") - #set($s2 = "REPORTED ") - #set($s3 = "FLASH FLOODING") - #set($nearPhrase = "IN") - #set($overPhrase = "IN") + #set($report = "LOCAL LAW ENFORCEMENT REPORTED FLASH FLOODING IS OCCURRING IN !** LOCATION **!.") #end #if(${list.contains(${bullets}, "lawEnforcement")} && ${list.contains(${bullets}, "plainRain")}) - #set($s1 = "LOCAL LAW ENFORCEMENT ") - #set($s2 = "REPORTED ") - #set($s3 = "HEAVY RAIN") - #set($nearPhrase = "IN") - #set($overPhrase = "IN") + #set($report = "LOCAL LAW ENFORCEMENT REPORTED HEAVY RAIN IN !** LOCATION **!.") #end #if(${list.contains(${bullets}, "emergencyManagement")}) - #set($s1 = "EMERGENCY MANAGEMENT ") - #set($s2 = "REPORTED ") - #set($s3 = "HEAVY RAIN") - #set($nearPhrase = "IN") - #set($overPhrase = "IN") + #set($report = "EMERGENCY MANAGEMENT REPORTED HEAVY RAIN OVER !** LOCATION **! ") #end #if(${list.contains(${bullets}, "emergencyManagement")} && ${list.contains(${bullets}, "thunder")}) - #set($s1 = "EMERGENCY MANAGEMENT ") - #set($s2 = "REPORTED ") - #if(${stormType} == "line") - #set($s3 = "THUNDERSTORMS PRODUCING HEAVY RAIN") - #else - #set($s3 = "A THUNDERSTORM PRODUCING HEAVY RAIN") - #end - #set($nearPhrase = "IN") - #set($overPhrase = "IN") + #set($report = "EMERGENCY MANAGEMENT REPORTED HEAVY RAIN DUE TO THUNDERSTORMS OVER !** LOCATION **!.") #end #if(${list.contains(${bullets}, "emergencyManagement")} && ${list.contains(${bullets}, "flash")}) - #set($s1 = "EMERGENCY MANAGEMENT ") - #set($s2 = "REPORTED ") - #set($s3 = "FLASH FLOODING") - #set($nearPhrase = "IN") - #set($overPhrase = "IN") + #set($report = "EMERGENCY MANAGEMENT REPORTED FLASH FLOODING IN !** LOCATION **!.") #end #if(${list.contains(${bullets}, "emergencyManagement")} && ${list.contains(${bullets}, "plainRain")}) - #set($s1 = "EMERGENCY MANAGEMENT ") - #set($s2 = "REPORTED ") - #set($s3 = "HEAVY RAIN") - #set($nearPhrase = "IN") - #set($overPhrase = "IN") + #set($report = "EMERGENCY MANAGEMENT REPORTED HEAVY RAIN IN !** LOCATION **!.") #end #if(${list.contains(${bullets}, "satellite")}) - #set($s1 = "SATELLITE ESTIMATES ") - #set($s2 = "INDICATED ") - #set($s3 = "HEAVY RAIN") - #set($nearPhrase = "NEAR") - #set($overPhrase = "OVER") + #set($report = "SATELLITE ESTIMATES INDICATED HEAVY RAIN.") #end #if(${list.contains(${bullets}, "satellite")} && ${list.contains(${bullets}, "thunder")}) - #set($s1 = "SATELLITE ESTIMATES ") - #set($s2 = "INDICATED ") - #if(${stormType} == "line") - #set($s3 = "THUNDERSTORMS PRODUCING HEAVY RAIN") - #else - #set($s3 = "A THUNDERSTORM PRODUCING HEAVY RAIN") - #end - #set($nearPhrase = "NEAR") - #set($overPhrase = "OVER") + #set($report = "SATELLITE ESTIMATES INDICATED THUNDERSTORMS PRODUCING HEAVY RAIN OVER THE WARNED AREA.") #end #if(${list.contains(${bullets}, "satelliteGauge")}) - #set($s1 = "SATELLITE ESTIMATES AND RAIN GAUGES ") - #set($s2 = "INDICATED ") - #set($s3 = "HEAVY RAIN FALLING") - #set($nearPhrase = "NEAR") - #set($overPhrase = "OVER") + #set($report = "SATELLITE ESTIMATES AND AUTOMATED RAIN GAUGES INDICATED THAT HEAVY RAIN WAS FALLING OVER THE WARNED AREA.") #end #if(${list.contains(${bullets}, "satelliteGauge")} && ${list.contains(${bullets}, "thunder")}) - #set($s1 = "SATELLITE ESTIMATES AND RAIN GAUGES ") - #set($s2 = "INDICATED ") - #if(${stormType} == "line") - #set($s3 = "THUNDERSTORMS PRODUCING HEAVY RAIN") - #else - #set($s3 = "A THUNDERSTORM PRODUCING HEAVY RAIN") - #end - #set($nearPhrase = "NEAR") - #set($overPhrase = "OVER") -#end -#if(${list.contains(${bullets}, "onlyGauge")}) - #set($s1 = "GAUGE REPORTS ") - #set($s2 = "INDICATED ") - #set($s3 = "HEAVY RAIN FALLING") - #set($nearPhrase = "NEAR") - #set($overPhrase = "OVER") -#end -#if(${list.contains(${bullets}, "onlyGauge")} && ${list.contains(${bullets}, "thunder")}) - #set($s1 = "GAUGE REPORTS ") - #set($s2 = "INDICATED ") - #if(${stormType} == "line") - #set($s3 = "THUNDERSTORMS PRODUCING HEAVY RAIN") - #else - #set($s3 = "A THUNDERSTORM PRODUCING HEAVY RAIN") - #end - #set($nearPhrase = "NEAR") - #set($overPhrase = "OVER") -#end -#if(${list.contains(${bullets}, "onlyGauge")} && ${list.contains(${bullets}, "plain rain")}) - #set($s1 = "GAUGE REPORTS ") - #set($s2 = "INDICATED ") - #set($nearPhrase = "NEAR") - #set($overPhrase = "OVER") + #set($report = "SATELLITE ESTIMATES AND AUTOMATED RAIN GAUGES INDICATED THUNDERSTORMS WERE PRODUCING HEAVY RAIN OVER THE WARNED AREA.") #end * ## #if(${productClass}=="T") THIS IS A TEST MESSAGE. ## #end -#thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) -...${s1}${s2}${s3} ## -############# IF TRACK IS ENABLED AND stormPosition SELECTED ############################################### -#if(${list.contains(${bullets},"stormPosition")}) -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase}, 6, ${overPhrase}, 2, "MILES", false) -. ## -#if(${list.contains(${bullets}, "flash")}) -#set($skip = "") -#else -#if(${movementSpeed} < 3 || ${stationary}) -#if(${list.contains(${bullets}, "thunder")}) -THE STORM IS NEARLY STATIONARY. ## -#else -THE RAIN WILL CONTINUE. ## -#end -#else -#if(${stormType} == "line") -#if(${list.contains(${bullets}, "thunder")}) -THE STORMS ARE MOVING ## -#else -THE STORM IS MOVING ## -#end -#else -THE RAIN IS MOVING ## -#end -#direction(${movementDirectionRounded}) AT ${mathUtil.roundTo5(${movementSpeed})} MPH. ## -#end -#end -#else -!** LOCATION **! ## -#end -${rainAmount}${isExpected}${snowMelt}${burnScar} +#thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone})...${report} ${rainAmount} ${isExpected} ${snowMelt} + +#wrapText(${burnScar} 2 2) ########################################################################## ## Flash Flood Emergency per NWS 10-922 Directive goes with third bullet # @@ -403,23 +216,10 @@ ${rainAmount}${isExpected}${snowMelt}${burnScar} ############################################################# ######## FOURTH BULLET (OPTIONAL IN FLOOD PRODUCTS) ######### ############################################################# -############# IF TRACK IS ENABLED AND trackStorm AND stormPosition BOTH SELECTED ############################################### -#if(${list.contains(${bullets},"pathcast")}) -* ## -#if(${productClass}=="T") -THIS IS A TEST MESSAGE. ## -#end -#if($movementSpeed < 3 ) -#pathCast("HEAVY RAIN WILL CONTINUE OVER THE FOLLOWING LOCATIONS..." "HEAVY RAIN" ${pathCast} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 0) - -#else -#pathCast("HEAVY RAIN WILL MOVE OVER THE FOLLOWING LOCATIONS..." "HEAVY RAIN" ${pathCast} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 0) - -#end -#end -################ #if(${list.contains(${bullets}, "listofcities")}) +#set($phenomena = "FLASH FLOOD") #set($floodType = "FLASH FLOODING") +#set($warningType = "WARNING") * ## #if(${productClass}=="T") THIS IS A TEST MESSAGE. ## @@ -449,9 +249,8 @@ FLOOD WATERS ARE MOVING DOWN !**name of channel**! FROM !**location**! TO !**loc #end -## parse file command here is to pull in mile marker and/or point marker info +## parse file command here is to pull in mile marker info ## #parse("mileMarkers.vm") -## #parse("pointMarkers.vm") #################################### END OF ADDITIONAL STUFF ################################### ###################################### @@ -560,18 +359,13 @@ PLEASE REPORT FLOODING TO YOUR LOCAL LAW ENFORCEMENT AGENCY WHEN YOU CAN DO SO S ########################################## ########BOTTOM OF THE PRODUCT############# ########################################## -######################## -## LAT/LON, TML, SIGN ## -######################## #if(${productClass}=="T") THIS IS A TEST MESSAGE. DO NOT TAKE ACTION BASED ON THIS MESSAGE. #end - -#printcoords(${areaPoly}, ${list}) - +#set($COORDS = "#printcoords(${areaPoly}, ${list})") +${COORDS} $$ - -#parse("forecasterName.vm") \ No newline at end of file +#parse("forecasterName.vm") diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/flashFloodWarning.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/flashFloodWarning.xml index db363c2f88..037ac9c54e 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/flashFloodWarning.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/flashFloodWarning.xml @@ -1,30 +1,18 @@ - - - - - - - - - - mi mph @@ -59,11 +47,6 @@ turned on unless the corresponding .vm file is turned on in a given template's . true - - false - @@ -75,20 +58,13 @@ Must be paired with proper vm code (also commented out in flashFloodWarning.vm)! 180 + 30 60 90 120 - 150 180 - 210 240 - 270 - 300 - 330 360 - 390 - 420 - 450 480 @@ -102,18 +78,17 @@ Must be paired with proper vm code (also commented out in flashFloodWarning.vm)! - - + + - - - + + - @@ -123,9 +98,7 @@ Must be paired with proper vm code (also commented out in flashFloodWarning.vm)! - - + @@ -140,7 +113,7 @@ Must be paired with proper vm code (also commented out in flashFloodWarning.vm)! - + @@ -154,16 +127,14 @@ Must be paired with proper vm code (also commented out in flashFloodWarning.vm)! - - - + + - @@ -173,14 +144,15 @@ Must be paired with proper vm code (also commented out in flashFloodWarning.vm)! - - - + + + + + @@ -201,19 +173,17 @@ Must be paired with proper vm code (also commented out in flashFloodWarning.vm)! - - + + - - - + + - @@ -223,10 +193,10 @@ Must be paired with proper vm code (also commented out in flashFloodWarning.vm)! - - - + + + + @@ -246,6 +216,118 @@ Must be paired with proper vm code (also commented out in flashFloodWarning.vm)! + + + County + 0 + AND + 0 + COUNTYNAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + FIPS + NAME + + parent + + + + + + + 25 + + + + + true + 8.0 + 5 + 5 + 4 + 8 + Name + AREA + COUNTYNAME + + STATE + STATE + countyTypes.txt + + distance + + + + + + + + + + + + + 1 + NAME + AREA + POINTS + true + 30 + 200 + + + + + + + + + + warngenlev + population + distance + + + + + + NAME + AREA + POINTS + true + 50 + 10 + + distance + + + + + + + + + + + + + + + false + + + WarnGenLoc + County + + States + TIMEZONES + TIME_ZONE + + ffmp_basins 0.064 diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/flashFloodWarningFollowup.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/flashFloodWarningFollowup.vm index e9c73c7d55..305eac6082 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/flashFloodWarningFollowup.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/flashFloodWarningFollowup.vm @@ -11,11 +11,7 @@ ## Mike Dangelo 9-13-2012 minor tweaks to ${variables} ## Phil Kurimski 2-08-2013 revised CTA statements ## Evan Bookbinder 3-1-2013 missing $$ for Partial Cancellation -## Mike Dangelo 09-18-2013 added code for init pos & pathcasting, and added pointMarkers parse line -## Mike Dangelo 09-19-2013 implemented config.vm -## Gene Petrescu 09-20-2013 added AK modifications (GP comments) #################################### SET SOME VARs ################################### -#parse("config.vm") #set($hycType = "") #set($snowMelt = "") #set($floodReason = "") @@ -57,11 +53,7 @@ ${ugclinecan} /${productClass}.CAN.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire},${timeFormat.ymdthmz})}/ /00000.0.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ #foreach (${area} in ${cancelareas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end #elseif(${CORCAN}=="true") ${ugclinecan} @@ -69,11 +61,7 @@ ${ugclinecan} /${productClass}.COR.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire},${timeFormat.ymdthmz})}/ /00000.0.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ #foreach (${area} in ${cancelareas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end #else ${ugcline} @@ -81,11 +69,7 @@ ${ugcline} /${productClass}.${action}.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ /00000.0.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ #foreach (${area} in ${areas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end #end @@ -120,24 +104,14 @@ ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} #if(${hycType} != "") ${hycType} IN ## #end -###REMMED OUT FOR Alaska. This would output the headline in zone format #headlineLocList(${areas} true true true false) ${expcanHLTag}... -###REPLACE headlineLocList ABOVE WITH THE FOLLOWING FOR ZONE BASED PRODUCT W/ COUNTY HEADLINE -###headlineLocList(${affectedCounties} true true true false) ${expcanHLTag}... -###UNCOMMENT LINE BELOW FOR AK - Temp fix until hydro shapefiles can be created -###!**INSERT RIVER/STREAM OR AREA**! IN !**INSERT GEO AREA**! ${expcanHLTag}... ## SLIGHTLY DIFFERENT VARIABLE FOR PARTIAL CANCELLATION HEADLINE #elseif(${action}=="CANCON" || ${CORCAN}=="true") ...THE FLASH FLOOD WARNING FOR ## #if(${hycType} != "") ${hycType} IN ## #end -###REMMED OUT FOR Alaska. This would output the headline in zone format #headlineLocList(${cancelareas} true true true false) ${expcanHLTag}... -###REPLACE headlineLocList ABOVE WITH THE FOLLOWING FOR ZONE BASED PRODUCT W/ COUNTY HEADLINE -###headlineLocList(${cancelaffectedCounties} true true true false) ${expcanHLTag}... -###UNCOMMENT LINE BELOW FOR AK - Temp fix until hydro shapefiles can be created -###!**INSERT RIVER/STREAM OR AREA**! IN !**INSERT GEO AREA**! ${expcanHLTag}... #end ############################ ## END CAN/EXP HEADLINE #### @@ -166,11 +140,7 @@ ${ugcline} /${productClass}.CON.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz})}/ /00000.0.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ #foreach (${area} in ${areas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} @@ -186,11 +156,7 @@ ${ugcline} /${productClass}.COR.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz})}/ /00000.0.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ #foreach (${area} in ${areas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} @@ -207,26 +173,21 @@ ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} #if(${productClass}=="T") THIS IS A TEST MESSAGE.## #end -################################### -## Flash Flood Emergency Headline # -################################### +...THE FLASH FLOOD WARNING ## +#if(${hycType} != "") +FOR ${hycType} ## +#end +REMAINS IN EFFECT #secondBullet(${dateUtil},${expire},${timeFormat},${localtimezone},${secondtimezone}) FOR ## +#headlineLocList(${areas} true true true false)... +############################################################################### +## Flash Flood Emergency per NWS 10-922 Directive goes after initial headline # +############################################################################### #if(${list.contains(${bullets}, "ffwEmergency")}) #set($ctaSelected = "YES") ...THIS IS A FLASH FLOOD EMERGENCY FOR !**ENTER LOCATION**!... #end -...THE FLASH FLOOD WARNING ## -#if(${hycType} != "") -FOR ${hycType} ## -#end -REMAINS IN EFFECT #secondBullet(${dateUtil},${expire},${timeFormat},${localtimezone},${secondtimezone}) FOR ## -###REMMED OUT FOR Alaska. This would output the headline in zone format -#headlineLocList(${areas} true true true false)... -###REPLACE LINE ABOVE WITH THE FOLLOWING IF YOU USE COUNTY HEADLINE INSTEAD OF ZONES -###headlineLocList(${affectedCounties} true true true false)... -###UNCOMMENT LINE BELOW for AK - Temp fix until hydro shapefiles can be created -###!**INSERT RIVER/STREAM OR AREA**! IN !**INSERT GEO AREA**!... ################################################ ################################# @@ -336,76 +297,19 @@ REMAINS IN EFFECT #secondBullet(${dateUtil},${expire},${timeFormat},${localtimez #if(${list.contains(${bullets}, "satelliteGauge")} && ${list.contains(${bullets}, "thunder")}) #set($report = "SATELLITE ESTIMATES AND AUTOMATED RAIN GAUGES INDICATED THAT THUNDERSTORMS WERE PRODUCING HEAVY RAIN OVER THE WARNED AREA.") #end -#if(${list.contains(${bullets}, "onlyGauge")}) - #set($report = "GAUGE REPORTS INDICATED THAT HEAVY RAIN WAS FALLING OVER THE WARNED AREA.") -#end -#if(${list.contains(${bullets}, "onlyGauge")} && ${list.contains(${bullets}, "thunder")}) - #set($report = "GAUGE REPORTS INDICATED THUNDERSTORMS WERE PRODUCING HEAVY RAIN OVER THE WARNED AREA.") -#end -#if(${list.contains(${bullets}, "onlyGauge")} && ${list.contains(${bullets}, "plainRain")}) - #set($report = "GAUGE REPORTS INDICATED HEAVY RAIN WAS FALLING OVER THE WARNED AREA.") -#end #if(${productClass}=="T") THIS IS A TEST MESSAGE. ## #end -############## IF TRACK IS ENABLED AND stormPosition SELECTED ############################################### -#if(${list.contains(${bullets},"stormPosition")}) #thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) -#if(${stormType} == "line") -...A LINE OF THUNDERSTORMS PRODUCING HEAVY RAIN WAS LOCATED ## -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxLandNearDistance}, ${overPhrase}, ${maxLandOverDistance}, ${landDistanceUnits}, ${useSecondReferenceLine}) -#else -...A THUNDERSTORM PRODUCING HEAVY RAIN WAS LOCATED ## -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxLandNearDistance}, ${overPhrase}, ${maxLandOverDistance}, ${landDistanceUnits}, ${useSecondReferenceCell}) -#end -#if(${movementSpeed} < ${landStationary} || ${stationary}) -...AND IS STATIONARY. ## -#else -#if(${stormType} == "line") -...AND MOVING ## -#else -...MOVING ## -#end -#direction(${movementDirectionRounded}) AT ${mathUtil.roundTo5(${movementSpeed})} MPH. ## -#end -${rainAmount} ${isExpected} ${snowMelt} -#else -###############IF TRACK IS NOT ENABLED OR stormPosition IS NOT SELECTED ####################################### -#thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone})...${report} ${rainAmount} ${isExpected} ${snowMelt} -#end - -########################## -## Flash Flood Emergency # -########################## -#if(${list.contains(${bullets}, "ffwEmergency")} ) -#set($ctaSelected = "YES") -THIS IS A FLASH FLOOD EMERGENCY FOR !** LOCATION **!. SEEK HIGHER GROUND NOW! -#end +...${report} ${rainAmount} ${isExpected} ${snowMelt} ${burnScar} -###################################################### -######## OPTIONAL LOCATIONS/CITY LIST INFO ########## -###################################################### -############# IF TRACK IS ENABLED AND trackStorm AND stormPosition BOTH SELECTED ############################################### -#if(${list.contains(${bullets},"pathcast")} && ${list.contains(${bullets}, "stormPosition")}) -#if(${productClass}=="T") -THIS IS A TEST MESSAGE. ## -#end -#if($movementSpeed < 3 ) -#pathCast("HEAVY RAIN WILL CONTINUE OVER THE FOLLOWING LOCATIONS..." "HEAVY RAIN" ${pathCast} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 0) - -#else -#pathCast("HEAVY RAIN WILL MOVE OVER THE FOLLOWING LOCATIONS..." "HEAVY RAIN" ${pathCast} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 0) - -#end -#end -################ +############################################ +######## (CITY LIST) ######### +############################################ #if(${list.contains(${bullets}, "listofcities")}) -###set($phenomena = "FLASH FLOOD") -#set($floodType = "FLASH FLOODING") -###set($warningType = "WARNING") #if(${productClass}=="T") THIS IS A TEST MESSAGE. ## #end @@ -419,7 +323,7 @@ THIS IS A TEST MESSAGE. ## ########### KEEP TWO BLANK LINES BELOW -########################################## END OF OPTIONAL LOCATIONS LISTS ############################## +########################################## END OF OPTIONAL FOURTH BULLET ############################## ###################################### ###### WHERE ADDITIONAL INFO GOES #### ###################################### @@ -438,8 +342,6 @@ FLOOD WATERS ARE MOVING DOWN !**name of channel**! FROM !**location**! TO !**loc ## parse file command here is to pull in mile marker info ## #parse("mileMarkers.vm") -## Uncomment below pull in point marker info -## #parse("pointMarkers.vm") #################################### END OF ADDITIONAL STUFF ################################### ###################################### @@ -545,16 +447,16 @@ PLEASE REPORT FLOODING TO YOUR LOCAL LAW ENFORCEMENT AGENCY WHEN YOU CAN DO SO S #end #################################### END OF CTA STUFF ################################### -######################## -## LAT/LON, TML, SIGN ## -######################## + +########################################## +########BOTTOM OF THE PRODUCT############# +########################################## #if(${productClass}=="T") THIS IS A TEST MESSAGE. DO NOT TAKE ACTION BASED ON THIS MESSAGE. #end - -#printcoords(${areaPoly}, ${list}) - +#set($COORDS = "#printcoords(${areaPoly}, ${list})") +${COORDS} $$ #end diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/flashFloodWarningFollowup.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/flashFloodWarningFollowup.xml index 9284ac84ea..078b34d0da 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/flashFloodWarningFollowup.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/flashFloodWarningFollowup.xml @@ -1,30 +1,19 @@ - - - - - - - - - - mi mph @@ -60,11 +49,6 @@ turned on unless the corresponding .vm file is turned on in a given template's . true - -false - 30 @@ -99,19 +83,17 @@ Must be paired with proper vm code (also commented out in flashFloodWarningFollo - - + + - - - + + - @@ -121,10 +103,10 @@ Must be paired with proper vm code (also commented out in flashFloodWarningFollo - - - + + + + @@ -154,16 +136,14 @@ Must be paired with proper vm code (also commented out in flashFloodWarningFollo - - - + + - @@ -173,10 +153,10 @@ Must be paired with proper vm code (also commented out in flashFloodWarningFollo - + + + - @@ -196,6 +176,118 @@ Must be paired with proper vm code (also commented out in flashFloodWarningFollo + false + + + + County + 0 + AND + 0 + COUNTYNAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + FIPS + NAME + + parent + + + + + + + 25 + + + + + true + 8.0 + 5 + 5 + 4 + 8 + Name + AREA + COUNTYNAME + + STATE + STATE + countyTypes.txt + + distance + + + + + + + + + + + + + NAME + 1 + AREA + POINTS + true + 30 + 200 + + + + + + + + + + warngenlev + population + distance + + + + + + NAME + AREA + POINTS + true + 10 + 200 + + name + + + + + + + + + + + + + + + + WarnGenLoc + County + + States + TIMEZONES + TIME_ZONE + + ffmp_basins 0.064 diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.vm new file mode 100644 index 0000000000..7acabc6992 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.vm @@ -0,0 +1,456 @@ +#################################################### +## FLASH FLOOD STATEMENT for ZONES ## +#################################################### +## Modified by MIKE DANGELO 9-19-2011 at Alaska TIM ## +## Overhauled by Phil Kurimski 09-23-2011 to reflect work +## done in August. +## Edited by Mike Dangelo 01-26-2012 at CRH TIM +## Edited by Phil Kurimski 2-29-2012 +## Mike Dangelo 9-13-2012 minor tweaks to ${variables} +#################################### SET SOME VARs ################################### +#set($hycType = "") +#set($snowMelt = "") +#set($floodReason = "") +#set($floodType = "FLASH FLOODING") +#set($burnCTA = "") +###OVERRIDE DEFAULT EXECESSIVE RAINFALL IF NECESSARY +#if(${list.contains(${bullets}, "icrs")}) + #set($hycType = "RAIN AND SNOW MELT") + #set($floodReason = " RAPID SNOW MELT IS ALSO OCCURRING AND WILL ADD TO THE ${floodType}.") +#end +## +###################################################################################### +${WMOId} ${vtecOffice} 000000 ${BBBId} +FFS${siteId} +#if(${productClass}=="T") +TEST...FLASH FLOOD STATEMENT...TEST +#else +FLASH FLOOD STATEMENT +#end +NATIONAL WEATHER SERVICE ${officeShort} +#backupText(${backupSite}) +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +#if(${action}=="COR" && ${cancelareas}) +#set($CORCAN = "true") +#else +#set($CORCAN = "false") +#end +#if(${action}=="CANCON") +${ugclinecan} +################### VTEC/COUNTY LINE ################## +/${productClass}.CAN.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire},${timeFormat.ymdthmz})}/ +/00000.0.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ +#set($zoneList = "") +#foreach (${area} in ${cancelareas}) +#set($zoneList = "${zoneList}${area.name}-") +#end +${zoneList} +#elseif(${CORCAN}=="true") +${ugclinecan} +################### VTEC/COUNTY LINE ################## +/${productClass}.COR.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire},${timeFormat.ymdthmz})}/ +/00000.0.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ +#set($zoneList = "") +#foreach (${area} in ${cancelareas}) +#set($zoneList = "${zoneList}${area.name}-") +#end +${zoneList} +#else +${ugcline} +################### VTEC/COUNTY LINE ################## +/${productClass}.${action}.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ +/00000.0.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ +#set($zoneList = "") +#foreach (${area} in ${areas}) +#set($zoneList = "${zoneList}${area.name}-") +#end +${zoneList} +#end + +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +#if(${productClass}=="T") +...THIS MESSAGE IS FOR TEST PURPOSES ONLY... + +#end +################################################################# +################################################################# +## LETS START WITH EXPIRATION AND CANCELLATION SEGMENTS ##### +################################################################# +################################################################# +### CREATE PHRASING DEPENDING ON WHETHER WE ISSUE EXP PRIOR TO EXPIRATION TIME OR NOT +#if(${now.compareTo(${expire})} >= 0 && ${action}=="EXP" ) + #set($expcanHLTag = "HAS EXPIRED") + #set($expcanBODYTag = "HAS BEEN ALLOWED TO EXPIRE") +#elseif(${action}=="EXP") + #set($expcanHLTag = "WILL EXPIRE AT ${dateUtil.format(${expire}, ${timeFormat.clock}, 15, ${localtimezone})}") + #set($expcanBODYTag = "WILL BE ALLOWED TO EXPIRE") +#elseif(${action}=="CAN" || ${action}=="CANCON" || ${CORCAN}=="true") + #set($expcanHLTag = "IS CANCELLED") + #set($expcanBODYTag = "HAS BEEN CANCELLED") +#end +################################ +#### CREATE HEADLINES ########## +################################ +## +#if(${action}=="EXP" || ${action}=="CAN") +...THE FLASH FLOOD WARNING FOR ## +#if(${hycType} != "") +${hycType} IN ## +#end +##REMMED OUT FOR Alaska. This would output the headline in zone format +###headlineLocList(${areas} true true true false) +##REPLACE LINE ABOVE WITH THE FOLLOWING IF YOU USE COUNTY HEADLINE INSTEAD OF ZONES +###headlineLocList(${affectedCounties} true true true false) +!**INSERT RIVER/STREAM OR AREA**! IN !**INSERT GEO AREA**! + ${expcanHLTag}... +## SLIGHTLY DIFFERENT VARIABLE FOR PARTIAL CANCELLATION HEADLINE +#elseif(${action}=="CANCON" || ${CORCAN}=="true") +...THE FLASH FLOOD WARNING FOR ## +#if(${hycType} != "") +${hycType} IN ## +#end +##REMMED OUT FOR Alaska. This would output the headline in zone format +###headlineLocList(${cancelareas} true true true false) +##REPLACE LINE ABOVE WITH THE FOLLOWING IF YOU USE COUNTY HEADLINE INSTEAD OF ZONES +###headlineLocList(${cancelaffectedCounties} true true true false) +!**INSERT RIVER/STREAM OR AREA**! IN !**INSERT GEO AREA**! + ${expcanHLTag}... +#end +############################ +## END CAN/EXP HEADLINE #### +############################ +####################################### +## EXPIRATION/CANCELLATION STATEMENT ## +####################################### + +#if(${action}=="EXP" || ${action} == "CAN" || ${action}=="CANCON" || ${CORCAN}=="true") +#if(${list.contains(${bullets}, "recedingWater")}) +FLOOD WATERS HAVE RECEDED...AND ARE NO LONGER EXPECTED TO POSE A THREAT TO LIFE OR PROPERTY. PLEASE CONTINUE TO HEED ANY ROAD CLOSURES. +#elseif(${list.contains(${bullets}, "rainEnded")}) +THE HEAVY RAIN HAS ENDED...AND FLOODING IS NO LONGER EXPECTED TO POSE A THREAT. +#else +!** THE HEAVY RAIN HAS ENDED. !** OR **! THE FLOOD WATER IS RECEDING. THEREFORE...THE FLOODING THREAT HAS ENDED. **!" +#end + +#printcoords(${areaPoly}, ${list}) + + +$$ +#end +#################################### END OF CAN STUFF ################################### +#### IF PARTIAL CANCELLATION, INSERT 2ND UGC/MND SECTION PRIOR TO CON PORTION +######################################################################################### +#if(${action}=="CANCON") + + +${ugcline} +/${productClass}.CON.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz})}/ +/00000.0.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ +#set($zoneList = "") +#foreach (${area} in ${areas}) +#set($zoneList = "${zoneList}${area.name}-") +#end +${zoneList} + +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +#if(${productClass}=="T") +...THIS MESSAGE IS FOR TEST PURPOSES ONLY... + +#end +#elseif(${CORCAN}) + + +${ugcline} +/${productClass}.COR.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz})}/ +/00000.0.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ +#set($zoneList = "") +#foreach (${area} in ${areas}) +#set($zoneList = "${zoneList}${area.name}-") +#end +${zoneList} + +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +#if(${productClass}=="T") +...THIS MESSAGE IS FOR TEST PURPOSES ONLY... + +#end +#end +############################ +## CONTINUATION STATEMENT ## +############################ +#if(${action}=="CANCON" || ${action}=="CON" || ${action}=="COR" || ${CORCAN}=="true") +#if(${productClass}=="T") +THIS IS A TEST MESSAGE.## +#end +...A FLASH FLOOD WARNING ## +#if(${hycType} != "") +FOR ${hycType} ## +#end +REMAINS IN EFFECT #secondBullet(${dateUtil},${expire},${timeFormat},${localtimezone},${secondtimezone}) FOR ## +##REMMED OUT FOR Alaska. This would output the headline in zone format +###headlineLocList(${cancelareas} true true true false)... +##REPLACE LINE ABOVE WITH THE FOLLOWING IF YOU USE COUNTY HEADLINE INSTEAD OF ZONES +###headlineLocList(${cancelaffectedCounties} true true true false)... +!**INSERT RIVER/STREAM OR AREA**! IN !**INSERT GEO AREA**!... + +############################################################################### +## Flash Flood Emergency per NWS 10-922 Directive goes after initial headline # +############################################################################### +#if(${list.contains(${bullets}, "ffwEmergency")}) + +...A FLASH FLOOD EMERGENCY FOR !**ENTER LOCATION**!... + +#end + +################################################ +################################# +######## THIRD BULLET ########### +################################# +#set($reportType = "HEAVY RAIN") +#set($rainAmount = "") +#set($report = "HEAVY RAIN IS OCCURRING. !** ADD MORE DETAIL HERE **!") +#if(${list.contains(${bullets}, "flash")} ) + #set($isExpected = "FLASH FLOODING IS ALREADY OCCURRING") +#else + #set($isExpected = "FLASH FLOODING IS EXPECTED TO BEGIN SHORTLY") +#end +#if(${list.contains(${bullets}, "burnScar")} ) + #set($burnScar = "EXCESSIVE RAINFALL OVER THE BURN SCAR WILL RESULT IN DEBRIS FLOW MOVING THROUGH THE !** DRAINAGE **!. THE DEBRIS FLOW CAN CONSIST OF ROCK...MUD...VEGETATION AND OTHER LOOSE MATERIALS.") + #set($burnCTA = "PERSONS IN THE VICINITY OF !** DRAINAGE **! SHOULD EVACUATE IMMEDIATELY.") + #set($ctaSelected = "YES") +#elseif(${list.contains(${bullets}, "mudSlide")} ) + #set($burnScar = "EXCESSIVE RAINFALL OVER THE WARNING AREA WILL CAUSE MUD SLIDES NEAR STEEP TERRAIN. THE MUD SLIDE CAN CONSIST OF ROCK...MUD...VEGETATION AND OTHER LOOSE MATERIALS.") + #set($burnCTA = "PERSONS IN THE VICINITY OF !** DRAINAGE **! SHOULD EVACUATE IMMEDIATELY.") + #set($ctaSelected = "YES") +#else + #set($burnScar = "") + #set($burnCTA = "") +#end +#if(${list.contains(${bullets}, "rain1")} ) + #set($rainAmount = "UP TO ONE INCH OF RAIN HAS ALREADY FALLEN.") +#end +#if(${list.contains(${bullets}, "rain2")} ) + #set($rainAmount = "UP TO TWO INCHES OF RAIN HAS ALREADY FALLEN.") +#end +#if(${list.contains(${bullets}, "rain3")} ) + #set($rainAmount = "UP TO THREE INCHES OF RAIN HAS ALREADY FALLEN.") +#end +#if(${list.contains(${bullets}, "rainEdit")} ) + #set($rainAmount = "!** RAINFALL AMOUNTS **! INCHES OF RAIN HAS ALREADY FALLEN.") +#end +#if(${list.contains(${bullets}, "doppler")}) + #set($report = "DOPPLER RADAR INDICATED HEAVY RAIN. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "doppler")} && ${list.contains(${bullets}, "thunder")}) + #set($report = "DOPPLER RADAR INDICATED HEAVY RAIN DUE TO A THUNDERSTORM. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "doppler")} && ${list.contains(${bullets}, "thunder")} && ${stormType} == "line") + #set($report = "DOPPLER RADAR INDICATED HEAVY RAIN DUE TO THUNDERSTORMS. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "dopplerGauge")}) + #set($report = "DOPPLER RADAR AND AUTOMATED RAIN GAUGES INDICATED THAT HEAVY RAIN WAS FALLING OVER THE AREA. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "dopplerGauge")} && ${list.contains(${bullets}, "thunder")}) + #set($report = "DOPPLER RADAR AND AUTOMATED RAIN GAUGES INDICATED THAT A THUNDERSTORM IS PRODUCING HEAVY RAIN OVER THE AREA. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "dopplerGauge")} && ${list.contains(${bullets}, "thunder")} && ${stormType} == "line") + #set($report = "DOPPLER RADAR AND AUTOMATED RAIN GAUGES INDICATED THAT A LINE OF THUNDERSTORMS IS PRODUCING HEAVY RAIN OVER THE AREA. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "trainedSpotters")}) + #set($report = "TRAINED WEATHER SPOTTERS REPORTED HEAVY RAIN IN !** LOCATION **! ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "trainedSpotters")} && ${list.contains(${bullets}, "thunder")}) + #set($report = "TRAINED WEATHER SPOTTERS REPORTED HEAVY RAIN IN !** LOCATION **! DUE TO A THUNDERSTORM. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "trainedSpotters")} && ${list.contains(${bullets}, "flash")}) + #set($report = "TRAINED WEATHER SPOTTERS REPORTED FLASH FLOODING IN !** LOCATION **!. ${rainAmount}") +#end +#if(${list.contains(${bullets}, "trainedSpotters")} && ${list.contains(${bullets}, "plainRain")}) + #set($report = "TRAINED WEATHER SPOTTERS REPORTED HEAVY RAIN IN !** LOCATION **!. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "lawEnforcement")}) + #set($report = "LOCAL LAW ENFORCEMENT REPORTED HEAVY RAIN OVER !** LOCATION **!. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "lawEnforcement")} && ${list.contains(${bullets}, "thunder")}) + #set($report = "LOCAL LAW ENFORCEMENT REPORTED HEAVY RAIN DUE TO A THUNDERSTORM OVER !** LOCATION **!. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "lawEnforcement")} && ${list.contains(${bullets}, "flash")}) + #set($report = "LOCAL LAW ENFORCEMENT REPORTED FLASH FLOODING IN !** LOCATION **!. ${rainAmount}") +#end +#if(${list.contains(${bullets}, "lawEnforcement")} && ${list.contains(${bullets}, "plainRain")}) + #set($report = "LOCAL LAW ENFORCEMENT REPORTED HEAVY RAIN IN !** LOCATION **!. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "emergencyManagement")}) + #set($report = "EMERGENCY MANAGEMENT REPORTED HEAVY RAIN OVER !** LOCATION **! ") +#end +#if(${list.contains(${bullets}, "emergencyManagement")} && ${list.contains(${bullets}, "thunder")}) + #set($report = "EMERGENCY MANAGEMENT REPORTED HEAVY RAIN DUE TO THUNDERSTORMS OVER !** LOCATION **!.") +#end +#if(${list.contains(${bullets}, "emergencyManagement")} && ${list.contains(${bullets}, "flash")}) + #set($report = "EMERGENCY MANAGEMENT REPORTED FLASH FLOODING IN !** LOCATION **!.") +#end +#if(${list.contains(${bullets}, "emergencyManagement")} && ${list.contains(${bullets}, "plainRain")}) + #set($report = "EMERGENCY MANAGEMENT REPORTED HEAVY RAIN IN !** LOCATION **!.") +#end +#if(${list.contains(${bullets}, "public")}) + #set($report = "HEAVY RAIN HAS BEEN REPORTED IN !** LOCATION **!. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "public")} && ${list.contains(${bullets}, "thunder")}) + #set($report = "HEAVY RAIN FROM THUNDERSTORMS HAS BEEN REPORTED IN !** LOCATION **!. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "public")} && ${list.contains(${bullets}, "flash")}) + #set($report = "FLASH FLOODING HAS BEEN REPORTED IN !** LOCATION **!.") +#end +#if(${list.contains(${bullets}, "public")} && ${list.contains(${bullets}, "plainRain")}) + #set($report = "HEAVY RAIN HAS BEEN REPORTED IN !** LOCATION **!. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "satellite")}) + #set($report = "SATELLITE ESTIMATES INDICATED HEAVY RAIN. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "satellite")} && ${list.contains(${bullets}, "thunder")}) + #set($report = "SATELLITE ESTIMATES INDICATED HEAVY RAIN DUE TO A THUNDERSTORM. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "satellite")} && ${list.contains(${bullets}, "thunder")} && ${stormType} == "line") + #set($report = "SATELLITE ESTIMATES INDICATED HEAVY RAIN DUE TO THUNDERSTORMS. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "satelliteGauge")}) + #set($report = "SATELLITE ESTIMATES AND AUTOMATED RAIN GAUGES INDICATED THAT HEAVY RAIN WAS FALLING OVER THE AREA. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "satelliteGauge")} && ${list.contains(${bullets}, "thunder")}) + #set($report = "SATELLITE ESTIMATES AND AUTOMATED RAIN GAUGES INDICATED THAT A THUNDERSTORM IS PRODUCING HEAVY RAIN OVER THE AREA. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "satelliteGauge")} && ${list.contains(${bullets}, "thunder")} && ${stormType} == "line") + #set($report = "SATELLITE ESTIMATES AND AUTOMATED RAIN GAUGES INDICATED THAT A LINE OF THUNDERSTORMS IS PRODUCING HEAVY RAIN OVER THE AREA. ${rainAmount} ${isExpected}") +#end + +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +#thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) +...${report}. ${snowMelt} + +${burnScar} + +############################################ +######## (CITY LIST) ######### +############################################ +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +#### THE THIRD ARGUMENT IS A NUMBER SPECIFYING THE NUMBER OF COLUMNS TO OUTPUT THE CITIES LIST IN +#### 0 IS A ... SEPARATED LIST, 1 IS ONE PER LINE, >1 IS A COLUMN FORMAT +#### IF YOU USE SOMETHING OTHER THAN "LOCATIONS IMPACTED INCLUDE" LEAD IN BELOW, MAKE SURE THE +#### ACCOMPANYING XML FILE PARSE STRING IS CHANGED TO MATCH! +#locationsList("SOME LOCATIONS THAT WILL EXPERIENCE FLOODING INCLUDE" ${floodType} 0 ${cityList} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 0) + +########################################## END OF OPTIONAL FOURTH BULLET ############################## +###################################### +###### WHERE ADDITIONAL INFO GOES #### +###################################### + +#if(${list.contains(${bullets}, "addRainfall")}) +ADDITIONAL RAINFALL AMOUNTS OF !** EDIT AMOUNT **! ARE POSSIBLE IN THE WARNED AREA. + +#end +#if(${list.contains(${bullets}, "drainages")}) +#drainages(${riverdrainages}) + +#end + +## parse file command here is to pull in mile marker info +## #parse("mileMarkers.vm") + +#################################### END OF ADDITIONAL STUFF ################################### +###################################### +####### CALL TO ACTIONS ############## +###################################### +##Check to see if we've selected any calls to action. +#foreach (${bullet} in ${bullets}) +#if(${bullet.endsWith("CTA")}) +#set($ctaSelected = "YES") +#end +#end +## +#if(${ctaSelected} == "YES") +PRECAUTIONARY/PREPAREDNESS ACTIONS... + +#end + +${burnCTA} + +#if(${list.contains(${bullets}, "urbanFloodingCTA")}) +EXCESSIVE RUNOFF FROM HEAVY RAINFALL WILL CAUSE FLOODING OF SMALL CREEKS AND STREAMS...URBAN AREAS...HIGHWAYS...STREETS AND UNDERPASSES AS WELL AS OTHER DRAINAGE AREAS AND LOW LYING SPOTS. + +#end +#if(${list.contains(${bullets}, "ruralFloodingCTA")}) +EXCESSIVE RUNOFF FROM HEAVY RAINFALL WILL CAUSE FLOODING OF SMALL CREEKS AND STREAMS...COUNTRY ROADS...AS WELL AS FARMLAND AS WELL AS OTHER DRAINAGE AREAS AND LOW LYING SPOTS. + +#end +#if(${list.contains(${bullets}, "ruralUrbanCTA")}) +EXCESSIVE RUNOFF FROM HEAVY RAINFALL WILL CAUSE FLOODING OF SMALL CREEKS AND STREAMS...HIGHWAYS AND UNDERPASSES. ADDITIONALLY...COUNTRY ROADS AND FARMLANDS ALONG THE BANKS OF CREEKS...STREAMS AND OTHER LOW LYING AREAS ARE SUBJECT TO FLOODING. + +#end +#if(${list.contains(${bullets}, "particularStreamCTA")}) +FLOOD WATERS ARE MOVING DOWN !**name of channel**! FROM !**location**! TO !**location**!. THE FLOOD CREST IS EXPECTED TO REACH !**location(s)**! BY !**time(s)**!. + +#end +#if(${list.contains(${bullets}, "nighttimeCTA")}) +BE ESPECIALLY CAUTIOUS AT NIGHT WHEN IT IS HARDER TO RECOGNIZE THE DANGERS OF FLOODING. IF FLASH FLOODING IS OBSERVED ACT QUICKLY. MOVE UP TO HIGHER GROUND TO ESCAPE FLOOD WATERS. DO NOT STAY IN AREAS SUBJECT TO FLOODING WHEN WATER BEGINS RISING. + +#end +#if(${list.contains(${bullets}, "dontDriveCTA")}) +DO NOT DRIVE YOUR VEHICLE INTO AREAS WHERE THE WATER COVERS THE ROADWAY. THE WATER DEPTH MAY BE TOO GREAT TO ALLOW YOUR CAR TO CROSS SAFELY. MOVE TO HIGHER GROUND. + +#end +#if(${list.contains(${bullets}, "turnAroundCTA")}) +MOST FLOOD DEATHS OCCUR IN AUTOMOBILES. NEVER DRIVE YOUR VEHICLE INTO AREAS WHERE THE WATER COVERS THE ROADWAY. FLOOD WATERS ARE USUALLY DEEPER THAN THEY APPEAR. JUST ONE FOOT OF FLOWING WATER IS POWERFUL ENOUGH TO SWEEP VEHICLES OFF THE ROAD. WHEN ENCOUNTERING FLOODED ROADS MAKE THE SMART CHOICE...TURN AROUND...DONT DROWN. + +#end +#if(${list.contains(${bullets}, "autoSafetyCTA")}) +FLOODING IS OCCURRING OR IS IMMINENT. MOST FLOOD RELATED DEATHS OCCUR IN AUTOMOBILES. DO NOT ATTEMPT TO CROSS WATER COVERED BRIDGES...DIPS... OR LOW WATER CROSSINGS. NEVER TRY TO CROSS A FLOWING STREAM...EVEN A SMALL ONE...ON FOOT. TO ESCAPE RISING WATER FIND ANOTHER ROUTE OVER HIGHER GROUND. + +#end +#if(${list.contains(${bullets}, "camperSafetyCTA")}) +FLOODING IS OCCURRING OR IS IMMINENT. IT IS IMPORTANT TO KNOW WHERE YOU ARE RELATIVE TO STREAMS...RIVERS...OR CREEKS WHICH CAN BECOME KILLERS IN HEAVY RAINS. CAMPERS AND HIKERS SHOULD AVOID STREAMS OR CREEKS. + +#end +#if(${list.contains(${bullets}, "lowSpotsCTA")}) +IN HILLY TERRAIN THERE ARE HUNDREDS OF LOW WATER CROSSINGS WHICH ARE POTENTIALLY DANGEROUS IN HEAVY RAIN. DO NOT ATTEMPT TO TRAVEL ACROSS FLOODED ROADS. FIND AN ALTERNATE ROUTE. IT TAKES ONLY A FEW INCHES OF SWIFTLY FLOWING WATER TO CARRY VEHICLES AWAY. + +#end +#if(${list.contains(${bullets}, "ffwMeansCTA")}) +A FLASH FLOOD WARNING MEANS THAT FLOODING IS IMMINENT OR OCCURRING. IF YOU ARE IN THE WARNING AREA MOVE TO HIGHER GROUND IMMEDIATELY. RESIDENTS LIVING ALONG STREAMS AND CREEKS SHOULD TAKE IMMEDIATE PRECAUTIONS TO PROTECT LIFE AND PROPERTY. DO NOT ATTEMPT TO CROSS SWIFTLY FLOWING WATERS OR WATERS OF UNKNOWN DEPTH BY FOOT OR BY AUTOMOBILE. + +#end +#if(${list.contains(${bullets}, "powerFloodCTA")}) +DO NOT UNDERESTIMATE THE POWER OF FLOOD WATERS. ONLY A FEW INCHES OF RAPIDLY FLOWING WATER CAN QUICKLY CARRY AWAY YOUR VEHICLE. + +#end +#if(${list.contains(${bullets}, "reportFloodingCTA")}) +TO REPORT FLOODING...HAVE THE NEAREST LAW ENFORCEMENT AGENCY RELAY YOUR REPORT TO THE NATIONAL WEATHER SERVICE. + +#end +#if(${ctaSelected} == "YES") +&& + +#end +#################################### END OF CTA STUFF ################################### + +########################################## +########BOTTOM OF THE PRODUCT############# +########################################## +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. DO NOT TAKE ACTION BASED ON THIS MESSAGE. + +#end +#printcoords(${areaPoly}, ${list}) + + +$$ +#end + +#parse("forecasterName.vm") diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.xml new file mode 100644 index 0000000000..bd603b5472 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.xml @@ -0,0 +1,332 @@ + + + + + + + + + mi + mph + + + + Forecast Zones + + + + + + + + COR + CON + CAN + EXP + + + + + FF.W + + + + false + + + true + + + + 30 + + 30 + + +ic + + + + + + + + + + + + + + + + + + + + + + + + + + + + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +false + + + + + + + + + + + Zone + HATCHING + 0 + AND + 0 + NAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + + STATE_ZONE + NAME + + parent + + + + + + + 25 + + + + + County + INTERSECT + 0 + AND + 0 + COUNTYNAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + FIPS + NAME + + parent + + + + + + + 25 + + + + + true + 8.0 + 5 + 5 + 4 + 8 + Name + AREA + + NAME + STATE + STATE + countyTypes.txt + + distance + + + + + + + + + + + + + NAME + 1 + AREA + POINTS + true + 30 + 200 + + + + + + + + + + warngenlev + population + distance + + + + + + NAME + AREA + POINTS + true + 10 + 200 + + name + + + + + + + + + + + + + + + + WarnGenLoc + + Zone + States + TIMEZONES + TIME_ZONE + + + + ffmp_basins + 0.064 + streamname + + + + + + true + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/flashFloodWarning_Zones.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/flashFloodWarning_Zones.vm new file mode 100644 index 0000000000..2ed327655a --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/flashFloodWarning_Zones.vm @@ -0,0 +1,347 @@ +############################################################ +## FLASH FLOOD WARNING TEMPLATE FOR COUNTY-BASED PRODUCTS ## +############################################################ +## EDITED BY MIKE DANGELO 7-13-2011 ## +## Edited by Phil Kurimski 8-15-2011 for OB11.8 ## +## EDITED BY MIKE DANGELO 9-21-2011 at Alaska TIM ## +## EDITED BY PHIL KURIMSKI 9-23-2011 at Alaska TIM for burn scars and mud slides ## +## EDITED BY PHIL KURIMSKI 2-29-2012 +## Mike Dangelo 9-13-2012 minor tweaks to ${variables} +#################################### SET SOME VARIABLES ################################### +#set($hycType = "") +## +#if(${action} == "EXT") + #set($starttime = "000000T0000Z") + #set($extend = true) +#else + #set($starttime = ${dateUtil.format(${start}, ${timeFormat.ymdthmz})}) + #set($extend = false) +#end +## +#if(${list.contains(${bullets}, "icrs")}) + #set($ic = "RS") + #set($snowMelt = "RAPID SNOW MELT IS ALSO OCCURRING AND WILL ADD TO THE FLOODING.") + #set($hycType = "RAIN AND SNOW MELT IN...") +#else + #set($ic = "ER") + #set($snowMelt = "") +#end +## +${WMOId} ${vtecOffice} 000000 ${BBBId} +FFW${siteId} +${ugcline} +#################################### VTEC LINE ################################### +/${productClass}.${action}.${vtecOffice}.FF.W.${etn}.${starttime}-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ +/00000.0.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ + +#################################### MND HEADER ################################### +BULLETIN - EAS ACTIVATION REQUESTED +#if(${productClass}=="T") +TEST...FLASH FLOOD WARNING...TEST +#else +FLASH FLOOD WARNING +#end +NATIONAL WEATHER SERVICE ${officeShort} +#backupText(${backupSite}) +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +#if(${productClass}=="T") +...THIS MESSAGE IS FOR TEST PURPOSES ONLY... + +#end + +############################################################################# +## Flash Flood Emergency Headline -- Coming soon to a warning near you! # +############################################################################# +###if(${list.contains(${bullets}, "ffwEmergency")} ) +##...FLASH FLOOD EMERGENCY FOR !** LOCATION **!... +## +###end +#headlineext(${officeLoc}, ${backupSite}, ${extend}) + +################################# +######## FIRST BULLET ########### +################################# +* ## +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +FLASH FLOOD WARNING FOR... +#if(${hycType} != "") + ${hycType} +#end +##REMMED OUT FOR ALASKA +###firstBullet(${areas}) +##REPLACE LINE ABOVE WITH THE FOLLOWING IF YOU USE COUNTY HEADLINE INSTEAD OF ZONES +###firstBullet(${affectedCounties}) +!**INSERT RIVER/STREAM OR AREA**! IN !**INSERT GEO AREA**! + +################################# +####### SECOND BULLET ########### +################################# + +* ## +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +#secondBullet(${dateUtil},${expire},${timeFormat},${localtimezone},${secondtimezone}) + +################################################ +################################# +######## THIRD BULLET ########### +################################# +#set($report = "HEAVY RAIN IS OCCURRING. !** ADD MORE DETAIL HERE **!") +#if(${list.contains(${bullets}, "flash")} ) + #set($isExpected = "FLASH FLOODING IS ALREADY OCCURRING.") +#else + #set($isExpected = "FLASH FLOODING IS EXPECTED TO BEGIN SHORTLY.") +#end +#if(${list.contains(${bullets}, "burnScar")} ) + #set($burnScar = "EXCESSIVE RAINFALL OVER THE BURN SCAR WILL RESULT IN DEBRIS FLOW MOVING THROUGH THE !** DRAINAGE **!. THE DEBRIS FLOW CAN CONSIST OF ROCK...MUD...VEGETATION AND OTHER LOOSE MATERIALS.") + #set($burnCTA = "PERSONS IN THE VICINITY OF !** DRAINAGE **! SHOULD EVACUATE IMMEDIATELY.") + #set($ctaSelected = "YES") +#elseif(${list.contains(${bullets}, "mudSlide")} ) + #set($burnScar = "EXCESSIVE RAINFALL OVER THE WARNING AREA WILL CAUSE MUD SLIDES NEAR STEEP TERRAIN. THE MUD SLIDE CAN CONSIST OF ROCK...MUD...VEGETATION AND OTHER LOOSE MATERIALS.") + #set($burnCTA = "PERSONS IN THE VICINITY OF !** DRAINAGE **! SHOULD EVACUATE IMMEDIATELY.") + #set($ctaSelected = "YES") +#else + #set($burnScar = "") + #set($burnCTA = "") +#end +#set($rainAmount = "") +#if(${list.contains(${bullets}, "rain1")} ) + #set($rainAmount = "UP TO ONE INCH OF RAIN HAS ALREADY FALLEN.") +#end +#if(${list.contains(${bullets}, "rain2")} ) + #set($rainAmount = "UP TO TWO INCHES OF RAIN HAVE ALREADY FALLEN.") +#end +#if(${list.contains(${bullets}, "rain3")} ) + #set($rainAmount = "UP TO THREE INCHES OF RAIN HAVE ALREADY FALLEN.") +#end +#if(${list.contains(${bullets}, "rainEdit")} ) + #set($rainAmount = "!** RAINFALL AMOUNTS **! INCHES OF RAIN HAVE ALREADY FALLEN.") +#end +#if(${list.contains(${bullets}, "doppler")}) + #set($report = "DOPPLER RADAR INDICATED HEAVY RAIN. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "doppler")} && ${list.contains(${bullets}, "thunder")}) + #set($report = "DOPPLER RADAR INDICATED HEAVY RAIN DUE TO A THUNDERSTORM. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "doppler")} && ${list.contains(${bullets}, "thunder")} && ${stormType} == "line") + #set($report = "DOPPLER RADAR INDICATED HEAVY RAIN DUE TO THUNDERSTORMS. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "dopplerGauge")}) + #set($report = "DOPPLER RADAR AND AUTOMATED RAIN GAUGES INDICATED THAT HEAVY RAIN WAS FALLING OVER THE AREA. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "dopplerGauge")} && ${list.contains(${bullets}, "thunder")}) + #set($report = "DOPPLER RADAR AND AUTOMATED RAIN GAUGES INDICATED THAT A THUNDERSTORM IS PRODUCING HEAVY RAIN OVER THE AREA. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "dopplerGauge")} && ${list.contains(${bullets}, "thunder")} && ${stormType} == "line") + #set($report = "DOPPLER RADAR AND AUTOMATED RAIN GAUGES INDICATED THAT A LINE OF THUNDERSTORMS IS PRODUCING HEAVY RAIN OVER THE AREA. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "trainedSpotters")}) + #set($report = "TRAINED WEATHER SPOTTERS REPORTED HEAVY RAIN IN !** LOCATION **! ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "trainedSpotters")} && ${list.contains(${bullets}, "thunder")}) + #set($report = "TRAINED WEATHER SPOTTERS REPORTED HEAVY RAIN IN !** LOCATION **! DUE TO A THUNDERSTORM. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "trainedSpotters")} && ${list.contains(${bullets}, "flash")}) + #set($report = "TRAINED WEATHER SPOTTERS REPORTED FLASH FLOODING IN !** LOCATION **!. ${rainAmount}") +#end +#if(${list.contains(${bullets}, "trainedSpotters")} && ${list.contains(${bullets}, "plainRain")}) + #set($report = "TRAINED WEATHER SPOTTERS REPORTED HEAVY RAIN IN !** LOCATION **!. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "lawEnforcement")}) + #set($report = "LOCAL LAW ENFORCEMENT REPORTED HEAVY RAIN OVER !** LOCATION **!. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "lawEnforcement")} && ${list.contains(${bullets}, "thunder")}) + #set($report = "LOCAL LAW ENFORCEMENT REPORTED HEAVY RAIN DUE TO A THUNDERSTORM OVER !** LOCATION **!. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "lawEnforcement")} && ${list.contains(${bullets}, "flash")}) + #set($report = "LOCAL LAW ENFORCEMENT REPORTED FLASH FLOODING IN !** LOCATION **!. ${rainAmount}") +#end +#if(${list.contains(${bullets}, "lawEnforcement")} && ${list.contains(${bullets}, "plainRain")}) + #set($report = "LOCAL LAW ENFORCEMENT REPORTED HEAVY RAIN IN !** LOCATION **!. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "emergencyManagement")}) + #set($report = "EMERGENCY MANAGEMENT REPORTED HEAVY RAIN OVER !** LOCATION **! ") +#end +#if(${list.contains(${bullets}, "emergencyManagement")} && ${list.contains(${bullets}, "thunder")}) + #set($report = "EMERGENCY MANAGEMENT REPORTED HEAVY RAIN DUE TO THUNDERSTORMS OVER !** LOCATION **!.") +#end +#if(${list.contains(${bullets}, "emergencyManagement")} && ${list.contains(${bullets}, "flash")}) + #set($report = "EMERGENCY MANAGEMENT REPORTED FLASH FLOODING IN !** LOCATION **!.") +#end +#if(${list.contains(${bullets}, "emergencyManagement")} && ${list.contains(${bullets}, "plainRain")}) + #set($report = "EMERGENCY MANAGEMENT REPORTED HEAVY RAIN IN !** LOCATION **!.") +#end +#if(${list.contains(${bullets}, "public")}) + #set($report = "HEAVY RAIN HAS BEEN REPORTED IN !** LOCATION **!. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "public")} && ${list.contains(${bullets}, "thunder")}) + #set($report = "HEAVY RAIN FROM THUNDERSTORMS HAS BEEN REPORTED IN !** LOCATION **!. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "public")} && ${list.contains(${bullets}, "flash")}) + #set($report = "FLASH FLOODING HAS BEEN REPORTED IN !** LOCATION **!.") +#end +#if(${list.contains(${bullets}, "public")} && ${list.contains(${bullets}, "plainRain")}) + #set($report = "HEAVY RAIN HAS BEEN REPORTED IN !** LOCATION **!. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "satellite")}) + #set($report = "SATELLITE ESTIMATES INDICATED HEAVY RAIN. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "satellite")} && ${list.contains(${bullets}, "thunder")}) + #set($report = "SATELLITE ESTIMATES INDICATED HEAVY RAIN DUE TO A THUNDERSTORM. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "satellite")} && ${list.contains(${bullets}, "thunder")} && ${stormType} == "line") + #set($report = "SATELLITE ESTIMATES INDICATED HEAVY RAIN DUE TO THUNDERSTORMS. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "satelliteGauge")}) + #set($report = "SATELLITE ESTIMATES AND AUTOMATED RAIN GAUGES INDICATED THAT HEAVY RAIN WAS FALLING OVER THE AREA. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "satelliteGauge")} && ${list.contains(${bullets}, "thunder")}) + #set($report = "SATELLITE ESTIMATES AND AUTOMATED RAIN GAUGES INDICATED THAT A THUNDERSTORM IS PRODUCING HEAVY RAIN OVER THE AREA. ${rainAmount} ${isExpected}") +#end +#if(${list.contains(${bullets}, "satelliteGauge")} && ${list.contains(${bullets}, "thunder")} && ${stormType} == "line") + #set($report = "SATELLITE ESTIMATES AND AUTOMATED RAIN GAUGES INDICATED THAT A LINE OF THUNDERSTORMS IS PRODUCING HEAVY RAIN OVER THE AREA. ${rainAmount} ${isExpected}") +#end + +* ## +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +#thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone})...${report} ${snowMelt} + +#wrapText("${burnScar} 2 2) + +########################################################################## +## Flash Flood Emergency per NWS 10-922 Directive goes with third bullet # +########################################################################## +#if(${list.contains(${bullets}, "ffwEmergency")} ) +#wrapText("THIS IS A FLASH FLOOD EMERGENCY FOR !** LOCATION **!. 2 2) +#end + + +############################################################# +######## FOURTH BULLET (OPTIONAL IN FLOOD PRODUCTS) ######### +############################################################# +#set($phenomena = "FLASH FLOOD") +#set($floodType = "FLASH FLOODING") +#set($warningType = "WARNING") +* ## +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +#### THE THIRD ARGUMENT IS A NUMBER SPECIFYING THE NUMBER OF COLUMNS TO OUTPUT THE CITIES LIST IN +#### 0 IS A ... SEPARATED LIST, 1 IS ONE PER LINE, >1 IS A COLUMN FORMAT +#### IF YOU USE SOMETHING OTHER THAN "LOCATIONS IMPACTED INCLUDE" LEAD IN BELOW, MAKE SURE THE +#### ACCOMPANYING XML FILE PARSE STRING IS CHANGED TO MATCH! +#locationsList("SOME LOCATIONS THAT WILL EXPERIENCE FLOODING INCLUDE" ${floodType} 0 ${cityList} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 0) + +########################################## END OF OPTIONAL FOURTH BULLET ############################## +###################################### +###### WHERE ADDITIONAL INFO GOES #### +###################################### + +#if(${list.contains(${bullets}, "addRainfall")}) +ADDITIONAL RAINFALL AMOUNTS OF !** EDIT AMOUNT **! ARE POSSIBLE IN THE WARNED AREA. + +#end +#if(${list.contains(${bullets}, "drainages")}) +#drainages(${riverdrainages}) + +#end + +## parse file command here is to pull in mile marker info +## #parse("mileMarkers.vm") + +#################################### END OF ADDITIONAL STUFF ################################### +###################################### +####### CALL TO ACTIONS ############## +###################################### +##Check to see if we've selected any calls to action. +#foreach (${bullet} in ${bullets}) +#if(${bullet.endsWith("CTA")}) +#set($ctaSelected = "YES") +#end +#end +## +#if(${ctaSelected} == "YES") +PRECAUTIONARY/PREPAREDNESS ACTIONS... + +#end + +${burnCTA} + +#if(${list.contains(${bullets}, "urbanFloodingCTA")}) +EXCESSIVE RUNOFF FROM HEAVY RAINFALL WILL CAUSE FLOODING OF SMALL CREEKS AND STREAMS...URBAN AREAS...HIGHWAYS...STREETS AND UNDERPASSES AS WELL AS OTHER DRAINAGE AREAS AND LOW LYING SPOTS. + +#end +#if(${list.contains(${bullets}, "ruralFloodingCTA")}) +EXCESSIVE RUNOFF FROM HEAVY RAINFALL WILL CAUSE FLOODING OF SMALL CREEKS AND STREAMS...COUNTRY ROADS...AS WELL AS FARMLAND AS WELL AS OTHER DRAINAGE AREAS AND LOW LYING SPOTS. + +#end +#if(${list.contains(${bullets}, "ruralUrbanCTA")}) +EXCESSIVE RUNOFF FROM HEAVY RAINFALL WILL CAUSE FLOODING OF SMALL CREEKS AND STREAMS...HIGHWAYS AND UNDERPASSES. ADDITIONALLY...COUNTRY ROADS AND FARMLANDS ALONG THE BANKS OF CREEKS...STREAMS AND OTHER LOW LYING AREAS ARE SUBJECT TO FLOODING. + +#end +#if(${list.contains(${bullets}, "particularStreamCTA")}) +FLOOD WATERS ARE MOVING DOWN !**name of channel**! FROM !**location**! TO !**location**!. THE FLOOD CREST IS EXPECTED TO REACH !**location(s)**! BY !**time(s)**!. + +#end +#if(${list.contains(${bullets}, "nighttimeCTA")}) +BE ESPECIALLY CAUTIOUS AT NIGHT WHEN IT IS HARDER TO RECOGNIZE THE DANGERS OF FLOODING. IF FLASH FLOODING IS OBSERVED ACT QUICKLY. MOVE UP TO HIGHER GROUND TO ESCAPE FLOOD WATERS. DO NOT STAY IN AREAS SUBJECT TO FLOODING WHEN WATER BEGINS RISING. + +#end +#if(${list.contains(${bullets}, "dontDriveCTA")}) +DO NOT DRIVE YOUR VEHICLE INTO AREAS WHERE THE WATER COVERS THE ROADWAY. THE WATER DEPTH MAY BE TOO GREAT TO ALLOW YOUR CAR TO CROSS SAFELY. MOVE TO HIGHER GROUND. + +#end +#if(${list.contains(${bullets}, "turnAroundCTA")}) +MOST FLOOD DEATHS OCCUR IN AUTOMOBILES. NEVER DRIVE YOUR VEHICLE INTO AREAS WHERE THE WATER COVERS THE ROADWAY. FLOOD WATERS ARE USUALLY DEEPER THAN THEY APPEAR. JUST ONE FOOT OF FLOWING WATER IS POWERFUL ENOUGH TO SWEEP VEHICLES OFF THE ROAD. WHEN ENCOUNTERING FLOODED ROADS MAKE THE SMART CHOICE...TURN AROUND...DONT DROWN. + +#end +#if(${list.contains(${bullets}, "autoSafetyCTA")}) +FLOODING IS OCCURRING OR IS IMMINENT. MOST FLOOD RELATED DEATHS OCCUR IN AUTOMOBILES. DO NOT ATTEMPT TO CROSS WATER COVERED BRIDGES...DIPS... OR LOW WATER CROSSINGS. NEVER TRY TO CROSS A FLOWING STREAM...EVEN A SMALL ONE...ON FOOT. TO ESCAPE RISING WATER FIND ANOTHER ROUTE OVER HIGHER GROUND. + +#end +#if(${list.contains(${bullets}, "camperSafetyCTA")}) +FLOODING IS OCCURRING OR IS IMMINENT. IT IS IMPORTANT TO KNOW WHERE YOU ARE RELATIVE TO STREAMS...RIVERS...OR CREEKS WHICH CAN BECOME KILLERS IN HEAVY RAINS. CAMPERS AND HIKERS SHOULD AVOID STREAMS OR CREEKS. + +#end +#if(${list.contains(${bullets}, "lowSpotsCTA")}) +IN HILLY TERRAIN THERE ARE HUNDREDS OF LOW WATER CROSSINGS WHICH ARE POTENTIALLY DANGEROUS IN HEAVY RAIN. DO NOT ATTEMPT TO TRAVEL ACROSS FLOODED ROADS. FIND AN ALTERNATE ROUTE. IT TAKES ONLY A FEW INCHES OF SWIFTLY FLOWING WATER TO CARRY VEHICLES AWAY. + +#end +#if(${list.contains(${bullets}, "ffwMeansCTA")}) +A FLASH FLOOD WARNING MEANS THAT FLOODING IS IMMINENT OR OCCURRING. IF YOU ARE IN THE WARNING AREA MOVE TO HIGHER GROUND IMMEDIATELY. RESIDENTS LIVING ALONG STREAMS AND CREEKS SHOULD TAKE IMMEDIATE PRECAUTIONS TO PROTECT LIFE AND PROPERTY. DO NOT ATTEMPT TO CROSS SWIFTLY FLOWING WATERS OR WATERS OF UNKNOWN DEPTH BY FOOT OR BY AUTOMOBILE. + +#end +#if(${list.contains(${bullets}, "powerFloodCTA")}) +DO NOT UNDERESTIMATE THE POWER OF FLOOD WATERS. ONLY A FEW INCHES OF RAPIDLY FLOWING WATER CAN QUICKLY CARRY AWAY YOUR VEHICLE. + +#end +#if(${list.contains(${bullets}, "reportFloodingCTA")}) +TO REPORT FLOODING...HAVE THE NEAREST LAW ENFORCEMENT AGENCY RELAY YOUR REPORT TO THE NATIONAL WEATHER SERVICE. + +#end +#if(${ctaSelected} == "YES") +&& + +#end +#################################### END OF CTA STUFF ################################### + +########################################## +########BOTTOM OF THE PRODUCT############# +########################################## + +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. DO NOT TAKE ACTION BASED ON THIS MESSAGE. + +#end +#printcoords(${areaPoly}, ${list}) + + +$$ + +#parse("forecasterName.vm") diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/flashFloodWarning_Zones.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/flashFloodWarning_Zones.xml new file mode 100644 index 0000000000..472f4dfcdc --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/flashFloodWarning_Zones.xml @@ -0,0 +1,370 @@ + + + + + + + + + + + mi + mph + + + + Forecast Zones + Major Rivers + + + + + NEW + COR + EXT + + + + + FF.W + + + + true + + + true + + + + torWatches + svrWatches + + + + 180 + + 30 + 60 + 90 + 120 + 180 + 240 + 360 + 480 + + +ic + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +false + + + + + + + + + + + Zone + HATCHING + 0 + AND + 0 + NAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + + STATE_ZONE + NAME + + parent + + + + + + + 25 + + + + + County + INTERSECT + 0 + AND + 0 + COUNTYNAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + FIPS + NAME + + parent + + + + + + + 25 + + + + + true + 8.0 + 5 + 5 + 4 + 8 + Name + AREA + NAME + + STATE + STATE + countyTypes.txt + + distance + + + + + + + + + + + + + NAME + 1 + AREA + POINTS + true + 30 + 200 + + + + + + + + + + warngenlev + population + distance + + + + + + NAME + AREA + TRACK + true + 50 + 10 + + + + + + + + + + distance + + + + + + + + + + WarnGenLoc + + Zone + States + TIMEZONES + TIME_ZONE + + + + ffmp_basins + 0.064 + streamname + + + + + + true + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/forecasterName.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/forecasterName.vm index 87f146d6b3..a07eb091ca 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/forecasterName.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/forecasterName.vm @@ -1,8 +1,8 @@ ##$user IS A GLOBAL VARIABLE CONTAINING THE WORKSTATION'S LOGIN USERNAME -#if(${user}=="ebookbin") -TEST +#if(${user}=="yourawipslogin") +YOURNAME #elseif(${user}=="hisawipslogin") SOMEONEELSESNAME #else !**NAME/INITIALS**! -#end +#end \ No newline at end of file diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/geospatialConfig_COUNTY.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/geospatialConfig_COUNTY.xml deleted file mode 100644 index cff158ac8e..0000000000 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/geospatialConfig_COUNTY.xml +++ /dev/null @@ -1,202 +0,0 @@ - - - - - County - 0 - AND - 0 - COUNTYNAME - NAME - STATE - FE_AREA - TIME_ZONE - countyTypes.txt - FIPS - NAME - - parent - - - - - - - 0 - - - - - Zone - INTERSECT - 0 - AND - 0 - NAME - NAME - STATE - FE_AREA - TIME_ZONE - countyTypes.txt - STATE_ZONE - NAME - - parent - - - - - - - 0 - - - - - - - NAME - AREA - POINTS - 1 - 100 - - - - - - - - - - distance - warngenlev - population - - - - - - NAME - AREA - POINTS - 5 - 100 - - - - - - - - - - distance - warngenlev - - - - - - AREA - 1 - true - 8.0 - 5 - 5 - 10 - 8 - Name - COUNTYNAME - STATE - STATE - countyTypes.txt - - warngenlev - population - distance - - - - - - - - - - - - - - NAME - 1 - AREA - TRACK - true - 10 - 10 - - distance - - - - - - - - - - - - - - TRACK - NAME - 1 - AREA - true - 20 - 10 - - - - - - - - - - warngenlev - population - distance - - - - - - WarnGenLoc - County - States - TIMEZONES - TIME_ZONE - - - diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/geospatialConfig_MARINE.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/geospatialConfig_MARINE.xml deleted file mode 100644 index 652e170cc0..0000000000 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/geospatialConfig_MARINE.xml +++ /dev/null @@ -1,171 +0,0 @@ - - - - - WarnGenLoc - MarineZones - MarineZones - TIMEZONES - TIME_ZONE - - - - - - MarineZones - 0 - AND - 0 - NAME - NAME - NAME - countyTypes.txt - ID - NAME - - parent - - - - - - - 0 - - - - - - - NAME - AREA - POINTS - 1 - 100 - - - - - - - - - - distance - warngenlev - - - - - - NAME - AREA - POINTS - - - - - - - - - 5 - 100 - - distance - warngenlev - - - - - - AREA - - false - 1 - 10.0 - 5 - 5 - 10 - 8 - Name - Name - Name - Name - countyTypes.txt - - warngenlev - distance - - - - - - - - - - - - - - NAME - 1 - AREA - TRACK - false - 10 - 10 - - distance - - - - - - - - - - - - - - NAME - 1 - AREA - TRACK - false - 20 - 10 - - - - - - - - - - distance - - - \ No newline at end of file diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/geospatialConfig_ZONE.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/geospatialConfig_ZONE.xml deleted file mode 100644 index 8f531db6bc..0000000000 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/geospatialConfig_ZONE.xml +++ /dev/null @@ -1,207 +0,0 @@ - - - - - WarnGenLoc - Zone - States - TIMEZONES - TIME_ZONE - - - - - - Zone - 0 - AND - 0 - NAME - NAME - STATE - FE_AREA - TIME_ZONE - countyTypes.txt - STATE_ZONE - NAME - - parent - - - - - - - 0 - - - - - COUNTY - INTERSECT - 0 - AND - 0 - COUNTYNAME - NAME - STATE - FE_AREA - TIME_ZONE - countyTypes.txt - FIPS - NAME - - parent - - - - - - - 0 - - - - - - - NAME - AREA - POINTS - 1 - 100 - - - - - - - - - - distance - warngenlev - - - - - - NAME - AREA - POINTS - 5 - 100 - - - - - - - - - - distance - warngenlev - - - - - - AREA - 1 - true - 8.0 - 5 - 5 - 10 - 8 - Name - NAME - STATE - STATE - countyTypes.txt - - warngenlev - population - distance - - - - - - - - - - - - - - NAME - 1 - AREA - TRACK - true - 10 - 10 - - distance - - - - - - - - - - - - - - NAME - 1 - AREA - TRACK - true - 20 - 10 - - - - - - - - - - warngenlev - population - distance - - - - - - - - diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSevereThunderstormWarning.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSevereThunderstormWarning.vm index 6a74dfd0e5..2747fc4bb3 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSevereThunderstormWarning.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSevereThunderstormWarning.vm @@ -1,16 +1,20 @@ -################################################################## -## SEVERE THUNDERSTORM WARNING TEMPLATE ## -## FOR CR IMPACT BASED SVR INITIATIVE ## -## CREATED BY PHIL KURIMSKI - WFO DTX ## -## UPDATED 9-18-2013 Implement global config.vm ## -################################################################## +################################################################ +## SEVERE THUNDERSTORM WARNING TEMPLATE ## +## FOR CR IMPACT BASED SVR INITIATIVE ## +## CREATED BY PHIL KURIMSKI - WFO DTX ## +## VERSION AWIPS II 1.0 -- 2-21-2012 OB12.1.1-1 ## +## VERSION AWIPS II 1.1 -- 2-29-2012 OB12.2.1-4 ## +## VERSION AWIPS II 1.2 -- 4-20-2012 ## +## QINGLU LIN 8-14-2012 DR 14493 use TMLtime ## +## VERSION AWIPS II 1.3 -- 2-04-2012 OB13.2.1-5 impact stmts ## +## VERSION AWIPS II 1.4 -- 5-20-2012 Addl IBW Changes ## +################################################################ ## Commented out Impact statements Feb 2013 and created file to ## be parsed into the template called impactStatements.vm ## Changes to the impact statements can be made to this file ## instead of the template ################################################################ ## -#parse("config.vm") ##SET SOME INITIAL VARIABLES #set($hazard = "") #set($source = "") @@ -350,13 +354,12 @@ THIS IS A TEST MESSAGE. ## #end #thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) ...${reportType3} ## -##Many of the variables passed below are controlled by config.vm #if(${stormType} == "line") -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxLandNearDistance}, ${overPhrase}, ${maxLandOverDistance}, ${landDistanceUnits}, ${useSecondReferenceLine}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "MILES", false) #else -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxLandNearDistance}, ${overPhrase}, ${maxLandOverDistance}, ${landDistanceUnits}, ${useSecondReferenceCell}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "MILES", true) #end -#if(${movementSpeed} < ${landStationary} || ${stationary}) +#if($movementSpeed < 3 || ${stationary}) #if(${stormType} == "line") ...AND ARE NEARLY STATIONARY. #else @@ -421,10 +424,10 @@ THIS IS A TEST MESSAGE. ## ############################################## #if(${list.contains(${bullets}, "specialEvent")}) #if(${stormType} == "line") -THOSE ATTENDING !**event/venue name or location**! ARE IN THE PATH OF THESE STORMS AND SHOULD PREPARE FOR IMMINENT DANGEROUS WEATHER CONDITIONS. SEEK SHELTER NOW. +EVERYONE AT !**event/venue name or location**! ARE IN THE PATH OF THESE STORMS AND SHOULD PREPARE FOR IMMINENT DANGEROUS WEATHER CONDITIONS. SEEK SHELTER NOW. #else -THOSE ATTENDING !**event/venue name or location**! ARE IN THE PATH OF THIS STORM AND SHOULD PREPARE FOR IMMINENT DANGEROUS WEATHER CONDITIONS. SEEK SHELTER NOW. +EVERYONE AT !**event/venue name or location**! ARE IN THE PATH OF THIS STORM AND SHOULD PREPARE FOR IMMINENT DANGEROUS WEATHER CONDITIONS. SEEK SHELTER NOW. #end #end diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSevereThunderstormWarning.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSevereThunderstormWarning.xml index d0bd8e2468..b620ec3999 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSevereThunderstormWarning.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSevereThunderstormWarning.xml @@ -6,24 +6,10 @@ MIKE REGA 5-10-2012 DR 14525 added timeZoneField DR 14691 added feAreaField Evan Bookbinder 09-11-2012 Added settings for locations shapefile - Added new areaSource object - Phil Kurimski 09-19-2013 added geospatialConfig.xml + Added new areaSource object --> - - - - - - - - - mi mph @@ -184,9 +170,10 @@ turned on unless the corresponding .vm file is turned on in a given template's . - - - + + + + @@ -216,4 +203,157 @@ turned on unless the corresponding .vm file is turned on in a given template's . + + + County + 0 + AND + 0 + COUNTYNAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + FIPS + NAME + + parent + + + + + + + 25 + + + + NAME + POINTS + AREA + + + + + + + + + 1 + 100 + + distance + warngenlev + population + + + + + NAME + POINTS + AREA + + + + + + + + + 5 + 100 + + distance + + + + + 1 + true + 8.0 + 5 + 5 + 10 + 8 + Name + AREA + COUNTYNAME + + STATE + STATE + countyTypes.txt + + warngenlev + population + distance + + + + + + + + + + + + + NAME + 1 + AREA + TRACK + true + 20 + 10 + + + + + + + + + + warngenlev + population + distance + + + + + NAME + 1 + AREA + TRACK + true + 10 + 10 + + distance + + + + + + + + + + + + + + + + + WarnGenLoc + County + + States + TIMEZONES + TIME_ZONE + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSevereWeatherStatement.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSevereWeatherStatement.vm index 69093663ea..1896e8cb3f 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSevereWeatherStatement.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSevereWeatherStatement.vm @@ -2,17 +2,20 @@ ## SEVERE WEATHER STATEMENT TEMPLATE ## ## FOR CR IMPACT BASED TOR/SVR INITIATIVE ## ## CREATED BY PHIL KURIMSKI - WFO DTX ## -## UPDATED Evan Bookbinder 2-22-13 2013 IBW Changes ## -## UPDATED -- Kurimski 5-20-13 2013 IBW Changes ## -## UPDATED -- Kurimski 9/17/13 Tor Emer Headline ## -## UPDATED -- Bookbinder 9/18/13 Implement config.vm ## +## VERSION AWIPS II 1.0 -- 2-21-2012 OB12.1.1-1 ## +## VERSION AWIPS II 1.1 -- 2-29-2012 OB12.2.1-4 ## +## VERSION AWIPS II 1.2 -- 4-20-2012 ## +## VERSION AWIPS II 1.3 -- 9-13-2012 OB12.9.1-12 ## +## VERSION AWIPS II 1.4 -- 2-04-2012 OB13.2.1-5 impact stmts ## +## VERSION AWIPS II 1.5 -- Bookbinder 2-22-13 2013 IBW Changes## +## VERSION AWIPS II 1.6 -- Kurimski 5-20-13 2013 IBW Changes ## ################################################################ ## Commented out Impact statements Feb 2013 and created file to ## be parsed into the template called impactStatements.vm ## Changes to the impact statements can be made to this file ## instead of the template ################################################################ -#parse("config.vm") +## ################################################################### ## Set null variables for wind/hail tags used in the template ## ################################################################### @@ -97,33 +100,19 @@ ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} ${ugclinecan} /${productClass}.CAN.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire},${timeFormat.ymdthmz})}/ #foreach (${area} in ${cancelareas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## +${area.name} ${area.stateabbr}-## #end --## -#end - #elseif(${CORCAN}=="true") ${ugclinecan} /${productClass}.COR.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire},${timeFormat.ymdthmz})}/ #foreach (${area} in ${cancelareas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## +${area.name} ${area.stateabbr}-## #end --## -#end - #else ${ugcline} /${productClass}.${action}.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire},${timeFormat.ymdthmz})}/ #foreach (${area} in ${areas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end #end @@ -165,8 +154,6 @@ ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} #elseif(${action}=="CANCON" || ${CORCAN}=="true") ...THE ${eventType} WARNING FOR ## #headlineLocList(${cancelareas} true true true false) ${expcanHLTag}... -###REPLACE headlineLocList ABOVE WITH THE FOLLOWING FOR ZONE BASED PRODUCT W/ COUNTY HEADLINE -###headlineLocList(${cancelaffectedCounties} true true true false) ${expcanHLTag}... #end ############################ ## END CAN/EXP HEADLINE #### @@ -178,12 +165,12 @@ ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} #if(${action}=="EXP" || ${action}=="CAN" || ${action}=="CANCON" || ${CORCAN}=="true") #### SET A DEFAULT STATEMENT IN CASE NO BULLET WAS SELECTED OR AVAILABLE #if(${stormType} == "line") - #set($expcanPhrase = "THE LINE OF STORMS WHICH PROMPTED THE WARNING HAVE !** WEAKENED. MOVED OUT OF THE WARNED AREA.**! THEREFORE THE WARNING ${expcanBODYTag}.") + #set($expcanPhrase = "THE LINE OF STORMS WHICH PROMPTED THE WARNING HAVE !** WEAKENED/MOVED OUT OF THE WARNED AREA **!. THEREFORE THE WARNING ${expcanBODYTag}.") #else #if(${phenomena}=="SV") - #set($expcanPhrase = "THE SEVERE THUNDERSTORM WHICH PROMPTED THE WARNING HAS !** WEAKENED. MOVED OUT OF THE WARNED AREA. **! THEREFORE THE WARNING ${expcanBODYTag}.") + #set($expcanPhrase = "THE SEVERE THUNDERSTORM WHICH PROMPTED THE WARNING HAS !** WEAKENED/MOVED OUT OF THE WARNED AREA **!. THEREFORE THE WARNING ${expcanBODYTag}.") #else - #set($expcanPhrase = "THE TORNADIC THUNDERSTORM WHICH PROMPTED THE WARNING HAS !** WEAKENED. MOVED OUT OF THE WARNED AREA. **! THEREFORE THE WARNING ${expcanBODYTag}.") + #set($expcanPhrase = "THE TORNADIC THUNDERSTORM WHICH PROMPTED THE WARNING HAS !** WEAKENED/MOVED OUT OF THE WARNED AREA **!. THEREFORE THE WARNING ${expcanBODYTag}.") #end #end #### WEAKENED BELOW SEVERE LIMITS @@ -345,11 +332,7 @@ $$ ${ugcline} /${productClass}.CON.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz})}/ #foreach (${area} in ${areas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} @@ -364,11 +347,7 @@ ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} ${ugcline} /${productClass}.COR.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz})}/ #foreach (${area} in ${areas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} @@ -377,19 +356,19 @@ ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} ...THIS MESSAGE IS FOR TEST PURPOSES ONLY... #end -#end -##################################################################### -### TORNADO EMERGENCY HEADLINE # -##################################################################### -#if(${list.contains(${bullets}, "torEmergency")}) - -...TORNADO EMERGENCY FOR !** EDIT LOCATION(S) **!... - #end #if(${action}=="CANCON" || ${action}=="CON" || ${action}=="COR" || ${CORCAN}=="true") ...A ${eventType} WARNING REMAINS IN EFFECT #secondBullet(${dateUtil},${expire},${timeFormat},${localtimezone},${secondtimezone}) FOR ## #headlineLocList(${areas} true true true false)... ########### END NEW HEADLINE CODE #################### +##################################################################### +### TORNADO EMERGENCY PER NWS 10-511 DIRECTIVE # +##################################################################### +#if(${list.contains(${bullets}, "torEmergency")}) + +...THIS IS A TORNADO EMERGENCY FOR !** EDIT LOCATION(S) **!... + +#end #set($reportType = "!** BASIS FOR WARNING **!") #set($reportAuthSVR = "") ############### BASIS SECTION #################### @@ -852,13 +831,12 @@ THIS IS A TEST MESSAGE. ## #thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone})...## ${reportType} LOCATED ## -##Many of the variables passed below are controlled by config.vm #if(${stormType} == "line") -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxLandNearDistance}, ${overPhrase}, ${maxLandOverDistance}, ${landDistanceUnits}, ${useSecondReferenceLine}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "MILES", false) #else -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxLandNearDistance}, ${overPhrase}, ${maxLandOverDistance}, ${landDistanceUnits}, ${useSecondReferenceCell}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "MILES", true) #end -#if(${movementSpeed} < ${landStationary} || ${stationary}) +#if($movementSpeed < 3 || ${stationary}) #if(${stormType} == "line") ...AND ARE NEARLY STATIONARY. #else diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSevereWeatherStatement.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSevereWeatherStatement.xml index 97516c2459..bcf1832654 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSevereWeatherStatement.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSevereWeatherStatement.xml @@ -12,8 +12,7 @@ Evan Bookbinder 09-11-2012 Added settings for locations shapefile Added new areaSource object Phil Kurimski 02-04-2013 OB13.2.1-5 Changed Sig Tor to Considerable - Phil Kurimski 05-20-2013 Added selection for very weak tornadoes and landspouts - Phil Kurimski 09-19-2013 added geospatialConfig.xml + Phil Kurimski 05-20-2013 Added selection for very weak tornadoes and landspouts --> - - - - - - - - - mi mph @@ -244,9 +230,10 @@ turned on unless the corresponding .vm file is turned on in a given template's . - - - + + + + @@ -301,9 +288,10 @@ turned on unless the corresponding .vm file is turned on in a given template's . - - - + + + + @@ -381,9 +369,10 @@ turned on unless the corresponding .vm file is turned on in a given template's . - - - + + + + @@ -437,9 +426,10 @@ turned on unless the corresponding .vm file is turned on in a given template's . - - - + + + + @@ -469,4 +459,156 @@ turned on unless the corresponding .vm file is turned on in a given template's . + + + County + 0 + AND + 0 + COUNTYNAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + FIPS + NAME + + parent + + + + + + + 25 + + + + NAME + POINTS + AREA + + + + + + + + + 1 + 100 + + distance + warngenlev + population + + + + + NAME + POINTS + AREA + + + + + + + + + 5 + 100 + + distance + + + + + 1 + true + 8.0 + 5 + 5 + 10 + 8 + Name + AREA + COUNTYNAME + + STATE + STATE + countyTypes.txt + + warngenlev + population + distance + + + + + + + + + + + + + NAME + 1 + AREA + TRACK + true + 20 + 10 + + + + + + + + + + warngenlev + population + distance + + + + + NAME + 1 + AREA + TRACK + true + 10 + 10 + + distance + + + + + + + + + + + + + + + + WarnGenLoc + States + County + + TIMEZONES + TIME_ZONE + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSpecialMarineWarning.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSpecialMarineWarning.vm deleted file mode 100644 index 7efb6291b3..0000000000 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSpecialMarineWarning.vm +++ /dev/null @@ -1,499 +0,0 @@ -##################################################### -## SPECIAL MARINE WARNING TEMPLATE ## -## FOR CR IMPACT BASED WARNING INITIATIVE ## -## CREATED BY PHIL KURIMSKI - WFO DTX ## -## UPDATED PHIL KURIMSKI -- SEP 17 2013 OB13.5.2-4 ## -## EVAN BOOKBINDER -- SEP 18 2013 Implemented config.vm -###################################################### -#parse("config.vm") -################################################ -## Set null variables used in the template -################################################ -#set($capable = "") -#set($ashfallPath = "") -#set($debrisflowPath = "") -#set($ashfallInfo = "") -#set($debrisflowInfo = "") -#set($ashfallCTA = "") -#set($spoutTag = "") -#set($source = "RADAR INDICATED.") -#set($extraSource = "") -#set($spoutThreat = "") -################################################ -## Set up override for ashfall warning -## This will change Special Marine Warning to -## Ashfall Warning Per the 10-313 Directive -################################################ -#if(${list.contains(${bullets}, "ashfall")}) - #set($ashfallHeadline = "ASHFALL WARNING FOR VOLCANIC ASH AND OTHER HAZARDS FOR...") -#end -################################################ -${WMOId} ${vtecOffice} 000000 ${BBBId} -SMW${siteId} -${ugcline} -/${productClass}.${action}.${vtecOffice}.MA.W.${etn}.${dateUtil.format(${start}, ${timeFormat.ymdthmz})}-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ - -BULLETIN - IMMEDIATE BROADCAST REQUESTED -#if(${productClass}=="T") -TEST...SPECIAL MARINE WARNING...TEST -#else -SPECIAL MARINE WARNING -#end -NATIONAL WEATHER SERVICE ${officeShort} -#backupText(${backupSite}) -${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} - -#if(${productClass}=="T") -...THIS MESSAGE IS FOR TEST PURPOSES ONLY... - -#end -#headline(${officeLoc}, ${backupSite}) - -* ## -#if(${productClass}=="T") -THIS IS A TEST MESSAGE. ## -#end -################################################## -## Override for Ashfall Warning -################################################## -#if(${ashfallHeadline}) -${ashfallHeadline} -#else -SPECIAL MARINE WARNING FOR... -#end -####################################################################### -## Coding to use the raw marine zone output from the shapefiles -## Comment this section out if you are combining your marine zones -####################################################################### -#foreach (${area} in ${areas}) - ## -${area.name}... -#end -####################################################################### -## End of code for raw marine zone output from the shapefiles -####################################################################### -####################################################################### -## The following code will create a string of marine zone fips codes -## which will be important in combining marine zones -####################################################################### -####################################################################### -## Set the fipsstring variable to null for marine zone combinations -####################################################################### -#set($fipsstring = "") -#foreach (${area} in ${areas}) -#set($fipsstring = $fipsstring + $area.fips + "-") -#end -####################################################################### -## Parse in the marineCombo.vm file which contains marine zone combinations -## Uncomment the parse command if you are combining your marine zones -####################################################################### -##parse("marineCombo.vm") -####################################################################### -## End of the marine zone combination script -####################################################################### - -* ## -#if(${productClass}=="T") -THIS IS A TEST MESSAGE. ## -#end -#secondBullet(${dateUtil},${expire},${timeFormat},${localtimezone},${secondtimezone}) - -####################################################################### -## List of Event Types. Added several events such as Shower...Cloud and Front. -## Removed Strong and Severe Thunderstorm selections and placed logic in the -## wind and hail selections that will change wording for Severe Thunderstorms. -####################################################################### -#set($eventType = "THUNDERSTORM") -#if(${list.contains(${bullets}, "thunderstorm")}) - #set($eventType = "THUNDERSTORM") - #set($severeType = "STRONG") -#end -#if(${list.contains(${bullets}, "shower")}) - #set($eventType = "SHOWER") -#end -#if(${list.contains(${bullets}, "cloud")}) - #set($eventType = "CLOUD") -#end -#if(${list.contains(${bullets}, "front")}) - #set($eventType = "FRONT") -#end -#if(${list.contains(${bullets}, "volcano")}) - #set($eventType = "VOLCANO") -#end -####################################################################### -## Added a Threat Section to the template that includes Wind...Hail -## and Waterspout selections. -## Strong Thunderstorm will change to Severe Thunderstorm automatically based on -## selections in Wind...Hail and Waterspout sections. -####################################################################### -#set($windTag = "<34") -#set($windCTA = "GUSTY WINDS") -#if(${list.contains(${bullets}, "34ktWind")}) - #set($windTag = ">34") - #set($windType = "WIND GUSTS 34 KNOTS OR GREATER") - #set($windCTA = "${windType}") -#end -#if(${list.contains(${bullets}, "40ktWind")}) - #set($windTag = "40") - #set($windType = "WIND GUSTS TO 40 KNOTS") - #set($windCTA = "${windType}") -#end -#if(${list.contains(${bullets}, "40ktplusWind")}) - #set($windTag = "49") - #set($windType = "WIND GUSTS TO NEARLY 50 KNOTS") - #set($windCTA = "${windType}") -#end -#if(${list.contains(${bullets}, "50ktWind")}) - #set($windTag = "50") - #set($windType = "WIND GUSTS IN EXCESS OF 50 KNOTS") - #set($severeType = "SEVERE") - #set($windCTA = "${windType}") -#end -#if(${list.contains(${bullets}, "65ktWind")}) - #set($windTag = "65") - #set($windType = "WIND GUSTS IN EXCESS OF 65 KNOTS") - #set($severeType = "SEVERE") - #set($windCTA = "${windType}") -#end -#set($hailTag = "0.00") -#set($hailCTA = "") -#if(${list.contains(${bullets}, "smallHail")}) - #set($hailTag = "<.75") - #set($hailType = "SMALL HAIL") - #set($hailCTA = "...${hailType}") -#end -#if(${list.contains(${bullets}, "largeHail")}) - #set($hailTag = ">.75") - #set($hailType = "LARGE HAIL") - #set($severeType = "SEVERE") - #set($hailCTA = "...${hailType}") -#end -#if(${list.contains(${bullets}, "destructiveHail")}) - #set($hailTag = ">2.0") - #set($hailType = "LARGE DESTRUCTIVE HAIL") - #set($severeType = "SEVERE") - #set($hailCTA = "...${hailType}") -#end -#if(${list.contains(${bullets}, "sightedSpout")}) - #set($spoutTag = "WATERSPOUT...OBSERVED") - #set($spoutType = "WATERSPOUTS") - #set($severeType = "SEVERE") -#end -#if(${list.contains(${bullets}, "possibleSpout")}) - #set($spoutTag = "WATERSPOUT...POSSIBLE") - #set($spoutType = "WATERSPOUTS") - #set($capable = "CAPABLE OF ") - #set($severeType = "SEVERE") -#end -################################################ -## Threat section for Volcanic Situations -################################################ -#if(${list.contains(${bullets}, "ashfall")}) - #set($ashfallType = "ASHFALL") - #set($ashfallPath = "VOLCANIC ASH") - #set($ctaSelected = "YES") - #set($ashfallCTA = "ASH IS AN EYE AND RESPIRATORY IRRITANT AND IS ABRASIVE. THOSE WITH RESPIRATORY SENSITIVITIES SHOULD TAKE EXTRA PRECAUTIONS TO MINIMIZE EXPOSURE. PROTECT ELECTRONICS AND COVER AIR INTAKES IF ASHFALL IS EXPECTED OR CONFIRMED. REMOVE ASH FROM SURFACES WITH WATER IF POSSIBLE TO PREVENT EXCESSIVE ACCUMULATION.") - #set($ashfallInfo = "AN ASHFALL WARNING MEANS THAT THE VOLCANO IS UNDERGOING A MAJOR ERUPTION. IT IS VERY LIKELY THAT MARINERS WILL BE AFFECTED BY VOLCANIC HAZARDS IN THE WARNING AREAS SUCH AS SIGNIFICANT DEBRIS...ASHFALL ONE QUARTER INCH OR GREATER...LAVA...OR LAHAR AND DEBRIS FLOWS.") -#end -#if(${list.contains(${bullets}, "debrisFlow")}) - #set($debrisflowType = "DEBRIS FLOW") - #set($debrisflowPath = "DEBRIS FLOW") - #set($debrisflowInfo = "THE ERUPTION OF THE VOLCANO CAN CAUSE A SUDDEN MELTING OF SNOW AND ICE ON THE MOUNTAIN. THIS WILL RESULT IN A TORRENT OF MUD...ASH...ROCK...AND HOT WATER TO FLOW DOWN THE MOUNTAIN AND INTO THE NEARBY WATERS.") -#end -################################################################################## -## Logic to put together the threats based on Wind...Hail and Waterspout sections. -################################################################################## -#if(${spoutType} && ${windType} && ${hailType}) - #set($threat = "${spoutType}...${windType} AND ${hailType}") -#elseif(${spoutType} && ${hailType}) - #set($threat = "${spoutType} AND ${hailType}") -#elseif(${spoutType} && ${windType}) - #set($threat = "${spoutType} AND ${windType}") -#elseif(${windType} && ${hailType}) - #set($threat = "${windType} AND ${hailType}") -#elseif(${spoutType}) - #set($threat = "${spoutType}") -#elseif(${windType}) - #set($threat = "${windType}") -#elseif(${hailType}) - #set($threat = "${hailType}") -#else - #set($threat = "!**YOU DID NOT SELECT ANY THREATS. PLEAST RE-GENERATE THIS WARNING!**!") -#end -#set($hazard = "${threat}.") -####################################################################### -## Logic for Volcanic Threats. If selected this will override any -## other selections for wind/hail/spouts. -####################################################################### -#if(${ashfallType} && ${debrisflowType}) - #set($threat = "${ashfallType} AND ${debrisflowType}") - #set($volcanoPath = "${ashfallPath} AND ${debrisflowPath}") -#elseif(${ashfallType}) - #set($threat = "${ashfallType}") - #set($volcanoPath = "${ashfallPath}") -#elseif(${debrisflowType}) - #set($threat = "${debrisflowType}") - #set($volcanoPath = "${debrisflowPath}") -#else -#end -######################################################################### -## Section to determine Thunderstorm Severity based on Threat Selections. -######################################################################### -#if(${eventType} == "THUNDERSTORM") - #set($thunderstormType = "${severeType} ${eventType}") - #set($eventType = "${thunderstormType}") -#end -####################################################################### -## Section to create line wording based on track type. -####################################################################### -#set($stormline = "A ${eventType}") -#set($pathheader = "THE ${eventType}") -#set($specialEvent = "THIS ${eventType}") -#set($reportType2 = "THE ${eventType} WAS") -#if(${stormType} == "line") - #set($stormline = "A LINE OF ${eventType}S") - #set($pathheader = "${eventType}S") - #set($specialEvent = "THESE ${eventType}S") - #set($reportType2 = "THE ${eventType}S WERE") -#end -########################################################################### -## Corrective coding to prevent the use of "Line of Fronts" in the Product. -########################################################################### -#if(${eventType} == "FRONT") - #set($stormline = "A ${eventType}") - #set($pathheader = "THE ${eventType}") - #set($specialEvent = "THIS ${eventType}") - #set($reportType2 = "THE ${eventType} WAS") -## #set($stormType = "") -#end -####################################################################### -## Coding for volcanos...this will override all other selections. -####################################################################### -#set($impacted = "LOCATIONS IMPACTED INCLUDE...") -#if(${eventType} == "VOLCANO") - #set($stormline = "AN ERUPTION OF !** NAME OF VOLCANO**! VOLCANO") - #set($pathheader = "THE ${volcanoPath}") - #set($reportType2 = "THE ${volcanoPath} WAS") - #set($specialEvent = "THE ${volcanoPath}") -## #set($stormType = "") - #set($impacted = "LOCATIONS IMPACTED BY ${volcanoPath} INCLUDE...") -#end -########################################################################## -## Basis section that incorporates line phenomena...capable vs producing -## and threat based on selections above. Added Satellite Imagery to basis. -########################################################################## -#set($report = "!** YOU DIDN'T SELECT A REPORTER **! ${eventType}") -#if(${list.contains(${bullets}, "doppler")}) - #set($source = "RADAR INDICATED.") - #set($capable = "CAPABLE OF ") -## #set($report = "DOPPLER RADAR INDICATED ${stormline}...${capable}PRODUCING ${threat}...") -#end -#if(${list.contains(${bullets}, "doppler")} && ${list.contains(${bullets}, "sightedSpout")}) -## #set($report = "DOPPLER RADAR INDICATED ${stormline}...PRODUCING ${threat}...") -#end -#if(${list.contains(${bullets}, "marineSpotter")}) - #set($source = "MARINE WEATHER SPOTTER.") -## #set($report = "MARINE WEATHER SPOTTERS REPORTED ${stormline}...${capable}PRODUCING ${threat}...") -#end -#if(${list.contains(${bullets}, "mariner")}) - #set($source = "MARINER.") -## #set($report = "A MARINER REPORTED ${stormline}...${capable}PRODUCING ${threat}...") -#end -#if(${list.contains(${bullets}, "public")}) - #set($source = "PUBLIC.") -## #set($report = "THE PUBLIC REPORTED ${stormline}...${capable}PRODUCING ${threat}...") -#end -#if(${list.contains(${bullets}, "pilot")}) - #set($source = "PILOT.") -## #set($report = "A PILOT REPORTED ${stormline}...${capable}PRODUCING ${threat}...") -#end -#if(${list.contains(${bullets}, "satellite")}) - #set($source = "SATELLITE IMAGERY INDICATED.") - #set($capable = "CAPABLE OF ") -## #set($report = "SATELLITE IMAGERY INDICATED ${stormline}...${capable}PRODUCING ${threat}...") -#end -#if(${list.contains(${bullets}, "satellite")} && ${list.contains(${bullets}, "sightedSpout")}) -## #set($report = "SATELLITE IMAGERY INDICATED ${stormline}...PRODUCING ${threat}...") -#end -## If waterspouts are observed override the capable wording -#if(${list.contains(${bullets}, "sightedSpout")}) -#set($capable = "") -#end -## If waterspouts are selected include them in the AT... section of the product -#if($spoutTag.length() > 0) - #set($spoutThreat = " ${capable}PRODUCING ${spoutType}") -#end -#set($report = "${stormline}${spoutThreat}...") - -## Storm current location description - -* ## -#if(${productClass}=="T") -THIS IS A TEST MESSAGE. ## -#end -#thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) -...${report}LOCATED ## -#if(${stormType} == "line") -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxMarineNearDistance}, ${overPhrase}, ${maxMarineOverDistance}, ${marineDistanceUnits}, ${useSecondReferenceLine}) -#else -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxMarineNearDistance}, ${overPhrase}, ${maxMarineOverDistance}, ${marineDistanceUnits}, ${useSecondReferenceCell}) -#end -#if(${eventType} == "VOLCANO") -. -#elseif(${movementSpeed} < ${marineStationary} || ${stationary}) -. ${reportType2} NEARLY STATIONARY. -#else -...MOVING #direction(${movementDirectionRounded}) AT ${mathUtil.roundTo5(${movementSpeed})} KNOTS. -#end - -############################################# -######## GENERATE ADDITIONAL REPORTS ####### -############################################# -#if(${list.contains(${bullets}, "addlRpt")}) -#set($extraSource = " AT !**enter time, phenomena**! WAS REPORTED !**enter location**!.") -#end -########################################################################## -## Command to parse the impact statements into the template -########################################################################## -#parse("impactStatements.vm") -################################### -## Section to include the hazard ## -################################### - -#wrapText("HAZARD...${hazard}" 2 11) - -#wrapText("SOURCE...${source}${extraSource}" 2 11) - -#wrapText("IMPACT...${smwimpact}" 2 11) - -${ashfallInfo} - -${debrisflowInfo} - -#set($eventType = "${pathheader}") -#set($warningType = "WARNING") -#if(${list.contains(${bullets}, "pathcast")}) -* ## -#if(${productClass}=="T") -THIS IS A TEST MESSAGE. ## -#end -#pathCast("${eventType} WILL BE NEAR..." ${eventType} ${pathCast} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 1) - -#elseif(${list.contains(${bullets}, "listoflocations")}) -* ## -#if(${productClass}=="T") -THIS IS A TEST MESSAGE. ## -#end -#### THE THIRD ARGUMENT IS A NUMBER SPECIFYING THE NUMBER OF COLUMNS TO OUTPUT THE CITIES LIST IN -#### 0 IS A ... SEPARATED LIST, 1 IS ONE PER LINE, >1 IS A COLUMN FORMAT -#### IF YOU USE SOMETHING OTHER THAN "LOCATIONS IMPACTED INCLUDE" LEAD IN BELOW, MAKE SURE THE -#### ACCOMPANYING XML FILE PARSE STRING IS CHANGED TO MATCH! -#locationsList("${impacted}" "${eventType}" 0 ${locationList} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 1) - -#end - -############################################## -###### SPECIAL VENUE/EVENT CASE ############## -############################################## - -#if(${list.contains(${bullets}, "specialEvent")}) -THOSE ATTENDING !**event/venue name or location**! ARE IN THE PATH OF ${specialEvent} AND SHOULD PREPARE FOR IMMINENT DANGEROUS WEATHER CONDITIONS. SEEK SHELTER NOW. - -#end -##################### -## CALL TO ACTIONS ## -##################### -####################################################################### -## Check to see if we've selected any calls to action. In our .xml file -## we ended each CTA bullet ID with "CTA" for this reason as a 'trip' -####################################################################### -#foreach (${bullet} in ${bullets}) -#if(${bullet.endsWith("CTA")}) -#set($ctaSelected = "YES") -#end -#end - -#if(${ctaSelected} == "YES") -PRECAUTIONARY/PREPAREDNESS ACTIONS... -#end -## - -${ashfallCTA} - -#if(${list.contains(${bullets}, "genericCTA")}) -#if(${stormType} == "line") -AS THUNDERSTORMS MOVE OVER THE WATER...BOATERS CAN EXPECT GUSTY WINDS AND HIGH WAVES. MOVE TO SAFE HARBOR OR STAY CLOSE TO SHORE UNTIL THESE STORMS PASS. - -#else -AS THIS THUNDERSTORM MOVES OVER THE WATER...BOATERS CAN EXPECT GUSTY WINDS AND HIGH WAVES. MOVE TO SAFE HARBOR OR STAY CLOSE TO SHORE UNTIL THE STORM PASSES. - -#end -#end -#if(${list.contains(${bullets}, "gustyWindsCTA")}) -#if(${stormType} == "line") -MARINERS CAN EXPECT GUSTY WINDS...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THESE STORMS PASS. - -#else -MARINERS CAN EXPECT GUSTY WINDS...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THIS STORM PASSES. - -#end -#end -#if(${list.contains(${bullets}, "hailWindsCTA")}) -#if(${stormType} == "line") -MARINERS CAN EXPECT ${windCTA}${hailCTA}...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THESE STORMS PASS. - -#else -MARINERS CAN EXPECT ${windCTA}${hailCTA}...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THIS STORM PASSES. - -#end -#end -#if(${list.contains(${bullets}, "nonThunderstormCTA")}) -MARINERS CAN EXPECT GUSTY WINDS...AND INCREASING WAVES. BOATERS...ESPECIALLY THOSE UNDER SAIL...SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THE HIGH WINDS SUBSIDE. - -#end -#if(${list.contains(${bullets}, "waterspoutCTA")}) -THUNDERSTORMS CAN PRODUCE SUDDEN WATERSPOUTS. WATERSPOUTS CAN EASILY OVERTURN BOATS AND CREATE LOCALLY HAZARDOUS SEAS. SEEK SAFE HARBOR IMMEDIATELY. - -#end -#if(${list.contains(${bullets}, "lightningCTA")}) -FREQUENT LIGHTNING IS OCCURRING WITH THIS STORM. IF CAUGHT ON THE OPEN WATER STAY BELOW DECK IF POSSIBLE...KEEP AWAY FROM UNGROUNDED METAL OBJECTS. - -#end -#if(${list.contains(${bullets}, "reportCTA")}) -REPORT SEVERE WEATHER TO THE COAST GUARD OR NEAREST LAW ENFORCEMENT AGENCY. THEY WILL RELAY YOUR REPORT TO THE NATIONAL WEATHER SERVICE OFFICE. - -#end -#if(${ctaSelected} == "YES") -&& -#end -############# -## WATCHES ## -############# - -#if(${list.contains(${includedWatches}, "torWatches")}) -#inserttorwatches(${watches}, ${list}, ${secondtimezone}, ${dateUtil}, ${timeFormat}) -#end -#if(${list.contains(${includedWatches}, "svrWatches")}) -#insertsvrwatches(${watches}, ${list}, ${secondtimezone}, ${dateUtil}, ${timeFormat}) -#end -#if(${productClass}=="T") -THIS IS A TEST MESSAGE. DO NOT TAKE ACTION BASED ON THIS MESSAGE. -#end - -#printcoords(${areaPoly}, ${list}) - -#tml(${TMLtime}, ${timeFormat}, ${movementDirection}, ${movementInKnots}, ${eventLocation}) - -################################################################## -## Waterspout/Hail/Wind Tags used by CR for IBW -################################################################## - -#if($spoutTag.length() > 0) -${spoutTag} -#end -HAIL...${hailTag}IN -WIND...${windTag}KTS - -$$ - -#parse("forecasterName.vm") diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSpecialMarineWarning.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSpecialMarineWarning.xml deleted file mode 100644 index f32d251601..0000000000 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSpecialMarineWarning.xml +++ /dev/null @@ -1,207 +0,0 @@ - - - - - - - - - - - - - - - - nmi - kn - - - - Coastal Marine Zones - - - - - - NEW - COR - - - - - MA.W - - - - true - - - true - - - - torWatches - svrWatches - - - - 30 - - 10 - 15 - 20 - 25 - 30 - 40 - 45 - 60 - 90 - 120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSpecialMarineWarningFollowup.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSpecialMarineWarningFollowup.vm deleted file mode 100644 index 312e7cab78..0000000000 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSpecialMarineWarningFollowup.vm +++ /dev/null @@ -1,1256 +0,0 @@ -##################################################### -## SPECIAL MARINE WARNING FOLLOWUP ## -## FOR CR IMPACT BASED WARNING INITIATIVE ## -## CREATED BY PHIL KURIMSKI - WFO DTX ## -## UPDATED KURIMSKI SEP 17 2013 OB13.5.2-4 ## -## UPDATED BOOKBINDER 9-18-2013 Implemented config.vm -##################################################### -#parse("config.vm") -############################################ -## Set null variables used in the template -############################################ -#set($capable = "") -#set($windhailTag = "") -#set($ashfallPath = "") -#set($debrisflowPath = "") -#set($ashfallInfo = "") -#set($debrisflowInfo = "") -#set($ashfallCTA = "") -#set($ashCON = "") -#set($spoutTag = "") -#set($source = "RADAR INDICATED.") -#set($extraSource = "") -#set($spoutThreat = "") -################################################ -## Set up override for ashfall warning -## This will change Special Marine Warning to -## Ashfall Warning Per the 10-313 Directive -################################################ -#set($warningType = "SPECIAL MARINE WARNING") -#if(${list.contains(${bullets}, "ashfall")}) - #set($warningType = "ASHFALL WARNING FOR VOLCANIC ASH AND OTHER HAZARDS") - #set($ashCON = "N") -#end -################################################ -####################################################################### -## List of Event Types. Added several events such as Shower...Cloud and Front. -## Removed Strong and Severe Thunderstorm selections and placed logic in the -## wind and hail selections that will change wording for Severe Thunderstorms. -####################################################################### -#set($eventType = "THUNDERSTORM") -#if(${list.contains(${bullets}, "thunderstorm")}) - #set($eventType = "THUNDERSTORM") - #set($severeType = "STRONG") -#end -#if(${list.contains(${bullets}, "shower")}) - #set($eventType = "SHOWER") -#end -#if(${list.contains(${bullets}, "cloud")}) - #set($eventType = "CLOUD") -#end -#if(${list.contains(${bullets}, "front")}) - #set($eventType = "FRONT") -#end -#if(${list.contains(${bullets}, "volcano")}) - #set($eventType = "VOLCANO") -#end -####################################################################### -## Added a Threat Section to the template that includes Wind...Hail -## and Waterspout selections. -## Strong Thunderstorm will change to Severe Thunderstorm automatically based on -## selections in Wind...Hail and Waterspout sections. -####################################################################### -#set($windTag = "<34") -#set($windCTA = "GUSTY WINDS") -#if(${list.contains(${bullets}, "34ktWind")}) - #set($windTag = ">34") - #set($windType = "WIND GUSTS 34 KNOTS OR GREATER") - #set($windCTA = "${windType}") -#end -#if(${list.contains(${bullets}, "40ktWind")}) - #set($windTag = "40") - #set($windType = "WIND GUSTS TO 40 KNOTS") - #set($windCTA = "${windType}") -#end -#if(${list.contains(${bullets}, "40ktplusWind")}) - #set($windTag = "49") - #set($windType = "WIND GUSTS TO NEARLY 50 KNOTS") - #set($windCTA = "${windType}") -#end -#if(${list.contains(${bullets}, "50ktWind")}) - #set($windTag = "50") - #set($windType = "WIND GUSTS IN EXCESS OF 50 KNOTS") - #set($severeType = "SEVERE") - #set($windCTA = "${windType}") -#end -#if(${list.contains(${bullets}, "65ktWind")}) - #set($windTag = "65") - #set($windType = "WIND GUSTS IN EXCESS OF 65 KNOTS") - #set($severeType = "SEVERE") - #set($windCTA = "${windType}") -#end -#set($hailTag = "0.00") -#set($hailCTA = "") -#if(${list.contains(${bullets}, "smallHail")}) - #set($hailTag = "<.75") - #set($hailType = "SMALL HAIL") - #set($hailCTA = "...${hailType}") -#end -#if(${list.contains(${bullets}, "largeHail")}) - #set($hailTag = ">.75") - #set($hailType = "LARGE HAIL") - #set($severeType = "SEVERE") - #set($hailCTA = "...${hailType}") -#end -#if(${list.contains(${bullets}, "destructiveHail")}) - #set($hailTag = ">2.0") - #set($hailType = "LARGE DESTRUCTIVE HAIL") - #set($severeType = "SEVERE") - #set($hailCTA = "...${hailType}") -#end -#if(${list.contains(${bullets}, "sightedSpout")}) - #set($spoutTag = "WATERSPOUT...OBSERVED") - #set($spoutType = "WATERSPOUTS") - #set($severeType = "SEVERE") -#end -#if(${list.contains(${bullets}, "possibleSpout")}) - #set($spoutTag = "WATERSPOUT...POSSIBLE") - #set($spoutType = "WATERSPOUTS") - #set($capable = "CAPABLE OF ") - #set($severeType = "SEVERE") -#end -################################################ -## Threat section for Volcanic Situations -################################################ -#if(${list.contains(${bullets}, "ashfall")}) - #set($ashfallType = "ASHFALL") - #set($ashfallPath = "VOLCANIC ASH") - #set($ctaSelected = "YES") - #set($ashfallCTA = "ASH IS AN EYE AND RESPIRATORY IRRITANT AND IS ABRASIVE. THOSE WITH RESPIRATORY SENSITIVITIES SHOULD TAKE EXTRA PRECAUTIONS TO MINIMIZE EXPOSURE. PROTECT ELECTRONICS AND COVER AIR INTAKES IF ASHFALL IS EXPECTED OR CONFIRMED. REMOVE ASH FROM SURFACES WITH WATER IF POSSIBLE TO PREVENT EXCESSIVE ACCUMULATION.") - #set($ashfallInfo = "AN ASHFALL WARNING MEANS THAT THE VOLCANO IS UNDERGOING A MAJOR ERUPTION. IT IS VERY LIKELY THAT MARINERS WILL BE AFFECTED BY VOLCANIC HAZARDS IN THE WARNING AREAS SUCH AS SIGNIFICANT DEBRIS...ASHFALL ONE QUARTER INCH OR GREATER...LAVA...OR LAHAR AND DEBRIS FLOWS.") -#end -#if(${list.contains(${bullets}, "debrisFlow")}) - #set($debrisflowType = "DEBRIS FLOW") - #set($debrisflowPath = "DEBRIS FLOW") - #set($debrisflowInfo = "THE ERUPTION OF THE VOLCANO CAN CAUSE A SUDDEN MELTING OF SNOW AND ICE ON THE MOUNTAIN. THIS WILL RESULT IN A TORRENT OF MUD...ASH...ROCK...AND HOT WATER TO FLOW DOWN THE MOUNTAIN AND INTO THE NEARBY WATERS.") -#end -################################################################################## -## Logic to put together the threats based on Wind...Hail and Waterspout sections. -################################################################################## -#if(${spoutType} && ${windType} && ${hailType}) - #set($threat = "${spoutType}...${windType} AND ${hailType}") -#elseif(${spoutType} && ${hailType}) - #set($threat = "${spoutType} AND ${hailType}") -#elseif(${spoutType} && ${windType}) - #set($threat = "${spoutType} AND ${windType}") -#elseif(${windType} && ${hailType}) - #set($threat = "${windType} AND ${hailType}") -#elseif(${spoutType}) - #set($threat = "${spoutType}") -#elseif(${windType}) - #set($threat = "${windType}") -#elseif(${hailType}) - #set($threat = "${hailType}") -#else - #set($threat = "!**YOU DID NOT SELECT ANY THREATS. PLEAST RE-GENERATE THIS WARNING!**!") -#end -#set($hazard = "${threat}.") -####################################################################### -## Logic for Volcanic Threats. If selected this will override any -## other selections for wind/hail/spouts. -####################################################################### -#if(${ashfallType} && ${debrisflowType}) - #set($threat = "${ashfallType} AND ${debrisflowType}") - #set($volcanoPath = "${ashfallPath} AND ${debrisflowPath}") -#elseif(${ashfallType}) - #set($threat = "${ashfallType}") - #set($volcanoPath = "${ashfallPath}") -#elseif(${debrisflowType}) - #set($threat = "${debrisflowType}") - #set($volcanoPath = "${debrisflowPath}") -#else -#end -######################################################################### -## Section to determine Thunderstorm Severity based on Threat Selections. -######################################################################### -#if(${eventType} == "THUNDERSTORM") - #set($thunderstormType = "${severeType} ${eventType}") - #set($eventType = "${thunderstormType}") -#end -####################################################################### -## Section to create line wording based on track type. -####################################################################### -#set($stormline = "A ${eventType}") -#set($pathheader = "THE ${eventType}") -#set($specialEvent = "THIS ${eventType}") -#set($reportType2 = "THE ${eventType} WAS") -#if(${stormType} == "line") - #set($stormline = "A LINE OF ${eventType}S") - #set($pathheader = "${eventType}S") - #set($specialEvent = "THESE ${eventType}S") - #set($reportType2 = "THE ${eventType}S WERE") -#end -########################################################################## -##Corrective coding to prevent the use of "Line of Fronts" in the Product. -########################################################################## -#if(${eventType} == "FRONT") - #set($stormline = "A ${eventType}") - #set($pathheader = "THE ${eventType}") - #set($specialEvent = "THIS ${eventType}") - #set($stormType = "") - #set($reportType2 = "THE ${eventType} WAS") -#end -####################################################################### -## Coding for volcanos...this will override all other selections. -####################################################################### -#set($impacted = "LOCATIONS IMPACTED INCLUDE...") -#if(${eventType} == "VOLCANO") - #set($stormline = "AN ERUPTION OF !** NAME OF VOLCANO**! VOLCANO") - #set($pathheader = "THE ${volcanoPath}") - #set($specialEvent = "THE ${volcanoPath}") - #set($reportType2 = "THE ${volcanoPath} WAS") - #set($stormType = "") - #set($impacted = "LOCATIONS IMPACTED BY ${volcanoPath} INCLUDE...") -#end -########################################################################## -## Basis section that incorporates line phenomena...capable vs producing -## and threat based on selections above. Added Satellite Imagery to basis. -########################################################################## -#set($report = "!** YOU DIDN'T SELECT A REPORTER **! ${eventType}") -#if(${list.contains(${bullets}, "doppler")}) - #set($source = "RADAR INDICATED.") - #set($capable = "CAPABLE OF ") -## #set($report = "DOPPLER RADAR INDICATED ${stormline}...${capable}PRODUCING ${threat}...") -#end -#if(${list.contains(${bullets}, "doppler")} && ${list.contains(${bullets}, "sightedSpout")}) -## #set($report = "DOPPLER RADAR INDICATED ${stormline}...PRODUCING ${threat}...") -#end -#if(${list.contains(${bullets}, "marineSpotter")}) - #set($source = "MARINE WEATHER SPOTTER.") -## #set($report = "MARINE WEATHER SPOTTERS REPORTED ${stormline}...${capable}PRODUCING ${threat}...") -#end -#if(${list.contains(${bullets}, "mariner")}) - #set($source = "MARINER.") -## #set($report = "A MARINER REPORTED ${stormline}...${capable}PRODUCING ${threat}...") -#end -#if(${list.contains(${bullets}, "public")}) - #set($source = "PUBLIC.") -## #set($report = "THE PUBLIC REPORTED ${stormline}...${capable}PRODUCING ${threat}...") -#end -#if(${list.contains(${bullets}, "pilot")}) - #set($source = "PILOT.") -## #set($report = "A PILOT REPORTED ${stormline}...${capable}PRODUCING ${threat}...") -#end -#if(${list.contains(${bullets}, "satellite")}) - #set($source = "SATELLITE IMAGERY INDICATED.") - #set($capable = "CAPABLE OF ") -## #set($report = "SATELLITE IMAGERY INDICATED ${stormline}...${capable}PRODUCING ${threat}...") -#end -#if(${list.contains(${bullets}, "satellite")} && ${list.contains(${bullets}, "sightedSpout")}) -## #set($report = "SATELLITE IMAGERY INDICATED ${stormline}...PRODUCING ${threat}...") -#end -## If waterspouts are observed override the capable wording -#if(${list.contains(${bullets}, "sightedSpout")}) -#set($capable = "") -#end -## If waterspouts are selected include them in the AT... section of the product -#if($spoutTag.length() > 0) - #set($spoutThreat = " ${capable}PRODUCING ${spoutType}") -#end -#set($report = "${stormline}${spoutThreat}...") -############################################# -######## GENERATE ADDITIONAL REPORTS ####### -############################################# -#if(${list.contains(${bullets}, "addlRpt")}) -#set($extraSource = " AT !**enter time, phenomena**! WAS REPORTED !**enter location**!.") -#end -########################################################################## -## Command to parse the impact statements into the template -########################################################################## -#parse("impactStatements.vm") -####################################################################### -## The following code will create a string of marine zone fips codes -## which will be important in combining marine zones -####################################################################### -####################################################################### -## Set the fipsstring variable to null for marine zone combinations -## This will only work for single CON/CAN/EXP products -## Combination CON/CAN will need additional code which will be -## included in the template below. -####################################################################### -#set($fipsstring = "") -#foreach (${area} in ${areas}) -#set($fipsstring = $fipsstring + $area.fips + "-") -#end -####################################################################### -## HEADER FOR NON-CAN/CON PRODUCTS -####################################################################### -## -#if(${action}=="COR" && ${cancelareas}) -#set($CORCAN = "true") -#else -#set($CORCAN = "false") -#end -#if(${action}!="CANCON" && ${CORCAN}!="true") -${WMOId} ${vtecOffice} 000000 ${BBBId} -MWS${siteId} - -#if(${productClass}=="T") -TEST...MARINE WEATHER STATEMENT...TEST -#else -MARINE WEATHER STATEMENT -#end -NATIONAL WEATHER SERVICE ${officeShort} -#backupText(${backupSite}) -${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} - -#if(${productClass}=="T") -...THIS MESSAGE IS FOR TEST PURPOSES ONLY... - -#end -${ugcline} -/${productClass}.${action}.${vtecOffice}.MA.W.${oldvtec}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ -${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} - -#if(${productClass}=="T") -...THIS MESSAGE IS FOR TEST PURPOSES ONLY... - -#end -#end -## -####################################################################### -## MWS CANCEL PRODUCT -####################################################################### -## Altered cancellation headline for cleaner wording and to match -## NWS Directive 10-314 -####################################################################### -#if(${action}=="CAN") -#if(${productClass}=="T") -THIS IS A TEST MESSAGE.## -#end -...THE ${warningType} IS CANCELLED... - -THE AFFECTED AREAS WERE... -####################################################################### -## Coding to use the raw marine zone output from the shapefiles -## Comment this section out if you are combining your marine zones -####################################################################### -#foreach (${area} in ${areas}) -${area.name}... -#end -####################################################################### -## End of code for raw marine zone output from the shapefiles -####################################################################### -####################################################################### -## Parse in the marineCombo.vm file which contains marine zone combinations -## Uncomment the parse command if you are combining your marine zones -####################################################################### -##parse("marineCombo.vm") -####################################################################### -## End of the marine zone combination script -####################################################################### - -####################################################################### -## Setup eventType for wording in the End of Warning Statement -####################################################################### -#set($stormline = " HAS") -#set($pose = "POSES") -#if(${stormType} == "line") - #set($stormline = "S HAVE") - #set($pose = "POSE") -#end -#set($eventType = "!**STORMS**! HAVE") -#if(${list.contains(${bullets}, "thunderstorm")}) - #set($eventType = "THUNDERSTORM${stormline}") -#end -#if(${list.contains(${bullets}, "shower")}) - #set($eventType = "SHOWER${stormline}") -#end -#if(${list.contains(${bullets}, "cloud")}) - #set($eventType = "CLOUD${stormline}") -#end -#if(${list.contains(${bullets}, "front")}) - #set($eventType = "FRONT HAS") - #set($pose = "POSES") -#end -#if(${list.contains(${bullets}, "volcano")}) - #set($eventType = "VOLCANO HAS") - #set($pose = "POSES") -#end -####################################################################### -## Section for end of warning statements. Replaced default wording with -## a better defined reason for the end to the warning. -####################################################################### -#set($canwarning = "THE ${eventType} !** WEAKENED / MOVED OUT OF THE WARNED AREA **! AND NO LONGER ${pose} A SIGNIFICANT THREAT TO BOATERS.") -#if(${list.contains(${bullets}, "weakenedWarnEnd")}) - #set($canwarning = "THE ${eventType} WEAKENED AND NO LONGER ${pose} A SIGNIFICANT THREAT TO BOATERS.") -#end -#if(${list.contains(${bullets}, "movedWarnEnd")}) - #set($canwarning = "THE ${eventType} MOVED OUT OF THE AREA AND NO LONGER ${pose} A SIGNIFICANT THREAT TO BOATERS.") -#end -#if(${list.contains(${bullets}, "volcano")}) - #set($canwarning = "THE ${eventType} STOPPED ERUPTING AND NO LONGER ${pose} A SIGNIFICANT THREAT TO BOATERS.") -#end - -${canwarning} - -############# -## WATCHES ## -############# -#if(${list.contains(${includedWatches}, "torWatches")}) -#inserttorwatches(${watches}, ${list}, ${secondtimezone}, ${dateUtil}, ${timeFormat}) -#end -#if(${list.contains(${includedWatches}, "svrWatches")}) -#insertsvrwatches(${watches}, ${list}, ${secondtimezone}, ${dateUtil}, ${timeFormat}) -#end -#end -## -####################################################################### -## MWS CON PRODUCT -####################################################################### -## -#if(${action}=="CON" || (${action}=="COR" && ${CORCAN}=="false")) -#if(${productClass}=="T") -THIS IS A TEST MESSAGE.## -#end -######################################################################## -## Altered continuation headline for cleaner wording and to match -## NWS Directive 10-314 -######################################################################## -...A${ashCON} ${warningType} REMAINS IN EFFECT #secondBullet(${dateUtil},${expire},${timeFormat},${localtimezone},${secondtimezone})... - -FOR THE FOLLOWING AREAS... -####################################################################### -## Coding to use the raw marine zone output from the shapefiles -## Comment this section out if you are combining your marine zones -####################################################################### -#foreach (${area} in ${areas}) -${area.name}... -#end -####################################################################### -## End of code for raw marine zone output from the shapefiles -####################################################################### -####################################################################### -## Parse in the marineCombo.vm file which contains marine zone combinations -## Uncomment the parse command if you are combining your marine zones -####################################################################### -##parse("marineCombo.vm") -####################################################################### -## End of the marine zone combination script -####################################################################### - -## Storm current location description -#if(${productClass}=="T") -THIS IS A TEST MESSAGE. ## -#end -#thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) -...${report}LOCATED ## -#if(${stormType} == "line") -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxMarineNearDistance}, ${overPhrase}, ${maxMarineOverDistance}, ${marineDistanceUnits}, ${useSecondReferenceLine}) -#else -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxMarineNearDistance}, ${overPhrase}, ${maxMarineOverDistance}, ${marineDistanceUnits}, ${useSecondReferenceCell}) -#end -#if(${eventType} == "VOLCANO") -. -#elseif(${movementSpeed} < ${marineStationary} || ${stationary}) -. ${reportType2} NEARLY STATIONARY. -#else -...MOVING #direction(${movementDirectionRounded}) AT ${mathUtil.roundTo5(${movementSpeed})} KNOTS. -#end - -################################### -## Section to include the hazard ## -################################### -#wrapText("HAZARD...${hazard}" 0 9) - -#wrapText("SOURCE...${source}${extraSource}" 0 9) - -#wrapText("IMPACT...${smwimpact}" 0 9) - -${ashfallInfo} - -${debrisflowInfo} - -################################################### -######## GENERATE PATHCAST OR CITIES LIST ######### -################################################### -#set($eventType = "${pathheader}") -#set($warningType = "WARNING") -#if(${list.contains(${bullets}, "pathcast")}) -#if(${productClass}=="T") -THIS IS A TEST MESSAGE. ## -#end -#pathCast("${eventType} WILL BE NEAR..." ${eventType} ${pathCast} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 1) - -#elseif(${list.contains(${bullets}, "listoflocations")}) -#if(${productClass}=="T") -THIS IS A TEST MESSAGE. ## -#end -#### THE THIRD ARGUMENT IS A NUMBER SPECIFYING THE NUMBER OF COLUMNS TO OUTPUT THE CITIES LIST IN -#### 0 IS A ... SEPARATED LIST, 1 IS ONE PER LINE, >1 IS A COLUMN FORMAT -#### IF YOU USE SOMETHING OTHER THAN "LOCATIONS IMPACTED INCLUDE" LEAD IN BELOW, MAKE SURE THE -#### ACCOMPANYING XML FILE PARSE STRING IS CHANGED TO MATCH! -#locationsList("${impacted}" "${eventType}" 0 ${locationList} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 1) - -#end -############################################## -###### SPECIAL VENUE/EVENT CASE ############## -############################################## - -#if(${list.contains(${bullets}, "specialEvent")}) -THOSE ATTENDING !**event/venue name or location**! ARE IN THE PATH OF ${specialEvent} AND SHOULD PREPARE FOR IMMINENT DANGEROUS WEATHER CONDITIONS. SEEK SHELTER NOW. - -#end -##################### -## CALL TO ACTIONS ## -##################### -####################################################################### -## Check to see if we've selected any calls to action. In our .xml file -## we ended each CTA bullet ID with "CTA" for this reason as a 'trip' -####################################################################### -#foreach (${bullet} in ${bullets}) -#if(${bullet.endsWith("CTA")}) -#set($ctaSelected = "YES") -#end -#end -## -#if(${ctaSelected} == "YES") - -PRECAUTIONARY/PREPAREDNESS ACTIONS... -#end -## - -${ashfallCTA} - -#if(${list.contains(${bullets}, "genericCTA")}) -#if(${stormType} == "line") -AS THUNDERSTORMS MOVE OVER THE WATER...BOATERS CAN EXPECT GUSTY WINDS AND HIGH WAVES. MOVE TO SAFE HARBOR OR STAY CLOSE TO SHORE UNTIL THESE STORMS PASS. - -#else -AS THIS THUNDERSTORM MOVES OVER THE WATER...BOATERS CAN EXPECT GUSTY WINDS AND HIGH WAVES. MOVE TO SAFE HARBOR OR STAY CLOSE TO SHORE UNTIL THE STORM PASSES. - -#end -#end -#if(${list.contains(${bullets}, "gustyWindsCTA")}) -#if(${stormType} == "line") -MARINERS CAN EXPECT GUSTY WINDS...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THESE STORMS PASS. - -#else -MARINERS CAN EXPECT GUSTY WINDS...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THIS STORM PASSES. - -#end -#end -#if(${list.contains(${bullets}, "hailWindsCTA")}) -#if(${stormType} == "line") -MARINERS CAN EXPECT ${windCTA}${hailCTA}...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THESE STORMS PASS. - -#else -MARINERS CAN EXPECT ${windCTA}${hailCTA}...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THIS STORM PASSES. - -#end -#end -#if(${list.contains(${bullets}, "nonThunderstormCTA")}) -MARINERS CAN EXPECT GUSTY WINDS...AND INCREASING WAVES. BOATERS...ESPECIALLY THOSE UNDER SAIL...SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THE HIGH WINDS SUBSIDE. - -#end -#if(${list.contains(${bullets}, "waterspoutCTA")}) -THUNDERSTORMS CAN PRODUCE SUDDEN WATERSPOUTS. WATERSPOUTS CAN EASILY OVERTURN BOATS AND CREATE LOCALLY HAZARDOUS SEAS. SEEK SAFE HARBOR IMMEDIATELY. - -#end -#if(${list.contains(${bullets}, "lightningCTA")}) -FREQUENT LIGHTNING IS OCCURRING WITH THIS STORM. IF CAUGHT ON THE OPEN WATER STAY BELOW DECK IF POSSIBLE...KEEP AWAY FROM UNGROUNDED METAL OBJECTS. - -#end -#if(${list.contains(${bullets}, "reportCTA")}) -REPORT SEVERE WEATHER TO THE COAST GUARD OR NEAREST LAW ENFORCEMENT AGENCY. THEY WILL RELAY YOUR REPORT TO THE NATIONAL WEATHER SERVICE OFFICE. - -#end -#if(${ctaSelected} == "YES") -&& -#end -############# -## WATCHES ## -############# -#if(${list.contains(${includedWatches}, "torWatches")}) -#inserttorwatches(${watches}, ${list}, ${secondtimezone}, ${dateUtil}, ${timeFormat}) -#end -#if(${list.contains(${includedWatches}, "svrWatches")}) -#insertsvrwatches(${watches}, ${list}, ${secondtimezone}, ${dateUtil}, ${timeFormat}) -#end -#end -## -## ##################################################################### -## MWS CAN/CON PRODUCT -## ##################################################################### -## Altered cancellation headline for cleaner wording and to match -## NWS Directive 10-314 -######################################################################## -#if(${action}=="CANCON") -${WMOId} ${vtecOffice} 000000 ${BBBId} -MWS${siteId} - -#if(${productClass}=="T") -TEST...MARINE WEATHER STATEMENT...TEST -#else -MARINE WEATHER STATEMENT -#end -NATIONAL WEATHER SERVICE ${officeShort} -#backupText(${backupSite}) -${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} - -#if(${productClass}=="T") -...THIS MESSAGE IS FOR TEST PURPOSES ONLY... - -#end -${ugclinecan} -/${productClass}.CAN.${vtecOffice}.MA.W.${oldvtec}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ -${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} - -#if(${productClass}=="T") -...THIS MESSAGE IS FOR TEST PURPOSES ONLY... - -#end -#if(${productClass}=="T") -THIS IS A TEST MESSAGE.## -#end -...THE ${warningType} IS CANCELLED... - -THE AFFECTED AREAS WERE... -####################################################################### -## Coding to use the raw marine zone output from the shapefiles -## Comment this section out if you are combining your marine zones -####################################################################### -#foreach (${area} in ${cancelareas}) -${area.name}... -#end -####################################################################### -## End of code for raw marine zone output from the shapefiles -####################################################################### -####################################################################### -## The following code will create a string of marine zone fips codes -## which will be important in combining marine zones -## This has to be done again since the CAN/CON section uses cancelareas -####################################################################### -####################################################################### -## Set the fipsstring variable to null for marine zone combinations -####################################################################### -#set($fipsstring = "") -#foreach (${area} in ${cancelareas}) -#set($fipsstring = $fipsstring + $area.fips + "-") -#end -####################################################################### -## Parse in the marineCombo.vm file which contains marine zone combinations -## Uncomment the parse command if you are combining your marine zones -####################################################################### -##parse("marineCombo.vm") -####################################################################### -## End of the marine zone combination script -####################################################################### - -###################################################################### -## Setup eventType for wording in the End of Warning Statement -###################################################################### -#set($stormline = " HAS") -#set($pose = "POSES") -#if(${stormType} == "line") - #set($stormline = "S HAVE") - #set($pose = "POSE") -#end -#set($eventType = "!**STORMS**! HAVE") -#if(${list.contains(${bullets}, "event1")}) - #set($eventType = "THUNDERSTORM${stormline}") -#end -#if(${list.contains(${bullets}, "event3")}) - #set($eventType = "SHOWER${stormline}") -#end -#if(${list.contains(${bullets}, "event4")}) - #set($eventType = "CLOUD${stormline}") -#end -#if(${list.contains(${bullets}, "event5")}) - #set($eventType = "FRONT HAS") - #set($pose = "POSES") -#end -####################################################################### -## Replaced default end of warning wording. -####################################################################### - -THE ${eventType} !** WEAKENED / MOVED OUT OF THE WARNED AREA **! AND NO LONGER ${pose} A SIGNIFICANT THREAT TO BOATERS. - -############# -## WATCHES ## -############# -#if(${list.contains(${includedWatches}, "torWatches")}) -#inserttorwatches(${watches}, ${list}, ${secondtimezone}, ${dateUtil}, ${timeFormat}) -#end -#if(${list.contains(${includedWatches}, "svrWatches")}) -#insertsvrwatches(${watches}, ${list}, ${secondtimezone}, ${dateUtil}, ${timeFormat}) -#end -#if(${productClass}=="T") -THIS IS A TEST MESSAGE. DO NOT TAKE ACTION BASED ON THIS MESSAGE. - -#end -#printcoords(${areaPoly}, ${list}) - -#tml(${TMLtime}, ${timeFormat}, ${movementDirection}, ${movementInKnots}, ${eventLocation}) - - -$$ - -${ugcline} -/${productClass}.CON.${vtecOffice}.MA.W.${oldvtec}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ -${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} - -#if(${productClass}=="T") -...THIS MESSAGE IS FOR TEST PURPOSES ONLY... - -#end -#if(${productClass}=="T") -THIS IS A TEST MESSAGE.## -#end -######################################################################## -## Altered continuation headline for cleaner wording and to match -## NWS Directive 10-314 -######################################################################## -...A${ashCON} ${warningType} REMAINS IN EFFECT #secondBullet(${dateUtil},${expire},${timeFormat},${localtimezone},${secondtimezone})... - -FOR THE FOLLOWING AREAS... -####################################################################### -## Coding to use the raw marine zone output from the shapefiles -## Comment this section out if you are combining your marine zones -####################################################################### -#foreach (${area} in ${areas}) -${area.name}... -#end -####################################################################### -## End of code for raw marine zone output from the shapefiles -####################################################################### -####################################################################### -## The following code will create a string of marine zone fips codes -## which will be important in combining marine zones -## This has to be done again since the CAN/CON section uses cancelareas -####################################################################### -####################################################################### -## Set the fipsstring variable to null for marine zone combinations -####################################################################### -#set($fipsstring = "") -#foreach (${area} in ${areas}) -#set($fipsstring = $fipsstring + $area.fips + "-") -#end -####################################################################### -## Parse in the marineCombo.vm file which contains marine zone combinations -####################################################################### -##parse("marineCombo.vm") -####################################################################### -## End of the marine zone combination script -####################################################################### - -#if(${productClass}=="T") -THIS IS A TEST MESSAGE. ## -#end -AT ${dateUtil.format(${event}, ${timeFormat.clock}, ${localtimezone})}...${report}LOCATED ## -#if(${stormType} == "line") -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxMarineNearDistance}, ${overPhrase}, ${maxMarineOverDistance}, ${marineDistanceUnits}, ${useSecondReferenceLine}) -#else -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxMarineNearDistance}, ${overPhrase}, ${maxMarineOverDistance}, ${marineDistanceUnits}, ${useSecondReferenceCell}) -#end -#if(${eventType} == "VOLCANO") -. -#elseif(${movementSpeed} < ${marineStationary} || ${stationary}) -. ${reportType2} NEARLY STATIONARY. -#else -...MOVING #direction(${movementDirectionRounded}) AT ${mathUtil.roundTo5(${movementSpeed})} KNOTS. -#end - -################################### -## Section to include the hazard ## -################################### -#wrapText("HAZARD...${hazard}" 0 9) - -#wrapText("SOURCE...${source}${extraSource}" 0 9) - -#wrapText("IMPACT...${smwimpact}" 0 9) - -${ashfallInfo} - -${debrisflowInfo} - -################################################### -######## GENERATE PATHCAST OR CITIES LIST ######### -################################################### -#set($eventType = "${pathheader}") -#set($warningType = "WARNING") -#if(${list.contains(${bullets}, "pathcast")}) -#if(${productClass}=="T") -THIS IS A TEST MESSAGE. ## -#end -#pathCast("${eventType} WILL BE NEAR..." ${eventType} ${pathCast} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 1) - -#elseif(${list.contains(${bullets}, "listoflocations")}) -#if(${productClass}=="T") -THIS IS A TEST MESSAGE. ## -#end -#### THE THIRD ARGUMENT IS A NUMBER SPECIFYING THE NUMBER OF COLUMNS TO OUTPUT THE CITIES LIST IN -#### 0 IS A ... SEPARATED LIST, 1 IS ONE PER LINE, >1 IS A COLUMN FORMAT -#### IF YOU USE SOMETHING OTHER THAN "LOCATIONS IMPACTED INCLUDE" LEAD IN BELOW, MAKE SURE THE -#### ACCOMPANYING XML FILE PARSE STRING IS CHANGED TO MATCH! -#locationsList("${impacted}" "${eventType}" 0 ${locationList} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 1) - -#end - -############################################## -###### SPECIAL VENUE/EVENT CASE ############## -############################################## - -#if(${list.contains(${bullets}, "specialEvent")}) -#if(${stormType} == "line") -THOSE ATTENDING THE !**event/venue name or location**! ARE IN THE PATH OF THESE STORMS AND SHOULD PREPARE FOR IMMINENT DANGEROUS WEATHER CONDITIONS. SEEK SHELTER NOW. - -#else -THOSE ATTENDING THE !**event/venue name or location**! ARE IN THE PATH OF THIS STORM AND SHOULD PREPARE FOR IMMINENT DANGEROUS WEATHER CONDITIONS. SEEK SHELTER NOW. - -#end -#end -##################### -## CALL TO ACTIONS ## -##################### -####################################################################### -## Check to see if we've selected any calls to action. In our .xml file -## we ended each CTA bullet ID with "CTA" for this reason as a 'trip' -####################################################################### -#foreach (${bullet} in ${bullets}) -#if(${bullet.endsWith("CTA")}) -#set($ctaSelected = "YES") -#end -#end -## -#if(${ctaSelected} == "YES") - -PRECAUTIONARY/PREPAREDNESS ACTIONS... -#end -## - -${ashfallCTA} - -#if(${list.contains(${bullets}, "genericCTA")}) -#if(${stormType} == "line") -AS THUNDERSTORMS MOVE OVER THE WATER...BOATERS CAN EXPECT GUSTY WINDS AND HIGH WAVES. MOVE TO SAFE HARBOR OR STAY CLOSE TO SHORE UNTIL THESE STORMS PASS. - -#else -AS THIS THUNDERSTORM MOVES OVER THE WATER...BOATERS CAN EXPECT GUSTY WINDS AND HIGH WAVES. MOVE TO SAFE HARBOR OR STAY CLOSE TO SHORE UNTIL THE STORM PASSES. - -#end -#end -#if(${list.contains(${bullets}, "gustyWindsCTA")}) -#if(${stormType} == "line") -MARINERS CAN EXPECT GUSTY WINDS...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THESE STORMS PASS. - -#else -MARINERS CAN EXPECT GUSTY WINDS...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THIS STORM PASSES. - -#end -#end -#if(${list.contains(${bullets}, "hailWindsCTA")}) -#if(${stormType} == "line") -MARINERS CAN EXPECT ${windCTA}${hailCTA}...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THESE STORMS PASS. - -#else -MARINERS CAN EXPECT ${windCTA}${hailCTA}...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THIS STORM PASSES. - -#end -#end -#if(${list.contains(${bullets}, "nonThunderstormCTA")}) -MARINERS CAN EXPECT GUSTY WINDS...AND INCREASING WAVES. BOATERS...ESPECIALLY THOSE UNDER SAIL...SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THE HIGH WINDS SUBSIDE. - -#end -#if(${list.contains(${bullets}, "waterspoutCTA")}) -THUNDERSTORMS CAN PRODUCE SUDDEN WATERSPOUTS. WATERSPOUTS CAN EASILY OVERTURN BOATS AND CREATE LOCALLY HAZARDOUS SEAS. SEEK SAFE HARBOR IMMEDIATELY. - -#end -#if(${list.contains(${bullets}, "lightningCTA")}) -FREQUENT LIGHTNING IS OCCURRING WITH THIS STORM. IF CAUGHT ON THE OPEN WATER STAY BELOW DECK IF POSSIBLE...KEEP AWAY FROM UNGROUNDED METAL OBJECTS. - -#end -#if(${list.contains(${bullets}, "reportCTA")}) -REPORT SEVERE WEATHER TO THE COAST GUARD OR NEAREST LAW ENFORCEMENT AGENCY. THEY WILL RELAY YOUR REPORT TO THE NATIONAL WEATHER SERVICE OFFICE. - -#end -#if(${ctaSelected} == "YES") -&& -#end -############# -## WATCHES ## -############# -#if(${list.contains(${includedWatches}, "torWatches")}) -#inserttorwatches(${watches}, ${list}, ${secondtimezone}, ${dateUtil}, ${timeFormat}) -#end -#if(${list.contains(${includedWatches}, "svrWatches")}) -#insertsvrwatches(${watches}, ${list}, ${secondtimezone}, ${dateUtil}, ${timeFormat}) -#end -#elseif(${CORCAN} == "true") -${WMOId} ${vtecOffice} 000000 ${BBBId} -MWS${siteId} -#if(${productClass}=="T") -TEST...MARINE WEATHER STATEMENT...TEST -#else -MARINE WEATHER STATEMENT -#end -NATIONAL WEATHER SERVICE ${officeShort} -#backupText(${backupSite}) -${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} - -#if(${productClass}=="T") -...THIS MESSAGE IS FOR TEST PURPOSES ONLY... - -#end -${ugclinecan} -/${productClass}.COR.${vtecOffice}.MA.W.${oldvtec}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ -${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} - -#if(${productClass}=="T") -...THIS MESSAGE IS FOR TEST PURPOSES ONLY... - -#end -#if(${productClass}=="T") -THIS IS A TEST MESSAGE.## -#end -...THE ${warningType} IS CANCELLED... - -THE AFFECTED AREAS WERE... -#foreach (${area} in ${cancelareas}) -${area.name}... -#end - -###################################################################### -## Setup eventType for wording in the End of Warning Statement -###################################################################### -#set($stormline = " HAS") -#set($pose = "POSES") -#if(${stormType} == "line") - #set($stormline = "S HAVE") - #set($pose = "POSE") -#end -#set($eventType = "!**STORMS**! HAVE") -#if(${list.contains(${bullets}, "event1")}) - #set($eventType = "THUNDERSTORM${stormline}") -#end -#if(${list.contains(${bullets}, "event3")}) - #set($eventType = "SHOWER${stormline}") -#end -#if(${list.contains(${bullets}, "event4")}) - #set($eventType = "CLOUD${stormline}") -#end -#if(${list.contains(${bullets}, "event5")}) - #set($eventType = "FRONT HAS") - #set($pose = "POSES") -#end -####################################################################### -## Replaced default end of warning wording. -####################################################################### - -THE ${eventType} !** WEAKENED / MOVED OUT OF THE WARNED AREA **! AND NO LONGER ${pose} A SIGNIFICANT THREAT TO BOATERS. - -############# -## WATCHES ## -############# -#if(${list.contains(${includedWatches}, "torWatches")}) -#inserttorwatches(${watches}, ${list}, ${secondtimezone}, ${dateUtil}, ${timeFormat}) -#end -#if(${list.contains(${includedWatches}, "svrWatches")}) -#insertsvrwatches(${watches}, ${list}, ${secondtimezone}, ${dateUtil}, ${timeFormat}) -#end -#if(${productClass}=="T") -THIS IS A TEST MESSAGE. DO NOT TAKE ACTION BASED ON THIS MESSAGE. - -#end -#printcoords(${areaPoly}, ${list}) - -#tml(${TMLtime}, ${timeFormat}, ${movementDirection}, ${movementInKnots}, ${eventLocation}) - - -$$ - -${ugcline} -/${productClass}.COR.${vtecOffice}.MA.W.${oldvtec}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ -${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} - -#if(${productClass}=="T") -...THIS MESSAGE IS FOR TEST PURPOSES ONLY... - -#end - -#if(${productClass}=="T") -THIS IS A TEST MESSAGE.## -#end -######################################################################## -## Altered continuation headline for cleaner wording and to match NWS Directive 10-314 -######################################################################## -...A${ashCON} ${warningType} REMAINS IN EFFECT #secondBullet(${dateUtil},${expire},${timeFormat},${localtimezone},${secondtimezone})... - -FOR THE FOLLOWING AREAS... -####################################################################### -## Coding to use the raw marine zone output from the shapefiles -## Comment this section out if you are combining your marine zones -####################################################################### -#foreach (${area} in ${areas}) -${area.name}... -#end -####################################################################### -## End of code for raw marine zone output from the shapefiles -####################################################################### -####################################################################### -## Parse in the marineCombo.vm file which contains marine zone combinations -####################################################################### -##parse("marineCombo.vm") -####################################################################### -## End of the marine zone combination script -####################################################################### - -#if(${productClass}=="T") -THIS IS A TEST MESSAGE. ## -#end -AT ${dateUtil.format(${event}, ${timeFormat.clock}, ${localtimezone})}...${report}LOCATED ## -##Many of the variables passed below are controlled by config.vm -#if(${stormType} == "line") -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxMarineNearDistance}, ${overPhrase}, ${maxMarineOverDistance}, ${marineDistanceUnits}, ${useSecondReferenceLine}) -#else -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxMarineNearDistance}, ${overPhrase}, ${maxMarineOverDistance}, ${marineDistanceUnits}, ${useSecondReferenceCell}) -#end -#if(${eventType} == "VOLCANO") -. -#elseif(${movementSpeed} < ${marineStationary} || ${stationary}) -. ${reportType2} NEARLY STATIONARY. -#else -...MOVING #direction(${movementDirectionRounded}) AT ${mathUtil.roundTo5(${movementSpeed})} KNOTS. -#end - -################################### -## Section to include the hazard ## -################################### -#wrapText("HAZARD...${hazard}" 0 9) - -#wrapText("SOURCE...${source}${extraSource}" 0 9) - -#wrapText("IMPACT...${smwimpact}" 0 9) - -${ashfallInfo} - -${debrisflowInfo} - -################################################### -######## GENERATE PATHCAST OR CITIES LIST ######### -################################################### -#set($eventType = "${pathheader}") -#set($warningType = "WARNING") -#if(${list.contains(${bullets}, "pathcast")}) -#if(${productClass}=="T") -THIS IS A TEST MESSAGE. ## -#end -#pathCast("${eventType} WILL BE NEAR..." ${eventType} ${pathCast} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 1) - -#elseif(${list.contains(${bullets}, "listoflocations")}) -#if(${productClass}=="T") -THIS IS A TEST MESSAGE. ## -#end -#### THE THIRD ARGUMENT IS A NUMBER SPECIFYING THE NUMBER OF COLUMNS TO OUTPUT THE CITIES LIST IN -#### 0 IS A ... SEPARATED LIST, 1 IS ONE PER LINE, >1 IS A COLUMN FORMAT -#### IF YOU USE SOMETHING OTHER THAN "LOCATIONS IMPACTED INCLUDE" LEAD IN BELOW, MAKE SURE THE -#### ACCOMPANYING XML FILE PARSE STRING IS CHANGED TO MATCH! -#locationsList("${impacted}" "${eventType}" 0 ${locationList} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 1) - -#end - -############################################## -###### SPECIAL VENUE/EVENT CASE ############## -############################################## - -#if(${list.contains(${bullets}, "specialEvent")}) -#if(${stormType} == "line") -THOSE ATTENDING THE !**event/venue name or location**! ARE IN THE PATH OF THESE STORMS AND SHOULD PREPARE FOR IMMINENT DANGEROUS WEATHER CONDITIONS. SEEK SHELTER NOW. - -#else -THOSE ATTENDING THE !**event/venue name or location**! ARE IN THE PATH OF THIS STORM AND SHOULD PREPARE FOR IMMINENT DANGEROUS WEATHER CONDITIONS. SEEK SHELTER NOW. - -#end -#end -##################### -## CALL TO ACTIONS ## -##################### -####################################################################### -## Check to see if we've selected any calls to action. In our .xml file -## we ended each CTA bullet ID with "CTA" for this reason as a 'trip' -####################################################################### -#foreach (${bullet} in ${bullets}) -#if(${bullet.endsWith("CTA")}) -#set($ctaSelected = "YES") -#end -#end -## -#if(${ctaSelected} == "YES") - -PRECAUTIONARY/PREPAREDNESS ACTIONS... -#end -## - -${ashfallCTA} - -#if(${list.contains(${bullets}, "genericCTA")}) -#if(${stormType} == "line") -AS THUNDERSTORMS MOVE OVER THE WATER...BOATERS CAN EXPECT GUSTY WINDS AND HIGH WAVES. MOVE TO SAFE HARBOR OR STAY CLOSE TO SHORE UNTIL THESE STORMS PASS. - -#else -AS THIS THUNDERSTORM MOVES OVER THE WATER...BOATERS CAN EXPECT GUSTY WINDS AND HIGH WAVES. MOVE TO SAFE HARBOR OR STAY CLOSE TO SHORE UNTIL THE STORM PASSES. - -#end -#end -#if(${list.contains(${bullets}, "gustyWindsCTA")}) -#if(${stormType} == "line") -MARINERS CAN EXPECT GUSTY WINDS...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THESE STORMS PASS. - -#else -MARINERS CAN EXPECT GUSTY WINDS...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THIS STORM PASSES. - -#end -#end -#if(${list.contains(${bullets}, "hailWindsCTA")}) -#if(${stormType} == "line") -MARINERS CAN EXPECT ${windCTA}${hailCTA}...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THESE STORMS PASS. - -#else -MARINERS CAN EXPECT ${windCTA}${hailCTA}...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THIS STORM PASSES. - -#end -#end -#if(${list.contains(${bullets}, "nonThunderstormCTA")}) -MARINERS CAN EXPECT GUSTY WINDS...AND INCREASING WAVES. BOATERS...ESPECIALLY THOSE UNDER SAIL...SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THE HIGH WINDS SUBSIDE. - -#end -#if(${list.contains(${bullets}, "waterspoutCTA")}) -THUNDERSTORMS CAN PRODUCE SUDDEN WATERSPOUTS. WATERSPOUTS CAN EASILY OVERTURN BOATS AND CREATE LOCALLY HAZARDOUS SEAS. SEEK SAFE HARBOR IMMEDIATELY. - -#end -#if(${list.contains(${bullets}, "lightningCTA")}) -FREQUENT LIGHTNING IS OCCURRING WITH THIS STORM. IF CAUGHT ON THE OPEN WATER STAY BELOW DECK IF POSSIBLE...KEEP AWAY FROM UNGROUNDED METAL OBJECTS. - -#end -#if(${list.contains(${bullets}, "reportCTA")}) -REPORT SEVERE WEATHER TO THE COAST GUARD OR NEAREST LAW ENFORCEMENT AGENCY. THEY WILL RELAY YOUR REPORT TO THE NATIONAL WEATHER SERVICE OFFICE. - -#end -#if(${ctaSelected} == "YES") -&& -#end -############# -## WATCHES ## -############# -#if(${list.contains(${includedWatches}, "torWatches")}) -#inserttorwatches(${watches}, ${list}, ${secondtimezone}, ${dateUtil}, ${timeFormat}) -#end -#if(${list.contains(${includedWatches}, "svrWatches")}) -#insertsvrwatches(${watches}, ${list}, ${secondtimezone}, ${dateUtil}, ${timeFormat}) -#end -#end -## -## ##################################################################### -## MWS EXP PRODUCT -## ##################################################################### -## Altered expiration headline for cleaner wording and to match NWS Directive 10-314 -######################################################################## -#if(${action}=="EXP") -#if(${productClass}=="T") -THIS IS A TEST MESSAGE.## -#end -...THE ${warningType} ## -#if(${now.compareTo(${expire})} > -1) -EXPIRED AT ${dateUtil.format(${expire}, ${timeFormat.clock}, 15, ${localtimezone})}... -#else -WILL EXPIRE AT ${dateUtil.format(${expire}, ${timeFormat.clock}, 15, ${localtimezone})}... -#end - -THE AFFECTED AREAS WERE... -#foreach (${area} in ${areas}) -${area.name}... -#end - -###################################################################### -## Setup eventType for wording in the End of Warning Statement -###################################################################### -#set($stormline = " HAS") -#set($pose = "POSES") -#if(${stormType} == "line") - #set($stormline = "S HAVE") - #set($pose = "POSE") -#end -#set($eventType = "!**STORMS**! HAVE") -#if(${list.contains(${bullets}, "thunderstorm")}) - #set($eventType = "THUNDERSTORM${stormline}") -#end -#if(${list.contains(${bullets}, "shower")}) - #set($eventType = "SHOWER${stormline}") -#end -#if(${list.contains(${bullets}, "cloud")}) - #set($eventType = "CLOUD${stormline}") -#end -#if(${list.contains(${bullets}, "front")}) - #set($eventType = "FRONT HAS") - #set($pose = "POSES") -#end -#if(${list.contains(${bullets}, "volcano")}) - #set($eventType = "VOLCANO HAS") - #set($pose = "POSES") -#end - -####################################################################### -## Section for end of warning statements. Replaced default wording with -## a better defined reason for the end to the warning. -####################################################################### -#set($expwarning = "THE ${eventType} !** WEAKENED / MOVED OUT OF THE WARNED AREA **! AND NO LONGER ${pose} A SIGNIFICANT THREAT TO BOATERS.") -#if(${list.contains(${bullets}, "weakenedWarnEnd")}) - #set($expwarning = "THE ${eventType} WEAKENED AND NO LONGER ${pose} A SIGNIFICANT THREAT TO BOATERS.") -#end -#if(${list.contains(${bullets}, "movedWarnEnd")}) - #set($expwarning = "THE ${eventType} MOVED OUT OF THE AREA AND NO LONGER ${pose} A SIGNIFICANT THREAT TO BOATERS.") -#end -#if(${list.contains(${bullets}, "volcano")}) - #set($expwarning = "THE ${eventType} STOPPED ERUPTING AND NO LONGER ${pose} A SIGNIFICANT THREAT TO BOATERS.") -#end - -${expwarning} - -############# -## WATCHES ## -############# -#if(${list.contains(${includedWatches}, "torWatches")}) -#inserttorwatches(${watches}, ${list}, ${secondtimezone}, ${dateUtil}, ${timeFormat}) -#end -#if(${list.contains(${includedWatches}, "svrWatches")}) -#insertsvrwatches(${watches}, ${list}, ${secondtimezone}, ${dateUtil}, ${timeFormat}) -#end -#end - -## -## ##################################################################### -## END OF MWS PRODUCTS -## ##################################################################### -## -#if(${productClass}=="T") -THIS IS A TEST MESSAGE. DO NOT TAKE ACTION BASED ON THIS MESSAGE. - -#end - -#printcoords(${areaPoly}, ${list}) - -#tml(${TMLtime}, ${timeFormat}, ${movementDirection}, ${movementInKnots}, ${eventLocation}) - -################################################################## -## Waterspout/Hail/Wind Tags used by CR for IBW -################################################################## - -#if($spoutTag.length() > 0) -${spoutTag} -#end -HAIL...${hailTag}IN -WIND...${windTag}KTS - -$$ - -#parse("forecasterName.vm") diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSpecialMarineWarningFollowup.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSpecialMarineWarningFollowup.xml deleted file mode 100644 index 282c828cb2..0000000000 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSpecialMarineWarningFollowup.xml +++ /dev/null @@ -1,254 +0,0 @@ - - - - - - - - - - - - - - - nmi - kn - - - - Coastal Marine Zones - - - - - COR - CON - CAN - EXP - - - - - MA.W - - - - false - - - true - - - - torWatches - svrWatches - - - - - 30 - - 30 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactStatements.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactStatements.vm index da4ff95233..47d0c6abcb 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactStatements.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactStatements.vm @@ -5,7 +5,6 @@ ## VERSION AWIPS II 1.0 -- 2-06-2013 OB13.2.1-5 ## ## EDITED EVAN BOOKBINDER 2-25-13 FOR IBW 2013 ## ## EDITED PHIL KURIMSKI 5-20-13 FOR UPDATED IMPACT STATEMENTS ## -## EDITED PHIL KURIMSKI 9-17-13 FOR SMW IMPACT STATEMENTS ## ################################################################ ## ################################################################ @@ -16,7 +15,6 @@ ##SET SOME INITIAL VARIABLES #set ($svrimpact = "") #set ($torimpact = "") -#set ($smwimpact = "") ################################################################ ## First create the Impact Statements for the SVR template ################################################################ @@ -109,10 +107,6 @@ #elseif(${phenomena}=="TO") #set ($svrimpact = "") #end -################################################################ -## Finally create the Impact Statements for the SMW template -################################################################ -#set($smwimpact = "OVERTURNED AND CAPSIZED BOATS.") ############################################################################ ## End of File ############################################################################ diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactTornadoWarning.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactTornadoWarning.vm index 292b2a12fd..a62a306e89 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactTornadoWarning.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactTornadoWarning.vm @@ -1,13 +1,15 @@ -########################################################## -## TORNADO WARNING TEMPLATE ## -## FOR CR IMPACT BASED TOR INITIATIVE ## -## CREATED BY PHIL KURIMSKI - WFO DTX ## -## UPDATED -- 2-04-2012 OB13.2.1-5 impact stmts ## -## UPDATED -- Bookbinder 2/22/13 2013 IBW Changes ## -## UPDATED -- Kurimski 5/20/13 Addl IBW Changes ## -## UPDATED -- Kurimski 9/17/13 Tor Emer Headline ## -## UPDATED -- Bookbinder 9/18/2013 implement config.vm ## -########################################################## +################################################################ +## TORNADO WARNING TEMPLATE ## +## FOR CR IMPACT BASED TOR INITIATIVE ## +## CREATED BY PHIL KURIMSKI - WFO DTX ## +## VERSION AWIPS II 1.0 -- 2-21-2012 OB12.1.1-1 ## +## VERSION AWIPS II 1.1 -- 2-29-2012 OB12.2.1-4 ## +## VERSION AWIPS II 1.2 -- 4-20-2012 ## +## BY QINGLU LIN 7-31-2012 DR 15217 use roundAndPad ## +## VERSION AWIPS II 1.3 -- 2-04-2012 OB13.2.1-5 impact stmts ## +## VERSION AWIPS II 1.4 -- Bookbinder 2/22/13 2013 IBW Changes## +## VERSION AWIPS II 1.5 -- Kurimski 5/20/13 Addl IBW Changes ## +################################################################ ## Commented out Impact statements Feb 2013 and created file to ## be parsed into the template called impactStatements.vm ## Changes to the impact statements can be made to this file @@ -15,7 +17,6 @@ ################################################################ ## ESTABLISH SOME INITIAL VARIABLES ############################ ################################################################ -#parse("config.vm") #set($preAmble = "") #set($hailSize = 0) #set($reportType = "A TORNADO WAS REPORTED") @@ -200,13 +201,14 @@ ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} #end ########################################################################## -### TORNADO EMERGENCY Headline # +### TORNADO EMERGENCY as a Headline...can be implemented at a later date # ########################################################################## +#* #if(${list.contains(${bullets}, "torEmergency")}) ...TORNADO EMERGENCY FOR !** EDIT LOCATION(S) **!... #end - +*# #headline(${officeLoc}, ${backupSite}) ################## @@ -444,13 +446,12 @@ THIS IS A TEST MESSAGE. ## THIS IS A TEST MESSAGE. ## #end #thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone})...${reportType} ## -##Many of the variables passed below are controlled by config.vm #if(${stormType} == "line") -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxLandNearDistance}, ${overPhrase}, ${maxLandOverDistance}, ${landDistanceUnits}, ${useSecondReferenceLine}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "MILES", false) #else -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxLandNearDistance}, ${overPhrase}, ${maxLandOverDistance}, ${landDistanceUnits}, ${useSecondReferenceCell}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "MILES", false) #end -#if(${movementSpeed} < ${landStationary} || ${stationary}) +#if($movementSpeed < 3 || ${stationary}) #if(${stormType} == "line") ...AND ARE NEARLY STATIONARY. #else @@ -520,10 +521,10 @@ THIS IS A TEST MESSAGE. ## ############################################## #if(${list.contains(${bullets}, "specialEvent")}) #if(${stormType} == "line") -THOSE ATTENDING !**event/venue name or location**! ARE IN THE PATH OF THESE STORMS AND SHOULD PREPARE FOR IMMINENT DANGEROUS AND POTENTIALLY LIFE THREATENING WEATHER CONDITIONS. SEEK SHELTER NOW. +EVERYONE AT !**event/venue name or location**! ARE IN THE PATH OF THESE STORMS AND SHOULD PREPARE FOR IMMINENT DANGEROUS AND POTENTIALLY LIFE THREATENING WEATHER CONDITIONS. SEEK SHELTER NOW. #else -THOSE ATTENDING !**event/venue name or location**! ARE IN THE PATH OF THIS STORM AND SHOULD PREPARE FOR IMMINENT DANGEROUS AND POTENTIALLY LIFE THREATENING WEATHER CONDITIONS. SEEK SHELTER NOW. +EVERYONE AT !**event/venue name or location**! ARE IN THE PATH OF THIS STORM AND SHOULD PREPARE FOR IMMINENT DANGEROUS AND POTENTIALLY LIFE THREATENING WEATHER CONDITIONS. SEEK SHELTER NOW. #end #end diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactTornadoWarning.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactTornadoWarning.xml index b586372932..b800109806 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactTornadoWarning.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactTornadoWarning.xml @@ -8,25 +8,11 @@ Evan Bookbinder 09-11-2012 Added settings for locations shapefile Added new areaSource objects Phil Kurimski 02-04-2013 OB13.2.1-5 Changed Sig Tor to Considerable - Phil Kurimski 05-20-2013 Added selection for very weak tornadoes and landspouts - Phil Kurimski 09-19-2013 added geospatialConfig.xml + Phil Kurimski 05-20-2013 Added selection for very weak tornadoes and landspouts --> - - - - - - - - - mi mph @@ -128,7 +114,7 @@ turned on unless the corresponding .vm file is turned on in a given template's . - + @@ -192,14 +178,15 @@ turned on unless the corresponding .vm file is turned on in a given template's . - - - + + + + - + @@ -216,5 +203,156 @@ turned on unless the corresponding .vm file is turned on in a given template's . + + + County + 0 + AND + 0 + COUNTYNAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + FIPS + NAME + + parent + + + + + + + 25 + + + + NAME + AREA + POINTS + + + + + + + + + 1 + 100 + + distance + warngenlev + + + + + NAME + AREA + POINTS + + + + + + + + + 5 + 100 + + distance + + + + + 1 + true + 8.0 + 5 + 5 + 10 + 8 + Name + AREA + COUNTYNAME + + STATE + STATE + countyTypes.txt + + warngenlev + population + distance + + + + + + + + + + + + + NAME + 1 + AREA + TRACK + true + 20 + 10 + + + + + + + + + + warngenlev + population + distance + + + + + NAME + 1 + AREA + TRACK + true + 10 + 10 + + distance + + + + + + + + + + + + + + + + WarnGenLoc + County + + States + TIMEZONES + TIME_ZONE + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/marineWeatherStatement.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/marineWeatherStatement.vm index 5cea94e171..8d286c26ba 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/marineWeatherStatement.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/marineWeatherStatement.vm @@ -1,15 +1,18 @@ ##################################################### ## MARINE WEATHER STATEMENT STANDALONE ## ## CREATED BY PHIL KURIMSKI - WFO DTX ## +## VERSION AWIPS II 1.0 -- FEB 24 2011 OB11.2 ## +## VERSION AWIPS II 1.1 -- APR 14 2011 OB11.4 ## +## VERSION AWIPS II 1.2 -- JUL 14 2011 OB11.7 ## +## VERSION AWIPS II 1.3 -- SEP 22 2011 OB11.8 ## +## VERSION AWIPS II 1.4 -- JAN 25 2012 OB12.1.1-1 ## +## Added coding for no headline in Version 1.4 ## ## VERSION AWIPS II 1.5 -- MAR 2 2012 OB12.2.1-4 ## ## Added coding for dense fog in Version 1.5 ## ## Evan Bookbinder 4-25-2012 for OB 12.3.1 (MND) ## ## Phil Kurimski -- SEP 10 2012 OB12.9.1-12 ## -## Phil Kurimski -- FEB 07 2013 OB13.2.1-5 ## -## Phil Kurimski -- SEP 17 2013 OB13.5.2-4 ## -## Evan Bookbinder -- SEP 18 2013 Implemented config.vm +## Phil Kurimski FEB 07 2013 OB13.2.1-5 ## ##################################################### -#parse("config.vm") ## Set the visibility variable to be used for dense fog ## This variable can be changed by the local office and will ## set the visibility in the 3rd bullet and dense fog CTA @@ -266,13 +269,12 @@ THIS IS A TEST MESSAGE. ## #end #thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) ...${report} ${reportLocation} ## -##Many of the variables passed below are controlled by config.vm #if(${stormType} == "line") -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxMarineNearDistance}, ${overPhrase}, ${maxMarineOverDistance}, ${marineDistanceUnits}, ${useSecondReferenceLine}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "MILES", false) #else -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxMarineNearDistance}, ${overPhrase}, ${maxMarineOverDistance}, ${marineDistanceUnits}, ${useSecondReferenceCell}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "MILES", true) #end -#if(${movementSpeed} < ${marineStationary} || ${stationary}) +#if($movementSpeed < 3 || ${stationary}) . ${reportType2} NEARLY STATIONARY. #else ...MOVING #direction(${movementDirectionRounded}) AT ${mathUtil.roundTo5(${movementSpeed})} KNOTS. @@ -302,7 +304,7 @@ THIS IS A TEST MESSAGE. ## ############################################## #if(${list.contains(${bullets}, "specialEvent")}) -THOSE ATTENDING !**event/venue name or location**! ARE IN THE PATH OF ${specialEvent} AND SHOULD PREPARE FOR IMMINENT DANGEROUS WEATHER CONDITIONS. SEEK SHELTER NOW. +EVERYONE AT !**event/venue name or location**! ARE IN THE PATH OF ${specialEvent} AND SHOULD PREPARE FOR IMMINENT DANGEROUS WEATHER CONDITIONS. SEEK SHELTER NOW. #end ##################### @@ -325,49 +327,24 @@ PRECAUTIONARY/PREPAREDNESS ACTIONS... ## #if(${list.contains(${bullets}, "genericCTA")}) -#if(${stormType} == "line") -MARINERS CAN EXPECT GUSTY WINDS UP TO 33 KNOTS...LOCALLY HIGHER WAVES...AND LIGHTNING STRIKES. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY UNTIL THESE STORMS PASS. - -#else MARINERS CAN EXPECT GUSTY WINDS UP TO 33 KNOTS...LOCALLY HIGHER WAVES...AND LIGHTNING STRIKES. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY UNTIL THIS STORM PASSES. -#end #end #if(${list.contains(${bullets}, "heavyRainCTA")}) -#if(${stormType} == "line") -MARINERS CAN EXPECT GUSTY WINDS UP TO 33 KNOTS...LOCALLY HIGHER WAVES...LIGHTNING STRIKES...AND HEAVY DOWNPOURS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY UNTIL THESE STORMS PASS. - -#else MARINERS CAN EXPECT GUSTY WINDS UP TO 33 KNOTS...LOCALLY HIGHER WAVES...LIGHTNING STRIKES...AND HEAVY DOWNPOURS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY UNTIL THIS STORM PASSES. -#end #end #if(${list.contains(${bullets}, "possibleSmwCTA")}) -#if(${stormType} == "line") -THIS ${stormline} WILL LIKELY PRODUCE WINDS UP TO 33 KNOTS...AND COULD POSE A SERIOUS HAZARD FOR BOATERS. A SPECIAL MARINE WARNING MAY EVENTUALLY BE REQUIRED WHEN THESE STORMS REACH THE NEARSHORE WATERS. BOATERS SHOULD CONSIDER HEADING FOR SHORE BEFORE THESE STORMS ARRIVE. - -#else THIS ${stormline} WILL LIKELY PRODUCE WINDS UP TO 33 KNOTS...AND COULD POSE A SERIOUS HAZARD FOR BOATERS. A SPECIAL MARINE WARNING MAY EVENTUALLY BE REQUIRED WHEN THIS STORM REACHES THE NEARSHORE WATERS. BOATERS SHOULD CONSIDER HEADING FOR SHORE BEFORE THE STORM ARRIVES. -#end #end #if(${list.contains(${bullets}, "likelySmwCTA")}) -#if(${stormType} == "line") -THIS ${stormline} WILL LIKELY PRODUCE WINDS IN EXCESS OF 34 KNOTS...AND IS LIKELY TO POSE A SERIOUS HAZARD FOR BOATERS. A SPECIAL MARINE WARNING WILL LIKELY BE REQUIRED WHEN THESE STORMS REACH THE NEARSHORE WATERS. BOATERS SHOULD CONSIDER HEADING FOR SHORE BEFORE THESE STORMS ARRIVE. - -#else THIS ${stormline} WILL LIKELY PRODUCE WINDS IN EXCESS OF 34 KNOTS...AND IS LIKELY TO POSE A SERIOUS HAZARD FOR BOATERS. A SPECIAL MARINE WARNING WILL LIKELY BE REQUIRED WHEN THIS STORM REACHES THE NEARSHORE WATERS. BOATERS SHOULD CONSIDER HEADING FOR SHORE BEFORE THE STORM ARRIVES. -#end #end #if(${list.contains(${bullets}, "lightningCTA")}) -#if(${stormType} == "line") -INTENSE LIGHTNING IS OCCURRING WITH THESE STORMS. IF CAUGHT ON THE OPEN WATER STAY BELOW DECK IF POSSIBLE...KEEP AWAY FROM UNGROUNDED METAL OBJECTS. - -#else INTENSE LIGHTNING IS OCCURRING WITH THIS STORM. IF CAUGHT ON THE OPEN WATER STAY BELOW DECK IF POSSIBLE...KEEP AWAY FROM UNGROUNDED METAL OBJECTS. -#end #end #if(${list.contains(${bullets}, "reportCTA")}) REPORT SEVERE WEATHER TO THE COAST GUARD OR NEAREST LAW ENFORCEMENT AGENCY. THEY WILL RELAY YOUR REPORT TO THE NATIONAL WEATHER SERVICE FORECAST OFFICE. diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/marineWeatherStatement.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/marineWeatherStatement.xml index 94af0ead79..672c287c51 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/marineWeatherStatement.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/marineWeatherStatement.xml @@ -3,22 +3,9 @@ Phil Kurimski WFO DTX 27 February 2012 Evan Bookbinder 09-11-2012 Added settings for locations shapefile Added new areaSource objects - Phil Kurimski 09-19-2013 added geospatialConfig.xml --> - - - - - - - - nmi @@ -89,7 +76,7 @@ turned on unless the corresponding .vm file is turned on in a given template's . - + @@ -129,7 +116,7 @@ turned on unless the corresponding .vm file is turned on in a given template's . - + @@ -152,7 +139,8 @@ turned on unless the corresponding .vm file is turned on in a given template's . - + + @@ -168,4 +156,147 @@ turned on unless the corresponding .vm file is turned on in a given template's . + + + MarineZones + 0 + AND + 0 + NAME + NAME + NAME + countyTypes.txt + ID + NAME + + parent + + + + + + + 25 + + + + NAME + AREA + POINTS + + + + + + + + + 1 + 100 + + distance + WARNGENLEV + + + + + NAME + AREA + POINTS + + + + + + + + + 5 + 100 + + distance + WARNGENLEV + + + + + + 1 + false + 10.0 + 5 + 5 + 4 + 8 + Name + AREA + Name + Name + Name + countyTypes.txt + + + + + + + + + + distance + + + + + NAME + 1 + AREA + TRACK + true + 20 + 20 + + distance + + + + + + + + + + + + + NAME + 1 + AREA + TRACK + true + 10 + 20 + + distance + + + + + + + + + + + + + + WarnGenLoc + MarineZones + MarineZones + TIMEZONES + TIME_ZONE + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/marineWeatherStatementAshfall.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/marineWeatherStatementAshfall.vm index 74a156b1e8..aefb1522dc 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/marineWeatherStatementAshfall.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/marineWeatherStatementAshfall.vm @@ -6,13 +6,9 @@ ## Evan Bookbinder 4-25-2012 for OB 12.3.1 (MND) ## ## Phil Kurimski SEP 10 2012 OB12.9.1-12 ## ## Phil Kurimski FEB 07 2013 OB13.2.1-5 ## -## Phil Kurimski SEP 16 2013 OB13.5.2-4 ## -## Evan Bookbinder SEP 18 2013 Implemented config.vm ## -######################################################### -#parse("config.vm") -########################################## +###################################################### ## Set null variables used in the template -########################################## +######################################### #set($capable = "") #set($hailType = "") #if(${productClass}=="O") @@ -157,13 +153,12 @@ THIS IS A TEST MESSAGE. ## #end #thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) ...${report} ## -##Many of the variables passed below are controlled by config.vm #if(${stormType} == "line") -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxMarineNearDistance}, ${overPhrase}, ${maxMarineOverDistance}, ${marineDistanceUnits}, ${useSecondReferenceLine}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "MILES", false) #else -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxMarineNearDistance}, ${overPhrase}, ${maxMarineOverDistance}, ${marineDistanceUnits}, ${useSecondReferenceCell}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "MILES", true) #end -#if(${movementSpeed} < ${marineStationary} || ${stationary}) +#if($movementSpeed < 3 || ${stationary}) . NEARLY STATIONARY. #else MOVING #direction(${movementDirectionRounded}) AT ${mathUtil.roundTo5(${movementSpeed})} KNOTS. diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/marineWeatherStatementAshfall.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/marineWeatherStatementAshfall.xml index f8d740f5a9..f40e6cea45 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/marineWeatherStatementAshfall.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/marineWeatherStatementAshfall.xml @@ -4,22 +4,8 @@ Customized by Tom Birchard WFO DTX 23 September 2011 for Ashfall Evan Bookbinder 09-11-2012 Added settings for locations shapefile Added new areaSource objects - Phil Kurimski 09-19-2013 added geospatialConfig.xml --> - - - - - - - - - nmi kn @@ -138,7 +124,8 @@ turned on unless the corresponding .vm file is turned on in a given template's . - + + @@ -149,4 +136,147 @@ turned on unless the corresponding .vm file is turned on in a given template's . + + + MarineZones + 0 + AND + 0 + NAME + NAME + NAME + countyTypes.txt + ID + NAME + + parent + + + + + + + 25 + + + + NAME + AREA + POINTS + + + + + + + + + 1 + 100 + + distance + WARNGENLEV + + + + + NAME + AREA + POINTS + + + + + + + + + 5 + 100 + + distance + WARNGENLEV + + + + + + false + 1 + 10.0 + 5 + 5 + 4 + 8 + Name + AREA + Name + Name + Name + countyTypes.txt + + + + + + + + + + distance + + + + + NAME + 1 + AREA + TRACK + true + 20 + 20 + + + + + + + + + + distance + + + + + NAME + 1 + AREA + TRACK + true + 10 + 20 + + distance + + + + + + + + + + + + + + WarnGenLoc + MarineZones + MarineZones + TIMEZONES + TIME_ZONE + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/mileMarkers.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/mileMarkers.vm index 96104c8885..a4393346bd 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/mileMarkers.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/mileMarkers.vm @@ -1,76 +1,75 @@ #* -CREATED 9-16-2013 BY EVAN BOOKBINDER -### THIS PLUG-IN VM FILE ALLOWS YOU TO CONSOLIDATE ALL YOUR -### MILEMARKER/EXIT/ROUTE OUTPUT INTO A SINGLE FUNCTION CALL -### A #parse("mileMarkers.vm") entry in your WarnGen .vm templates will thus -### generate any milemarker info intersected by your warning polygon. +CREATED 1-25-2012 BY MIKE DANGELO AND EVAN BOOKBINDER -##GENERAL INFORMATION## -Mile Marker Macro (VM_global_library.vm): -#macro(mmarkers $markers $id $name $type $simplify) -$markers is a string, and is the exact "variable" set in the XML "pointSource" tag for this road - - -$id is the sequential ID database field to determine logical breaks in the mile markers - set in the XML "pointSource" tag for this road - - +Here are some examples of very simple INTERSTATE output + (one line/sentence per interstate): + +#mmarkers(${i70momm},${i70mommid},"INTERSTATE 70 IN MISSOURI","MILE MARKER",false) +#mmarkers(${i70momm},${i70mommid},"INTERSTATE 70 IN MISSOURI","MILE MARKER",true) +#mmarkers(${i70momm},${i70mommid},"INTERSTATE 70 IN MISSOURI","",false) +#mmarkers(${i70momm},${i70mommid},"INTERSTATE 70 IN MISSOURI","",true) +#mmarkers(${i435mm},${i435mmid},"INTERSTATE 435 IN MISSOURI","",false) +#mmarkers(${i435mm},${i435mmid},"INTERSTATE 435 IN MISSOURI","",true) +#mmarkers(${i435mm},${i435mmid},"INTERSTATE 435 IN MISSOURI","MILE MARKER",false) +#mmarkers(${i435mm},${i435mmid},"INTERSTATE 435 IN MISSOURI","MILE MARKER",true) + +Mile Marker Test Code +macro "mmarkers" use (called out of VM_global_library.vm): +#mmarkers($name, $id, $type, $markers, $simplify) +where the argument: $name is a string "OUTPUT TEXT" of the road name +$id is the sequential ID database field to determine logical breaks in the mile markers $type is a string which describes the type of "marker" - may be "MILE MARKER" or something similar, or blank "" - "" is for use when town names (CHARLESTON) or exit names (THE SUNSET EXIT) +$markers is a string, and is the exact "variable" set in the XML "pointSource" tag for this road + - $simplify is a boolean value (true or false) - true concatenates (FROM MM 2 to 4), - false is a big list (MM 2...3...AND 4) -########################### -CONFIGURATION: -########################### -#COMMENT OUT LINES 61-64 BELOW AS NEEDED, REPLACING/ADDING TO THE EXAMPLE WITH YOUR -#MILE MARKER/ROUTE ENTRIES -#EACH LINE CONTAINS A VARIABLE MM1,MM2,MM3,etc... REFERENCING AN ARRAY (LIST) OF DATA THAT -#WILL BE PASSED TO THE MMARKERS ROUTINE. +From mileMarkers.xml +$databaseName is an array of pointSource objects containing the milemarker names +$databaseId is an array of pointSource objects containing the milemarker IDs +$specificName is an array of plain English names for the Interstates, Routes, etc.. +e.g. +#set ($databaseName = [${i435mm},${i70momm},${i35momm}]) +#set ($databaseId = [${i435mmid},${i70mommid},${i35mommid}]) +#set ($specificName = ['INTERSTATE 435','INTERSTATE 70','INTERSTATE 35']) -The items in the array are as follows: -1.) java Object - A pointSource object from mileMarkers.xml containing the milemarker names -2.) java Object - A pointSource object from mileMarkers.xml containing the milemarker IDs or index -3.) String - A plain English name for the Interstates, Routes, etc.. -4.) String - A plain English name describing the output (mile marker, exit, etc...) - Can be blank ''. Make sure the singular phrase is used (an "S" will be auto-applied for - plural values. e.g. MILE MARKERS 3 AND 10 -5.) Boolean - A true/false value telling the function whether to group the milemarkers where - possible, or list them individually. For mile markers that are text (such as exits or - intersections, false might be a better option) - -NOTE: PLEASE ENSURE PROPER SYNTAX. Java Objects are ${variable}, Text Strings are 'TEXT', and - Booleans are true/false (no quote)..see examples below - ALSO ENSURE THAT EACH LINE CONTAINS A UNIQUE VARIABLE NAME: MM1, MM2, MM3, etc.. - - -HERE IS AN EXAMPLE: - e.g. - #set ($mm1 = [${i435mm},${i435mmid},'INTERSTATE 435','MILE MARKER',true]) - #set ($mm2 = [${i70momm},${i70mommid},'INTERSTATE 70 IN MISSOURI','MILE MARKER',true]) - #set ($mm3 = [${route22mm},${route22mmid},'ROUTE 22','EXIT',true]) - -After creating these, we must create a match list containing all of our variable names - e.g. - #set ($varList = [$mm1,$mm2,$mm3]) +The following code makes upkeep of the mile marker files easier, and is + reccomended for use. +Substitute all your "INTERSTATE NAME(s)" into the array: $specificName +Likewise, +Substitute all your corresponding database table names (${tablename}) for those + interstates into the array: $databaseName +You may also use town names or exit names + in the "name" field of your database tables. *# - #set($hits = 0) #set($bigList = '') - -##set ($mm1 = [${i435mm},${i435mmid},'INTERSTATE 435','MILE MARKER',true]) -##set ($mm2 = [${i70momm},${i70mommid},'INTERSTATE 70 IN MISSOURI','MILE MARKER',true]) -##set ($mm3 = [${i35momm},${i35mommid},'INTERSTATE 70 IN KANSAS','MILE MARKER',true]) -##set ($varList = [$mm1,$mm2,$mm3]) - -#foreach ($var in $varList) -#set ($checker = "#mmarkers(${list.get(${var},0)},${list.get(${var},1)},${list.get(${var},2)},${list.get(${var},3)},${list.get(${var},4)})") +##set ($databaseName = [${i435mm},${i70momm},${i35momm}]) +##set ($databaseId = [${i435mmid},${i70mommid},${i35mommid}]) +##set ($specificName = ['INTERSTATE 435','INTERSTATE 70','INTERSTATE 35']) +#set ($itemCount = 0) +#foreach($specName in $specificName) +#set ($itemCount = $itemCount + 1) +#set ($itemCount2 = 0) +#foreach($dbName in $databaseName) +#set ($itemCount2 = $itemCount2 + 1) +#set ($itemCount3 = 0) +#foreach($dbId in $databaseId) +#set ($itemCount3 = $itemCount3 + 1) +#if ($itemCount3 == $itemCount2 && $itemCount2 == $itemCount) +#set ($checker = "#mmarkers(${dbName},${dbId},${specName},'MILE MARKER',true)") #if ($checker.length() > 0) #set ($hits = $hits + 1) #set ($bigList = "$bigList $checker") #end #end +#end +#end +#end #if ($hits == 1) THIS INCLUDES$bigList #end diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/mileMarkers.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/mileMarkers.xml index ae1f732c41..ff97807137 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/mileMarkers.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/mileMarkers.xml @@ -1,45 +1,29 @@ - \ No newline at end of file + + --> \ No newline at end of file diff --git a/nativeLib/org.apache.qpid/org.apache.qpid.ecl b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/milemarkers.vm similarity index 100% rename from nativeLib/org.apache.qpid/org.apache.qpid.ecl rename to edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/milemarkers.vm diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.gempak/gov.noaa.nws.ncep.common.dataplugin.gempak.ecl b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/milemarkers.xml similarity index 100% rename from ncep/gov.noaa.nws.ncep.common.dataplugin.gempak/gov.noaa.nws.ncep.common.dataplugin.gempak.ecl rename to edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/milemarkers.xml diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning.vm index 7c85ae101a..a850bd864e 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning.vm @@ -1,18 +1,18 @@ ###################################################### ## DAM BREAK FFW TEMPLATE ## ## CREATED BY PHIL KURIMSKI - WFO DTX ## -## RECENT VERSION HISTORY: +## VERSION AWIPS II 1.0 - APR 13 2011 OB11.4 ## +## VERSION AWIPS II 1.1 - JUL 14 2011 OB11.7 ## +## VERSION AWIPS II 1.2 - AUG 18 2011 OB11.8 ## +## VERSION AWIPS II 1.3 - SEP 23 2011 OB11.8 ## ## VERSION AWIPS II 1.4 - SEP 13 2012 OB12.9.1-12 ## ## to add Flash Flood Emergency Headline ## ## VERSION AWIPS II 1.5 - FEB 08 2013 OB13.2.1-5 ## ## to update CTA statements ## ## VERSION AWIPS II 1.6 - JUN 26 2013 OB13.4.1 ## ## to add "U" Unknown servity ## -## VERSION AWIPS II 1.7 - SEP 17 2013 OB13.5.2-4 ## -## Phil Kurimski - Added FFW Emergency Headline ## ###################################################### ## -#parse("config.vm") #if(${action} == "EXT") #set($starttime = "000000T0000Z") #set($extend = true) @@ -42,7 +42,6 @@ #set($ruleofthumb = "") #set($sitespecCTA = "") #set($volcanoCTA = "") -#set($emergencyHeadline = "!** ENTER LOCATION **!") #if(${list.contains(${bullets}, "levee")}) #set($ic = "DM") #set($hycType = "A LEVEE FAILURE") @@ -97,9 +96,78 @@ #end ######################################################################### ## Parse command to include a damInfo.vm file with site specific dam -## information. Sites can include their information in this file. +## information. Sites can include this information in a separate file or +## include in the template per the coding below. ######################################################################### ##parse ("damInfo.vm") +#* +######################################################################### +## The next section is for site specific dams. Each site should take the +## example below and customize it for their dams with the information +## from the LLL-damInfo.txt file in AWIPS 1. If you have any questions +## please contact Phil Kurimski - WFO DTX +######################################################################### +#if(${list.contains(${bullets}, "BigRockDam")}) + #set($riverName = "PHIL RIVER") + #set($damName = "BIG ROCK DAM") + #set($cityInfo = "EVAN...LOCATED ABOUT 3 MILES") +#end +#if(${list.contains(${bullets}, "BigRockhighfast")}) + #set($scenario = "IF A COMPLETE FAILURE OF THE DAM OCCURS...THE WATER DEPTH AT EVAN COULD EXCEED 18 FEET IN 16 MINUTES.") +#end +#if(${list.contains(${bullets}, "BigRockhighnormal")}) + #set($scenario = "IF A COMPLETE FAILURE OF THE DAM OCCURS...THE WATER DEPTH AT EVAN COULD EXCEED 23 FEET IN 31 MINUTES.") +#end +#if(${list.contains(${bullets}, "BigRockmediumfast")}) + #set($scenario = "IF A COMPLETE FAILURE OF THE DAM OCCURS...THE WATER DEPTH AT EVAN COULD EXCEED 14 FEET IN 19 MINUTES.") +#end +#if(${list.contains(${bullets}, "BigRockmediumnormal")}) + #set($scenario = "IF A COMPLETE FAILURE OF THE DAM OCCURS...THE WATER DEPTH AT EVAN COULD EXCEED 17 FEET IN 32 MINUTES.") +#end +#if(${list.contains(${bullets}, "BigRockruleofthumb")}) + #set($ruleofthumb = "FLOOD WAVE ESTIMATE BASED ON THE DAM IN IDAHO: FLOOD INITIALLY HALF OF ORIGINAL HEIGHT BEHIND DAM AND 3-4 MPH; 5 MILES IN 1/2 HOURS; 10 MILES IN 1 HOUR; AND 20 MILES IN 9 HOURS.") +#end +#if(${list.contains(${bullets}, "BranchedOakDam")}) + #set($riverName = "KELLS RIVER") + #set($damName = "BRANCHED OAK DAM") + #set($cityInfo = "DANGELO...LOCATED ABOUT 6 MILES") +#end +#if(${list.contains(${bullets}, "BranchedOakhighfast")}) + #set($scenario = "IF A COMPLETE FAILURE OF THE DAM OCCURS...THE WATER DEPTH AT DANGELO COULD EXCEED 19 FEET IN 32 MINUTES.") +#end +#if(${list.contains(${bullets}, "BranchedOakhighnormal")}) + #set($scenario = "IF A COMPLETE FAILURE OF THE DAM OCCURS...THE WATER DEPTH AT DANGELO COULD EXCEED 26 FEET IN 56 MINUTES.") +#end +#if(${list.contains(${bullets}, "BranchedOakmediumfast")}) + #set($scenario = "IF A COMPLETE FAILURE OF THE DAM OCCURS...THE WATER DEPTH AT DANGELO COULD EXCEED 14 FEET IN 33 MINUTES.") +#end +#if(${list.contains(${bullets}, "BranchedOakmediumnormal")}) + #set($scenario = "IF A COMPLETE FAILURE OF THE DAM OCCURS...THE WATER DEPTH AT DANGELO COULD EXCEED 20 FEET IN 60 MINUTES.") +#end +#if(${list.contains(${bullets}, "BranchedOakruleofthumb")}) + #set($ruleofthumb = "FLOOD WAVE ESTIMATE BASED ON THE DAM IN IDAHO: FLOOD INITIALLY HALF OF ORIGINAL HEIGHT BEHIND DAM AND 3-4 MPH; 5 MILES IN 1/2 HOURS; 10 MILES IN 1 HOUR; AND 20 MILES IN 9 HOURS.") +#end +####################################################################### +## Look for site specific selections to override the 4th bullet and +## to set up the headlines and additional info used in the product. +## This loop assumes you end each site specific selection with +## the word "Dam". If you end with a different word you will need +## to modify the loop below. +######################################################################## +#foreach (${bullet} in ${bullets}) +#if(${bullet.endsWith("Dam")}) + #set($ctaSelected = "YES") + #set($sitespecSelected = "YES") + #set($hycType = "THE ${riverName} BELOW ${damName}") + #set($reportType1 = "${reportType2} ${damName} ON THE ${riverName}") + #set($addInfo = "THE NEAREST DOWNSTREAM TOWN IS ${cityInfo} FROM THE DAM.") + #set($sitespecCTA = "IF YOU ARE IN LOW LYING AREAS BELOW THE ${damName} YOU SHOULD MOVE TO HIGHER GROUND IMMEDIATELY.") +#end +#end +####################################################################### +## End of Site Specific Dam Information +####################################################################### +*# ## ${WMOId} ${vtecOffice} 000000 ${BBBId} FFW${siteId} @@ -121,14 +189,15 @@ ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} ...THIS MESSAGE IS FOR TEST PURPOSES ONLY... #end -#################################### -## Flash Flood Emergency Headline # -#################################### +############################################################################# +## Flash Flood Emergency Headline...can be implemented at a later date # +############################################################################# +#* #if(${list.contains(${bullets}, "ffwEmergency")} ) -...FLASH FLOOD EMERGENCY FOR ${emergencyHeadline}... +...FLASH FLOOD EMERGENCY FOR !** LOCATION **!... #end - +*# #headlineext(${officeLoc}, ${backupSite}, ${extend}) * ## @@ -179,7 +248,7 @@ THIS IS A TEST MESSAGE. ## ## Flash Flood Emergency per NWS 10-922 Directive goes with third bullet # ########################################################################## #if(${list.contains(${bullets}, "ffwEmergency")}) -#wrapText("THIS IS A FLASH FLOOD EMERGENCY FOR ${emergencyHeadline}. SEEK HIGHER GROUND NOW!" 2 2) +#wrapText("THIS IS A FLASH FLOOD EMERGENCY FOR !**ENTER LOCATION**!. SEEK HIGHER GROUND NOW! THIS IS A POTENTIALLY LIFE THREATENING SITUATION!" 2 2) #end #set($phenomena = "FLASH FLOOD") diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning.xml index 8040086cc1..6edf1e7b75 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning.xml @@ -13,22 +13,9 @@ Modified Phil Kurimski 02-05-2013 Reordered GUI selections to make more sense Added additional valid duration times Modified Evan Bookbinder 06-26-2013 Added "U" Unknown severity - Modified Phil Kurimski 09-19-2013 added geospatialConfig.xml + --> - - - - - - - - - mi mph @@ -191,7 +178,9 @@ turned on unless the corresponding .vm file is turned on in a given template's . - + + + @@ -261,12 +250,13 @@ turned on unless the corresponding .vm file is turned on in a given template's . - + + + - + - @@ -306,6 +296,117 @@ turned on unless the corresponding .vm file is turned on in a given template's . false + + + County + 0 + AND + 0 + COUNTYNAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + FIPS + NAME + + parent + + + + + + + 25 + + + + + true + 8.0 + 5 + 5 + 4 + 8 + Name + AREA + COUNTYNAME + + STATE + STATE + countyTypes.txt + + + + + + + + + + distance + + + + + NAME + 1 + AREA + POINTS + true + 30 + 200 + + warngenlev + population + distance + + + + + + + + + + + + + + NAME + AREA + POINTS + true + 10 + 200 + + distance + + + + + + + + + + + + + + + + + WarnGenLoc + County + States + TIMEZONES + TIME_ZONE + + ffmp_basins 0.064 diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup.vm index 3571a5cf6f..0fc9fa4781 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup.vm @@ -8,10 +8,8 @@ ## Phil Kurimski -- SEP 23 2011 OB11.0.8-8 ## ## Mike Rega -- MAY 03 2012 DR 14885 MND ## ## Phil Kurimski -- FEB 08 2013 CTA stmnts ## -## Phil Kurimski -- SEP 17 2013 FFW Emerg ## ##################################################### ## -#parse("config.vm") #set($headline = "") ## set reportType2 to a default value in case nothing is selected for site specific #set($reportType2 = "THE FAILURE OF") @@ -24,7 +22,6 @@ #set($sitespecCTA = "") #set($addInfo = "") #set($volcanoCTA = "") -#set($emergencyHeadline = "!** ENTER LOCATION **!") #if(${list.contains(${bullets}, "levee")}) #set($ic = "DM") #set($hycType = "A LEVEE FAILURE") @@ -102,9 +99,79 @@ #end ######################################################################### ## Parse command to include a damInfo.vm file with site specific dam -## information. Sites can include their information in this file. +## information. Sites can include this information in a separate file or +## include in the template per the coding below. ######################################################################### ##parse ("damInfo.vm") +#* +######################################################################### +## The next section is for site specific dams. Each site should take the +## example below and customize it for their dams with the information +## from the LLL-damInfo.txt file in AWIPS 1. If you have any questions +## please contact Phil Kurimski - WFO DTX +######################################################################### +#if(${list.contains(${bullets}, "BigRockDam")}) + #set($riverName = "PHIL RIVER") + #set($damName = "BIG ROCK DAM") + #set($cityInfo = "EVAN...LOCATED ABOUT 3 MILES") +#end +#if(${list.contains(${bullets}, "BigRockhighfast")}) + #set($scenario = "IF A COMPLETE FAILURE OF THE DAM OCCURS...THE WATER DEPTH AT EVAN COULD EXCEED 18 FEET IN 16 MINUTES.") +#end +#if(${list.contains(${bullets}, "BigRockhighnormal")}) + #set($scenario = "IF A COMPLETE FAILURE OF THE DAM OCCURS...THE WATER DEPTH AT EVAN COULD EXCEED 23 FEET IN 31 MINUTES.") +#end +#if(${list.contains(${bullets}, "BigRockmediumfast")}) + #set($scenario = "IF A COMPLETE FAILURE OF THE DAM OCCURS...THE WATER DEPTH AT EVAN COULD EXCEED 14 FEET IN 19 MINUTES.") +#end +#if(${list.contains(${bullets}, "BigRockmediumnormal")}) + #set($scenario = "IF A COMPLETE FAILURE OF THE DAM OCCURS...THE WATER DEPTH AT EVAN COULD EXCEED 17 FEET IN 32 MINUTES.") +#end +#if(${list.contains(${bullets}, "BigRockruleofthumb")}) + #set($ruleofthumb = "FLOOD WAVE ESTIMATE BASED ON THE DAM IN IDAHO: FLOOD INITIALLY HALF OF ORIGINAL HEIGHT BEHIND DAM AND 3-4 MPH; 5 MILES IN 1/2 HOURS; 10 MILES IN 1 HOUR; AND 20 MILES IN 9 HOURS.") +#end +#if(${list.contains(${bullets}, "BranchedOakDam")}) + #set($riverName = "KELLS RIVER") + #set($damName = "BRANCHED OAK DAM") + #set($cityInfo = "DANGELO...LOCATED ABOUT 6 MILES") +#end +#if(${list.contains(${bullets}, "BranchedOakhighfast")}) + #set($scenario = "IF A COMPLETE FAILURE OF THE DAM OCCURS...THE WATER DEPTH AT DANGELO COULD EXCEED 19 FEET IN 32 MINUTES.") +#end +#if(${list.contains(${bullets}, "BranchedOakhighnormal")}) + #set($scenario = "IF A COMPLETE FAILURE OF THE DAM OCCURS...THE WATER DEPTH AT DANGELO COULD EXCEED 26 FEET IN 56 MINUTES.") +#end +#if(${list.contains(${bullets}, "BranchedOakmediumfast")}) + #set($scenario = "IF A COMPLETE FAILURE OF THE DAM OCCURS...THE WATER DEPTH AT DANGELO COULD EXCEED 14 FEET IN 33 MINUTES.") +#end +#if(${list.contains(${bullets}, "BranchedOakmediumnormal")}) + #set($scenario = "IF A COMPLETE FAILURE OF THE DAM OCCURS...THE WATER DEPTH AT DANGELO COULD EXCEED 20 FEET IN 60 MINUTES.") +#end +#if(${list.contains(${bullets}, "BranchedOakruleofthumb")}) + #set($ruleofthumb = "FLOOD WAVE ESTIMATE BASED ON THE DAM IN IDAHO: FLOOD INITIALLY HALF OF ORIGINAL HEIGHT BEHIND DAM AND 3-4 MPH; 5 MILES IN 1/2 HOURS; 10 MILES IN 1 HOUR; AND 20 MILES IN 9 HOURS.") +#end +####################################################################### +## Look for site specific selections to override the 4th bullet and +## to set up the headlines and additional info used in the product. +## This loop assumes you end each site specific selection with +## the word "Dam". If you end with a different word you will need +## to modify the loop below. +######################################################################## +#foreach (${bullet} in ${bullets}) +#if(${bullet.endsWith("Dam")}) + #set($ctaSelected = "YES") + #set($sitespecSelected = "YES") + #set($hycType = "THE ${riverName} BELOW ${damName}") + #set($headline = "FOR ${reportType2} ${damName} ON THE ${riverName} ") + #set($reportType1 = "${reportType2} ${damName} ON THE ${riverName}") + #set($addInfo = "THE NEAREST DOWNSTREAM TOWN IS ${cityInfo} FROM THE DAM.") + #set($sitespecCTA = "IF YOU ARE IN LOW LYING AREAS BELOW THE ${damName} YOU SHOULD MOVE TO HIGHER GROUND IMMEDIATELY.") +#end +#end +####################################################################### +## End of Site Specific Dam Information +####################################################################### +*# #################################### ## DAM BREAK FFW FOLLOW-UP HEADER ## #################################### @@ -130,11 +197,7 @@ ${ugcline} /${productClass}.${action}.${vtecOffice}.FF.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ /00000.${floodseverity}.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ #foreach (${area} in ${areas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} @@ -163,14 +226,6 @@ ${endwarning} #if(${action}=="CON" || (${action}=="COR" && ${CORCAN}=="false")) #if(${productClass}=="T") THIS IS A TEST MESSAGE.## -#end -##################################### -## Flash Flood Emergency Headline # -##################################### -#if(${list.contains(${bullets}, "ffwEmergency")}) - -...FLASH FLOOD EMERGENCY FOR ${emergencyHeadline}... - #end ...A FLASH FLOOD WARNING ${headline}REMAINS IN EFFECT #secondBullet(${dateUtil},${expire},${timeFormat},${localtimezone},${secondtimezone}) FOR ## #headlineLocList(${areas} true true true false) @@ -178,7 +233,15 @@ THIS IS A TEST MESSAGE.## ########### END NEW HEADLINE CODE #################### +############################################################################### +## Flash Flood Emergency per NWS 10-922 Directive goes after initial headline # +############################################################################### +#if(${list.contains(${bullets}, "ffwEmergency")}) + +...THIS IS A FLASH FLOOD EMERGENCY FOR !**ENTER LOCATION**!... + +#end ##################################################### ## Changed report to match selections in template ##################################################### @@ -208,13 +271,6 @@ THIS IS A TEST MESSAGE. ## #thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) ${report}. -########################################################################## -## Flash Flood Emergency per NWS 10-922 Directive goes with third bullet # -########################################################################## -#if(${list.contains(${bullets}, "ffwEmergency")}) -THIS IS A FLASH FLOOD EMERGENCY FOR ${emergencyHeadline}. SEEK HIGHER GROUND NOW! - -#end #set($phenomena = "FLASH FLOOD") #set($warningType = "WARNING") ########################################################################## @@ -356,11 +412,7 @@ ${ugclinecan} /${productClass}.CAN.${vtecOffice}.FF.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ /00000.${floodseverity}.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ #foreach (${area} in ${cancelareas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} @@ -386,31 +438,28 @@ ${ugcline} /${productClass}.CON.${vtecOffice}.FF.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ /00000.${floodseverity}.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ #foreach (${area} in ${areas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} #if(${productClass}=="T") THIS IS A TEST MESSAGE.## -#end -################################### -## Flash Flood Emergency Headline # -################################### -#if(${list.contains(${bullets}, "ffwEmergency")}) - -...FLASH FLOOD EMERGENCY FOR ${emergencyHeadline}... - #end ...A FLASH FLOOD WARNING ${headline}REMAINS IN EFFECT #secondBullet(${dateUtil},${expire},${timeFormat},${localtimezone},${secondtimezone}) FOR ## #headlineLocList(${areas} true true true false) ...## ########### END NEW HEADLINE CODE #################### + +############################################################################### +## Flash Flood Emergency per NWS 10-922 Directive goes after initial headline # +############################################################################### +#if(${list.contains(${bullets}, "ffwEmergency")}) + +...THIS IS A FLASH FLOOD EMERGENCY FOR !**ENTER LOCATION**!... + +#end ##################################################### ## Changed report to match selections in template ##################################################### @@ -440,13 +489,6 @@ THIS IS A TEST MESSAGE. ## #end #thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) ${report}. -########################################################################## -## Flash Flood Emergency per NWS 10-922 Directive goes with third bullet # -########################################################################## -#if(${list.contains(${bullets}, "ffwEmergency")}) -THIS IS A FLASH FLOOD EMERGENCY FOR ${emergencyHeadline}. SEEK HIGHER GROUND NOW! - -#end #set($phenomena = "FLASH FLOOD") #set($warningType = "WARNING") ########################################################################## @@ -576,11 +618,7 @@ ${ugclinecan} /${productClass}.COR.${vtecOffice}.FF.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ /00000.${floodseverity}.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ #foreach (${area} in ${cancelareas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} @@ -607,31 +645,28 @@ ${ugcline} /${productClass}.COR.${vtecOffice}.FF.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ /00000.${floodseverity}.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ #foreach (${area} in ${areas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} #if(${productClass}=="T") THIS IS A TEST MESSAGE.## -#end -################################### -## Flash Flood Emergency Headline # -################################### -#if(${list.contains(${bullets}, "ffwEmergency")}) - -...FLASH FLOOD EMERGENCY FOR ${emergencyHeadline}... - #end ...A FLASH FLOOD WARNING ${headline}REMAINS IN EFFECT #secondBullet(${dateUtil},${expire},${timeFormat},${localtimezone},${secondtimezone}) FOR ## #headlineLocList(${areas} true true true false) ...## ########### END NEW HEADLINE CODE #################### + +############################################################################### +## Flash Flood Emergency per NWS 10-922 Directive goes after initial headline # +############################################################################### +#if(${list.contains(${bullets}, "ffwEmergency")}) + +...THIS IS A FLASH FLOOD EMERGENCY FOR !**ENTER LOCATION**!... + +#end ##################################################### ## Changed report to match selections in template ##################################################### @@ -661,13 +696,6 @@ THIS IS A TEST MESSAGE. ## #end #thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) ${report}. -########################################################################## -## Flash Flood Emergency per NWS 10-922 Directive goes with third bullet # -########################################################################## -#if(${list.contains(${bullets}, "ffwEmergency")}) -THIS IS A FLASH FLOOD EMERGENCY FOR ${emergencyHeadline}. SEEK HIGHER GROUND NOW! - -#end #set($phenomena = "FLASH FLOOD") #set($warningType = "WARNING") ########################################################################## diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup.xml index bed994a85f..c71e43b29c 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup.xml @@ -8,24 +8,10 @@ Evan Bookbinder 09-11-2012 Added settings for locations shapefile Added areaSource object Modified Phil Kurimski 02-05-2013 Reordered GUI selections to make more sense - Modified Phil Kurimski 09-19-2013 added geospatialConfig.xml --> - - - - - - - - - mi mph @@ -195,9 +181,11 @@ turned on unless the corresponding .vm file is turned on in a given template's . - - - + + + + + @@ -268,9 +256,11 @@ turned on unless the corresponding .vm file is turned on in a given template's . - - - + + + + + @@ -320,6 +310,120 @@ turned on unless the corresponding .vm file is turned on in a given template's . false + + + County + 0 + AND + 0 + COUNTYNAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + FIPS + NAME + + parent + + + + + + + 25 + + + + 1 + true + 8.0 + 5 + 5 + 10 + 8 + Name + AREA + COUNTYNAME + + STATE + STATE + countyTypes.txt + + warngenlev + population + distance + + + + + + + + + + + + + NAME + 1 + AREA + TRACK + true + 20 + 10 + + + + + + + + + + warngenlev + population + distance + + + + + NAME + 1 + AREA + TRACK + true + 10 + 10 + + distance + + + + + + + + + + + + + + + + + WarnGenLoc + County + + States + TIMEZONES + TIME_ZONE + + ffmp_basins 0.064 diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.vm new file mode 100644 index 0000000000..1be5bdc593 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.vm @@ -0,0 +1,815 @@ +##################################################### +## DAM BREAK FFW FOLLOW-UP ## +## CREATED BY PHIL KURIMSKI - WFO DTX ## +## VERSION AWIPS II 1.0 -- APR 14 2011 OB11.4 ## +## -- JUL 14 2011 OB11.7 ## +## -- AUG 18 2011 OB11.0.8-4 ## +## Evan Bookbinder -- SEP 16 2011 OB11.0.8-8 ## +## Phil Kurimski -- SEP 23 2011 OB11.0.8-8 ## +## Mike Rega -- MAY 03 2012 DR 14885 MND ## +##################################################### +## +#set($headline = "") +## set reportType2 to a default value in case nothing is selected for site specific +#set($reportType2 = "THE FAILURE OF") +##################################################################### +## set variables to be used in site specific dam break selections +##################################################################### +#set($addInfo = "") +#set($scenario = "") +#set($ruleofthumb = "") +#set($sitespecCTA = "") +#set($addInfo = "") +#set($volcanoCTA = "") +#if(${list.contains(${bullets}, "levee")}) + #set($ic = "DM") + #set($hycType = "A LEVEE FAILURE") + #set($headline = "FOR A LEVEE FAILURE ") + #set($reportType1 = "A LEVEE ON THE !** **! RIVER AT !** **! FAILED CAUSING FLASH FLOODING OF IMMEDIATELY SURROUNDING AREAS") +#elseif(${list.contains(${bullets}, "floodgate")}) + #set($ic = "DR") + #set($hycType = "A DAM FLOODGATE RELEASE") + #set($headline = "FOR A DAM FLOODGATE RELEASE ") + #set($reportType1 = "THE FLOODGATES ON THE !** **! DAM WERE OPENED CAUSING FLASH FLOODING DOWNSTREAM ON THE !** **! RIVER") +#elseif(${list.contains(${bullets}, "glacier")}) + #set($ic = "GO") + #set($hycType = "A GLACIAL-DAMMED LAKE OUTBURST FLOODING") + #set($headline = "FOR A GLACIAL-DAMMED LAKE OUTBURST FLOODING ") + #set($reportType1 = "A GLACIER AT !** **! HAS MELTED...RELEASING LARGE QUANTITIES OF IMPOUNDED WATER AND CAUSING FLASH FLOODING !** **!") +#elseif(${list.contains(${bullets}, "icejam")}) + #set($ic = "IJ") + #set($hycType = "ICE JAM FLOODING") + #set($headline = "FOR ICE JAM FLOODING ") + #set($reportType1 = "AN ICE JAM ON THE !** **! RIVER AT !** **! BROKE CAUSING FLASH FLOODING DOWNSTREAM") +#elseif(${list.contains(${bullets}, "rain")}) + #set($ic = "RS") + #set($hycType = "EXTREMELY RAPID RAIN SNOW MELT") + #set($headline = "FOR EXTREMELY RAPID RAIN SNOW MELT ") + #set($reportType1 = "RAIN FALLING ON EXISTING SNOWPACK WAS GENERATING FLASH FLOODING FROM EXCESSIVE RUNOFF") +#elseif(${list.contains(${bullets}, "volcano")}) + #set($ic = "SM") + #set($hycType = "VOLCANIC SNOW MELT") + #set($headline = "FOR VOLCANIC SNOW MELT ") + #set($reportType1 = "ACTIVITY OF THE !** **! VOLCANO WAS CAUSING RAPID SNOWMELT ON ITS SLOPES AND GENERATING FLASH FLOODING") +#elseif(${list.contains(${bullets}, "volcanoLahar")}) + #set($ic = "SM") + #set($hycType = "VOLCANIC SNOW MELT") + #set($headline = "FOR VOLCANIC SNOW MELT ") + #set($ctaSelected = "YES") + #set($reportType1 = "ACTIVITY OF THE !** **! VOLCANO WAS CAUSING RAPID MELTING OF SNOW AND ICE ON THE MOUNTAIN. THIS WILL RESULT IN A TORRENT OF MUD...ASH...ROCK AND HOT WATER TO FLOW DOWN THE MOUNTAIN THROUGH !** DRAINAGE **! AND GENERATE FLASH FLOODING") + #set($volcanoCTA = "PERSONS IN THE VICINITY OF !** DRAINAGE **! SHOULD HEAD TO HIGHER GROUND IMMEDIATELY.") +#elseif(${list.contains(${bullets}, "dam")}) + #set($ic = "DM") + #set($hycType = "A DAM FAILURE") + #set($headline = "FOR A DAM FAILURE ") + ## The next line should be the headline but will not currently work + ##set($headline = "FOR THE FAILURE OF !**DAM NAME**! ON !**STREAM NAME**! ") + #set($reportType1 = "THE !** **! DAM FAILED CAUSING FLASH FLOODING DOWNSTREAM ON THE !** **! RIVER") +#elseif(${list.contains(${bullets}, "siteimminent")}) + #set($ic = "DM") + #set($hycType = "A DAM BREAK") + #set($headline = "FOR A DAM BREAK ") + ## The next line should be the headline but will not currently work + ##set($headline = "FOR THE IMMINENT FAILURE OF !**DAM NAME**! ON !**STREAM NAME**! ") + #set($reportType1 = "THE IMMINENT FAILURE OF !** **! DAM") + #set($reportType2 = "THE IMMINENT FAILURE OF") +#elseif(${list.contains(${bullets}, "sitefailed")}) + #set($ic = "DM") + #set($hycType = "A DAM BREAK") + #set($headline = "FOR A DAM BREAK ") + ## The next line should be the headline but will not currently work + ##set($headline = "FOR THE FAILURE OF !**DAM NAME**! ON !**STREAM NAME**! ") + #set($reportType1 = "THE FAILURE OF !** **! DAM") + #set($reportType2 = "THE FAILURE OF") +#else + #set($ic = "ER") + #set($hycType = "EXCESSIVE RAIN") + #set($reportType1 = "EXCESSIVE RAIN CAUSING FLASH FLOODING WAS OCCURING OVER THE WARNED AREA") +#end +#set($endwarning = "THE WATER IS RECEDING...AND IS NO LONGER EXPECTED TO POSE A SIGNIFICANT THREAT. PLEASE CONTINUE TO HEED ALL ROAD CLOSURES.") +#if(${list.contains(${bullets}, "warnend1")}) + #set($endwarning = "THE WATER IS RECEDING...AND IS NO LONGER EXPECTED TO POSE A SIGNIFICANT THREAT. PLEASE CONTINUE TO HEED ALL ROAD CLOSURES.") +#end +#if(${list.contains(${bullets}, "warnend2")}) + #set($endwarning = "FLOODING ON THE !** **! RIVER HAS RECEDED AND IS NO LONGER EXPECTED TO POSE A SIGNIFICANT THREAT. PLEASE CONTINUE TO HEED ALL ROAD CLOSURES.") +#end +#if(${floodic}) + #set($ic = ${floodic}) +#end +######################################################################### +## Parse command to include a damInfo.vm file with site specific dam +## information. Sites can include this information in a separate file or +## include in the template per the coding below. +######################################################################### +##parse ("damInfo.vm") +#* +######################################################################### +## The next section is for site specific dams. Each site should take the +## example below and customize it for their dams with the information +## from the LLL-damInfo.txt file in AWIPS 1. If you have any questions +## please contact Phil Kurimski - WFO DTX +######################################################################### +#if(${list.contains(${bullets}, "BigRockDam")}) + #set($riverName = "PHIL RIVER") + #set($damName = "BIG ROCK DAM") + #set($cityInfo = "EVAN...LOCATED ABOUT 3 MILES") +#end +#if(${list.contains(${bullets}, "BigRockhighfast")}) + #set($scenario = "IF A COMPLETE FAILURE OF THE DAM OCCURS...THE WATER DEPTH AT EVAN COULD EXCEED 18 FEET IN 16 MINUTES.") +#end +#if(${list.contains(${bullets}, "BigRockhighnormal")}) + #set($scenario = "IF A COMPLETE FAILURE OF THE DAM OCCURS...THE WATER DEPTH AT EVAN COULD EXCEED 23 FEET IN 31 MINUTES.") +#end +#if(${list.contains(${bullets}, "BigRockmediumfast")}) + #set($scenario = "IF A COMPLETE FAILURE OF THE DAM OCCURS...THE WATER DEPTH AT EVAN COULD EXCEED 14 FEET IN 19 MINUTES.") +#end +#if(${list.contains(${bullets}, "BigRockmediumnormal")}) + #set($scenario = "IF A COMPLETE FAILURE OF THE DAM OCCURS...THE WATER DEPTH AT EVAN COULD EXCEED 17 FEET IN 32 MINUTES.") +#end +#if(${list.contains(${bullets}, "BigRockruleofthumb")}) + #set($ruleofthumb = "FLOOD WAVE ESTIMATE BASED ON THE DAM IN IDAHO: FLOOD INITIALLY HALF OF ORIGINAL HEIGHT BEHIND DAM AND 3-4 MPH; 5 MILES IN 1/2 HOURS; 10 MILES IN 1 HOUR; AND 20 MILES IN 9 HOURS.") +#end +#if(${list.contains(${bullets}, "BranchedOakDam")}) + #set($riverName = "KELLS RIVER") + #set($damName = "BRANCHED OAK DAM") + #set($cityInfo = "DANGELO...LOCATED ABOUT 6 MILES") +#end +#if(${list.contains(${bullets}, "BranchedOakhighfast")}) + #set($scenario = "IF A COMPLETE FAILURE OF THE DAM OCCURS...THE WATER DEPTH AT DANGELO COULD EXCEED 19 FEET IN 32 MINUTES.") +#end +#if(${list.contains(${bullets}, "BranchedOakhighnormal")}) + #set($scenario = "IF A COMPLETE FAILURE OF THE DAM OCCURS...THE WATER DEPTH AT DANGELO COULD EXCEED 26 FEET IN 56 MINUTES.") +#end +#if(${list.contains(${bullets}, "BranchedOakmediumfast")}) + #set($scenario = "IF A COMPLETE FAILURE OF THE DAM OCCURS...THE WATER DEPTH AT DANGELO COULD EXCEED 14 FEET IN 33 MINUTES.") +#end +#if(${list.contains(${bullets}, "BranchedOakmediumnormal")}) + #set($scenario = "IF A COMPLETE FAILURE OF THE DAM OCCURS...THE WATER DEPTH AT DANGELO COULD EXCEED 20 FEET IN 60 MINUTES.") +#end +#if(${list.contains(${bullets}, "BranchedOakruleofthumb")}) + #set($ruleofthumb = "FLOOD WAVE ESTIMATE BASED ON THE DAM IN IDAHO: FLOOD INITIALLY HALF OF ORIGINAL HEIGHT BEHIND DAM AND 3-4 MPH; 5 MILES IN 1/2 HOURS; 10 MILES IN 1 HOUR; AND 20 MILES IN 9 HOURS.") +#end +####################################################################### +## Look for site specific selections to override the 4th bullet and +## to set up the headlines and additional info used in the product. +## This loop assumes you end each site specific selection with +## the word "Dam". If you end with a different word you will need +## to modify the loop below. +######################################################################## +#foreach (${bullet} in ${bullets}) +#if(${bullet.endsWith("Dam")}) + #set($ctaSelected = "YES") + #set($sitespecSelected = "YES") + #set($hycType = "THE ${riverName} BELOW ${damName}") + #set($headline = "FOR ${reportType2} ${damName} ON THE ${riverName} ") + #set($reportType1 = "${reportType2} ${damName} ON THE ${riverName}") + #set($addInfo = "THE NEAREST DOWNSTREAM TOWN IS ${cityInfo} FROM THE DAM.") + #set($sitespecCTA = "IF YOU ARE IN LOW LYING AREAS BELOW THE ${damName} YOU SHOULD MOVE TO HIGHER GROUND IMMEDIATELY.") +#end +#end +####################################################################### +## End of Site Specific Dam Information +####################################################################### +*# +#################################### +## DAM BREAK FFW FOLLOW-UP HEADER ## +#################################### +#if(${action}=="COR" && ${cancelareas}) +#set($CORCAN = "true") +#else +#set($CORCAN = "false") +#end +#if(${action}!="CANCON" && ${CORCAN}!="true") +${WMOId} ${vtecOffice} 000000 ${BBBId} +FFS${siteId} + +#if(${productClass}=="T") +TEST...FLASH FLOOD STATEMENT...TEST +#else +FLASH FLOOD STATEMENT +#end +NATIONAL WEATHER SERVICE ${officeShort} +#backupText(${backupSite}) +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +${ugcline} +/${productClass}.${action}.${vtecOffice}.FF.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ +/00000.${floodseverity}.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ +#set($zoneList = "") +#foreach (${area} in ${areas}) +#set($zoneList = "${zoneList}${area.name}-") +#end +${zoneList} + +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +#end +########################## +## DAM BREAK FFW CANCEL ## +########################## +#if(${action}=="CAN") +#if(${productClass}=="T") +THIS IS A TEST MESSAGE.## +#end +...THE FLASH FLOOD WARNING ${headline}HAS BEEN CANCELLED FOR ## +###zoneHeadlineLocList(${areas} true true true false) +##REPLACE THE LINE ABOVE WITH THE FOLLOWING IF YOU USE COUNTY VS. ZONE OUTPUT +#headlineLocList(${affectedCounties} true true true false) +...## +########### END NEW HEADLINE CODE #################### + + +## Explanation +${endwarning} + +#end +####################### +## DAM BREAK FFW CON ## +####################### +#if(${action}=="CON" || (${action}=="COR" && ${CORCAN}=="false")) +#if(${productClass}=="T") +THIS IS A TEST MESSAGE.## +#end +...A FLASH FLOOD WARNING ${headline}REMAINS IN EFFECT #secondBullet(${dateUtil},${expire},${timeFormat},${localtimezone},${secondtimezone}) FOR ## +###zoneHeadlineLocList(${areas} true true true false) +##REPLACE THE LINE ABOVE WITH THE FOLLOWING IF YOU USE COUNTY VS. ZONE OUTPUT +#headlineLocList(${affectedCounties} true true true false) +...## + + +########### END NEW HEADLINE CODE #################### +############################################################################### +## Flash Flood Emergency per NWS 10-922 Directive goes after initial headline # +############################################################################### +#if(${list.contains(${bullets}, "ffwEmergency")}) + + +...THIS IS A FLASH FLOOD EMERGENCY FOR !**ENTER LOCATION**!... + +#end +##################################################### +## Changed report to match selections in template +##################################################### +#set($report = "${reportType1}") +#if(${list.contains(${bullets}, "county")}) + #set($report = "COUNTY DISPATCH REPORTED ${reportType1}") +#end +#if(${list.contains(${bullets}, "lawEnforcement")}) + #set($report = "LOCAL LAW ENFORCEMENT REPORTED ${reportType1}") +#end +#if(${list.contains(${bullets}, "corps")}) + #set($report = "CORPS OF ENGINEERS REPORTED ${reportType1}") +#end +#if(${list.contains(${bullets}, "damop")}) + #set($report = "DAM OPERATORS REPORTED ${reportType1}") +#end +#if(${list.contains(${bullets}, "bureau")}) + #set($report = "BUREAU OF RECLAMATION REPORTED ${reportType1}") +#end +#if(${list.contains(${bullets}, "public")}) + #set($report = "THE PUBLIC REPORTED ${reportType1}") +#end + +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +#thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) ${report}. + +#set($phenomena = "FLASH FLOOD") +#set($warningType = "WARNING") +########################################################################## +## Optional 4th bullet...comment out if needed. +########################################################################## +## This first if loop will override the locations impacted statement +## with the site specific information in the 4th bullet. +########################################################################## +#if(${sitespecSelected} == "YES") +${addInfo} + +${scenario} + +${ruleofthumb} + +########################################################################## +## Continue with the regular 4th bullet information +########################################################################## +#elseif(${list.contains(${bullets}, "pathcast")}) +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +#pathCast("THE FLOOD WILL BE NEAR..." "THIS FLOODING" ${pathCast} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 0) + +#elseif(${list.contains(${bullets}, "listofcities")}) +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +#### THE THIRD ARGUMENT IS A NUMBER SPECIFYING THE NUMBER OF COLUMNS TO OUTPUT THE CITIES LIST IN +#### 0 IS A ... SEPARATED LIST, 1 IS ONE PER LINE, >1 IS A COLUMN FORMAT +#### IF YOU USE SOMETHING OTHER THAN "LOCATIONS IMPACTED INCLUDE" LEAD IN BELOW, MAKE SURE THE +#### ACCOMPANYING XML FILE PARSE STRING IS CHANGED TO MATCH! +#locationsList("LOCATIONS IMPACTED INCLUDE..." "THIS FLOODING WILL AFFECT MAINLY RURAL AREAS OF" 0 ${cityList} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 0) + +#end +############################ End of Optional 4th Bullet ########################### +#if(${list.contains(${bullets}, "drainages")}) +#drainages(${riverdrainages}) + +#end +##################### +## CALL TO ACTIONS ## +##################### +####################################################################### +## Check to see if we've selected any calls to action. In our .xml file +## we ended each CTA bullet ID with "CTA" for this reason as a 'trip' +####################################################################### +#foreach (${bullet} in ${bullets}) +#if(${bullet.endsWith("CTA")}) +#set($ctaSelected = "YES") +#end +#end +## +#if(${ctaSelected} == "YES") +PRECAUTIONARY/PREPAREDNESS ACTIONS... +#end +## + +${sitespecCTA} + +${volcanoCTA} + +#if(${list.contains(${bullets}, "floodMovingCTA")}) +FLOOD WATERS ARE MOVING DOWN !**name of channel**! FROM !**location**! TO !**location**!. THE FLOOD CREST IS EXPECTED TO REACH !**location(s)**! BY !**time(s)**!. + +#end +#if(${list.contains(${bullets}, "taddCTA")}) +MOST FLOOD DEATHS OCCUR IN AUTOMOBILES. NEVER DRIVE YOUR VEHICLE INTO AREAS WHERE THE WATER COVERS THE ROADWAY. FLOOD WATERS ARE USUALLY DEEPER THAN THEY APPEAR. JUST ONE FOOT OF FLOWING WATER IS POWERFUL ENOUGH TO SWEEP VEHICLES OFF THE ROAD. WHEN ENCOUNTERING FLOODED ROADS MAKE THE SMART CHOICE...TURN AROUND...DONT DROWN. + +#end +#if(${list.contains(${bullets}, "nighttimeCTA")}) +BE ESPECIALLY CAUTIOUS AT NIGHT WHEN IT IS HARDER TO RECOGNIZE THE DANGERS OF FLOODING. IF FLOODING IS OBSERVED ACT QUICKLY. MOVE UP TO HIGHER GROUND TO ESCAPE FLOOD WATERS. DO NOT STAY IN AREAS SUBJECT TO FLOODING WHEN WATER BEGINS RISING. + +#end +#if(${list.contains(${bullets}, "vehicleCTA")}) +DO NOT DRIVE YOUR VEHICLE INTO AREAS WHERE THE WATER COVERS THE ROADWAY. THE WATER DEPTH MAY BE TOO GREAT TO ALLOW YOUR CAR TO CROSS SAFELY. MOVE TO HIGHER GROUND. + +#end +#if(${list.contains(${bullets}, "warningMeansCTA")}) +A FLASH FLOOD WARNING MEANS FLASH FLOODING IS OCCURRING OR IS IMMINENT. MOST FLOOD RELATED DEATHS OCCUR IN AUTOMOBILES. DO NOT ATTEMPT TO CROSS WATER COVERED BRIDGES...DIPS...OR LOW WATER CROSSINGS. NEVER TRY TO CROSS A FLOWING STREAM...EVEN A SMALL ONE...ON FOOT. TO ESCAPE RISING WATER MOVE UP TO HIGHER GROUND. + +#end +#if(${list.contains(${bullets}, "powerFloodCTA")}) +DO NOT UNDERESTIMATE THE POWER OF FLOOD WATERS. ONLY A FEW INCHES OF RAPIDLY FLOWING WATER CAN QUICKLY CARRY AWAY YOUR VEHICLE. + +#end +#if(${list.contains(${bullets}, "reportCTA")}) +TO REPORT FLOODING...HAVE THE NEAREST LAW ENFORCEMENT AGENCY RELAY YOUR REPORT TO THE NATIONAL WEATHER SERVICE FORECAST OFFICE. + +#end +#if(${ctaSelected} == "YES") +&& +#end +#end +########################### +## DAM BREAK FFW CAN/CON ## +########################### +#if(${action}=="CANCON") +${WMOId} ${vtecOffice} 000000 ${BBBId} +FFS${siteId} + +#if(${productClass}=="T") +TEST...FLASH FLOOD STATEMENT...TEST +#else +FLASH FLOOD STATEMENT +#end +NATIONAL WEATHER SERVICE ${officeShort} +#backupText(${backupSite}) +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +${ugclinecan} +/${productClass}.CAN.${vtecOffice}.FF.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ +/00000.${floodseverity}.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ +#set($zoneList = "") +#foreach (${area} in ${cancelareas}) +#set($zoneList = "${zoneList}${area.name}-") +#end +${zoneList} + +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +#if(${productClass}=="T") +THIS IS A TEST MESSAGE.## +#end +...THE FLASH FLOOD WARNING ${headline}HAS BEEN CANCELLED FOR ## +###zoneHeadlineLocList(${cancelareas} true true true false) +##REPLACE THE LINE ABOVE WITH THE FOLLOWING IF YOU USE COUNTY VS. ZONE OUTPUT +#headlineLocList(${cancelaffectedCounties} true true true false) +...## +########### END NEW HEADLINE CODE #################### + + +## Explanation +${endwarning} + +#printcoords(${areaPoly}, ${list}) + + +$$ + +${ugcline} +/${productClass}.CON.${vtecOffice}.FF.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ +/00000.${floodseverity}.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ +#set($zoneList = "") +#foreach (${area} in ${areas}) +#set($zoneList = "${zoneList}${area.name}-") +#end +${zoneList} + +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +#if(${productClass}=="T") +THIS IS A TEST MESSAGE.## +#end +...A FLASH FLOOD WARNING ${headline}REMAINS IN EFFECT #secondBullet(${dateUtil},${expire},${timeFormat},${localtimezone},${secondtimezone}) FOR ## +###zoneHeadlineLocList(${areas} true true true false) +##REPLACE THE LINE ABOVE WITH THE FOLLOWING IF YOU USE COUNTY VS. ZONE OUTPUT +#headlineLocList(${affectedCounties} true true true false) +...## +########### END NEW HEADLINE CODE #################### + + +############################################################################### +## Flash Flood Emergency per NWS 10-922 Directive goes after initial headline # +############################################################################### +#if(${list.contains(${bullets}, "ffwEmergency")}) + +...THIS IS A FLASH FLOOD EMERGENCY FOR !**ENTER LOCATION**!... + +#end +##################################################### +## Changed report to match selections in template +##################################################### +#set($report = "${reportType1}") +#if(${list.contains(${bullets}, "county")}) + #set($report = "COUNTY DISPATCH REPORTED ${reportType1}") +#end +#if(${list.contains(${bullets}, "lawEnforcement")}) + #set($report = "LOCAL LAW ENFORCEMENT REPORTED ${reportType1}") +#end +#if(${list.contains(${bullets}, "corps")}) + #set($report = "CORPS OF ENGINEERS REPORTED ${reportType1}") +#end +#if(${list.contains(${bullets}, "damop")}) + #set($report = "DAM OPERATORS REPORTED ${reportType1}") +#end +#if(${list.contains(${bullets}, "bureau")}) + #set($report = "BUREAU OF RECLAMATION REPORTED ${reportType1}") +#end +#if(${list.contains(${bullets}, "public")}) + #set($report = "THE PUBLIC REPORTED ${reportType1}") +#end + +## Storm current location description +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +#thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) ${report}. + +#set($phenomena = "FLASH FLOOD") +#set($warningType = "WARNING") +########################################################################## +## Optional 4th bullet...comment out if needed. +########################################################################## +## This first if loop will override the locations impacted statement +## with the site specific information in the 4th bullet. +########################################################################## +#if(${sitespecSelected} == "YES") +${addInfo} + +${scenario} + +${ruleofthumb} + +########################################################################## +## Continue with the regular 4th bullet information +########################################################################## +#elseif(${list.contains(${bullets}, "pathcast")}) +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +#pathCast("THE FLOOD WILL BE NEAR..." "THIS FLOODING" ${pathCast} ${otherPoints} ${areas} ${dateUtil} ${timeFormat}) + +#elseif(${list.contains(${bullets}, "listofcities")}) +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +#### THE THIRD ARGUMENT IS A NUMBER SPECIFYING THE NUMBER OF COLUMNS TO OUTPUT THE CITIES LIST IN +#### 0 IS A ... SEPARATED LIST, 1 IS ONE PER LINE, >1 IS A COLUMN FORMAT +#### IF YOU USE SOMETHING OTHER THAN "LOCATIONS IMPACTED INCLUDE" LEAD IN BELOW, MAKE SURE THE +#### ACCOMPANYING XML FILE PARSE STRING IS CHANGED TO MATCH! +#locationsList("LOCATIONS IMPACTED INCLUDE..." "THIS FLOODING" 0 ${cityList} ${otherPoints} ${areas} ${dateUtil} ${timeFormat}) + +#end +############################ End of Optional 4th Bullet ########################### +#if(${list.contains(${bullets}, "drainages")}) +#drainages(${riverdrainages}) + +#end + +## parse file command here is to pull in mile marker info +## #parse("mileMarkers.vm") + +#if(${list.contains(${bullets}, "floodMoving")}) +FLOOD WATERS ARE MOVING DOWN !**name of channel**! FROM !**location**! TO !**location**!. THE FLOOD CREST IS EXPECTED TO REACH !**location(s)**! BY !**time(s)**!. + +#end + +##################### +## CALL TO ACTIONS ## +##################### +####################################################################### +## Check to see if we've selected any calls to action. In our .xml file +## we ended each CTA bullet ID with "CTA" for this reason as a 'trip' +####################################################################### +#foreach (${bullet} in ${bullets}) +#if(${bullet.endsWith("CTA")}) +#set($ctaSelected = "YES") +#end +#end +## +#if(${ctaSelected} == "YES") +PRECAUTIONARY/PREPAREDNESS ACTIONS... +#end +## + +${sitespecCTA} + +${volcanoCTA} + +#if(${list.contains(${bullets}, "taddCTA")}) +MOST FLOOD DEATHS OCCUR IN AUTOMOBILES. NEVER DRIVE YOUR VEHICLE INTO AREAS WHERE THE WATER COVERS THE ROADWAY. FLOOD WATERS ARE USUALLY DEEPER THAN THEY APPEAR. JUST ONE FOOT OF FLOWING WATER IS POWERFUL ENOUGH TO SWEEP VEHICLES OFF THE ROAD. WHEN ENCOUNTERING FLOODED ROADS MAKE THE SMART CHOICE...TURN AROUND...DONT DROWN. + +#end +#if(${list.contains(${bullets}, "nighttimeCTA")}) +BE ESPECIALLY CAUTIOUS AT NIGHT WHEN IT IS HARDER TO RECOGNIZE THE DANGERS OF FLOODING. IF FLOODING IS OBSERVED ACT QUICKLY. MOVE UP TO HIGHER GROUND TO ESCAPE FLOOD WATERS. DO NOT STAY IN AREAS SUBJECT TO FLOODING WHEN WATER BEGINS RISING. + +#end +#if(${list.contains(${bullets}, "vehicleCTA")}) +DO NOT DRIVE YOUR VEHICLE INTO AREAS WHERE THE WATER COVERS THE ROADWAY. THE WATER DEPTH MAY BE TOO GREAT TO ALLOW YOUR CAR TO CROSS SAFELY. MOVE TO HIGHER GROUND. + +#end +#if(${list.contains(${bullets}, "warningMeansCTA")}) +A FLASH FLOOD WARNING MEANS FLASH FLOODING IS OCCURRING OR IS IMMINENT. MOST FLOOD RELATED DEATHS OCCUR IN AUTOMOBILES. DO NOT ATTEMPT TO CROSS WATER COVERED BRIDGES...DIPS...OR LOW WATER CROSSINGS. NEVER TRY TO CROSS A FLOWING STREAM...EVEN A SMALL ONE...ON FOOT. TO ESCAPE RISING WATER MOVE UP TO HIGHER GROUND. + +#end +#if(${list.contains(${bullets}, "powerFloodCTA")}) +DO NOT UNDERESTIMATE THE POWER OF FLOOD WATERS. ONLY A FEW INCHES OF RAPIDLY FLOWING WATER CAN QUICKLY CARRY AWAY YOUR VEHICLE. + +#end +#if(${list.contains(${bullets}, "reportCTA")}) +TO REPORT FLOODING...HAVE THE NEAREST LAW ENFORCEMENT AGENCY RELAY YOUR REPORT TO THE NATIONAL WEATHER SERVICE FORECAST OFFICE. + +#end +#if(${ctaSelected} == "YES") +&& +#end + +#elseif(${CORCAN}=="true") +${WMOId} ${vtecOffice} 000000 ${BBBId} +FFS${siteId} + +#if(${productClass}=="T") +TEST...FLASH FLOOD STATEMENT...TEST +#else +FLASH FLOOD STATEMENT +#end +NATIONAL WEATHER SERVICE ${officeShort} +#backupText(${backupSite}) +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +${ugclinecan} +/${productClass}.COR.${vtecOffice}.FF.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ +/00000.${floodseverity}.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ +#set($zoneList = "") +#foreach (${area} in ${cancelareas}) +#set($zoneList = "${zoneList}${area.name}-") +#end +${zoneList} + +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +#if(${productClass}=="T") +THIS IS A TEST MESSAGE.## +#end +...THE FLASH FLOOD WARNING ${headline}HAS BEEN CANCELLED FOR ## +###zoneHeadlineLocList(${cancelareas} true true true false) +##REPLACE THE LINE ABOVE WITH THE FOLLOWING IF YOU USE COUNTY VS. ZONE OUTPUT +#headlineLocList(${cancelaffectedCounties} true true true false) +...## +########### END NEW HEADLINE CODE #################### + + +## Explanation +${endwarning} + +#printcoords(${areaPoly}, ${list}) + + +$$ + +${ugcline} +/${productClass}.COR.${vtecOffice}.FF.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ +/00000.${floodseverity}.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ +#set($zoneList = "") +#foreach (${area} in ${areas}) +#set($zoneList = "${zoneList}${area.name}-") +#end +${zoneList} + +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +#if(${productClass}=="T") +THIS IS A TEST MESSAGE.## +#end +...A FLASH FLOOD WARNING ${headline}REMAINS IN EFFECT #secondBullet(${dateUtil},${expire},${timeFormat},${localtimezone},${secondtimezone}) FOR ## +###zoneHeadlineLocList(${areas} true true true false) +##REPLACE THE LINE ABOVE WITH THE FOLLOWING IF YOU USE COUNTY VS. ZONE OUTPUT +#headlineLocList(${affectedCounties} true true true false) +...## +########### END NEW HEADLINE CODE #################### + + +############################################################################### +## Flash Flood Emergency per NWS 10-922 Directive goes after initial headline # +############################################################################### +#if(${list.contains(${bullets}, "ffwEmergency")}) + +...THIS IS A FLASH FLOOD EMERGENCY FOR !**ENTER LOCATION**!... + +#end +##################################################### +## Changed report to match selections in template +##################################################### +#set($report = "${reportType1}") +#if(${list.contains(${bullets}, "county")}) + #set($report = "COUNTY DISPATCH REPORTED ${reportType1}") +#end +#if(${list.contains(${bullets}, "lawEnforcement")}) + #set($report = "LOCAL LAW ENFORCEMENT REPORTED ${reportType1}") +#end +#if(${list.contains(${bullets}, "corps")}) + #set($report = "CORPS OF ENGINEERS REPORTED ${reportType1}") +#end +#if(${list.contains(${bullets}, "damop")}) + #set($report = "DAM OPERATORS REPORTED ${reportType1}") +#end +#if(${list.contains(${bullets}, "bureau")}) + #set($report = "BUREAU OF RECLAMATION REPORTED ${reportType1}") +#end +#if(${list.contains(${bullets}, "public")}) + #set($report = "THE PUBLIC REPORTED ${reportType1}") +#end + +## Storm current location description +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +#thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) ${report}. + +#set($phenomena = "FLASH FLOOD") +#set($warningType = "WARNING") +########################################################################## +## Optional 4th bullet...comment out if needed. +########################################################################## +## This first if loop will override the locations impacted statement +## with the site specific information in the 4th bullet. +########################################################################## +#if(${sitespecSelected} == "YES") +${addInfo} + +${scenario} + +${ruleofthumb} + +########################################################################## +## Continue with the regular 4th bullet information +########################################################################## +#elseif(${list.contains(${bullets}, "pathcast")}) +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +#pathCast("THE FLOOD WILL BE NEAR..." "THIS FLOODING" ${pathCast} ${otherPoints} ${areas} ${dateUtil} ${timeFormat}) + +#elseif(${list.contains(${bullets}, "listofcities")}) +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +#### THE THIRD ARGUMENT IS A NUMBER SPECIFYING THE NUMBER OF COLUMNS TO OUTPUT THE CITIES LIST IN +#### 0 IS A ... SEPARATED LIST, 1 IS ONE PER LINE, >1 IS A COLUMN FORMAT +#### IF YOU USE SOMETHING OTHER THAN "LOCATIONS IMPACTED INCLUDE" LEAD IN BELOW, MAKE SURE THE +#### ACCOMPANYING XML FILE PARSE STRING IS CHANGED TO MATCH! +#locationsList("LOCATIONS IMPACTED INCLUDE..." "THIS FLOODING" 0 ${cityList} ${otherPoints} ${areas} ${dateUtil} ${timeFormat}) + +#end +############################ End of Optional 4th Bullet ########################### +#if(${list.contains(${bullets}, "drainages")}) +#drainages(${riverdrainages}) + +#end + +## parse file command here is to pull in mile marker info +## #parse("mileMarkers.vm") + +#if(${list.contains(${bullets}, "floodMoving")}) +FLOOD WATERS ARE MOVING DOWN !**name of channel**! FROM !**location**! TO !**location**!. THE FLOOD CREST IS EXPECTED TO REACH !**location(s)**! BY !**time(s)**!. + +#end + +##################### +## CALL TO ACTIONS ## +##################### +####################################################################### +## Check to see if we've selected any calls to action. In our .xml file +## we ended each CTA bullet ID with "CTA" for this reason as a 'trip' +####################################################################### +#foreach (${bullet} in ${bullets}) +#if(${bullet.endsWith("CTA")}) +#set($ctaSelected = "YES") +#end +#end +## +#if(${ctaSelected} == "YES") +PRECAUTIONARY/PREPAREDNESS ACTIONS... +#end +## + +${sitespecCTA} + +${volcanoCTA} + +#if(${list.contains(${bullets}, "taddCTA")}) +MOST FLOOD DEATHS OCCUR IN AUTOMOBILES. NEVER DRIVE YOUR VEHICLE INTO AREAS WHERE THE WATER COVERS THE ROADWAY. FLOOD WATERS ARE USUALLY DEEPER THAN THEY APPEAR. JUST ONE FOOT OF FLOWING WATER IS POWERFUL ENOUGH TO SWEEP VEHICLES OFF THE ROAD. WHEN ENCOUNTERING FLOODED ROADS MAKE THE SMART CHOICE...TURN AROUND...DONT DROWN. + +#end +#if(${list.contains(${bullets}, "nighttimeCTA")}) +BE ESPECIALLY CAUTIOUS AT NIGHT WHEN IT IS HARDER TO RECOGNIZE THE DANGERS OF FLOODING. IF FLOODING IS OBSERVED ACT QUICKLY. MOVE UP TO HIGHER GROUND TO ESCAPE FLOOD WATERS. DO NOT STAY IN AREAS SUBJECT TO FLOODING WHEN WATER BEGINS RISING. + +#end +#if(${list.contains(${bullets}, "vehicleCTA")}) +DO NOT DRIVE YOUR VEHICLE INTO AREAS WHERE THE WATER COVERS THE ROADWAY. THE WATER DEPTH MAY BE TOO GREAT TO ALLOW YOUR CAR TO CROSS SAFELY. MOVE TO HIGHER GROUND. + +#end +#if(${list.contains(${bullets}, "warningMeansCTA")}) +A FLASH FLOOD WARNING MEANS FLASH FLOODING IS OCCURRING OR IS IMMINENT. MOST FLOOD RELATED DEATHS OCCUR IN AUTOMOBILES. DO NOT ATTEMPT TO CROSS WATER COVERED BRIDGES...DIPS...OR LOW WATER CROSSINGS. NEVER TRY TO CROSS A FLOWING STREAM...EVEN A SMALL ONE...ON FOOT. TO ESCAPE RISING WATER MOVE UP TO HIGHER GROUND. + +#end +#if(${list.contains(${bullets}, "powerFloodCTA")}) +DO NOT UNDERESTIMATE THE POWER OF FLOOD WATERS. ONLY A FEW INCHES OF RAPIDLY FLOWING WATER CAN QUICKLY CARRY AWAY YOUR VEHICLE. + +#end +#if(${list.contains(${bullets}, "reportCTA")}) +TO REPORT FLOODING...HAVE THE NEAREST LAW ENFORCEMENT AGENCY RELAY YOUR REPORT TO THE NATIONAL WEATHER SERVICE FORECAST OFFICE. + +#end +#if(${ctaSelected} == "YES") +&& +#end + +#end +####################### +## DAM BREAK FFW EXP ## +####################### +#if(${action}=="EXP") +#if(${productClass}=="T") +THIS IS A TEST MESSAGE.## +#end +...THE FLASH FLOOD WARNING ${headline}## +#if(${now.compareTo(${expire})} > -1) +EXPIRED AT ${dateUtil.format(${expire}, ${timeFormat.clock}, 15, ${localtimezone})} FOR ## +#else +WILL EXPIRE AT ${dateUtil.format(${expire}, ${timeFormat.clock}, 15, ${localtimezone})} FOR ## +#end +###zoneHeadlineLocList(${areas} true true true false) +##REPLACE THE LINE ABOVE WITH THE FOLLOWING IF YOU USE COUNTY VS. ZONE OUTPUT +#headlineLocList(${affectedCounties} true true true false) +...## +########### END NEW HEADLINE CODE #################### + + +## Explaination +${endwarning} + +#end +########################## +## END OF DAM BREAK FFW ## +########################## +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. DO NOT TAKE ACTION BASED ON THIS MESSAGE. + +#end + +#printcoords(${areaPoly}, ${list}) + + +$$ + +#parse("forecasterName.vm") diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.xml new file mode 100644 index 0000000000..cd164beda3 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.xml @@ -0,0 +1,467 @@ + + + + + + + mi + mph + + + + Forecast Zones + + + + + + + + + COR + CON + CAN + EXP + + + + + FF.W + + + + false + + +true + + + true + + + + 30 + + 30 + + + +dam,ic + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +false + + + + + + + + + + + Zone + HATCHING + 0 + AND + 0 + NAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + + STATE_ZONE + NAME + + parent + + + + + + + 25 + + + + + County + INTERSECT + 0 + AND + 0 + COUNTYNAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + FIPS + NAME + + parent + + + + + + + 25 + + + + 1 + true + 8.0 + 5 + 5 + 4 + 8 + Name + AREA + NAME + + STATE + STATE + countyTypes.txt + + distance + + + + + + + + + + + + + NAME + 1 + AREA + POINTS + true + 30 + 200 + + warngenlev + population + distance + + + + + + + + + + + + + NAME + AREA + 1 + POINTS + true + 10 + 200 + + name + + + + + + + + + + + + + + + + + WarnGenLoc + + Zone + States + TIMEZONES + TIME_ZONE + + + + ffmp_basins + 0.064 + streamname + + + + + + true + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.vm new file mode 100644 index 0000000000..1edd427b5b --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.vm @@ -0,0 +1,352 @@ +################################################# +## DAM BREAK FFW TEMPLATE ## +## CREATED BY PHIL KURIMSKI - WFO DTX ## +## VERSION AWIPS II 1.0 - APR 13 2011 OB11.4 ## +## VERSION AWIPS II 1.1 - JUL 14 2011 OB11.7 ## +## VERSION AWIPS II 1.2 - AUG 18 2011 OB11.8 ## +## VERSION AWIPS II 1.3 - SEP 23 2011 OB11.8 ## +## VERSION AWIPS II 1.4 - JUN 26 2013 OB13.4.1 ## +## to add "U" Unknown servity ## +################################################# +## +#if(${action} == "EXT") + #set($starttime = "000000T0000Z") + #set($extend = true) +#else + #set($starttime = ${dateUtil.format(${start}, ${timeFormat.ymdthmz})}) + #set($extend = false) +#end +#if(${list.contains(${bullets}, "sev1")}) + #set($sev = "1") +#elseif(${list.contains(${bullets}, "sev2")}) + #set($sev = "2") +#elseif(${list.contains(${bullets}, "sev3")}) + #set($sev = "3") +#else + #set($sev = "0") +#end +## +## set reportType2 to a default value in case nothing is selected for site specific +#set($reportType2 = "THE FAILURE OF") +##################################################################### +## set variables to be used in site specific dam break selections +##################################################################### +#set($addInfo = "") +#set($scenario = "") +#set($ruleofthumb = "") +#set($sitespecCTA = "") +#set($volcanoCTA = "") +#if(${list.contains(${bullets}, "levee")}) + #set($ic = "DM") + #set($hycType = "A LEVEE FAILURE") + #set($reportType1 = "A LEVEE ON THE !** **! RIVER AT !** **! FAILED CAUSING FLASH FLOODING OF IMMEDIATELY SURROUNDING AREAS") +#elseif(${list.contains(${bullets}, "floodgate")}) + #set($ic = "DR") + #set($hycType = "A DAM FLOODGATE RELEASE") + #set($reportType1 = "THE FLOODGATES ON THE !** **! DAM WERE OPENED CAUSING FLASH FLOODING DOWNSTREAM ON THE !** **! RIVER") +#elseif(${list.contains(${bullets}, "glacier")}) + #set($ic = "GO") + #set($hycType = "A GLACIAL-DAMMED LAKE OUTBURST FLOODING") + #set($reportType1 = "A GLACIER AT !** **! HAS MELTED...RELEASING LARGE QUANTITIES OF IMPOUNDED WATER AND CAUSING FLASH FLOODING !** **!") +#elseif(${list.contains(${bullets}, "icejam")}) + #set($ic = "IJ") + #set($hycType = "ICE JAM FLOODING") + #set($reportType1 = "AN ICE JAM ON THE !** **! RIVER AT !** **! BROKE CAUSING FLASH FLOODING DOWNSTREAM") +#elseif(${list.contains(${bullets}, "rain")}) + #set($ic = "RS") + #set($hycType = "EXTREMELY RAPID RAIN SNOW MELT") + #set($reportType1 = "RAIN FALLING ON EXISTING SNOWPACK WAS GENERATING FLASH FLOODING FROM EXCESSIVE RUNOFF") +#elseif(${list.contains(${bullets}, "volcano")}) + #set($ic = "SM") + #set($hycType = "VOLCANIC SNOW MELT") + #set($reportType1 = "ACTIVITY OF THE !** **! VOLCANO WAS CAUSING RAPID SNOWMELT ON ITS SLOPES AND GENERATING FLASH FLOODING") +#elseif(${list.contains(${bullets}, "volcanoLahar")}) + #set($ic = "SM") + #set($hycType = "VOLCANIC SNOW MELT") + #set($ctaSelected = "YES") + #set($reportType1 = "ACTIVITY OF THE !** **! VOLCANO WAS CAUSING RAPID MELTING OF SNOW AND ICE ON THE MOUNTAIN. THIS WILL RESULT IN A TORRENT OF MUD...ASH...ROCK AND HOT WATER TO FLOW DOWN THE MOUNTAIN THROUGH !** DRAINAGE **! AND GENERATE FLASH FLOODING") + #set($volcanoCTA = "PERSONS IN THE VICINITY OF !** DRAINAGE **! SHOULD HEAD TO HIGHER GROUND IMMEDIATELY.") +#elseif(${list.contains(${bullets}, "dam")}) + #set($ic = "DM") + #set($hycType = "A DAM FAILURE") + #set($reportType1 = "THE !** **! DAM FAILED CAUSING FLASH FLOODING DOWNSTREAM ON THE !** **! RIVER") + #set($addInfo = "!** **! DAM ON THE !** **! RIVER UPSTREAM FROM !** **! HAS GIVEN WAY AND HIGH WATERS ARE NOW MOVING TOWARD !** **!. AREAS DOWNSTREAM FROM THE DAM ALONG THE !** **! RIVER SHOULD BE PREPARED FOR FLOODING. TAKE NECESSARY PRECAUTIONS IMMEDIATELY") +#elseif(${list.contains(${bullets}, "siteimminent")}) + #set($ic = "DM") + #set($hycType = "A DAM BREAK") + #set($reportType1 = "THE IMMINENT FAILURE OF !** **! DAM") + #set($reportType2 = "THE IMMINENT FAILURE OF") + #set($addInfo = "!** **! DAM ON THE !** **! RIVER UPSTREAM FROM !** **! HAS GIVEN WAY AND HIGH WATERS ARE NOW MOVING TOWARD !** **!. AREAS DOWNSTREAM FROM THE DAM ALONG THE !** **! RIVER SHOULD BE PREPARED FOR FLOODING. TAKE NECESSARY PRECAUTIONS IMMEDIATELY") +#elseif(${list.contains(${bullets}, "sitefailed")}) + #set($ic = "DM") + #set($hycType = "A DAM BREAK") + #set($reportType1 = "THE FAILURE OF !** **! DAM") + #set($reportType2 = "THE FAILURE OF") + #set($addInfo = "!** **! DAM ON THE !** **! RIVER UPSTREAM FROM !** **! HAS GIVEN WAY AND HIGH WATERS ARE NOW MOVING TOWARD !** **!. AREAS DOWNSTREAM FROM THE DAM ALONG THE !** **! RIVER SHOULD BE PREPARED FOR FLOODING. TAKE NECESSARY PRECAUTIONS IMMEDIATELY") +#else + #set($ic = "ER") + #set($hycType = "EXCESSIVE RAIN") + #set($reportType1 = "EXCESSIVE RAIN CAUSING FLASH FLOODING WAS OCCURING OVER THE WARNED AREA") +#end +######################################################################### +## Parse command to include a damInfo.vm file with site specific dam +## information. Sites can include this information in a separate file or +## include in the template per the coding below. +######################################################################### +##parse ("damInfo.vm") +#* +######################################################################### +## The next section is for site specific dams. Each site should take the +## example below and customize it for their dams with the information +## from the LLL-damInfo.txt file in AWIPS 1. If you have any questions +## please contact Phil Kurimski - WFO DTX +######################################################################### +#if(${list.contains(${bullets}, "BigRockDam")}) + #set($riverName = "PHIL RIVER") + #set($damName = "BIG ROCK DAM") + #set($cityInfo = "EVAN...LOCATED ABOUT 3 MILES") +#end +#if(${list.contains(${bullets}, "BigRockhighfast")}) + #set($scenario = "IF A COMPLETE FAILURE OF THE DAM OCCURS...THE WATER DEPTH AT EVAN COULD EXCEED 18 FEET IN 16 MINUTES.") +#end +#if(${list.contains(${bullets}, "BigRockhighnormal")}) + #set($scenario = "IF A COMPLETE FAILURE OF THE DAM OCCURS...THE WATER DEPTH AT EVAN COULD EXCEED 23 FEET IN 31 MINUTES.") +#end +#if(${list.contains(${bullets}, "BigRockmediumfast")}) + #set($scenario = "IF A COMPLETE FAILURE OF THE DAM OCCURS...THE WATER DEPTH AT EVAN COULD EXCEED 14 FEET IN 19 MINUTES.") +#end +#if(${list.contains(${bullets}, "BigRockmediumnormal")}) + #set($scenario = "IF A COMPLETE FAILURE OF THE DAM OCCURS...THE WATER DEPTH AT EVAN COULD EXCEED 17 FEET IN 32 MINUTES.") +#end +#if(${list.contains(${bullets}, "BigRockruleofthumb")}) + #set($ruleofthumb = "FLOOD WAVE ESTIMATE BASED ON THE DAM IN IDAHO: FLOOD INITIALLY HALF OF ORIGINAL HEIGHT BEHIND DAM AND 3-4 MPH; 5 MILES IN 1/2 HOURS; 10 MILES IN 1 HOUR; AND 20 MILES IN 9 HOURS.") +#end +#if(${list.contains(${bullets}, "BranchedOakDam")}) + #set($riverName = "KELLS RIVER") + #set($damName = "BRANCHED OAK DAM") + #set($cityInfo = "DANGELO...LOCATED ABOUT 6 MILES") +#end +#if(${list.contains(${bullets}, "BranchedOakhighfast")}) + #set($scenario = "IF A COMPLETE FAILURE OF THE DAM OCCURS...THE WATER DEPTH AT DANGELO COULD EXCEED 19 FEET IN 32 MINUTES.") +#end +#if(${list.contains(${bullets}, "BranchedOakhighnormal")}) + #set($scenario = "IF A COMPLETE FAILURE OF THE DAM OCCURS...THE WATER DEPTH AT DANGELO COULD EXCEED 26 FEET IN 56 MINUTES.") +#end +#if(${list.contains(${bullets}, "BranchedOakmediumfast")}) + #set($scenario = "IF A COMPLETE FAILURE OF THE DAM OCCURS...THE WATER DEPTH AT DANGELO COULD EXCEED 14 FEET IN 33 MINUTES.") +#end +#if(${list.contains(${bullets}, "BranchedOakmediumnormal")}) + #set($scenario = "IF A COMPLETE FAILURE OF THE DAM OCCURS...THE WATER DEPTH AT DANGELO COULD EXCEED 20 FEET IN 60 MINUTES.") +#end +#if(${list.contains(${bullets}, "BranchedOakruleofthumb")}) + #set($ruleofthumb = "FLOOD WAVE ESTIMATE BASED ON THE DAM IN IDAHO: FLOOD INITIALLY HALF OF ORIGINAL HEIGHT BEHIND DAM AND 3-4 MPH; 5 MILES IN 1/2 HOURS; 10 MILES IN 1 HOUR; AND 20 MILES IN 9 HOURS.") +#end +####################################################################### +## Look for site specific selections to override the 4th bullet and +## to set up the headlines and additional info used in the product. +## This loop assumes you end each site specific selection with +## the word "Dam". If you end with a different word you will need +## to modify the loop below. +######################################################################## +#foreach (${bullet} in ${bullets}) +#if(${bullet.endsWith("Dam")}) + #set($ctaSelected = "YES") + #set($sitespecSelected = "YES") + #set($hycType = "THE ${riverName} BELOW ${damName}") + #set($reportType1 = "${reportType2} ${damName} ON THE ${riverName}") + #set($addInfo = "THE NEAREST DOWNSTREAM TOWN IS ${cityInfo} FROM THE DAM.") + #set($sitespecCTA = "IF YOU ARE IN LOW LYING AREAS BELOW THE ${damName} YOU SHOULD MOVE TO HIGHER GROUND IMMEDIATELY.") +#end +#end +####################################################################### +## End of Site Specific Dam Information +####################################################################### +*# +## +${WMOId} ${vtecOffice} 000000 ${BBBId} +FFW${siteId} +${ugcline} +/${productClass}.${action}.${vtecOffice}.FF.W.${etn}.${starttime}-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ +/00000.${sev}.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/ + +BULLETIN - EAS ACTIVATION REQUESTED +#if(${productClass}=="T") +TEST...FLASH FLOOD WARNING...TEST +#else +FLASH FLOOD WARNING +#end +NATIONAL WEATHER SERVICE ${officeShort} +#backupText(${backupSite}) +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +#if(${productClass}=="T") +...THIS MESSAGE IS FOR TEST PURPOSES ONLY... + +#end +#headlineext(${officeLoc}, ${backupSite}, ${extend}) + +* ## +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +####################################################################### +## Put the hycType variable on the next line and included the word 'IN' +## to come in line with the 10-922 directive +####################################################################### +FLASH FLOOD WARNING FOR... + ${hycType} IN... +###firstBullet(${areas}) +##REPLACE THE LINE ABOVE WITH THE FOLLOWING IF YOU USE COUNTY VS. ZONE OUTPUT +#firstBullet(${affectedCounties}) + +* ## +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +#secondBullet(${dateUtil},${expire},${timeFormat},${localtimezone},${secondtimezone}) + +#set($report = "${reportType1}") +#if(${list.contains(${bullets}, "county")}) + #set($report = "COUNTY DISPATCH REPORTED ${reportType1}") +#end +#if(${list.contains(${bullets}, "lawEnforcement")}) + #set($report = "LOCAL LAW ENFORCEMENT REPORTED ${reportType1}") +#end +#if(${list.contains(${bullets}, "corps")}) + #set($report = "CORPS OF ENGINEERS REPORTED ${reportType1}") +#end +#if(${list.contains(${bullets}, "damop")}) + #set($report = "DAM OPERATORS REPORTED ${reportType1}") +#end +#if(${list.contains(${bullets}, "bureau")}) + #set($report = "BUREAU OF RECLAMATION REPORTED ${reportType1}") +#end +#if(${list.contains(${bullets}, "public")}) + #set($report = "THE PUBLIC REPORTED ${reportType1}") +#end + +* ## +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +#thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone})...${report}. + +########################################################################## +## Flash Flood Emergency per NWS 10-922 Directive goes with third bullet # +########################################################################## +#if(${list.contains(${bullets}, "ffwEmergency")}) + THIS IS A FLASH FLOOD EMERGENCY FOR !**ENTER LOCATION**!. + +#end +#set($phenomena = "FLASH FLOOD") +#set($warningType = "WARNING") +########################################################################## +## Optional 4th bullet...comment out if not needed. +########################################################################## +## This first if loop will override the locations impacted statement +## with the site specific information in the 4th bullet. +########################################################################## +#if(${sitespecSelected} == "YES") +* ## +${addInfo} + +${scenario} + +${ruleofthumb} + +########################################################################## +## Continue with the regular 4th bullet information +########################################################################## +#elseif(${list.contains(${bullets}, "pathcast")}) +* ## +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +#pathCast("THE FLOOD WILL BE NEAR..." "THIS FLOODING" ${pathCast} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 0) + +#elseif(${list.contains(${bullets}, "listofcities")}) +* ## +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +#### THE THIRD ARGUMENT IS A NUMBER SPECIFYING THE NUMBER OF COLUMNS TO OUTPUT THE CITIES LIST IN +#### 0 IS A ... SEPARATED LIST, 1 IS ONE PER LINE, >1 IS A COLUMN FORMAT +#### IF YOU USE SOMETHING OTHER THAN "LOCATIONS IMPACTED INCLUDE" LEAD IN BELOW, MAKE SURE THE +#### ACCOMPANYING XML FILE PARSE STRING IS CHANGED TO MATCH! +#locationsList("LOCATIONS IMPACTED INCLUDE..." "THIS FLOODING" 0 ${cityList} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 0) + +#end +############################ End of Optional 4th Bullet ########################### +#if(${list.contains(${bullets}, "drainages")}) +#drainages(${riverdrainages}) + +#end + +## parse file command here is to pull in mile marker info +## #parse("mileMarkers.vm") + +#if(${list.contains(${bullets}, "floodMoving")}) +FLOOD WATERS ARE MOVING DOWN !**name of channel**! FROM !**location**! TO !**location**!. THE FLOOD CREST IS EXPECTED TO REACH !**location(s)**! BY !**time(s)**!. + +#end + +##################### +## CALL TO ACTIONS ## +##################### +####################################################################### +## Check to see if we've selected any calls to action. In our .xml file +## we ended each CTA bullet ID with "CTA" for this reason as a 'trip' +####################################################################### +#foreach (${bullet} in ${bullets}) +#if(${bullet.endsWith("CTA")}) +#set($ctaSelected = "YES") +#end +#end +## +#if(${ctaSelected} == "YES") +PRECAUTIONARY/PREPAREDNESS ACTIONS... +#end +## + +${sitespecCTA} + +${volcanoCTA} + +#if(${list.contains(${bullets}, "taddCTA")}) +MOST FLOOD DEATHS OCCUR IN AUTOMOBILES. NEVER DRIVE YOUR VEHICLE INTO AREAS WHERE THE WATER COVERS THE ROADWAY. FLOOD WATERS ARE USUALLY DEEPER THAN THEY APPEAR. JUST ONE FOOT OF FLOWING WATER IS POWERFUL ENOUGH TO SWEEP VEHICLES OFF THE ROAD. WHEN ENCOUNTERING FLOODED ROADS MAKE THE SMART CHOICE...TURN AROUND...DONT DROWN. + +#end +#if(${list.contains(${bullets}, "nighttimeCTA")}) +BE ESPECIALLY CAUTIOUS AT NIGHT WHEN IT IS HARDER TO RECOGNIZE THE DANGERS OF FLOODING. IF FLOODING IS OBSERVED ACT QUICKLY. MOVE UP TO HIGHER GROUND TO ESCAPE FLOOD WATERS. DO NOT STAY IN AREAS SUBJECT TO FLOODING WHEN WATER BEGINS RISING. + +#end +#if(${list.contains(${bullets}, "vehicleCTA")}) +DO NOT DRIVE YOUR VEHICLE INTO AREAS WHERE THE WATER COVERS THE ROADWAY. THE WATER DEPTH MAY BE TOO GREAT TO ALLOW YOUR CAR TO CROSS SAFELY. MOVE TO HIGHER GROUND. + +#end +#if(${list.contains(${bullets}, "warningMeansCTA")}) +A FLASH FLOOD WARNING MEANS FLASH FLOODING IS OCCURRING OR IS IMMINENT. MOST FLOOD RELATED DEATHS OCCUR IN AUTOMOBILES. DO NOT ATTEMPT TO CROSS WATER COVERED BRIDGES...DIPS...OR LOW WATER CROSSINGS. NEVER TRY TO CROSS A FLOWING STREAM...EVEN A SMALL ONE...ON FOOT. TO ESCAPE RISING WATER MOVE UP TO HIGHER GROUND. + +#end +#if(${list.contains(${bullets}, "powerFloodCTA")}) +DO NOT UNDERESTIMATE THE POWER OF FLOOD WATERS. ONLY A FEW INCHES OF RAPIDLY FLOWING WATER CAN QUICKLY CARRY AWAY YOUR VEHICLE. + +#end +#if(${list.contains(${bullets}, "reportCTA")}) +TO REPORT FLOODING...HAVE THE NEAREST LAW ENFORCEMENT AGENCY RELAY YOUR REPORT TO THE NATIONAL WEATHER SERVICE FORECAST OFFICE. + +#end +#if(${ctaSelected} == "YES") +&& +#end + +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. DO NOT TAKE ACTION BASED ON THIS MESSAGE. + +#end +#printcoords(${areaPoly}, ${list}) + + +$$ + +#parse("forecasterName.vm") diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.xml new file mode 100644 index 0000000000..44d87c07d0 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.xml @@ -0,0 +1,441 @@ + + + + + + mi + mph + + + + Forecast Zones + + + + + + + + NEW + COR + EXT + + + + + FF.W + + + +true + + +true + + + true + + + 180 + + 30 + 40 + 45 + 50 + 60 + 90 + 120 + 150 + 180 + 210 + 240 + 270 + 300 + 360 + + + +dam,ic + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +false + + + + + + + + + + + Zone + HATCHING + 0 + AND + 0 + NAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + + STATE_ZONE + NAME + + parent + + + + + + + 25 + + + + + COUNTY + INTERSECT + 0 + AND + 0 + COUNTYNAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + FIPS + NAME + + parent + + + + + + + 25 + + + + + 1 + AREA + true + 8.0 + 5 + 5 + 4 + 8 + Name + + NAME + STATE + STATE + countyTypes.txt + + distance + + + + + + + + + + + + + NAME + 1 + AREA + POINTS + true + 30 + 200 + + + + + + + + + + warngenlev + population + distance + + + + + NAME + 1 + AREA + POINTS + true + 10 + 200 + + distance + + + + + + + + + + + + + + + + WarnGenLoc + + Zone + States + TIMEZONES + TIME_ZONE + + + + ffmp_basins + 0.064 + streamname + + + + + + true + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeThunderstormWarning.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeThunderstormWarning.vm index ddf4eecd29..dba2ab4ab9 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeThunderstormWarning.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeThunderstormWarning.vm @@ -1,15 +1,18 @@ ################################################################ ## SEVERE THUNDERSTORM WARNING TEMPLATE ## ## CREATED BY EVAN BOOKBINDER - WFO EAX ## -## RECENT VERSION HISTORY ## +## VERSION HISTORY -- 3-24-2011 INITIAL OB11.2 REWRITE ## +## 4-12-2011 OB11.4 MODIFICATIONS ## +## 7-11-2011 OB11.7 MODIFICATIONS ## +## 9-15-2011 OB11.8.0-8 PATHCAST/CITY ## +## 11-04-2011 OB11.9-3 (DRs) ## +## 2-24-2012 OB12.2.1 CLEANUP ## +## BY QINGLU LIN 6-18-2012 DR 15043 use duration ## ## BY QINGLU LIN 8-14-2012 DR 14493 use TMLtime ## ## Mike Dangelo 9-13-2012 minor tweaks to some ${variables}## ## Mike Dangelo 2-4-2013 NWS Mets detected a svr ## -## Evan Bookbinder 9-16-2013 Fixed CTA ## -## Evan Bookbinder 9-18-2013 Implemented config.vm ## ################################################################ ## -#parse("config.vm") ##SET SOME INITIAL VARIABLES #if(${stormType} == "line") #set($report = "A LINE OF SEVERE THUNDERSTORMS WAS REPORTED") @@ -244,13 +247,12 @@ THIS IS A TEST MESSAGE. ## #end #thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) ...${report}${hailwind}. ${reportType2} LOCATED ## -##Many of the variables passed below are controlled by config.vm #if(${stormType} == "line") -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxLandNearDistance}, ${overPhrase}, ${maxLandOverDistance}, ${landDistanceUnits}, ${useSecondReferenceLine}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "MILES", false) #else -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxLandNearDistance}, ${overPhrase}, ${maxLandOverDistance}, ${landDistanceUnits}, ${useSecondReferenceCell}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "MILES", true) #end -#if(${movementSpeed} < ${landStationary} || ${stationary}) +#if($movementSpeed < 3 || ${stationary}) . ${reportType2} NEARLY STATIONARY. ${smallHail} #else ...AND MOVING #direction(${movementDirectionRounded}) AT ${mathUtil.roundTo5(${movementSpeed})} MPH. ${smallHail} @@ -293,9 +295,10 @@ THE CORRECT LOCATIONS BULLET SELECTED **!. #end ## Uncomment below pull in mile marker info -## #parse("mileMarkers.vm") +##parse("mileMarkers.vm") ## Uncomment below pull in point marker info -## #parse("pointMarkers.vm") +##parse("pointMarkers.vm") +## #pmarkers(${locpointsName},${locpointsGid}, "THE FOLLOWING", "VENUE", false) ## ############################################## @@ -339,7 +342,7 @@ SEVERE THUNDERSTORMS PRODUCE DAMAGING WINDS...DESTRUCTIVE HAIL...DEADLY LIGHTNIN ## #if(${list.contains(${bullets}, "canProduceTornadoesCTA")}) #if(${stormType} == "line") -DOPPLER RADAR HAS INDICATED SOME WEAK ROTATION WITHIN THESE STORMS. ALTHOUGH A TORNADO IS NOT IMMEDIATELY LIKELY...IF ONE IS SPOTTED...ACT QUICKLY AND MOVE TO A PLACE OF SAFETY IN A STURDY STRUCTURE...SUCH AS A BASEMENT OR SMALL INTERIOR ROOM. +DOPPLER RADAR HAS INDICATED SOME WEAK ROTATION WITHIN THESE STORMS. ALTHOUGH A TORNADO IS NOT IMMEDIATELY LIKELY...IF ONE IS SPOTTED...ACT QUICKLY AND MOVE TO A PLACE OF SAFETY IN A STURDY STRUCTURE...SUCH AS A BASEMENT OR SMALL INTERIOR #else DOPPLER RADAR HAS INDICATED SOME WEAK ROTATION WITHIN THIS STORM. ALTHOUGH A TORNADO IS NOT IMMEDIATELY LIKELY...IF ONE IS SPOTTED...ACT QUICKLY AND MOVE TO A PLACE OF SAFETY IN A STURDY STRUCTURE...SUCH AS A BASEMENT OR SMALL INTERIOR ROOM. @@ -483,7 +486,6 @@ THIS IS A TEST MESSAGE. DO NOT TAKE ACTION BASED ON THIS MESSAGE. #printcoords(${areaPoly}, ${list}) #tml(${TMLtime}, ${timeFormat}, ${movementDirection}, ${movementInKnots}, ${eventLocation}) - ## UNCOMMENT 2 LINES BELOW IF PARTICIPATING IN THE WIND/HAIL TAG EXPERIMENT ## ##${windhailTag} diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeThunderstormWarning.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeThunderstormWarning.xml index bf18698b4a..d1f760aa59 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeThunderstormWarning.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeThunderstormWarning.xml @@ -10,24 +10,9 @@ Evan Bookbinder 09-11-2012 Added settings for locations shapefile Create new areaSource objects Mike Dangelo 2-4-2013 Added commented bullet for METS DETECTED - Phil Kurimski 09-16-2013 Fixed some spelling errors - Phil Kurimski 09-19-2013 added geospatialConfig.xml --> - - - - - - - - - mi mph @@ -119,16 +104,16 @@ turned on unless the corresponding .vm file is turned on in a given template's . - - + + - - + + @@ -161,8 +146,10 @@ turned on unless the corresponding .vm file is turned on in a given template's . + @@ -175,17 +162,18 @@ turned on unless the corresponding .vm file is turned on in a given template's . - - - + + + + - - + + @@ -204,4 +192,160 @@ turned on unless the corresponding .vm file is turned on in a given template's . + + + County + 0.00 + AND + 0 + COUNTYNAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + FIPS + NAME + + parent + + + + + + + 25 + + + + NAME + AREA + POINTS + + + + + + + + + 1 + 100 + + distance + warngenlev + population + + + + + NAME + AREA + POINTS + + + + + + + + + 5 + 100 + + distance + + + + + 1 + true + 8.0 + 5 + 5 + 10 + 8 + Name + AREA + COUNTYNAME + + STATE + STATE + countyTypes.txt + + warngenlev + population + distance + + + + + + + + + + + + + NAME + 1 + AREA + TRACK + true + 20 + 10 + + + + + + + + + + warngenlev + population + distance + + + + + NAME + 1 + AREA + TRACK + true + 10 + 10 + + distance + + + + + + + + + + + + + + + + + + + + WarnGenLoc + County + + States + TIMEZONES + TIME_ZONE + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeWeatherStatement.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeWeatherStatement.vm index b27a3611b6..1130d2d0a1 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeWeatherStatement.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeWeatherStatement.vm @@ -1,19 +1,23 @@ ################################################################# ## SEVERE WEATHER STATEMENT TEMPLATE ## ## CREATED BY EVAN BOOKBINDER - WFO EAX ## -## RECENT HISTORY: +## MODIFIED INITIAL OB11.4 REWRITE - 4-13-2011 ## +## HEADLINE MACRO REWRITE 8-17-2011 OB11.8.4 ## +## PATHCAST/CITIES CHANGES 9-15-2011 OB11.8.0-8 ## +## BY PHIL KURIMSKI 9-22-2011 OB11.8.0-8 ## +## BY EVAN BOOKBINDER 11-04-2011 OB11.9-3 ## +## BY EVAN BOOKBINDER 2-24-2012 OB12.2.1 ## +## BY MIKE REGA 5-3-2012 DR 14885 MND blank line ## +## BY QINGLU LIN 6-18-2012 DR 15043 use duration ## +## BY QINGLU LIN 7-31-2012 DR 15217 use roundAndPad## ## Mike Dangelo 9-13-2012 minor tweaks to ${variables} ## ## Mike Dangelo 2-5-2013 NWS Mets Detected options ## ## PHIL KURIMSKI 2-6-2013 Tor emergency preamble ## -## EVAN BOOKBINDER 9-16-2013 CTA WORDING FIX ## -## PHIL KURIMSKI 9-17-2013 Tor emergency headline ## -## EVAN BOOKBINDER 9-18-2013 Implemented config.vm ## ################################################################# ## ################################################################### ## Set null variables for wind/hail tags used in the template ## ################################################################### -#parse("config.vm") #set($windhailTag = "") #set($TORhailTag = "") ############################################################################### @@ -75,33 +79,19 @@ ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} ${ugclinecan} /${productClass}.CAN.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire},${timeFormat.ymdthmz})}/ #foreach (${area} in ${cancelareas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## +${area.name} ${area.stateabbr}-## #end --## -#end - #elseif(${CORCAN}=="true") ${ugclinecan} /${productClass}.COR.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire},${timeFormat.ymdthmz})}/ #foreach (${area} in ${cancelareas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## +${area.name} ${area.stateabbr}-## #end --## -#end - #else ${ugcline} /${productClass}.${action}.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire},${timeFormat.ymdthmz})}/ #foreach (${area} in ${areas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end #end @@ -143,8 +133,6 @@ ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} #elseif(${action}=="CANCON" || ${CORCAN}=="true") ...THE ${eventType} WARNING FOR ## #headlineLocList(${cancelareas} true true true false) ${expcanHLTag}... -###REPLACE headlineLocList ABOVE WITH THE FOLLOWING FOR ZONE BASED PRODUCT W/ COUNTY HEADLINE -###headlineLocList(${cancelaffectedCounties} true true true false) ${expcanHLTag}... #end ############################ ## END CAN/EXP HEADLINE #### @@ -322,11 +310,7 @@ $$ ${ugcline} /${productClass}.CON.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz})}/ #foreach (${area} in ${areas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} @@ -341,11 +325,7 @@ ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} ${ugcline} /${productClass}.COR.${vtecOffice}.${phenomena}.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz})}/ #foreach (${area} in ${areas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## -#end --## +${area.name} ${area.stateabbr}-## #end ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} @@ -354,19 +334,18 @@ ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} ...THIS MESSAGE IS FOR TEST PURPOSES ONLY... #end -#end -##################################################################### -### TORNADO EMERGENCY HEADLINE # -##################################################################### -#if(${list.contains(${bullets}, "torEmergency")}) - -...TORNADO EMERGENCY FOR !** EDIT LOCATION(S) **!... - #end #if(${action}=="CANCON" || ${action}=="CON" || ${action}=="COR" || ${CORCAN}=="true") ...A ${eventType} WARNING REMAINS IN EFFECT #secondBullet(${dateUtil},${expire},${timeFormat},${localtimezone},${secondtimezone},${duration}) FOR ## #headlineLocList(${areas} true true true false)... ########### END NEW HEADLINE CODE #################### +##################################################################### +### TORNADO EMERGENCY PER NWS 10-511 DIRECTIVE # +##################################################################### +#if(${list.contains(${bullets}, "torEmergency")}) +...THIS IS A TORNADO EMERGENCY FOR !** EDIT LOCATION(S) **!... + +#end #set($reportType = "!** BASIS FOR WARNING **!") #set($reportAuthSVR = "") ############### BASIS SECTION #################### @@ -635,24 +614,15 @@ THIS IS A TEST MESSAGE. ## #thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) ...${reportType}${hailwind}. ## ${reportType2} LOCATED ## -##Many of the variables passed below are controlled by config.vm #if(${stormType} == "line") -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxLandNearDistance}, ${overPhrase}, ${maxLandOverDistance}, ${landDistanceUnits}, ${useSecondReferenceLine}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "MILES", false) #else -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxLandNearDistance}, ${overPhrase}, ${maxLandOverDistance}, ${landDistanceUnits}, ${useSecondReferenceCell}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "MILES", true) #end -#if(${movementSpeed} < ${landStationary} || ${stationary}) +#if($movementSpeed < 3 || ${stationary}) . ${reportType2} NEARLY STATIONARY. ${smallHail}${TORHailThreat} #else ...MOVING #direction(${movementDirectionRounded}) AT ${mathUtil.roundTo5(${movementSpeed})} MPH. ${smallHail}${TORHailThreat} -#end - -##################################################################### -### TORNADO EMERGENCY PER NWS 10-511 DIRECTIVE GOES WITH 3RD BULLET # -##################################################################### -#if(${list.contains($bullets, "torEmergency")}) -THIS IS A TORNADO EMERGENCY FOR !** EDIT LOCATION(S) **!. TAKE COVER NOW. - #end ############################################# ######## GENERATE ADDITIONAL REPORTS ####### @@ -720,8 +690,6 @@ THOSE ATTENDING THE !**now/venue name or location**! ARE IN THE PATH OF THIS STO ## parse file command here is to pull in mile marker info ## #parse("mileMarkers.vm") -## Uncomment below pull in point marker info -## #parse("pointMarkers.vm") ################################## ######### CALLS TO ACTION ######## @@ -800,7 +768,7 @@ SEVERE THUNDERSTORMS PRODUCE DAMAGING WINDS...DESTRUCTIVE HAIL...DEADLY LIGHTNIN ## #if(${list.contains(${bullets}, "canProduceTornadoesCTA")}) #if(${stormType} == "line") -DOPPLER RADAR HAS INDICATED SOME WEAK ROTATION WITHIN THESE STORMS. ALTHOUGH A TORNADO IS NOT IMMEDIATELY LIKELY...IF ONE IS SPOTTED...ACT QUICKLY AND MOVE TO A PLACE OF SAFETY IN A STURDY STRUCTURE...SUCH AS A BASEMENT OR SMALL INTERIOR ROOM. +DOPPLER RADAR HAS INDICATED SOME WEAK ROTATION WITHIN THESE STORMS. ALTHOUGH A TORNADO IS NOT IMMEDIATELY LIKELY...IF ONE IS SPOTTED...ACT QUICKLY AND MOVE TO A PLACE OF SAFETY IN A STURDY STRUCTURE...SUCH AS A BASEMENT OR SMALL INTERIOR #else DOPPLER RADAR HAS INDICATED SOME WEAK ROTATION WITHIN THIS STORM. ALTHOUGH A TORNADO IS NOT IMMEDIATELY LIKELY...IF ONE IS SPOTTED...ACT QUICKLY AND MOVE TO A PLACE OF SAFETY IN A STURDY STRUCTURE...SUCH AS A BASEMENT OR SMALL INTERIOR ROOM. diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeWeatherStatement.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeWeatherStatement.xml index e870e42fc2..e94414c988 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeWeatherStatement.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeWeatherStatement.xml @@ -8,7 +8,6 @@ Qinglu Lin 04-04-2012 DR 14691. Added tag. Evan Bookbinder 09-11-2012 Added settings for locations shapefile Mike Dangelo 2-5-2013 NWS Mets Detected options (commented by default) - Phil Kurimski 09-19-2013 added geospatialConfig.xml --> - - - - - - - - - mi mph @@ -231,9 +217,10 @@ turned on unless the corresponding .vm file is turned on in a given template's . - - - + + + + @@ -289,15 +276,16 @@ turned on unless the corresponding .vm file is turned on in a given template's . - - - + + + + - + @@ -358,9 +346,10 @@ turned on unless the corresponding .vm file is turned on in a given template's . - - - + + + + @@ -414,16 +403,17 @@ turned on unless the corresponding .vm file is turned on in a given template's . - - - + + + + - + @@ -443,4 +433,158 @@ turned on unless the corresponding .vm file is turned on in a given template's . + + + + County + 0 + AND + 0 + COUNTYNAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + FIPS + NAME + + parent + + + + + + + 25 + + + + NAME + AREA + POINTS + + + + + + + + + 1 + 100 + + distance + warngenlev + population + + + + + NAME + AREA + POINTS + + + + + + + + + 5 + 100 + + distance + + + + + 1 + true + 8.0 + 5 + 5 + 4 + 8 + Name + AREA + COUNTYNAME + + STATE + STATE + countyTypes.txt + + warngenlev + population + distance + + + + + + + + + + + + + 1 + NAME + AREA + TRACK + true + 20 + 10 + + + + + + + + + + warngenlev + population + distance + + + + + NAME + 1 + AREA + TRACK + true + 10 + 10 + + distance + + + + + + + + + + + + + + + + + WarnGenLoc + States + County + + TIMEZONES + TIME_ZONE + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/shortTermForecast.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/shortTermForecast.vm index 4097824fae..f954dae9d5 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/shortTermForecast.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/shortTermForecast.vm @@ -2,14 +2,12 @@ ## SHORT TERM FORECAST ## ## CREATED BY PHIL KURIMSKI - WFO DTX ## ## VERSION AWIPS II 1.0 -- AUG 19 2011 OB11.8 ## -## EDITED BY MIKE DANGELO 2-27-2012 -## EDITED BY Phil Kurimski 3-01-2012 OB12.2.1-4 +## EDITED BY MIKE DANGELO 2-27-2012 ## +## EDITED BY Phil Kurimski 3-01-2012 OB12.2.1-4 ## ## Evan Bookbinder 4-25-2012 for OB 12.3.1 (MND) -## Mike Dangelo 9-13-2012 minor tweaks to ${variables} -## Evan Bookbinder 9-18-2013 implemented config.vm -################################################################ +## Mike Dangelo 9-13-2012 minor tweaks to ${variables} +################################################## ## -#parse("config.vm") ${WMOId} ${vtecOffice} 000000 ${BBBId} NOW${siteId} @@ -144,7 +142,7 @@ THIS IS A TEST MESSAGE. ## ####################################################################### #set($report = "!** YOU DIDN'T SELECT A BASIS **! ${eventType}") #if(${list.contains(${bullets}, "doppler")}) - #set($report = "DOPPLER RADAR INDICATED ${eventType}...") + #set($report = "NATIONAL WEATHER SERVICE DOPPLER RADAR INDICATED ${eventType}...") #end #if(${list.contains(${bullets}, "trainedSpotters")}) #set($report = "TRAINED WEATHER SPOTTERS REPORTED ${eventType}...") @@ -164,13 +162,12 @@ THIS IS A TEST MESSAGE. ## .NOW... #thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) ...${report}## -##Many of the variables passed below are controlled by config.vm #if(${stormType} == "line") -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxLandNearDistance}, ${overPhrase}, ${maxLandOverDistance}, ${landDistanceUnits}, ${useSecondReferenceLine}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "MILES", false) #else -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxLandNearDistance}, ${overPhrase}, ${maxLandOverDistance}, ${landDistanceUnits}, ${useSecondReferenceCell}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "MILES", true) #end -#if(${movementSpeed} < ${landStationary} || ${stationary}) +#if($movementSpeed < 3 || ${stationary}) . ${reportType2} NEARLY STATIONARY. #else MOVING #direction(${movementDirectionRounded}) AT ${mathUtil.roundTo5(${movementSpeed})} MPH. @@ -205,7 +202,7 @@ LOCATIONS IMPACTED INCLUDE... #end -#if(${list.contains(${bullets}, "gustFrontPassage")}) +#if(${list.contains(${bullets}, "gustFrontWinds")}) GUSTY WINDS TO !**WIND SPEED**! MPH WILL ACCOMPANY THE FRONT. #end diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/shortTermForecast.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/shortTermForecast.xml index c74eca389d..5a6c5bc016 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/shortTermForecast.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/shortTermForecast.xml @@ -8,24 +8,9 @@ Added settings for locations shapefile Added new areaSource object Evan Bookbinder 5-5-2013 fixed variable under areaSource objects - Chad Gimmestad 9-17-2013 made additional info bullet names/labels consistent - Phil Kurimski 09-19-2013 added geospatialConfig.xml --> - - - - - - - - - mi mph @@ -101,13 +86,13 @@ turned on unless the corresponding .vm file is turned on in a given template's . - - + + - - - + + + @@ -136,7 +121,8 @@ turned on unless the corresponding .vm file is turned on in a given template's . - + + @@ -148,4 +134,193 @@ turned on unless the corresponding .vm file is turned on in a given template's . + + + + + + + + + + Zone + HATCHING + 0 + AND + 0 + NAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + + STATE_ZONE + NAME + + parent + + + + + + + 25 + + + + + County + INTERSECT + 0 + AND + 0 + COUNTYNAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + FIPS + NAME + + parent + + + + + + + 25 + + + + NAME + AREA + POINTS + + + + + + + + + 1 + 100 + + distance + warngenlev + + + + + NAME + AREA + POINTS + + + + + + + + + 5 + 100 + + distance + warngenlev + + + + + 1 + true + 8.0 + 5 + 5 + 10 + 8 + Name + AREA + + NAME --> + STATE + STATE + countyTypes.txt + + warngenlev + population + distance + + + + + + + + + + + + + NAME + 1 + AREA + TRACK + true + 20 + 10 + + + + + + + + + + warngenlev + population + distance + + + + + NAME + 1 + AREA + TRACK + true + 10 + 10 + + distance + + + + + + + + + + + + + + + + WarnGenLoc + + Zone + States + TIMEZONES + TIME_ZONE + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/significantWeatherAdvisory.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/significantWeatherAdvisory.vm index 1befba963d..0864126461 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/significantWeatherAdvisory.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/significantWeatherAdvisory.vm @@ -2,13 +2,10 @@ ## SPS - SIGNIFICANT WEATHER ADVISORY ## ## WRITTEN BY: ## ## TOM BIRCHARD WFO HFO/EVAN BOOKBINDER WFO EAX ## -## Modified by: ## -## Phil Kurimski 16 Sep 2013 OB13.5.2-4 ## -## Evan Bookbinder Sep 18 2013 Implemented config.vm ## -################################################################### +## VERSION 1.0 8-16-2011 ## +###################################################### ## ##SET SOME INITIAL VARIABLES -#parse("config.vm") #if(${stormType} == "line") #set($report = "A LINE OF STRONG THUNDERSTORMS WERE REPORTED") #set($reportType1 = "LINE OF STRONG THUNDERSTORMS") @@ -18,14 +15,11 @@ #set($reportType1 = "STRONG THUNDERSTORM") #set($reportType2 = "THIS STORM WAS") #end -#set($windThreat = "") -#set($hailThreat = "") -#set($hailTrail = "") ############################################################# #### CREATE BASIS WORDING ################################### ############################################################# #if(${list.contains(${bullets}, "doppler")}) - #set($report = "DOPPLER RADAR WAS TRACKING A ${reportType1}") + #set($report = "NATIONAL WEATHER SERVICE DOPPLER RADAR WAS TRACKING A ${reportType1}") #set($reportAuthSVR = "CAPABLE OF PRODUCING") #end #if(${list.contains(${bullets}, "stormSpotters")}) @@ -63,15 +57,10 @@ #set($windTag = "40MPH") #end #if(${list.contains(${bullets}, "wind50")}) - #set($windThreat = "WIND GUSTS UP TO 50 MPH") + #set($windThreat = "WINDS IN EXCESS OF 50 MPH") #set($windSpeed = 50) #set($windTag = "50MPH") #end -#if(${list.contains(${bullets}, "wind55")}) - #set($windThreat = "WIND GUSTS OF 50 TO 55 MPH") - #set($windSpeed = 50) - #set($windTag = "55MPH") -#end ################################################### ## HANDLE HAIL POSSIBILITIES ###################### @@ -79,13 +68,8 @@ #set($hailSize = 0) #set($smallHail = "") #if(${list.contains(${bullets}, "peaHail")}) - #set($hailSize = 0.25) - #set($hailThreat = "PEA SIZE") - #set($hailTrail = " HAIL") -#end -#if(${list.contains(${bullets}, "halfHail")}) #set($hailSize = 0.50) - #set($hailThreat = "HALF INCH") + #set($hailThreat = "PEA SIZE") #set($hailTrail = " HAIL") #end #if(${list.contains(${bullets}, "dimeHail")}) @@ -119,14 +103,11 @@ ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} #end ${ugcline} +#set($zoneList = "") #foreach (${area} in ${areas}) -${area.name}## -#if(${includeStateAbbreviation}==true) - ${area.stateabbr}## +#set($zoneList = "${zoneList}${area.name}-") #end --## -#end - +${zoneList} ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} #if(${productClass}=="T") @@ -154,13 +135,12 @@ THIS IS A TEST MESSAGE. ## #end #thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) ...${report} ## -##Many of the variables passed below are controlled by config.vm #if(${stormType} == "line") -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxLandNearDistance}, ${overPhrase}, ${maxLandOverDistance}, ${landDistanceUnits}, ${useSecondReferenceLine}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "MILES", false) #else -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxLandNearDistance}, ${overPhrase}, ${maxLandOverDistance}, ${landDistanceUnits}, ${useSecondReferenceCell}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "MILES", true) #end -#if(${movementSpeed} < ${landStationary} || ${stationary}) +#if($movementSpeed < 3 || ${stationary}) . ${reportType2} NEARLY STATIONARY. ${smallHail} #else #if(${stormType} == "line") @@ -171,21 +151,41 @@ THIS IS A TEST MESSAGE. ## #direction(${movementDirectionRounded}) AT ${mathUtil.roundTo5(${movementSpeed})} MPH. ${smallHail} #end +#if(${list.contains(${bullets}, "peaHail")}) +#set($hail = "Hail up to the size of peas") +#elseif(${list.contains(${bullets}, "dimeHail")}) +#set($hail = "Hail up to the size of dimes") +#elseif(${list.contains(${bullets}, "nickelHail")}) +#set($hail = "Hail up to the size of nickels") +#else +#set($hail="") +#end +#if(${list.contains(${bullets}, "wind30")}) +#set($wind = "Wind gusts up to 30 mph") +#elseif(${list.contains(${bullets}, "wind40")}) +#set($wind = "Wind gusts up to 40 mph") +#elseif(${list.contains(${bullets}, "wind50")}) +#set($wind = "Wind gusts up to 50 mph") +#else +#set($wind="") +#end + + #if(${stormType} == "line") -#if(${hailThreat} != "" && ${windThreat} != "") -${hailThreat}${hailTrail} AND ${windThreat} WILL BE POSSIBLE WITH THESE STORMS. -#elseif(${hailThreat}=="" && ${windThreat}!="") -${windThreat} WILL BE POSSIBLE WITH THESE STORMS. -#elseif(${hailThreat}!="" && ${windThreat}=="") -${hailThreat}${hailTrail} WILL BE POSSIBLE WITH THESE STORMS. +#if(${hail} != "" && ${wind} != "") +${hail} AND ${wind} WILL BE POSSIBLE WITH THESE STORMS. +#elseif(${hail}=="" && ${wind}!="") +${wind} WILL BE POSSIBLE WITH THESE STORMS. +#elseif(${hail}!="" && ${wind}=="") +${hail} WILL BE POSSIBLE WITH THESE STORMS. #end #else -#if(${hailThreat} != "" && ${windThreat} != "") -${hailThreat}${hailTrail} AND ${windThreat} WILL BE POSSIBLE WITH THIS STORM. -#elseif(${hailThreat}=="" && ${windThreat}!="") -${windThreat} WILL BE POSSIBLE WITH THIS STORM. -#elseif(${hailThreat}!="" && ${windThreat}=="") -${hailThreat}${hailTrail} WILL BE POSSIBLE WITH THIS STORM. +#if(${hail} != "" && ${wind} != "") +${hail} AND ${wind} WILL BE POSSIBLE WITH THIS STORM. +#elseif(${hail}=="" && ${wind}!="") +${wind} WILL BE POSSIBLE WITH THIS STORM. +#elseif(${hail}!="" && ${wind}=="") +${hail} WILL BE POSSIBLE WITH THIS STORM. #end #end @@ -240,8 +240,6 @@ THIS IS A TEST MESSAGE. ## ## parse file command here is to pull in mile marker info ## #parse("mileMarkers.vm") -## Uncomment below pull in point marker info -## #parse("pointMarkers.vm") ################################## ######### CALLS TO ACTION ######## diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/significantWeatherAdvisory.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/significantWeatherAdvisory.xml index 37298cbbca..6662cdb8ae 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/significantWeatherAdvisory.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/significantWeatherAdvisory.xml @@ -5,23 +5,9 @@ 9-15-2011 Merge in OB11.8.0-8 Coding Changes, Zone Codes 9-12-2012 Added in new areaSource object and recode for new locations shapefile - Phil Kurimski 09-19-2013 added geospatialConfig.xml --> - - - - - - - - - mi mph @@ -31,7 +17,6 @@ turned on unless the corresponding .vm file is turned on in a given template's . that can be loaded with each template. --> Forecast Zones - County Names County Warning Areas @@ -84,9 +69,8 @@ turned on unless the corresponding .vm file is turned on in a given template's . - - - + + @@ -118,14 +102,14 @@ turned on unless the corresponding .vm file is turned on in a given template's . - - - + + - + + @@ -144,4 +128,193 @@ turned on unless the corresponding .vm file is turned on in a given template's . + + + + + + + + + + Zone + HATCHING + 0 + AND + 0 + NAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + + STATE_ZONE + NAME + + parent + + + + + + + 25 + + + + + COUNTY + INTERSECT + 0 + AND + 0 + COUNTYNAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + FIPS + NAME + + parent + + + + + + + 25 + + + + NAME + AREA + POINTS + + + + + + + + + 1 + 100 + + distance + warngenlev + population + + + + + NAME + AREA + POINTS + + + + + + + + + 5 + 100 + + distance + + + + + 1 + AREA + true + 8.0 + 5 + 5 + 4 + 8 + Name + + NAME + STATE + STATE + countyTypes.txt + + warngenlev + population + distance + + + + + + + + + + + + + NAME + 1 + AREA + TRACK + true + 20 + 10 + + + + + + + + + + warngenlev + population + distance + + + + + NAME + 1 + AREA + TRACK + true + 10 + 10 + + distance + + + + + + + + + + + + + WarnGenLoc + + Zone + States + TIMEZONES + TIME_ZONE + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/specialMarineWarning.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/specialMarineWarning.vm index c61278ce4c..9a20d47fd5 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/specialMarineWarning.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/specialMarineWarning.vm @@ -1,12 +1,21 @@ ##################################################### ## SPECIAL MARINE WARNING TEMPLATE ## ## CREATED BY PHIL KURIMSKI - WFO DTX ## -## RECENT HISTORY ## -## BY QINGLU LIN 8-14-2012 DR 14493 use TMLtime ## -## Phil Kurimski -- SEP 10 2012 OB12.9.1-12 ## -## Evan Bookbinder SEP 18 2013 Implemented config.vm ## +## VERSION AWIPS II 1.0 -- FEB 24 2011 OB11.2 ## +## VERSION AWIPS II 1.1 -- APR 13 2011 OB11.4 ## +## VERSION AWIPS II 1.2 -- JUL 14 2011 OB11.7 ## +## VERSION AWIPS II 1.3 -- SEP 23 2011 OB11.8 ## +## Added Volcano Information for version 1.3 ## +## VERSION AWIPS II 1.4 -- JAN 26 2012 OB12.1.1-1 ## +## Cleaned up wind coding for version 1.4 ## +## VERSION AWIPS II 1.5 -- MAR 2 2012 OB12.2.1-4 ## +## BY QINGLU LIN 8-14-2012 DR 14493 use TMLtime ## +## Phil Kurimski -- SEP 10 2012 OB12.9.1-12 ## ################################################################ -#parse("config.vm") +## Added Volcano Information in version 1.3 for sites where +## Volcanoes affect their marine zones. If sites wish to hide +## this information comment out the appropriate bullets in the +## xml file. ################################################ ## Set null variables used in the template ################################################ @@ -118,57 +127,47 @@ THIS IS A TEST MESSAGE. ## #set($eventType = "VOLCANO") #end ####################################################################### -## Added a Threat Section to the template that includes Wind...Hail -## and Waterspout selections. +## Added a Threat Section to template that includes Wind...Hail and Waterspout selections. ## Strong Thunderstorm will change to Severe Thunderstorm automatically based on ## selections in Wind...Hail and Waterspout sections. ####################################################################### #set($windTag = "<34") -#set($windCTA = "GUSTY WINDS") #if(${list.contains(${bullets}, "34ktWind")}) #set($windTag = ">34") #set($windType = "WINDS 34 KNOTS OR GREATER") - #set($windCTA = "WIND GUSTS 34 KNOTS OR GREATER") #end #if(${list.contains(${bullets}, "40ktWind")}) #set($windTag = "40") #set($windType = "WINDS TO 40 KNOTS") - #set($windCTA = "WIND GUSTS TO 40 KNOTS") #end #if(${list.contains(${bullets}, "40ktplusWind")}) #set($windTag = "40") #set($windType = "WINDS TO NEARLY 50 KNOTS") - #set($windCTA = "WIND GUSTS TO NEARLY 50 KNOTS") #end #if(${list.contains(${bullets}, "50ktWind")}) #set($windTag = "50") #set($windType = "DANGEROUS WINDS IN EXCESS OF 50 KNOTS") #set($severeType = "SEVERE") - #set($windCTA = "WIND GUSTS IN EXCESS OF 50 KNOTS") #end #if(${list.contains(${bullets}, "65ktWind")}) #set($windTag = "65") #set($windType = "DANGEROUS CAPSIZING WINDS IN EXCESS OF 65 KNOTS") #set($severeType = "SEVERE") - #set($windCTA = "WIND GUSTS IN EXCESS OF 65 KNOTS") #end #set($hailTag = "0.00") #if(${list.contains(${bullets}, "smallHail")}) #set($hailTag = "<.75") #set($hailType = "SMALL HAIL") - #set($hailCTA = "...${hailType}") #end #if(${list.contains(${bullets}, "largeHail")}) #set($hailTag = ">.75") #set($hailType = "LARGE HAIL") #set($severeType = "SEVERE") - #set($hailCTA = "...${hailType}") #end #if(${list.contains(${bullets}, "destructiveHail")}) #set($hailTag = ">2.0") #set($hailType = "LARGE DESTRUCTIVE HAIL") #set($severeType = "SEVERE") - #set($hailCTA = "...${hailType}") #end #if(${list.contains(${bullets}, "sightedSpout")}) #set($spoutType = "WATERSPOUTS") @@ -315,13 +314,13 @@ THIS IS A TEST MESSAGE. ## #thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) ...${report}LOCATED ## #if(${stormType} == "line") -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxMarineNearDistance}, ${overPhrase}, ${maxMarineOverDistance}, ${marineDistanceUnits}, ${useSecondReferenceLine}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "NM", false) #else -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxMarineNearDistance}, ${overPhrase}, ${maxMarineOverDistance}, ${marineDistanceUnits}, ${useSecondReferenceCell}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "NM", true) #end #if(${eventType} == "VOLCANO") . -#elseif(${movementSpeed} < ${marineStationary} || ${stationary}) +#elseif($movementSpeed < 3 || ${stationary}) . ${reportType2} NEARLY STATIONARY. #else ...MOVING #direction(${movementDirectionRounded}) AT ${mathUtil.roundTo5(${movementSpeed})} KNOTS. @@ -358,7 +357,7 @@ THIS IS A TEST MESSAGE. ## ############################################## #if(${list.contains(${bullets}, "specialEvent")}) -THOSE ATTENDING !**event/venue name or location**! ARE IN THE PATH OF ${specialEvent} AND SHOULD PREPARE FOR IMMINENT DANGEROUS WEATHER CONDITIONS. SEEK SHELTER NOW. +EVERYONE AT !**event/venue name or location**! ARE IN THE PATH OF ${specialEvent} AND SHOULD PREPARE FOR IMMINENT DANGEROUS WEATHER CONDITIONS. SEEK SHELTER NOW. #end ##################### @@ -382,31 +381,12 @@ PRECAUTIONARY/PREPAREDNESS ACTIONS... ${ashfallCTA} #if(${list.contains(${bullets}, "genericCTA")}) -#if(${stormType} == "line") -AS THUNDERSTORMS MOVE OVER THE WATER...BOATERS CAN EXPECT GUSTY WINDS AND HIGH WAVES. MOVE TO SAFE HARBOR OR STAY CLOSE TO SHORE UNTIL THESE STORMS PASS. +AS THUNDERSTORMS MOVE OVER THE WATER...BOATERS CAN EXPECT GUSTY WINDS AND HIGH WAVES. MOVE TO SAFE HARBOR OR STAY CLOSE TO SHORE UNTIL THE STORM PASSES. -#else -AS THIS THUNDERSTORM MOVES OVER THE WATER...BOATERS CAN EXPECT GUSTY WINDS AND HIGH WAVES. MOVE TO SAFE HARBOR OR STAY CLOSE TO SHORE UNTIL THE STORM PASSES. - -#end #end #if(${list.contains(${bullets}, "gustyWindsCTA")}) -#if(${stormType} == "line") -MARINERS CAN EXPECT GUSTY WINDS...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THESE STORMS PASS. - -#else MARINERS CAN EXPECT GUSTY WINDS...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THIS STORM PASSES. -#end -#end -#if(${list.contains(${bullets}, "hailWindsCTA")}) -#if(${stormType} == "line") -MARINERS CAN EXPECT ${windCTA}${hailCTA}...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THESE STORMS PASS. - -#else -MARINERS CAN EXPECT ${windCTA}${hailCTA}...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THIS STORM PASSES. - -#end #end #if(${list.contains(${bullets}, "nonThunderstormCTA")}) MARINERS CAN EXPECT GUSTY WINDS...AND INCREASING WAVES. BOATERS...ESPECIALLY THOSE UNDER SAIL...SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THE HIGH WINDS SUBSIDE. diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/specialMarineWarning.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/specialMarineWarning.xml index 70f1df6d30..bf5a1b3926 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/specialMarineWarning.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/specialMarineWarning.xml @@ -5,23 +5,8 @@ Added Volcano Information Phil Kurimski 23 Sept 2011 Phil Kurimski 1 Mar 2012 Evan Bookbinder 09-11-2012 Added settings for locations shapefile - Phil Kurimski 09-16-2013 Fixed multiple selections in pathcast - Phil Kurimski 09-19-2013 added geospatialConfig.xml --> - - - - - - - - - nmi kn @@ -125,13 +110,12 @@ turned on unless the corresponding .vm file is turned on in a given template's . - - + + - + - @@ -176,14 +160,14 @@ turned on unless the corresponding .vm file is turned on in a given template's . - - - + + + + - + - @@ -192,4 +176,146 @@ turned on unless the corresponding .vm file is turned on in a given template's . + + + MarineZones + 0 + AND + 0 + NAME + NAME + NAME + countyTypes.txt + ID + NAME + + parent + + + + + + + 25 + + + + NAME + AREA + POINTS + 1 + 100 + + + + + + + + + + distance + WARNGENLEV + + + + + NAME + AREA + POINTS + 5 + 100 + + + + + + + + + + distance + WARNGENLEV + + + + + + false + 1 + 10.0 + 5 + 5 + 4 + 8 + Name + AREA + Name + Name + Name + countyTypes.txt + + + + + + + + + + distance + + + + + NAME + 1 + AREA + TRACK + true + 20 + 20 + + + + + + + + + + distance + + + + + NAME + 1 + AREA + TRACK + true + 10 + 20 + + distance + + + + + + + + + + + + + WarnGenLoc + MarineZones + MarineZones + TIMEZONES + TIME_ZONE + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/specialMarineWarningFollowup.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/specialMarineWarningFollowup.vm index 2d5d85cc88..01dcd6d485 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/specialMarineWarningFollowup.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/specialMarineWarningFollowup.vm @@ -1,10 +1,22 @@ -################################################################### -## SPECIAL MARINE WARNING FOLLOWUP ## -## CREATED BY PHIL KURIMSKI - WFO DTX ## -## UPDATED Phil Kurimski -- SEP 17 2013 OB13.5.2-4 ## -## Evan Bookbinder -- SEP 18 2013 Implemented config.vm ## -################################################################### -#parse("config.vm") +##################################################### +## SPECIAL MARINE WARNING FOLLOWUP ## +## CREATED BY PHIL KURIMSKI - WFO DTX ## +## VERSION AWIPS II 1.0 -- FEB 24 2011 OB11.2 ## +## VERSION AWIPS II 1.1 -- APR 14 2011 OB11.4 ## +## VERSION AWIPS II 1.2 -- JUL 14 2011 OB11.7 ## +## VERSION AWIPS II 1.3 -- SEP 22 2011 OB11.8 ## +## Added Volcano Information for version 1.3 ## +## VERSION AWIPS II 1.4 -- JAN 26 2012 OB12.1.1-1 ## +## Cleaned up wind coding for version 1.4 ## +## VERSION AWIPS II 1.5 -- MAR 2 2012 OB12.2.1-4 ## +## BY MGAMAZAYCHIKOV -- JUL 20 2012 DR15006 ## +## Phil Kurimski -- SEP 10 2012 OB12.9.1-12 ## +##################################################### +## Added Volcano Information in version 1.3 for sites where +## Volcanoes affect their marine zones. If sites wish to hide +## this information comment out the appropriate bullets in the +## xml file. +############################################ ## Set null variables used in the template ############################################ #set($capable = "") @@ -27,10 +39,151 @@ #end ################################################ ####################################################################### +## The following code will create a string of marine zone fips codes +## which will be important in combining marine zones +####################################################################### +####################################################################### +## Set the fipsstring variable to null for marine zone combinations +## This will only work for single CON/CAN/EXP products +## Combination CON/CAN will need additional code which will be +## included in the template below. +####################################################################### +#set($fipsstring = "") +#foreach (${area} in ${areas}) +#set($fipsstring = $fipsstring + $area.fips + "-") +#end +####################################################################### +## HEADER FOR NON-CAN/CON PRODUCTS +####################################################################### +## +#if(${action}=="COR" && ${cancelareas}) +#set($CORCAN = "true") +#else +#set($CORCAN = "false") +#end +#if(${action}!="CANCON" && ${CORCAN}!="true") +${WMOId} ${vtecOffice} 000000 ${BBBId} +MWS${siteId} + +#if(${productClass}=="T") +TEST...MARINE WEATHER STATEMENT...TEST +#else +MARINE WEATHER STATEMENT +#end +NATIONAL WEATHER SERVICE ${officeShort} +#backupText(${backupSite}) +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +#if(${productClass}=="T") +...THIS MESSAGE IS FOR TEST PURPOSES ONLY... + +#end +${ugcline} +/${productClass}.${action}.${vtecOffice}.MA.W.${oldvtec}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +#if(${productClass}=="T") +...THIS MESSAGE IS FOR TEST PURPOSES ONLY... + +#end +#end +## +####################################################################### +## MWS CANCEL PRODUCT +####################################################################### +## Altered cancellation headline for cleaner wording and to match NWS Directive 10-314 +######################################################################## +#if(${action}=="CAN") +#if(${productClass}=="T") +THIS IS A TEST MESSAGE.## +#end +...THE ${warningType} IS CANCELLED... + +THE AFFECTED AREAS WERE... +####################################################################### +## Coding to use the raw marine zone output from the shapefiles +## Comment this section out if you are combining your marine zones +####################################################################### +#foreach (${area} in ${areas}) +${area.name}... +#end +####################################################################### +## End of code for raw marine zone output from the shapefiles +####################################################################### +####################################################################### +## Parse in the marineCombo.vm file which contains marine zone combinations +## Uncomment the parse command if you are combining your marine zones +####################################################################### +##parse("marineCombo.vm") +####################################################################### +## End of the marine zone combination script +####################################################################### + +###################################################################### +## Setup eventType for wording in the End of Warning Statement +###################################################################### +#set($stormline = " HAS") +#set($pose = "POSES") +#if(${stormType} == "line") + #set($stormline = "S HAVE") + #set($pose = "POSE") +#end +#set($eventType = "!**STORMS**! HAVE") +#if(${list.contains(${bullets}, "thunderstorm")}) + #set($eventType = "THUNDERSTORM${stormline}") +#end +#if(${list.contains(${bullets}, "shower")}) + #set($eventType = "SHOWER${stormline}") +#end +#if(${list.contains(${bullets}, "cloud")}) + #set($eventType = "CLOUD${stormline}") +#end +#if(${list.contains(${bullets}, "front")}) + #set($eventType = "FRONT HAS") + #set($pose = "POSES") +#end +#if(${list.contains(${bullets}, "volcano")}) + #set($eventType = "VOLCANO HAS") + #set($pose = "POSES") +#end +####################################################################### +## Section for end of warning statements. Replaced default wording with +## a better defined reason for the end to the warning. +####################################################################### +#set($canwarning = "THE ${eventType} !**WEAKENED/MOVED OUT OF THE AREA**! AND NO LONGER ${pose} A SIGNIFICANT THREAT TO BOATERS.") +#if(${list.contains(${bullets}, "weakenedWarnEnd")}) + #set($canwarning = "THE ${eventType} WEAKENED AND NO LONGER ${pose} A SIGNIFICANT THREAT TO BOATERS.") +#end +#if(${list.contains(${bullets}, "movedWarnEnd")}) + #set($canwarning = "THE ${eventType} MOVED OUT OF THE AREA AND NO LONGER ${pose} A SIGNIFICANT THREAT TO BOATERS.") +#end +#if(${list.contains(${bullets}, "volcano")}) + #set($canwarning = "THE ${eventType} STOPPED ERUPTING AND NO LONGER ${pose} A SIGNIFICANT THREAT TO BOATERS.") +#end + +${canwarning} + +############# +## WATCHES ## +############# +#if(${list.contains(${includedWatches}, "torWatches")}) +#inserttorwatches(${watches}, ${list}, ${secondtimezone}, ${dateUtil}, ${timeFormat}) +#end +#if(${list.contains(${includedWatches}, "svrWatches")}) +#insertsvrwatches(${watches}, ${list}, ${secondtimezone}, ${dateUtil}, ${timeFormat}) +#end +#end +## +####################################################################### +## MWS CON PRODUCT +####################################################################### +## +####################################################################### ## List of Event Types. Added several events such as Shower...Cloud and Front. ## Removed Strong and Severe Thunderstorm selections and placed logic in the ## wind and hail selections that will change wording for Severe Thunderstorms. ####################################################################### +#if(${action}=="CON" || (${action}=="COR" && ${CORCAN}=="false")) #set($eventType = "THUNDERSTORM") #if(${list.contains(${bullets}, "thunderstorm")}) #set($eventType = "THUNDERSTORM") @@ -49,57 +202,47 @@ #set($eventType = "VOLCANO") #end ####################################################################### -## Added a Threat Section to the template that includes Wind...Hail -## and Waterspout selections. +## Added a Threat Section to template that includes Wind...Hail and Waterspout selections. ## Strong Thunderstorm will change to Severe Thunderstorm automatically based on ## selections in Wind...Hail and Waterspout sections. ####################################################################### #set($windTag = "<34") -#set($windCTA = "GUSTY WINDS") #if(${list.contains(${bullets}, "34ktWind")}) #set($windTag = ">34") #set($windType = "WINDS 34 KNOTS OR GREATER") - #set($windCTA = "WIND GUSTS 34 KNOTS OR GREATER") #end #if(${list.contains(${bullets}, "40ktWind")}) #set($windTag = "40") #set($windType = "WINDS TO 40 KNOTS") - #set($windCTA = "WIND GUSTS TO 40 KNOTS") #end #if(${list.contains(${bullets}, "40ktplusWind")}) #set($windTag = "40") #set($windType = "WINDS TO NEARLY 50 KNOTS") - #set($windCTA = "WIND GUSTS TO NEARLY 50 KNOTS") #end #if(${list.contains(${bullets}, "50ktWind")}) #set($windTag = "50") #set($windType = "DANGEROUS WINDS IN EXCESS OF 50 KNOTS") #set($severeType = "SEVERE") - #set($windCTA = "WIND GUSTS IN EXCESS OF 50 KNOTS") #end #if(${list.contains(${bullets}, "65ktWind")}) #set($windTag = "65") #set($windType = "DANGEROUS CAPSIZING WINDS IN EXCESS OF 65 KNOTS") #set($severeType = "SEVERE") - #set($windCTA = "WIND GUSTS IN EXCESS OF 65 KNOTS") #end #set($hailTag = "0.00") #if(${list.contains(${bullets}, "smallHail")}) #set($hailTag = "<.75") #set($hailType = "SMALL HAIL") - #set($hailCTA = "...${hailType}") #end #if(${list.contains(${bullets}, "largeHail")}) #set($hailTag = ">.75") #set($hailType = "LARGE HAIL") #set($severeType = "SEVERE") - #set($hailCTA = "...${hailType}") #end #if(${list.contains(${bullets}, "destructiveHail")}) #set($hailTag = ">2.0") #set($hailType = "LARGE DESTRUCTIVE HAIL") #set($severeType = "SEVERE") - #set($hailCTA = "...${hailType}") #end #if(${list.contains(${bullets}, "sightedSpout")}) #set($spoutType = "WATERSPOUTS") @@ -237,147 +380,6 @@ #if(${list.contains(${bullets}, "satellite")} && ${list.contains(${bullets}, "sightedSpout")}) #set($report = "SATELLITE IMAGERY INDICATED ${stormline}...PRODUCING ${threat}...") #end -####################################################################### -## The following code will create a string of marine zone fips codes -## which will be important in combining marine zones -####################################################################### -####################################################################### -## Set the fipsstring variable to null for marine zone combinations -## This will only work for single CON/CAN/EXP products -## Combination CON/CAN will need additional code which will be -## included in the template below. -####################################################################### -#set($fipsstring = "") -#foreach (${area} in ${areas}) -#set($fipsstring = $fipsstring + $area.fips + "-") -#end -####################################################################### -## HEADER FOR NON-CAN/CON PRODUCTS -####################################################################### -## -#if(${action}=="COR" && ${cancelareas}) -#set($CORCAN = "true") -#else -#set($CORCAN = "false") -#end -#if(${action}!="CANCON" && ${CORCAN}!="true") -${WMOId} ${vtecOffice} 000000 ${BBBId} -MWS${siteId} - -#if(${productClass}=="T") -TEST...MARINE WEATHER STATEMENT...TEST -#else -MARINE WEATHER STATEMENT -#end -NATIONAL WEATHER SERVICE ${officeShort} -#backupText(${backupSite}) -${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} - -#if(${productClass}=="T") -...THIS MESSAGE IS FOR TEST PURPOSES ONLY... - -#end -${ugcline} -/${productClass}.${action}.${vtecOffice}.MA.W.${oldvtec}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/ -${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} - -#if(${productClass}=="T") -...THIS MESSAGE IS FOR TEST PURPOSES ONLY... - -#end -#end -## -####################################################################### -## MWS CANCEL PRODUCT -####################################################################### -## Altered cancellation headline for cleaner wording and to match NWS Directive 10-314 -######################################################################## -#if(${action}=="CAN") -#if(${productClass}=="T") -THIS IS A TEST MESSAGE.## -#end -...THE ${warningType} IS CANCELLED... - -THE AFFECTED AREAS WERE... -####################################################################### -## Coding to use the raw marine zone output from the shapefiles -## Comment this section out if you are combining your marine zones -####################################################################### -#foreach (${area} in ${areas}) -${area.name}... -#end -####################################################################### -## End of code for raw marine zone output from the shapefiles -####################################################################### -####################################################################### -## Parse in the marineCombo.vm file which contains marine zone combinations -## Uncomment the parse command if you are combining your marine zones -####################################################################### -##parse("marineCombo.vm") -####################################################################### -## End of the marine zone combination script -####################################################################### - -###################################################################### -## Setup eventType for wording in the End of Warning Statement -###################################################################### -#set($stormline = " HAS") -#set($pose = "POSES") -#if(${stormType} == "line") - #set($stormline = "S HAVE") - #set($pose = "POSE") -#end -#set($eventType = "!**STORMS**! HAVE") -#if(${list.contains(${bullets}, "thunderstorm")}) - #set($eventType = "THUNDERSTORM${stormline}") -#end -#if(${list.contains(${bullets}, "shower")}) - #set($eventType = "SHOWER${stormline}") -#end -#if(${list.contains(${bullets}, "cloud")}) - #set($eventType = "CLOUD${stormline}") -#end -#if(${list.contains(${bullets}, "front")}) - #set($eventType = "FRONT HAS") - #set($pose = "POSES") -#end -#if(${list.contains(${bullets}, "volcano")}) - #set($eventType = "VOLCANO HAS") - #set($pose = "POSES") -#end -####################################################################### -## Section for end of warning statements. Replaced default wording with -## a better defined reason for the end to the warning. -####################################################################### -#set($canwarning = "THE ${eventType} !** WEAKENED / MOVED OUT OF THE WARNED AREA **! AND NO LONGER ${pose} A SIGNIFICANT THREAT TO BOATERS.") -#if(${list.contains(${bullets}, "weakenedWarnEnd")}) - #set($canwarning = "THE ${eventType} WEAKENED AND NO LONGER ${pose} A SIGNIFICANT THREAT TO BOATERS.") -#end -#if(${list.contains(${bullets}, "movedWarnEnd")}) - #set($canwarning = "THE ${eventType} MOVED OUT OF THE AREA AND NO LONGER ${pose} A SIGNIFICANT THREAT TO BOATERS.") -#end -#if(${list.contains(${bullets}, "volcano")}) - #set($canwarning = "THE ${eventType} STOPPED ERUPTING AND NO LONGER ${pose} A SIGNIFICANT THREAT TO BOATERS.") -#end - -${canwarning} - -############# -## WATCHES ## -############# -#if(${list.contains(${includedWatches}, "torWatches")}) -#inserttorwatches(${watches}, ${list}, ${secondtimezone}, ${dateUtil}, ${timeFormat}) -#end -#if(${list.contains(${includedWatches}, "svrWatches")}) -#insertsvrwatches(${watches}, ${list}, ${secondtimezone}, ${dateUtil}, ${timeFormat}) -#end -#end -## -####################################################################### -## MWS CON PRODUCT -####################################################################### -## -#if(${action}=="CON" || (${action}=="COR" && ${CORCAN}=="false")) #if(${productClass}=="T") THIS IS A TEST MESSAGE.## #end @@ -412,15 +414,14 @@ THIS IS A TEST MESSAGE. ## #end #thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}) ...${report}LOCATED ## -##Many of the variables passed below are controlled by config.vm #if(${stormType} == "line") -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxMarineNearDistance}, ${overPhrase}, ${maxMarineOverDistance}, ${marineDistanceUnits}, ${useSecondReferenceLine}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "NM", false) #else -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxMarineNearDistance}, ${overPhrase}, ${maxMarineOverDistance}, ${marineDistanceUnits}, ${useSecondReferenceCell}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "NM", true) #end #if(${eventType} == "VOLCANO") . -#elseif(${movementSpeed} < ${marineStationary} || ${stationary}) +#elseif($movementSpeed < 3 || ${stationary}) . ${reportType2} NEARLY STATIONARY. #else ...MOVING #direction(${movementDirectionRounded}) AT ${mathUtil.roundTo5(${movementSpeed})} KNOTS. @@ -456,7 +457,7 @@ THIS IS A TEST MESSAGE. ## #### 0 IS A ... SEPARATED LIST, 1 IS ONE PER LINE, >1 IS A COLUMN FORMAT #### IF YOU USE SOMETHING OTHER THAN "LOCATIONS IMPACTED INCLUDE" LEAD IN BELOW, MAKE SURE THE #### ACCOMPANYING XML FILE PARSE STRING IS CHANGED TO MATCH! -#locationsList("${impacted}" "${eventType}" 0 ${locationList} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 1) +#locationsList("${impacted}" "THE ${eventType}" 0 ${locationList} ${otherPoints} ${areas} ${dateUtil} ${timeFormat} 1) #end ############################################## @@ -464,7 +465,7 @@ THIS IS A TEST MESSAGE. ## ############################################## #if(${list.contains(${bullets}, "specialEvent")}) -THOSE ATTENDING !**event/venue name or location**! ARE IN THE PATH OF ${specialEvent} AND SHOULD PREPARE FOR IMMINENT DANGEROUS WEATHER CONDITIONS. SEEK SHELTER NOW. +EVERYONE AT !**event/venue name or location**! ARE IN THE PATH OF ${specialEvent} AND SHOULD PREPARE FOR IMMINENT DANGEROUS WEATHER CONDITIONS. SEEK SHELTER NOW. #end ##################### @@ -489,31 +490,12 @@ PRECAUTIONARY/PREPAREDNESS ACTIONS... ${ashfallCTA} #if(${list.contains(${bullets}, "genericCTA")}) -#if(${stormType} == "line") -AS THUNDERSTORMS MOVE OVER THE WATER...BOATERS CAN EXPECT GUSTY WINDS AND HIGH WAVES. MOVE TO SAFE HARBOR OR STAY CLOSE TO SHORE UNTIL THESE STORMS PASS. +AS THUNDERSTORMS MOVE OVER THE WATER...BOATERS CAN EXPECT GUSTY WINDS AND HIGH WAVES. MOVE TO SAFE HARBOR OR STAY CLOSE TO SHORE UNTIL THE STORM PASSES. -#else -AS THIS THUNDERSTORM MOVES OVER THE WATER...BOATERS CAN EXPECT GUSTY WINDS AND HIGH WAVES. MOVE TO SAFE HARBOR OR STAY CLOSE TO SHORE UNTIL THE STORM PASSES. - -#end #end #if(${list.contains(${bullets}, "gustyWindsCTA")}) -#if(${stormType} == "line") -MARINERS CAN EXPECT GUSTY WINDS...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THESE STORMS PASS. +MARINERS CAN EXPECT GUSTY WINDS...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THIS STORM PASSES. -#else -MARINERS CAN EXPECT GUSTY WINDS...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THIS STORM PASSES. - -#end -#end -#if(${list.contains(${bullets}, "hailWindsCTA")}) -#if(${stormType} == "line") -MARINERS CAN EXPECT ${windCTA}${hailCTA}...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THESE STORMS PASS. - -#else -MARINERS CAN EXPECT ${windCTA}${hailCTA}...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THIS STORM PASSES. - -#end #end #if(${list.contains(${bullets}, "nonThunderstormCTA")}) MARINERS CAN EXPECT GUSTY WINDS...AND INCREASING WAVES. BOATERS...ESPECIALLY THOSE UNDER SAIL...SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THE HIGH WINDS SUBSIDE. @@ -639,7 +621,7 @@ ${area.name}... ## Replaced default end of warning wording. ####################################################################### -THE ${eventType} !** WEAKENED / MOVED OUT OF THE WARNED AREA **! AND NO LONGER ${pose} A SIGNIFICANT THREAT TO BOATERS. +THE ${eventType} !**WEAKENED/MOVED OUT OF THE AREA**! AND NO LONGER ${pose} A SIGNIFICANT THREAT TO BOATERS. ############# ## WATCHES ## @@ -668,6 +650,192 @@ ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} #if(${productClass}=="T") ...THIS MESSAGE IS FOR TEST PURPOSES ONLY... +#end +####################################################################### +## List of Event Types. Added several events such as Shower...Cloud and Front. +## Removed Strong and Severe Thunderstorm selections and placed logic in the +## wind and hail selections that will change wording for Severe Thunderstorms. +####################################################################### +#set($eventType = "THUNDERSTORM") +#if(${list.contains(${bullets}, "thunderstorm")}) + #set($eventType = "THUNDERSTORM") + #set($severeType = "STRONG") +#end +#if(${list.contains(${bullets}, "shower")}) + #set($eventType = "SHOWER") +#end +#if(${list.contains(${bullets}, "cloud")}) + #set($eventType = "CLOUD") +#end +#if(${list.contains(${bullets}, "front")}) + #set($eventType = "FRONT") +#end +#if(${list.contains(${bullets}, "volcano")}) + #set($eventType = "VOLCANO") +#end +####################################################################### +## Added a Threat Section to template that includes Wind...Hail and Waterspout selections. +## Strong Thunderstorm will change to Severe Thunderstorm automatically based on +## selections in Wind...Hail and Waterspout sections. +####################################################################### +#set($windTag = "<34") +#if(${list.contains(${bullets}, "34ktWind")}) + #set($windTag = ">34") + #set($windType = "STRONG WINDS 34 KNOTS OR GREATER") +#end +#if(${list.contains(${bullets}, "40ktWind")}) + #set($windTag = "40") + #set($windType = "STRONG WINDS TO 40 KNOTS") +#end +#if(${list.contains(${bullets}, "40ktplusWind")}) + #set($windTag = "40") + #set($windType = "STRONG WINDS TO NEARLY 50 KNOTS") +#end +#if(${list.contains(${bullets}, "50ktWind")}) + #set($windTag = "50") + #set($windType = "DANGEROUS WINDS IN EXCESS OF 50 KNOTS") + #set($severeType = "SEVERE") +#end +#if(${list.contains(${bullets}, "65ktWind")}) + #set($windTag = "65") + #set($windType = "DANGEROUS CAPSIZING WINDS IN EXCESS OF 65 KNOTS") + #set($severeType = "SEVERE") +#end +#set($hailTag = "0.00") +#if(${list.contains(${bullets}, "smallHail")}) + #set($hailTag = "<.75") + #set($hailType = "SMALL HAIL") +#end +#if(${list.contains(${bullets}, "largeHail")}) + #set($hailTag = ">.75") + #set($hailType = "LARGE HAIL") + #set($severeType = "SEVERE") +#end +#if(${list.contains(${bullets}, "destructiveHail")}) + #set($hailTag = ">2.0") + #set($hailType = "LARGE DESTRUCTIVE HAIL") + #set($severeType = "SEVERE") +#end +#if(${list.contains(${bullets}, "sightedSpout")}) + #set($spoutType = "WATERSPOUTS") + #set($severeType = "SEVERE") +#end +#if(${list.contains(${bullets}, "possibleSpout")}) + #set($spoutType = "WATERSPOUTS") + #set($capable = "CAPABLE OF ") +#end +################################################ +## Threat section for Volcanic Situations +################################################ +#if(${list.contains(${bullets}, "ashfall")}) + #set($ashfallType = "ASHFALL") + #set($ashfallPath = "VOLCANIC ASH") + #set($ctaSelected = "YES") + #set($ashfallCTA = "ASH IS AN EYE AND RESPIRATORY IRRITANT AND IS ABRASIVE. THOSE WITH RESPIRATORY SENSITIVITIES SHOULD TAKE EXTRA PRECAUTIONS TO MINIMIZE EXPOSURE. PROTECT ELECTRONICS AND COVER AIR INTAKES IF ASHFALL IS EXPECTED OR CONFIRMED. REMOVE ASH FROM SURFACES WITH WATER IF POSSIBLE TO PREVENT EXCESSIVE ACCUMULATION.") + #set($ashfallInfo = "AN ASHFALL WARNING MEANS THAT THE VOLCANO IS UNDERGOING A MAJOR ERUPTION. IT IS VERY LIKELY THAT MARINERS WILL BE AFFECTED BY VOLCANIC HAZARDS IN THE WARNING AREAS SUCH AS SIGNIFICANT DEBRIS...ASHFALL ONE QUARTER INCH OR GREATER...LAVA...OR LAHAR AND DEBRIS FLOWS.") +#end +#if(${list.contains(${bullets}, "debrisFlow")}) + #set($debrisflowType = "DEBRIS FLOW") + #set($debrisflowPath = "DEBRIS FLOW") + #set($debrisflowInfo = "THE ERUPTION OF THE VOLCANO CAN CAUSE A SUDDEN MELTING OF SNOW AND ICE ON THE MOUNTAIN. THIS WILL RESULT IN A TORRENT OF MUD...ASH...ROCK...AND HOT WATER TO FLOW DOWN THE MOUNTAIN AND INTO THE NEARBY WATERS.") +#end +####################################################################### +## Logic to create the Wind/Hail Tags used by CR. +####################################################################### +#set($windhailTag = "WIND...HAIL ${windTag}KTS ${hailTag}IN") +####################################################################### +## Logic to put together the threats based on Wind...Hail and Waterspout sections. +####################################################################### +#if(${spoutType} && ${windType} && ${hailType}) + #set($threat = "${spoutType}...${windType} AND ${hailType}") +#elseif(${spoutType} && ${hailType}) + #set($threat = "${spoutType} AND ${hailType}") +#elseif(${spoutType} && ${windType}) + #set($threat = "${spoutType} AND ${windType}") +#elseif(${windType} && ${hailType}) + #set($threat = "${windType} AND ${hailType}") +#elseif(${spoutType}) + #set($threat = "${spoutType}") +#elseif(${windType}) + #set($threat = "${windType}") +#elseif(${hailType}) + #set($threat = "${hailType}") +#else + #set($threat = "!**YOU DID NOT SELECT ANY THREATS. PLEAST RE-GENERATE THIS WARNING!**!") +#end +####################################################################### +## Logic for Volcanic Threats. If selected this will override any +## other selections for wind/hail/spouts. +####################################################################### +#if(${ashfallType} && ${debrisflowType}) + #set($threat = "${ashfallType} AND ${debrisflowType}") + #set($volcanoPath = "${ashfallPath} AND ${debrisflowPath}") +#elseif(${ashfallType}) + #set($threat = "${ashfallType}") + #set($volcanoPath = "${ashfallPath}") +#elseif(${debrisflowType}) + #set($threat = "${debrisflowType}") + #set($volcanoPath = "${debrisflowPath}") +#else +#end +####################################################################### +## Section to determine Thunderstorm Severity based on Threat Selections. +####################################################################### +#if(${eventType} == "THUNDERSTORM") + #set($thunderstormType = "${severeType} ${eventType}") + #set($eventType = "${thunderstormType}") +#end +####################################################################### +## Section to create line wording based on track type. +####################################################################### +#set($stormline = "A ${eventType}") +#set($pathheader = "${eventType}") +#if(${stormType} == "line") + #set($stormline = "A LINE OF ${eventType}S") + #set($pathheader = "${eventType}S") +#end +####################################################################### +##Corrective coding to prevent the use of "Line of Fronts" in the Product. +####################################################################### +#if(${eventType} == "FRONT") + #set($stormline = "A ${eventType}") + #set($pathheader = "${eventType}") +## #set($stormType = "") +#end +####################################################################### +## Coding for volcanos...this will override all other selections. +####################################################################### +#set($impacted = "LOCATIONS IMPACTED INCLUDE...") +#if(${eventType} == "VOLCANO") + #set($stormline = "!** NAME OF VOLCANO**! ${eventType}") + #set($pathheader = "THE ${volcanoPath}") +## #set($stormType = "") + #set($impacted = "LOCATIONS IMPACTED BY ${volcanoPath} INCLUDE...") +#end +####################################################################### +## Basis section that incorporates line phenomena...capable vs producing +## and threat based on selections above. Added Satellite Imagery to basis. +####################################################################### +#set($report = "!** YOU DIDN'T SELECT A REPORTER **! ${eventType}") +#if(${list.contains(${bullets}, "doppler")}) + #set($capable = "CAPABLE OF ") + #set($report = "NATIONAL WEATHER SERVICE DOPPLER RADAR INDICATED ${stormline}...${capable}PRODUCING ${threat}...") +#end +#if(${list.contains(${bullets}, "marineSpotter")}) + #set($report = "MARINE WEATHER SPOTTERS REPORTED ${stormline}...${capable}PRODUCING ${threat}...") +#end +#if(${list.contains(${bullets}, "mariner")}) + #set($report = "A MARINER REPORTED ${stormline}...${capable}PRODUCING ${threat}...") +#end +#if(${list.contains(${bullets}, "public")}) + #set($report = "THE PUBLIC REPORTED ${stormline}...${capable}PRODUCING ${threat}...") +#end +#if(${list.contains(${bullets}, "pilot")}) + #set($report = "A PILOT REPORTED ${stormline}...${capable}PRODUCING ${threat}...") +#end +#if(${list.contains(${bullets}, "satellite")}) + #set($capable = "CAPABLE OF ") + #set($report = "SATELLITE IMAGERY INDICATED ${stormline}...${capable}PRODUCING ${threat}...") #end #if(${productClass}=="T") THIS IS A TEST MESSAGE.## @@ -711,16 +879,15 @@ ${area.name}... #if(${productClass}=="T") THIS IS A TEST MESSAGE. ## #end -AT ${dateUtil.format(${event}, ${timeFormat.clock}, ${localtimezone})}...${report}LOCATED ## -##Many of the variables passed below are controlled by config.vm +AT ${dateUtil.format(${event}, ${timeFormat.clock}, ${localtimezone})}... ${report} LOCATED ## #if(${stormType} == "line") -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxMarineNearDistance}, ${overPhrase}, ${maxMarineOverDistance}, ${marineDistanceUnits}, ${useSecondReferenceLine}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "NM", false) #else -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxMarineNearDistance}, ${overPhrase}, ${maxMarineOverDistance}, ${marineDistanceUnits}, ${useSecondReferenceCell}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "NM", true) #end #if(${eventType} == "VOLCANO") . -#elseif(${movementSpeed} < ${landStationary} || ${stationary}) +#elseif($movementSpeed < 3 || ${stationary}) . ${reportType2} NEARLY STATIONARY. #else ...MOVING #direction(${movementDirectionRounded}) AT ${mathUtil.roundTo5(${movementSpeed})} KNOTS. @@ -795,31 +962,12 @@ PRECAUTIONARY/PREPAREDNESS ACTIONS... ${ashfallCTA} #if(${list.contains(${bullets}, "genericCTA")}) -#if(${stormType} == "line") -AS THUNDERSTORMS MOVE OVER THE WATER...BOATERS CAN EXPECT GUSTY WINDS AND HIGH WAVES. MOVE TO SAFE HARBOR OR STAY CLOSE TO SHORE UNTIL THESE STORMS PASS. +AS THUNDERSTORMS MOVE OVER THE WATER...BOATERS CAN EXPECT GUSTY WIND AND HIGH WAVES. MOVE TO SAFE HARBOR OR STAY CLOSE TO SHORE UNTIL THE STORM PASSES. -#else -AS THIS THUNDERSTORM MOVES OVER THE WATER...BOATERS CAN EXPECT GUSTY WINDS AND HIGH WAVES. MOVE TO SAFE HARBOR OR STAY CLOSE TO SHORE UNTIL THE STORM PASSES. - -#end #end #if(${list.contains(${bullets}, "gustyWindsCTA")}) -#if(${stormType} == "line") -MARINERS CAN EXPECT GUSTY WINDS...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THESE STORMS PASS. +MARINERS CAN EXPECT GUSTY WINDS...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THIS STORM PASSES. -#else -MARINERS CAN EXPECT GUSTY WINDS...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THIS STORM PASSES. - -#end -#end -#if(${list.contains(${bullets}, "hailWindsCTA")}) -#if(${stormType} == "line") -MARINERS CAN EXPECT ${windCTA}${hailCTA}...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THESE STORMS PASS. - -#else -MARINERS CAN EXPECT ${windCTA}${hailCTA}...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THIS STORM PASSES. - -#end #end #if(${list.contains(${bullets}, "nonThunderstormCTA")}) MARINERS CAN EXPECT GUSTY WINDS...AND INCREASING WAVES. BOATERS...ESPECIALLY THOSE UNDER SAIL...SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THE HIGH WINDS SUBSIDE. @@ -910,7 +1058,7 @@ ${area.name}... ## Replaced default end of warning wording. ####################################################################### -THE ${eventType} !** WEAKENED / MOVED OUT OF THE WARNED AREA **! AND NO LONGER ${pose} A SIGNIFICANT THREAT TO BOATERS. +THE ${eventType} !**WEAKENED/MOVED OUT OF THE AREA**! AND NO LONGER ${pose} A SIGNIFICANT THREAT TO BOATERS. ############# ## WATCHES ## @@ -939,6 +1087,192 @@ ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} #if(${productClass}=="T") ...THIS MESSAGE IS FOR TEST PURPOSES ONLY... +#end +####################################################################### +## List of Event Types. Added several events such as Shower...Cloud and Front. +## Removed Strong and Severe Thunderstorm selections and placed logic in the +## wind and hail selections that will change wording for Severe Thunderstorms. +####################################################################### +#set($eventType = "THUNDERSTORM") +#if(${list.contains(${bullets}, "thunderstorm")}) + #set($eventType = "THUNDERSTORM") + #set($severeType = "STRONG") +#end +#if(${list.contains(${bullets}, "shower")}) + #set($eventType = "SHOWER") +#end +#if(${list.contains(${bullets}, "cloud")}) + #set($eventType = "CLOUD") +#end +#if(${list.contains(${bullets}, "front")}) + #set($eventType = "FRONT") +#end +#if(${list.contains(${bullets}, "volcano")}) + #set($eventType = "VOLCANO") +#end +####################################################################### +## Added a Threat Section to template that includes Wind...Hail and Waterspout selections. +## Strong Thunderstorm will change to Severe Thunderstorm automatically based on +## selections in Wind...Hail and Waterspout sections. +####################################################################### +#set($windTag = "<34") +#if(${list.contains(${bullets}, "34ktWind")}) + #set($windTag = ">34") + #set($windType = "STRONG WINDS 34 KNOTS OR GREATER") +#end +#if(${list.contains(${bullets}, "40ktWind")}) + #set($windTag = "40") + #set($windType = "STRONG WINDS TO 40 KNOTS") +#end +#if(${list.contains(${bullets}, "40ktplusWind")}) + #set($windTag = "40") + #set($windType = "STRONG WINDS TO NEARLY 50 KNOTS") +#end +#if(${list.contains(${bullets}, "50ktWind")}) + #set($windTag = "50") + #set($windType = "DANGEROUS WINDS IN EXCESS OF 50 KNOTS") + #set($severeType = "SEVERE") +#end +#if(${list.contains(${bullets}, "65ktWind")}) + #set($windTag = "65") + #set($windType = "DANGEROUS CAPSIZING WINDS IN EXCESS OF 65 KNOTS") + #set($severeType = "SEVERE") +#end +#set($hailTag = "0.00") +#if(${list.contains(${bullets}, "smallHail")}) + #set($hailTag = "<.75") + #set($hailType = "SMALL HAIL") +#end +#if(${list.contains(${bullets}, "largeHail")}) + #set($hailTag = ">.75") + #set($hailType = "LARGE HAIL") + #set($severeType = "SEVERE") +#end +#if(${list.contains(${bullets}, "destructiveHail")}) + #set($hailTag = ">2.0") + #set($hailType = "LARGE DESTRUCTIVE HAIL") + #set($severeType = "SEVERE") +#end +#if(${list.contains(${bullets}, "sightedSpout")}) + #set($spoutType = "WATERSPOUTS") + #set($severeType = "SEVERE") +#end +#if(${list.contains(${bullets}, "possibleSpout")}) + #set($spoutType = "WATERSPOUTS") + #set($capable = "CAPABLE OF ") +#end +################################################ +## Threat section for Volcanic Situations +################################################ +#if(${list.contains(${bullets}, "ashfall")}) + #set($ashfallType = "ASHFALL") + #set($ashfallPath = "VOLCANIC ASH") + #set($ctaSelected = "YES") + #set($ashfallCTA = "ASH IS AN EYE AND RESPIRATORY IRRITANT AND IS ABRASIVE. THOSE WITH RESPIRATORY SENSITIVITIES SHOULD TAKE EXTRA PRECAUTIONS TO MINIMIZE EXPOSURE. PROTECT ELECTRONICS AND COVER AIR INTAKES IF ASHFALL IS EXPECTED OR CONFIRMED. REMOVE ASH FROM SURFACES WITH WATER IF POSSIBLE TO PREVENT EXCESSIVE ACCUMULATION.") + #set($ashfallInfo = "AN ASHFALL WARNING MEANS THAT THE VOLCANO IS UNDERGOING A MAJOR ERUPTION. IT IS VERY LIKELY THAT MARINERS WILL BE AFFECTED BY VOLCANIC HAZARDS IN THE WARNING AREAS SUCH AS SIGNIFICANT DEBRIS...ASHFALL ONE QUARTER INCH OR GREATER...LAVA...OR LAHAR AND DEBRIS FLOWS.") +#end +#if(${list.contains(${bullets}, "debrisFlow")}) + #set($debrisflowType = "DEBRIS FLOW") + #set($debrisflowPath = "DEBRIS FLOW") + #set($debrisflowInfo = "THE ERUPTION OF THE VOLCANO CAN CAUSE A SUDDEN MELTING OF SNOW AND ICE ON THE MOUNTAIN. THIS WILL RESULT IN A TORRENT OF MUD...ASH...ROCK...AND HOT WATER TO FLOW DOWN THE MOUNTAIN AND INTO THE NEARBY WATERS.") +#end +####################################################################### +## Logic to create the Wind/Hail Tags used by CR. +####################################################################### +#set($windhailTag = "WIND...HAIL ${windTag}KTS ${hailTag}IN") +####################################################################### +## Logic to put together the threats based on Wind...Hail and Waterspout sections. +####################################################################### +#if(${spoutType} && ${windType} && ${hailType}) + #set($threat = "${spoutType}...${windType} AND ${hailType}") +#elseif(${spoutType} && ${hailType}) + #set($threat = "${spoutType} AND ${hailType}") +#elseif(${spoutType} && ${windType}) + #set($threat = "${spoutType} AND ${windType}") +#elseif(${windType} && ${hailType}) + #set($threat = "${windType} AND ${hailType}") +#elseif(${spoutType}) + #set($threat = "${spoutType}") +#elseif(${windType}) + #set($threat = "${windType}") +#elseif(${hailType}) + #set($threat = "${hailType}") +#else + #set($threat = "!**YOU DID NOT SELECT ANY THREATS. PLEAST RE-GENERATE THIS WARNING!**!") +#end +####################################################################### +## Logic for Volcanic Threats. If selected this will override any +## other selections for wind/hail/spouts. +####################################################################### +#if(${ashfallType} && ${debrisflowType}) + #set($threat = "${ashfallType} AND ${debrisflowType}") + #set($volcanoPath = "${ashfallPath} AND ${debrisflowPath}") +#elseif(${ashfallType}) + #set($threat = "${ashfallType}") + #set($volcanoPath = "${ashfallPath}") +#elseif(${debrisflowType}) + #set($threat = "${debrisflowType}") + #set($volcanoPath = "${debrisflowPath}") +#else +#end +####################################################################### +## Section to determine Thunderstorm Severity based on Threat Selections. +####################################################################### +#if(${eventType} == "THUNDERSTORM") + #set($thunderstormType = "${severeType} ${eventType}") + #set($eventType = "${thunderstormType}") +#end +####################################################################### +## Section to create line wording based on track type. +####################################################################### +#set($stormline = "A ${eventType}") +#set($pathheader = "${eventType}") +#if(${stormType} == "line") + #set($stormline = "A LINE OF ${eventType}S") + #set($pathheader = "${eventType}S") +#end +####################################################################### +##Corrective coding to prevent the use of "Line of Fronts" in the Product. +####################################################################### +#if(${eventType} == "FRONT") + #set($stormline = "A ${eventType}") + #set($pathheader = "${eventType}") +## #set($stormType = "") +#end +####################################################################### +## Coding for volcanos...this will override all other selections. +####################################################################### +#set($impacted = "LOCATIONS IMPACTED INCLUDE...") +#if(${eventType} == "VOLCANO") + #set($stormline = "!** NAME OF VOLCANO**! ${eventType}") + #set($pathheader = "THE ${volcanoPath}") +## #set($stormType = "") + #set($impacted = "LOCATIONS IMPACTED BY ${volcanoPath} INCLUDE...") +#end +####################################################################### +## Basis section that incorporates line phenomena...capable vs producing +## and threat based on selections above. Added Satellite Imagery to basis. +####################################################################### +#set($report = "!** YOU DIDN'T SELECT A REPORTER **! ${eventType}") +#if(${list.contains(${bullets}, "doppler")}) + #set($capable = "CAPABLE OF ") + #set($report = "NATIONAL WEATHER SERVICE DOPPLER RADAR INDICATED ${stormline}...${capable}PRODUCING ${threat}...") +#end +#if(${list.contains(${bullets}, "marineSpotter")}) + #set($report = "MARINE WEATHER SPOTTERS REPORTED ${stormline}...${capable}PRODUCING ${threat}...") +#end +#if(${list.contains(${bullets}, "mariner")}) + #set($report = "A MARINER REPORTED ${stormline}...${capable}PRODUCING ${threat}...") +#end +#if(${list.contains(${bullets}, "public")}) + #set($report = "THE PUBLIC REPORTED ${stormline}...${capable}PRODUCING ${threat}...") +#end +#if(${list.contains(${bullets}, "pilot")}) + #set($report = "A PILOT REPORTED ${stormline}...${capable}PRODUCING ${threat}...") +#end +#if(${list.contains(${bullets}, "satellite")}) + #set($capable = "CAPABLE OF ") + #set($report = "SATELLITE IMAGERY INDICATED ${stormline}...${capable}PRODUCING ${threat}...") #end #if(${productClass}=="T") THIS IS A TEST MESSAGE.## @@ -970,16 +1304,15 @@ ${area.name}... #if(${productClass}=="T") THIS IS A TEST MESSAGE. ## #end -AT ${dateUtil.format(${event}, ${timeFormat.clock}, ${localtimezone})}...${report} LOCATED ## -##Many of the variables passed below are controlled by config.vm +AT ${dateUtil.format(${event}, ${timeFormat.clock}, ${localtimezone})}... ${report} LOCATED ## #if(${stormType} == "line") -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxMarineNearDistance}, ${overPhrase}, ${maxMarineOverDistance}, ${marineDistanceUnits}, ${useSecondReferenceLine}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "NM", false) #else -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxMarineNearDistance}, ${overPhrase}, ${maxMarineOverDistance}, ${marineDistanceUnits}, ${useSecondReferenceCell}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "NM", true) #end #if(${eventType} == "VOLCANO") . -#elseif(${movementSpeed} < ${landStationary} || ${stationary}) +#elseif($movementSpeed < 3 || ${stationary}) . ${reportType2} NEARLY STATIONARY. #else ...MOVING #direction(${movementDirectionRounded}) AT ${mathUtil.roundTo5(${movementSpeed})} KNOTS. @@ -1054,31 +1387,12 @@ PRECAUTIONARY/PREPAREDNESS ACTIONS... ${ashfallCTA} #if(${list.contains(${bullets}, "genericCTA")}) -#if(${stormType} == "line") -AS THUNDERSTORMS MOVE OVER THE WATER...BOATERS CAN EXPECT GUSTY WINDS AND HIGH WAVES. MOVE TO SAFE HARBOR OR STAY CLOSE TO SHORE UNTIL THESE STORMS PASS. +AS THUNDERSTORMS MOVE OVER THE WATER...BOATERS CAN EXPECT GUSTY WIND AND HIGH WAVES. MOVE TO SAFE HARBOR OR STAY CLOSE TO SHORE UNTIL THE STORM PASSES. -#else -AS THIS THUNDERSTORM MOVES OVER THE WATER...BOATERS CAN EXPECT GUSTY WINDS AND HIGH WAVES. MOVE TO SAFE HARBOR OR STAY CLOSE TO SHORE UNTIL THE STORM PASSES. - -#end #end #if(${list.contains(${bullets}, "gustyWindsCTA")}) -#if(${stormType} == "line") -MARINERS CAN EXPECT GUSTY WINDS...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THESE STORMS PASS. +MARINERS CAN EXPECT GUSTY WINDS...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THIS STORM PASSES. -#else -MARINERS CAN EXPECT GUSTY WINDS...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THIS STORM PASSES. - -#end -#end -#if(${list.contains(${bullets}, "hailWindsCTA")}) -#if(${stormType} == "line") -MARINERS CAN EXPECT ${windCTA}${hailCTA}...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THESE STORMS PASS. - -#else -MARINERS CAN EXPECT ${windCTA}${hailCTA}...HIGH WAVES...DANGEROUS LIGHTNING...AND HEAVY RAINS. BOATERS SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THIS STORM PASSES. - -#end #end #if(${list.contains(${bullets}, "nonThunderstormCTA")}) MARINERS CAN EXPECT GUSTY WINDS...AND INCREASING WAVES. BOATERS...ESPECIALLY THOSE UNDER SAIL...SHOULD SEEK SAFE HARBOR IMMEDIATELY...UNTIL THE HIGH WINDS SUBSIDE. @@ -1163,7 +1477,7 @@ ${area.name}... ## Section for end of warning statements. Replaced default wording with ## a better defined reason for the end to the warning. ####################################################################### -#set($expwarning = "THE ${eventType} !** WEAKENED / MOVED OUT OF THE WARNED AREA **! AND NO LONGER ${pose} A SIGNIFICANT THREAT TO BOATERS.") +#set($expwarning = "THE ${eventType} !**WEAKENED/MOVED OUT OF THE AREA**! AND NO LONGER ${pose} A SIGNIFICANT THREAT TO BOATERS.") #if(${list.contains(${bullets}, "weakenedWarnEnd")}) #set($expwarning = "THE ${eventType} WEAKENED AND NO LONGER ${pose} A SIGNIFICANT THREAT TO BOATERS.") #end diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/specialMarineWarningFollowup.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/specialMarineWarningFollowup.xml index 5eac690e76..6833a65313 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/specialMarineWarningFollowup.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/specialMarineWarningFollowup.xml @@ -5,24 +5,9 @@ Phil Kurimski 23 Sept 2011 Added Volcano Information Phil Kurimski 1 Mar 2012 Evan Bookbinder 09-11-2012 Added settings for locations shapefile - Added new areaSource variable - Phil Kurimski 09-16-2013 Fixed multiple selections in pathcast - Phil Kurimski 09-19-2013 added geospatialConfig.xml + Added new areaSource variable --> - - - - - - - - - nmi kn @@ -165,14 +150,14 @@ turned on unless the corresponding .vm file is turned on in a given template's . - + + - + - + - @@ -218,14 +203,14 @@ turned on unless the corresponding .vm file is turned on in a given template's . - + + - + - + - @@ -234,4 +219,146 @@ turned on unless the corresponding .vm file is turned on in a given template's . + + + MarineZones + 0 + AND + 0 + NAME + NAME + NAME + countyTypes.txt + ID + NAME + + parent + + + + + + + 25 + + + + NAME + AREA + POINTS + + + + + + + + + 1 + 100 + + distance + WARNGENLEV + + + + + NAME + AREA + POINTS + + + + + + + + + 5 + 100 + + distance + WARNGENLEV + + + + + + false + 1 + 10.0 + 5 + 5 + 4 + 8 + Name + AREA + Name + Name + Name + countyTypes.txt + + + + + + + + + + distance + + + + + NAME + 1 + AREA + TRACK + true + 20 + 20 + + + + + + + + + + distance + + + + + NAME + 1 + AREA + TRACK + true + 10 + 20 + + distance + + + + + + + + + + + + + WarnGenLoc + MarineZones + MarineZones + TIMEZONES + TIME_ZONE + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/specialWeatherStatement.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/specialWeatherStatement.vm index f5502da633..b8e0e22155 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/specialWeatherStatement.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/specialWeatherStatement.vm @@ -1,14 +1,11 @@ -############################################################ -## SPS - SPECIAL WEATHER STATEMENT for various THREATS ## -## WRITTEN BY: ## -## Mike Dangelo WFO CTP 1.25.2013 (BUILD 12.12.1-12) ## -## Phil Kurimski WFO DTX 2.05.2013 (BUILD 13.2.1-5) ## -## Phil Kurimski WFO DTX 9.16.2013 (BUILD 13.5.2-4) ## -## Evan Bookbinder 9.18.2013 Implemented config.vm ## -############################################################ +######################################################### +## SPS - SPECIAL WEATHER STATEMENT for various THREATS ## +## WRITTEN BY: ## +## Mike Dangelo WFO CTP 1.25.2013 (BUILD 12.12.1-12) ## +## Phil Kurimski WFO DTX 2.05.2013 (BUILD 13.2.1-5) ## +######################################################### ## ## SET SOME INITIAL VARIABLES -#parse("config.vm") #set($SvsR = "RAIN") #foreach ($bullet in $bullets) #if($bullet.startsWith("snow")) @@ -113,48 +110,43 @@ ## HANDLE WIND POSSIBILITIES ###################### ################################################### #set($windSpeed = 0) -#if(${list.contains(${bullets}, "wind30")}) - #set($windThreat = "WINDS IN EXCESS OF 30 MPH") +#if(${list.contains($bullets, "wind30")}) + #set($windThreat = "WIND GUSTS UP TO 30 MPH") #set($windSpeed = 30) #set($windTag = "30MPH") #end -#if(${list.contains(${bullets}, "wind40")}) - #set($windThreat = "WINDS IN EXCESS OF 40 MPH") +#if(${list.contains($bullets, "wind40")}) + #set($windThreat = "WINDS GUSTS UP TO 40 MPH") #set($windSpeed = 40) #set($windTag = "40MPH") #end -#if(${list.contains(${bullets}, "wind50")}) - #set($windThreat = "WIND GUSTS UP TO 50 MPH") +#if(${list.contains($bullets, "wind50")}) + #set($windThreat = "WINDS GUSTS UP TO 50 MPH") #set($windSpeed = 50) #set($windTag = "50MPH") #end -#if(${list.contains(${bullets}, "wind55")}) - #set($windThreat = "WIND GUSTS OF 50 TO 55 MPH") - #set($windSpeed = 50) - #set($windTag = "55MPH") -#end ################################################### ## HANDLE HAIL POSSIBILITIES ###################### ################################################### #set($hailSize = 0) #set($smallHail = "") -#if(${list.contains(${bullets}, "peaHail")}) +#if(${list.contains($bullets, "smallHail")}) #set($hailSize = 0.25) + #set($hailThreat = "SMALL") + #set($hailTrail = " HAIL") +#end +#if(${list.contains($bullets, "peaHail")}) + #set($hailSize = 0.50) #set($hailThreat = "PEA SIZE") #set($hailTrail = " HAIL") #end -#if(${list.contains(${bullets}, "halfHail")}) - #set($hailSize = 0.50) - #set($hailThreat = "HALF INCH") - #set($hailTrail = " HAIL") -#end -#if(${list.contains(${bullets}, "dimeHail")}) +#if(${list.contains($bullets, "dimeHail")}) #set($hailSize = 0.75) #set($hailThreat = "DIME SIZE") #set($hailTrail = " HAIL") #end -#if(${list.contains(${bullets}, "nickelHail")}) +#if(${list.contains($bullets, "nickelHail")}) #set($hailSize = 0.88) #set($hailThreat = "NICKEL SIZE") #set($hailTrail = " HAIL") @@ -180,14 +172,11 @@ ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} #end ${ugcline} +#set($zoneList = "") #foreach (${area} in ${areas}) -${area.name}## -#if(${sAbbreviation}==true) - ${area.stateabbr}## +#set($zoneList = "${zoneList}${area.name}-") #end --## -#end - +${zoneList} ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} #if(${productClass}=="T") @@ -212,13 +201,12 @@ THIS IS A TEST MESSAGE. ## #end #thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone})...## ${describeMovement} WAS ## -##Many of the variables passed below are controlled by config.vm #if(${stormType} == "line") -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxLandNearDistance}, ${overPhrase}, ${maxLandOverDistance}, ${landDistanceUnits}, ${useSecondReferenceLine}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "MILES", false) #else -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxLandNearDistance}, ${overPhrase}, ${maxLandOverDistance}, ${landDistanceUnits}, ${useSecondReferenceCell}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "MILES", true) #end -#if(${movementSpeed} < ${landStationary} || ${stationary}) +#if($movementSpeed < 5 || ${stationary}) . ${eventWas} NEARLY STATIONARY. #else #if(${stormType} == "line") @@ -352,7 +340,6 @@ THIS IS A TEST MESSAGE. DO NOT TAKE ACTION BASED ON THIS MESSAGE. #tml(${TMLtime}, ${timeFormat}, ${movementDirection}, ${movementInKnots}, ${eventLocation}) - $$ diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/specialWeatherStatement.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/specialWeatherStatement.xml index 7e3165ac1b..a52346b802 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/specialWeatherStatement.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/specialWeatherStatement.xml @@ -1,23 +1,9 @@ - - - - - - - - - mi mph @@ -27,7 +13,6 @@ turned on unless the corresponding .vm file is turned on in a given template's . that can be loaded with each template. --> Forecast Zones - County Names County Warning Areas @@ -88,14 +73,13 @@ turned on unless the corresponding .vm file is turned on in a given template's . - - - - - - - - + + + + + + + @@ -141,14 +125,13 @@ turned on unless the corresponding .vm file is turned on in a given template's . - - - - - - - - + + + + + + + @@ -182,4 +165,164 @@ turned on unless the corresponding .vm file is turned on in a given template's . + + + + + + + + + Zone + 0 + AND + 0 + NAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + + STATE_ZONE + NAME + + parent + + + + + + + 25 + + + + NAME + POINTS + + + + + + + + + 1 + AREA + 100 + + distance + warngenlev + population + + + + + NAME + POINTS + + + + + + + + + AREA + 5 + 100 + + distance + + + + + 1 + true + 8.0 + 5 + 5 + 4 + 8 + Name + + NAME + AREA + STATE + STATE + countyTypes.txt + + warngenlev + population + distance + + + + + + + + + + + + + 1 + NAME + TRACK + true + AREA + 20 + 10 + + + + + + + + + + warngenlev + population + distance + + + + + NAME + 1 + TRACK + true + AREA + 10 + 10 + + distance + + + + + + + + + + + + + WarnGenLoc + + Zone + States + TIMEZONES + TIME_ZONE + + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/stormReports.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/stormReports.vm index d7a4ce3f89..aeb2aa9d93 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/stormReports.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/stormReports.vm @@ -11,7 +11,7 @@ stormReports.xml #if ($dbTable) #foreach($table in $dbTable) #set($size = ${list.size($table)}) -#if ($size > 0) +#if ($size > 1) !** RECENT LOCAL STORM REPORTS: (COPY AND PASTE VALID REPORTS INTO 3RD BULLET THEN DELETE THIS SECTION) #foreach($report in $table) diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/stormReports.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/stormReports.xml index daa843081a..ea8a86ebcc 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/stormReports.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/stormReports.xml @@ -6,6 +6,8 @@ importLSR2DB.sh script and create pointSource objects for WarnGen usage + + lsr_severe NAME diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/sws_county.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/sws_county.vm new file mode 100644 index 0000000000..064e4cd910 --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/sws_county.vm @@ -0,0 +1,103 @@ +## new template jfrederick tim feb 2011 +## sigwx alert for thunderstorms with wind and/or hail under +## severe limits +## county list needs to be sortable by state/parts of state/ +## +## Qinglu Lin 12-27-2012 DR 15594. Appended true to headlineLocList's parameter list. +## +${WMOId} ${vtecOffice} 000000 ${BBBId} +SPS${siteId} + +#if(${productClass}=="T") +TEST...SPECIAL WEATHER STATEMENT...TEST +#else +SPECIAL WEATHER STATEMENT +#end +NATIONAL WEATHER SERVICE ${officeShort} +#backupText(${backupSite}) +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +#foreach (${area} in ${areas}) +${area.name} ${area.stateabbr}-## +#end + +${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} + +#if(${productClass}=="T") +...THIS MESSAGE IS FOR TEST PURPOSES ONLY... + +#end + +THE NATIONAL WEATHER SERVICE IN ${officeLoc} HAS ISSUED A SPECIAL WEATHER STATEMENT EFFECTIVE ## +#secondBullet(${dateUtil},${expire},${timeFormat},${localtimezone},${secondtimezone}) FOR #headlineLocList(${areas} true true true false true). + +#if(${stormType} == "line") + #set ($type1 = "THUNDERSTORMS") +#else + #set ($type1 = "A THUNDERSTORM") +#end +#if(${list.contains($bullets, "doppler")}) + #set ($report = "NATIONAL WEATHER SERVICE DOPPLER RADAR INDICATED ${type1} ") +#end +#if(${list.contains($bullets, "spotter")}) + #set ($report = "AMATEUR RADIO WEATHER SPOTTERS REPORTED !** **!") +#end +#if(${list.contains($bullets, "public")}) + #set ($report = "THE PUBLIC REPORTED !** **! ") +#end + +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. ## +#end +AT ${dateUtil.format(${event}, ${timeFormat.clock}, ${localtimezone})}...${report} ## +#handleClosestPoints($list, $closestPoints, $otherClosestPoints, $stormType, "NEAR", 6, "MILES") +#if($movementSpeed < 3 || ${stationary}) +. ${reportType2} NEARLY STATIONARY. +#else +...MOVING #direction(${movementDirectionRounded}) AT ${mathUtil.roundTo5(${movementSpeed})} MPH. +#end + +## calls to action +#if(${list.contains($bullets, "streamflooding")}) +HEAVY RAINS MAY FLOOD LOW LYING AREAS SUCH AS DITCHES AND ## +UNDERPASSES. AVOID THESE AREAS AND DO NOT CROSS FLOODED ROADS ## +AS THEY MAY BE WASHED OUT. WATER LEVELS OF SMALL STREAMS AND ## +RIVERS MAY ALSO RISE...THEREFORE SEEK HIGHER GROUND IF THREATENED ## +BY FLOOD WATERS. + +#end +#if(${list.contains($bullets, "intenselightning")}) +INTENSE LIGHTNING IS REPORTED WITH THIS STORM. IF OUTDOORS...## +STAY AWAY FROM ISOLATED HIGH OBJECTS SUCH AS TREES. MOVE ## +INDOORS IF POSSIBLE. WHEN INDOORS...STAY AWAY FROM WINDOWS AND ## +DOORS AND AVOID USING TELEPHONES UNLESS IT IS AN EMERGENCY. ## +TRY TO UNPLUG UNNECESSARY ELECTRICAL APPLIANCES BEFORE THE ## +THUNDERSTORM APPROACHES. + +#end + +############# +## WATCHES ## +############# +#if(${list.contains($includedWatches, "torWatches")}) +#inserttorwatches(${watches}, ${list}, ${secondtimezone}, ${dateUtil}, ${timeFormat}) +#end +#if(${list.contains($includedWatches, "svrWatches")}) +#insertsvrwatches(${watches}, ${list}, ${secondtimezone}, ${dateUtil}, ${timeFormat}) +#end + +######################## +## LAT/LON, TML, SIGN ## +######################## +#if(${productClass}=="T") +THIS IS A TEST MESSAGE. DO NOT TAKE ACTION BASED ON THIS MESSAGE. + +#end +#printcoords(${areaPoly}, ${list}) + +#tml(${start} ${movementDirection} ${movementInKnots} ${timeFormat} ${eventlocation}) + + +$$ + +!**NAME/INITIALS**! diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/sws_county.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/sws_county.xml new file mode 100644 index 0000000000..6f4e9a5dca --- /dev/null +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/sws_county.xml @@ -0,0 +1,160 @@ + + + + + + mi + mph + + + + + + + + + + + + + + + true + + + true + + + + torWatches + svrWatches + + + + 30 + + 10 + 15 + 20 + 25 + 30 + 40 + 45 + 50 + 60 + 75 + + + + + + + + + + + + + + + + + 0.00 + AND + 0 + COUNTYNAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + FIPS + NAME + + parent + + + + + + + 25 + + + + NAME + TRACK + true + 50 + 10 + + warngenlev + population + + + + + NAME + POINTS + + + + + + 1 + 50 + + distance + warngenlev + + + + + NAME + POINTS + + + + + + 5 + 100 + + distance + warngenlev + + + + + true + 8.0 + 5 + 5 + 4 + 8 + Name + COUNTYNAME + STATE + STATE + countyTypes.txt + + distance + + + + + City + County + States + TIMEZONES + TIME_ZONE + + + + + diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/tornadoWarning.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/tornadoWarning.vm index f5b3df0152..09730f84bc 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/tornadoWarning.vm +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/tornadoWarning.vm @@ -1,15 +1,23 @@ ############################################################################### ## TORNADO WARNING TEMPLATE ## -## VERSION AWIPS II ## -## RECENT CHANGES ## -## Mike Dangelo 9-13-2012 minor tweaks to ${variables} ## -## Mike Dangelo 2-4-2013 NWS Mets detected a svr ## +## VERSION AWIPS II 1.0 ## +## MODIFIED ## +## JAMIE FREDERICK - WFO TSA 2-24-11 ## +## EVAN BOOKBINDER - WFO EAX 3-23-11 - Initial OB11.2 ReWrite ## +## 4-13-11 - OB11.4 Modifications ## +## 7-11-11 - OB11.7 Modifications ## +## 9-16-11 - OB11.8.0-8 Pathcast/City ## +## MIKE DANGELO WFO CTP 9-22-11 - OB11.8.0-9 ## +## EVAN BOOKBINDER WFO EAX 11-04-11 - OB11.9-3 (DRs) ## +## EVAN BOOKBINDER WFO EAX 2-24-12 - OB12.2.1 ## +## MIKE REGA 5-03-12 - DR 14885 MND blank line ## +## QINGLU LIN 7-31-2012 DR 15217 use roundAndPad ## +## QINGLU LIN 8-14-2012 DR 14493 use TMLtime ## +## Mike Dangelo 9-13-2012 minor tweaks to ${variables} ## +## Mike Dangelo 2-4-2013 NWS Mets detected a svr ## ## PHIL KURIMSKI 2-6-2013 Put tor emergency back in as 3rd bullet ## -## PHIL KURIMSKI 9-17-2013 Put tor emergency as a headline ## -## Evan Bookbinder 9-18-2013 Implemented config.vm ## ############################################################################### ## ESTABLISH SOME INITIAL VARIABLES -#parse("config.vm") #set($hailSize = 0) #set($hailTag = "<.75IN") #set($reportType = "A TORNADO WAS REPORTED") @@ -122,12 +130,12 @@ ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} #end ################################################################# -### TORNADO EMERGENCY HEADLINE # +### TORNADO EMERGENCY HEADLINE...COMING SOON TO A WFO NEAR YOU! # ################################################################# -#if(${list.contains(${bullets}, "torEmergency")}) -...TORNADO EMERGENCY FOR !** EDIT LOCATION(S) **!... - -#end +###if(${list.contains(${bullets}, "torEmergency")}) +##...TORNADO EMERGENCY FOR !** EDIT LOCATION(S) **!... +## +###end #headline(${officeLoc}, ${backupSite}) ################## @@ -287,13 +295,12 @@ THIS IS A TEST MESSAGE. ## THIS IS A TEST MESSAGE. ## #end #thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone})...${reportType} ## -##Many of the variables passed below are controlled by config.vm #if(${stormType} == "line") -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxLandNearDistance}, ${overPhrase}, ${maxLandOverDistance}, ${landDistanceUnits}, ${useSecondReferenceLine}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "MILES", false) #else -#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, ${nearPhrase} , ${maxLandNearDistance}, ${overPhrase}, ${maxLandOverDistance}, ${landDistanceUnits}, ${useSecondReferenceCell}) +#handleClosestPoints(${list}, ${closestPoints}, ${otherClosestPoints}, ${stormType}, "NEAR", 6, "OVER", 2, "MILES", true) #end -#if(${movementSpeed} < ${landStationary} || ${stationary}) +#if(${movementSpeed} < 3 || ${stationary}) #if(${stormType} == "line") . THE LINE OF TORNADIC STORMS WAS NEARLY STATIONARY. #else @@ -307,7 +314,7 @@ THIS IS A TEST MESSAGE. ## ### TORNADO EMERGENCY PER NWS 10-511 DIRECTIVE GOES WITH 3RD BULLET # ##################################################################### #if(${list.contains($bullets, "torEmergency")}) -#wrapText("THIS IS A TORNADO EMERGENCY FOR !** EDIT LOCATION(S) **!. TAKE COVER NOW." 2 2) +#wrapText("THIS IS A TORNADO EMERGENCY FOR !** EDIT LOCATION(S) **!...TAKE IMMEDIATE TORNADO PRECAUTIONS NOW." 2 2) #end ############################ @@ -397,8 +404,6 @@ THOSE ATTENDING THE !**event/venue name or location**! ARE IN THE PATH OF THIS S ## parse file command here is to pull in mile marker info ## #parse("mileMarkers.vm") -## Uncomment below pull in point marker info -## #parse("pointMarkers.vm") ##################### ## CALL TO ACTIONS ## @@ -482,7 +487,6 @@ THIS IS A TEST MESSAGE. DO NOT TAKE ACTION BASED ON THIS MESSAGE. #printcoords(${areaPoly}, ${list}) #tml(${TMLtime}, ${timeFormat}, ${movementDirection}, ${movementInKnots}, ${eventLocation}) - ## UNCOMMENT 2 LINES BELOW IF YOU ARE PARTICIPATING IN THE HAIL TAG TESTBED ## ##HAIL ${hailTag} diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/tornadoWarning.xml b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/tornadoWarning.xml index 2c9a8c5178..414fc9cd7c 100644 --- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/tornadoWarning.xml +++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/tornadoWarning.xml @@ -14,20 +14,6 @@ - - - - - - - - - - mi mph @@ -122,7 +108,7 @@ turned on unless the corresponding .vm file is turned on in a given template's . - + @@ -181,13 +167,14 @@ turned on unless the corresponding .vm file is turned on in a given template's . - + + - + - + @@ -203,6 +190,158 @@ turned on unless the corresponding .vm file is turned on in a given template's . + + + + + County + 0 + AND + 0 + COUNTYNAME + NAME + STATE + FE_AREA + TIME_ZONE + countyTypes.txt + FIPS + NAME + + parent + + + + + + + 25 + + + NAME + AREA + POINTS + + + + + + + + + 1 + 100 + + distance + warngenlev + + + + + NAME + AREA + POINTS + + + + + + + + + 5 + 100 + + distance + + + + + 1 + true + 8.0 + 5 + 5 + 4 + 8 + Name + AREA + COUNTYNAME + + STATE + STATE + countyTypes.txt + + warngenlev + population + distance + + + + + + + + + + + + + NAME + 1 + AREA + TRACK + true + 20 + 10 + + + + + + + + + + warngenlev + population + distance + + + + + NAME + 1 + AREA + TRACK + true + 10 + 10 + + distance + + + + + + + + + + + + + + + + WarnGenLoc + County + + States + TIMEZONES + TIME_ZONE + diff --git a/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/product/Hazard_AQA_MultiPil.py b/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/product/Hazard_AQA_MultiPil.py index b135763d2f..0f2f64b084 100644 --- a/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/product/Hazard_AQA_MultiPil.py +++ b/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/product/Hazard_AQA_MultiPil.py @@ -47,7 +47,7 @@ class TextProduct(GenericHazards.TextProduct): elif "_" == "_WCZ": Definition["subDomainUGCs"] = ["AKZ207","AKZ208","AKZ209","AKZ210", "AKZ211","AKZ212","AKZ213","AKZ214", - "AKZ215","AKZ216","AKZ217","AKZ227"] + "AKZ215","AKZ216","AKZ217"] # Header configuration items Definition["productName"] = "AIR QUALITY ALERT" # name of product diff --git a/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/product/Hazard_MWW_MultiPil.py b/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/product/Hazard_MWW_MultiPil.py index 759335f6c4..909c523f88 100644 --- a/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/product/Hazard_MWW_MultiPil.py +++ b/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/product/Hazard_MWW_MultiPil.py @@ -46,7 +46,7 @@ class TextProduct(GenericHazards.TextProduct): elif "_" == "_WCZ": Definition["subDomainUGCs"] = ["AKZ207","AKZ208","AKZ209","AKZ210", "AKZ211","AKZ212","AKZ213","AKZ214", - "AKZ215","AKZ216","AKZ217","AKZ227"] + "AKZ215","AKZ216","AKZ217"] # Header configuration items diff --git a/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/product/Hazard_NPW_MultiPil.py b/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/product/Hazard_NPW_MultiPil.py index ddcb1b1fab..a0e6bbd5a4 100644 --- a/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/product/Hazard_NPW_MultiPil.py +++ b/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/product/Hazard_NPW_MultiPil.py @@ -46,7 +46,7 @@ class TextProduct(GenericHazards.TextProduct): elif "_" == "_WCZ": Definition["subDomainUGCs"] = ["AKZ207","AKZ208","AKZ209","AKZ210", "AKZ211","AKZ212","AKZ213","AKZ214", - "AKZ215","AKZ216","AKZ217","AKZ227"] + "AKZ215","AKZ216","AKZ217"] # Header configuration items diff --git a/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/product/Hazard_RFW_MultiPil.py b/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/product/Hazard_RFW_MultiPil.py index db74856844..39f473ef5b 100644 --- a/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/product/Hazard_RFW_MultiPil.py +++ b/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/product/Hazard_RFW_MultiPil.py @@ -55,7 +55,7 @@ class TextProduct(GenericHazards.TextProduct): elif "_" == "_WCZ": Definition["subDomainUGCs"] = ["AKZ207","AKZ208","AKZ209","AKZ210", "AKZ211","AKZ212","AKZ213","AKZ214", - "AKZ215","AKZ216","AKZ217","AKZ227"] + "AKZ215","AKZ216","AKZ217"] # Header configuration items Definition["productName"] = "URGENT - FIRE WEATHER MESSAGE" # name of product diff --git a/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/product/Hazard_WSW_MultiPil.py b/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/product/Hazard_WSW_MultiPil.py index a30b05e0a7..f1904bef32 100644 --- a/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/product/Hazard_WSW_MultiPil.py +++ b/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/product/Hazard_WSW_MultiPil.py @@ -46,7 +46,7 @@ class TextProduct(GenericHazards.TextProduct): elif "_" == "_WCZ": Definition["subDomainUGCs"] = ["AKZ207","AKZ208","AKZ209","AKZ210", "AKZ211","AKZ212","AKZ213","AKZ214", - "AKZ215","AKZ216","AKZ217","AKZ227"] + "AKZ215","AKZ216","AKZ217"] # Header configuration items diff --git a/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/product/SPS_MultiPil_Local.py b/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/product/SPS_MultiPil_Local.py index ec33e3639e..2e40b81245 100644 --- a/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/product/SPS_MultiPil_Local.py +++ b/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/product/SPS_MultiPil_Local.py @@ -62,7 +62,7 @@ class TextProduct(GenericReport.TextProduct): elif "_" == "_WCZ": Definition["subDomainUGCs"] = ["AKZ207","AKZ208","AKZ209","AKZ210", "AKZ211","AKZ212","AKZ213","AKZ214", - "AKZ215","AKZ216","AKZ217","AKZ227"] + "AKZ215","AKZ216","AKZ217"] # product identifiers Definition["productName"] = "SPECIAL WEATHER STATEMENT" # product name diff --git a/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/FWFTable_Site_MultiPil_Definition.py b/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/FWFTable_Site_MultiPil_Definition.py index a5a47a1866..0dc183547a 100644 --- a/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/FWFTable_Site_MultiPil_Definition.py +++ b/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/FWFTable_Site_MultiPil_Definition.py @@ -65,7 +65,7 @@ if "" == "AFG": elif "_" == "_WCZ": Definition["subDomainUGCs"] = ["AKZ207","AKZ208","AKZ209","AKZ210", "AKZ211","AKZ212","AKZ213","AKZ214", - "AKZ215","AKZ216","AKZ217","AKZ227"] + "AKZ215","AKZ216","AKZ217"] # Header configuration items #Definition["productName"] = "FIRE WEATHER PLANNING FORECAST" # name of product diff --git a/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/FWF_Site_MultiPil_Definition.py b/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/FWF_Site_MultiPil_Definition.py index d014b408ea..e0dc06099c 100644 --- a/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/FWF_Site_MultiPil_Definition.py +++ b/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/FWF_Site_MultiPil_Definition.py @@ -63,7 +63,7 @@ if "" == "AFG": elif "_" == "_WCZ": Definition["subDomainUGCs"] = ["AKZ207","AKZ208","AKZ209","AKZ210", "AKZ211","AKZ212","AKZ213","AKZ214", - "AKZ215","AKZ216","AKZ217","AKZ227"] + "AKZ215","AKZ216","AKZ217"] #Definition["tempLocalEffects"] = 1 # Set to 1 to enable Temp and RH local effects AFTER # creating AboveElev and BelowElev edit areas diff --git a/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/FireWxZones_EA_Site_MultiPil_Definition.py b/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/FireWxZones_EA_Site_MultiPil_Definition.py index 6fba4b7524..c0c21fd75c 100644 --- a/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/FireWxZones_EA_Site_MultiPil_Definition.py +++ b/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/FireWxZones_EA_Site_MultiPil_Definition.py @@ -53,6 +53,6 @@ if "" == "AFG": elif "_" == "_WCZ": Definition["subDomainUGCs"] = ["AKZ207","AKZ208","AKZ209","AKZ210", "AKZ211","AKZ212","AKZ213","AKZ214", - "AKZ215","AKZ216","AKZ217","AKZ227"] + "AKZ215","AKZ216","AKZ217"] diff --git a/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/PublicZones_EA_Site_MultiPil_Definition.py b/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/PublicZones_EA_Site_MultiPil_Definition.py index 7b64fa5da1..31172df316 100644 --- a/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/PublicZones_EA_Site_MultiPil_Definition.py +++ b/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/PublicZones_EA_Site_MultiPil_Definition.py @@ -53,5 +53,5 @@ if "" == "AFG": elif "_" == "_WCZ": Definition["subDomainUGCs"] = ["AKZ207","AKZ208","AKZ209","AKZ210", "AKZ211","AKZ212","AKZ213","AKZ214", - "AKZ215","AKZ216","AKZ217","AKZ227"] + "AKZ215","AKZ216","AKZ217"] diff --git a/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SRF_Site_MultiPil_Definition.py b/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SRF_Site_MultiPil_Definition.py index 20fc1e9fc5..7463e52494 100644 --- a/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SRF_Site_MultiPil_Definition.py +++ b/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SRF_Site_MultiPil_Definition.py @@ -75,7 +75,7 @@ if "" == "AFG": elif "_" == "_WCZ": Definition["subDomainUGCs"] = ["AKZ207","AKZ208","AKZ209","AKZ210", "AKZ211","AKZ212","AKZ213","AKZ214", - "AKZ215","AKZ216","AKZ217","AKZ227"] + "AKZ215","AKZ216","AKZ217"] #Definition["tempLocalEffects"] = 1 # Set to 1 to enable Temp and RH local effects AFTER # creating Inland and Coastal edit areas #Definition["windLocalEffects"] = 1 # Set to 1 to enable wind local effects AFTER diff --git a/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/ZFP_Site_MultiPil_Definition.py b/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/ZFP_Site_MultiPil_Definition.py index b3cae1a4bf..7977b22eec 100644 --- a/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/ZFP_Site_MultiPil_Definition.py +++ b/edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/ZFP_Site_MultiPil_Definition.py @@ -61,7 +61,7 @@ if "" == "AFG": elif "_" == "_WCZ": Definition["subDomainUGCs"] = ["AKZ207","AKZ208","AKZ209","AKZ210", "AKZ211","AKZ212","AKZ213","AKZ214", - "AKZ215","AKZ216","AKZ217","AKZ227"] + "AKZ215","AKZ216","AKZ217"] # Header configuration items #Definition["productName"] = "ZONE FORECAST PRODUCT" # name of product diff --git a/edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-spring.xml b/edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-spring.xml index cdf139c5bf..c7050e3009 100644 --- a/edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-spring.xml +++ b/edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-spring.xml @@ -50,7 +50,7 @@ - + diff --git a/edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml b/edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml index 23ffbb0dcc..ca32da1f75 100644 --- a/edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml +++ b/edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml @@ -76,7 +76,7 @@ - + diff --git a/edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml index a757baaf8e..3fa5094f14 100644 --- a/edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml +++ b/edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml @@ -12,7 +12,7 @@ - + airep - + --> - + airep diff --git a/edexOsgi/com.raytheon.edex.plugin.binlightning/res/spring/binlightning_ep-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.binlightning/res/spring/binlightning_ep-ingest.xml index 0e28d3357b..22f5fb05ea 100644 --- a/edexOsgi/com.raytheon.edex.plugin.binlightning/res/spring/binlightning_ep-ingest.xml +++ b/edexOsgi/com.raytheon.edex.plugin.binlightning/res/spring/binlightning_ep-ingest.xml @@ -9,7 +9,7 @@ - + binlightning - + --> - + binlightning diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrmos/res/spring/bufrmos-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.bufrmos/res/spring/bufrmos-ingest.xml index 90ea632604..656b35ba9b 100644 --- a/edexOsgi/com.raytheon.edex.plugin.bufrmos/res/spring/bufrmos-ingest.xml +++ b/edexOsgi/com.raytheon.edex.plugin.bufrmos/res/spring/bufrmos-ingest.xml @@ -8,7 +8,7 @@ - + bufrmos - + --> - + bufrmos diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrua/res/spring/bufrua-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.bufrua/res/spring/bufrua-ingest.xml index df4ddcd80c..4b2643dff6 100644 --- a/edexOsgi/com.raytheon.edex.plugin.bufrua/res/spring/bufrua-ingest.xml +++ b/edexOsgi/com.raytheon.edex.plugin.bufrua/res/spring/bufrua-ingest.xml @@ -32,13 +32,13 @@ bufrua - + --> - + bufrua diff --git a/edexOsgi/com.raytheon.edex.plugin.ccfp/res/spring/ccfp-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.ccfp/res/spring/ccfp-ingest.xml index a13ea2bad9..bca9b008bb 100644 --- a/edexOsgi/com.raytheon.edex.plugin.ccfp/res/spring/ccfp-ingest.xml +++ b/edexOsgi/com.raytheon.edex.plugin.ccfp/res/spring/ccfp-ingest.xml @@ -29,13 +29,13 @@ ccfp - + --> - + ccfp diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml index 495781a71b..9035319bc5 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml @@ -55,7 +55,7 @@ errorHandlerRef="errorHandler"> - + @@ -87,7 +87,7 @@ - + diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml index b296dc27ba..b1b68a4994 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml @@ -464,9 +464,9 @@ - - + @@ -487,11 +487,11 @@ - + - + @@ -623,7 +623,7 @@ - + @@ -643,7 +643,7 @@ errorHandlerRef="errorHandler" autoStartup="false"> - + diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml index 0f267bc501..c2c87fd5bf 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml @@ -8,8 +8,8 @@ - + @@ -40,7 +40,7 @@ xmlns="http://camel.apache.org/schema/spring" errorHandlerRef="errorHandler"> - + @@ -51,7 +51,7 @@ - + @@ -78,7 +78,7 @@ - + @@ -117,9 +117,9 @@ - + - + java.lang.Throwable + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java index b15f2f06f6..f56c8d9a14 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java @@ -21,6 +21,7 @@ package com.raytheon.edex.plugin.gfe.cache.d2dparms; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -71,8 +72,6 @@ import com.raytheon.uf.edex.site.SiteAwareRegistry; * Mar 20, 2013 #1774 randerso Changed to use GFDD2DDao * Apr 01, 2013 #1774 randerso Moved wind component checking to GfeIngestNotificaionFilter * May 14, 2013 #2004 randerso Added DBInvChangeNotifications when D2D data is purged - * Sep 12, 2013 #2348 randerso Changed to send DBInvChangeNotifications in a batch instead - * of one at a time. * * * @@ -326,16 +325,10 @@ public class D2DParmIdCache { try { D2DGridDatabase db = (D2DGridDatabase) GridParmManager .getDb(dbIds.get(i)); - if (db == null) { - statusHandler - .error("Unable to get parm list for: " - + dbIds.get(i)); - } else { - ServerResponse> sr = db - .getParmList(); - if (sr.isOkay()) { - parmIds.addAll(sr.getPayload()); - } + ServerResponse> sr = db + .getParmList(); + if (sr.isOkay()) { + parmIds.addAll(sr.getPayload()); } } catch (GfeException e) { throw new PluginException( @@ -353,8 +346,13 @@ public class D2DParmIdCache { putParmIDList(parmIds); List currentDbInventory = this.getDatabaseIDs(); dbsToRemove.removeAll(currentDbInventory); - SendNotifications.send(new DBInvChangeNotification(null, - dbsToRemove, siteID)); + List invChgList = new ArrayList( + dbsToRemove.size()); + for (DatabaseID dbId : dbsToRemove) { + invChgList.add(new DBInvChangeNotification(null, Arrays + .asList(dbId), siteID)); + } + SendNotifications.send(invChgList); // inform GfeIngestNotificationFilter of removed dbs GfeIngestNotificationFilter.purgeDbs(dbsToRemove); diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java index 106c4fd65f..ac19cd6994 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java @@ -88,7 +88,7 @@ import com.raytheon.uf.edex.site.notify.SendSiteActivationNotifications; * activation. * Mar 20, 2013 #1774 randerso Changed to use GFED2DDao * May 02, 2013 #1969 randerso Moved updateDbs method into IFPGridDatabase - * Sep 13, 2013 2368 rjpeter Used durable jms settings. + * * * * @author njensen @@ -115,7 +115,7 @@ public class GFESiteActivation implements ISiteActivationListener { private boolean intialized = false; - private final ExecutorService postActivationTaskExecutor = MoreExecutors + private ExecutorService postActivationTaskExecutor = MoreExecutors .getExitingExecutorService((ThreadPoolExecutor) Executors .newCachedThreadPool()); @@ -356,7 +356,7 @@ public class GFESiteActivation implements ISiteActivationListener { GridDatabase db = GridParmManager.getDb(dbid); // cluster locked since IFPGridDatabase can modify the grids // based on changes to grid size, etc - if ((db instanceof IFPGridDatabase) && db.databaseIsValid()) { + if (db instanceof IFPGridDatabase && db.databaseIsValid()) { ((IFPGridDatabase) db).updateDbs(); } } @@ -410,7 +410,7 @@ public class GFESiteActivation implements ISiteActivationListener { long startTime = System.currentTimeMillis(); // wait for system startup or at least 3 minutes while (!EDEXUtil.isRunning() - || (System.currentTimeMillis() > (startTime + 180000))) { + || System.currentTimeMillis() > startTime + 180000) { try { Thread.sleep(15000); } catch (InterruptedException e) { @@ -420,7 +420,7 @@ public class GFESiteActivation implements ISiteActivationListener { ClusterTask ct = ClusterLockUtils.lookupLock(TASK_NAME, SMART_INIT_TASK_DETAILS + siteID); - if ((ct.getLastExecution() + SMART_INIT_TIMEOUT) < System + if (ct.getLastExecution() + SMART_INIT_TIMEOUT < System .currentTimeMillis()) { ct = ClusterLockUtils.lock(TASK_NAME, SMART_INIT_TASK_DETAILS + siteID, @@ -467,7 +467,7 @@ public class GFESiteActivation implements ISiteActivationListener { "Firing smartinit for " + id); try { producer.sendAsyncUri( - "jms-durable:queue:manualSmartInit", + "jms-generic:queue:manualSmartInit", id + ":0::" + SmartInitRecord.SITE_ACTIVATION_INIT_PRIORITY); @@ -499,7 +499,7 @@ public class GFESiteActivation implements ISiteActivationListener { long startTime = System.currentTimeMillis(); // wait for system startup or at least 3 minutes while (!EDEXUtil.isRunning() - || (System.currentTimeMillis() > (startTime + 180000))) { + || System.currentTimeMillis() > startTime + 180000) { try { Thread.sleep(15000); } catch (InterruptedException e) { diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java index e39f39347c..110f104736 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java @@ -100,12 +100,6 @@ import com.raytheon.uf.edex.database.purge.PurgeLogger; * Removed inventory from DBInvChangedNotification * 05/03/13 #1974 randerso Fixed error logging to include stack trace * 05/14/13 #2004 randerso Added methods to synch GridParmManager across JVMs - * 09/12/13 #2348 randerso Added logging when database are added/removed from dbMap - * Fixed the synchronization of dbMap with the database inventory - * Changed to call D2DGridDatabase.getDatabase instead of calling - * the constructor directly to ensure the data exists before creating - * the D2DGridDatabase object - * * * * @author bphillip @@ -1022,10 +1016,10 @@ public class GridParmManager { sr.addMessage("VersionPurge failed - couldn't get inventory"); return sr; } - List currentInv = sr.getPayload(); + List databases = sr.getPayload(); // sort the inventory by site, type, model, time (most recent first) - Collections.sort(currentInv); + Collections.sort(databases); // process the inventory looking for "old" unwanted databases String model = null; @@ -1033,7 +1027,7 @@ public class GridParmManager { String type = null; int count = 0; int desiredVersions = 0; - for (DatabaseID dbId : currentInv) { + for (DatabaseID dbId : databases) { // new series? if (!dbId.getSiteId().equals(site) || !dbId.getDbType().equals(type) @@ -1061,31 +1055,11 @@ public class GridParmManager { } } - List newInv = getDbInventory(siteID).getPayload(); - List additions = new ArrayList(newInv); - additions.removeAll(currentInv); - - List deletions = new ArrayList(currentInv); - deletions.removeAll(newInv); - // kludge to keep dbMap in synch until GridParmManager/D2DParmICache // merge/refactor - List toRemove = new ArrayList(dbMap.keySet()); - toRemove.removeAll(newInv); - for (DatabaseID dbId : toRemove) { - statusHandler - .info("Synching GridParmManager with database inventory, removing " - + dbId); - dbMap.remove(dbId); + dbMap.keySet().retainAll(databases); - // add any removals to the deletions list - // so notifications go to the other JVMs - if (!deletions.contains(dbId)) { - deletions.add(dbId); - } - } - - createDbNotification(siteID, additions, deletions); + createDbNotification(siteID, databases); return sr; } @@ -1246,8 +1220,8 @@ public class GridParmManager { // ingested String d2dModelName = serverConfig .d2dModelNameMapping(modelName); - db = D2DGridDatabase.getDatabase(serverConfig, - d2dModelName, dbId.getModelTimeAsDate()); + db = new D2DGridDatabase(serverConfig, d2dModelName, + dbId.getModelTimeAsDate()); } catch (Exception e) { statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e); @@ -1270,7 +1244,6 @@ public class GridParmManager { } if ((db != null) && db.databaseIsValid()) { - statusHandler.info("getDb called, adding " + dbId); dbMap.put(dbId, db); } } @@ -1282,8 +1255,6 @@ public class GridParmManager { while (iter.hasNext()) { DatabaseID dbId = iter.next(); if (dbId.getSiteId().equals(siteID)) { - statusHandler.info("purgeDbCache(" + siteID + "), removing " - + dbId); iter.remove(); } } @@ -1399,6 +1370,18 @@ public class GridParmManager { return sr; } + private static void createDbNotification(String siteID, + List prevInventory) { + List newInventory = getDbInventory(siteID).getPayload(); + List additions = new ArrayList(newInventory); + additions.removeAll(prevInventory); + + List deletions = new ArrayList(prevInventory); + deletions.removeAll(newInventory); + + createDbNotification(siteID, additions, deletions); + } + private static void createDbNotification(String siteID, List additions, List deletions) { if (!additions.isEmpty() || !deletions.isEmpty()) { @@ -1417,7 +1400,6 @@ public class GridParmManager { "Unable to purge model database: " + id, e); } } - statusHandler.info("deallocateDb called, removing " + id); dbMap.remove(id); } @@ -1447,9 +1429,6 @@ public class GridParmManager { } for (DatabaseID dbId : invChanged.getDeletions()) { - statusHandler - .info("DBInvChangeNotification deletion received, removing " - + dbId); dbMap.remove(dbId); } } diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java index 9f35eabb27..4d398756e0 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java @@ -43,6 +43,7 @@ import com.raytheon.edex.plugin.gfe.db.dao.GFED2DDao; import com.raytheon.edex.plugin.gfe.paraminfo.GridParamInfo; import com.raytheon.edex.plugin.gfe.paraminfo.GridParamInfoLookup; import com.raytheon.edex.plugin.gfe.paraminfo.ParameterInfo; +import com.raytheon.edex.plugin.gfe.server.GridParmManager; import com.raytheon.uf.common.comm.CommunicationException; import com.raytheon.uf.common.dataplugin.PluginException; import com.raytheon.uf.common.dataplugin.gfe.GridDataHistory; @@ -106,9 +107,6 @@ import com.raytheon.uf.edex.database.DataAccessLayerException; * 04/17/2013 #1913 randerso Added GFE level mapping to replace GridTranslator * 05/02/2013 #1969 randerso Removed unnecessary updateDbs method * 05/03/2013 #1974 randerso Fixed error handling when no D2D level mapping found - * 09/12/2013 #2348 randerso Removed code that called getDb from getD2DDatabaseIdsFromDb - * Added function to create a D2DGridDatabase object only if there is - * data in postgres for the desired model/reftime * * * @@ -137,33 +135,6 @@ public class D2DGridDatabase extends VGridDatabase { gfeModelName, modelTime); } - /** - * Get a D2DGridDatabase if it is available - * - * @param config - * configuration for site - * @param dbId - * DatabaseID of desired database - * @return D2DGridDatabase or null if not available - */ - public static D2DGridDatabase getDatabase(IFPServerConfig config, - String d2dModelName, Date refTime) { - try { - GFED2DDao dao = new GFED2DDao(); - List result = dao.getModelRunTimes(d2dModelName, -1); - - if (result.contains(refTime)) { - D2DGridDatabase db = new D2DGridDatabase(config, d2dModelName, - refTime); - return db; - } - return null; - } catch (Exception e) { - statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e); - return null; - } - } - /** * Retrieves DatabaseIDs for all model runs of a given d2dModelName * @@ -207,7 +178,15 @@ public class D2DGridDatabase extends VGridDatabase { for (Date date : result) { DatabaseID dbId = null; dbId = getDbId(d2dModelName, date, config); - dbInventory.add(dbId); + try { + GridDatabase db = GridParmManager.getDb(dbId); + if ((db != null) && !dbInventory.contains(dbId)) { + dbInventory.add(dbId); + } + } catch (GfeException e) { + statusHandler.handle(Priority.PROBLEM, + e.getLocalizedMessage(), e); + } } return dbInventory; } catch (PluginException e) { @@ -306,14 +285,10 @@ public class D2DGridDatabase extends VGridDatabase { /** * Constructs a new D2DGridDatabase * - * For internal use only. External code should call - * D2DGridDatabase.getDatabase(IFPServerConfig, String, Date) to ensure - * objects are only created if data is present - * * @param dbId * The database ID of this database */ - private D2DGridDatabase(IFPServerConfig config, String d2dModelName, + public D2DGridDatabase(IFPServerConfig config, String d2dModelName, Date refTime) throws GfeException { super(config); diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/SmartInitRequestHandler.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/SmartInitRequestHandler.java index 8a57825302..3492acf6d8 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/SmartInitRequestHandler.java +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/SmartInitRequestHandler.java @@ -35,7 +35,7 @@ import com.raytheon.uf.common.serialization.comm.IRequestHandler; import com.raytheon.uf.edex.core.EDEXUtil; /** - * Handler for SmartInitRequest. + * TODO Add Description * *
  * 
@@ -43,7 +43,7 @@ import com.raytheon.uf.edex.core.EDEXUtil;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Oct 12, 2010            dgilling     Initial creation
- * Sep 13, 2013 2368       rjpeter      Used durable jms settings.
+ * 
  * 
* * @author dgilling @@ -93,7 +93,7 @@ public class SmartInitRequestHandler implements .append(SmartInitRecord.MANUAL_SMART_INIT_PRIORITY); EDEXUtil.getMessageProducer().sendAsyncUri( - "jms-durable:queue:manualSmartInit", + "jms-generic:queue:manualSmartInit", manualInitString.toString()); } else { sr.addMessage("No valid model data could be retrieved for model " diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java index dab1904860..fb74c8bfbb 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java @@ -50,8 +50,8 @@ import com.raytheon.uf.common.dataplugin.gfe.server.notify.DBInvChangeNotificati import com.raytheon.uf.common.dataplugin.gfe.server.notify.GfeNotification; import com.raytheon.uf.common.dataplugin.gfe.server.notify.GridUpdateNotification; import com.raytheon.uf.common.dataplugin.grid.GridRecord; -import com.raytheon.uf.common.dataplugin.level.Level; import com.raytheon.uf.common.dataplugin.message.DataURINotificationMessage; +import com.raytheon.uf.common.dataplugin.level.Level; import com.raytheon.uf.common.dataplugin.satellite.SatelliteRecord; import com.raytheon.uf.common.message.WsId; import com.raytheon.uf.common.serialization.SerializationUtil; @@ -81,8 +81,7 @@ import com.raytheon.uf.edex.core.EDEXUtil; * Apr 01, 2013 #1774 randerso Moved wind component checking to GfeIngestNotificaionFilter * Apr 04, 2013 #1787 randerso Added null check to prevent log spamming for parameters * not included in the parameter info file - * May 02, 2013 #1969 randerso Updated for change to DBInvChangeNotification - * Sep 03, 2013 #2321 randerso Fixed smartInits for D2D accumulative parameters + * May 2, 2013 #1969 randerso Updated for change to DBInvChangeNotification * * * @@ -241,10 +240,9 @@ public class GfeIngestNotificationFilter { initNameBuilder.append('_'); initNameBuilder.append(dbId.getModelTime()); - Date validTime = grid.getDataTime().getValidTime() - .getTime(); SmartInitRecordPK id = new SmartInitRecordPK( - initNameBuilder.toString(), validTime); + initNameBuilder.toString(), grid.getDataTime() + .getValidPeriod().getStart()); SmartInitRecord record = inits.get(id); if (record == null) { diff --git a/edexOsgi/com.raytheon.edex.plugin.goessounding/res/spring/goessounding-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.goessounding/res/spring/goessounding-ingest.xml index 25158070e6..ea38fe8764 100644 --- a/edexOsgi/com.raytheon.edex.plugin.goessounding/res/spring/goessounding-ingest.xml +++ b/edexOsgi/com.raytheon.edex.plugin.goessounding/res/spring/goessounding-ingest.xml @@ -12,7 +12,7 @@ - + goessounding - +
--> - + goessounding diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml index c8556bce9f..19b4807c0b 100644 --- a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml +++ b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml @@ -6,11 +6,14 @@ - + - + + + + @@ -58,7 +61,7 @@ autoStartup="false"> - + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml index 3c36fb0ed9..19236c7b3d 100644 --- a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml +++ b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml @@ -6,11 +6,14 @@ - + - + + + + @@ -54,7 +57,7 @@ autoStartup="false"> - + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml index eaa7bc52b4..516afb5ee1 100644 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml @@ -791,11 +791,6 @@ HPCGuide
6
- - HPCGuide-2.5km - HPCGuide-2.5km -
6
-
HPCGuide-AK HPCGuide-AK diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_RFC-9.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_RFC-9.xml index b6b933f6a3..9f7bf13420 100644 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_RFC-9.xml +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_RFC-9.xml @@ -515,6 +515,11 @@ FFG-TIR
1
+ + FFG-TIR-HiRes + FFG-TIR-HiRes +
1
+
QPE-TIR QPE-TIR diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml index c8c8d047cf..5e97026f27 100644 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml @@ -383,12 +383,6 @@ 2 00-00:15:00
- - - HPCGuide-2.5km - 2 - 00-00:15:00 - GFSGuide diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/grid161.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/grid161.xml index 94cafe010b..0b3c077a4a 100644 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/grid161.xml +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/grid161.xml @@ -26,8 +26,8 @@ UpperLeft 137 102 - 0.50367647058823528 - 0.50495049504950495 + 0.5 + 0.5 degree -0.25 340.25 diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml index ad4fdc14d4..219bddfe51 100644 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml @@ -2885,15 +2885,6 @@ - - HPCGuide-2.5km -
7
- 5 - - 183 - -
- HPCGuide-AK
7
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_RFC-9.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_RFC-9.xml index 5483816d9d..15eb7b2bd5 100644 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_RFC-9.xml +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_RFC-9.xml @@ -1079,11 +1079,21 @@ 180
- + FFG-TIR
9
160 + 240160 + + 151 + +
+ + + FFG-TIR-HiRes +
9
+ 160 250160 151 diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/7/5/4.2.0.1.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/7/5/4.2.0.1.table index fa0c25f3c2..0cae767a57 100644 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/7/5/4.2.0.1.table +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/7/5/4.2.0.1.table @@ -1,6 +1,6 @@ # Product Discipline 0: Meteorological products, Parameter Category 1: Moisture #192-254 Reserved for local use -192:192:Weather::wxType +192:192:Categorical Rain::CRAIN 193:193:Categorical Freezing Rain::CFRZR 194:194:Categorical Ice Pellets::CICEP 195:195:Categorical Snow::CSNOW diff --git a/edexOsgi/com.raytheon.edex.plugin.ldad/res/spring/ldad-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.ldad/res/spring/ldad-ingest.xml index 6c33246a98..3cc4285252 100644 --- a/edexOsgi/com.raytheon.edex.plugin.ldad/res/spring/ldad-ingest.xml +++ b/edexOsgi/com.raytheon.edex.plugin.ldad/res/spring/ldad-ingest.xml @@ -21,11 +21,11 @@ ldad - + - + diff --git a/edexOsgi/com.raytheon.edex.plugin.ldadhydro/res/spring/ldadhydro-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.ldadhydro/res/spring/ldadhydro-ingest.xml index 3cfd3faf96..ae1cc4c127 100644 --- a/edexOsgi/com.raytheon.edex.plugin.ldadhydro/res/spring/ldadhydro-ingest.xml +++ b/edexOsgi/com.raytheon.edex.plugin.ldadhydro/res/spring/ldadhydro-ingest.xml @@ -15,7 +15,7 @@ - + @@ -30,7 +30,7 @@ errorHandlerRef="errorHandler" autoStartup="false"> - + diff --git a/edexOsgi/com.raytheon.edex.plugin.ldadmanual/res/spring/ldadmanual-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.ldadmanual/res/spring/ldadmanual-ingest.xml index 9bfdd35584..86f2581985 100644 --- a/edexOsgi/com.raytheon.edex.plugin.ldadmanual/res/spring/ldadmanual-ingest.xml +++ b/edexOsgi/com.raytheon.edex.plugin.ldadmanual/res/spring/ldadmanual-ingest.xml @@ -14,7 +14,7 @@ - + - + diff --git a/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/res/spring/ldadprofiler-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/res/spring/ldadprofiler-ingest.xml index cdde40ba86..18fb79835a 100644 --- a/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/res/spring/ldadprofiler-ingest.xml +++ b/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/res/spring/ldadprofiler-ingest.xml @@ -16,7 +16,7 @@ - + ldadprofiler - + --> - + diff --git a/edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml index 5a664102f7..d2479bf461 100644 --- a/edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml +++ b/edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml @@ -22,7 +22,7 @@ - + modelsounding - + --> - + modelsounding diff --git a/edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml index cd52a3a7e1..493be3e3cd 100644 --- a/edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml +++ b/edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml @@ -14,7 +14,7 @@ - + obs - + --> - + obs diff --git a/edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml index 444d2faa3f..8a3bc973bd 100644 --- a/edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml +++ b/edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml @@ -34,12 +34,12 @@ pirep - + --> - + pirep diff --git a/edexOsgi/com.raytheon.edex.plugin.poessounding/res/spring/poessounding-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.poessounding/res/spring/poessounding-ingest.xml index b82366bf4b..431cfa949a 100644 --- a/edexOsgi/com.raytheon.edex.plugin.poessounding/res/spring/poessounding-ingest.xml +++ b/edexOsgi/com.raytheon.edex.plugin.poessounding/res/spring/poessounding-ingest.xml @@ -9,7 +9,7 @@ - + poessounding - + --> - + poessounding diff --git a/edexOsgi/com.raytheon.edex.plugin.profiler/res/spring/profiler-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.profiler/res/spring/profiler-ingest.xml index 6b15f7bfe7..c7023d4244 100644 --- a/edexOsgi/com.raytheon.edex.plugin.profiler/res/spring/profiler-ingest.xml +++ b/edexOsgi/com.raytheon.edex.plugin.profiler/res/spring/profiler-ingest.xml @@ -9,7 +9,7 @@ - + profiler - + --> - + profiler diff --git a/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-ingest.xml index 4099b9b31c..992b1ffa71 100644 --- a/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-ingest.xml +++ b/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-ingest.xml @@ -6,11 +6,12 @@ - + - + + @@ -53,7 +54,7 @@ - + radar-sbn @@ -61,7 +62,7 @@ - + radar-local diff --git a/edexOsgi/com.raytheon.edex.plugin.recco/res/spring/recco-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.recco/res/spring/recco-ingest.xml index 2ef0c4dbe6..ffbb96a228 100644 --- a/edexOsgi/com.raytheon.edex.plugin.recco/res/spring/recco-ingest.xml +++ b/edexOsgi/com.raytheon.edex.plugin.recco/res/spring/recco-ingest.xml @@ -33,13 +33,13 @@ recco - + --> - + recco diff --git a/edexOsgi/com.raytheon.edex.plugin.redbook/res/spring/redbook-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.redbook/res/spring/redbook-ingest.xml index 710cbff1f2..c040dfe92c 100644 --- a/edexOsgi/com.raytheon.edex.plugin.redbook/res/spring/redbook-ingest.xml +++ b/edexOsgi/com.raytheon.edex.plugin.redbook/res/spring/redbook-ingest.xml @@ -10,7 +10,7 @@ - + - + redbook diff --git a/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-ingest.xml index 0268baaa52..1a7cbda284 100644 --- a/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-ingest.xml +++ b/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-ingest.xml @@ -4,11 +4,11 @@ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd"> - + - + @@ -47,13 +47,13 @@ satellite - + --> - + satellite diff --git a/edexOsgi/com.raytheon.edex.plugin.sfcobs/res/spring/sfcobs-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.sfcobs/res/spring/sfcobs-ingest.xml index a8d9d8c731..74331b1784 100644 --- a/edexOsgi/com.raytheon.edex.plugin.sfcobs/res/spring/sfcobs-ingest.xml +++ b/edexOsgi/com.raytheon.edex.plugin.sfcobs/res/spring/sfcobs-ingest.xml @@ -13,7 +13,7 @@ - + sfcobs - + --> - + sfcobs diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml index 94e68bba7a..ba744a3c9a 100644 --- a/edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml +++ b/edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml @@ -4,11 +4,11 @@ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd"> - + - + @@ -47,13 +47,13 @@ factory-method="register"> + value="jms-dist:queue:Ingest.Shef?destinationResolver=#qpidDurableResolver" /> - + + uri="jms-generic:queue:Ingest.ShefManual?destinationResolver=#qpidDurableResolver" /> @@ -92,7 +92,7 @@ + uri="jms-shef:queue:Ingest.Shef?destinationResolver=#qpidDurableResolver" /> shef @@ -103,7 +103,7 @@ + uri="jms-shef:queue:Ingest.ShefStaged?destinationResolver=#qpidDurableResolver" /> shef @@ -119,7 +119,7 @@ - + @@ -134,7 +134,7 @@ + uri="jms-generic:queue:Ingest.ShefStaged?destinationResolver=#qpidDurableResolver" /> @@ -155,7 +155,7 @@ + uri="jms-shef:queue:Ingest.ShefManual?destinationResolver=#qpidDurableResolver" /> shef diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/RecordMgr.java b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/RecordMgr.java index 15650ae2a2..f578ee3a07 100644 --- a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/RecordMgr.java +++ b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/RecordMgr.java @@ -41,7 +41,6 @@ import com.raytheon.uf.edex.database.dao.DaoConfig; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * June 15, 2011 9377 jnjanga Initial creation - * Sep 05, 2013 16549 wkwock Fix the query * * * @@ -148,7 +147,7 @@ class RecordMgr { private static String modeSubClause() { if (options.getMode() == ReportMode.UNREPORTED) - return " AND action_time IS NULL "; + return " AND action_time IS NULL AND "; else return " "; } diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/ReportWriter.java b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/ReportWriter.java index 58b3d924c8..764590e7a1 100644 --- a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/ReportWriter.java +++ b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/ReportWriter.java @@ -62,8 +62,7 @@ import com.raytheon.uf.edex.database.dao.DaoConfig; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * June 15, 2011 9377 jnjanga Initial creation - * July 12, 2013 15711 wkwock Fix verbose, observe mode, etc - * Sep 05, 2013 16539 wkwock Fix RECENT, NEAR_NOW,FRESH,and NEW_OR_INCREASED modes + * July 12, 2013 15711 wkwock Fix verbose, observe mode, etc * * * @@ -85,6 +84,8 @@ class ReportWriter { private Date now; + private long window; + private Date startTime; private Date endTime; @@ -101,12 +102,10 @@ class ReportWriter { this.reportData = new StringBuilder(); this.opt = opt; this.now = now; - Calendar cal = Calendar.getInstance(); - cal.add(Calendar.MINUTE, opt.getMinutes()); - endTime = cal.getTime(); - cal.add(Calendar.MINUTE, opt.getMinutes()*(-2)); - startTime = cal.getTime(); - + window = opt.getMinutes() * 60; + startTime = new Date(now.getTime() - window); + endTime = new Date(now.getTime() + window); + } @@ -377,6 +376,8 @@ class ReportWriter { Alertalarmval maxfcst = findMaxfcst(grpData); Alertalarmval latestReport = findLatestAction(grpData); + long latestActiontime = 0; + long latestPosttime = 0; Date posttime = null; double latestValue = -88888.; @@ -447,17 +448,6 @@ class ReportWriter { } break; - case RECENT: - for (Alertalarmval aav : grpData) { - Date postingTime = aav.getPostingtime(); - if (postingTime.after(startTime)) { - writeAAval(aav); - updateDatabase(aav); - alarmCount++; - } - } - break; - case LATEST_MAXFCST: if (grpTs0 == 'R' || grpTs0 == 'P') { @@ -481,13 +471,11 @@ class ReportWriter { */ for (Alertalarmval aav : grpData) { - if ((grpTs0 == 'R' || grpTs0 == 'P')) { + if ((grpTs0 == 'R' || grpTs0 == 'P') && latestReport != null) { Date validtime = aav.getId().getValidtime(); - Calendar cal = Calendar.getInstance(); - if (latestReport != null) - cal.setTime(latestReport.getId().getValidtime()); - cal.add(Calendar.MINUTE, opt.getMinutes()); - if (latestReport==null || validtime.after(cal.getTime())) { + latestActiontime = latestReport.getId().getValidtime() + .getTime(); + if (validtime.after(new Date(latestActiontime + window))) { writeAAval(aav); updateDatabase(aav); alarmCount++; @@ -497,7 +485,9 @@ class ReportWriter { if (grpTs0 == 'F' || grpTs0 == 'C') { if (maxfcst != null && isNotNull(maxfcst.getActionTime().getTime())) { - if (maxfcst.getActionTime().before(startTime)) { + latestActiontime = maxfcst.getActionTime().getTime(); + Date latestActiondate = maxfcst.getActionTime(); + if (latestActiondate.before(startTime)) { writeAAval(maxfcst); updateDatabase(maxfcst); alarmCount++; @@ -508,13 +498,10 @@ class ReportWriter { break; case NEW_OR_INCREASED: - Calendar cal = Calendar.getInstance(); for (Alertalarmval aav : grpData) { if (latestReport != null) { - latestValue = latestReport.getValue(); - cal.setTime(latestReport.getPostingtime()); - } else { - cal.setTimeInMillis(0); + latestPosttime = aav.getPostingtime().getTime(); + latestValue = aav.getValue(); } if (isNull(aav.getActionTime().getTime())) { @@ -525,9 +512,8 @@ class ReportWriter { * has a higher value than the last posted record's value * (i.e. the report is 'increased'), then report it. */ - cal.add(Calendar.MINUTE, opt.getMinutes()); - if (posttime.after(cal.getTime()) + if (posttime.after(new Date(latestPosttime + window)) || (aav.getValue() > latestValue)) { writeAAval(aav); updateDatabase(aav); @@ -567,6 +553,8 @@ class ReportWriter { Alertalarmval latestReport = findLatestAction(grpData); Alertalarmval maxfcstVal = findMaxfcst(grpData); + long latestActiontime = 0; + long latestPosttime = 0; Date posttime = null; double latestValue = -88888.; @@ -591,21 +579,18 @@ class ReportWriter { * forecast value */ - if ((ts0 == 'R' || ts0 == 'P') ) { - if (latestReport == null) - return true; - - Date validtime = aav.getId().getValidtime(); - Calendar cal = Calendar.getInstance(); - cal.setTime(latestReport.getId().getValidtime()); - cal.add(Calendar.MINUTE, opt.getMinutes()); - if (validtime.after(cal.getTime())) + if ((ts0 == 'R' || ts0 == 'P') && latestReport != null) { + Date validtime = aav.getId().getValidtime(); + latestActiontime = latestReport.getId().getValidtime() + .getTime(); + if (validtime.after(new Date(latestActiontime + window))) return true; } if (ts0 == 'F' || ts0 == 'C') { if (maxfcstVal != null && isNotNull(maxfcstVal.getActionTime().getTime())) { + latestActiontime = maxfcstVal.getActionTime().getTime(); Date latestActiondate = maxfcstVal.getActionTime(); if (latestActiondate.before(startTime)) return true; @@ -615,12 +600,9 @@ class ReportWriter { case NEW_OR_INCREASED: /* get the last reported record and its time and value. */ - Calendar cal = Calendar.getInstance(); if (latestReport != null) { - latestValue = latestReport.getValue(); - cal.setTime(latestReport.getPostingtime()); - } else { - cal.setTimeInMillis(0); + latestPosttime = aav.getPostingtime().getTime(); + latestValue = aav.getValue(); } if (isNull(aav.getActionTime().getTime())) { @@ -631,9 +613,8 @@ class ReportWriter { * has a higher value than the last posted record's value * (i.e. the report is 'increased'), then report it. */ - cal.add(Calendar.MINUTE, opt.getMinutes()); - if (posttime.after(cal.getTime())) { + if (posttime.after(new Date(latestPosttime + window))) { return true; } else if (aav.getValue() > latestValue) { return true; @@ -701,12 +682,10 @@ class ReportWriter { short dur = aav.getId().getDur(); if (dur != 0) { Object[] durData = getShefDurInfo(dur); - if (durData == null) + if (durData == null) devbStr[0] = "Duration=" + dur; - else { - Object[] aDurData = (Object[]) durData[0] -; devbStr[0] = (String) aDurData[2] + Constants.SPACE; - } + else + devbStr[0] = (String) durData[2] + Constants.SPACE; } else { devbStr[0] = Constants.SPACE; @@ -858,10 +837,9 @@ class ReportWriter { private Alertalarmval findLatestAction(List grpData) { TreeSet actions = new TreeSet( new ActiontimeComparator()); - for (Alertalarmval aav : grpData) { + for (Alertalarmval aav : grpData) if (isNotNull(aav.getActionTime().getTime())) actions.add(aav); - } return actions.isEmpty() ? null : actions.first(); } @@ -1008,7 +986,7 @@ class ReportWriter { flushDataLimitsObj(limits); dateWithin = checkDateRange(validtime, mds, mde); if (dateWithin) { - copyThresholds(limits, limRow, locRangeFound); + copyThresholds(limits, limRow, !locRangeFound); break; } } @@ -1170,7 +1148,7 @@ class ReportWriter { public static boolean isNull(long value) { boolean result = false; - if (value == getNullLong() || value==0) { + if (value == getNullLong()) { result = true; } diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostTables.java b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostTables.java index 1fc27abaf0..c355d74a3d 100644 --- a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostTables.java +++ b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostTables.java @@ -80,7 +80,6 @@ import com.raytheon.uf.edex.database.dao.DaoConfig; * 02/24/2012 14535 W. Kwock Correct the duration value. * 11/29/2012 15530 lbousaidi corrected posting and production time for * latestobsvalue table. - * 09/19/2013 16515 w. Kwock Fix the excessive digits in rawpp,lake,height...tables * * * @@ -1066,7 +1065,7 @@ public class PostTables { cs.setString(5, shefData.getExtremum().getCode()); cs.setTimestamp(6, new Timestamp(shefData.getObservationTimeObj() .getTime())); - cs.setDouble(7, Double.parseDouble(dataValue)); + cs.setFloat(7, Float.parseFloat(dataValue)); cs.setString(8, qualifier); cs.setInt(9, (int) qualityCode); @@ -1185,7 +1184,7 @@ public class PostTables { cs.setString(5, shefData.getExtremum().getCode()); cs.setTimestamp(6, new java.sql.Timestamp(shefData .getObservationTimeObj().getTime())); - cs.setDouble(7, Double.parseDouble(dataValue)); + cs.setFloat(7, Float.parseFloat(dataValue)); cs.setString(8, qualifier); cs.setInt(9, (int) qualityCode); @@ -1317,7 +1316,7 @@ public class PostTables { timeStamp = new java.sql.Timestamp(basisDate.getTime()); cs.setTimestamp(8, timeStamp); - cs.setDouble(9, Double.parseDouble(dataValue)); + cs.setFloat(9, Float.parseFloat(dataValue)); cs.setString(10, qualifier); @@ -1535,7 +1534,7 @@ public class PostTables { ps.setTimestamp(8, timeStamp2); // ps.setFloat(9, Float.parseFloat(shefDataValue.getStringValue())); - ps.setDouble(9, shefDataValue.getValue().floatValue()); + ps.setFloat(9, shefDataValue.getValue().floatValue()); if (updateFlag) { ps.setString(10, lid); diff --git a/edexOsgi/com.raytheon.edex.plugin.taf/res/spring/taf-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.taf/res/spring/taf-ingest.xml index fcd1df9358..6fa7bc90db 100644 --- a/edexOsgi/com.raytheon.edex.plugin.taf/res/spring/taf-ingest.xml +++ b/edexOsgi/com.raytheon.edex.plugin.taf/res/spring/taf-ingest.xml @@ -9,13 +9,13 @@ - + - + taf - + --> - + taf @@ -69,5 +69,7 @@ + + \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-ingest.xml index 982bc1af13..7a14ef86cb 100644 --- a/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-ingest.xml +++ b/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-ingest.xml @@ -11,13 +11,13 @@ - + - + @@ -28,11 +28,12 @@ - + - + + @@ -60,7 +61,7 @@ text - + --> @@ -114,7 +115,7 @@ - + text @@ -141,7 +142,7 @@ - + @@ -150,7 +151,7 @@ - + diff --git a/edexOsgi/com.raytheon.edex.plugin.textlightning/res/spring/textlightning_ep-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.textlightning/res/spring/textlightning_ep-ingest.xml index feb8c3a7a6..f4a6428e18 100644 --- a/edexOsgi/com.raytheon.edex.plugin.textlightning/res/spring/textlightning_ep-ingest.xml +++ b/edexOsgi/com.raytheon.edex.plugin.textlightning/res/spring/textlightning_ep-ingest.xml @@ -9,7 +9,7 @@ - + textlightning - + --> - + textlightning diff --git a/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml index a088d2fc1b..85a08e2df5 100644 --- a/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml +++ b/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml @@ -8,13 +8,13 @@ - + - + - + - + + @@ -48,7 +49,7 @@ warning - + --> @@ -56,7 +57,7 @@ Warning routes --> - + warning @@ -71,7 +72,7 @@ - + @@ -88,5 +89,6 @@ + \ No newline at end of file diff --git a/edexOsgi/com.raytheon.messaging.mhs/src/com/raytheon/messaging/mhs/MhsMessage.java b/edexOsgi/com.raytheon.messaging.mhs/src/com/raytheon/messaging/mhs/MhsMessage.java index 85a21fc099..0a12d6ab4e 100644 --- a/edexOsgi/com.raytheon.messaging.mhs/src/com/raytheon/messaging/mhs/MhsMessage.java +++ b/edexOsgi/com.raytheon.messaging.mhs/src/com/raytheon/messaging/mhs/MhsMessage.java @@ -81,15 +81,6 @@ public class MhsMessage { */ static public final String EnvMhsTrace = "MHS_SHOW_TRACE"; - /** - * Environment variable to determine the MHS interface to use. If undefined, - * it is the same as defining it to "NO" or "FALSE". If set to "YES" or - * "TRUE", then the JNI interface to the MHS DWB functions is used to submit - * messages. Any other value results in message submission occurring via the - * command line utility msg_send. - */ - static public final String EnvMhsUseNative = "MHS_USE_NATIVE_INTERFACE"; - /** * Minimum message code value */ @@ -194,7 +185,6 @@ public class MhsMessage { * Valid time parameter formatted as a string (mm/dd/yyyy:HHMM). This value * is derived from {@link #validTime} during message submission. */ - @SuppressWarnings("unused") private String validTimeString; /** @@ -207,7 +197,6 @@ public class MhsMessage { * Timeout time parameter formatted as a string (mm/dd/yyyy:HHMM). This * value is derived from {@link #timeoutTime} during message submission. */ - @SuppressWarnings("unused") private String timeoutTimeString; /** @@ -259,11 +248,6 @@ public class MhsMessage { */ private String resultText; - /** - * - */ - private boolean useNativeInterface; - /** * Sole constructor. Provides reasonable default values for a message * object's fields as follows: @@ -286,14 +270,10 @@ public class MhsMessage { */ public MhsMessage(int code) { String traceString = System.getenv(EnvMhsTrace); - String interfaceString = System.getenv(EnvMhsUseNative); showTrace = (traceString != null) - && ((traceString.equalsIgnoreCase("yes") || traceString - .equalsIgnoreCase("true"))); - useNativeInterface = (interfaceString != null) - && ((interfaceString.equalsIgnoreCase("yes")) || interfaceString - .equalsIgnoreCase("true")); + && ((traceString.equalsIgnoreCase("yes") + || traceString.equalsIgnoreCase("true"))); actionCode = code; setRetryCount(0); @@ -313,21 +293,6 @@ public class MhsMessage { submitted = false; } - /** - * Submits a message to the message request server daemon. This is JNI code - * to translate a Java message object to a C MHS message object. - * - * @return 0 if successful; a positive integer if a MHS error is detected; - * -1 if an error occurs in a JNI call, which will usually result in - * a Java exception when control is returned toe the JVM. - * @see MhsMessage - */ - private native String submitMessage() throws MhsSubmitException; - - static { - System.loadLibrary("coDDM_msg_send"); - } - /** * Gets the action code for this message object. * @@ -839,30 +804,6 @@ public class MhsMessage { return retryCount; } - /** - * Call to force the MHS interface to be used for this message. The default - * value is determined by the environment variable MHS_USE_NATIVE_INTERFACE. - * Set to true to use the native C DWB functions. Set to false to use the - * command line utility msg_send. - * - * @param useNativeInterface - * the useNativeInterface to set - */ - public void setUseNativeInterface(boolean useNativeInterface) { - this.useNativeInterface = useNativeInterface; - } - - /** - * Returns the MHS interface that will be used to submit this message. A - * true value indicates that the native C DWB functions will be used. False - * indicates that the command line utility msg_send will be used. - * - * @return the useNativeInterface - */ - public boolean isUseNativeInterface() { - return useNativeInterface; - } - /** * Retrieves the message Id of this message. * @@ -1153,147 +1094,136 @@ public class MhsMessage { String timeStamp = timeStampFormat.format(System.currentTimeMillis()); System.out.println(timeStamp + ": Message submitted"); - if (useNativeInterface) { // Submit the message using the MHS and DWB - // native libraries. - try { - messageId = submitMessage(); - } catch (MhsSubmitException e) { - resultText = e.toString(); - throw new MhsSubmitException(resultText); - } - } else { // Submit the message by constructing a command line and - // execing a new msg_send process - LinkedList command = new LinkedList(); + LinkedList command = new LinkedList(); - command.add("msg_send"); - command.add("-c" + actionCode); - String addrStr = ""; - String ackAddrStr = ""; - String encList = ""; + command.add("msg_send"); + command.add("-c" + actionCode); + String addrStr = ""; + String ackAddrStr = ""; + String encList = ""; - for (int i = 0; i < addressees.getCount(); i++) { - Addressee addr = addressees.get(i); - if (addr.isAckRequired()) { - if (ackAddrStr.isEmpty()) { - ackAddrStr = addr.getAddress(); - } else { - ackAddrStr += "," + addr.getAddress(); - } + for (int i = 0; i < addressees.getCount(); i++) { + Addressee addr = addressees.get(i); + if (addr.isAckRequired()) { + if (ackAddrStr.isEmpty()) { + ackAddrStr = addr.getAddress(); } else { - if (addrStr.isEmpty()) { - addrStr = addr.getAddress(); - } else { - addrStr += "," + addr.getAddress(); - } + ackAddrStr += "," + addr.getAddress(); } - } - - if (!addrStr.isEmpty()) { - command.add("-a" + addrStr); - } - - if (!ackAddrStr.isEmpty()) { - command.add("-A" + ackAddrStr); - } - - if (retryCount != 0) { - command.add("-R" + retryCount); - } - - for (int i = 0; i < enclosures.getCount(); i++) { - Enclosure enc = enclosures.get(i); - if (encList.isEmpty()) { - encList = enc.getEnclosureName(); + } else { + if (addrStr.isEmpty()) { + addrStr = addr.getAddress(); } else { - encList += "," + enc.getEnclosureName(); - } - } - - if (!encList.isEmpty()) { - command.add("-e" + encList); - } - - if (!timeoutTimeString.isEmpty()) { - command.add("-T" + timeoutTimeString); - } - - if (!validTimeString.isEmpty()) { - command.add("-v" + validTimeString); - } - - if (!bodyFile.isEmpty()) { - command.add("-b" + bodyFile); - } - - if (!productId.isEmpty()) { - command.add("-i" + productId); - } - - if (!subject.isEmpty()) { - command.add("-s" + subject); - } - - if (priority != MhsMessagePriority.Default) { - command.add("-p" + priority.value()); - } - - if (type != MhsMessageType.Routine) { - command.add("-t" + type.text()); - } - - if (verifyAddressees) { - command.add("-C"); - } - - if (showTrace) { - System.out.print("Executing command: "); - for (int i = 0; i < command.size(); i++) { - System.out.print(command.get(i) + " "); - } - System.out.println(); - } - - Process proc = null; - try { - ProcessBuilder procDesc = new ProcessBuilder(command); - procDesc.redirectErrorStream(true); - - proc = procDesc.start(); - InputStream stdout = proc.getInputStream(); - InputStreamReader isr = new InputStreamReader(stdout); - BufferedReader br = new BufferedReader(isr); - String outp; - - while ((outp = br.readLine()) != null) { - if (outp.length() > 0) { - // System.out.println(outp); - messageId = outp; - } - } - // System.out.println(line); - int exitVal = proc.waitFor(); - if (exitVal != 0) { - // System.out.println("Abnormal exit code " + exitVal); - // resultText = messageId; - throw new MhsSubmitException(messageId); - } - - if (showTrace) { - System.out - .println("Message successfully submitted. Message ID: " - + messageId); - } - } catch (Throwable t) { - resultText = t.getMessage(); - // System.out.println("Exception thrown: " + resultText); - throw new MhsSubmitException(resultText); - } finally { - // DR #10955 - if (proc != null) { - proc.destroy(); + addrStr += "," + addr.getAddress(); } } } + + if (!addrStr.isEmpty()) { + command.add("-a" + addrStr); + } + + if (!ackAddrStr.isEmpty()) { + command.add("-A" + ackAddrStr); + } + + if (retryCount != 0) { + command.add("-R" + retryCount); + } + + for (int i = 0; i < enclosures.getCount(); i++) { + Enclosure enc = enclosures.get(i); + if (encList.isEmpty()) { + encList = enc.getEnclosureName(); + } else { + encList += "," + enc.getEnclosureName(); + } + } + + if (!encList.isEmpty()) { + command.add("-e" + encList); + } + + if (!timeoutTimeString.isEmpty()) { + command.add("-T" + timeoutTimeString); + } + + if (!validTimeString.isEmpty()) { + command.add("-v" + validTimeString); + } + + if (!bodyFile.isEmpty()) { + command.add("-b" + bodyFile); + } + + if (!productId.isEmpty()) { + command.add("-i" + productId); + } + + if (!subject.isEmpty()) { + command.add("-s" + subject); + } + + if (priority != MhsMessagePriority.Default) { + command.add("-p" + priority.value()); + } + + if (type != MhsMessageType.Routine) { + command.add("-t" + type.text()); + } + + if (verifyAddressees) { + command.add("-C"); + } + + if (showTrace) { + System.out.print("Executing command: "); + for (int i = 0; i < command.size(); i++) { + System.out.print(command.get(i) + " "); + } + System.out.println(); + } + + Process proc = null; + try { + ProcessBuilder procDesc = new ProcessBuilder(command); + procDesc.redirectErrorStream(true); + + proc = procDesc.start(); + InputStream stdout = proc.getInputStream(); + InputStreamReader isr = new InputStreamReader(stdout); + BufferedReader br = new BufferedReader(isr); + String outp; + + while ((outp = br.readLine()) != null) { + if (outp.length() > 0) { + // System.out.println(outp); + messageId = outp; + } + } + // System.out.println(line); + int exitVal = proc.waitFor(); + if (exitVal != 0) { + // System.out.println("Abnormal exit code " + exitVal); + // resultText = messageId; + throw new MhsSubmitException(messageId); + } + + if (showTrace) { + System.out.println("Message successfully submitted. Message ID: " + + messageId); + } + } catch (Throwable t) { + resultText = t.getMessage(); + // System.out.println("Exception thrown: " + resultText); + throw new MhsSubmitException(resultText); + } finally { + // DR #10955 + if (proc != null) { + proc.destroy(); + } + } + return messageId; } } diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/RemapGrid.java b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/RemapGrid.java index 620b41bf9a..eb7e0e1cf5 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/RemapGrid.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/RemapGrid.java @@ -63,8 +63,6 @@ import com.vividsolutions.jts.geom.Coordinate; * 5/16/08 875 bphillip Initial Creation. * 10/10/12 #1260 randerso Added getters for source and destination glocs * 02/19/13 #1637 randerso Fixed remapping of byte grids - * 08/27/13 #2287 randerso Removed 180 degree adjustment required by error - * in Maputil.rotation * * * @@ -600,7 +598,7 @@ public class RemapGrid { Coordinate llc = destinationGloc .latLonCenter(new Coordinate(x1, y1)); this.rotation.set(x1, y1, - (float) (-MapUtil.rotation(llc, sourceGloc))); + (float) (180 - MapUtil.rotation(llc, sourceGloc))); } } } diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.level/utility/common_static/base/level/alias/gempak.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.level/utility/common_static/base/level/alias/gempak.xml index 50cca22d39..3026665927 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.level/utility/common_static/base/level/alias/gempak.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.level/utility/common_static/base/level/alias/gempak.xml @@ -66,6 +66,7 @@ HCLY HTSLW FRZH + HTFL HGHT HTSLW HYBL diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/util/RadarRecordUtil.java b/edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/util/RadarRecordUtil.java index a7e4a3138c..0ca1b6e03c 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/util/RadarRecordUtil.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/util/RadarRecordUtil.java @@ -59,7 +59,7 @@ import com.vividsolutions.jts.geom.Coordinate; * Mar 19, 2013 1804 bsteffen Reduce useless data stored in radar hdf5 * Mar 19, 2013 1804 bsteffen Remove empty data structures from radar * hdf5. - * Sep 03, 2013 DR 13083 gzhang Add DHR Bias support for ADAD(38)/(46). + * * * * @author mnash @@ -507,7 +507,7 @@ public class RadarRecordUtil { map.put(DHRValues.ZRMULTCOEFF, parseDHRValue(v[vi + 9])); map.put(DHRValues.ZRPOWERCOEFF, parseDHRValue(v[vi + 10])); map.put(DHRValues.MAXPRECIPRATEALLOW, parseDHRValue(v[vi + 25])); - map.put(DHRValues.BIASAPPLIEDFLAG, parseDHRValue(v[vi + 37])); biasApplied = map.get(DHRValues.BIASAPPLIEDFLAG) > 0;// DR 13083 + map.put(DHRValues.BIASAPPLIEDFLAG, parseDHRValue(v[vi + 37])); s = v[46]; if (s.equals("SUPL(15)")) { biasCalculated = parseDHRValue(v[71]); @@ -524,10 +524,10 @@ public class RadarRecordUtil { map.put(DHRValues.MAXPRECIPRATEALLOW, parseDHRValue(v[vi + 25])); s = v[68]; if (s.equals("BIAS(11)")) { - map.put(DHRValues.BIASAPPLIEDFLAG, parseDHRValue(v[53])); biasApplied = map.get(DHRValues.BIASAPPLIEDFLAG) > 0;// DR 13083 + map.put(DHRValues.BIASAPPLIEDFLAG, parseDHRValue(v[53])); biasCalculated = parseDHRValue(v[77]); } else if (s.equals("BIAS( 9)")) { - map.put(DHRValues.BIASAPPLIEDFLAG, parseDHRValue(v[53])); biasApplied = map.get(DHRValues.BIASAPPLIEDFLAG) > 0;// DR 13083 + map.put(DHRValues.BIASAPPLIEDFLAG, parseDHRValue(v[53])); biasCalculated = parseDHRValue(v[73]); } vi = nv; @@ -537,7 +537,7 @@ public class RadarRecordUtil { map.put(DHRValues.FLAGZEROHYBRID, (double) flagZeroHybrid); if (!biasApplied) { biasCalculated = 1.0; - } else { if(biasCalculated < 0.01 || biasCalculated > 100.0) biasCalculated = 1.0; } // DR 13083 + } map.put(DHRValues.BIAS, biasCalculated); // Also include logic from A1 FFMPContainer::read(), FFMP_ORPG case diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/EmergencyType.java b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/EmergencyType.java deleted file mode 100644 index bcb1ff1d76..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/EmergencyType.java +++ /dev/null @@ -1,91 +0,0 @@ -/** - * 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.warning; - -/** - * Helps manage and identify emergency products. - * - *
- * 
- * SOFTWARE HISTORY
- * 
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Sep  4, 2013  2176      jsanchez     Initial creation
- * 
- * 
- * - * @author jsanchez - * @version 1.0 - */ - -public class EmergencyType { - - public static final String EMER = "EMER"; - - private static final EmergencyType TORNADO = new EmergencyType( - "TORNADO EMERGENCY", "TO.W"); - - private static final EmergencyType FLASH_FLOOD = new EmergencyType( - "FLASH FLOOD EMERGENCY", "FF.W"); - - private final String value; - - private final String phensig; - - private final static EmergencyType[] values = new EmergencyType[] { - TORNADO, FLASH_FLOOD }; - - private EmergencyType(String type, String phensig) { - this.value = type; - this.phensig = phensig; - } - - public static EmergencyType valueOf(String phensig) { - EmergencyType type = null; - for (EmergencyType t : values) { - if (t.phensig.equals(phensig)) { - type = t; - break; - } - } - return type; - } - - /** - * Checks to see if the text product is an emergency product. - * - * @param rawmessage - * @return - */ - public static boolean isEmergency(String rawmessage) { - for (EmergencyType type : values) { - if (rawmessage != null && rawmessage.contains(type.getValue())) { - return true; - } - } - return false; - } - - public String getValue() { - return value; - } - -} diff --git a/edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/MapUtil.java b/edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/MapUtil.java index 167a7bcfa5..f16cd33f5f 100644 --- a/edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/MapUtil.java +++ b/edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/MapUtil.java @@ -94,8 +94,6 @@ import com.vividsolutions.jts.geom.Polygon; * 06/19/2012 14988 D. Friedman Make oversampling more like AWIPS 1 * 09/18/2012 #1091 randerso corrected getBoundingEnvelope * 11/06/2012 15406 ryu Added convertToNativeEnvelope() - * 08/27/2013 #2287 randerso Fixed rotation methods so it is not necessary - * to subtract 180 from the returned value * * * @@ -1064,13 +1062,12 @@ public class MapUtil { * the right of UP is north (or 360) degrees. * * @param latLon - * @param spatialObject * @return rotation angle */ public static double rotation(Coordinate latLon, ISpatialObject spatialObject) { - double newLatLonY = latLon.y - 0.05; + double newLatLonY = latLon.y + 0.05; if (newLatLonY > 90) { newLatLonY -= 180; } @@ -1101,12 +1098,11 @@ public class MapUtil { * the right of UP is north (or 360) degrees. * * @param latLon - * @param geometry * @return rotation angle */ public static double rotation(Coordinate latLon, GridGeometry2D geometry) { - double newLatLonY = latLon.y - 0.05; + double newLatLonY = latLon.y + 0.05; if (newLatLonY > 90) { newLatLonY -= 180; } diff --git a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/scan/ScanUtils.java b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/scan/ScanUtils.java index a99224937c..49fc2d0149 100644 --- a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/scan/ScanUtils.java +++ b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/scan/ScanUtils.java @@ -76,7 +76,7 @@ import com.vividsolutions.jts.io.WKTWriter; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * 02/11/2009 1981 dhladky Initial Creation. - * 09/03/2013 DR 13083 gzhang Added getZRvalue2() to fix an error. + * * * * @author dhladky @@ -1927,34 +1927,4 @@ public class ScanUtils { return returns; } - - /** - * DR 13083: the first parameter zValue will use a radar bin's raw data - * since old version handles value 66 wrong in getDecodedDHRValue(int). - * - * Usage: to be called in FFMPProcessor.processRADAR(ArrayList): - - 1). comment out fval line; - 2). call ScanUtils.getZRvalue2; - 3). use dataVals[j] as the first parameter in the step 2 above. - */ - public static float getZRvalue2(double zValue, double coefficent, - double hailCap, double power, double bias) { - // The Fulton et al 1998 standard NWS Z-R relationship - double rValue = 0.0f; - if (zValue >= 2) { - zValue = MIN_DHR_DBZ + ((zValue - 2) * DHR_DBZ_STEP); - double rlogMult = Math.log10(coefficent); - rValue = bias*(Math.pow(10.0, ((zValue-10.0*rlogMult)/(10.0*power)))); - - // hail cap check - if (rValue > hailCap) { - return (float) (MM_TO_INCH * hailCap); - } - } else { - return (float) rValue; - } - - return (float) (MM_TO_INCH * rValue); - } } diff --git a/edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults b/edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults index 9904db1bca..d3908a8b55 100644 --- a/edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults +++ b/edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults @@ -1,1876 +1,1871 @@ -# -# Official National .Apps_defaults file for AWIPS Release OB8.3 -# Also see .Apps_defaults_site for override settings -# Revision History: -# 11/06/2001 - adjusted many directory locations of precip_proc tokens. -# notable changes: st3_mkimage, rfcwide_input_dir -# added pproc_local, pproc_local_data, pproc_log -# grouped tokens together for 3 subsystems - shefdecode, whfs, -# precip_proc. -# placed precip_proc section after ofs since there are some -# dependencies -# changed value of whfs_editor -# added hydro_publicbin token -# added pproc_util_log_dir -# 07/01/2002 - added ens_input, ens_output, ens_files -# 07/22/2002 - add global gaff execution token -# 11/04/2002 - added disagg tokens -# 08/29/2003 - added sqlcmd_bin_dir -# 08/20/2003 - added ligtning_input_dir, lightning_log_dir -# 10/03/2003 - added tokens gage_qc, sccqc_threshold, mpe_scc_boxes_failed, -# mpe_msc_precip_limit -# 10/10/2003 - changed token names to mpe_gage_qc, mpe_sccqc_threshold -# - changed mpe_gage_qc token value to ON -# 02/04/2004 - Added new tokens for ens_pre netCDF enhancement --kwz -# 2/4/2004 - added mpe_locbias_1hr_rerun token -# 02/11/2004 - Added hv_map_projection. -# 02/19/2004 - Removed stage2 and stage3 related tokens. -# 03/10/2004 - Added mpe_mlmosaic_calc and rfcwide_mlmosaic_dir tokens. -# 03/16/2004 - Added rfcwide_lsatpre_dir, rfcwide_satstate_var_dir, -# mpe_lsatpre_calc. -# 03/19/2004 - Added mpe_del_gage_zeros. -# 03/22/2004 - added sshp tokens -# 03/24/2004 - Added rpf_min_dur_filled -# 03/31/2004 - Added SSHP tokens -# 04/26/2004 - added sshp_invoke_map_preprocess and -# sshp_java_process_host tokens for the -# mpe_fieldgen scripts -# 05/06/2004 - Added more RFC archive database (adb) tokens -# 06/28/2004 - Added preadj_outts_dir -# 07/31/2004 - Added gage_pp_userid, gage_pp_host, gage_pp_data, gage_pp_log -# and gage_pp_sleep. -# 08/10/2004 - ssh- Added gage_pp_userid, gage_pp_host, gage_pp_data, -# gage_pp_log, gage_pp_sleep, gage_pp_enable, shef_post_precip -# 08/12/2004 - Added timeseries_begintime, timeseries_endtime, timeseries_mode -# timeseries_showcat, timeseries_linewidth, dam_icon_color -# 10/14/2004 - Added the mpe_generate_list token. BAL -# 10/14/2004 - Removed the tokens: mpe_mlmosaic_calc, mpe_lsatpre_calc -# 11/05/2004 - Corrected spelling of timeseries_endime. RAE -# 11/23/2004 - Added the mpe_show_missing_gage token. -# 01/07/2005 - Added the sum_pc_reports token. This controls how PC-based -# precipitation totals are derived. -# 01/10/2005 - Added the sum_pc_reports token. -# 01/28/2005 - Added AWIPS MODIFICATION BLOCK. When gmake is run in the -# development tree location of .Apps_defaults, a copy of it -# will be placed in /awips/hydroapps with the lines modified -# in the AWIPS modification block to work in the /awips/hydroapps -# tree. -# 01/28/2005 - Modified the definitions of adb_shef_pro_err_dir and -# adb_shef_pro_logs_dir. -# Added the pghost, and pguser, pgport tokens for PostGres. -# 04/21/2005 - Changed shefdecode_host and gage_pp_host to dx. -# 04/28/2005 - Added hv_min_dur_filled token. Added ppp_ppd_local_7am_window -# token. -# 5/5/2005 - Added SSHP tokens sshp_initial_forecast_length, sshp_max_forecast_length, -# sshp_sac_update_expiration_hours, sshp_sac_update_hours_forward. -# Moved sshp_fcst_ts to be next to the rest of the SSHP tokens. -# 5/11/2005 - Changed pguser token value to pguser. -# 6/9/2005 - Changed value of grib_rls (location of gribit executable) -# - Added new tokens mpe_d2d_display_grib, d2d_input_dir, mpe_send_grib -# 6/15/2005 - Changed value for d2d_input_dir token -# 9/13/2005 - Replaced the edit_poly token with the rfcwide_drawpre_dir -# token. This directory will contain the precip edit polygons -# drawn in Hydroview/MPE and applied in MPE Fieldgen. -# 9/22/2005 - Added the rfcwide_gageloc_dir and rfcwide_beamheight_dir tokens. -# 9/27/2005 - Added the hdb_db_name token. Contains the name of the database -# used by the historical data browser. -#10/6/2005 - Modified the value of the rfcwide_utiltriangles_dir token to -# be under local/data/app/mpe instead of local/data/mpe. -#10/6/2005 - Added the mpe_base_radar_mosaic token. -#02/7/2006 - Added the mpe_split_screen token. -#02/8/2006 - Added tokens for the PDC Preprocessor -#02/9/2006 - Added mpe_polygon_action_order and mpe_polygon_field_order -# tokens. -#03/2/2006 - Added new tokens for DailyQC. Added renamed MPE tokens. -#04/19/2006 - Added new tokens for controling the orientation/appearance -# of the historical data browser and the locations of the help -# and configuration directory. -#05/30/2006 - Modified the token values for datview_plot_font and anav_data. -# Added the following tokens for archive database programs: -# adb_shef_pro_tmp_dir, adb_shef_raw_tmp_dir, -# adb_shef_raw_add_adjust, rax_pghost, adb_name -#05/30/2006 - Added the mpe_send_qpe_to_sbn token. -#06/06/2006 - Added the grib_set_subcenter_0 token. -#07/07/2006 - Added the ifp_griddb_dir token. -#09/05/2006 - Added the dhm_d2d_data_dir and dhm_d2d_notify_dir tokens. -#10/02/2006 - Added the sshp_map_qpe_to_use token. -#11/02/2006 - Added the mpe_qpe_grib_sbn_dir token. -#11/17/2006 - Added the mpe_qpe_sbn_dir token. -#05/08/2007 - Added tokens for the rfc bias transfer project. -#05/09/2007 - Added 3 tokens for SRG field directories -#05/14/2007 - Added token for rdhm input directory -#O5/23/2007 - Added sshp_show_simulated_timeseries, changed sshp_background_fcst_length to -# sshp_background_forecast_length -#05/23/2007 - Add tokens for RiverPro: rpf_endtime_shifthrs, -# show_vtecqc_window, event_expire_withinhr -#06/18/2007 - Added the send_local_bias_when_rfc_bias_missing token. -# Biasmesgen reads this token to determine whether or not -# to send the locally generated MPE bias to the RPG if -# the RFC bias is not available. -#06/28/2007 - Added DailyQC preprocessor token dqc_preprocessor_basetime -#07/17/2007 - Added rgb_file_path token. Used by new Color Manager in Hydroview -# and MPE Editor. -#10/24/2007 - Added dhm_rain_plus_melt_data_dir token -#11/08/2007 - Added tokens for IHFS->RAX Synchronization: adb_sync_logs_dir, -# adb_sync_mode, adb_sync_tablenames, adb_sync_ihfs_ingest, adb_sync_rivercrit -#1/16/2008 - added new tokens for disagg processing -# mpe_disagg_execute, mpe_disagg_method, mpe_disagg_6hreq_0,mpe_disagg_6hrgt_0 -#3/22/2008 - Added variable substitution for database port. -# -#3/5/2008 - Modified the value of the mpe_mmosaic_dir token. There was a typo in the -# product name. It was mrmosaic. It is now mmosaic. -#05/19/2008 - Added sshp_hpn_minutes_before and sshp_hpn_minutes_after tokens. -# These tokens define the time window for the SSHP HPN Prerocessor. -#07/07/08 - Added sshp_show_unadjusted_states // for sshp -# -#10/01/09 - Added 5 tokens for arcnav application. //only for arcnav for raxum application -#10/03/12 - Added token section for script execution - - -# ============================================================================== -# To see syntax rules for this file, see the bottom of this file -# -# Also see .Apps_defaults_site for overriding settings -# - -#$============================================================================= -#$ This section contains the tokens whose values are different between the -#$ development and the delivery tree. The value give is the development -#$ value. The commented value is the delivery value. The uncommented value -#$ is in the development tree. All of these tokens must be enclosed -#$ by the AWIPS_MODIFICATION_BLOCK_BEGIN and AWIPS_MODIFICATION_BLOCK_END -#$ tags. Token names and commented lines should at column 1. - -#AWIPS_MODIFICATION_BLOCK_BEGIN - -apps_dir : $(SHARE_DIR)/hydroapps # Hydrologic applications directory - -data_archive_root : /data_store # root directory of the data archive - -mcp3_icp_iface : $(HOME)/mcp3_ntrfc -#mcp3_icp_iface : /tmp/$(LOGNAME)/mcp3_ntrfc - -verify_dir : $(apps_dir)/rfc/verify #base verify directory -#verify_dir : /rfc_arc/verify #base verify directory - -vsys_dir : $(apps_dir)/rfc/verify #base verify directory -#vsys_dir : $(verify_dir) #base verify directory - -#AWIPS_MODIFICATION_BLOCK_END - -#===================== Apps/Script Execution Tokens ================================= -WhfsSrv : ON -WhfsSrv.purge_files : ON -WhfsSrv.run_db_purge : ON -WhfsSrv.run_floodseq : ON -PprocSrv : ON -PprocSrv.purge_mpe_files : ON -PprocSrv.purge_hpe_file : ON -MpeFieldGenSrv.run_mpe_fieldgen : ON -WhfsSrv.run_pdc_pp : ON -WhfsSrv.run_alarm_whfs : ON -WhfsSrv.run_alarm_whfs.run_roc_checker : ON -WhfsSrv.run_alarm_whfs.run_report_alarm : ON -WhfsSrv.run_alarm_whfs.run_report_alarm.textdb : ON -ArealQpeGenSrv : ON -DqcPreProcSrv : ON -DqcPreProcSrv.run_dqc_preprocessor : ON -MpeRUCFreezingLevel : ON -MpeLightningSrv : ON -#==================================================================================== - -# ============================================================================== - -# Executable directory tokens. -sys_java_dir : /awips2/java # Location of Java COTS software -hydro_publicbin : $(apps_dir)/public/bin -sqlcmd_bin_dir : /usr/local/sqlcmd/bin # location of sqlcmd executable on both HP and - # Linux beginning in OB3 - -################################################################################# -# Default Display Maps - comma separated list of maps with no spaces -# Map names can be found in the localization perspective under -# CAVE->Bundles->Maps. Use the filename without the extension. -# statesCounties.xml -> statesCounties -# -# display_maps - default display maps for Hydro Perspective -# mpe_display_maps - default display maps for MPE Perspective -display_maps : statesCounties -mpe_display_maps : statesCounties -################################################################################# - -# database selection tokens -server_name : ONLINE # Informix database server name -db_name : hd_ob92lwx # IHFS database name -damcat_db_name : dc_ob5xxx # Dam Catalog database name -hdb_db_name : ob81_histdata # Historical database. -pghost : localhost # The machine PostGres is running on -pguser : awips # The user allowed to access PostGres -pgport : 5432 # The PostGres Server port -adb_name : adb_ob7xxx # RFC archive database name -rax_pghost : ax # The machine PostGres is running on for the adb - -# vacuum log dir token. -vacuum_log_dir : $(whfs_log_dir)/vacuum - -# WHFS specific tokens -whfs_tz : EST5EDT # WHFS time zone for local time -whfs_primary_radar : TLX # WHFS primary radar id, for Stage II - -# damcat tokens -damcat_hostoffice_type : wfo # source of run-from office -damcat_office_datasource : ohd # which data source is used -max_storage_value : 0.00 # max storage volume filter -damcat_data : /tmp/damcatData - -# Damcrest tokens -damcrest.db_enabled : true # set to true when the user has damcat database -damcrest.hasListAllDams : true # when set to true, all dams will be displayed initially - -# Path to the editor used by Damcrest -damcrest.editor : /usr/bin/gvim - -# Path to the damcrest data directory where input and output files -# of the model are stored -damcrest_data_dir : $(whfs_local_data_dir)/damcrest - -# Path to the directory where .vimrc resource file resides. -# This resource file is needed when editor in Damcrest application -# is set to gvim. -damcrest_res_dir : $(whfs_config_dir)/damcrest - -#===================== SHEFDECODE Application Tokens ================================ - -shefdecode_userid : oper # controlling UNIX user -shefdecode_host : dx1f # controlling UNIX system. -shefdecode_dir : $(apps_dir)/shefdecode # main directory location -shefdecode_bin : $(shefdecode_dir)/bin # executable programs location -shefdecode_input : $(shefdecode_dir)/input # SHEF parameter file location -shef_data_dir : /data/fxa/ispan/hydro # input products location - -shefdecode_log : $(shefdecode_dir)/logs/decoder # daily log files location -shef_error_dir : $(shefdecode_dir)/logs/product # product log files location -shef_keeperror : ALWAYS # keep product log files (=ALWAYS) or - # only when errors occur (=IF_ERROR) -shef_perflog : ON # ON/OFF - create a separate performance log file to - # save internal decoder timing messages for - # monitoring performance -shef_data_log : ON # ON/OFF - include messages in the log file detailing - the SHEF records -dupmess : ON # ON/OFF - include messages in the log file about - # duplicate data -elgmess : ON # ON/OFF - include messages in the log file about - # data types not found in IngestFilter or - # data types turned off in IngestFilter -locmess : ON # ON/OFF - include messages in the log file about - # stations and areas not found in Location - # or GeoArea - -shef_sleep : 10 # sleep duration in seconds in between queries -shef_winpast : 10 # number of days in past to post data -shef_winfuture : 30 # number of minutes in future to post obs data -shef_duplicate : IF_DIFFERENT # flag for handling duplicate date - # ALWAYS_OVERWRITE-always overwrite when value repeats - # USE_REVCODE-if revcode set overwrite duplicate value - # IF_DIFFERENT-overwrite if new value is different - # IF_DIFFERENT_OR_REVCODE-overwrite if new value is - # different or revcode is set -shef_load_ingest : ON # ON/OFF - automatically load the IngestFilter table or not - # with (station id-PEDTSE) combinations as they - # arrive in the input data flow -shef_storetext : OFF # ON/OFF - post/don't post raw encoded SHEF text messages - # to the TextProduct table -shef_post_unk : NONE # NONE - do not post to the UnkStn nor UnkStnValue tables - # IDS_ONLY - post only location identifiers for unknown - # stations to the UnkStn table - # IDS_AND_DATA - post all data from unknown stations to - # the UnkStnValue table -shef_post_baddata : REJECT # PE/REJECT - post data that have failed the gross range - # check to the physical element data tables (=PE) OR - # to the RejectedData table (=REJECT) -shef_procobs : OFF # ON/OFF - post Processed data values (i.e., TS=P*) to - # the observation data tables (=ON) or to - # the ProcValue table (=OFF) -shef_post_latest : ON # ON/OFF - post/don't post data to the LatestObsValue table - # VALID_ONLY - post data to the LatestObsValue table - # ONLY if the gross range check is passed -shef_post_link : ON # ON/OFF - post/don't post data to the ProductLink table -shef_load_maxfcst : ON # ON/OFF - after each product that resulted in forecast - # height or discharge data being posted, load - # the maximum forecast data into the RiverStatus table -shef_alertalarm : ON # ON/OFF - causes shefdecoder to screen data against - # alert and alarm thresholds -# -- Intermediate output from ShefParser prior to post -shef_out : OFF - - -#===================== WHFS Applications Tokens ================================ - -whfs_base_dir : $(apps_dir)/whfs # top of the WHFS tree -whfs_local_dir : $(whfs_base_dir)/local # top of WHFS local tree -whfs_local_data_dir : $(whfs_local_dir)/data # top of WHFS local data tree -whfs_local_grid_dir : $(whfs_local_data_dir)/grid # top of WHFS grids tree -whfs_log_dir : $(whfs_local_data_dir)/log # top of WHFS logs tree - -whfs_local_bin_dir : $(whfs_local_dir)/bin # local WHFS executables - -whfs_geodata_dir : $(whfs_local_data_dir)/geo # WHFS map backgrounds -whfs_image_dir : $(whfs_local_data_dir)/image # user-saved image files -whfs_import_dir : $(whfs_local_data_dir)/import # files to import into WHFS -whfs_product_dir : $(whfs_local_data_dir)/product # WHFS generated external products -whfs_report_dir : $(whfs_local_data_dir)/report # user-saved text reports -whfs_lines_per_page : 60 - -whfs_config_dir : $(whfs_local_data_dir)/app # WHFS app configuration files -rpf_template_dir : $(RPF_TEMPLATE_DIR) # RiverPro templates -metar_config_dir : $(whfs_config_dir)/metar2shef # METAR translator config -metar2shef_options : " -a -b -p1 -y2k -salias -p6 -p24 -round -w -strip " -ts_config_dir : $(whfs_config_dir)/timeseries # Time Series config -hv_config_dir : $(whfs_config_dir)/hydroview # Hydroview pixmaps etc. -hv_help_dir : $(hv_config_dir)/help/ # Hydroview Help direc. -rivermon_config_dir : $(whfs_config_dir)/rivermon/ # RiverMonitor Conf dir. - -whfs_misc_grid_dir : $(whfs_local_grid_dir)/misc # misc WHFS grids - -rgb_file_path : /usr/share/X11/rgb.txt # Location of X/Motif color file. - -rpf_log_dir : $(RPF_LOG_DIR) # RiverPro logs -rivermon_log_dir : $(whfs_log_dir)/rivermon # RiverMonitor logs -obsfcstmonitor_log_dir : $(whfs_log_dir)/obsfcst_monitor # ObsFcstMonitor logs -whfs_util_log_dir : $(whfs_log_dir)/misc # WHFS misc logs -precip_accum_log_dir : $(whfs_log_dir)/precip_accum # precip_accum logs -floodseq_log_dir : $(whfs_log_dir)/floodseq # flood sequencer logs -metar_log_dir : $(whfs_log_dir)/metar2shef # METAR translator logs -hb_gagrad_log_dir : $(whfs_log_dir)/create_gagradloc # gage-radar locator logs -qcalarm_log_dir : $(whfs_log_dir)/qcalarm # batch QC logs - -db_purge_log_dir : $(whfs_log_dir)/db_purge # db_purge token -db_purge_backup_retention_use : ON # db_purge token for using backup retention value - -purge_files_log_dir : $(whfs_log_dir)/misc # purge_files token - -whfs_bin_dir : $(whfs_base_dir)/bin # WHFS executables -sws_parent_dir : $(whfs_bin_dir) # SWS parent dir -sws_home_dir : $(whfs_bin_dir)/pa # SWS dir - -# ----------------------------------------------------------------- -# The Gage Precip Processor tokens -# ----------------------------------------------------------------- - -gage_pp_userid : oper # controlling UNIX user -gage_pp_host : dx # controlling UNIX system -gage_pp_data : $(pproc_local_data)/gpp_input # input data files location -gage_pp_log : $(pproc_log)/gage_pp # daily log files location -gage_pp_sleep : 10 # sleep duration in seconds in between queries -gage_pp_enable : ON # gpp enabled; shef uses to determine post -shef_post_precip : OFF # post to Precip/CurPrecip tables -build_hourly_enable : ON # Enable the build_hourly application - -# ---------------------------------------------------------------- -# The following tokens are most likely to be customized by the user -# (the first 4 MUST be customized at each site in the .Apps_defaults_site file) -# ---------------------------------------------------------------- -hv_center_lat : 35.0 # HydroView center latitude -hv_center_lon : -97.8 # HydroView center longitude -hv_height_in_pixels : 900 # Hydroview map height in pixels -hv_width_in_pixels : 1200 # Hydroview map width in pixels -hv_map_width : 320 # HydroView map width (nautical miles) -hv_pointdata_display : ON # Hydroview point data display flag (ON, OFF) -hv_hours_in_window : 4 # Change window hours -hv_zoom_out_limit : 20 # Limits how far the map can be zoomed out -hv_disclosure_limit : 60 # Prog disclosure limit -hv_zoom_threshold : 150 # nautical miles; Hydroview - # detail level for cities/towns -hv_map_projection : FLAT # Sets default map projection used in - # hydroview/MPE. Options are FLAT, POLAR - # or HRAP. -hv_refresh_minutes : 15 # HydroView auto refresh time (minutes) -hv_riverbasis : maxobsfcst # initial river basis for river characteristics -hv_min_dur_filled : 0.0 # Minimum percentage of accum interval covered - # by precip data. -ppp_ppd_local_7am_window : 3 # Number of +/- hours around 7 AM local to - # to use PPP and PPD reports for 24 hour - # precip summaries. - # values either obs, fcst, maxobsfcst -shefencode_prodid : CCCCNNNXXX # product identifier for outgoing SHEF - # encoded messages from Hydro Time Series -whfs_editor : whfs_editor # WHFS text editor -rpf_linewidth : 80 # width of line in RiverPro generated products -rpf_min_dur_filled : 0.25 # min percent time of requested precip dur in RiverPro -office_prefix : K # fourth char prepended to 3-char office id -vtec_record_stageoffset : 2.0 # ft offset from record value for H-VTEC field -vtec_record_flowoffset : 5000.0 # cfs offset from record value for H-VTEC field -pproc_s2_gridgen_hrs : 5 # WHFS Stage II lookback (hours) -whfs_min_dur_filled : 0.83 # WHFS min fractional time duration needed for radar accumulations -whfs_min_area_covered : 0.80 # WHFS min fractional area needed to compute MAPs -whfs_printcommand_HP : lp # command used to print WHFS apps reports on HP -whfs_printcommand_LX : lp # command used to print WHFS apps reports - # on LX -whfs_e19_print_command : "lp -o cpi=19 -o lpi=7" # command used to print e19 text reports - -dam_icon_color : BROWN # Color used for dam icon in Hydroview -timeseries_begintime : 5 # number of days back relative to current time -timeseries_endtime : 3 # number of days ahead relative to current time -timeseries_showcat : 2 # scale by data and show categories -timeseries_linewidth : 1 # width of line drawn on graph -timeseries_mode : STATION # set to GROUP or STATION mode -timeseries_dist_shef : OFF # ON/OFF token for the shef send script distribute check box - # Defaults to off if not set -rpf_stage_window : 0.5 # set stage window for determining the trend - # variables in RiverPro -show_vtecqc_window : IF_ERROR #or ALWAYS, used in RiverPro -rpf_endtime_shifthrs : 6 # in RiverPro -event_expire_withinhr : 3 # in RiverPro - -#=====Tokens To Generate Areal FFG from Mosaicked FFG Grids for Use By SSHP===== -# (NOTE: gaff_rfc_list MUST be customized at EVERY Field Office) - -gaff_execution : ON # ON/OFF token for the gen_areal_ffg process - # the gen_areal_ffg process is run from the - # process_dpa_files script at WFOs -gaff_rfc_list : ABRFC,LMRFC # list of RFCs to be mosaicked - # list is comma separated, no embedded - # spaces are allowed -gaff_input_dir : $(EDEX_HOME)/data/processing - # directory containing gridded FFG - # generated by RFCs -gaff_look_back_limit : 60 # number of hours to look back for valid gridded - # FFG data for input -gaff_mosaic_dir : $(whfs_misc_grid_dir) # directory containing output - # mosaicked gridded FFG in - # netCDF format -gaff_durations : 1,3,6 # FFG durations in hours - # list is comma separated, no embedded - # spaces are allowed - - -# ================= "ds_" system tokens (see more in site file) =============== - -ofs_dir : $(apps_dir)/rfc/nwsrfs/ofs -util_dir : $(apps_dir)/rfc/nwsrfs/util -calb_dir : $(apps_dir)/rfc/nwsrfs/calb -ifp_dir : $(apps_dir)/rfc/nwsrfs/ifp -icp_dir : $(apps_dir)/rfc/nwsrfs/icp -ens_dir : $(apps_dir)/rfc/nwsrfs/ens -fld_dir : $(apps_dir)/rfc/fld - - -hdb_dir : $(apps_dir)/rfc/hdb - -# = = = = = = = = = = = = = = = = = = = = = = end "ds_" system requirements = = - -ofs_rls : $(ofs_dir)/bin/RELEASE -util_rls : $(util_dir)/bin/RELEASE -calb_rls : $(calb_dir)/bin/RELEASE -ffg_rls : $(ffg_dir)/bin/RELEASE -ifp_rls : $(ifp_dir)/bin/RELEASE -icp_rls : $(icp_dir)/bin/RELEASE -ens_rls : $(ens_dir)/bin/RELEASE -hdb_rls : $(hdb_dir)/bin/RELEASE -fld_rls : $(fld_dir)/bin/RELEASE -xsets_rls : $(xsets_dir)/bin/RELEASE -xnav_rls : $(xnav_dir)/bin/RELEASE -xdat_rls : $(xdat_dir)/bin/RELEASE - -ofs_arc : $(ofs_dir)/bin/ARCHIVE -util_arc : $(util_dir)/bin/ARCHIVE -calb_arc : $(calb_dir)/bin/ARCHIVE -ffg_arc : $(ffg_dir)/bin/ARCHIVE -ifp_arc : $(ifp_dir)/bin/ARCHIVE -icp_arc : $(icp_dir)/bin/ARCHIVE -ens_arc : $(ens_dir)/bin/ARCHIVE -hdb_arc : $(hdb_dir)/bin/ARCHIVE -fld_arc : $(fld_dir)/bin/ARCHIVE -xsets_arc : $(xsets_dir)/bin/ARCHIVE -xnav_arc : $(xnav_dir)/bin/ARCHIVE -xdat_arc : $(xdat_dir)/bin/ARCHIVE -# = = = = = = = = = = = = = = = = = = = = = = end of other "ds_" tokens = = = = - -# LDAD shefencode tokens -ldad_data_dir : /awips/ldad/data # the LDAD internal data dir -shefenc_pe_table : $(ldad_data_dir)/ShefEncoder_PE.tbl -shefenc_units_table : $(ldad_data_dir)/ShefEncoder_Units.tbl - -# NWSRFS tokens - -rfs_dir : $(apps_dir)/rfc/nwsrfs # Top-level rfs mt. -rfs_sys_dir : $(rfs_dir)/sys_files # RFS system files -rfs_doc : $(rfs_dir)/doc # NWSRFS documentation - -# OFS tokens -locks_dir : $(rfs_dir)/locks -ofs_lock_max_wait : 60 # no. of mins to wait to get an ofs lock -ofs_lock_wait_interval : 5 # no. of secs 'tween retries to get an ofs lock -ofs_locks_max_pass : 4 # no. of attempts to make to get a set of locks. - -ofs_level : oper -ofs_reor_lvl : oper_new -ofs_inpt_grp : oper - -home_files_workstation : ds - -ofs_log_output : off # whether to output file r/w info -ofs_error_output : on # whether to output file error info -fortran_stderr : 7 # FORTRAN standard error unit - -ofs_bin : $(ofs_dir)/bin # OFS executables dir -ofs_files : $(ofs_dir)/files # OFS file group -ofs_fs5files : $(ofs_files)/$(ofs_level)/fs5files # OFS files dir -ofs_reorder_dir : $(ofs_files)/$(ofs_reor_lvl)/fs5files # OFS reordered files -ofs_output : $(ofs_dir)/output # OFS output dir -ofs_input : $(ofs_dir)/input/$(ofs_inpt_grp) # OFS input dir -ofs_input_dflt : $(ofs_dir)/input/$(ofs_inpt_grp) # OFS input dir -ofs_shefdata_dir: $(ofs_files)/$(ofs_level)/shefdata # OFS SHEF data dir -ofs_shefout_dir : $(ofs_files)/$(ofs_level)/shefdata # OFS shefout file dir -ofs_mods_dir : $(ofs_files)/$(ofs_level)/mods # OFS MODS files dir -ofs_griddb_dir : $(ofs_files)/$(ofs_level)/griddb # OFS gridded fields -ofs_scripts : $(ofs_dir)/scripts # OFS scripts dir -ofs_server : apwk01g2 # OFS "slave" server -my_output : $(ofs_output)/$(LOGNAME) # users ofs output files - -ndfd2rfs_input : $(ofs_files)/$(ofs_level)/ndfd -ndfd2rfs_output : $(my_output) -ndfd2rfs_log_level : 0 - -fldview_dir : $(apps_dir)/rfc/fldview/floodmapdata - -# calb tokens -calb_bin : $(calb_dir)/bin -calb_lib : $(calb_dir)/lib - -calb_data_grp : oper -calb_inpt_grp : oper -calb_input : $(calb_dir)/input/$(calb_inpt_grp) -calb_output : $(calb_dir)/output -calb_sta_ts_dir : $(calb_dir)/data/sta_ts/$(calb_data_grp) -calb_area_ts_dir : $(calb_dir)/data/area_ts/$(calb_data_grp) -peakflow_data_dir : $(calb_dir)/data/area_ts/$(calb_data_grp) - -calb_gzio_read : off # whether or not to read gzipped DATACARD files -calb_gzio_write : off # whether or not to write gzipped DATACARD files - -nwsrfs_calbfile_default : CARD # default calibration file type -nwsrfs_platform : AIX # operating system - -# ICP tokens -icp_bin : $(icp_dir)/bin -icp_pw : hILLEL -icp_scripts : $(icp_dir)/scripts - -mcp_decks : $(calb_input)/mcp3 -mcp_dir : $(calb_rls) - -# IFP tokens -ifp_help_dir : $(ifp_dir)/help_files # IFP help files -ifp_bin_dir : $(ifp_dir)/bin/RELEASE # IFP bin files - ref in code -ifp_nwsrfs_bin_dir : $(ifp_dir)/bin/RELEASE # ifp_nwsrfs bin - ref in code -ifp_sys_dir : $(ifp_dir)/system # IFP system files -ifp_scripts_dir : $(ifp_dir)/scripts # IFP script files -ifp_options_dir : $(ifp_dir)/options # IFP options files -ifp_colors_dir : $(ifp_options_dir)/colors # IFP color files -ifp_fs5files : $(HOME)/ofs_ifp/fs5files # user copy of fs5files -ifp_rfc : host # name of RFC to run -ifp_num_columns : 3 # number of columns to display -ifp_gif_files : $(ofs_files)/$(ofs_level)/gif_files # gif files directory -ifp_sacco_dir : $(ofs_files)/$(ofs_level)/sacsnow_clim -ifp_dhm_data_dir : /data/dhm/$(LOGNAME) -ifp_griddb_dir : $(ifp_dhm_data_dir)/precip - -# Ensemble (ens) tokens - -espts_dir : $(ens_dir)/files/$(ofs_level)/espts #espts files esp -espadp_dir : $(ens_dir) -preadj_dir : $(ens_dir)/files/$(ofs_level)/cpc_fcsts -ens_input : $(ens_dir)/input/$(ofs_level) -ens_output : $(ens_dir)/output -ens_files : $(ens_dir)/files/$(ofs_level) -ens_scripts : $(ens_dir)/scripts - -# ens_pre tokens -##FXA_HOME : /px1data #taken out by kwz.2/11/04 -enspre_griddb : $(FXA_DATA)/Grid/SBN/netCDF/CONUS211/CPCoutlook -ens_log_dir : $(ens_output)/$(ofs_level) -ens_msglog_level : 5 -preadj_outts_dir : $(calb_area_ts_dir)/pre - -# FLDGRF tokens (added 6 April 2000) - -fldgrf_iface : $(HOME)/fldgrf - -# ofsde tokens - -ofsde_log_dir : $(ofs_output)/ofsde_logs # ofsde log dir - # (formerly ofsde_output_dir) -ofsde_ndate : 7 # number of days to search for forecast temps -ofsde_rrstime_check : OFF # flag to check obs times of RRS data - # against window around 12Z (OFF/ON) - -# intervals for max/min temperatures (used by ofsde) -# these represent number of hours around 12z - -intlrmn : 8 -inturmn : 2 -intlrzn : 2 -inturzn : 2 -intlrzx : 8 -inturzx : 2 -siipp_calc_624_PP : OFF # flag for calculating 6hr and 24hr - # PP data from PC data - # if running RFCWide, should be set to OFF - -# defaults for geographic data - -geo_data : $(apps_dir)/geo_data -geo_util : $(geo_data)/util - -geo_ifp_bin : $(geo_data)/$(ifp_rfc)/binary -geo_ifp_ascii : $(geo_data)/$(ifp_rfc)/ascii - -#===================== PRECIP_PROC Application Tokens ======================== - -# precip_proc directory - -pproc_dir : $(apps_dir)/precip_proc # precip proc top - # level dir -pproc_bin : $(pproc_dir)/bin # dir with precip proc exes -pproc_local : $(pproc_dir)/local # dir with local items, esp. data -pproc_local_data : $(pproc_local)/data # dir with local data -pproc_local_bin : $(pproc_local)/bin # dir with local bin -pproc_log : $(pproc_local_data)/log # dir with local logs - -pproc_util_log_dir : $(pproc_log)/misc # miscellaneous logs - -# DecodeDPA tokens (formerly DecodeHDP tokens that looked like hdp_*) - -dpa_log_dir : $(pproc_log)/decodedpa # DPA Decoder logs -dpa_prod_dir : /data/fxa/ispan/hdp # DPA input directory -dpa_gather : $(pproc_local_data)/dpa_gather # DPA gather directory -dpa_error_dir : $(pproc_local_data)/stage1_error # DPA error files -dpa_arch_dir : $(pproc_local_data)/stage1_archive # DPA archives -dpa_wind : 10 - - -dpa_filter_decode : ON # flag for non-top-of-hour - # filtering of decoded products - # ON - filter products for decode - # OFF - do not filter (ie decode all products) - -dpa_decode_window : 10 # number of minutes around top - # of hour for filtering products for - # decoding - -dpa_archive : OFF # ON/OFF flag for archiving products - # OFF - do not archive products - # ON - archive products and filter based - # on value of dpa_archive_window - -dpa_archive_window : 10 # number of minutes around top - # of hour for filtering products for archiving - -dpa_dirname1 : $(data_archive_root)/radar # first part of directory name - # containing DPA products for - # associated or dial in radars -dpa_dirname2 : DPA/layer0/res4/level256 # second part of directory name - # containing DPA products for - # associated or dial in radars -dpa_grid_dir : $(pproc_local_data)/stage1_decoded # decoded DPA radar grids - -# siipp tokens - -intpc : 10 # interval (minutes) around top of hour for using PC data -intlppp : 2 -intuppp : 2 -intppq : 2 -siipp_log_dir : $(pproc_log)/siipp # Stage II preprocessor logs - # (formerly siipp_output_dir) - -# tokens for stageiii -st3_help : $(pproc_local_data)/app/stage3/help # online help text - -st3_rfc : host -awips_rfc_id : TUA # 3 char AWIPS RFC identifier - # must be all upper case - -# tokens for stageiii output -st3_mapx_id : xmrg # identifier for Stage 3 output -st3_date_form : mdY # date format - # current allowable = Ymd or mdY - # similar to formatting codes for - # strftime function - -st3_output : $(ofs_griddb_dir) # dir for xmrg files for MAPX - # ofs_griddb_dir defined outside of pproc -st3_out_dir : $(pproc_local_data)/stage3 -post_output : $(st3_out_dir)/post_analysis - -# defaults for netCDF output - -st3_netcdf_loc : arkansas_red_basin_river_forecast_center_tulsa_ok - # underscores needed between words -st3_netcdf_swlat : 33.603 -st3_netcdf_swlon : 106.456 -st3_netcdf_selat : 32.433 -st3_netcdf_selon : 92.322 -st3_netcdf_nelat : 38.027 -st3_netcdf_nelon : 90.678 -st3_netcdf_nwlat : 39.420 -st3_netcdf_nwlon : 106.652 - -#defaults for auto stageiii -st3_auto_graphic_scale : 2.4 # used by gif file generation - -#===================== disagg Tokens (old disagg process)======================== - -disagg_msglog_level : 30 # message level - # possible values are 1,10,20,30,...80 - # lower values signify less info in log - -disagg_dur : 24 # maximum duration of precip gage data to - # be disaggregated - # possible values = 2,3,...,24 - -disagg_look_back : 0 # time (hours) to look back from current hour - # for precip gage data to be disaggregated - -disagg_radius : 3 # number of HRAP bins within which the QPE - # will be averaged for disagg - # for example, if disagg_radius = 3, then - # the 9 nearest neighbor QPE bin values - # will be averaged -disagg_set_date : 0 # identifier for current date (yyyymmdd). - # Default value is 0 - set to - # today date - -disagg_set_hour : 0 # identifier for current hour (hh). - # Default value is 0 - # Possible values = 0,1,2,3,...,23 - -disagg_log_dir : $(pproc_log)/disagg # directory containing disagg logs - -# =============== Multi-Sensor Precipitation Estimator (MPE) ================ - -rfcw_rfcname : host -rfcwide_logs_dir : $(pproc_log)/mpe_fieldgen -hmap_mpe_timelapse : 1000 # time between images, in milliseconds, for the MPE - # time lapse display - -### tokens for input ### - -rfcwide_input_dir : $(pproc_local_data)/app/mpe - -rfcwide_satpre_dir : $(mpe_fieldgen_product_dir)/satpre - -# the help_dir token needs a trailing slash because it is required byt -# the RFC software the processes the help info... - -rfcwide_help_dir : $(rfcwide_input_dir)/help/ -rfcwide_misbin_dir : $(rfcwide_input_dir)/misbin -rfcwide_prism_dir : $(rfcwide_input_dir)/prism -rfcwide_gageloc_dir : $(rfcwide_input_dir)/gage_locations -rfcwide_beamheight_dir : $(rfcwide_input_dir)/beam_height -rfcwide_utiltriangles_dir : $(rfcwide_input_dir)/utiltriangles - -### tokens for output ### -### NOTE: xmrg files are stored in dir defined by rfcwide_xmrg_dir token below - -rfcwide_output_dir : $(pproc_local_data)/mpe # fka ofs_griddb_dir defined outside of pproc - -rfcwide_gagetriangles_dir : $(rfcwide_output_dir)/gagetriangles -rfcwide_drawpre_dir : $(rfcwide_output_dir)/draw_precip - -rfcwide_avg_rmosaic_dir : $(rfcwide_output_dir)/avgrmosaic -rfcwide_max_rmosaic_dir : $(rfcwide_output_dir)/maxrmosaic -rfcwide_rmosaic_dir : $(rfcwide_output_dir)/rmosaic -rfcwide_bmosaic_dir : $(rfcwide_output_dir)/bmosaic -rfcwide_mmosaic_dir : $(rfcwide_output_dir)/mmosaic -rfcwide_mlmosaic_dir : $(rfcwide_output_dir)/mlmosaic -rfcwide_lmosaic_dir : $(rfcwide_output_dir)/lmosaic -rfcwide_lsatpre_dir : $(rfcwide_output_dir)/lsatpre -rfcwide_gageonly_dir : $(rfcwide_output_dir)/gageonly - -rfcwide_height_dir : $(rfcwide_output_dir)/height -rfcwide_index_dir : $(rfcwide_output_dir)/index -rfcwide_locbias_dir : $(rfcwide_output_dir)/locbias -rfcwide_locspan_dir : $(rfcwide_output_dir)/locspan -rfcwide_p3lmosaic_dir : $(rfcwide_output_dir)/p3lmosaic - -rfcwide_xmrg_dir : $(rfcwide_output_dir)/qpe -rfcwide_statevar_dir : $(rfcwide_output_dir)/state_var -rfcwide_sat_statevar_dir : $(rfcwide_output_dir)/sat_state_var -mpe_q2_statevar_dir : $(rfcwide_output_dir)/q2_state_var - -# ==================== MPE Tokens =============================== - -#daily qc options token defaults to 'off' where daily qc options are grayed out; values are 'on' and 'off' -mpe_dqc_options : off -mpe_map_background_color : GRAY20 # The default color of the MPE map background -mpe_temperature_window : 60 # The window in minutes the dqc preprocessor - # searches around a synoptic time - # (00z,06z,12z,18z) for temperature data. -mpe_maxminT_hour_window : 2 -mpe_dqc_max_precip_neighbors : 30 -mpe_dqc_max_temp_neighbors : 20 -mpe_dqc_precip_deviation : 3.0 -mpe_dqc_temperature_deviation : 10.0 -mpe_dqc_min_good_stations : 5 -mpe_copy_level2_dqc_to_ihfs_shef : OFF -mpe_copy_level2_dqc_to_archive_shef : OFF -mpe_dqc_num_days : 10 -mpe_dqc_warningpopup : on -mpe_dqc_6hr_24hr_set_bad : OFF # Define logic if user sets a 6hr value to Bad in the - # Edit Precip Stations window. - # OFF – if user sets 6hr value to Bad; 24hr value unaffected - # ON - if user sets 6hr value to Bad; 24hr value set to Bad - # Added at request of MBRFC to help with QC of SNOTEL. - -mpe_dqc_grid_max_dist : 70 # Max distance (units of grid bins) between a grid bin and a - # station to use the station to estimate the value at the grid bin. - -mpe_dqc_output_qc_file : OFF # ON/OFF default = OFF - -mpe_dqc_execute_internal_script : OFF # ON/OFF - -mpe_dqc_24hr_precip_grid_meth : USE_24HR # We use the token values of ACCUM_6HR and USE_24HR -mpe_td_new_algorithm : OFF # flag set for new algorithm in calculating Time Distributed estimate, the default - # is false -mpe_dqc_gridtype : SCALAR -mpe_dqc_projectiontype : POLAR_STEREOGRAPHIC -mpe_dqc_lonorigin : -105. - -#daily qc preprocessor tokens -dqc_preprocessor_basetime : 12Z #The value can be 12Z, 18Z, 00Z, or 06Z - -### MPE base directory tokens. -mpe_dir : $(pproc_local_data)/mpe -mpe_gageqc_dir : $(mpe_dir)/dailyQC -mpe_scratch_dir : $(mpe_gageqc_dir)/scratch -mpe_app_dir : $(pproc_local_data)/app/mpe -mpe_fieldgen_product_dir : $(mpe_dir) - -### MPE station list tokens -mpe_station_list_dir : $(mpe_app_dir)/station_lists -mpe_site_id : ounx -mpe_area_names : $(mpe_site_id) - -### MPE static data files -mpe_prism_dir : $(mpe_app_dir)/prism -mpe_misbin_dir : $(mpe_app_dir)/misbin -mpe_utiltriangles_dir : $(mpe_app_dir)/utiltriangles -mpe_beamheight_dir : $(mpe_app_dir)/beam_height -mpe_climo_dir : $(mpe_app_dir)/climo -mpe_help_dir : $(mpe_app_dir)/help -mpe_gridmask_dir : $(mpe_app_dir)/grid_masks -mpe_basin_file : $(whfs_geodata_dir)/basins.dat - -### MPE precipitation gage qc directories -mpe_precip_data_dir : $(mpe_gageqc_dir)/precip -mpe_bad_precip_dir : $(mpe_precip_data_dir)/bad -mpe_dev_precip_dir : $(mpe_precip_data_dir)/dev -mpe_map_dir : $(mpe_precip_data_dir)/MAP -mpe_grid_precip_dir : $(mpe_precip_data_dir)/grid -mpe_point_precip_dir : $(mpe_precip_data_dir)/point - -### MPE temperature gage qc directories -mpe_temperature_data_dir : $(mpe_gageqc_dir)/temperature -mpe_bad_temperature_dir : $(mpe_temperature_data_dir)/bad -mpe_dev_temperature_dir : $(mpe_temperature_data_dir)/dev -mpe_mat_dir : $(mpe_temperature_data_dir)/MAT -mpe_grid_temperature_dir : $(mpe_temperature_data_dir)/grid -mpe_point_temperature_dir : $(mpe_temperature_data_dir)/point - -### MPE freezing level gage qc directories -mpe_freezing_data_dir : $(mpe_gageqc_dir)/freezing_level -mpe_maz_dir : $(mpe_freezing_data_dir)/MAZ -mpe_grid_freezing_dir : $(mpe_freezing_data_dir)/grid -mpe_point_freezing_dir : $(mpe_freezing_data_dir)/point -ruc_model_data_dir : /data/fxa/Grid/SBN/netCDF/CONUS211/RUC - -### MPE 1 hour mosaics and fields and supporting reference fields. -mpe_avgrmosaic_dir : $(mpe_fieldgen_product_dir)/avgrmosaic -mpe_maxrmosaic_dir : $(mpe_fieldgen_product_dir)/maxrmosaic -mpe_bmosaic_dir : $(mpe_fieldgen_product_dir)/bmosaic -mpe_d2d_files_dir : $(mpe_fieldgen_product_dir)/d2d_files -mpe_polygon_dir : $(mpe_fieldgen_product_dir)/edit_polygon -mpe_gageonly_dir : $(mpe_fieldgen_product_dir)/gageonly -mpe_gagetriangles_dir : $(mpe_fieldgen_product_dir)/gagetriangles -mpe_height_dir : $(mpe_fieldgen_product_dir)/height -mpe_index_dir : $(mpe_fieldgen_product_dir)/index -mpe_lmosaic_dir : $(mpe_fieldgen_product_dir)/lmosaic -mpe_locbias_dir : $(mpe_fieldgen_product_dir)/locbias -mpe_locspan_dir : $(mpe_fieldgen_product_dir)/locspan -mpe_lsatpre_dir : $(mpe_fieldgen_product_dir)/lsatpre -mpe_mlmosaic_dir : $(mpe_fieldgen_product_dir)/mlmosaic -mpe_mmosaic_dir : $(mpe_fieldgen_product_dir)/mmosaic -mpe_qmosaic_dir : $(mpe_fieldgen_product_dir)/qmosaic -mpe_lqmosaic_dir : $(mpe_fieldgen_product_dir)/lqmosaic -mpe_mlqmosaic_dir : $(mpe_fieldgen_product_dir)/mlqmosaic -mpe_p3lmosaic_dir : $(mpe_fieldgen_product_dir)/p3lmosaic -mpe_qpe_dir : $(mpe_fieldgen_product_dir)/qpe -mpe_qpe_sbn_dir : $(mpe_fieldgen_product_dir)/qpe_sbn -mpe_qpe_gif_dir : $(mpe_fieldgen_product_dir)/qpe_gif -mpe_qpe_grib_dir : $(mpe_fieldgen_product_dir)/qpe_grib -mpe_qpe_grib_sbn_dir : $(mpe_fieldgen_product_dir)/qpe_grib_sbn -mpe_qpe_jpeg_dir : $(mpe_fieldgen_product_dir)/qpe_jpeg -mpe_qpe_netcdf_dir : $(mpe_fieldgen_product_dir)/qpe_netcdf -mpe_rmosaic_dir : $(mpe_fieldgen_product_dir)/rmosaic -mpe_sat_state_var : $(mpe_fieldgen_product_dir)/sat_state_var -mpe_state_var : $(mpe_fieldgen_product_dir)/state_var -mpe_srmosaic_dir : $(mpe_fieldgen_product_dir)/srmosaic -mpe_sgmosaic_dir : $(mpe_fieldgen_product_dir)/sgmosaic -mpe_srgmosaic_dir : $(mpe_fieldgen_product_dir)/srgmosaic -mpe_satpre_dir : $(mpe_fieldgen_product_dir)/satpre -mpe_rfcmmosaic_dir : $(mpe_fieldgen_product_dir)/rfcmmosaic -mpe_rfcbmosaic_dir : $(mpe_fieldgen_product_dir)/rfcbmosaic -mpe_localfield1_dir : $(mpe_fieldgen_product_dir)/localfield1 -mpe_localfield2_dir : $(mpe_fieldgen_product_dir)/localfield2 -mpe_localfield3_dir : $(mpe_fieldgen_product_dir)/localfield3 - -### Tokens related to the MPE Editor map display. -mpe_config_dir : $(whfs_config_dir) -mpe_center_lat : 39.8 -mpe_center_lon : -98.55 -mpe_height_in_pixels : 900 -mpe_width_in_pixels : 1200 -mpe_map_width : 1320 -mpe_zoom_out_limit : 20 -mpe_disclosure_limit : 60 -mpe_map_projection : FLAT - -### Misc tokens -mpe_load_hourlypc : ON -mpe_gageqc_gif_dir : $(whfs_image_dir) -mpe_gif_location : 34.0,-97.0,34.0,-94.0,33.0,-94.0 -mpe_overlay_dir : $(whfs_geodata_dir) -mpe_editor_logs_dir : $(pproc_log)/mpe_editor -mpe_type_source : RG:GOES,RR:ALERT,RM:SNOTEL,RP:LARC,RZ:COOP - -### New tokens for DQC/CHPS -mpe_level2_type_value : 2 # Allow user to customize the type value. The default is “2” -mpe_td_details_set : OFF # Allow generating a time distribution details file. -mpe_process_PC : ON # Skip call to the load_PC_hourly routine if "OFF" -mpe_map_one_zone : OFF # Allow MAP generation for one zone only -fewsgrib_dir : $(mpe_gageqc_dir)/fewsgrib # default nc2grib grib file output dir -nc2g_app_dir : $(mpe_app_dir)/nc2grib # directory for gfe2grib.txt file -netcdf_dir : $(mpe_gageqc_dir)/netcdf_files #default output directory for netcdf files -mpe_dqc_save_netcdf : OFF # Save Daily QC as netCDF -mpe_dqc_save_grib : OFF # Save Daily QC as grib - -### Tokens which control the products generated by MPE Fieldgen. -mpe_locbias_1hr_rerun : OFF # ON/OF .Apps_defaultsF flag to - # determine if local bias should be - # recalculated as part of the mpe_fieldgen - # rerun from hmap_mpe - # ON -- recalc loc bias on rerun - # OFF -- do not recalc loc bias on rerun -mpe_del_gage_zeros : OFF # ON/OFF flog to determine if a zero gage - # value should be removed from consideration - # if the radar shows > 0.0 - # ON -- check for and remove zero gage values - # OFF -- do not check for or remove zero - # gage values - -mpe_selected_grid_gagediff : MMOSAIC - -mpe_qpe_fieldtype : MMOSAIC # field type to be saved as qpe -mpe_generate_list : BMOSAIC,GAGEONLY,LMOSAIC,LSATPRE,MLMOSAIC,MMOSAIC,RMOSAIC,SATPRE,P3LMOSAIC,SRMOSAIC,SGMOSAIC,QMOSAIC,LQMOSAIC,MLQMOSAIC,RFCBMOSAIC,RFCMMOSAIC,RFCMOSAIC,SAVELEVEL2 -mpe_base_radar_mosaic : RMOSAIC # The base radar mosaic used for the fields - # that mpe_fieldgen generates -mpe_show_missing_gage : None # MPE missing gage display. - # (None,All,Reported) -mpe_bad_gages_dir : $(rfcwide_output_dir)/bad_gages - -### directory locations of various format MPE output grid files -mpe_gif_dir : $(rfcwide_output_dir)/qpe_gif -mpe_jpeg_dir : $(rfcwide_output_dir)/qpe_jpeg -mpe_netcdf_dir : $(rfcwide_output_dir)/qpe_netcdf -mpe_grib_dir : $(rfcwide_output_dir)/qpe_grib - -### which format MPE output grid files to save -mpe_save_gif : nosave -mpe_save_jpeg : nosave -mpe_save_netcdf : nosave -mpe_save_grib : save - -### prefixes for various format MPE output grid files, blank by default -mpe_gif_id : -mpe_jpeg_id : -mpe_netcdf_id : -mpe_grib_id : - -### mpe gage QC tokens -mpe_gage_qc : ON -mpe_sccqc_threshold : 2.0 -mpe_scc_boxes_failed : 4 -mpe_msc_precip_limit : 1.0 -mpe_split_screen : OFF - -### mpe polygon tokens -mpe_polygon_action_order : None -mpe_polygon_field_order : None - -### tokens which control the transmission of RFC bias data. -mpe_transmit_bias : OFF -transmit_bias_on_save : NO -transmit_bias_on_rerun : NO -rfc_bias_input_dir : $(mpe_dir)/bias_message_input -rfc_bias_output_dir : $(mpe_dir)/bias_message_output -process_bias_log_dir : $(pproc_log)/process_bias_message -send_local_bias_when_rfc_bias_missing : NO - -### rfc qpe to wfo tokens -mpe_send_qpe_to_sbn : OFF -mpe_generate_areal_qpe : OFF -# List of RFCs to process for Gen Areal Qpe -gaq_rfc_list : MBRFC,NCRFC -gaq_dur_list : 1,6,24 -gaq_app_dir : $(pproc_local_data)/app/gen_areal_qpe -gaq_input_dir : /data/fxa/Grid/SBN/netCDF/HRAP/QPE -gaq_log_dir : $(pproc_log)/gen_areal_qpe -gaq_rfc_mask_dir : $(gaq_app_dir) -gaq_temp_xmrg_dir : $(rfcwide_output_dir)/rfcqpe_temp -gaq_xmrg_1hr_dir : $(rfcwide_output_dir)/rfcqpe01 -gaq_xmrg_6hr_dir : $(rfcwide_output_dir)/rfcqpe06 -gaq_xmrg_24hr_dir : $(rfcwide_output_dir)/rfcqpe24 -gaq_grib_dir : $(rfcwide_output_dir)/rfcqpe_grib - -### token which controls how PC precipitation totals are derived. -sum_pc_reports : NO - -geo_st3_bin : $(geo_data)/$(st3_rfc)/binary #geo_data defined outside of pproc -geo_st3_ascii : $(geo_data)/$(st3_rfc)/ascii -adjust_PC_startingtime : 4 #allow PC starting time tolerance - -### tokens for sending MPE mean field bias data to the ORPG - -bias_message_dir : $(apps_dir)/data/fxa/radar/envData - -### tokens for Lightning Data processing - -lightning_input_dir : /data/fxa/point/binLightning/netcdf - -lightning_log_dir : $(pproc_log)/lightning_proc - -### tokens for D2D display - -mpe_d2d_display_grib : ON # ON/OFF token to determine if further - # processing of grib file for D2D display - # is required - -d2d_input_dir : $(EDEX_HOME)/data/manual/mpe # dir containing grib files - # to be processed for D2D display - -mpe_send_grib : OFF # ON/OFF token to determine if grib file is - # to be sent to other sites such as NPVU - -# disagg processing tokens - -mpe_disagg_execute : OFF -mpe_disagg_method : POINT -mpe_disagg_6hreq_0 : 1 -mpe_disagg_6hrgt_0 : 1 - -#====== High-resolution Precipitation Estimator (HPE) tokens==================== - -# DecodeDHR tokens (formerly DecodeHDP tokens that looked like hdp_*) - -dhr_log_dir : $(pproc_log)/decodedhr # DHR Decoder logs - -dhr_prod_dir : $(pproc_local_data)/dhr_gather # DHR input directory - -dhr_dirname1 : $(data_archive_root)/radar # first part of directory name -# # containing DHR products for -# # associated or dial in radars - -dhr_dirname2 : DHR/layer0/res1/level256 # second part of directory name - # containing DHR products for - # associated or dial in radar -dhr_grid_dir : $(pproc_local_data)/dhr_decoded # decoded DHR radar grids - -dhr_error_dir : $(pproc_local_data)/dhr_error # DHR error files -dhr_arch_dir : $(pproc_local_data)/dhr_archive # DHR archives - -# DecodeDSP tokens (formerly DecodeHDP tokens that looked like hdp_*) - -dsp_log_dir : $(pproc_log)/decodedsp # DSP Decoder logs - -dsp_prod_dir : $(pproc_local_data)/dsp_gather # DSP input directory - -dsp_dirname1 : $(data_archive_root)/radar # first part of directory name -# # containing DSP products for -# # associated or dial in radars - -dsp_dirname2 : STP/layer0/res2/level256 # second part of directory name - # containing DSP products for - # associated or dial in radars - # NOTE that DSP is level256 vs level16 for - # STP and this is where it is stored - # in AWIPS -dsp_grid_dir : $(pproc_local_data)/dsp_decoded # decoded DSP radar grids -dsp_error_dir : $(pproc_local_data)/dsp_error # DSP error files -dsp_arch_dir : $(pproc_local_data)/dsp_archive # DSP archives - - -hpe_generate_list : DHRMOSAIC,BDHRMOSAIC,ERMOSAIC,LSATPRE,EBMOSAIC -hpe_qpe_fieldtype : ERMOSAIC # field type to be saved as qpe - -hpe_satpre_dir : $(mpe_fieldgen_product_dir)/satpre -hpe_input_dir : $(pproc_local_data)/app/hpe -hpe_output_dir : $(pproc_local_data)/hpe -hpe_sat_statevar_dir : $(rfcwide_output_dir)/state_var - -hpe_log_dir : $(pproc_local_data)/log/hpe - -hpe_hrap_grid_factor : 4 # 1 for HRAP grid - # 4 for quarter HRAP grid - -hpe_dhrmosaic_dir : $(hpe_output_dir)/dhrmosaic -hpe_bdhrmosaic_dir : $(hpe_output_dir)/bdhrmosaic -hpe_ermosaic_dir : $(hpe_output_dir)/ermosaic -hpe_ebmosaic_dir : $(hpe_output_dir)/ebmosaic -hpe_avg_ermosaic_dir : $(hpe_output_dir)/avgrmosaic -hpe_max_ermosaic_dir : $(hpe_output_dir)/maxrmosaic -hpe_lsatpre_dir : $(hpe_output_dir)/lsatpre - -hpe_dspheight_dir : $(hpe_output_dir)/height -hpe_dspindex_dir : $(hpe_output_dir)/index -hpe_height_dir : $(hpe_output_dir)/height -hpe_index_dir : $(hpe_output_dir)/index - -hpe_dhrmosaic_grib_dir : $(hpe_dhrmosaic_dir)/grib -dhrmosaic_netcdf_dir : $(hpe_dhrmosaic_dir)/netcdf -dhrmosaic_gif_dir : $(hpe_dhrmosaic_dir)/gif -hpe_bdhrmosaic_grib_dir : $(hpe_bdhrmosaic_dir)/grib -bdhrmosaic_netcdf_dir : $(hpe_bdhrmosaic_dir)/netcdf -bdhrmosaic_gif_dir : $(hpe_bdhrmosaic_dir)/gif -hpe_ermosaic_grib_dir : $(hpe_ermosaic_dir)/grib -ermosaic_netcdf_dir : $(hpe_ermosaic_dir)/netcdf -ermosaic_gif_dir : $(hpe_ermosaic_dir)/gif -hpe_ebmosaic_grib_dir : $(hpe_ebmosaic_dir)/grib -ebmosaic_netcdf_dir : $(hpe_ebmosaic_dir)/netcdf -ebmosaic_gif_dir : $(hpe_ebmosaic_dir)/gif - -dhrmosaic_save_grib : save -dhrmosaic_save_gif : nosave -dhrmosaic_save_netcdf : nosave -bdhrmosaic_save_grib : save -bdhrmosaic_save_gif : nosave -bdhrmosaic_save_netcdf : nosave -ermosaic_save_grib : save -ermosaic_save_gif : nosave -ermosaic_save_netcdf : nosave -ebmosaic_save_grib : save -ebmosaic_save_gif : nosave -ebmosaic_save_netcdf : nosave - -hpe_gif_dir : $(hpe_output_dir)/hpe_gif -hpe_jpeg_dir : $(hpe_output_dir)/hpe_jpeg -hpe_netcdf_dir : $(hpe_output_dir)/hpe_netcdf -hpe_grib_dir : $(hpe_output_dir)/hpe_grib -hpe_xmrg_dir : $(hpe_output_dir)/hpe_xmrg -hpe_save_gif : nosave -hpe_save_jpeg : nosave -hpe_save_netcdf : nosave -hpe_save_grib : nosave - -dhr_window : 15 -dsp_window : 15 -dsp_duration : 60 - -hpe_base_radar_mosaic : ERMOSAIC -hpe_qpe_fieldtype : ERMOSAIC -hpe_load_misbin : OFF -hpe_debug_log : ON -hpe_use_locbias : OFF -hpe_runfreq : 5 -hpe_timelag : 5 -hpe_bias_source : RFC -hpe_rfc_bias_lag : 2 -hpe_purge_logage : 720 -hpe_purge_fileage : 180 -hpe_purge_xmrgage : 75 - -dhrmosaic_d2d_display_grib : ON -ermosaic_d2d_display_grib : ON -ebmosaic_d2d_display_grib : ON -bdhrmosaic_d2d_display_grib : ON -hpe_run_nowcast : ON -hpe_nowcast_generate_list : PRTM, BPTRM -hpe_nowcast_dir : $(hpe_output_dir)/nowcast -hpe_rate_save_grib : save -hpe_brate_save_grib : save -hpe_tp1h_save_grib : save -hpe_btp1h_save_grib : save -hpe_4km_tp1h_save_grib : nosave -hpe_4km_btp1h_save_grib : nosave -nowcast_d2d_display_grib : ON -hpe_smooth_method : 1 # 0=no smoothing 1=FFP method (default) 2=BZ94 method -hpn_use_meanvelocity : OFF -hpn_meanvelocity_direction : 45 # direction precip is moving towards -hpn_meanvelocity_speed : 20 # miles per hour - - -hpe_send_grib : OFF # ON/OFF token to determine if grib file is - # to be sent to other sites such as NPVU - -#========END HPE tokens====================================================== - -# ================= Flash Flood Guidance System ============================= - -ffg_level : oper - -ffg_dir : $(apps_dir)/rfc/nwsrfs/ffg # Top-level ffg -ffg_bin : $(ffg_dir)/bin # FFG execute dir -ffg_files : $(ffg_dir)/files # FFG file group -ffg_gsfiles : $(ffg_files)/$(ffg_level) # FFG files dir -ffg_out_dir : $(ffg_dir)/output # FFG output dir -ffg_grib_out : $(ffg_out_dir)/grib # GRIB output -ffg_scripts : $(ffg_dir)/scripts # FFG scripts -ffg_gff_level : grff # regular grid ffg dir -ffg_gro_level : grro # regular grid ro dir - .Apps_defaults -ffg_usr_dir : $(ffg_gsfiles)/user # FFG user dir -ffg_area_dir : $(ffg_gsfiles)/affg # FFG area dir -ffg_cary_dir : $(ffg_gsfiles)/cary # FFG carryover dir -ffg_define_dir : $(ffg_gsfiles)/define # FFG definition dir -ffg_gridff_dir : $(ffg_gsfiles)/$(ffg_gff_level) # FFG grid ff dir -ffg_gridro_dir : $(ffg_gsfiles)/$(ffg_gro_level) # FFG grid ro dir -ffg_hwatr_dir : $(ffg_gsfiles)/hffg # FFG headwater dir - -ffg_gridpm_dir : $(ffg_gsfiles)/gdpm # grid runoff adjust parameters -ffg_group_dir : $(ffg_gsfiles)/grpp # FFG groups of products -ffg_prod_dir : $(ffg_gsfiles)/prod # FFG products dir -ffg_text_dir : $(ffg_gsfiles)/text # FFG text dir -ffg_wsup_dir : $(ffg_gsfiles)/wsup # Water supply dir - -# ffg program control -ffg_error_output : on # whether to output error messages -ffg_log_output : off # whether to output log messages - -# ===================== GRIB packer/encoder ================================= - -grib_dir : $(apps_dir)/rfc/grib # Top level grib -grib_rls : $(pproc_bin) # location of gribit executable -grib_arc : $(grib_dir)/bin/ARCHIVE # grib archive -grib_in_dir : $(rfcwide_xmrg_dir) # depends on data to be encoded -grib_out_dir : $(grib_dir)/output # GRIB encoded files -grib_error_output : on # turn on/off GRIB error output -grib_set_subcenter_0 : off # set subcenter to 0 - # on - set subcenter to 0 - # off - do not set subcenter to 0 - -# end of ffg apps - -#================== XSETS Apps_defaults Tokens - 08/03/2001 =================== - -# [] = default value -#................................. -# Date Control -#................................. -xsets_date_used : SYSTEM # computer system clock - # OFSFILES = forecast time series - # mm/dd/ccyy = explicit date, 12Z - -#................................. -# Directories and files to use -#................................. -xsets_dir : $(apps_dir)/rfc/xsets -xsets_level : oper -xsets_files : $(xsets_dir)/files -xsets_xsfiles : $(xsets_files)/$(xsets_level) -xsets_param_dir : $(xsets_xsfiles)/param -xsets_config_file : xsetsconfig -xsets_output_dir : $(xsets_xsfiles)/output - -#................................. -# Commands -#................................. -xsets_editor : "nedit" -xsets_hydrographs_cmd : "$(xsets_dir)/bin/RELEASE/new_hydroplot" -xsets_print_cmd : "lp" -xsets_xmit_cmd : "cat " - -#................................. -# Parameters for creation of hydrographs -#................................. -xsets_hydro_button : NO # Create Make Hydro button, [NO] - (currently unused) -xsets_make_hydro : NO # Create .gif hydrographs, [NO] - -#................................. -# NEW_HYDROPLOTS parameters -#................................. -xsets_html_daily_dir : /pub/FcstGraphs # Location of gif images on - web server -xsets_html_flood_dir : /pub/FloodGraphs # Location of gif images on - web server -xsets_hydrographs_html : 1 # 1 = create basic html - 0 = no html created -xsets_hydrographs_output: "$(xsets_output_dir)/gifs" -xsets_hydrographs_param : $(xsets_xsfiles)/hydrographs/param - -#................................. -# File Print Options and Settings -#................................. -xsets_add_remarks : NO # Add remark after each site, [NO] -xsets_brackets : NO # Put brackets around latest stage, - # forecasts and dates, [NO] -xsets_cmt_line : NO # YES = separate line, - # NO = append to description, river -xsets_expanded_dates : YES # Insert MMDD before values, [NO] -xsets_fgroup_preamble : "FORECAST GROUP IS" #Preamble for the fgroup (string) -xsets_H_precision : 1 # 0, [1], or 2 decimal precision of stages -xsets_output_style : E # E = Expanded, each day has line, - # C = Compact -xsets_print_crests : YES # Print crest comment, [NO] -xsets_print_disclaimer : YES # Print disclaimer, [NO] -xsets_print_fs : YES # YES = encode flood stage in SHEF, - # [NO] = display as comment -xsets_print_fs_cross : COMMENT # Time level passes flood stage - # [NO] = don't include, - # SHEF = encode in SHEF, - # COMMENT = display as comment -xsets_print_ls : COMMENT # Latest stage - # [NO] = don't include, - # SHEF = encode in SHEF, - # COMMENT = display as comment -xsets_print_MAP : NO # Print MAP values, [NO] -xsets_print_qpf : COMMENT # Print QPF values - # [NO] = don't include, - # SHEF = encode in SHEF, - # COMMENT = display as comment -xsets_print_ws : YES # Display warning/caution stage, [NO] -xsets_product_hdr : PIT # Indentifier in Product Header, non-AWIPS -xsets_Q_precision : 1 # 0, [1], 2 decimal precision of flows -xsets_signature : $(LOGNAME) #User signature (string) -xsets_wmo_id : TTAA00 KTUR DDHHMM # the wmo id -xsets_ws_label : "WARNING" # Label for WARNING/[CAUTION] stage (string) -xsets_zczc : YES # Include ZCZC & NNNN, [NO], non-AWIPS - -#................................. -# Run Options -#................................. -xsets_age_check : 6 # Number of hours old of forecast before - # error generated, [6] -xsets_edit_lock : NO # Lock main display when editing SETS file, [NO]??? -xsets_gen_summary : NO # Include summary of flood locations, [NO], Currently Unused -xsets_msg_obs_warn : YES # Print warning when observed values are - # missing, [NO] -xsets_numhrs_curob : 12 # number of hours back from current time to use - # informix obs as "current obs" -xsets_num_MAP_values : 4 # Number [4] of MAP values to include in product -xsets_num_qpf_values : 4 # Number [4] of qpf values to include in product -xsets_numdays_hydro : 3 # Run Parameters for FCSTPROG -xsets_ofs_select : OFS # OFS or IFP for time series files -xsets_stdout : NO # Send wprint messages to stdout, [NO] -xsets_time : Z # Time Zone code used in product - # ([Z], E, C, M, P, A, H OR N) -# ================== end of xsets tokens ======================================= - -#================== XNAV Apps_defaults Tokens - 03/29/2000 ==================== -# defaults for program XNAV - -xnav_user : oper - -#................................. -# Date/time related tokens -#................................. -db_days : 10 -xnav_daily_days : 30 -xnav_ffg_periods : 3 -xnav_sixhr_periods : 40 -xnav_hyd_days_fut : 5 -xnav_hyd_days_prev : 5 -xnav_precip_hours : 240 -xnav_settoday : - -#................................. -# Directories and files to use -#................................. -xnav_dir : $(apps_dir)/rfc/xnav -xnav_data : $(xnav_dir)/data -xnav_params : $(xnav_dir)/parameters -xnav_P1xmrg_dir : $(rfs_dir)/ofs/files/$(xnav_user)/griddb -xnav_S1xmrg_dir : $(rfs_dir)/ofs/files/$(xnav_user)/griddb -xnav_bin_dir : $(xnav_dir)/bin -xnav_data_dir : $(xnav_data) -xnav_ffg_dir : $(ffg_dir)/output/$(xnav_user) -xnav_geo_data : $(geo_data)/$(ifp_rfc)/binary -xnav_gif_dir : $(HOME)/gifs/xnav -xnav_grid_ffg_dir : $(ffg_dir)/files/$(xnav_user)/grff -xnav_localdata_dir : $(xnav_data)/localdata -xnav_misc_dir : $(xnav_data)/misc_data -xnav_qpfbin_dir : $(xnav_data)/wfoqpf -xnav_rfcfmap_dir : $(xnav_data)/rfcqpf -xnav_rules_dir : $(xnav_params)/rules -xnav_shefdata_dir : $(xnav_data)/shefdata -xnav_wfoqpf_dir : $(apps_dir)/rfc/data/products -xnav_xmrg_dir : $(rfs_dir)/ofs/files/$(xnav_user)/griddb -nmap_xmrg_dir : $(xnav_rfcfmap_dir)/nmap - -#................................. -# Fonts and colors -#................................. -xnav_action_color : yellow -xnav_flood_color : red -xnav_ok_color : green -xnav_ts1_color : yellow -xnav_ts2_color : magenta -xnav_label_font : "-*-new century schoolbook-*-*-*-*-14-*-*-*-*-*-*-*" -xnav_legend_font : "-*-new century schoolbook-*-*-*-*-14-*-*-*-*-*-*-*" -xnav_list_font : "-*-new century schoolbook-*-*-*-*-14-*-*-*-*-*-*-*" -xnav_menu_font : "-*-new century schoolbook-*-*-*-*-14-*-*-*-*-*-*-*" -xnav_pb_font : "-*-new century schoolbook-*-*-*-*-14-*-*-*-*-*-*-*" -xnav_text_font : -*-charter-bold-*-*-*-17-*-*-*-*-*-*-* -xnav_toggle_font : "-*-new century schoolbook-*-*-*-*-14-*-*-*-*-*-*-*" -xnav_town_font : "-*-new century schoolbook-bold-*-*-*-14-*-*-*-*-*-*-*" - -idma_label_font : "-*-new century schoolbook-bold-*-*-*-12-*-*-*-*-*-*-*" -idma_data_font : "-*-new century schoolbook-bold-*-*-*-18-*-*-*-*-*-*-*" - -#................................. -# Window size controls -#................................. -xnav_hrap_x : 59 -xnav_hrap_xor : 311 -xnav_hrap_y : 83 -xnav_hrap_yor : 410 -xnav_hydro_height : 400 -xnav_hydro_width : 750 -xnav_scale : 8.0 -xnav_scale_colors : 3.0 -xnav_x_offset : 100 -xnav_y_offset : 100 - -#................................. -# Display options -#................................. -xnav_basins : yes -xnav_counties : no -xnav_cwas : no -xnav_fgroups : no -xnav_flights : no -xnav_grid : no -xnav_hydro_segments : no -xnav_radars : no -xnav_rfc : yes -xnav_rivers : yes -xnav_states : yes -xnav_towns : yes - -#................................. -# Other control options -#................................. -load_db_on_boot : no -load_ofs_on_boot : no -check_flood_on_boot : no -use_new_xmrg : yes -xnav_afosid : ? #PITRR1RHA -xnav_editor : nedit -xnav_exception_file : exception_file -xnav_grid_ffg_pattern : xhr -xnav_locrangecheck : no -xnav_office_hdr : ? #KRHA -xnav_only_use_ofs_data : no -xnav_pe : "HG HP HT PP PT QR QT SD SF SW TA TD TS XC" -xnav_precip_filter : .01 -xnav_route_code : ? #ES -xnav_seg_type : 2 -xnav_send_shef : no -xnav_show_p1_files : yes -xnav_suppress_msg : yes -xnav_xmit_cmd : "cat " - -# ====== MAKE24HRXMRG Tokens ====== - -make24hrxmrg_settoday : # Run date in mm/dd/yyyy. Empty means uses number - # of days back argument to program. -make24hrxmrg_debug_level : 0 # Set debug output level. 1 or 2 yields more output. -make24hrxmrg_endtime : # Hour to end the 24 hour total. Default: 12Z if not - # given. -make24hrxmrg_tz : Z # Time zone; E, C, M, P, Y, H, L, or Z (defautlt). - -# ================== end of xnav tokens ======================================== - -#================== XDAT Apps_defaults Tokens - 03/29/2000 ==================== -# defaults for program XDAT - -xdat_user : oper - -#................................ -# Date/time related tokens -#................................ -xdat_flood_hours : 6 -xdat_settoday : - -#.................................. -# Directories and files to use -#.................................. -xdat_dir : $(apps_dir)/rfc/xdat -xdat_data : $(xdat_dir)/data -xdat_params : $(xdat_dir)/parameters -xdat_groups_dir : $(xdat_params)/groups -xdat_localdata_dir : $(xdat_data)/localdata -xdat_shefdata_dir : $(xdat_data)/shefdata - -#.................................. -# Fonts and colors to use -#.................................. -xdat_label_font : ncenb14 -xdat_list_font : helvb14 -xdat_text_font : user14x19 -xdat_pb_font : ncenb14 - -#................................. -# Window size controls -#................................. -xdat_scale : 1.0 - -#.................................. -# Display Options -#.................................. -xdat_clear_id : yes - -#.................................. -# Other Control Options -#.................................. -xdat_afosid : ?ofstest? -xdat_office_hdr : ??? -xdat_post_unk : $(shef_post_unk) -xdat_route_code : ??? -xdat_send_shef : no -xdat_xmit_cmd : "cat " -# ================== end of xdat tokens ======================================== - -#====================== Shape Data File Directory ============================== -shape_data_dir : $(apps_dir)/ffmpShapeData # Directory holding shape - # files acting as data files - - -#================== send_rfc Apps_defaults Tokens - 3/08/2001 ================= -send_rfc_dir : $(apps_dir)/rfc/send_rfc -send_rfc_input_dir : $(send_rfc_dir)/data/send -send_rfc_id : WWW -send_hardcopy_nnn : PRI-WRK-EDI-SNO-ADM-RVF -send_rfc_hardcopy : $(send_rfc_dir)/data/sbnprods -send_rfc_hpc : 0 -send_rfc_host : ds-www -send_rfc_alternate : 0 -# ================== end of send_rfc tokens ==================================== - -#================== verify Apps_defaults Tokens - 08/03/2001 ================== -# defaults for program verify -vsys_output : $(vsys_dir)/output #location of output files -vsys_input : $(vsys_dir)/input #location of input files -vsys_files : $(vsys_dir)/files #location of verify files -vsys_scripts : $(vsys_dir)/scripts #location of verify scripts -vsys_output_log : test.log #name of log file -vsys_ihfsdb : $(db_name) #ihfs_db name -vsys_vdb : vdb1_1rfc #verification db name for RFC="rfc" -verify_rls : $(vsys_dir)/bin/RELEASE #The release directory. -vsys_rls : $(verify_rls) #Not really needed, but consistent. - -# ================== end of verify tokens ====================================== - -# ================== RFC Archive Database tokens =============================== - -archive_shefdata_dir : /data/fxa/ispan/hydro_adbs # directory for archive data -archive_enable : OFF # ON/OFF - Enable or Disable - # archive data feed (OFF by default) -metar_output_dir : $(whfs_local_data_dir)/metar_output # metar2shef temp output directory - # used if archive_enable is ON - -#================== Directory tokens for RFC Archive Database ================== -adb_dir : /rfc_arc # Base RFC Archive Directory -adb_raw_que : /rfc_arc_data/q/raw/ # pathname for raw q input directory -adb_pro_que : /rfc_arc_data/q/processed/ # pathname for processed q input directory -adb_bin_dir : $(adb_dir)/bin # pathname for the bin directory -adb_cfg_dir : $(adb_dir)/cfg # pathname for the config directory -adb_lib_dir : $(adb_dir)/lib # pathname for the lib directory -adb_logs_dir : $(adb_dir)/logs # pathname for the logs directory -adb_scripts_dir: $(adb_dir)/scripts # pathname for the scripts directory - -#================== Shefdecode tokens for RFC Archive Database ================= - -adb_shef_winpast : 9999 # number of days in past to post data for RAW -adb_shef_winfuture : 9999 # number of mins in future to post obs data - # for RAW. -adb_shef_winpast_pro : 9999 # number of days in past to post data -adb_shef_winfuture_pro : 9999 # number of minutes in future to post obs data -shefdecode_rax_userid : oper # controlling UNIX user -adb_shefdecode_input : $(adb_cfg_dir)/decoders # adb SHEF parameter file - # location -adb_shef_raw_perflog : OFF # ON/OFF - create a separate performance - # log file to save internal decoder timing - # messages for monitoring performance -adb_shef_raw_logs_dir : $(adb_logs_dir)/decoder/raw/logs # pathname for the - # daily logs directory -adb_shef_raw_err_dir : $(adb_logs_dir)/decoder/raw/err # pathname for the - #product logs directory -adb_shef_raw_keeperror : ALWAYS # keep files (=ALWAYS) or only - # when errors occur (=IF_ERROR) -adb_shef_raw_post_unk : IDS_AND_DATA # NONE - do not post to the UnkStnValue tables - # values IDS_ONLY or IDS_AND_DATA - # will post everything - # to the UnkStnValue table -adb_shef_pro_post_unk : NONE # NONE - do not post to the UnkStnValue tables - # values IDS_ONLY or IDS_AND_DATA - # will post everything - # to the UnkStnValue table -adb_shef_pro_perflog : OFF # ON/OFF - create a separate performance - # log file to save internal decoder timing - # messages for monitoring performance -adb_shef_pro_logs_dir : $(adb_logs_dir)/decoder/processed/logs # pathname for the - # daily logs directory -adb_shef_pro_err_dir : $(adb_logs_dir)/decoder/processed/err # pathname for the - # product logs directory -adb_shef_pro_keeperror : ALWAYS # keep files (=ALWAYS) or only - # when errors occur (=IF_ERROR) -adb_shef_raw_checktab : ON # ON checks location and ingestfilter tables -adb_shef_pro_checktab : OFF # ON checks location and ingestfilter tables -adb_shef_duplicate_raw : USE_REVCODE # Token for allowing duplicate records to be - # posted for raw decoder. -adb_shef_duplicate_pro : USE_REVCODE # Same thing but for processed decoder. -adb_shef_raw_dupmess : ON # duplication messages from adb raw decoder. -adb_shef_raw_locmess : ON # invalid location messages from adb raw decoder. -adb_shef_raw_elgmess : ON # invalid ingestfilter messages from adb raw - # decoder. -adb_shef_raw_storall : OFF # OFF - default- will only write to pecrsep table - # ON will write to both pecrsep and peirsep tables -adb_shef_pro_dupmess : ON # duplication messages from adb processed decoder. -adb_shef_pro_locmess : OFF # invalid location messages from adb pro decoder. -adb_shef_pro_elgmess : OFF # invalid ingestfilter messages from adb pro - # decoder. -adb_shef_pro_tmp_dir : $(adb_pro_que) -adb_shef_raw_tmp_dir : $(adb_raw_que) -adb_shef_raw_add_adjust : OFF - -#========== IHFS->RAX synchronization tokens for RFC Archive Database ========== -adb_sync_logs_dir : $(adb_logs_dir)/dbsync # directory for synchronization log files -adb_sync_mode : ANALYSIS # ANALYSIS or UPDATE -adb_sync_tablenames : ALL # List of table names to synchronize -adb_sync_ihfs_ingest: USE # USE or IGNORE -adb_sync_rivercrit : ACTION # ACTION, FIS or BOTH - - -#================== DatView program tokens for RFC Archive Database ============ -datview_db_name : $(adb_name) -datview_startdate : '1975-01-01 00:00:00' -datview_label_font : -schumacher-clean-bold-r-normal-*-14-*-75-75-c-80-*-* -datview_list_font : -schumacher-clean-bold-r-normal-*-14-*-75-75-c-80-*-* -datview_text_font : -schumacher-clean-bold-r-normal-*-14-*-75-75-c-80-*-* -datview_text2_font :-adobe-courier-bold-r-normal-*-*-140-*-*-m-*-iso8859-1 -datview_bg_color : black -datview_fg_color : white -datview_ob_color1 : green -datview_ob_color2 : blue -datview_ob_color3 : yellow -datview_ob_color4 : red -datview_ob_color5 : DarkOrange -datview_ob_color6 : SlateGray1 -datview_plot_font : -adobe-courier-bold-r-normal-*-*-80-*-*-m-*-iso8859-1 -datview_plot_width : 750 -datview_plot_height : 420 -datview_data_dir : /home/oper -datview_raw_shef_dir : $(adb_raw_que) -datview_pro_shef_dir : $(adb_pro_que) -datview_office_header : KTUA # to be set by each RFC -datview_pil : OKCRR1TUR # to be set by each RFC - - -#=============== ARCH_NAV Apps_defaults Tokens - 05/5/2005 ================== -# defaults for program ARCNAV - -anav_user : oper - -#................................. -# Date/time related tokens -#................................. -anav_daily_days : 30 -anav_sixhr_periods : 40 -anav_precip_hours : 24 - - -#................................. -# Directories and files to use -#................................. - -anav_dir : /awips/hydroapps/lx/rfc/xnav -anav_data : /data -anav_flatfiles : $(anav_data)/flatfiles -anav_params : $(anav_dir)/parameters -anav_data_dir : $(anav_data) -anav_geo_data : /awips/hydroapps/lx/geo_data/$(ifp_rfc)/binary -anav_gif_dir : /rfc_arc/data/arcnav/gifs -anav_localdata_dir : $(anav_data)/localdata -anav_xmrg_dir : $(anav_flatfiles) - -#................................. -# Fonts and colors -#................................. -anav_label_font : courb14gr -anav_legend_font : courb14gr -anav_list_font : courb14gr -anav_menu_font : 9x15 -anav_pb_font : courb12gr -anav_text_font : helvb18gr -anav_toggle_font : courb14gr -anav_town_font : courb12gr - -#................................. -# Window size controls -#................................. -anav_hrap_x : 200 -anav_hrap_xor : 850 -anav_hrap_y : 200 -anav_hrap_yor : 470 -anav_hydro_height : 400 -anav_hydro_width : 750 -anav_scale : 3.5 -anav_scale_colors : 3.0 -anav_x_offset : 300 -anav_y_offset : 300 - -#................................. -# Display options -#................................. -anav_basins : yes -anav_counties : no -anav_cwas : no -anav_fgroups : no -anav_flights : no -anav_grid : no -anav_hydro_segments : no -anav_radars : no -anav_rfc : no -anav_rivers : no -anav_states : yes -anav_towns : yes - -#................................. -# Other control options -#................................. -anav_editor : nedit -anav_suppress_msg : yes - -#...................................... -# tokens added for arcnav application -# for future use -#...................................... -anav_ok_color : green -anav_action_color : yellow -anav_flood_color : red -anav_ts1_color : yellow -anav_ts2_color : magenta - -# ================= end of arcnav tokens ====================================== - -# ================== end of RFC Archive Database tokens ======================== - -# ================== SSHP Directory Structure and application tokens =============================== - -local_data_sshp_dir : $(whfs_local_data_dir)/sshp_transfer -sshp_control_dir : $(whfs_local_data_dir)/app/sshp -sshp_ofs_extract_text_dir : $(local_data_sshp_dir)/ofs_extract_text -sshp_ofs_extract_xml_dir : $(local_data_sshp_dir)/ofs_extract_xml -sshp_ingest_xml_dir : $(local_data_sshp_dir)/ingest_xml -sshp_incoming_dir : $(local_data_sshp_dir)/incoming -sshp_outgoing_dir : $(local_data_sshp_dir)/outgoing -sshp_log_dir : $(whfs_log_dir)/sshp -sshp_java_process_host : px1f -sshp_invoke_map_preprocess: ON -sshp_map_qpe_to_use : MIXED # choices are: MIXED, LOCAL_BEST_ONLY, RFC_ONLY -sshp_fcst_ts : FZ # SSHP type-source code for generated forecasts -sshp_initial_forecast_length: 24 # length of forecast in hours -sshp_max_forecast_length: 120 # max length of forecast in hours that user can make generated in GUI -sshp_sac_update_expiration_hours: 25 # number of hours after which to update locally the SAC states -sshp_sac_update_hours_forward: -2 # number of hours forward of last top of hour to save sac states - - # negative -2 means 2 hours BEFORE last top of hour -sshp_adjustment_pairing_minutes : 70 -sshp_adjustment_interpolation_hours : 3 -sshp_show_simulated_timeseries : true - -sshp_data_dir : $(whfs_local_data_dir)/sshp # base sshp dynamic data dir -sshp_precip_dir : $(sshp_data_dir)/precip # default location for saved precip files -sshp_background_forecast_output_dir : $(sshp_data_dir)/forecast -sshp_background_forecast_length : 48 # length of a background forecast - -sshp_hpn_minutes_before : 5 # don't use grid files prior to X minutes before Hour -sshp_hpn_minutes_after : 5 # don't use grid files after X minutes past the Hour - -sshp_show_unadjusted_states: false # initial setting of option in GUI for displaying the unadjusted SAC-SMA states -# ==================== Radar Climatology Tokens ============================== -radclim_data_dir : $(pproc_local_data)/app/radclim - -# ==================== PDC Preprocessor Tokens =============================== -pdc_clean_cache_minutes : 60 -pdc_temperature_hours : 168 -pdc_height_hours : 168 -pdc_snow_hours : 168 -pdc_wind_hours : 168 -pdc_weather_hours : 168 -pdc_precip_hours : 168 -pdc_lower_window : 5 -pdc_upper_window : 5 - -pdc_pp_dir : $(whfs_local_data_dir)/pdc_pp -pdc_pp_log_dir : $(whfs_log_dir)/pdc_pp - -# ====================== Historical Data Browser Tokens ======================= - -hdb_help_dir : $(hdb_dir)/help_files # Historical data browser help - # files -hdb_script_directory : $(hdb_dir)/scripts # Historical data browser - # scripts dir -hdb_config_dir : $(hdb_dir)/app-defaults # Historical data browser - # configuration file directory - -hdb_height_in_pixels : 900 # Historical data browser map height in - # pixels -hdb_width_in_pixels : 1200 # Historical data browser map width in - # pixels -hdb_center_lat : 35 # The initial center latitude of the HDB -hdb_center_lon : -88.9 # The initial center longitude of the HDB -hdb_map_width : 2999.862 # The width in nautical miles of the area - # displayed in the HDB -hdb_disclosure_limit : 60 # The disclosure limit for displaying finer - # detail in the city overlay. -hdb_map_projection : FLAT # The initial map projection used by HDB. - # Possible values: FLAT, POLAR, HRAP -# ====================== DHM Token ======================= -dhm_data_dir : $(ofs_files)/$(ofs_level)/dhmdata # DHM data dir -dhm_d2d_data_dir : /data/fxa/Grid/LOCAL/netCDF/DHM # d2d data dir -dhm_d2d_notify_bin_dir : /awips/fxa/bin # d2d notify bin dir -rdhm_input_dir : $(geo_data) -dhm_rain_plus_melt_data_dir: $(geo_data) -# ================== end of SSHP Directory Structure tokens ======================== - -# ========================== NRLDB Tokens=================== -nrldb_log : $(whfs_log_dir)/nrldb -nrldb_data : $(whfs_local_data_dir)/nrldb -nrldb_config : $(whfs_config_dir)/nrldb -nrldb_tmp : /awips/hydroapps/whfs/local/data/output - -# The syntax needed in the file is: -# -# token : resource -# -# where: token is defined as a string delimited by white space or -# the delimiter, -# the delimiter between token and resource is the :, -# no white space needs to surround the delimiter, -# comments are indicated by a #, -# neither token nor resource can begin with a # or :, -# a # or a : can be embedded within resource, -# resource can contain white space if it is bounded by -# the ' or " characters, -# blank lines are allowed. -# referbacks are indicated by $(...). The '...' is resolved -# the same way any other token is, and is substituted for -# the $(...) string to compose the final resource value. -# Multiple referbacks are allowed in a resource, but -# embedded referbacks are not allowed (i.e. no -# $($(...)) allowed). -# Note that this file is read only if the token can not be resolved -# as an environment variable. -# -# ============================================================================== +# +# Official National .Apps_defaults file for AWIPS Release OB8.3 +# Also see .Apps_defaults_site for override settings +# Revision History: +# 11/06/2001 - adjusted many directory locations of precip_proc tokens. +# notable changes: st3_mkimage, rfcwide_input_dir +# added pproc_local, pproc_local_data, pproc_log +# grouped tokens together for 3 subsystems - shefdecode, whfs, +# precip_proc. +# placed precip_proc section after ofs since there are some +# dependencies +# changed value of whfs_editor +# added hydro_publicbin token +# added pproc_util_log_dir +# 07/01/2002 - added ens_input, ens_output, ens_files +# 07/22/2002 - add global gaff execution token +# 11/04/2002 - added disagg tokens +# 08/29/2003 - added sqlcmd_bin_dir +# 08/20/2003 - added ligtning_input_dir, lightning_log_dir +# 10/03/2003 - added tokens gage_qc, sccqc_threshold, mpe_scc_boxes_failed, +# mpe_msc_precip_limit +# 10/10/2003 - changed token names to mpe_gage_qc, mpe_sccqc_threshold +# - changed mpe_gage_qc token value to ON +# 02/04/2004 - Added new tokens for ens_pre netCDF enhancement --kwz +# 2/4/2004 - added mpe_locbias_1hr_rerun token +# 02/11/2004 - Added hv_map_projection. +# 02/19/2004 - Removed stage2 and stage3 related tokens. +# 03/10/2004 - Added mpe_mlmosaic_calc and rfcwide_mlmosaic_dir tokens. +# 03/16/2004 - Added rfcwide_lsatpre_dir, rfcwide_satstate_var_dir, +# mpe_lsatpre_calc. +# 03/19/2004 - Added mpe_del_gage_zeros. +# 03/22/2004 - added sshp tokens +# 03/24/2004 - Added rpf_min_dur_filled +# 03/31/2004 - Added SSHP tokens +# 04/26/2004 - added sshp_invoke_map_preprocess and +# sshp_java_process_host tokens for the +# mpe_fieldgen scripts +# 05/06/2004 - Added more RFC archive database (adb) tokens +# 06/28/2004 - Added preadj_outts_dir +# 07/31/2004 - Added gage_pp_userid, gage_pp_host, gage_pp_data, gage_pp_log +# and gage_pp_sleep. +# 08/10/2004 - ssh- Added gage_pp_userid, gage_pp_host, gage_pp_data, +# gage_pp_log, gage_pp_sleep, gage_pp_enable, shef_post_precip +# 08/12/2004 - Added timeseries_begintime, timeseries_endtime, timeseries_mode +# timeseries_showcat, timeseries_linewidth, dam_icon_color +# 10/14/2004 - Added the mpe_generate_list token. BAL +# 10/14/2004 - Removed the tokens: mpe_mlmosaic_calc, mpe_lsatpre_calc +# 11/05/2004 - Corrected spelling of timeseries_endime. RAE +# 11/23/2004 - Added the mpe_show_missing_gage token. +# 01/07/2005 - Added the sum_pc_reports token. This controls how PC-based +# precipitation totals are derived. +# 01/10/2005 - Added the sum_pc_reports token. +# 01/28/2005 - Added AWIPS MODIFICATION BLOCK. When gmake is run in the +# development tree location of .Apps_defaults, a copy of it +# will be placed in /awips/hydroapps with the lines modified +# in the AWIPS modification block to work in the /awips/hydroapps +# tree. +# 01/28/2005 - Modified the definitions of adb_shef_pro_err_dir and +# adb_shef_pro_logs_dir. +# Added the pghost, and pguser, pgport tokens for PostGres. +# 04/21/2005 - Changed shefdecode_host and gage_pp_host to dx. +# 04/28/2005 - Added hv_min_dur_filled token. Added ppp_ppd_local_7am_window +# token. +# 5/5/2005 - Added SSHP tokens sshp_initial_forecast_length, sshp_max_forecast_length, +# sshp_sac_update_expiration_hours, sshp_sac_update_hours_forward. +# Moved sshp_fcst_ts to be next to the rest of the SSHP tokens. +# 5/11/2005 - Changed pguser token value to pguser. +# 6/9/2005 - Changed value of grib_rls (location of gribit executable) +# - Added new tokens mpe_d2d_display_grib, d2d_input_dir, mpe_send_grib +# 6/15/2005 - Changed value for d2d_input_dir token +# 9/13/2005 - Replaced the edit_poly token with the rfcwide_drawpre_dir +# token. This directory will contain the precip edit polygons +# drawn in Hydroview/MPE and applied in MPE Fieldgen. +# 9/22/2005 - Added the rfcwide_gageloc_dir and rfcwide_beamheight_dir tokens. +# 9/27/2005 - Added the hdb_db_name token. Contains the name of the database +# used by the historical data browser. +#10/6/2005 - Modified the value of the rfcwide_utiltriangles_dir token to +# be under local/data/app/mpe instead of local/data/mpe. +#10/6/2005 - Added the mpe_base_radar_mosaic token. +#02/7/2006 - Added the mpe_split_screen token. +#02/8/2006 - Added tokens for the PDC Preprocessor +#02/9/2006 - Added mpe_polygon_action_order and mpe_polygon_field_order +# tokens. +#03/2/2006 - Added new tokens for DailyQC. Added renamed MPE tokens. +#04/19/2006 - Added new tokens for controling the orientation/appearance +# of the historical data browser and the locations of the help +# and configuration directory. +#05/30/2006 - Modified the token values for datview_plot_font and anav_data. +# Added the following tokens for archive database programs: +# adb_shef_pro_tmp_dir, adb_shef_raw_tmp_dir, +# adb_shef_raw_add_adjust, rax_pghost, adb_name +#05/30/2006 - Added the mpe_send_qpe_to_sbn token. +#06/06/2006 - Added the grib_set_subcenter_0 token. +#07/07/2006 - Added the ifp_griddb_dir token. +#09/05/2006 - Added the dhm_d2d_data_dir and dhm_d2d_notify_dir tokens. +#10/02/2006 - Added the sshp_map_qpe_to_use token. +#11/02/2006 - Added the mpe_qpe_grib_sbn_dir token. +#11/17/2006 - Added the mpe_qpe_sbn_dir token. +#05/08/2007 - Added tokens for the rfc bias transfer project. +#05/09/2007 - Added 3 tokens for SRG field directories +#05/14/2007 - Added token for rdhm input directory +#O5/23/2007 - Added sshp_show_simulated_timeseries, changed sshp_background_fcst_length to +# sshp_background_forecast_length +#05/23/2007 - Add tokens for RiverPro: rpf_endtime_shifthrs, +# show_vtecqc_window, event_expire_withinhr +#06/18/2007 - Added the send_local_bias_when_rfc_bias_missing token. +# Biasmesgen reads this token to determine whether or not +# to send the locally generated MPE bias to the RPG if +# the RFC bias is not available. +#06/28/2007 - Added DailyQC preprocessor token dqc_preprocessor_basetime +#07/17/2007 - Added rgb_file_path token. Used by new Color Manager in Hydroview +# and MPE Editor. +#10/24/2007 - Added dhm_rain_plus_melt_data_dir token +#11/08/2007 - Added tokens for IHFS->RAX Synchronization: adb_sync_logs_dir, +# adb_sync_mode, adb_sync_tablenames, adb_sync_ihfs_ingest, adb_sync_rivercrit +#1/16/2008 - added new tokens for disagg processing +# mpe_disagg_execute, mpe_disagg_method, mpe_disagg_6hreq_0,mpe_disagg_6hrgt_0 +#3/22/2008 - Added variable substitution for database port. +# +#3/5/2008 - Modified the value of the mpe_mmosaic_dir token. There was a typo in the +# product name. It was mrmosaic. It is now mmosaic. +#05/19/2008 - Added sshp_hpn_minutes_before and sshp_hpn_minutes_after tokens. +# These tokens define the time window for the SSHP HPN Prerocessor. +#07/07/08 - Added sshp_show_unadjusted_states // for sshp +# +#10/01/09 - Added 5 tokens for arcnav application. //only for arcnav for raxum application +#10/03/12 - Added token section for script execution + + +# ============================================================================== +# To see syntax rules for this file, see the bottom of this file +# +# Also see .Apps_defaults_site for overriding settings +# + +#$============================================================================= +#$ This section contains the tokens whose values are different between the +#$ development and the delivery tree. The value give is the development +#$ value. The commented value is the delivery value. The uncommented value +#$ is in the development tree. All of these tokens must be enclosed +#$ by the AWIPS_MODIFICATION_BLOCK_BEGIN and AWIPS_MODIFICATION_BLOCK_END +#$ tags. Token names and commented lines should at column 1. + +#AWIPS_MODIFICATION_BLOCK_BEGIN + +apps_dir : $(SHARE_DIR)/hydroapps # Hydrologic applications directory + +data_archive_root : /data_store # root directory of the data archive + +mcp3_icp_iface : $(HOME)/mcp3_ntrfc +#mcp3_icp_iface : /tmp/$(LOGNAME)/mcp3_ntrfc + +verify_dir : $(apps_dir)/rfc/verify #base verify directory +#verify_dir : /rfc_arc/verify #base verify directory + +vsys_dir : $(apps_dir)/rfc/verify #base verify directory +#vsys_dir : $(verify_dir) #base verify directory + +#AWIPS_MODIFICATION_BLOCK_END + +#===================== Apps/Script Execution Tokens ================================= +WhfsSrv : ON +WhfsSrv.purge_files : ON +WhfsSrv.run_db_purge : ON +WhfsSrv.run_floodseq : ON +PprocSrv : ON +PprocSrv.purge_mpe_files : ON +PprocSrv.purge_hpe_file : ON +MpeFieldGenSrv.run_mpe_fieldgen : ON +WhfsSrv.run_pdc_pp : ON +WhfsSrv.run_alarm_whfs : ON +WhfsSrv.run_alarm_whfs.run_roc_checker : ON +WhfsSrv.run_alarm_whfs.run_report_alarm : ON +WhfsSrv.run_alarm_whfs.run_report_alarm.textdb : ON +ArealQpeGenSrv : ON +DqcPreProcSrv : ON +DqcPreProcSrv.run_dqc_preprocessor : ON +MpeRUCFreezingLevel : ON +MpeLightningSrv : ON +#==================================================================================== + +# ============================================================================== + +# Executable directory tokens. +sys_java_dir : /awips2/java # Location of Java COTS software +hydro_publicbin : $(apps_dir)/public/bin +sqlcmd_bin_dir : /usr/local/sqlcmd/bin # location of sqlcmd executable on both HP and + # Linux beginning in OB3 + +################################################################################# +# Default Display Maps - comma separated list of maps with no spaces +# Map names can be found in the localization perspective under +# CAVE->Bundles->Maps. Use the filename without the extension. +# statesCounties.xml -> statesCounties +# +# display_maps - default display maps for Hydro Perspective +# mpe_display_maps - default display maps for MPE Perspective +display_maps : statesCounties +mpe_display_maps : statesCounties +################################################################################# + +# database selection tokens +server_name : ONLINE # Informix database server name +db_name : hd_ob92lwx # IHFS database name +damcat_db_name : dc_ob5xxx # Dam Catalog database name +hdb_db_name : ob81_histdata # Historical database. +pghost : localhost # The machine PostGres is running on +pguser : awips # The user allowed to access PostGres +pgport : 5432 # The PostGres Server port +adb_name : adb_ob7xxx # RFC archive database name +rax_pghost : ax # The machine PostGres is running on for the adb + +# vacuum log dir token. +vacuum_log_dir : $(whfs_log_dir)/vacuum + +# WHFS specific tokens +whfs_tz : EST5EDT # WHFS time zone for local time +whfs_primary_radar : TLX # WHFS primary radar id, for Stage II + +# damcat tokens +damcat_hostoffice_type : wfo # source of run-from office +damcat_office_datasource : ohd # which data source is used +max_storage_value : 0.00 # max storage volume filter +damcat_data : /tmp/damcatData + +# Damcrest tokens +damcrest.db_enabled : true # set to true when the user has damcat database +damcrest.hasListAllDams : true # when set to true, all dams will be displayed initially + +# Path to the editor used by Damcrest +damcrest.editor : /usr/bin/gvim + +# Path to the damcrest data directory where input and output files +# of the model are stored +damcrest_data_dir : $(whfs_local_data_dir)/damcrest + +# Path to the directory where .vimrc resource file resides. +# This resource file is needed when editor in Damcrest application +# is set to gvim. +damcrest_res_dir : $(whfs_config_dir)/damcrest + +#===================== SHEFDECODE Application Tokens ================================ + +shefdecode_userid : oper # controlling UNIX user +shefdecode_host : dx1f # controlling UNIX system. +shefdecode_dir : $(apps_dir)/shefdecode # main directory location +shefdecode_bin : $(shefdecode_dir)/bin # executable programs location +shefdecode_input : $(shefdecode_dir)/input # SHEF parameter file location +shef_data_dir : /data/fxa/ispan/hydro # input products location + +shefdecode_log : $(shefdecode_dir)/logs/decoder # daily log files location +shef_error_dir : $(shefdecode_dir)/logs/product # product log files location +shef_keeperror : ALWAYS # keep product log files (=ALWAYS) or + # only when errors occur (=IF_ERROR) +shef_perflog : ON # ON/OFF - create a separate performance log file to + # save internal decoder timing messages for + # monitoring performance +shef_data_log : ON # ON/OFF - include messages in the log file detailing + the SHEF records +dupmess : ON # ON/OFF - include messages in the log file about + # duplicate data +elgmess : ON # ON/OFF - include messages in the log file about + # data types not found in IngestFilter or + # data types turned off in IngestFilter +locmess : ON # ON/OFF - include messages in the log file about + # stations and areas not found in Location + # or GeoArea + +shef_sleep : 10 # sleep duration in seconds in between queries +shef_winpast : 10 # number of days in past to post data +shef_winfuture : 30 # number of minutes in future to post obs data +shef_duplicate : IF_DIFFERENT # flag for handling duplicate date + # ALWAYS_OVERWRITE-always overwrite when value repeats + # USE_REVCODE-if revcode set overwrite duplicate value + # IF_DIFFERENT-overwrite if new value is different + # IF_DIFFERENT_OR_REVCODE-overwrite if new value is + # different or revcode is set +shef_load_ingest : ON # ON/OFF - automatically load the IngestFilter table or not + # with (station id-PEDTSE) combinations as they + # arrive in the input data flow +shef_storetext : OFF # ON/OFF - post/don't post raw encoded SHEF text messages + # to the TextProduct table +shef_post_unk : NONE # NONE - do not post to the UnkStn nor UnkStnValue tables + # IDS_ONLY - post only location identifiers for unknown + # stations to the UnkStn table + # IDS_AND_DATA - post all data from unknown stations to + # the UnkStnValue table +shef_post_baddata : REJECT # PE/REJECT - post data that have failed the gross range + # check to the physical element data tables (=PE) OR + # to the RejectedData table (=REJECT) +shef_procobs : OFF # ON/OFF - post Processed data values (i.e., TS=P*) to + # the observation data tables (=ON) or to + # the ProcValue table (=OFF) +shef_post_latest : ON # ON/OFF - post/don't post data to the LatestObsValue table + # VALID_ONLY - post data to the LatestObsValue table + # ONLY if the gross range check is passed +shef_post_link : ON # ON/OFF - post/don't post data to the ProductLink table +shef_load_maxfcst : ON # ON/OFF - after each product that resulted in forecast + # height or discharge data being posted, load + # the maximum forecast data into the RiverStatus table +shef_alertalarm : ON # ON/OFF - causes shefdecoder to screen data against + # alert and alarm thresholds +# -- Intermediate output from ShefParser prior to post +shef_out : OFF + + +#===================== WHFS Applications Tokens ================================ + +whfs_base_dir : $(apps_dir)/whfs # top of the WHFS tree +whfs_local_dir : $(whfs_base_dir)/local # top of WHFS local tree +whfs_local_data_dir : $(whfs_local_dir)/data # top of WHFS local data tree +whfs_local_grid_dir : $(whfs_local_data_dir)/grid # top of WHFS grids tree +whfs_log_dir : $(whfs_local_data_dir)/log # top of WHFS logs tree + +whfs_local_bin_dir : $(whfs_local_dir)/bin # local WHFS executables + +whfs_geodata_dir : $(whfs_local_data_dir)/geo # WHFS map backgrounds +whfs_image_dir : $(whfs_local_data_dir)/image # user-saved image files +whfs_import_dir : $(whfs_local_data_dir)/import # files to import into WHFS +whfs_product_dir : $(whfs_local_data_dir)/product # WHFS generated external products +whfs_report_dir : $(whfs_local_data_dir)/report # user-saved text reports +whfs_lines_per_page : 60 + +whfs_config_dir : $(whfs_local_data_dir)/app # WHFS app configuration files +rpf_template_dir : $(RPF_TEMPLATE_DIR) # RiverPro templates +metar_config_dir : $(whfs_config_dir)/metar2shef # METAR translator config +metar2shef_options : " -a -b -p1 -y2k -salias -p6 -p24 -round -w -strip " +ts_config_dir : $(whfs_config_dir)/timeseries # Time Series config +hv_config_dir : $(whfs_config_dir)/hydroview # Hydroview pixmaps etc. +hv_help_dir : $(hv_config_dir)/help/ # Hydroview Help direc. +rivermon_config_dir : $(whfs_config_dir)/rivermon/ # RiverMonitor Conf dir. + +whfs_misc_grid_dir : $(whfs_local_grid_dir)/misc # misc WHFS grids + +rgb_file_path : /usr/share/X11/rgb.txt # Location of X/Motif color file. + +rpf_log_dir : $(RPF_LOG_DIR) # RiverPro logs +rivermon_log_dir : $(whfs_log_dir)/rivermon # RiverMonitor logs +obsfcstmonitor_log_dir : $(whfs_log_dir)/obsfcst_monitor # ObsFcstMonitor logs +whfs_util_log_dir : $(whfs_log_dir)/misc # WHFS misc logs +precip_accum_log_dir : $(whfs_log_dir)/precip_accum # precip_accum logs +floodseq_log_dir : $(whfs_log_dir)/floodseq # flood sequencer logs +metar_log_dir : $(whfs_log_dir)/metar2shef # METAR translator logs +hb_gagrad_log_dir : $(whfs_log_dir)/create_gagradloc # gage-radar locator logs +qcalarm_log_dir : $(whfs_log_dir)/qcalarm # batch QC logs + +db_purge_log_dir : $(whfs_log_dir)/db_purge # db_purge token +db_purge_backup_retention_use : ON # db_purge token for using backup retention value + +purge_files_log_dir : $(whfs_log_dir)/misc # purge_files token + +whfs_bin_dir : $(whfs_base_dir)/bin # WHFS executables +sws_parent_dir : $(whfs_bin_dir) # SWS parent dir +sws_home_dir : $(whfs_bin_dir)/pa # SWS dir + +# ----------------------------------------------------------------- +# The Gage Precip Processor tokens +# ----------------------------------------------------------------- + +gage_pp_userid : oper # controlling UNIX user +gage_pp_host : dx # controlling UNIX system +gage_pp_data : $(pproc_local_data)/gpp_input # input data files location +gage_pp_log : $(pproc_log)/gage_pp # daily log files location +gage_pp_sleep : 10 # sleep duration in seconds in between queries +gage_pp_enable : ON # gpp enabled; shef uses to determine post +shef_post_precip : OFF # post to Precip/CurPrecip tables +build_hourly_enable : ON # Enable the build_hourly application + +# ---------------------------------------------------------------- +# The following tokens are most likely to be customized by the user +# (the first 4 MUST be customized at each site in the .Apps_defaults_site file) +# ---------------------------------------------------------------- +hv_center_lat : 35.0 # HydroView center latitude +hv_center_lon : -97.8 # HydroView center longitude +hv_height_in_pixels : 900 # Hydroview map height in pixels +hv_width_in_pixels : 1200 # Hydroview map width in pixels +hv_map_width : 320 # HydroView map width (nautical miles) +hv_pointdata_display : ON # Hydroview point data display flag (ON, OFF) +hv_hours_in_window : 4 # Change window hours +hv_zoom_out_limit : 20 # Limits how far the map can be zoomed out +hv_disclosure_limit : 60 # Prog disclosure limit +hv_zoom_threshold : 150 # nautical miles; Hydroview + # detail level for cities/towns +hv_map_projection : FLAT # Sets default map projection used in + # hydroview/MPE. Options are FLAT, POLAR + # or HRAP. +hv_refresh_minutes : 15 # HydroView auto refresh time (minutes) +hv_riverbasis : maxobsfcst # initial river basis for river characteristics +hv_min_dur_filled : 0.0 # Minimum percentage of accum interval covered + # by precip data. +ppp_ppd_local_7am_window : 3 # Number of +/- hours around 7 AM local to + # to use PPP and PPD reports for 24 hour + # precip summaries. + # values either obs, fcst, maxobsfcst +shefencode_prodid : CCCCNNNXXX # product identifier for outgoing SHEF + # encoded messages from Hydro Time Series +whfs_editor : whfs_editor # WHFS text editor +rpf_linewidth : 80 # width of line in RiverPro generated products +rpf_min_dur_filled : 0.25 # min percent time of requested precip dur in RiverPro +office_prefix : K # fourth char prepended to 3-char office id +vtec_record_stageoffset : 2.0 # ft offset from record value for H-VTEC field +vtec_record_flowoffset : 5000.0 # cfs offset from record value for H-VTEC field +pproc_s2_gridgen_hrs : 5 # WHFS Stage II lookback (hours) +whfs_min_dur_filled : 0.83 # WHFS min fractional time duration needed for radar accumulations +whfs_min_area_covered : 0.80 # WHFS min fractional area needed to compute MAPs +whfs_printcommand_HP : lp # command used to print WHFS apps reports on HP +whfs_printcommand_LX : lp # command used to print WHFS apps reports + # on LX +whfs_e19_print_command : "lp -o cpi=19 -o lpi=7" # command used to print e19 text reports + +dam_icon_color : BROWN # Color used for dam icon in Hydroview +timeseries_begintime : 5 # number of days back relative to current time +timeseries_endtime : 3 # number of days ahead relative to current time +timeseries_showcat : 2 # scale by data and show categories +timeseries_linewidth : 1 # width of line drawn on graph +timeseries_mode : STATION # set to GROUP or STATION mode +timeseries_dist_shef : OFF # ON/OFF token for the shef send script distribute check box + # Defaults to off if not set +rpf_stage_window : 0.5 # set stage window for determining the trend + # variables in RiverPro +show_vtecqc_window : IF_ERROR #or ALWAYS, used in RiverPro +rpf_endtime_shifthrs : 6 # in RiverPro +event_expire_withinhr : 3 # in RiverPro + +#=====Tokens To Generate Areal FFG from Mosaicked FFG Grids for Use By SSHP===== +# (NOTE: gaff_rfc_list MUST be customized at EVERY Field Office) + +gaff_execution : ON # ON/OFF token for the gen_areal_ffg process + # the gen_areal_ffg process is run from the + # process_dpa_files script at WFOs +gaff_rfc_list : ABRFC,LMRFC # list of RFCs to be mosaicked + # list is comma separated, no embedded + # spaces are allowed +gaff_input_dir : $(EDEX_HOME)/data/processing + # directory containing gridded FFG + # generated by RFCs +gaff_look_back_limit : 60 # number of hours to look back for valid gridded + # FFG data for input +gaff_mosaic_dir : $(whfs_misc_grid_dir) # directory containing output + # mosaicked gridded FFG in + # netCDF format +gaff_durations : 1,3,6 # FFG durations in hours + # list is comma separated, no embedded + # spaces are allowed + + +# ================= "ds_" system tokens (see more in site file) =============== + +ofs_dir : $(apps_dir)/rfc/nwsrfs/ofs +util_dir : $(apps_dir)/rfc/nwsrfs/util +calb_dir : $(apps_dir)/rfc/nwsrfs/calb +ifp_dir : $(apps_dir)/rfc/nwsrfs/ifp +icp_dir : $(apps_dir)/rfc/nwsrfs/icp +ens_dir : $(apps_dir)/rfc/nwsrfs/ens +fld_dir : $(apps_dir)/rfc/fld + + +hdb_dir : $(apps_dir)/rfc/hdb + +# = = = = = = = = = = = = = = = = = = = = = = end "ds_" system requirements = = + +ofs_rls : $(ofs_dir)/bin/RELEASE +util_rls : $(util_dir)/bin/RELEASE +calb_rls : $(calb_dir)/bin/RELEASE +ffg_rls : $(ffg_dir)/bin/RELEASE +ifp_rls : $(ifp_dir)/bin/RELEASE +icp_rls : $(icp_dir)/bin/RELEASE +ens_rls : $(ens_dir)/bin/RELEASE +hdb_rls : $(hdb_dir)/bin/RELEASE +fld_rls : $(fld_dir)/bin/RELEASE +xsets_rls : $(xsets_dir)/bin/RELEASE +xnav_rls : $(xnav_dir)/bin/RELEASE +xdat_rls : $(xdat_dir)/bin/RELEASE + +ofs_arc : $(ofs_dir)/bin/ARCHIVE +util_arc : $(util_dir)/bin/ARCHIVE +calb_arc : $(calb_dir)/bin/ARCHIVE +ffg_arc : $(ffg_dir)/bin/ARCHIVE +ifp_arc : $(ifp_dir)/bin/ARCHIVE +icp_arc : $(icp_dir)/bin/ARCHIVE +ens_arc : $(ens_dir)/bin/ARCHIVE +hdb_arc : $(hdb_dir)/bin/ARCHIVE +fld_arc : $(fld_dir)/bin/ARCHIVE +xsets_arc : $(xsets_dir)/bin/ARCHIVE +xnav_arc : $(xnav_dir)/bin/ARCHIVE +xdat_arc : $(xdat_dir)/bin/ARCHIVE +# = = = = = = = = = = = = = = = = = = = = = = end of other "ds_" tokens = = = = + +# LDAD shefencode tokens +ldad_data_dir : /awips/ldad/data # the LDAD internal data dir +shefenc_pe_table : $(ldad_data_dir)/ShefEncoder_PE.tbl +shefenc_units_table : $(ldad_data_dir)/ShefEncoder_Units.tbl + +# NWSRFS tokens + +rfs_dir : $(apps_dir)/rfc/nwsrfs # Top-level rfs mt. +rfs_sys_dir : $(rfs_dir)/sys_files # RFS system files +rfs_doc : $(rfs_dir)/doc # NWSRFS documentation + +# OFS tokens +locks_dir : $(rfs_dir)/locks +ofs_lock_max_wait : 60 # no. of mins to wait to get an ofs lock +ofs_lock_wait_interval : 5 # no. of secs 'tween retries to get an ofs lock +ofs_locks_max_pass : 4 # no. of attempts to make to get a set of locks. + +ofs_level : oper +ofs_reor_lvl : oper_new +ofs_inpt_grp : oper + +home_files_workstation : ds + +ofs_log_output : off # whether to output file r/w info +ofs_error_output : on # whether to output file error info +fortran_stderr : 7 # FORTRAN standard error unit + +ofs_bin : $(ofs_dir)/bin # OFS executables dir +ofs_files : $(ofs_dir)/files # OFS file group +ofs_fs5files : $(ofs_files)/$(ofs_level)/fs5files # OFS files dir +ofs_reorder_dir : $(ofs_files)/$(ofs_reor_lvl)/fs5files # OFS reordered files +ofs_output : $(ofs_dir)/output # OFS output dir +ofs_input : $(ofs_dir)/input/$(ofs_inpt_grp) # OFS input dir +ofs_input_dflt : $(ofs_dir)/input/$(ofs_inpt_grp) # OFS input dir +ofs_shefdata_dir: $(ofs_files)/$(ofs_level)/shefdata # OFS SHEF data dir +ofs_shefout_dir : $(ofs_files)/$(ofs_level)/shefdata # OFS shefout file dir +ofs_mods_dir : $(ofs_files)/$(ofs_level)/mods # OFS MODS files dir +ofs_griddb_dir : $(ofs_files)/$(ofs_level)/griddb # OFS gridded fields +ofs_scripts : $(ofs_dir)/scripts # OFS scripts dir +ofs_server : apwk01g2 # OFS "slave" server +my_output : $(ofs_output)/$(LOGNAME) # users ofs output files + +ndfd2rfs_input : $(ofs_files)/$(ofs_level)/ndfd +ndfd2rfs_output : $(my_output) +ndfd2rfs_log_level : 0 + +fldview_dir : $(apps_dir)/rfc/fldview/floodmapdata + +# calb tokens +calb_bin : $(calb_dir)/bin +calb_lib : $(calb_dir)/lib + +calb_data_grp : oper +calb_inpt_grp : oper +calb_input : $(calb_dir)/input/$(calb_inpt_grp) +calb_output : $(calb_dir)/output +calb_sta_ts_dir : $(calb_dir)/data/sta_ts/$(calb_data_grp) +calb_area_ts_dir : $(calb_dir)/data/area_ts/$(calb_data_grp) +peakflow_data_dir : $(calb_dir)/data/area_ts/$(calb_data_grp) + +calb_gzio_read : off # whether or not to read gzipped DATACARD files +calb_gzio_write : off # whether or not to write gzipped DATACARD files + +nwsrfs_calbfile_default : CARD # default calibration file type +nwsrfs_platform : AIX # operating system + +# ICP tokens +icp_bin : $(icp_dir)/bin +icp_pw : hILLEL +icp_scripts : $(icp_dir)/scripts + +mcp_decks : $(calb_input)/mcp3 +mcp_dir : $(calb_rls) + +# IFP tokens +ifp_help_dir : $(ifp_dir)/help_files # IFP help files +ifp_bin_dir : $(ifp_dir)/bin/RELEASE # IFP bin files - ref in code +ifp_nwsrfs_bin_dir : $(ifp_dir)/bin/RELEASE # ifp_nwsrfs bin - ref in code +ifp_sys_dir : $(ifp_dir)/system # IFP system files +ifp_scripts_dir : $(ifp_dir)/scripts # IFP script files +ifp_options_dir : $(ifp_dir)/options # IFP options files +ifp_colors_dir : $(ifp_options_dir)/colors # IFP color files +ifp_fs5files : $(HOME)/ofs_ifp/fs5files # user copy of fs5files +ifp_rfc : host # name of RFC to run +ifp_num_columns : 3 # number of columns to display +ifp_gif_files : $(ofs_files)/$(ofs_level)/gif_files # gif files directory +ifp_sacco_dir : $(ofs_files)/$(ofs_level)/sacsnow_clim +ifp_dhm_data_dir : /data/dhm/$(LOGNAME) +ifp_griddb_dir : $(ifp_dhm_data_dir)/precip + +# Ensemble (ens) tokens + +espts_dir : $(ens_dir)/files/$(ofs_level)/espts #espts files esp +espadp_dir : $(ens_dir) +preadj_dir : $(ens_dir)/files/$(ofs_level)/cpc_fcsts +ens_input : $(ens_dir)/input/$(ofs_level) +ens_output : $(ens_dir)/output +ens_files : $(ens_dir)/files/$(ofs_level) +ens_scripts : $(ens_dir)/scripts + +# ens_pre tokens +##FXA_HOME : /px1data #taken out by kwz.2/11/04 +enspre_griddb : $(FXA_DATA)/Grid/SBN/netCDF/CONUS211/CPCoutlook +ens_log_dir : $(ens_output)/$(ofs_level) +ens_msglog_level : 5 +preadj_outts_dir : $(calb_area_ts_dir)/pre + +# FLDGRF tokens (added 6 April 2000) + +fldgrf_iface : $(HOME)/fldgrf + +# ofsde tokens + +ofsde_log_dir : $(ofs_output)/ofsde_logs # ofsde log dir + # (formerly ofsde_output_dir) +ofsde_ndate : 7 # number of days to search for forecast temps +ofsde_rrstime_check : OFF # flag to check obs times of RRS data + # against window around 12Z (OFF/ON) + +# intervals for max/min temperatures (used by ofsde) +# these represent number of hours around 12z + +intlrmn : 8 +inturmn : 2 +intlrzn : 2 +inturzn : 2 +intlrzx : 8 +inturzx : 2 +siipp_calc_624_PP : OFF # flag for calculating 6hr and 24hr + # PP data from PC data + # if running RFCWide, should be set to OFF + +# defaults for geographic data + +geo_data : $(apps_dir)/geo_data +geo_util : $(geo_data)/util + +geo_ifp_bin : $(geo_data)/$(ifp_rfc)/binary +geo_ifp_ascii : $(geo_data)/$(ifp_rfc)/ascii + +#===================== PRECIP_PROC Application Tokens ======================== + +# precip_proc directory + +pproc_dir : $(apps_dir)/precip_proc # precip proc top + # level dir +pproc_bin : $(pproc_dir)/bin # dir with precip proc exes +pproc_local : $(pproc_dir)/local # dir with local items, esp. data +pproc_local_data : $(pproc_local)/data # dir with local data +pproc_local_bin : $(pproc_local)/bin # dir with local bin +pproc_log : $(pproc_local_data)/log # dir with local logs + +pproc_util_log_dir : $(pproc_log)/misc # miscellaneous logs + +# DecodeDPA tokens (formerly DecodeHDP tokens that looked like hdp_*) + +dpa_log_dir : $(pproc_log)/decodedpa # DPA Decoder logs +dpa_prod_dir : /data/fxa/ispan/hdp # DPA input directory +dpa_gather : $(pproc_local_data)/dpa_gather # DPA gather directory +dpa_error_dir : $(pproc_local_data)/stage1_error # DPA error files +dpa_arch_dir : $(pproc_local_data)/stage1_archive # DPA archives +dpa_wind : 10 + + +dpa_filter_decode : ON # flag for non-top-of-hour + # filtering of decoded products + # ON - filter products for decode + # OFF - do not filter (ie decode all products) + +dpa_decode_window : 10 # number of minutes around top + # of hour for filtering products for + # decoding + +dpa_archive : OFF # ON/OFF flag for archiving products + # OFF - do not archive products + # ON - archive products and filter based + # on value of dpa_archive_window + +dpa_archive_window : 10 # number of minutes around top + # of hour for filtering products for archiving + +dpa_dirname1 : $(data_archive_root)/radar # first part of directory name + # containing DPA products for + # associated or dial in radars +dpa_dirname2 : DPA/layer0/res4/level256 # second part of directory name + # containing DPA products for + # associated or dial in radars +dpa_grid_dir : $(pproc_local_data)/stage1_decoded # decoded DPA radar grids + +# siipp tokens + +intpc : 10 # interval (minutes) around top of hour for using PC data +intlppp : 2 +intuppp : 2 +intppq : 2 +siipp_log_dir : $(pproc_log)/siipp # Stage II preprocessor logs + # (formerly siipp_output_dir) + +# tokens for stageiii +st3_help : $(pproc_local_data)/app/stage3/help # online help text + +st3_rfc : host +awips_rfc_id : TUA # 3 char AWIPS RFC identifier + # must be all upper case + +# tokens for stageiii output +st3_mapx_id : xmrg # identifier for Stage 3 output +st3_date_form : mdY # date format + # current allowable = Ymd or mdY + # similar to formatting codes for + # strftime function + +st3_output : $(ofs_griddb_dir) # dir for xmrg files for MAPX + # ofs_griddb_dir defined outside of pproc +st3_out_dir : $(pproc_local_data)/stage3 +post_output : $(st3_out_dir)/post_analysis + +# defaults for netCDF output + +st3_netcdf_loc : arkansas_red_basin_river_forecast_center_tulsa_ok + # underscores needed between words +st3_netcdf_swlat : 33.603 +st3_netcdf_swlon : 106.456 +st3_netcdf_selat : 32.433 +st3_netcdf_selon : 92.322 +st3_netcdf_nelat : 38.027 +st3_netcdf_nelon : 90.678 +st3_netcdf_nwlat : 39.420 +st3_netcdf_nwlon : 106.652 + +#defaults for auto stageiii +st3_auto_graphic_scale : 2.4 # used by gif file generation + +#===================== disagg Tokens (old disagg process)======================== + +disagg_msglog_level : 30 # message level + # possible values are 1,10,20,30,...80 + # lower values signify less info in log + +disagg_dur : 24 # maximum duration of precip gage data to + # be disaggregated + # possible values = 2,3,...,24 + +disagg_look_back : 0 # time (hours) to look back from current hour + # for precip gage data to be disaggregated + +disagg_radius : 3 # number of HRAP bins within which the QPE + # will be averaged for disagg + # for example, if disagg_radius = 3, then + # the 9 nearest neighbor QPE bin values + # will be averaged +disagg_set_date : 0 # identifier for current date (yyyymmdd). + # Default value is 0 - set to + # today date + +disagg_set_hour : 0 # identifier for current hour (hh). + # Default value is 0 + # Possible values = 0,1,2,3,...,23 + +disagg_log_dir : $(pproc_log)/disagg # directory containing disagg logs + +# =============== Multi-Sensor Precipitation Estimator (MPE) ================ + +rfcw_rfcname : host +rfcwide_logs_dir : $(pproc_log)/mpe_fieldgen +hmap_mpe_timelapse : 1000 # time between images, in milliseconds, for the MPE + # time lapse display + +### tokens for input ### + +rfcwide_input_dir : $(pproc_local_data)/app/mpe + +rfcwide_satpre_dir : $(mpe_fieldgen_product_dir)/satpre + +# the help_dir token needs a trailing slash because it is required byt +# the RFC software the processes the help info... + +rfcwide_help_dir : $(rfcwide_input_dir)/help/ +rfcwide_misbin_dir : $(rfcwide_input_dir)/misbin +rfcwide_prism_dir : $(rfcwide_input_dir)/prism +rfcwide_gageloc_dir : $(rfcwide_input_dir)/gage_locations +rfcwide_beamheight_dir : $(rfcwide_input_dir)/beam_height +rfcwide_utiltriangles_dir : $(rfcwide_input_dir)/utiltriangles + +### tokens for output ### +### NOTE: xmrg files are stored in dir defined by rfcwide_xmrg_dir token below + +rfcwide_output_dir : $(pproc_local_data)/mpe # fka ofs_griddb_dir defined outside of pproc + +rfcwide_gagetriangles_dir : $(rfcwide_output_dir)/gagetriangles +rfcwide_drawpre_dir : $(rfcwide_output_dir)/draw_precip + +rfcwide_avg_rmosaic_dir : $(rfcwide_output_dir)/avgrmosaic +rfcwide_max_rmosaic_dir : $(rfcwide_output_dir)/maxrmosaic +rfcwide_rmosaic_dir : $(rfcwide_output_dir)/rmosaic +rfcwide_bmosaic_dir : $(rfcwide_output_dir)/bmosaic +rfcwide_mmosaic_dir : $(rfcwide_output_dir)/mmosaic +rfcwide_mlmosaic_dir : $(rfcwide_output_dir)/mlmosaic +rfcwide_lmosaic_dir : $(rfcwide_output_dir)/lmosaic +rfcwide_lsatpre_dir : $(rfcwide_output_dir)/lsatpre +rfcwide_gageonly_dir : $(rfcwide_output_dir)/gageonly + +rfcwide_height_dir : $(rfcwide_output_dir)/height +rfcwide_index_dir : $(rfcwide_output_dir)/index +rfcwide_locbias_dir : $(rfcwide_output_dir)/locbias +rfcwide_locspan_dir : $(rfcwide_output_dir)/locspan +rfcwide_p3lmosaic_dir : $(rfcwide_output_dir)/p3lmosaic + +rfcwide_xmrg_dir : $(rfcwide_output_dir)/qpe +rfcwide_statevar_dir : $(rfcwide_output_dir)/state_var +rfcwide_sat_statevar_dir : $(rfcwide_output_dir)/sat_state_var +mpe_q2_statevar_dir : $(rfcwide_output_dir)/q2_state_var + +# ==================== MPE Tokens =============================== + +#daily qc options token defaults to 'off' where daily qc options are grayed out; values are 'on' and 'off' +mpe_dqc_options : off +mpe_map_background_color : GRAY20 # The default color of the MPE map background +mpe_temperature_window : 60 # The window in minutes the dqc preprocessor + # searches around a synoptic time + # (00z,06z,12z,18z) for temperature data. +mpe_maxminT_hour_window : 2 +mpe_dqc_max_precip_neighbors : 30 +mpe_dqc_max_temp_neighbors : 20 +mpe_dqc_precip_deviation : 3.0 +mpe_dqc_temperature_deviation : 10.0 +mpe_dqc_min_good_stations : 5 +mpe_copy_level2_dqc_to_ihfs_shef : OFF +mpe_copy_level2_dqc_to_archive_shef : OFF +mpe_dqc_num_days : 10 +mpe_dqc_warningpopup : on +mpe_dqc_6hr_24hr_set_bad : OFF # Define logic if user sets a 6hr value to Bad in the + # Edit Precip Stations window. + # OFF – if user sets 6hr value to Bad; 24hr value unaffected + # ON - if user sets 6hr value to Bad; 24hr value set to Bad + # Added at request of MBRFC to help with QC of SNOTEL. + +mpe_dqc_grid_max_dist : 70 # Max distance (units of grid bins) between a grid bin and a + # station to use the station to estimate the value at the grid bin. + +mpe_dqc_output_qc_file : OFF # ON/OFF default = OFF + +mpe_dqc_execute_internal_script : OFF # ON/OFF + +mpe_dqc_24hr_precip_grid_meth : USE_24HR # We use the token values of ACCUM_6HR and USE_24HR +mpe_td_new_algorithm : OFF # flag set for new algorithm in calculating Time Distributed estimate, the default + # is false +mpe_dqc_gridtype : SCALAR +mpe_dqc_projectiontype : POLAR_STEREOGRAPHIC +mpe_dqc_lonorigin : -105. + +#daily qc preprocessor tokens +dqc_preprocessor_basetime : 12Z #The value can be 12Z, 18Z, 00Z, or 06Z + +### MPE base directory tokens. +mpe_dir : $(pproc_local_data)/mpe +mpe_gageqc_dir : $(mpe_dir)/dailyQC +mpe_scratch_dir : $(mpe_gageqc_dir)/scratch +mpe_app_dir : $(pproc_local_data)/app/mpe +mpe_fieldgen_product_dir : $(mpe_dir) + +### MPE station list tokens +mpe_station_list_dir : $(mpe_app_dir)/station_lists +mpe_site_id : ounx +mpe_area_names : $(mpe_site_id) + +### MPE static data files +mpe_prism_dir : $(mpe_app_dir)/prism +mpe_misbin_dir : $(mpe_app_dir)/misbin +mpe_utiltriangles_dir : $(mpe_app_dir)/utiltriangles +mpe_beamheight_dir : $(mpe_app_dir)/beam_height +mpe_climo_dir : $(mpe_app_dir)/climo +mpe_help_dir : $(mpe_app_dir)/help +mpe_gridmask_dir : $(mpe_app_dir)/grid_masks +mpe_basin_file : $(whfs_geodata_dir)/basins.dat + +### MPE precipitation gage qc directories +mpe_precip_data_dir : $(mpe_gageqc_dir)/precip +mpe_bad_precip_dir : $(mpe_precip_data_dir)/bad +mpe_dev_precip_dir : $(mpe_precip_data_dir)/dev +mpe_map_dir : $(mpe_precip_data_dir)/MAP +mpe_grid_precip_dir : $(mpe_precip_data_dir)/grid +mpe_point_precip_dir : $(mpe_precip_data_dir)/point + +### MPE temperature gage qc directories +mpe_temperature_data_dir : $(mpe_gageqc_dir)/temperature +mpe_bad_temperature_dir : $(mpe_temperature_data_dir)/bad +mpe_dev_temperature_dir : $(mpe_temperature_data_dir)/dev +mpe_mat_dir : $(mpe_temperature_data_dir)/MAT +mpe_grid_temperature_dir : $(mpe_temperature_data_dir)/grid +mpe_point_temperature_dir : $(mpe_temperature_data_dir)/point + +### MPE freezing level gage qc directories +mpe_freezing_data_dir : $(mpe_gageqc_dir)/freezing_level +mpe_maz_dir : $(mpe_freezing_data_dir)/MAZ +mpe_grid_freezing_dir : $(mpe_freezing_data_dir)/grid +mpe_point_freezing_dir : $(mpe_freezing_data_dir)/point +ruc_model_data_dir : /data/fxa/Grid/SBN/netCDF/CONUS211/RUC + +### MPE 1 hour mosaics and fields and supporting reference fields. +mpe_avgrmosaic_dir : $(mpe_fieldgen_product_dir)/avgrmosaic +mpe_maxrmosaic_dir : $(mpe_fieldgen_product_dir)/maxrmosaic +mpe_bmosaic_dir : $(mpe_fieldgen_product_dir)/bmosaic +mpe_d2d_files_dir : $(mpe_fieldgen_product_dir)/d2d_files +mpe_polygon_dir : $(mpe_fieldgen_product_dir)/edit_polygon +mpe_gageonly_dir : $(mpe_fieldgen_product_dir)/gageonly +mpe_gagetriangles_dir : $(mpe_fieldgen_product_dir)/gagetriangles +mpe_height_dir : $(mpe_fieldgen_product_dir)/height +mpe_index_dir : $(mpe_fieldgen_product_dir)/index +mpe_lmosaic_dir : $(mpe_fieldgen_product_dir)/lmosaic +mpe_locbias_dir : $(mpe_fieldgen_product_dir)/locbias +mpe_locspan_dir : $(mpe_fieldgen_product_dir)/locspan +mpe_lsatpre_dir : $(mpe_fieldgen_product_dir)/lsatpre +mpe_mlmosaic_dir : $(mpe_fieldgen_product_dir)/mlmosaic +mpe_mmosaic_dir : $(mpe_fieldgen_product_dir)/mmosaic +mpe_qmosaic_dir : $(mpe_fieldgen_product_dir)/qmosaic +mpe_lqmosaic_dir : $(mpe_fieldgen_product_dir)/lqmosaic +mpe_mlqmosaic_dir : $(mpe_fieldgen_product_dir)/mlqmosaic +mpe_p3lmosaic_dir : $(mpe_fieldgen_product_dir)/p3lmosaic +mpe_qpe_dir : $(mpe_fieldgen_product_dir)/qpe +mpe_qpe_sbn_dir : $(mpe_fieldgen_product_dir)/qpe_sbn +mpe_qpe_gif_dir : $(mpe_fieldgen_product_dir)/qpe_gif +mpe_qpe_grib_dir : $(mpe_fieldgen_product_dir)/qpe_grib +mpe_qpe_grib_sbn_dir : $(mpe_fieldgen_product_dir)/qpe_grib_sbn +mpe_qpe_jpeg_dir : $(mpe_fieldgen_product_dir)/qpe_jpeg +mpe_qpe_netcdf_dir : $(mpe_fieldgen_product_dir)/qpe_netcdf +mpe_rmosaic_dir : $(mpe_fieldgen_product_dir)/rmosaic +mpe_sat_state_var : $(mpe_fieldgen_product_dir)/sat_state_var +mpe_state_var : $(mpe_fieldgen_product_dir)/state_var +mpe_srmosaic_dir : $(mpe_fieldgen_product_dir)/srmosaic +mpe_sgmosaic_dir : $(mpe_fieldgen_product_dir)/sgmosaic +mpe_srgmosaic_dir : $(mpe_fieldgen_product_dir)/srgmosaic +mpe_satpre_dir : $(mpe_fieldgen_product_dir)/satpre +mpe_rfcmmosaic_dir : $(mpe_fieldgen_product_dir)/rfcmmosaic +mpe_rfcbmosaic_dir : $(mpe_fieldgen_product_dir)/rfcbmosaic +mpe_localfield1_dir : $(mpe_fieldgen_product_dir)/localfield1 +mpe_localfield2_dir : $(mpe_fieldgen_product_dir)/localfield2 +mpe_localfield3_dir : $(mpe_fieldgen_product_dir)/localfield3 + +### Tokens related to the MPE Editor map display. +mpe_config_dir : $(whfs_config_dir) +mpe_center_lat : 39.8 +mpe_center_lon : -98.55 +mpe_height_in_pixels : 900 +mpe_width_in_pixels : 1200 +mpe_map_width : 1320 +mpe_zoom_out_limit : 20 +mpe_disclosure_limit : 60 +mpe_map_projection : FLAT + +### Misc tokens +mpe_load_hourlypc : ON +mpe_gageqc_gif_dir : $(whfs_image_dir) +mpe_gif_location : 34.0,-97.0,34.0,-94.0,33.0,-94.0 +mpe_overlay_dir : $(whfs_geodata_dir) +mpe_editor_logs_dir : $(pproc_log)/mpe_editor +mpe_type_source : RG:GOES,RR:ALERT,RM:SNOTEL,RP:LARC,RZ:COOP + +### New tokens for DQC/CHPS +mpe_level2_type_value : 2 # Allow user to customize the type value. The default is “2” +mpe_td_details_set : OFF # Allow generating a time distribution details file. +mpe_process_PC : ON # Skip call to the load_PC_hourly routine if "OFF" +mpe_map_one_zone : OFF # Allow MAP generation for one zone only +fewsgrib_dir : $(mpe_gageqc_dir)/fewsgrib # default nc2grib grib file output dir +nc2g_app_dir : $(mpe_app_dir)/nc2grib # directory for gfe2grib.txt file +netcdf_dir : $(mpe_gageqc_dir)/netcdf_files #default output directory for netcdf files +mpe_dqc_save_netcdf : OFF # Save Daily QC as netCDF +mpe_dqc_save_grib : OFF # Save Daily QC as grib + +### Tokens which control the products generated by MPE Fieldgen. +mpe_locbias_1hr_rerun : OFF # ON/OF .Apps_defaultsF flag to + # determine if local bias should be + # recalculated as part of the mpe_fieldgen + # rerun from hmap_mpe + # ON -- recalc loc bias on rerun + # OFF -- do not recalc loc bias on rerun +mpe_del_gage_zeros : OFF # ON/OFF flog to determine if a zero gage + # value should be removed from consideration + # if the radar shows > 0.0 + # ON -- check for and remove zero gage values + # OFF -- do not check for or remove zero + # gage values + +mpe_selected_grid_gagediff : MMOSAIC + +mpe_qpe_fieldtype : MMOSAIC # field type to be saved as qpe +mpe_generate_list : BMOSAIC,GAGEONLY,LMOSAIC,LSATPRE,MLMOSAIC,MMOSAIC,RMOSAIC,SATPRE,P3LMOSAIC,SRMOSAIC,SGMOSAIC,QMOSAIC,LQMOSAIC,MLQMOSAIC,RFCBMOSAIC,RFCMMOSAIC,RFCMOSAIC,SAVELEVEL2 +mpe_base_radar_mosaic : RMOSAIC # The base radar mosaic used for the fields + # that mpe_fieldgen generates +mpe_show_missing_gage : None # MPE missing gage display. + # (None,All,Reported) +mpe_bad_gages_dir : $(rfcwide_output_dir)/bad_gages + +### directory locations of various format MPE output grid files +mpe_gif_dir : $(rfcwide_output_dir)/qpe_gif +mpe_jpeg_dir : $(rfcwide_output_dir)/qpe_jpeg +mpe_netcdf_dir : $(rfcwide_output_dir)/qpe_netcdf +mpe_grib_dir : $(rfcwide_output_dir)/qpe_grib + +### which format MPE output grid files to save +mpe_save_gif : nosave +mpe_save_jpeg : nosave +mpe_save_netcdf : nosave +mpe_save_grib : save + +### prefixes for various format MPE output grid files, blank by default +mpe_gif_id : +mpe_jpeg_id : +mpe_netcdf_id : +mpe_grib_id : + +### mpe gage QC tokens +mpe_gage_qc : ON +mpe_sccqc_threshold : 2.0 +mpe_scc_boxes_failed : 4 +mpe_msc_precip_limit : 1.0 +mpe_split_screen : OFF + +### mpe polygon tokens +mpe_polygon_action_order : None +mpe_polygon_field_order : None + +### tokens which control the transmission of RFC bias data. +mpe_transmit_bias : OFF +transmit_bias_on_save : NO +transmit_bias_on_rerun : NO +rfc_bias_input_dir : $(mpe_dir)/bias_message_input +rfc_bias_output_dir : $(mpe_dir)/bias_message_output +process_bias_log_dir : $(pproc_log)/process_bias_message +send_local_bias_when_rfc_bias_missing : NO + +### rfc qpe to wfo tokens +mpe_send_qpe_to_sbn : OFF +mpe_generate_areal_qpe : OFF +# List of RFCs to process for Gen Areal Qpe +gaq_rfc_list : MBRFC,NCRFC +gaq_dur_list : 1,6,24 +gaq_app_dir : $(pproc_local_data)/app/gen_areal_qpe +gaq_input_dir : /data/fxa/Grid/SBN/netCDF/HRAP/QPE +gaq_log_dir : $(pproc_log)/gen_areal_qpe +gaq_rfc_mask_dir : $(gaq_app_dir) +gaq_temp_xmrg_dir : $(rfcwide_output_dir)/rfcqpe_temp +gaq_xmrg_1hr_dir : $(rfcwide_output_dir)/rfcqpe01 +gaq_xmrg_6hr_dir : $(rfcwide_output_dir)/rfcqpe06 +gaq_xmrg_24hr_dir : $(rfcwide_output_dir)/rfcqpe24 +gaq_grib_dir : $(rfcwide_output_dir)/rfcqpe_grib + +### token which controls how PC precipitation totals are derived. +sum_pc_reports : NO + +geo_st3_bin : $(geo_data)/$(st3_rfc)/binary #geo_data defined outside of pproc +geo_st3_ascii : $(geo_data)/$(st3_rfc)/ascii +adjust_PC_startingtime : 4 #allow PC starting time tolerance + +### tokens for sending MPE mean field bias data to the ORPG + +bias_message_dir : $(apps_dir)/data/fxa/radar/envData + +### tokens for Lightning Data processing + +lightning_input_dir : /data/fxa/point/binLightning/netcdf + +lightning_log_dir : $(pproc_log)/lightning_proc + +### tokens for D2D display + +mpe_d2d_display_grib : ON # ON/OFF token to determine if further + # processing of grib file for D2D display + # is required + +d2d_input_dir : $(EDEX_HOME)/data/manual/mpe # dir containing grib files + # to be processed for D2D display + +mpe_send_grib : OFF # ON/OFF token to determine if grib file is + # to be sent to other sites such as NPVU + +# disagg processing tokens + +mpe_disagg_execute : OFF +mpe_disagg_method : POINT +mpe_disagg_6hreq_0 : 1 +mpe_disagg_6hrgt_0 : 1 + +#====== High-resolution Precipitation Estimator (HPE) tokens==================== + +# DecodeDHR tokens (formerly DecodeHDP tokens that looked like hdp_*) + +dhr_log_dir : $(pproc_log)/decodedhr # DHR Decoder logs + +dhr_prod_dir : $(pproc_local_data)/dhr_gather # DHR input directory + +dhr_dirname1 : $(data_archive_root)/radar # first part of directory name +# # containing DHR products for +# # associated or dial in radars + +dhr_dirname2 : DHR/layer0/res1/level256 # second part of directory name + # containing DHR products for + # associated or dial in radar +dhr_grid_dir : $(pproc_local_data)/dhr_decoded # decoded DHR radar grids + +dhr_error_dir : $(pproc_local_data)/dhr_error # DHR error files +dhr_arch_dir : $(pproc_local_data)/dhr_archive # DHR archives + +# DecodeDSP tokens (formerly DecodeHDP tokens that looked like hdp_*) + +dsp_log_dir : $(pproc_log)/decodedsp # DSP Decoder logs + +dsp_prod_dir : $(pproc_local_data)/dsp_gather # DSP input directory + +dsp_dirname1 : $(data_archive_root)/radar # first part of directory name +# # containing DSP products for +# # associated or dial in radars + +dsp_dirname2 : STP/layer0/res2/level256 # second part of directory name + # containing DSP products for + # associated or dial in radars + # NOTE that DSP is level256 vs level16 for + # STP and this is where it is stored + # in AWIPS +dsp_grid_dir : $(pproc_local_data)/dsp_decoded # decoded DSP radar grids +dsp_error_dir : $(pproc_local_data)/dsp_error # DSP error files +dsp_arch_dir : $(pproc_local_data)/dsp_archive # DSP archives + + +hpe_generate_list : DHRMOSAIC,BDHRMOSAIC,ERMOSAIC,LSATPRE,EBMOSAIC +hpe_qpe_fieldtype : ERMOSAIC # field type to be saved as qpe + +hpe_satpre_dir : $(mpe_fieldgen_product_dir)/satpre +hpe_input_dir : $(pproc_local_data)/app/hpe +hpe_output_dir : $(pproc_local_data)/hpe +hpe_sat_statevar_dir : $(rfcwide_output_dir)/state_var + +hpe_log_dir : $(pproc_local_data)/log/hpe + +hpe_hrap_grid_factor : 4 # 1 for HRAP grid + # 4 for quarter HRAP grid + +hpe_dhrmosaic_dir : $(hpe_output_dir)/dhrmosaic +hpe_bdhrmosaic_dir : $(hpe_output_dir)/bdhrmosaic +hpe_ermosaic_dir : $(hpe_output_dir)/ermosaic +hpe_ebmosaic_dir : $(hpe_output_dir)/ebmosaic +hpe_avg_ermosaic_dir : $(hpe_output_dir)/avgrmosaic +hpe_max_ermosaic_dir : $(hpe_output_dir)/maxrmosaic +hpe_lsatpre_dir : $(hpe_output_dir)/lsatpre + +hpe_dspheight_dir : $(hpe_output_dir)/height +hpe_dspindex_dir : $(hpe_output_dir)/index +hpe_height_dir : $(hpe_output_dir)/height +hpe_index_dir : $(hpe_output_dir)/index + +hpe_dhrmosaic_grib_dir : $(hpe_dhrmosaic_dir)/grib +dhrmosaic_netcdf_dir : $(hpe_dhrmosaic_dir)/netcdf +dhrmosaic_gif_dir : $(hpe_dhrmosaic_dir)/gif +hpe_bdhrmosaic_grib_dir : $(hpe_bdhrmosaic_dir)/grib +bdhrmosaic_netcdf_dir : $(hpe_bdhrmosaic_dir)/netcdf +bdhrmosaic_gif_dir : $(hpe_bdhrmosaic_dir)/gif +hpe_ermosaic_grib_dir : $(hpe_ermosaic_dir)/grib +ermosaic_netcdf_dir : $(hpe_ermosaic_dir)/netcdf +ermosaic_gif_dir : $(hpe_ermosaic_dir)/gif +hpe_ebmosaic_grib_dir : $(hpe_ebmosaic_dir)/grib +ebmosaic_netcdf_dir : $(hpe_ebmosaic_dir)/netcdf +ebmosaic_gif_dir : $(hpe_ebmosaic_dir)/gif + +dhrmosaic_save_grib : save +dhrmosaic_save_gif : nosave +dhrmosaic_save_netcdf : nosave +bdhrmosaic_save_grib : save +bdhrmosaic_save_gif : nosave +bdhrmosaic_save_netcdf : nosave +ermosaic_save_grib : save +ermosaic_save_gif : nosave +ermosaic_save_netcdf : nosave +ebmosaic_save_grib : save +ebmosaic_save_gif : nosave +ebmosaic_save_netcdf : nosave + +hpe_gif_dir : $(hpe_output_dir)/hpe_gif +hpe_jpeg_dir : $(hpe_output_dir)/hpe_jpeg +hpe_netcdf_dir : $(hpe_output_dir)/hpe_netcdf +hpe_grib_dir : $(hpe_output_dir)/hpe_grib +hpe_xmrg_dir : $(hpe_output_dir)/hpe_xmrg +hpe_save_gif : nosave +hpe_save_jpeg : nosave +hpe_save_netcdf : nosave +hpe_save_grib : nosave + +dhr_window : 15 +dsp_window : 15 +dsp_duration : 60 + +hpe_base_radar_mosaic : ERMOSAIC +hpe_qpe_fieldtype : ERMOSAIC +hpe_load_misbin : OFF +hpe_debug_log : ON +hpe_use_locbias : OFF +hpe_runfreq : 5 +hpe_timelag : 5 +hpe_bias_source : RFC +hpe_rfc_bias_lag : 2 +hpe_purge_logage : 720 +hpe_purge_fileage : 180 +hpe_purge_xmrgage : 75 + +dhrmosaic_d2d_display_grib : ON +ermosaic_d2d_display_grib : ON +ebmosaic_d2d_display_grib : ON +bdhrmosaic_d2d_display_grib : ON +hpe_run_nowcast : ON +hpe_nowcast_generate_list : PRTM, BPTRM +hpe_nowcast_dir : $(hpe_output_dir)/nowcast +hpe_rate_save_grib : save +hpe_brate_save_grib : save +hpe_tp1h_save_grib : save +hpe_btp1h_save_grib : save +hpe_4km_tp1h_save_grib : nosave +hpe_4km_btp1h_save_grib : nosave +nowcast_d2d_display_grib : ON +hpe_smooth_method : 1 # 0=no smoothing 1=FFP method (default) 2=BZ94 method +hpn_use_meanvelocity : OFF +hpn_meanvelocity_direction : 45 # direction precip is moving towards +hpn_meanvelocity_speed : 20 # miles per hour + + +hpe_send_grib : OFF # ON/OFF token to determine if grib file is + # to be sent to other sites such as NPVU + +#========END HPE tokens====================================================== + +# ================= Flash Flood Guidance System ============================= + +ffg_level : oper + +ffg_dir : $(apps_dir)/rfc/nwsrfs/ffg # Top-level ffg +ffg_bin : $(ffg_dir)/bin # FFG execute dir +ffg_files : $(ffg_dir)/files # FFG file group +ffg_gsfiles : $(ffg_files)/$(ffg_level) # FFG files dir +ffg_out_dir : $(ffg_dir)/output # FFG output dir +ffg_grib_out : $(ffg_out_dir)/grib # GRIB output +ffg_scripts : $(ffg_dir)/scripts # FFG scripts +ffg_gff_level : grff # regular grid ffg dir +ffg_gro_level : grro # regular grid ro dir + .Apps_defaults +ffg_usr_dir : $(ffg_gsfiles)/user # FFG user dir +ffg_area_dir : $(ffg_gsfiles)/affg # FFG area dir +ffg_cary_dir : $(ffg_gsfiles)/cary # FFG carryover dir +ffg_define_dir : $(ffg_gsfiles)/define # FFG definition dir +ffg_gridff_dir : $(ffg_gsfiles)/$(ffg_gff_level) # FFG grid ff dir +ffg_gridro_dir : $(ffg_gsfiles)/$(ffg_gro_level) # FFG grid ro dir +ffg_hwatr_dir : $(ffg_gsfiles)/hffg # FFG headwater dir + +ffg_gridpm_dir : $(ffg_gsfiles)/gdpm # grid runoff adjust parameters +ffg_group_dir : $(ffg_gsfiles)/grpp # FFG groups of products +ffg_prod_dir : $(ffg_gsfiles)/prod # FFG products dir +ffg_text_dir : $(ffg_gsfiles)/text # FFG text dir +ffg_wsup_dir : $(ffg_gsfiles)/wsup # Water supply dir + +# ffg program control +ffg_error_output : on # whether to output error messages +ffg_log_output : off # whether to output log messages + +# ===================== GRIB packer/encoder ================================= + +grib_dir : $(apps_dir)/rfc/grib # Top level grib +grib_rls : $(pproc_bin) # location of gribit executable +grib_arc : $(grib_dir)/bin/ARCHIVE # grib archive +grib_in_dir : $(rfcwide_xmrg_dir) # depends on data to be encoded +grib_out_dir : $(grib_dir)/output # GRIB encoded files +grib_error_output : on # turn on/off GRIB error output +grib_set_subcenter_0 : off # set subcenter to 0 + # on - set subcenter to 0 + # off - do not set subcenter to 0 + +# end of ffg apps + +#================== XSETS Apps_defaults Tokens - 08/03/2001 =================== + +# [] = default value +#................................. +# Date Control +#................................. +xsets_date_used : SYSTEM # computer system clock + # OFSFILES = forecast time series + # mm/dd/ccyy = explicit date, 12Z + +#................................. +# Directories and files to use +#................................. +xsets_dir : $(apps_dir)/rfc/xsets +xsets_level : oper +xsets_files : $(xsets_dir)/files +xsets_xsfiles : $(xsets_files)/$(xsets_level) +xsets_param_dir : $(xsets_xsfiles)/param +xsets_config_file : xsetsconfig +xsets_output_dir : $(xsets_xsfiles)/output + +#................................. +# Commands +#................................. +xsets_editor : "nedit" +xsets_hydrographs_cmd : "$(xsets_dir)/bin/RELEASE/new_hydroplot" +xsets_print_cmd : "lp" +xsets_xmit_cmd : "cat " + +#................................. +# Parameters for creation of hydrographs +#................................. +xsets_hydro_button : NO # Create Make Hydro button, [NO] + (currently unused) +xsets_make_hydro : NO # Create .gif hydrographs, [NO] + +#................................. +# NEW_HYDROPLOTS parameters +#................................. +xsets_html_daily_dir : /pub/FcstGraphs # Location of gif images on + web server +xsets_html_flood_dir : /pub/FloodGraphs # Location of gif images on + web server +xsets_hydrographs_html : 1 # 1 = create basic html + 0 = no html created +xsets_hydrographs_output: "$(xsets_output_dir)/gifs" +xsets_hydrographs_param : $(xsets_xsfiles)/hydrographs/param + +#................................. +# File Print Options and Settings +#................................. +xsets_add_remarks : NO # Add remark after each site, [NO] +xsets_brackets : NO # Put brackets around latest stage, + # forecasts and dates, [NO] +xsets_cmt_line : NO # YES = separate line, + # NO = append to description, river +xsets_expanded_dates : YES # Insert MMDD before values, [NO] +xsets_fgroup_preamble : "FORECAST GROUP IS" #Preamble for the fgroup (string) +xsets_H_precision : 1 # 0, [1], or 2 decimal precision of stages +xsets_output_style : E # E = Expanded, each day has line, + # C = Compact +xsets_print_crests : YES # Print crest comment, [NO] +xsets_print_disclaimer : YES # Print disclaimer, [NO] +xsets_print_fs : YES # YES = encode flood stage in SHEF, + # [NO] = display as comment +xsets_print_fs_cross : COMMENT # Time level passes flood stage + # [NO] = don't include, + # SHEF = encode in SHEF, + # COMMENT = display as comment +xsets_print_ls : COMMENT # Latest stage + # [NO] = don't include, + # SHEF = encode in SHEF, + # COMMENT = display as comment +xsets_print_MAP : NO # Print MAP values, [NO] +xsets_print_qpf : COMMENT # Print QPF values + # [NO] = don't include, + # SHEF = encode in SHEF, + # COMMENT = display as comment +xsets_print_ws : YES # Display warning/caution stage, [NO] +xsets_product_hdr : PIT # Indentifier in Product Header, non-AWIPS +xsets_Q_precision : 1 # 0, [1], 2 decimal precision of flows +xsets_signature : $(LOGNAME) #User signature (string) +xsets_wmo_id : TTAA00 KTUR DDHHMM # the wmo id +xsets_ws_label : "WARNING" # Label for WARNING/[CAUTION] stage (string) +xsets_zczc : YES # Include ZCZC & NNNN, [NO], non-AWIPS + +#................................. +# Run Options +#................................. +xsets_age_check : 6 # Number of hours old of forecast before + # error generated, [6] +xsets_edit_lock : NO # Lock main display when editing SETS file, [NO]??? +xsets_gen_summary : NO # Include summary of flood locations, [NO], Currently Unused +xsets_msg_obs_warn : YES # Print warning when observed values are + # missing, [NO] +xsets_numhrs_curob : 12 # number of hours back from current time to use + # informix obs as "current obs" +xsets_num_MAP_values : 4 # Number [4] of MAP values to include in product +xsets_num_qpf_values : 4 # Number [4] of qpf values to include in product +xsets_numdays_hydro : 3 # Run Parameters for FCSTPROG +xsets_ofs_select : OFS # OFS or IFP for time series files +xsets_stdout : NO # Send wprint messages to stdout, [NO] +xsets_time : Z # Time Zone code used in product + # ([Z], E, C, M, P, A, H OR N) +# ================== end of xsets tokens ======================================= + +#================== XNAV Apps_defaults Tokens - 03/29/2000 ==================== +# defaults for program XNAV + +xnav_user : oper + +#................................. +# Date/time related tokens +#................................. +db_days : 10 +xnav_daily_days : 30 +xnav_ffg_periods : 3 +xnav_sixhr_periods : 40 +xnav_hyd_days_fut : 5 +xnav_hyd_days_prev : 5 +xnav_precip_hours : 240 +xnav_settoday : + +#................................. +# Directories and files to use +#................................. +xnav_dir : $(apps_dir)/rfc/xnav +xnav_data : $(xnav_dir)/data +xnav_params : $(xnav_dir)/parameters +xnav_P1xmrg_dir : $(rfs_dir)/ofs/files/$(xnav_user)/griddb +xnav_S1xmrg_dir : $(rfs_dir)/ofs/files/$(xnav_user)/griddb +xnav_bin_dir : $(xnav_dir)/bin +xnav_data_dir : $(xnav_data) +xnav_ffg_dir : $(ffg_dir)/output/$(xnav_user) +xnav_geo_data : $(geo_data)/$(ifp_rfc)/binary +xnav_gif_dir : $(HOME)/gifs/xnav +xnav_grid_ffg_dir : $(ffg_dir)/files/$(xnav_user)/grff +xnav_localdata_dir : $(xnav_data)/localdata +xnav_misc_dir : $(xnav_data)/misc_data +xnav_qpfbin_dir : $(xnav_data)/wfoqpf +xnav_rfcfmap_dir : $(xnav_data)/rfcqpf +xnav_rules_dir : $(xnav_params)/rules +xnav_shefdata_dir : $(xnav_data)/shefdata +xnav_wfoqpf_dir : $(apps_dir)/rfc/data/products +xnav_xmrg_dir : $(rfs_dir)/ofs/files/$(xnav_user)/griddb +nmap_xmrg_dir : $(xnav_rfcfmap_dir)/nmap + +#................................. +# Fonts and colors +#................................. +xnav_action_color : yellow +xnav_flood_color : red +xnav_ok_color : green +xnav_ts1_color : yellow +xnav_ts2_color : magenta +xnav_label_font : "-*-new century schoolbook-*-*-*-*-14-*-*-*-*-*-*-*" +xnav_legend_font : "-*-new century schoolbook-*-*-*-*-14-*-*-*-*-*-*-*" +xnav_list_font : "-*-new century schoolbook-*-*-*-*-14-*-*-*-*-*-*-*" +xnav_menu_font : "-*-new century schoolbook-*-*-*-*-14-*-*-*-*-*-*-*" +xnav_pb_font : "-*-new century schoolbook-*-*-*-*-14-*-*-*-*-*-*-*" +xnav_text_font : -*-charter-bold-*-*-*-17-*-*-*-*-*-*-* +xnav_toggle_font : "-*-new century schoolbook-*-*-*-*-14-*-*-*-*-*-*-*" +xnav_town_font : "-*-new century schoolbook-bold-*-*-*-14-*-*-*-*-*-*-*" + +idma_label_font : "-*-new century schoolbook-bold-*-*-*-12-*-*-*-*-*-*-*" +idma_data_font : "-*-new century schoolbook-bold-*-*-*-18-*-*-*-*-*-*-*" + +#................................. +# Window size controls +#................................. +xnav_hrap_x : 59 +xnav_hrap_xor : 311 +xnav_hrap_y : 83 +xnav_hrap_yor : 410 +xnav_hydro_height : 400 +xnav_hydro_width : 750 +xnav_scale : 8.0 +xnav_scale_colors : 3.0 +xnav_x_offset : 100 +xnav_y_offset : 100 + +#................................. +# Display options +#................................. +xnav_basins : yes +xnav_counties : no +xnav_cwas : no +xnav_fgroups : no +xnav_flights : no +xnav_grid : no +xnav_hydro_segments : no +xnav_radars : no +xnav_rfc : yes +xnav_rivers : yes +xnav_states : yes +xnav_towns : yes + +#................................. +# Other control options +#................................. +load_db_on_boot : no +load_ofs_on_boot : no +check_flood_on_boot : no +use_new_xmrg : yes +xnav_afosid : ? #PITRR1RHA +xnav_editor : nedit +xnav_exception_file : exception_file +xnav_grid_ffg_pattern : xhr +xnav_locrangecheck : no +xnav_office_hdr : ? #KRHA +xnav_only_use_ofs_data : no +xnav_pe : "HG HP HT PP PT QR QT SD SF SW TA TD TS XC" +xnav_precip_filter : .01 +xnav_route_code : ? #ES +xnav_seg_type : 2 +xnav_send_shef : no +xnav_show_p1_files : yes +xnav_suppress_msg : yes +xnav_xmit_cmd : "cat " + +# ====== MAKE24HRXMRG Tokens ====== + +make24hrxmrg_settoday : # Run date in mm/dd/yyyy. Empty means uses number + # of days back argument to program. +make24hrxmrg_debug_level : 0 # Set debug output level. 1 or 2 yields more output. +make24hrxmrg_endtime : # Hour to end the 24 hour total. Default: 12Z if not + # given. +make24hrxmrg_tz : Z # Time zone; E, C, M, P, Y, H, L, or Z (defautlt). + +# ================== end of xnav tokens ======================================== + +#================== XDAT Apps_defaults Tokens - 03/29/2000 ==================== +# defaults for program XDAT + +xdat_user : oper + +#................................ +# Date/time related tokens +#................................ +xdat_flood_hours : 6 +xdat_settoday : + +#.................................. +# Directories and files to use +#.................................. +xdat_dir : $(apps_dir)/rfc/xdat +xdat_data : $(xdat_dir)/data +xdat_params : $(xdat_dir)/parameters +xdat_groups_dir : $(xdat_params)/groups +xdat_localdata_dir : $(xdat_data)/localdata +xdat_shefdata_dir : $(xdat_data)/shefdata + +#.................................. +# Fonts and colors to use +#.................................. +xdat_label_font : ncenb14 +xdat_list_font : helvb14 +xdat_text_font : user14x19 +xdat_pb_font : ncenb14 + +#................................. +# Window size controls +#................................. +xdat_scale : 1.0 + +#.................................. +# Display Options +#.................................. +xdat_clear_id : yes + +#.................................. +# Other Control Options +#.................................. +xdat_afosid : ?ofstest? +xdat_office_hdr : ??? +xdat_post_unk : $(shef_post_unk) +xdat_route_code : ??? +xdat_send_shef : no +xdat_xmit_cmd : "cat " +# ================== end of xdat tokens ======================================== + +#====================== Shape Data File Directory ============================== +shape_data_dir : $(apps_dir)/ffmpShapeData # Directory holding shape + # files acting as data files + + +#================== send_rfc Apps_defaults Tokens - 3/08/2001 ================= +send_rfc_dir : $(apps_dir)/rfc/send_rfc +send_rfc_input_dir : $(send_rfc_dir)/data/send +send_rfc_id : WWW +send_hardcopy_nnn : PRI-WRK-EDI-SNO-ADM-RVF +send_rfc_hardcopy : $(send_rfc_dir)/data/sbnprods +send_rfc_hpc : 0 +send_rfc_host : ds-www +send_rfc_alternate : 0 +# ================== end of send_rfc tokens ==================================== + +#================== verify Apps_defaults Tokens - 08/03/2001 ================== +# defaults for program verify +vsys_output : $(vsys_dir)/output #location of output files +vsys_input : $(vsys_dir)/input #location of input files +vsys_files : $(vsys_dir)/files #location of verify files +vsys_scripts : $(vsys_dir)/scripts #location of verify scripts +vsys_output_log : test.log #name of log file +vsys_ihfsdb : $(db_name) #ihfs_db name +vsys_vdb : vdb1_1rfc #verification db name for RFC="rfc" +verify_rls : $(vsys_dir)/bin/RELEASE #The release directory. +vsys_rls : $(verify_rls) #Not really needed, but consistent. + +# ================== end of verify tokens ====================================== + +# ================== RFC Archive Database tokens =============================== + +archive_shefdata_dir : /data/fxa/ispan/hydro_adbs # directory for archive data +archive_enable : OFF # ON/OFF - Enable or Disable + # archive data feed (OFF by default) +metar_output_dir : $(whfs_local_data_dir)/metar_output # metar2shef temp output directory + # used if archive_enable is ON + +#================== Directory tokens for RFC Archive Database ================== +adb_dir : /rfc_arc # Base RFC Archive Directory +adb_raw_que : /rfc_arc_data/q/raw/ # pathname for raw q input directory +adb_pro_que : /rfc_arc_data/q/processed/ # pathname for processed q input directory +adb_bin_dir : $(adb_dir)/bin # pathname for the bin directory +adb_cfg_dir : $(adb_dir)/cfg # pathname for the config directory +adb_lib_dir : $(adb_dir)/lib # pathname for the lib directory +adb_logs_dir : $(adb_dir)/logs # pathname for the logs directory +adb_scripts_dir: $(adb_dir)/scripts # pathname for the scripts directory + +#================== Shefdecode tokens for RFC Archive Database ================= + +adb_shef_winpast : 9999 # number of days in past to post data for RAW +adb_shef_winfuture : 9999 # number of mins in future to post obs data + # for RAW. +adb_shef_winpast_pro : 9999 # number of days in past to post data +adb_shef_winfuture_pro : 9999 # number of minutes in future to post obs data +shefdecode_rax_userid : oper # controlling UNIX user +adb_shefdecode_input : $(adb_cfg_dir)/decoders # adb SHEF parameter file + # location +adb_shef_raw_perflog : OFF # ON/OFF - create a separate performance + # log file to save internal decoder timing + # messages for monitoring performance +adb_shef_raw_logs_dir : $(adb_logs_dir)/decoder/raw/logs # pathname for the + # daily logs directory +adb_shef_raw_err_dir : $(adb_logs_dir)/decoder/raw/err # pathname for the + #product logs directory +adb_shef_raw_keeperror : ALWAYS # keep files (=ALWAYS) or only + # when errors occur (=IF_ERROR) +adb_shef_raw_post_unk : IDS_AND_DATA # NONE - do not post to the UnkStnValue tables + # values IDS_ONLY or IDS_AND_DATA + # will post everything + # to the UnkStnValue table +adb_shef_pro_post_unk : NONE # NONE - do not post to the UnkStnValue tables + # values IDS_ONLY or IDS_AND_DATA + # will post everything + # to the UnkStnValue table +adb_shef_pro_perflog : OFF # ON/OFF - create a separate performance + # log file to save internal decoder timing + # messages for monitoring performance +adb_shef_pro_logs_dir : $(adb_logs_dir)/decoder/processed/logs # pathname for the + # daily logs directory +adb_shef_pro_err_dir : $(adb_logs_dir)/decoder/processed/err # pathname for the + # product logs directory +adb_shef_pro_keeperror : ALWAYS # keep files (=ALWAYS) or only + # when errors occur (=IF_ERROR) +adb_shef_raw_checktab : ON # ON checks location and ingestfilter tables +adb_shef_pro_checktab : OFF # ON checks location and ingestfilter tables +adb_shef_duplicate_raw : USE_REVCODE # Token for allowing duplicate records to be + # posted for raw decoder. +adb_shef_duplicate_pro : USE_REVCODE # Same thing but for processed decoder. +adb_shef_raw_dupmess : ON # duplication messages from adb raw decoder. +adb_shef_raw_locmess : ON # invalid location messages from adb raw decoder. +adb_shef_raw_elgmess : ON # invalid ingestfilter messages from adb raw + # decoder. +adb_shef_raw_storall : OFF # OFF - default- will only write to pecrsep table + # ON will write to both pecrsep and peirsep tables +adb_shef_pro_dupmess : ON # duplication messages from adb processed decoder. +adb_shef_pro_locmess : OFF # invalid location messages from adb pro decoder. +adb_shef_pro_elgmess : OFF # invalid ingestfilter messages from adb pro + # decoder. +adb_shef_pro_tmp_dir : $(adb_pro_que) +adb_shef_raw_tmp_dir : $(adb_raw_que) +adb_shef_raw_add_adjust : OFF + +#========== IHFS->RAX synchronization tokens for RFC Archive Database ========== +adb_sync_logs_dir : $(adb_logs_dir)/dbsync # directory for synchronization log files +adb_sync_mode : ANALYSIS # ANALYSIS or UPDATE +adb_sync_tablenames : ALL # List of table names to synchronize +adb_sync_ihfs_ingest: USE # USE or IGNORE +adb_sync_rivercrit : ACTION # ACTION, FIS or BOTH + + +#================== DatView program tokens for RFC Archive Database ============ +datview_db_name : $(adb_name) +datview_startdate : '1975-01-01 00:00:00' +datview_label_font : -schumacher-clean-bold-r-normal-*-14-*-75-75-c-80-*-* +datview_list_font : -schumacher-clean-bold-r-normal-*-14-*-75-75-c-80-*-* +datview_text_font : -schumacher-clean-bold-r-normal-*-14-*-75-75-c-80-*-* +datview_text2_font :-adobe-courier-bold-r-normal-*-*-140-*-*-m-*-iso8859-1 +datview_bg_color : black +datview_fg_color : white +datview_ob_color1 : green +datview_ob_color2 : blue +datview_ob_color3 : yellow +datview_ob_color4 : red +datview_ob_color5 : DarkOrange +datview_ob_color6 : SlateGray1 +datview_plot_font : -adobe-courier-bold-r-normal-*-*-80-*-*-m-*-iso8859-1 +datview_plot_width : 750 +datview_plot_height : 420 +datview_data_dir : /home/oper +datview_raw_shef_dir : $(adb_raw_que) +datview_pro_shef_dir : $(adb_pro_que) +datview_office_header : KTUA # to be set by each RFC +datview_pil : OKCRR1TUR # to be set by each RFC + + +#=============== ARCH_NAV Apps_defaults Tokens - 05/5/2005 ================== +# defaults for program ARCNAV + +anav_user : oper + +#................................. +# Date/time related tokens +#................................. +anav_daily_days : 30 +anav_sixhr_periods : 40 +anav_precip_hours : 24 + + +#................................. +# Directories and files to use +#................................. + +anav_dir : /awips/hydroapps/lx/rfc/xnav +anav_data : /data +anav_flatfiles : $(anav_data)/flatfiles +anav_params : $(anav_dir)/parameters +anav_data_dir : $(anav_data) +anav_geo_data : /awips/hydroapps/lx/geo_data/$(ifp_rfc)/binary +anav_gif_dir : /rfc_arc/data/arcnav/gifs +anav_localdata_dir : $(anav_data)/localdata +anav_xmrg_dir : $(anav_flatfiles) + +#................................. +# Fonts and colors +#................................. +anav_label_font : courb14gr +anav_legend_font : courb14gr +anav_list_font : courb14gr +anav_menu_font : 9x15 +anav_pb_font : courb12gr +anav_text_font : helvb18gr +anav_toggle_font : courb14gr +anav_town_font : courb12gr + +#................................. +# Window size controls +#................................. +anav_hrap_x : 200 +anav_hrap_xor : 850 +anav_hrap_y : 200 +anav_hrap_yor : 470 +anav_hydro_height : 400 +anav_hydro_width : 750 +anav_scale : 3.5 +anav_scale_colors : 3.0 +anav_x_offset : 300 +anav_y_offset : 300 + +#................................. +# Display options +#................................. +anav_basins : yes +anav_counties : no +anav_cwas : no +anav_fgroups : no +anav_flights : no +anav_grid : no +anav_hydro_segments : no +anav_radars : no +anav_rfc : no +anav_rivers : no +anav_states : yes +anav_towns : yes + +#................................. +# Other control options +#................................. +anav_editor : nedit +anav_suppress_msg : yes + +#...................................... +# tokens added for arcnav application +# for future use +#...................................... +anav_ok_color : green +anav_action_color : yellow +anav_flood_color : red +anav_ts1_color : yellow +anav_ts2_color : magenta + +# ================= end of arcnav tokens ====================================== + +# ================== end of RFC Archive Database tokens ======================== + +# ================== SSHP Directory Structure and application tokens =============================== + +local_data_sshp_dir : $(whfs_local_data_dir)/sshp_transfer +sshp_control_dir : $(whfs_local_data_dir)/app/sshp +sshp_ofs_extract_text_dir : $(local_data_sshp_dir)/ofs_extract_text +sshp_ofs_extract_xml_dir : $(local_data_sshp_dir)/ofs_extract_xml +sshp_ingest_xml_dir : $(local_data_sshp_dir)/ingest_xml +sshp_incoming_dir : $(local_data_sshp_dir)/incoming +sshp_outgoing_dir : $(local_data_sshp_dir)/outgoing +sshp_log_dir : $(whfs_log_dir)/sshp +sshp_java_process_host : px1f +sshp_invoke_map_preprocess: ON +sshp_map_qpe_to_use : MIXED # choices are: MIXED, LOCAL_BEST_ONLY, RFC_ONLY +sshp_fcst_ts : FZ # SSHP type-source code for generated forecasts +sshp_initial_forecast_length: 24 # length of forecast in hours +sshp_max_forecast_length: 120 # max length of forecast in hours that user can make generated in GUI +sshp_sac_update_expiration_hours: 25 # number of hours after which to update locally the SAC states +sshp_sac_update_hours_forward: -2 # number of hours forward of last top of hour to save sac states - + # negative -2 means 2 hours BEFORE last top of hour +sshp_adjustment_pairing_minutes : 70 +sshp_adjustment_interpolation_hours : 3 +sshp_show_simulated_timeseries : true + +sshp_data_dir : $(whfs_local_data_dir)/sshp # base sshp dynamic data dir +sshp_precip_dir : $(sshp_data_dir)/precip # default location for saved precip files +sshp_background_forecast_output_dir : $(sshp_data_dir)/forecast +sshp_background_forecast_length : 48 # length of a background forecast + +sshp_hpn_minutes_before : 5 # don't use grid files prior to X minutes before Hour +sshp_hpn_minutes_after : 5 # don't use grid files after X minutes past the Hour + +sshp_show_unadjusted_states: false # initial setting of option in GUI for displaying the unadjusted SAC-SMA states +# ==================== Radar Climatology Tokens ============================== +radclim_data_dir : $(pproc_local_data)/app/radclim + +# ==================== PDC Preprocessor Tokens =============================== +pdc_clean_cache_minutes : 60 +pdc_temperature_hours : 168 +pdc_height_hours : 168 +pdc_snow_hours : 168 +pdc_wind_hours : 168 +pdc_weather_hours : 168 +pdc_precip_hours : 168 +pdc_lower_window : 5 +pdc_upper_window : 5 + +pdc_pp_dir : $(whfs_local_data_dir)/pdc_pp +pdc_pp_log_dir : $(whfs_log_dir)/pdc_pp + +# ====================== Historical Data Browser Tokens ======================= + +hdb_help_dir : $(hdb_dir)/help_files # Historical data browser help + # files +hdb_script_directory : $(hdb_dir)/scripts # Historical data browser + # scripts dir +hdb_config_dir : $(hdb_dir)/app-defaults # Historical data browser + # configuration file directory + +hdb_height_in_pixels : 900 # Historical data browser map height in + # pixels +hdb_width_in_pixels : 1200 # Historical data browser map width in + # pixels +hdb_center_lat : 35 # The initial center latitude of the HDB +hdb_center_lon : -88.9 # The initial center longitude of the HDB +hdb_map_width : 2999.862 # The width in nautical miles of the area + # displayed in the HDB +hdb_disclosure_limit : 60 # The disclosure limit for displaying finer + # detail in the city overlay. +hdb_map_projection : FLAT # The initial map projection used by HDB. + # Possible values: FLAT, POLAR, HRAP +# ====================== DHM Token ======================= +dhm_data_dir : $(ofs_files)/$(ofs_level)/dhmdata # DHM data dir +dhm_d2d_data_dir : /data/fxa/Grid/LOCAL/netCDF/DHM # d2d data dir +dhm_d2d_notify_bin_dir : /awips/fxa/bin # d2d notify bin dir +rdhm_input_dir : $(geo_data) +dhm_rain_plus_melt_data_dir: $(geo_data) +# ================== end of SSHP Directory Structure tokens ======================== + + +# The syntax needed in the file is: +# +# token : resource +# +# where: token is defined as a string delimited by white space or +# the delimiter, +# the delimiter between token and resource is the :, +# no white space needs to surround the delimiter, +# comments are indicated by a #, +# neither token nor resource can begin with a # or :, +# a # or a : can be embedded within resource, +# resource can contain white space if it is bounded by +# the ' or " characters, +# blank lines are allowed. +# referbacks are indicated by $(...). The '...' is resolved +# the same way any other token is, and is substituted for +# the $(...) string to compose the final resource value. +# Multiple referbacks are allowed in a resource, but +# embedded referbacks are not allowed (i.e. no +# $($(...)) allowed). +# Note that this file is read only if the token can not be resolved +# as an environment variable. +# +# ============================================================================== diff --git a/edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml b/edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml index 0d6e84d11e..83a30388cb 100644 --- a/edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml +++ b/edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml @@ -11,7 +11,7 @@ autoStartup="false"> - + diff --git a/edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml b/edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml index 69c5a9e7f6..8e6590e032 100644 --- a/edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml +++ b/edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml @@ -30,9 +30,9 @@ - - - + + + java.lang.Throwable @@ -42,7 +42,7 @@ - + diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-edex-impl.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-edex-impl.xml index 290cab7094..82c5961d31 100644 --- a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-edex-impl.xml +++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-edex-impl.xml @@ -54,7 +54,7 @@ + uri="jms-generic:queue:matureSubscriptions?destinationResolver=#qpidDurableResolver" /> diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.event/res/spring/event-datadelivery-ingest.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.event/res/spring/event-datadelivery-ingest.xml index 6b0bf48923..b46677e860 100644 --- a/edexOsgi/com.raytheon.uf.edex.datadelivery.event/res/spring/event-datadelivery-ingest.xml +++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.event/res/spring/event-datadelivery-ingest.xml @@ -6,7 +6,7 @@ + value="jms-generic:topic:notify.msg?destinationResolver=#qpidDurableResolver" /> diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery.xml index 15d153514a..a08888d46f 100644 --- a/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery.xml +++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery.xml @@ -2,8 +2,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd"> + + + + - + @@ -24,11 +29,11 @@ errorHandlerRef="errorHandler"> - + - + diff --git a/edexOsgi/com.raytheon.uf.edex.dissemination/res/spring/dissemination-request.xml b/edexOsgi/com.raytheon.uf.edex.dissemination/res/spring/dissemination-request.xml index 4c6ca44914..592aad665e 100644 --- a/edexOsgi/com.raytheon.uf.edex.dissemination/res/spring/dissemination-request.xml +++ b/edexOsgi/com.raytheon.uf.edex.dissemination/res/spring/dissemination-request.xml @@ -34,12 +34,12 @@ a new route and use moveFileToArchive --> + uri="jms-generic:queue:Ingest.handleoup?destinationResolver=#qpidDurableResolver" /> + uri="jms-generic:queue:handleoup.dropbox?destinationResolver=#qpidDurableResolver" /> java.lang.Throwable - - + - + + + @@ -28,7 +29,7 @@ - + @@ -39,7 +40,7 @@ - + @@ -50,7 +51,7 @@ - + diff --git a/edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java b/edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java index d613a2c985..20bb844fd8 100644 --- a/edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java +++ b/edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java @@ -62,6 +62,7 @@ import com.raytheon.uf.common.status.UFStatus.Priority; * when no distribution files present * Mar 19, 2013 1794 djohnson PatternWrapper is immutable, add toString() to it for debugging. * Aug 19, 2013 2257 bkowal edexBridge to qpid 0.18 upgrade + * Aug 30, 2013 2163 bkowal edexBridge to qpid 0.18 RHEL6 upgrade * * * @@ -76,6 +77,8 @@ public class DistributionSrv { private static final String HEADER_QPID_SUBJECT = "qpid.subject"; + private static final String MESSAGE_HEADER = "header"; + private static class PatternWrapper { private final String plugin; @@ -231,10 +234,10 @@ public class DistributionSrv { if (header != null) { // make the qpid subject the header so that everything downstream // will be able to read it as the header. - in.setHeader("header", header); + in.setHeader(MESSAGE_HEADER, header); } - header = (String) in.getHeader("header"); + header = (String) in.getHeader(MESSAGE_HEADER); Object payload = in.getBody(); String bodyString = null; if (payload instanceof byte[]) { diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/DPADecoder-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/DPADecoder-spring.xml index e5e7eff311..4d75a6d347 100644 --- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/DPADecoder-spring.xml +++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/DPADecoder-spring.xml @@ -9,13 +9,13 @@ - + - + dpa - + --> - + dpa @@ -55,5 +55,6 @@ + \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/arealffgGenerator-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/arealffgGenerator-spring.xml index 1f19aed7ac..bf202ee202 100644 --- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/arealffgGenerator-spring.xml +++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/arealffgGenerator-spring.xml @@ -31,14 +31,14 @@ arealffg - + --> - + dhr @@ -47,7 +47,7 @@ errorHandlerRef="errorHandler"> - + diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/q2FileProcessor-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/q2FileProcessor-spring.xml index 4c90c7a7f8..0a6b8311c5 100644 --- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/q2FileProcessor-spring.xml +++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/q2FileProcessor-spring.xml @@ -8,7 +8,7 @@ - + - + diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/GAFF.java b/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/GAFF.java index ee6f61df3e..ea9725a6e2 100644 --- a/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/GAFF.java +++ b/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/GAFF.java @@ -60,7 +60,6 @@ import com.vividsolutions.jts.geom.Coordinate; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Jan 5, 2011 mpduff Initial creation - * Sep 5, 2013 16437 wkwock Fix the "HiRes" issue * * * @@ -344,9 +343,6 @@ public class GAFF { try { uri = db.getDataURI(rfc, durString, today); - if (uri == null) { - uri = db.getDataURI(rfc+"-HiRes", durString, today); - } if (uri == null) { continue; } diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/HPEDhrSrv.java b/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/HPEDhrSrv.java index bcdd7a2d1e..0c2b467dd2 100644 --- a/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/HPEDhrSrv.java +++ b/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/HPEDhrSrv.java @@ -49,12 +49,12 @@ import com.raytheon.uf.edex.ohd.MainMethod; * SOFTWARE HISTORY * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- - * Jan 20, 2010 4200 snaples Initial creation - * Mar 09, 2012 417 dgilling Refactor to use two-stage queue + * Jan 20, 2010 4200 snaples Initial creation + * Mar 09, 2012 417 dgilling Refactor to use two-stage queue * process. * Mar 20, 2013 1804 bsteffen Switch all radar decompressing to be in * memory. - * Sep 13, 2013 2368 rjpeter Updated to use durable jms settings. + * * * * @author snaples @@ -92,9 +92,9 @@ public class HPEDhrSrv { private static final int DT_IDX = 2; - private static final String JMS_QUEUE_URI = "jms-durable:queue:dhrProcess"; + private static final String JMS_QUEUE_URI = "jms-generic:queue:dhrProcess"; - private final AppsDefaults appsDefaults = AppsDefaults.getInstance(); + private AppsDefaults appsDefaults = AppsDefaults.getInstance(); /** * Route endpoint for "dhrIngestRoute". Takes a message, writes the file to diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.acars/res/spring/acars-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.acars/res/spring/acars-ingest.xml index 3970913f1b..1fdc32f63e 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.acars/res/spring/acars-ingest.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.acars/res/spring/acars-ingest.xml @@ -10,7 +10,7 @@ - + acars - + --> - + acars diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/res/spring/bufrascat-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/res/spring/bufrascat-ingest.xml index 555e481851..7b06593774 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/res/spring/bufrascat-ingest.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/res/spring/bufrascat-ingest.xml @@ -37,13 +37,13 @@ bufrascat - + --> - + bufrascat diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/res/spring/bufrhdw-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/res/spring/bufrhdw-ingest.xml index 13c2a92577..6ec50ec4c1 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/res/spring/bufrhdw-ingest.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/res/spring/bufrhdw-ingest.xml @@ -10,7 +10,7 @@ - + bufrhdw - + --> - + bufrhdw diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/res/spring/bufrmthdw-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/res/spring/bufrmthdw-ingest.xml index 4e14275afa..f9ac6f6360 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/res/spring/bufrmthdw-ingest.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/res/spring/bufrmthdw-ingest.xml @@ -10,7 +10,7 @@ - + bufrmthdw - + --> - + bufrmthdw diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/res/spring/bufrncwf-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/res/spring/bufrncwf-ingest.xml index 09d6036294..086d87414c 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/res/spring/bufrncwf-ingest.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/res/spring/bufrncwf-ingest.xml @@ -9,7 +9,7 @@ - + bufrncwf - + --> - + bufrncwf diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/res/spring/bufrquikscat-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/res/spring/bufrquikscat-ingest.xml index 33bbe3d3ea..b87f4f528d 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/res/spring/bufrquikscat-ingest.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/res/spring/bufrquikscat-ingest.xml @@ -16,7 +16,7 @@ - + bufrquikscat - + --> - + bufrquikscat diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/res/spring/bufrsigwx-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/res/spring/bufrsigwx-ingest.xml index 83a5477522..105354db60 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/res/spring/bufrsigwx-ingest.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/res/spring/bufrsigwx-ingest.xml @@ -32,13 +32,13 @@ bufrsigwx - + --> - + bufrsigwx diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/res/spring/bufrssmi-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/res/spring/bufrssmi-ingest.xml index f46b4a195a..a6b184480e 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/res/spring/bufrssmi-ingest.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/res/spring/bufrssmi-ingest.xml @@ -16,7 +16,7 @@ - + bufrssmi - + --> - + bufrssmi diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.cwa/res/spring/cwa-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.cwa/res/spring/cwa-ingest.xml index 7170d7db2e..4ffba53407 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.cwa/res/spring/cwa-ingest.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.cwa/res/spring/cwa-ingest.xml @@ -24,7 +24,7 @@ autoStartup="false"> - + cwa diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.cwat/res/spring/cwat-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.cwat/res/spring/cwat-ingest.xml index 1a230939fd..0e0a471a98 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.cwat/res/spring/cwat-ingest.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.cwat/res/spring/cwat-ingest.xml @@ -12,7 +12,7 @@ - + diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/res/spring/ffmp-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/res/spring/ffmp-ingest.xml index 7c9a709340..fdb5c7ecc8 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/res/spring/ffmp-ingest.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/res/spring/ffmp-ingest.xml @@ -28,7 +28,7 @@ - + diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFMPProcessor.java b/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFMPProcessor.java index 40aaded68b..5d467b9b80 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFMPProcessor.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFMPProcessor.java @@ -99,8 +99,8 @@ import com.vividsolutions.jts.geom.Polygon; * 02/25/13 1660 D. Hladky FFTI design change to help mosaic processing. * 05/01/2013 15684 zhao Unlock when Exception caught * Jul 15, 2013 2184 dhladky Remove all HUC's for storage except ALL - * 09/03/2013 DR 13083 G. Zhang Added a fix in processRADAR(ArrayList). * + * * @author dhladky * @version 1 */ @@ -1107,10 +1107,10 @@ public class FFMPProcessor { for (int j = 0; j < dataVals.length; j++) { - //float fval = (float) ScanUtils.getDecodedDHRValue(dataVals[j]); + float fval = (float) ScanUtils.getDecodedDHRValue(dataVals[j]); try { - val += ScanUtils.getZRvalue2(dataVals[j],//fval,// DR 13083 + val += ScanUtils.getZRvalue(fval, dhrMap.get(DHRValues.ZRMULTCOEFF), dhrMap.get(DHRValues.MAXPRECIPRATEALLOW), dhrMap.get(DHRValues.ZRPOWERCOEFF), diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.fog/res/spring/fog-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.fog/res/spring/fog-ingest.xml index d6e9e55176..d860306f98 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.fog/res/spring/fog-ingest.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.fog/res/spring/fog-ingest.xml @@ -12,7 +12,7 @@ - + diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/res/spring/fssobs-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/res/spring/fssobs-ingest.xml index 3c80ab9e44..fc44cc5c1f 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/res/spring/fssobs-ingest.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/res/spring/fssobs-ingest.xml @@ -15,7 +15,7 @@ - + diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml index edcdea0661..5673569635 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml @@ -383,12 +383,6 @@ 2 00-00:15:00
- - - HPCGuide-2.5km - 2 - 00-00:15:00 - GFSGuide diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.ldadmesonet/res/spring/ldadmesonet-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.ldadmesonet/res/spring/ldadmesonet-ingest.xml index 156bced102..41c7f38307 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.ldadmesonet/res/spring/ldadmesonet-ingest.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.ldadmesonet/res/spring/ldadmesonet-ingest.xml @@ -15,7 +15,7 @@ - + @@ -30,7 +30,7 @@ errorHandlerRef="errorHandler" autoStartup="false"> - + diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.loctables/res/spring/loctables-spring.xml b/edexOsgi/com.raytheon.uf.edex.plugin.loctables/res/spring/loctables-spring.xml index 761d2fdf82..19e95ab8f8 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.loctables/res/spring/loctables-spring.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.loctables/res/spring/loctables-spring.xml @@ -33,7 +33,7 @@ - + loctables diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.lsr/res/spring/lsr-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.lsr/res/spring/lsr-ingest.xml index ca898cf275..388c01b927 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.lsr/res/spring/lsr-ingest.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.lsr/res/spring/lsr-ingest.xml @@ -31,13 +31,13 @@ lsr - + --> - + lsr diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-request.xml b/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-request.xml index eab8b24d84..3018e3d30a 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-request.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-request.xml @@ -8,11 +8,11 @@ - + - + java.lang.Throwable diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml b/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml index 5b7d9ec7a2..7c5c1010eb 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml @@ -16,7 +16,7 @@ - + diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.mesowest/res/spring/mesowest-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.mesowest/res/spring/mesowest-ingest.xml index 23a5694be6..fc04d39b07 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.mesowest/res/spring/mesowest-ingest.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.mesowest/res/spring/mesowest-ingest.xml @@ -49,13 +49,13 @@ mesowest - + --> - + diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.crimss/res/spring/crimss-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.crimss/res/spring/crimss-ingest.xml index 7f2882bc9f..311684aff5 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.npp.crimss/res/spring/crimss-ingest.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.crimss/res/spring/crimss-ingest.xml @@ -24,7 +24,7 @@ - + crimss diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/res/spring/nucaps-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/res/spring/nucaps-ingest.xml index 5cb9948a33..29c2aa2faa 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/res/spring/nucaps-ingest.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/res/spring/nucaps-ingest.xml @@ -24,7 +24,7 @@ - + nucaps diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/res/spring/viirs-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/res/spring/viirs-ingest.xml index 0833d2ef2f..d275f1f337 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/res/spring/viirs-ingest.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/res/spring/viirs-ingest.xml @@ -8,12 +8,14 @@ + + - + - + @@ -40,7 +42,7 @@ - + diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/res/spring/preciprate-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/res/spring/preciprate-ingest.xml index eb49a866b7..5751d3a9e6 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/res/spring/preciprate-ingest.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/res/spring/preciprate-ingest.xml @@ -12,7 +12,7 @@ - + diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.qpf/res/spring/qpf-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.qpf/res/spring/qpf-ingest.xml index 2b90e0b133..faec13e4c2 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.qpf/res/spring/qpf-ingest.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.qpf/res/spring/qpf-ingest.xml @@ -12,7 +12,7 @@ - + diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/res/spring/satellite-mcidas-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/res/spring/satellite-mcidas-ingest.xml index 43c3f88bdf..f2a06df07d 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/res/spring/satellite-mcidas-ingest.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/res/spring/satellite-mcidas-ingest.xml @@ -4,16 +4,17 @@ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd"> - + + - + @@ -35,7 +36,7 @@ - + satellite-mcidas diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.scan/res/spring/scan-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.scan/res/spring/scan-ingest.xml index 6c59176e41..719f851bf6 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.scan/res/spring/scan-ingest.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.scan/res/spring/scan-ingest.xml @@ -28,7 +28,7 @@ xmlns="http://camel.apache.org/schema/spring" errorHandlerRef="errorHandler"> - + diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/res/spring/svrwx-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/res/spring/svrwx-ingest.xml index 09021bf61e..e5770ca7ba 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/res/spring/svrwx-ingest.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/res/spring/svrwx-ingest.xml @@ -24,7 +24,7 @@ autoStartup="false"> - + svrwx diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/spring/tcg-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/spring/tcg-ingest.xml index 113efae2fa..ca50801379 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/spring/tcg-ingest.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/spring/tcg-ingest.xml @@ -10,7 +10,7 @@ - + - + tcg diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/spring/tcs-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/spring/tcs-ingest.xml index 1583d2405b..f223e4bf0a 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/spring/tcs-ingest.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/spring/tcs-ingest.xml @@ -24,7 +24,7 @@ autoStartup="false"> - + tcs diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.vaa/res/spring/vaa-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.vaa/res/spring/vaa-ingest.xml index 76532eb545..3a0c5dfe8a 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.vaa/res/spring/vaa-ingest.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.vaa/res/spring/vaa-ingest.xml @@ -10,7 +10,7 @@ - + vaa - + --> - + vaa diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.vil/res/spring/vil-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.vil/res/spring/vil-ingest.xml index 9044e2d523..809da4ce6d 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.vil/res/spring/vil-ingest.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.vil/res/spring/vil-ingest.xml @@ -12,7 +12,7 @@ - + diff --git a/edexOsgi/com.raytheon.uf.edex.useradmin/res/spring/useradmin-request.xml b/edexOsgi/com.raytheon.uf.edex.useradmin/res/spring/useradmin-request.xml index e5fe9d1102..cb98375d92 100644 --- a/edexOsgi/com.raytheon.uf.edex.useradmin/res/spring/useradmin-request.xml +++ b/edexOsgi/com.raytheon.uf.edex.useradmin/res/spring/useradmin-request.xml @@ -8,7 +8,7 @@ + value="jms-generic:topic:user.authentication.changed?timeToLive=60000&destinationResolver=#qpidDurableResolver" /> diff --git a/edexOsgi/com.raytheon.uf.tools.cli/impl/capture b/edexOsgi/com.raytheon.uf.tools.cli/impl/capture index 9c6ef5af9b..90de8e49fe 100644 --- a/edexOsgi/com.raytheon.uf.tools.cli/impl/capture +++ b/edexOsgi/com.raytheon.uf.tools.cli/impl/capture @@ -15,9 +15,6 @@ if [ "$REMOTE_SERVERS_TO_CHECK" == "" ]; then REMOTE_SERVERS_TO_CHECK="dx1f dx2f dx3 dx4" fi -# the database host to grab current running queries for -DATABASE_HOST="dx1f" - # Flags to control what data capure grabs, to enable flag must be YES, anything else will be considered off. RUN_JSTACK="Y" JSTACK_ITERATIONS="15" @@ -28,8 +25,7 @@ MOVE_ALL_HS_ERR_PID="Y" GRAB_REMOTE_TOP="Y" GRAB_REMOTE_VMSTAT="Y" GRAB_CAVE_AND_ALERTVIZ_LOGS="Y" -GRAB_SCREENSHOT="Y" -GRAB_CURRENT_QUERIES="Y" +GRAB_SCREENSHOT='Y' EDEX_MODE="N" FORCE="N" TGZ_OUTPUT="Y" @@ -44,44 +40,32 @@ usage() { echo "Script for capturing information about cave/edex and general server health." echo echo "Following options allowed" - echo -e "-c \"{host names}\"\tdefault [$REMOTE_SERVERS_TO_CHECK]" - echo " The servers to grab top information from, make sure list is quoted and space delimited" - echo - echo -e "-d {y/n}\t\tdefault [$RUN_JMAP]" - echo " Run jmap to grab the head dump information" - echo - echo -e "-e {request/ingest/ingestGrib/ingestDat}" - echo " Run edex mode and grab information about the jvm passed. May be used multiple times to grab data about multiple jvms" - echo - echo -e "-f {y/n}\t\tdefault [$FORCE]" - echo " Force a jstack/jmap by default" + echo -e "-p {PID}\t\tdefault none" + echo " Run capture for a specific PID, crash information will not be captured. Defaults to none and runs against all pids found." echo echo -e "-g {grep string}\tdefault [$grepString]" echo " The grep string used to find the processes" echo - echo -e "-l {y/n}\t\tdefault [$GRAB_CAVE_AND_ALERTVIZ_LOGS]" - echo " Captures the cave and alertviz logs. If run for a specific pid the only cave log captured will be for that pid" - echo - echo -e "-m {y/n}\t\tdefault [$MOVE_ALL_HS_ERR_PID]" - echo " Captures all hs_err_pid's found" - echo - echo -e "-p {PID}\t\tdefault none" - echo " Run capture for a specific PID, crash information will not be captured. Defaults to none and runs against all pids found." - echo - echo -e "-q {y/n}\t\tdefault [$RUN_QPID_STAT]" - echo " Run qpid-stat" - echo - echo -e "-Q {y/n}\t\tdefault [$GRAB_CURRENT_QUERIES]" - echo " Grab current running database queries" - echo - echo -e "-r \"Reason for capture\"" - echo " The reason for capture, so popup will not be shown" + echo -e "-screen {y/n}\t\tdefault [$GRAB_SCREENSHOT]" + echo " Screen print the current workstation (local user must be running capture)" echo echo -e "-s {y/n}\t\tdefault [$RUN_JSTACK]" echo " Run jstack to grab the thread stack information" echo - echo -e "-screen {y/n}\t\tdefault [$GRAB_SCREENSHOT]" - echo " Screen print the current workstation (local user must be running capture)" + echo -e "-d {y/n}\t\tdefault [$RUN_JMAP]" + echo " Run jmap to grab the head dump information" + echo + echo -e "-f {y/n}\t\tdefault [$FORCE]" + echo " Force a jstack/jmap by default" + echo + echo -e "-q {y/n}\t\tdefault [$RUN_QPID_STAT]" + echo " Force a qpid-stat by default" + echo + echo -e "-m {y/n}\t\tdefault [$MOVE_ALL_HS_ERR_PID]" + echo " Captures all hs_err_pid's found" + echo + echo -e "-l {y/n}\t\tdefault [$GRAB_CAVE_AND_ALERTVIZ_LOGS]" + echo " Captures the cave and alertviz logs. If run for a specific pid the only cave log captured will be for that pid" echo echo -e "-t {y/n}\t\tdefault [$GRAB_REMOTE_TOP]" echo " Captures top information from servers, auto login must be enabled" @@ -89,12 +73,21 @@ usage() { echo -e "-v {y/n}\t\tdefault [$GRAB_REMOTE_VMSTAT]" echo " Captures vmstat information from servers, auto login must be enabled" echo - echo -e "-V {y/n}\t\tdefault [$RUN_VERSIONS]" - echo " Grab version information" + echo -e "-c \"{host names}\"\tdefault [$REMOTE_SERVERS_TO_CHECK]" + echo " The servers to grab top information from, make sure list is quoted and space delimited" + echo + echo -e "-r \"Reason for capture\"" + echo " The reason for capture, so popup will not be shown" echo echo -e "-z {y/n}\t\tdefault [$TGZ_OUTPUT]" echo " Tar and gzip the captured data" echo + echo -e "-e {request/ingest/ingestGrib/ingestDat}" + echo " Run edex mode and grab information about the jvm passed. May be used multiple times to grab data about multiple jvms" + echo + echo -e "-v {y/n}\t\tdefault [$RUN_VERSIONS]" + echo " Grab version information" + echo echo -e "-h" echo " Display this usage statement" exit 0 @@ -135,18 +128,12 @@ checkYes() { # runs import to grab screen shot of users desktop grabScreenShot() { if [ "$GRAB_SCREENSHOT" == "y" ]; then - echo "Capturing screen shot of desktop" + echo "Capturing screen shot of desktop" t1=`date "+%Y%m%d %H:%M:%S"` echo "${t1}: Capturing screen shot of desktop" >> $processFile - possibleScreens=`w -hs $user | awk '{print $3}' | sort -u` - count=0 - for pScreen in $possibleScreens; - do - if [[ $pScreen =~ :[0-9]+\.[0-9]+ ]]; then - import -window root -display $pScreen ${dataPath}/screenShot_${count}.png > ${dataPath}/screenShot_${count}.log 2>&1 & - let "count+=1" - fi - done + import -window root -display :0.0 ${dataPath}/screenShot_0.png > ${dataPath}/screenShot_0.log 2>&1 & + import -window root -display :0.1 ${dataPath}/screenShot_1.png > ${dataPath}/screenShot_1.log 2>&1 & + import -window root -display :0.2 ${dataPath}/screenShot_2.png > ${dataPath}/screenShot_2.log 2>&1 & fi } @@ -178,16 +165,6 @@ grabRemoteVmstat() { fi } -grabCurrentDatabaseQueries() { - if [ "$GRAB_CURRENT_QUERIES" == "y" ]; then - echo "Capturing current database queries" - t1=`date "+%Y%m%d %H:%M:%S"` - echo "${t1}: Capturing current database queries" >> $processFile - out_file="${dataPath}/database_queries.log" - psql -d metadata -U awips -h ${DATABASE_HOST} -c "select datname, pid, client_addr, query, now()-xact_start as runningTime from pg_stat_activity where state != 'idle' order by runningTime desc;" >> $out_file 2>&1 & - fi -} - checkForProcsAsOtherUsers() { if [ ! -z "$procs" ]; then numMyProcs=`echo "$myProcs" | wc -l` @@ -397,23 +374,21 @@ while [ ! -z "$1" ]; do shift 1 case $arg in - -a) ACCUM="$1"; shift 1;; - -d) RUN_JMAP="$1"; shift 1;; - -e) EDEX_MODE="Y"; edexProcs[$edexProcCount]="$1"; shift 1; let "edexProcCount+=1";; - -f) FORCE="$1"; shift 1;; - -g) grepString="$1"; shift 1;; - -l) GRAB_CAVE_AND_ALERTVIZ_LOGS="$1"; shift 1;; - -m) MOVE_ALL_HS_ERR_PID="$1"; shift 1;; -p) cavePid="$1"; shift 1;; -q) RUN_QPID_STAT="$1"; shift 1;; - -Q) GRAB_CURRENT_QUERIES="$1"; shift 1;; + -g) grepString="$1"; shift 1;; -r) REMOTE_SERVERS_TO_CHECK="$1"; shift 1;; -s) RUN_JSTACK="$1"; shift 1;; - -screen) GRAB_SCREENSHOT="$1"; shift 1;; + -d) RUN_JMAP="$1"; shift 1;; + -f) FORCE="$1"; shift 1;; + -m) MOVE_ALL_HS_ERR_PID="$1"; shift 1;; -t) GRAB_REMOTE_TOP="$1"; shift 1;; - -v) GRAB_REMOTE_VMSTAT="$1"; shift 1;; - -V) RUN_VERSIONS="$1"; shift 1;; + -l) GRAB_CAVE_AND_ALERTVIZ_LOGS="$1"; shift 1;; -z) TGZ_OUTPUT="$1"; shift 1;; + -e) EDEX_MODE="Y"; edexProcs[$edexProcCount]="$1"; shift 1; let "edexProcCount+=1";; + -a) ACCUM="$1"; shift 1;; + -v) GRAB_REMOTE_VMSTAT="$1"; shift 1;; + -screen) GRAB_SCREENSHOT="$1"; shift 1;; -h|*) usage;; esac done @@ -426,7 +401,6 @@ checkYes FORCE $FORCE checkYes MOVE_ALL_HS_ERR_PID $MOVE_ALL_HS_ERR_PID checkYes GRAB_REMOTE_TOP $GRAB_REMOTE_TOP checkYes GRAB_REMOTE_VMSTAT $GRAB_REMOTE_VMSTAT -checkYes GRAB_CURRENT_QUERIES $GRAB_CURRENT_QUERIES checkYes GRAB_CAVE_AND_ALERTVIZ_LOGS $GRAB_CAVE_AND_ALERTVIZ_LOGS checkYes EDEX_MODE $EDEX_MODE checkYes TGZ_OUTPUT $TGZ_OUTPUT @@ -545,29 +519,29 @@ if [ ! -z "${myProcs}" ]; then IFS=$PREV_IFS launchJstacks + launchJmaps + + runQpidStat + + grabRemoteTop + + grabRemoteVmstat + else t1=`date "+%Y%m%d %H:%M:%S"` echo "*** NO processes found for user $user, capturing limited data to $dataPath" echo "${t1}: NO processes found for $user" >> $processFile echo "" >> $processFile + + runQpidStat + grabRemoteTop + grabRemoteVmstat fi -# grab top for servers -grabRemoteTop - -# grab vm stat for servers -grabRemoteVmstat - -# grab current database queries -grabCurrentDatabaseQueries - # grab screen shot, spawns background process for each screen grabScreenShot -# grab qpid stat -runQpidStat - # ls users home directory to check nas performance /usr/bin/time -p ls -la ~ > ${dataPath}/nas_check_ls_home.txt 2>&1 & diff --git a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/gpd/gpd.py b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/gpd/gpd.py index 243e7ca477..e0bdc4e7e5 100644 --- a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/gpd/gpd.py +++ b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/gpd/gpd.py @@ -37,22 +37,6 @@ USAGE_MESSAGE = \ gpd spx --f filePath gpd spg --f filePath --p prodName [--v versionNum] - - gpd qig --p prodName --f filePath - - gpd qigl --p prodName - - gpd qpg --p prodName --t referenceTime [--f filePath --v versionNum] - - gpd qpgl --p prodName --t referenceTime [--v versionNum] - - gpd qsg --p prodName --t referenceTime --id stationId [--f filePath --v versionNum] - - gpd qsgl --p prodName --t referenceTime --id stationId [--v versionNum] - - gpd qmg --p prodName --t referenceTime --slat latitude --slon longitude [--f filePath --v versionNum] - - gpd qmgl --p prodName --t referenceTime --slat latitude --slon longitude [--v versionNum] gpd pe @@ -78,6 +62,27 @@ SUBCOMMAND_MESSAGE = \ qmxl: To query and print a moving product spx: To store product XML file to EDEX server database spg: To store product GEMPAk table file to EDEX server database + pe: To purge expired products + pa: To purge all products + u: To print usage +""" +''' + gpd qig --p prodName --f filePath + + gpd qigl --p prodName + + gpd qpg --p prodName --t referenceTime [--f filePath --v versionNum] + + gpd qpgl --p prodName --t referenceTime [--v versionNum] + + gpd qsg --p prodName --t referenceTime --id stationId [--f filePath --v versionNum] + + gpd qsgl --p prodName --t referenceTime --id stationId [--v versionNum] + + gpd qmg --p prodName --t referenceTime --slat latitude --slon longitude [--f filePath --v versionNum] + + gpd qmgl --p prodName --t referenceTime --slat latitude --slon longitude [--v versionNum] + qig: To query product information, result saved at optional filePath qigl: To query and list product information qpg: To query a product (all stations), result saved at optional filePath @@ -86,10 +91,7 @@ SUBCOMMAND_MESSAGE = \ qsgl: To query and list a station product qmg: To query a moving product, result saved at optional filePath qmgl: To query and print a moving product - pe: To purge expired products - pa: To purge all products - u: To print usage -""" +''' def __initLogger(): global logger logger = logging.getLogger("gpd") @@ -152,7 +154,7 @@ def __parseCommandLine(): #parser_info_printXml.add_argument("--f", dest="filePath", action="store", # help=":target file path for return product") parser_info_printXml.set_defaults(func=__getPrintProdInfoXml) - + ''' parser_infoGempak = subparsers.add_parser('qig') parser_infoGempak.add_argument("--p", dest="prodName", action="store",required=True, help=":name of a Generic Point Data product") @@ -164,7 +166,7 @@ def __parseCommandLine(): parser_info_printGempak.add_argument("--p", dest="prodName", action="store",required=True, help=":name of a Generic Point Data product") parser_info_printGempak.set_defaults(func=__getPrintProdInfoGempak) - + ''' #To query a station product (single station) parser_stnProdXml = subparsers.add_parser('qsx') parser_stnProdXml.add_argument("--p", dest="prodName", action="store",required=True, @@ -190,7 +192,7 @@ def __parseCommandLine(): help=":product version") parser_stnProdXml_print.set_defaults(func=__getPrintStnProdXml) - + ''' parser_stnProdGempak = subparsers.add_parser('qsg') parser_stnProdGempak.add_argument("--p", dest="prodName", action="store",required=True, help=":name of a Generic Point Data product") @@ -214,7 +216,7 @@ def __parseCommandLine(): parser_stnProdGempak_print.add_argument("--v", dest="versionNum", action="store", help=":product version") parser_stnProdGempak_print.set_defaults(func=__getPrintStnProdGempak) - + ''' #To query a moving product parser_movingProdXml = subparsers.add_parser('qmx') parser_movingProdXml.add_argument("--p", dest="prodName", action="store",required=True, @@ -244,7 +246,7 @@ def __parseCommandLine(): help=":product version") parser_movingProdXml_print.set_defaults(func=__getPrintMovingProdXml) - + ''' parser_movingProdGempak = subparsers.add_parser('qmg') parser_movingProdGempak.add_argument("--p", dest="prodName", action="store",required=True, help=":name of a Generic Point Data product") @@ -272,7 +274,7 @@ def __parseCommandLine(): parser_movingProdGempak_print.add_argument("--v", dest="versionNum", action="store", help=":product version") parser_movingProdGempak_print.set_defaults(func=__getPrintMovingProdGempak) - + ''' #To query a product parser_prodXml = subparsers.add_parser('qpx') @@ -286,7 +288,7 @@ def __parseCommandLine(): help=":product version") parser_prodXml.set_defaults(func=__getProdXml) - + ''' parser_prodGempak = subparsers.add_parser('qpg') parser_prodGempak.add_argument("--p", dest="prodName", action="store",required=True, help=":name of a Generic Point Data product") @@ -297,7 +299,7 @@ def __parseCommandLine(): parser_prodGempak.add_argument("--v", dest="versionNum", action="store", help=":product version") parser_prodGempak.set_defaults(func=__getProdGempak) - + ''' parser_prodXml_print = subparsers.add_parser('qpxl') parser_prodXml_print.add_argument("--p", dest="prodName", action="store",required=True, help=":name of a Generic Point Data product") @@ -307,7 +309,7 @@ def __parseCommandLine(): help=":product version") parser_prodXml_print.set_defaults(func=__getPrintProdXml) - + ''' parser_prodGempak_print = subparsers.add_parser('qpgl') parser_prodGempak_print.add_argument("--p", dest="prodName", action="store",required=True, help=":name of a Generic Point Data product") @@ -317,7 +319,7 @@ def __parseCommandLine(): help=":product version") parser_prodGempak_print.set_defaults(func=__getPrintProdGempak) - + ''' ''' #parser_purge_prod = subparsers.add_parser('pp') diff --git a/edexOsgi/meteolib.jni.linux64/libmeteoLib.so b/edexOsgi/meteolib.jni.linux64/libmeteoLib.so index 8cec4f9682..5a19e061b4 100644 Binary files a/edexOsgi/meteolib.jni.linux64/libmeteoLib.so and b/edexOsgi/meteolib.jni.linux64/libmeteoLib.so differ diff --git a/javaUtilities/build.wes2bridge.utility/wes2bridge/customTargets.xml b/javaUtilities/build.wes2bridge.utility/wes2bridge/customTargets.xml index 54c80123bb..172709d29e 100644 --- a/javaUtilities/build.wes2bridge.utility/wes2bridge/customTargets.xml +++ b/javaUtilities/build.wes2bridge.utility/wes2bridge/customTargets.xml @@ -76,6 +76,10 @@ + + + + @@ -188,4 +192,4 @@ - \ No newline at end of file + diff --git a/javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java b/javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java index e1662dc0f7..ff16a2cd89 100644 --- a/javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java +++ b/javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java @@ -64,7 +64,6 @@ import com.raytheon.wes2bridge.common.configuration.Wes2BridgeConfiguration; * Jan 18, 2012 1490 bkowal Pypies is now added to each * edex-environment instance * Apr 18, 2013 1899 bkowal Updates qpid 0.18 configuration now. - * July 2, 2013 2133 bkowal Updates for yajsw-wrapped qpid * * * @@ -441,11 +440,23 @@ public class Wes2BridgeManager { BufferedWriter bw = this.getBufferedWriter(qpidd); final String line1 = "QPID_HOME="; + /* + * Need to update the 'ps' command that determines if qpid is running or + * not. + */ + final String line2 = "isRunning=`ps -ef | grep org.apache.qpid.server.Main | grep -c \"PNAME=QPBRKR \"`"; String line = StringUtils.EMPTY; while ((line = br.readLine()) != null) { if (line.startsWith(line1)) { line = line1 + qpidDirectory; + } else if (line.contains(line2)) { + StringBuilder stringBuilder = new StringBuilder(); + stringBuilder + .append("isRunning=`ps -ef | grep org.apache.qpid.server.Main | grep QPID_HOME="); + stringBuilder.append(qpidDirectory); + stringBuilder.append("| grep -c \"PNAME=QPBRKR \"`"); + line = stringBuilder.toString(); } bw.write(line + "\n"); diff --git a/javaUtilities/yajsw/deploy.xml b/javaUtilities/yajsw/deploy.xml deleted file mode 100644 index 9b013eaf74..0000000000 --- a/javaUtilities/yajsw/deploy.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/localization/localization.OAX/utility/common_static/site/OAX/warngen/config.xml b/localization/localization.OAX/utility/common_static/site/OAX/warngen/config.xml new file mode 100644 index 0000000000..608df36aa5 --- /dev/null +++ b/localization/localization.OAX/utility/common_static/site/OAX/warngen/config.xml @@ -0,0 +1,30 @@ + + + + OMAHA/VALLEY NE + OMAHA + EAX/KANSAS CITY,DMX/DES MOINES,BOX/BOSTON,LBF/NORTH PLATTE,PQR/PORTLAND + OMA + severethunderstorm + Flash Flood/ffw,Severe Thunderstorm/severethunderstorm,Tornado/tornado + Severe Weather Statement/SVS,Flash Flood Statement/ffs,non-convective FFW (Dam Break)/dambreak,non-convective Flash Flood Statement/dambreakffs,Areal Flood Warning/flw,Areal Flood Warning Followup/fls,Areal Flood Advisory/fla,Areal Flood Advisory Followup/flas,Special Marine Warning/smw,Marine Weather Statement (SMW Follow)/smws,Marine Weather Statement standalone/marinestatement,Short Term Forecast/shortterm,Special Weather Statement (zones)/sws + 5000 + \ No newline at end of file diff --git a/msi/VizLauncher/VizLauncher.suo b/msi/VizLauncher/VizLauncher.suo index 9b44de8eee..610c195a0e 100644 Binary files a/msi/VizLauncher/VizLauncher.suo and b/msi/VizLauncher/VizLauncher.suo differ diff --git a/msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs b/msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs index 31a4bf9a90..db02974126 100644 --- a/msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs +++ b/msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs @@ -56,10 +56,11 @@ namespace VizLauncher.com.raytheon.viz.launcher.process { ProcessStartInfo processStartInfo = new ProcessStartInfo(this.constructProcessName(vizEnvironment.getLocation())); - processStartInfo.EnvironmentVariables[EnvironmentProperties.ENVIRONMENT_VARIABLE_PATH] = - vizEnvironment.getPath(); - processStartInfo.EnvironmentVariables[EnvironmentProperties.ENVIRONMENT_VARIABLE_PYTHON_PATH] = - vizEnvironment.getPythonPath(); + processStartInfo.EnvironmentVariables.Remove(EnvironmentProperties.ENVIRONMENT_VARIABLE_PATH); + processStartInfo.EnvironmentVariables.Add( + EnvironmentProperties.ENVIRONMENT_VARIABLE_PATH, vizEnvironment.getPath()); + processStartInfo.EnvironmentVariables.Add( + EnvironmentProperties.ENVIRONMENT_VARIABLE_PYTHON_PATH, vizEnvironment.getPythonPath()); processStartInfo.UseShellExecute = false; processStartInfo.Arguments = this.getCommandLineArguments(); processStartInfo.RedirectStandardOutput = true; diff --git a/msi/build/A2Staging/VisualStudio/VizLauncher.exe b/msi/build/A2Staging/VisualStudio/VizLauncher.exe index af03282d6f..7b199ed61c 100644 Binary files a/msi/build/A2Staging/VisualStudio/VizLauncher.exe and b/msi/build/A2Staging/VisualStudio/VizLauncher.exe differ diff --git a/nativeLib/build.native/build-notification.sh b/nativeLib/build.native/build-notification.sh index 4517812a8e..d31e41a6ac 100644 --- a/nativeLib/build.native/build-notification.sh +++ b/nativeLib/build.native/build-notification.sh @@ -1,5 +1,7 @@ #!/bin/bash +set -x + # Constants: __ECLIPSE_="eclipse" __NO_SPLASH_="-nosplash" @@ -65,7 +67,7 @@ if [ $? -ne 0 ]; then exit 1 fi -PROJECTS_TO_IMPORT=( "org.apache.thrift" "org.apache.qpid" ) +PROJECTS_TO_IMPORT=( "org.apache.thrift" ) PROJECTS_TO_BUILD=( "edex_com" "edex_notify" ) for project in ${PROJECTS_TO_IMPORT[*]}; diff --git a/nativeLib/build.native/tools/compile_filetypes/fortran_filetype.cfg b/nativeLib/build.native/tools/compile_filetypes/fortran_filetype.cfg index a58d2e8dee..ad3f58e028 100644 --- a/nativeLib/build.native/tools/compile_filetypes/fortran_filetype.cfg +++ b/nativeLib/build.native/tools/compile_filetypes/fortran_filetype.cfg @@ -23,6 +23,6 @@ case $extension in fi - eval "$FORTRAN_COMPILER $OPTIONS $INCLUDE -o$OUT_FILE $IN_FILE" + eval "$FORTRAN_COMPILER $OPTIONS $INCLUDE -cpp -o$OUT_FILE $IN_FILE" ;; esac diff --git a/nativeLib/edexBridge/.cproject b/nativeLib/edexBridge/.cproject index d6e0bcb04b..f9cb73446c 100644 --- a/nativeLib/edexBridge/.cproject +++ b/nativeLib/edexBridge/.cproject @@ -4,7 +4,7 @@ - + @@ -16,7 +16,7 @@ - + @@ -27,10 +27,9 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -504,4 +569,5 @@ + diff --git a/nativeLib/edexBridge/edexBridge.cpp b/nativeLib/edexBridge/edexBridge.cpp index 784973d279..4ea302e346 100644 --- a/nativeLib/edexBridge/edexBridge.cpp +++ b/nativeLib/edexBridge/edexBridge.cpp @@ -159,7 +159,7 @@ private: { uwarn(error.what()); } - } + } this->isConnected = false; } @@ -399,7 +399,7 @@ int main(int argc, char* argv[]) { // Need to copy in the end of the queue before moving to front if (lastQueueSize > queueSize) { - udebug( + unotice( "Coming over the top with lastQueueSize of %d on a size of %d", lastQueueSize, sizeOfQueue); endQueueDiff = sizeOfQueue - lastQueueSize; @@ -431,7 +431,7 @@ int main(int argc, char* argv[]) { messagesSent, queue_diff); } - udebug( + unotice( "Sent %d messages (%d at the end of the queue, %d normally).", messagesSent, endQueueDiff, queue_diff); } diff --git a/nativeLib/edex_com/src/EdexNotification.h b/nativeLib/edex_com/src/EdexNotification.h index 9c02d955d4..1118fdcf22 100644 --- a/nativeLib/edex_com/src/EdexNotification.h +++ b/nativeLib/edex_com/src/EdexNotification.h @@ -56,6 +56,7 @@ typedef void CEdexNotification; #include "NotificationProtocol.h" using namespace qpid::messaging; +using namespace qpid::framing; using namespace std; using apache::thrift::transport::TMemoryBuffer; using boost::shared_ptr; diff --git a/nativeLib/files.native/awipsShare/hydroapps/bin/runso b/nativeLib/files.native/awipsShare/hydroapps/bin/runso index 7ee690b5d8..d48279da95 100755 Binary files a/nativeLib/files.native/awipsShare/hydroapps/bin/runso and b/nativeLib/files.native/awipsShare/hydroapps/bin/runso differ diff --git a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg.so.6 b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg.so.6 index 732b086cfe..25f7c7205e 100755 Binary files a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg.so.6 and b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg.so.6 differ diff --git a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg.so.6.0 b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg.so.6.0 index 732b086cfe..25f7c7205e 100755 Binary files a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg.so.6.0 and b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg.so.6.0 differ diff --git a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg_compat.so.3 b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg_compat.so.3 index 54a73b2b0b..528ffbacb8 100755 Binary files a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg_compat.so.3 and b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg_compat.so.3 differ diff --git a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg_compat.so.3.0 b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg_compat.so.3.0 index 54a73b2b0b..528ffbacb8 100755 Binary files a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg_compat.so.3.0 and b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg_compat.so.3.0 differ diff --git a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libjasper.so.1 b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libjasper.so.1 old mode 100644 new mode 100755 index c720732e99..7f23227c4d Binary files a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libjasper.so.1 and b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libjasper.so.1 differ diff --git a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libjvm.so b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libjvm.so old mode 100644 new mode 100755 diff --git a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libpgtypes.so.3 b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libpgtypes.so.3 index b24a5dc603..c7319c7b3e 100755 Binary files a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libpgtypes.so.3 and b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libpgtypes.so.3 differ diff --git a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libpgtypes.so.3.0 b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libpgtypes.so.3.0 index b24a5dc603..c7319c7b3e 100755 Binary files a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libpgtypes.so.3.0 and b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libpgtypes.so.3.0 differ diff --git a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.empty.motif.so b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.empty.motif.so old mode 100644 new mode 100755 index a026e3d168..46ab5f519f Binary files a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.empty.motif.so and b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.empty.motif.so differ diff --git a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.ofs.so.REMOVED.git-id b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.ofs.so.REMOVED.git-id index 670b0bb934..0de4c22f16 100644 --- a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.ofs.so.REMOVED.git-id +++ b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.ofs.so.REMOVED.git-id @@ -1 +1 @@ -cbeec8412bbae976431cb0dbe85fc6b9c170253e \ No newline at end of file +1a32b06c313e625de84f906b3a788e18d5fbf5a4 \ No newline at end of file diff --git a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so.REMOVED.git-id b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so.REMOVED.git-id index 2291591ae6..9e29681c5a 100644 --- a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so.REMOVED.git-id +++ b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so.REMOVED.git-id @@ -1 +1 @@ -2d8d4c03270ef631f167570cf0c03461ff832fea \ No newline at end of file +a86124ed46f7a16af33a87ae5ba9a1c02b870c80 \ No newline at end of file diff --git a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.util.so b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.util.so index 921c7422ff..636b0abd2a 100755 Binary files a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.util.so and b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.util.so differ diff --git a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so index 58ee78671b..ffc2a0e804 100755 Binary files a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so and b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so differ diff --git a/nativeLib/files.native/awipsShare/hydroapps/precip_proc/bin/gribit.LX b/nativeLib/files.native/awipsShare/hydroapps/precip_proc/bin/gribit.LX index 611883065b..0e61f132ac 100644 Binary files a/nativeLib/files.native/awipsShare/hydroapps/precip_proc/bin/gribit.LX and b/nativeLib/files.native/awipsShare/hydroapps/precip_proc/bin/gribit.LX differ diff --git a/nativeLib/files.native/awipsShare/hydroapps/whfs/bin/nrldb.ksh b/nativeLib/files.native/awipsShare/hydroapps/whfs/bin/nrldb.ksh deleted file mode 100644 index 5ffcc8009c..0000000000 --- a/nativeLib/files.native/awipsShare/hydroapps/whfs/bin/nrldb.ksh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/ksh - -#setenv FXA_HOME /awips/fxa -#setenv LOG_DIR /data/logs/fxa -#source $FXA_HOME/readenv.csh - -RUN_FROM_DIR=`dirname $0` -echo "RFD: $RUN_FROM_DIR" -# set up SOME environment variables for WHFS applications -. $RUN_FROM_DIR/../../set_hydro_env -. $RUN_FROM_DIR/../../check_app_context - -#set NRLDB_DATA=`/awips/hydroapps/public/bin/get_apps_defaults.LX nrldb_data` -#set NRLDB_LOG=`/awips/hydroapps/public/bin/get_apps_defaults.LX nrldb_log` -#set NRLDB_CONFIG=`/awips/hydroapps/public/bin/get_apps_defaults.LX nrldb_config` -#set WHFS_BIN=`/awips/hydroapps/public/bin/get_apps_defaults.LX whfs_bin_dir` -#cd /awips/hydroapps/whfs/local/data/backup_db/nrldb - -export NRLDB_DATA=$(get_apps_defaults nrldb_data) -echo "NRLDB data: $NRLDB_DATA" - -export NRLDB_LOG=$(get_apps_defaults nrldb_log) -echo "NRLDB log: $NRLDB_LOG" - -export NRLDB_CONFIG=$(get_apps_defaults nrldb_config) -echo "NRLDB config: $NRLDB_CONFIG" - -export WHFS_BIN=$(get_apps_defaults whfs_bin_dir) -echo "WHFS_BIN: $WHFS_BIN" - -export NRLDBLOGFILE=${NRLDB_LOG}/nrldb.log -export NRLDBTMPFILE=${NRLDB_LOG}/nrldb.tmp -tail -5000 $NRLDBLOGFILE > $NRLDBTMPFILE -mv $NRLDBTMPFILE $NRLDBLOGFILE - -${WHFS_BIN}/nrldb.pl -t wfo -u - -# diff --git a/nativeLib/files.native/awipsShare/hydroapps/whfs/bin/nrldb.pl b/nativeLib/files.native/awipsShare/hydroapps/whfs/bin/nrldb.pl deleted file mode 100644 index 409152e903..0000000000 --- a/nativeLib/files.native/awipsShare/hydroapps/whfs/bin/nrldb.pl +++ /dev/null @@ -1,1415 +0,0 @@ -#!/usr/bin/perl - -use strict; -use DBI; -use AppConfig qw(:expand :argcount); - - -#Set/define command line args -my %cfg = ( DEBUG => 0); # debug mode on or off -my $config = AppConfig->new(\%cfg); # create config object -$config->define('type',{ARGCOUNT => ARGCOUNT_ONE, VALIDATE => '(WFO|RFC|HQ|wfo|rfc|hq)', ALIAS => 'T'}); -$config->define('local-control-file',{ARGCOUNT => ARGCOUNT_ONE, ALIAS => 'L',DEFAULT => 0}); -$config->define('upload',{ARGCOUNT => ARGCOUNT_NONE, ALIAS => 'U', DEFAULT => 0}); -$config->define('wfo-id',{ARGCOUNT => ARGCOUNT_ONE, ALIAS => 'W', DEFAULT => 0}); -$config->define('rfc-id',{ARGCOUNT => ARGCOUNT_ONE, ALIAS => 'R', DEFAULT => 0}); -$config->define('out-xmlfile',{ARGCOUNT => ARGCOUNT_ONE, ALIAS => 'O', DEFAULT => 0}); -$config->define('input-xmlfile',{ARGCOUNT => ARGCOUNT_ONE, ALIAS => 'I', DEFAULT => 0}); -$config->define('check',{ARGCOUNT => ARGCOUNT_NONE, ALIAS => 'C', DEFAULT => 0}); -$config->define('verbose',{ARGCOUNT => ARGCOUNT_NONE, ALIAS => 'V', DEFAULT => 0}); -$config->define('dbname',{ARGCOUNT => ARGCOUNT_ONE, ALIAS => 'D', DEFAULT => 0}); -$config->define('extract',{ARGCOUNT => ARGCOUNT_NONE, ALIAS => 'E', DEFAULT => 0}); -$config->define('delete',{ARGCOUNT => ARGCOUNT_NONE, ALIAS => 'A', DEFAULT => 0}); -$config->getopt(\@ARGV); - -our $type = uc($config->get('type')); -our $localControlFile = $config->get('local-control-file'); -our $Upload = $config->get('upload'); -our $wfoID = uc($config->get('wfo-id')); -our $rfcID = uc($config->get('rfc-id')); -our $outFile = $config->get('out-xmlfile'); -our $inFile = $config->get('input-xmlfile'); -our $check = $config->get('check'); -our $verbose = $config->get('verbose'); -our $dbname_flag = $config->get('dbname'); -our $extract = $config->get('extract'); -our $delete = $config->get('delete'); -our $office; -our $update_count = 0; -our $insert_count = 0; -our $error_count = 0; -our $total_count = 0; -our $file_name; -our $conf_dir; -my ($dbname, $host, $user, $pass, $nrldb_host, $backup_host); -my @delete_list; -my $delete_listRef; -print "db name flag: $dbname_flag\n"; -if($check) { - warn "-----Starting NRLDB installation check-----\nInstallation Complete.\n"; - print "Installation Complete.\n"; - exit 0; -} - - -#Get config file info -($dbname, $host, $user, $pass, $nrldb_host, $office, $backup_host) = read_config_file(); - -if(!$dbname_flag) -{ - if( -e "/awips/hydroapps/public/bin/get_apps_defaults") - { - $dbname = `/awips/hydroapps/public/bin/get_apps_defaults.LX db_name`; - } -} -else{ - $dbname = $dbname_flag; -} -# Do parameter checks -if($type eq "") -{ - print "No office type specified.\nusage: --type WFO|RFC|HQ\n\n"; - exit 1; -} -if($type eq "HQ") -{ - if($inFile eq 0) - { - print "No xml input file specified.\nusage: --type HQ --input-xmlfile 'file'\n\n"; - exit 1; - } - if($rfcID eq 0 && $wfoID eq 0) - { - print "You must specify a WFO/RFC office identifier with the HQ type.\n"; - exit 1; - } - - unless($rfcID eq 0) { - $office = $rfcID; - } - unless($wfoID eq 0) { - $office = $wfoID; - } - -} - -if($type eq "RFC") -{ - if($rfcID eq 0) - { - print "You must specify an RFC office identifier with the rfc option.\nusage: --type RFC --rfc-id IDRFC\n\n"; - exit 1; - } -} - - -#Connect to database -our $db = db_connect($dbname, $host, $user, $pass); - -my $date = getdate(); -print "---Starting NRLDB process at $office\, running as $type\---\n---$date\n\n" if($verbose); -warn "---Starting NRLDB process at $office\, running as $type\---\n---$date\n\n"; -print "Connected to database: $dbname\n" if($verbose); -warn "Connected to database: $dbname\n"; -#Determine what type of office is running nrldb software -if(($type eq "WFO") | ($type eq "RFC")) -{ - if($localControlFile eq 0) - { - download_control_file($type); - } - create_xml(); - if($Upload) - { - upload_xml($nrldb_host); - upload_xml($backup_host); - } -} -elsif($type eq "HQ") -{ - if($delete) - { - $delete_listRef = get_delete_list(); - @delete_list = @$delete_listRef; - foreach my $delete_table (@delete_list) - { - deleteValues($delete_table); - } - } - xml_parse(); -} - -print "\n-----------------------------\n\n" if($verbose); -warn "\n-----------------------------\n\n"; -exit 0; - - -# sub 'create_xml' is responsible for querying the database and putting the info into xml format. -sub create_xml -{ - -my $table_name; -my ($select_string, $field_string); -my $xml_string; -my $record_count; -my ($st, $at); -my $table_query; -my $query_error_flag; -my $numrows; -my $lid_flag; -my $pkey; -my ($pk_name, $field_name); -my $row; -my $extract_detail; -my %infohash; -my @tables; -my @fields; -my @fields_all; -my @select_array; -my @PK; -my @keys; -my (@pk_output, @fields_output); - -#read control file and put specified fields into array -my ($tables_ref, $fields_all_ref) = read_control_file(); -@tables = @$tables_ref; -@fields_all = @$fields_all_ref; - - $extract_detail = ''; -# print "EXTRACT: $extract\n"; - unless($extract eq 0) - { - $extract_detail = extract_detail(); - } - -# Start creating xml -$xml_string = "\n\n"; -foreach $table_name (@tables) -{ - - print "TABLE: $table_name\n" if($verbose); - warn "TABLE: $table_name\n"; - $select_string = ""; - $lid_flag = 1; - # Get primary key list for specified tables - @keys = $db->primary_key(undef, undef, $table_name); - - foreach $pkey (@keys) - { - # The following 6 lines were by mark Armstrong (HSD) on 2/26/09 - # to remove the quotes from primary keys. - # When primary keys occurred with quotes, the update queries - # were not successful. - if ($pkey =~ /"/){ - my $length_pkey = length $pkey; - $length_pkey -= 2; - my $new_pkey = substr($pkey,1,$length_pkey); - $pkey=$new_pkey; - } - push(@PK, "$table_name.$pkey"); - } - - @pk_output = grep(/$table_name\.\w*/, @PK); - print "\tPK: @pk_output\n" if($verbose); - warn "\tPK: @pk_output\n"; - @fields_output = grep(/$table_name\.\w*/, @fields_all); - print "\tFIELDS: @fields_output\n" if($verbose); - warn "\tFIELDS: @fields_output\n"; - - my $pk_count = @pk_output; - if($pk_count == 0) - { - print "No Primary Keys found for Table: $table_name\nContinuing\n\n" if($verbose); - warn "No Primary Keys found for Table: $table_name\nContinuing\n\n"; - next; - } - - #loop through arrays and put together a select string for specified table - foreach my $pk (@pk_output) - { - if($pk =~ /$table_name\.\w*/) - { - if($select_string eq "") - { - $select_string = "$pk"; - } - else - { - $select_string .= ",$pk"; - } - } - } - - - foreach my $fields (@fields_output) - { - if($select_string =~ /.*$fields.*/) - { - if($field_string eq "") - { - $field_string = "$fields"; - } - else - { - $field_string .= ",$fields"; - } - next; - } - elsif($fields =~ /.*ALL.*/) - { - $select_string = "*"; - last; - } - else - { - if($field_string eq "") - { - $field_string = "$fields"; - } - else - { - $field_string .= ",$fields"; - } - $select_string .= ",$fields"; - } - } - - - #print select string to be used - print "\n" if($verbose); - warn "\n"; - $query_error_flag = 0; - #if select string equal 'ALL' get a list of all fields in specified table by querying database info tables. - if($select_string eq "*") - { - - my $query_column1 = "SELECT c.oid - FROM pg_catalog.pg_class c - LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace - WHERE pg_catalog.pg_table_is_visible(c.oid) - AND c.relname ~ '^$table_name\$'"; - - my $attribute_query = "SELECT a.attname - FROM pg_catalog.pg_attribute a - WHERE a.attnum > 0 AND NOT a.attisdropped - AND a.attrelid = ($query_column1) - ORDER BY a.attnum;"; - - eval - { - $at = $db->prepare($attribute_query); - $at->execute() or die "Cannot execute: ".$at->errstr(); - }; - if($@) - {print "$@\n" if($verbose); warn "$@\n";} - - my $att_count = 0; - while ( defined ( my $attribues = $at->fetchrow_arrayref() ) ) - { - if($att_count > 0) - { - $select_string .= ",$table_name.@$attribues[0]"; - } - else - { - $select_string = "$table_name.@$attribues[0]"; - } - $att_count++; - } - $field_string = $select_string; - } - - #Check for lid in table - if($select_string !~ /$table_name\.lid/) - { - $lid_flag = lid_check($table_name); - } - - # Determine query depending on office type and other parameters - ## Revised query to properly select only counties from primary HSA or identified WFO - Ernie Wells February 09 ## - if($type eq "WFO") - { - if($wfoID eq 0) { - if($table_name =~ /location/) - { - $table_query = "SELECT $select_string FROM location, admin WHERE location.hsa = admin.hsa $extract_detail ORDER BY lid;"; - } elsif($table_name =~ /counties/) { - $table_query = "SELECT $select_string FROM counties, admin WHERE counties.wfo = admin.hsa;"; - } elsif($table_name =~ /rpffcstgroup/) { - $table_query = "SELECT distinct $select_string from rpffcstgroup join rpffcstpoint rp on rp.group_id = rpffcstgroup.group_id join location l on l.lid = rp.lid join admin on l.hsa = admin.hsa;"; - } elsif($table_name =~ /vtecevent/) { - $table_query = "SELECT $select_string FROM vtecevent WHERE vtecevent.geoid in (select location.lid from location, admin where location.hsa = admin.hsa) $extract_detail;"; - } elsif($table_name eq "height" || $table_name =~ /temperature/ || $table_name =~ /curpp/ || $table_name =~ /curpc/ || $table_name eq "discharge"){ - my $cutoff_dtime = getcutoffdate(); - $table_query = "SELECT $select_string FROM $table_name WHERE exists (SELECT lid FROM location, admin WHERE location.lid = $table_name.lid AND location.hsa = admin.hsa) and obstime > '$cutoff_dtime' $extract_detail ORDER BY lid;"; - } elsif($table_name =~ /fcstheight/ || $table_name =~ /fcstdischarge/) { - my $cutoff_dtime = getcutoffdate(); - $table_query = "SELECT $select_string FROM $table_name WHERE exists (SELECT lid FROM location, admin WHERE location.lid = $table_name.lid AND location.hsa = admin.hsa) and basistime > '$cutoff_dtime' $extract_detail ORDER BY lid;"; - } elsif($lid_flag == 1){ - $table_query = "SELECT $select_string FROM $table_name WHERE exists (SELECT lid FROM location, admin WHERE location.lid = $table_name.lid AND location.hsa = admin.hsa) $extract_detail ORDER BY lid;"; - } - else { - $table_query = "SELECT $select_string FROM $table_name\;"; - } - } - else { - if($table_name =~ /location/) - { - if($extract eq 0) { - $table_query = "SELECT $select_string FROM location WHERE location.hsa = '$wfoID' $extract_detail ORDER BY lid;"; - } else { - $table_query = "SELECT $select_string FROM location WHERE location.hsa like '%' $extract_detail ORDER BY lid;"; - } - } elsif($table_name =~ /counties/) { - if($extract eq 0) { - $table_query = "SELECT $select_string FROM counties WHERE counties.wfo = '$wfoID';"; - } else { - $table_query = "SELECT $select_string FROM counties WHERE counties.wfo in (select hsa from location where hsa is not null $extract_detail) ;"; - } - } elsif($table_name =~ /rpffcstgroup/) { - if($extract eq 0) { - $table_query = "SELECT distinct $select_string from rpffcstgroup join rpffcstpoint rp on rp.group_id = rpffcstgroup.group_id join location l on l.lid = rp.lid where l.hsa = '$wfoID';"; - } else { - my $rpgroup_extract_detail = $extract_detail; - $rpgroup_extract_detail =~ s/lid/l.lid/g; - $table_query = "SELECT distinct $select_string from rpffcstgroup join rpffcstpoint rp on rp.group_id = rpffcstgroup.group_id join location l on l.lid = rp.lid where l.hsa is not null $rpgroup_extract_detail;"; - } - } elsif($table_name =~ /vtecevent/) { - if($extract eq 0) { - $table_query = "SELECT $select_string FROM vtecevent WHERE vtecevent.geoid in (select location.lid from location where location.hsa = '$wfoID') ;"; - } else { - my $vtec_extract_detail = $extract_detail; - $vtec_extract_detail =~ s/lid/geoid/g; - print "vtec_extract_detail: $vtec_extract_detail\n"; - $table_query = "SELECT $select_string FROM vtecevent WHERE vtecevent.geoid in (select location.lid from location where location.hsa is not null) $vtec_extract_detail;"; - } - } elsif($table_name eq "height" || $table_name =~ /temperature/ || $table_name =~ /curpp/ || $table_name =~ /curpc/ || $table_name eq "discharge"){ - my $cutoff_dtime = getcutoffdate(); - if($extract eq 0) { - $table_query = "SELECT $select_string FROM $table_name WHERE exists (SELECT lid FROM location WHERE location.lid = $table_name.lid AND location.hsa = '$wfoID') and obstime > '$cutoff_dtime' ORDER BY lid;"; - } else { - $table_query = "SELECT $select_string FROM $table_name WHERE exists (SELECT lid FROM location WHERE location.lid = $table_name.lid ) and obstime > '$cutoff_dtime' $extract_detail ORDER BY lid;"; - } - } elsif($table_name =~ /fcstheight/ || $table_name =~ /fcstdischarge/) { - my $cutoff_dtime = getcutoffdate(); - if($extract eq 0) { - $table_query = "SELECT $select_string FROM $table_name WHERE exists (SELECT lid FROM location WHERE location.lid = $table_name.lid AND location.hsa = '$wfoID') and basistime > '$cutoff_dtime' ORDER BY lid;"; - } else { - $table_query = "SELECT $select_string FROM $table_name WHERE exists (SELECT lid FROM location WHERE location.lid = $table_name.lid) and basistime > '$cutoff_dtime' $extract_detail ORDER BY lid;"; - } - } elsif($lid_flag == 1) { - if($extract eq 0) { - $table_query = "SELECT $select_string FROM $table_name WHERE exists (SELECT lid FROM location WHERE location.lid = $table_name.lid AND location.hsa = '$wfoID') $extract_detail ORDER BY lid;"; - } else { - $table_query = "SELECT $select_string FROM $table_name WHERE exists (SELECT lid FROM location WHERE location.lid = $table_name.lid) $extract_detail ORDER BY lid;"; - } - } else { - $table_query = "SELECT $select_string FROM $table_name\;"; - } - } - } elsif($type eq "RFC") { - if($table_name =~ /location/) { - $table_query = "SELECT $select_string FROM location WHERE location.rfc='$rfcID' $extract_detail ORDER BY lid;"; - } elsif($lid_flag == 1) { - $table_query = "SELECT $select_string from $table_name where exists (select lid from location where -location.lid = $table_name.lid and location.rfc='$rfcID') $extract_detail ORDER BY lid;"; - # $table_query = "SELECT $select_string from $table_name where exists (select lid from location where -#location.lid=rating.lid and location.rfc='$rfcID') $extract_detail ORDER BY lid;"; - } else { - $table_query = "SELECT $select_string FROM $table_name\;"; - } - } - - # print the query for log purpose and execute the query - print "$table_query\n\n" if($verbose); - warn "$table_query\n\n"; - $record_count = 0; - eval - { - $st = $db->prepare($table_query); - $row = $db->selectall_arrayref($st,{Slice => {}}); - #$st->execute() or die "Cannot execute: ".$st->errstr(); - }; - if ($@) - { - print "$@\n" if($verbose); - warn "$@\n"; - $xml_string .= " \n"; - $query_error_flag = 1; - } - - # if no db error continue adding info to xml file for the table. - if($query_error_flag == 0) - { - $numrows = $st->rows; - print "Number of records obtained: $numrows\n" if($verbose); - warn "Number of records obtained: $numrows\n"; - if ($numrows == 0) - { - $xml_string .= "
\n"; - } - else - { - $xml_string .= "
\n"; - } - - foreach my $sref (@$row) - { - %infohash=%{$sref}; - #print record number to xml file - $xml_string .= " \n \n"; - - #print primary key to xml file - my $pk_count = 0; - foreach my $pk (@pk_output) - { - if($pk =~ /$table_name\.(.*)/) - { - $pk_name=$1; - #$infohash{$pk_name}=~ s/\r|\n//g; - $xml_string .= " <$pk>$infohash{$pk_name}\n"; - $pk_count++; - } - } - $xml_string .= " \n \n"; - @select_array = split(/,/, $field_string); - #start printing fields to xml file - my $field_count = 0; - foreach my $select (@select_array) - { - if($select =~ /.*$table_name\.(.*)/) - { - $field_name = $1; - if($infohash{$field_name} !~/^\s*$/) - { - #$infohash{$field_name} =~ s/\r|\n//g; - $xml_string .= " <$select>$infohash{$field_name}\n"; - } - else - { - $xml_string .= " <$select/>\n"; - } - $field_count++; - } - } - $xml_string .=" \n"; - $xml_string .=" \n"; - $record_count++; - } - - } - if($numrows != 0 && $query_error_flag == 0) - { - $xml_string .="
\n"; - } - @select_array = (); - $field_string = ""; - - print "\n---------------\n" if($verbose); - warn "\n---------------\n"; - -} -$xml_string .="
\n"; - -if ($type eq "WFO" && $wfoID eq 0) -{ - my $hsa_admin_query = "SELECT admin.hsa FROM admin;"; - my $st_admin; - eval - { - $st_admin = $db->prepare($hsa_admin_query); - $st_admin->execute() or die "Cannot execute: ".$st_admin->errstr(); - }; - if ($@) - { - print "$@\n" if($verbose); - warn "$@\n"; - } - while ( defined ( my $row = $st_admin->fetchrow_arrayref() ) ) - { - $wfoID = @$row[0]; - } - -} - -if($type eq "WFO") -{ - $file_name = "$wfoID\_from-$office\_nrldb.xml"; -} -elsif($type eq "RFC") -{ - $file_name = "$rfcID\_from-$office\_nrldb.xml"; -} - - -#determine output file -if($outFile eq 0) -{ - $outFile = $file_name; -} - -my $outDir; - -if( -e "/awips/hydroapps/public/bin/get_apps_defaults"){ - $outDir = `/awips/hydroapps/public/bin/get_apps_defaults.LX nrldb_data`; - - chomp($outDir); -} else { - print "Could not access /awips/hydroapps/public/bin/get_apps_defaults.LX. Exiting"; - exit -1; -} - -$outFile = $outDir . "/" . $outFile; -open(XMLFILE, ">$outFile") || die "Could not open $outFile for writing.\n$!\nExiting\n"; -printf XMLFILE "$xml_string"; -close(XMLFILE); - -my $end = $db->disconnect; -zip_xml($outFile); -} - -sub zip_xml -{ -my $filename = shift; -my $zip_string; - - $zip_string = "zip $filename.zip $filename"; - print "$zip_string\n" if($verbose); - warn "$zip_string\n"; - my $zip_exe = `$zip_string`; - print "$zip_exe\n" if($verbose); - warn "$zip_exe\n"; - print "Failed: \"$zip_string\"\n" if ($? && $verbose); - warn "Failed: \"$zip_string\"\n" if $?; -} - - -sub read_control_file -{ -my @fields_all; -my @tables; -my @fields; -my $table_name; -my $control_file; - -if($localControlFile eq 0) -{ - if($type eq "WFO") - { - $control_file = "${conf_dir}/nrldb_control_wfo"; - } - elsif($type eq "RFC") - { - $control_file = "${conf_dir}/nrldb_control_rfc"; - } -} -else -{ - $control_file = $localControlFile; -} -open(FILE, "$control_file") || die "Could not open control file: $control_file\n$!\nExiting\n"; -my @infile = ; -close(FILE); - -foreach my $line (@infile) -{ -chomp($line); - if($line =~ /^#.*$/) - { - next; - } - elsif($line =~ /\[(.*)\]/) - { - $table_name = $1; - push (@tables, $table_name); - } - elsif($line =~ /^(fields)/) - { - $line =~ /fields = (.*)/; - @fields = split(/,/, $1); - - foreach my $tmp_field (@fields) - { - $tmp_field =~ s/\s*//; - push(@fields_all, "$table_name.$tmp_field"); - } - } -} - - -return (\@tables, \@fields_all); -} - -sub extract_detail() -{ - -my $wfo = $office; -my $wfo_fh_pointer = 0; -my $info_found = 0; -my ($ex_type, $ex_list); -my @extract_lid; -my $uclid; -my $compare_symbol; -my $extract_query = ''; - -open(FILE, "nrldb_extract") || die "Could not open detail extract file nrldb_extract:\n$!\nExiting\n"; -my @infile = ; -close(FILE); - - foreach my $line (@infile) - { - chomp($line); - if($line =~ m/type:\s*(\w*)/) - {$ex_type= $1;} - if($line =~ m/list:\s*(.*)/) - { - $ex_list= $1; - if(defined($ex_type) && defined($ex_list)) - {$info_found = 1;} - } - - if($info_found eq 1) - {last;} - } - if($info_found eq 1) - { - print "EXTRACT: $ex_type, [$ex_list]\n" if($verbose); - warn "EXTRACT: $ex_type, [$ex_list]\n"; - @extract_lid = split(/,/,$ex_list); - - if(lc($ex_type) eq 'only') - {$compare_symbol = '=';} - elsif(lc($ex_type) eq 'except') - {$compare_symbol = '!=';} - else - { - print "Undefined extraction type '$ex_type', should be only|except\n" if($verbose); - warn "Undefined extraction type '$ex_type', should be only|except\n"; - return($extract_query); - } - # The following has been modified by Mark Armstrong HSD - # Originally, the query for multiple lids using the "only" extract - # was incorrect. It used the AND condition for each lid which - # would never be true. I added another if condition and a new - # for loop to handle this case. - if(lc($ex_type) eq 'only'){ - my $count = 0; - $extract_query=" AND ("; - foreach my $lid (@extract_lid) - { - if($lid eq '') - {next;} - - $uclid=uc($lid); - $uclid =~ s/\s*//g; - if ( $count eq 0) - { - $extract_query .= " lid $compare_symbol '$uclid'"; - } - else - { - $extract_query .= " OR lid $compare_symbol '$uclid'"; - } - $count = $count + 1; - } - $extract_query .= ") "; - } - else{ - foreach my $lid (@extract_lid) - { - if($lid eq '') - {next;} - - $uclid=uc($lid); - $uclid =~ s/\s*//g; - $extract_query .= " AND lid $compare_symbol '$uclid'"; - - } - } - } - return($extract_query); -} - -sub read_config_file() -{ - -my $dbname; -my $host; -my $pass; -my $user; -my $nrldb_host; -my $site_conf; -my $backup_host; -my $conf_file; - -if( -e "/awips/hydroapps/public/bin/get_apps_defaults") -{ - $conf_dir = `/awips/hydroapps/public/bin/get_apps_defaults.LX nrldb_config`; - chomp($conf_dir); - $conf_file = "${conf_dir}/nrldb.conf"; -} -else -{ - print "nrldb_conf token not specified. Exiting"; - exit -1; -} -open(FILE, "${conf_file}") || die "Could not open configuration ${conf_file}:\n$!\nExiting\n"; -my @infile = ; -close(FILE); - - foreach my $line (@infile) - { - chomp($line); - if($line =~ /(^\s*dbname\s*=\s*"(.*)")/) - { - $dbname = "$2"; - } - elsif($line =~ /(^\s*dbhost\s*=\s*"(.*)")/) - { - $host = "$2"; - } - elsif($line =~ /(^\s*dbpass\s*=\s*"(.*)")/) - { - $pass = "$2"; - } - elsif($line =~ /(^\s*dbuser\s*=\s*"(.*)")/) - { - $user = "$2"; - } - elsif($line =~ /(^\s*nrldb_host\s*=\s*"(.*)")/) - { - $nrldb_host = "$2"; - } - elsif($line =~ /(^\s*site\s*=\s*"(.*)")/) - { - $site_conf = "$2"; - } - elsif($line =~ /(^\s*backup_host\s*=\s*"(.*)")/) - { - $backup_host = "$2"; - } - - } - return($dbname, $host, $user, $pass, $nrldb_host, $site_conf, $backup_host); -} - - -sub xml_parse -{ -my $xmlfile = $inFile; # the file to parse -my $lineCount = 0; -my @rawLine; -my $last_f; -my $record_num; -my $table; -my ($i, $j, $k); -my ($PK_name, $PK_value, $Field_name, $Field_value); -sub insertValues($table, $record_num, $PK_name, $PK_value, $Field_name, $Field_value); - -print "Parsing and Inserting Values from $xmlfile into database\n\n" if($verbose); -warn "Parsing and Inserting Values from $xmlfile into database\n\n"; - -open(XML_FH, "$xmlfile") or die("Cant open file $xmlfile for reading: $!\nExiting\n"); -while () -{ - # $_ is the line that has set. - $rawLine[$lineCount] = "$_"; - $lineCount++; -} - - - -close(XML_FH); - -$i=0; - - while (!$last_f) - { - if ($rawLine[$i] =~ m//) - { - print "Current Table: $1\n" if($verbose); - warn "Current Table: $1\n"; - $table = $1; - while($rawLine[$i] !~ m/<\/Table>/) - { - if($rawLine[$i] =~ //) - { - $record_num = $1; - while ($rawLine[$i] !~ m/<\/Record>/) - { - if($rawLine[$i] =~ //) - { $i++; - $j = 0; - while($rawLine[$i] !~ m/<\/PK>/) - { - if($rawLine[$i] =~ m/<$table\.(.*?)>(.*)<\/$table\..*>/) - { - $$PK_name[$j] = $1; - $$PK_value[$j] = $2; - $j++; - } - elsif($rawLine[$i] =~ m/<$table\.(.*)\/>/) - { - $$PK_name[$j] = $1; - $$PK_value[$j] = "NULL"; - $j++; - } - elsif($rawLine[$i] =~ m/<$table\.(.*?)>.*/) - { - - {$$PK_name[$k] = $1;} - $$PK_value[$j] = ''; - do - { - $$PK_value[$j] .= $rawLine[$i]; - $i++; - } until ($rawLine[$i] =~ m/<\/$table\..*>$/); - $$PK_value[$j] .= $rawLine[$i]; - $$PK_value[$j] =~ s/^\s*<$table\.(.*)>//g; - $$PK_value[$j] =~ s/<\/$table\..*>$//g; #/ - $j++; - } - $i++; - } - } - if($rawLine[$i] =~ //) - { $i++; - $k = 0; - while($rawLine[$i] !~ m/<\/Fields>/) - { - if($rawLine[$i] =~ m/<$table\.(.*?)>(.*)<\/$table\..*>/) - { - $$Field_name[$k] = $1; - $$Field_value[$k] = $2; - $k++; - } - elsif($rawLine[$i] =~ m/<$table\.(.*)\/>/) - { - $$Field_name[$k] = $1; - $$Field_value[$k] = "NULL"; - $k++; - } - elsif($rawLine[$i] =~ m/<$table\.(.*?)>.*/) - { - - {$$Field_name[$k] = $1;} - $$Field_value[$k] = ''; - do - { - $$Field_value[$k] .= $rawLine[$i]; - $i++; - } until ($rawLine[$i] =~ m/<\/$table\..*>$/); - $$Field_value[$k] .= $rawLine[$i]; - $$Field_value[$k] =~ s/^\s*<$table\.(.*)>//g; - $$Field_value[$k] =~ s/<\/$table\..*>$//g; #/ - $k++; - } - $i++; - } - } - $i++; - } - &insertValues($table, $record_num, $PK_name, $PK_value, $Field_name, $Field_value); - $#$PK_name = -1; $#$PK_value = -1; $#$Field_name = -1; $#$Field_value = -1; - $total_count++; - } - $i++; - } - print "\tTotal Inserts: $insert_count\n" if($verbose); - warn "\tTotal Inserts: $insert_count\n"; - print "\tTotal Updates: $update_count\n" if($verbose); - warn "\tTotal Updates: $update_count\n"; - print "\tTotal Errors: $error_count\n" if($verbose); - warn "\tTotal Errors: $error_count\n"; - print "\tTOTAL: $total_count\n\n" if($verbose); - warn "\tTOTAL: $total_count\n\n"; - $insert_count = 0; - $update_count = 0; - $error_count = 0; - $total_count = 0; - } - elsif ($rawLine[$i] =~ /<\/NRLDB>/) - {$last_f = 1;} - else - {$i++;} - } - -} - -sub get_delete_list -{ - my @list; - my $table; - - open(FILE, "${conf_dir}/nrldb_control_delete") || die "Could not open detail extract file ${conf_dir}/nrldb_control_delete:\n$!\nExiting\n"; - my @infile = ; - close(FILE); - - foreach my $line (@infile) - { - chomp($line); - if($line =~ m/^\s*#/) - {next;} - - if($line =~ m/^\s*\w+\s*$/) - { - $line =~ s/\s*//g; - $table=lc($line); - push(@list, $table); - } - } - - return(\@list); -} - -sub deleteValues -{ - my $deleteTable = shift; - my $deleteWFO = $office; - my $lid_flag = lid_check($deleteTable); - my ($delete_query, $st); - - my ($delete_detail, $total); - - if($lid_flag == 1) - { - ($delete_detail, $total)=getDeleteLid($deleteTable); - if($total !=0) - { - $delete_query = "DELETE FROM $deleteTable $delete_detail\;"; - print "DELETE: $delete_query\n"; - } - } - else - { - $delete_query = "DELETE FROM $deleteTable\;"; - } - - eval - { - $st = $db->prepare($delete_query); - $st->execute() or die "Cannot execute: ".$st->errstr(); - }; - if($@) - {print "$@\n" if($verbose); warn "$@\n";} - -} - - -sub getDeleteLid -{ - -my $xmlfile = $inFile; # the file to parse -my $lineCount = 0; -my @rawLine; -my $last_f; -my $record_num; -my $table; -my ($i, $j, $k); -my $lid_name; - -my $deleteTable = shift; -my $total_count = 0; - -open(XML_FH, "$xmlfile") or die("Cant open file $xmlfile for reading: $!\nExiting\n"); -while () -{ - # $_ is the line that has set. - $rawLine[$lineCount] = "$_"; - $lineCount++; -} - -close(XML_FH); - -$i=0; -my $delete_str = ""; -my $last_lid = -1; - while (!$last_f) - { - if ($rawLine[$i] =~ m/
/) - { - print "Delete Table: $1\n" if($verbose); - warn "Delete Table: $1\n"; - $table = $1; - while($rawLine[$i] !~ m/<\/Table>/) - { - if($rawLine[$i] =~ //) - { - $record_num = $1; - while ($rawLine[$i] !~ m/<\/Record>/) - { - if($rawLine[$i] =~ //) - { $i++; - while($rawLine[$i] !~ m/<\/PK>/) - { - if($rawLine[$i] =~ m/<$table\.lid>(.*)<\/$table\.lid>/) - { - if(($last_lid != -1) && ($last_lid eq $1)) - {$i++; next;} - #print "$1\n"; - if ($total_count == 0) - { - $delete_str .= "WHERE $table.lid = '$1'"; - } - else - { - $delete_str .= " OR $table.lid = '$1'"; - } - - $last_lid = $1; - - } - $i++; - } - } - $i++; - } - $total_count++; - } - $i++; - } - print "\tTotal Delete LIDs: $total_count\n" if($verbose); - warn "\tTotal Delete LIDs: $total_count\n"; - $last_f = 1; - } - elsif ($rawLine[$i] =~ /<\/NRLDB>/) - {$last_f = 1;} - else - {$i++;} - } - #print "$delete_str, $total_count\n"; - return ($delete_str, $total_count); - -} - - -sub insertValues($table, $record_num, $PK_name, $PK_value, $Field_name, $Field_value) -{ - my $num; - my ($fields, $values); - my ($update_set, $update_where); - my $Field_value_quoted; - my $table = shift; - my $record_num = shift; - my $PK_name = shift; - my $PK_value = shift; - my $Field_name = shift; - my $Field_value = shift; - my $update_flag = 0; - my $st_handle; - my $insertrows; - - for($num = 0; $num <= $#$Field_value; $num++) - { - if($num == 0) - { - $fields = "($$Field_name[$num]"; - if($$Field_value[$num] ne "NULL") - { - $$Field_value[$num] = $db->quote($$Field_value[$num]); - $values = "($$Field_value[$num]"; - $update_set = "$$Field_name[$num]=$$Field_value[$num]"; - } - else - { - $values = "($$Field_value[$num]"; - $update_set = "$$Field_name[$num]=$$Field_value[$num]"; - } - } - else - { - $fields .= ", $$Field_name[$num]"; - if($$Field_value[$num] ne "NULL") - { - $$Field_value[$num] =~ s/\n//g; - $$Field_value[$num] =~ s/\r//g; - $$Field_value[$num] = $db->quote($$Field_value[$num]); - $values .= ", $$Field_value[$num]"; - $update_set .= ", $$Field_name[$num]=$$Field_value[$num]"; - } - else - { - $values .= ", $$Field_value[$num]"; - $update_set .= ", $$Field_name[$num]=$$Field_value[$num]"; - } - } - } - for($num = 0; $num <= $#$PK_name; $num++) - { - if($num == 0) - { - $$PK_value[$num] = $db->quote($$PK_value[$num]); - $update_where = "$$PK_name[$num]=$$PK_value[$num] "; - } - else - { - $$PK_value[$num] = $db->quote($$PK_value[$num]); - $update_where .= "AND $$PK_name[$num]=$$PK_value[$num]"; - } - } - - $fields .= ")"; - $values .= ")"; - my $insert_cmd = "INSERT INTO $table $fields VALUES $values\;"; - my $update_cmd = "UPDATE $table SET $update_set WHERE $update_where\;"; - - eval { - $insert_count++; - $st_handle = $db->prepare($insert_cmd); - $st_handle->execute() or die "Cannot execute: ".$st_handle->errstr(); - $insertrows = $st_handle->rows(); - if($insertrows == 0) - { - $insert_count--; - $error_count++; - print "ZERO ROWS FOR QUERY: $insert_cmd\n\n" if($verbose); - warn "ZERO ROWS FOR QUERY: $insert_cmd\n\n"; - } - }; - - if ($@) { - if($@ =~ /duplicate key/) - { - $update_flag = 1; - $insert_count--; - } - else - { - print "$@\n" if($verbose); - warn "$@\n"; - $insert_count--; - $error_count++; - print "INSERT ERROR ON QUERY: $insert_cmd\n\n" if($verbose); - warn "INSERT ERROR ON QUERY: $insert_cmd\n\n"; - - } - } - - if($update_flag == 1) - { - eval { - $update_count++; - $st_handle = $db->prepare($update_cmd); - $st_handle->execute() or die "Cannot execute: ".$st_handle->errstr(); - $insertrows = $st_handle->rows(); - if($insertrows == 0) - { - $update_count--; - $error_count++; - print "ZERO ROWS FOR QUERY: $update_cmd\n\n" if($verbose); - warn "ZERO ROWS FOR QUERY: $update_cmd\n\n"; - } - }; - - if ($@) { - print "$@\n" if($verbose); - warn "$@\n"; - $update_count--; - $error_count++; - print "UPDATE ERROR ON QUERY: $update_cmd\n\n" if($verbose); - warn "UPDATE ERROR ON QUERY: $update_cmd\n\n"; - } - } - -} - - -sub db_connect -{ -my $dbname = shift; -my $host = shift; -my $user = shift; -my $pass = shift; - -my %db_attr = ( - PrintError => 0, - RaiseError => 0, -); - -my $dsn = "DBI:Pg:dbname=$dbname;host=$host"; -my $db = DBI->connect($dsn, $user, $pass, \%db_attr) or die "Can't connect() to database $dbname: $DBI::errstr"; -return ($db); -} - -sub upload_xml -{ - print "---UPLOAD XML FILE----\n" if($verbose); - warn "---UPLOAD XML FILE----\n"; - my $upload_string = "rsync -av --chmod=ugo+rw $outFile.zip $nrldb_host\::nrldb_xml/"; - print "$upload_string\n" if($verbose); - warn "$upload_string\n"; - my $upload_exe = `$upload_string`; - print "$upload_exe\n" if($verbose); - warn "$upload_exe\n"; - print "Failed: \"$upload_string\"\n" if ($? && $verbose); - warn "Failed: \"$upload_string\"\n" if $?; - return; -} -sub download_control_file -{ - my $office_type = shift; - my $download_string; - print "---DOWNLOAD $office_type CONTROL FILE----\n" if($verbose); - warn "---DOWNLOAD $office_type CONTROL FILE----\n"; - - if ($office_type eq "WFO") - { - $download_string = "rsync -av $nrldb_host\::nrldb_control/nrldb_control_wfo ${conf_dir}/"; - } - elsif ($office_type eq "RFC") - { - $download_string = "rsync -av $nrldb_host\::nrldb_control/nrldb_control_rfc ${conf_dir}/"; - } - print "$download_string\n" if($verbose); - warn "$download_string\n"; - my $download_exe = `$download_string`; - print "$download_exe\n" if($verbose); - warn "$download_exe\n"; - print "Failed: \"$download_string\"\n" if ($? && $verbose); - warn "Failed: \"$download_string\"\n" if $?; - return; -} - -sub getdate() -{ -my ($Second, $Minute, $Hour, $Day, $Month, $Year, $WeekDay, $DayOfYear, $IsDST) = localtime(time) ; -my $RealMonth = $Month + 1 ; # Months of the year are not zero-based -my $FixedYear; - -if ($Hour < 10) -{ - $Hour = "0" . $Hour -} - -if ($Minute < 10) -{ - $Minute = "0" . $Minute -} - -if ($Second < 10) -{ - $Second = "0" . $Second -} - -if ($RealMonth < 10) -{ - $RealMonth = "0" . $RealMonth; -} - -if ($Day < 10) -{ - $Day = "0" . $Day; -} - -if ($Year >= 100) -{ - $FixedYear = $Year - 100; -} -else -{ - $FixedYear = $Year; -} - -if ($FixedYear < 10) -{ - $FixedYear = "0" . $FixedYear; -} - -my $clean_date = "$Hour:$Minute:$Second $RealMonth/$Day/$FixedYear"; - -return($clean_date); -} - -sub lid_check { - my $table_name = shift; - my $at; - my $lid_flag = 0; - - my $query_column1 = "SELECT c.oid - FROM pg_catalog.pg_class c - LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace - WHERE pg_catalog.pg_table_is_visible(c.oid) - AND c.relname ~ '^$table_name\$'"; - - my $attribute_query = "SELECT a.attname - FROM pg_catalog.pg_attribute a - WHERE a.attnum > 0 AND NOT a.attisdropped - AND a.attrelid = ($query_column1) - ORDER BY a.attnum;"; - - eval { - $at = $db->prepare($attribute_query); - $at->execute() or die "Cannot execute: ".$at->errstr(); - }; - if($@) { - print "$@\n"; - } - - while ( defined ( my $attribues = $at->fetchrow_arrayref() ) ) { - if(@$attribues[0] =~ /^lid$/) { - $lid_flag = 1; - } - } - -return ($lid_flag); -} - -BEGIN { - use CGI::Carp qw(carpout); - my $logDir; - if( -e "/awips/hydroapps/public/bin/get_apps_defaults"){ - $logDir = `/awips/hydroapps/public/bin/get_apps_defaults.LX nrldb_log`; - chomp($logDir); - } else { - print "Could not access /awips/hydroapps/public/bin/get_apps_defaults.LX. Exiting\n"; - exit -1; - } - print "log dirlogDir\n"; - my $log = "${logDir}/nrldb.log"; - open(LOG, ">>$log") or die "Unable to open $log. $! "; - carpout(*LOG); -} - -END { - my $date = `date`; - print LOG "End $0 at $date\tElapsed time: " . (time - $^T) . " seconds\n\n"; - close LOG; -} - -sub getcutoffdate() -{ -my ($Second, $Minute, $Hour, $Day, $Month, $Year, $WeekDay, $DayOfYear, $IsDST) = gmtime(time-172800) ; -my $RealMonth = $Month + 1 ; # Months of the year are not zero-based -my $FixedYear; - -if ($Hour < 10) -{ - $Hour = "0" . $Hour -} - -if ($Minute < 10) -{ - $Minute = "0" . $Minute -} - -if ($Second < 10) -{ - $Second = "0" . $Second -} - -if ($RealMonth < 10) -{ - $RealMonth = "0" . $RealMonth; -} - -if ($Day < 10) -{ - $Day = "0" . $Day; -} - - $FixedYear = $Year + 1900; - -my $clean_date = "$FixedYear-$RealMonth-$Day $Hour:$Minute"; - -return($clean_date); -} diff --git a/nativeLib/files.native/awipsShare/hydroapps/whfs/bin/send_nrldb_update.sh b/nativeLib/files.native/awipsShare/hydroapps/whfs/bin/send_nrldb_update.sh deleted file mode 100644 index 4710156c93..0000000000 --- a/nativeLib/files.native/awipsShare/hydroapps/whfs/bin/send_nrldb_update.sh +++ /dev/null @@ -1,173 +0,0 @@ -#!/bin/sh -############################################################################### -# This script is run at the field office to send ad-hoc updates to the NRLDB -# server, then on to the AHPS CMS. It can be run at any time. It is designed -# to send small, time-sensitive updates to the CMS. It takes two argument -# lists:-table table names (comma-separated) and -lid lid names -# (comma-separated). It parses the arguments, selects the updated data from -# the database and builds an SQL formatted text file for use on the nrldb and -# CMS databases. The SQL file contains a delete staement that deletes the -# pre-existing data for the lid/table combinations, before running the inserts -# -# Usage: send_nrldb_update.sh -table ,,... -lid ,,... -# Example: send_nrldb_update.sh -table rating,floodstmt -lid BRKM2,CBEM2 -# -if [ $# -ne 4 ] -then - echo "Incorrect number of arguments entered: $#" - echo "Correct Arguments are:" - echo "send_nrldb_update.sh -table table1,table2 -lid lid1,lid2" - echo "Any number of tables and lids may be specified, but they need to be in a comma separated list with no spaces between commas and table/lid names" - exit 0 -fi -# set up SOME environment variables for NRLDB applications -export apps_dir=/awips2/edex/data/share/hydroapps -export EDEX_HOME=/awips2/edex -export NRLDB_DATA=`get_apps_defaults nrldb_data` -export NRLDB_LOG=$(get_apps_defaults nrldb_log) -export NRLDB_CONFIG=$(get_apps_defaults nrldb_config) -export db_name=$(get_apps_defaults db_name) -export NRLDB_TMP=$(get_apps_defaults nrldb_tmp) -export PGUSER=awips - -# get the nrldb host and wfo from the nrldb.conf file/database -nrldb_host=`grep nrldb_host $NRLDB_CONFIG/nrldb.conf | cut -d= -f2 | sed 's/"//g' | sed 's/ //g'` -wfo=`psql -d $db_name -c "select hsa from admin;" | tail -3 | head -1 | sed -e 's/ //g'` -echo `date` - -# create the final SQL file that will be sent to the NRLDB host -timestamp=`date +%Y%m%d%H%N` -sql_file="${wfo}_update_${timestamp}.sql" -if [ -f $sql_file ] -then - rm $sql_file -fi - -# build the list of tables/lids to send -lid_list="XXXXX" -table_list="XXXXX" -while [ $# -gt 0 ] -do - case "$1" in - -lid) lid_list="$2,";shift;; - -table) table_list="$2,";shift;; - *) break;; - esac - shift -done - -# set the last update information for update_nrldb.pl to use -echo `date` > ${NRLDB_LOG}/last_nrldb_update.txt -up_lid_list=`echo $lid_list | sed 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` -echo "lid list: $up_lid_list" >> ${NRLDB_LOG}/last_nrldb_update.txt -echo "table_list: $table_list" >> ${NRLDB_LOG}/last_nrldb_update.txt - -#loop through the tables/lids -if [ $table_list != "XXXXX" ] -then - pos=1 - table="XXXXX" - ltable=`echo $table | wc -m` - while [ $ltable -gt 4 ] - do - table=`echo $table_list | cut -d"," -f$pos` - pos=`expr $pos + 1` - ltable=`echo $table | wc -m` - if [ $ltable -gt 4 ] - then - lid="XXXXX" - lpos=1 - llid=`echo $lid | wc -m` - while [ $llid -gt 3 ] - do - lid=`echo $up_lid_list | cut -d"," -f$lpos` - lpos=`expr $lpos + 1` - llid=`echo $lid | wc -m` - if [ $llid -gt 3 ] - then - # fetch the values from the DB and edit them - export PGUSER=awips - touch $NRLDB_TMP/update.txt - chmod ugo+rw $NRLDB_TMP/update.txt - ls -l $NRLDB_TMP/update.txt - psql -d $db_name -c "copy (select * from $table where lid = '$lid') to '$NRLDB_TMP/update.txt' with delimiter '|';" - cp $NRLDB_TMP/update.txt ${NRLDB_DATA}/update.txt - sed -f ${NRLDB_CONFIG}/sed_script.txt ${NRLDB_TMP}/update.txt > ${NRLDB_DATA}/update11.txt - sed -e "s/|/'|'/g" ${NRLDB_DATA}/update11.txt > ${NRLDB_DATA}/update1.txt - sed -e "s/^/insert into $table values('/g" ${NRLDB_DATA}/update1.txt > ${NRLDB_DATA}/update2.txt - sed -e "s/$/');/g" ${NRLDB_DATA}/update2.txt > ${NRLDB_DATA}/update3.txt - sed -e "s/|/,/g" ${NRLDB_DATA}/update3.txt > ${NRLDB_DATA}/update4.txt - if [ -f "${NRLDB_DATA}/update.txt" ] - then - update_lines=`wc -l "${NRLDB_DATA}/update.txt" | cut -d" " -f1` - else - echo "No update file found". - update_lines=0 - fi - if [ $update_lines -gt 0 ] - then - if [ $table != "location" -a $table != "riverstat" ] - then - echo "delete from $table where lid = '$lid';" >> ${NRLDB_DATA}/$sql_file - fi - cat ${NRLDB_DATA}/update4.txt >> ${NRLDB_DATA}/$sql_file - fi - # location and riverstat require a special forecast since they have dependent tables via foreign keys - if [ $table = "location" ] - then - sql_stmt="update location set lid = '$lid'" - for col in county coe cpm detail elev hdatum hsa hu lat lon lremark lrevise name network rb rfc sbd sn state waro wfo wsfo type des det post stntype tzone - do - psql -d $db_name -c "select $col from location where lid = '$lid' and $col is not null;" > ${NRLDB_DATA}/update.txt - ct_zero=`grep -c "0 row" ${NRLDB_DATA}/update.txt` - if [ $ct_zero -eq 0 ] - then - export val=`cat ${NRLDB_DATA}/update.txt | head -3 | tail -1 | cut -c2-80` - new_val=`echo "$val" | sed -f ${NRLDB_CONFIG}/sed_script.txt` - sql_stmt="$sql_stmt, $col = '$new_val'" - fi - done - sql_stmt="$sql_stmt where lid = '$lid';" - echo $sql_stmt >> ${NRLDB_DATA}/$sql_file - - elif [ $table = "riverstat" ] - then - sql_stmt="update riverstat set lid = '$lid'" - for col in primary_pe bf cb da response_time threshold_runoff fq fs gsno level mile pool por rated lat lon remark rrevise rsource stream tide backwater vdatum action_flow wstg zd ratedat usgs_ratenum uhgdur use_latest_fcst - do - psql -d $db_name -c "select $col from riverstat where lid = '$lid' and $col is not null;" > ${NRLDB_DATA}/update.txt - ct_zero=`grep -c "0 row" ${NRLDB_DATA}/update.txt` - if [ $ct_zero -eq 0 ] - then - export val=`cat ${NRLDB_DATA}/update.txt | head -3 | tail -1 | cut -c2-80` - new_val=`echo "$val" | sed -f ${NRLDB_CONFIG}/sed_script.txt` - sql_stmt="$sql_stmt, $col = '$new_val'" - fi - done - sql_stmt="$sql_stmt where lid = '$lid';" - echo $sql_stmt >> ${NRLDB_DATA}/$sql_file - fi - fi - done - fi - - done - - # send the SQL file to the NRLDB server - if [ -f ${NRLDB_DATA}/$sql_file ] - then - rsync -av ${NRLDB_DATA}/$sql_file ${nrldb_host}\::nrldb_update/ - echo "SQL file: $sql_file created for lids: $up_lid_list and tables: $table_list" - else - echo "No SQL file created. Database contained no entries for lids: $up_lid_list and tables: $table_list" - fi -fi - -# remove the temp files to keep the directory clean -for temp_file in ${NRLDB_DATA}/update.txt ${NRLDB_DATA}/update11.txt ${NRLDB_DATA}/update1.txt ${NRLDB_DATA}/update2.txt ${NRLDB_DATA}/update3.txt ${NRLDB_DATA}/update4.txt -do - if [ -f $temp_file ] - then - rm $temp_file - fi -done diff --git a/nativeLib/files.native/awipsShare/hydroapps/whfs/bin/update_nrldb.pl b/nativeLib/files.native/awipsShare/hydroapps/whfs/bin/update_nrldb.pl deleted file mode 100644 index 0a0a08728c..0000000000 --- a/nativeLib/files.native/awipsShare/hydroapps/whfs/bin/update_nrldb.pl +++ /dev/null @@ -1,274 +0,0 @@ -#!/usr/bin/perl -################################################################################ -# update_nrldb.pl is the GUI for the Ad-Hoc update process. ## This process was put in place so that WFOs could update information # -# between daily runs of the NRLDB update process. The information is # -# collected at the WFO, sent to the NRLDB central server and then forwarded to # -# CMS servers outside of the AWIPS firewall. # -# # -# Developer: Mark Armstrong (OCWWS/HSD) # -# Developed 2011 - Modified for AWIPS2 2013 # -################################################################################ - -use Tk; -use strict; -use warnings; -use AppConfig qw(:expand :argcount); -use DBI; - -$ENV{EDEX_HOME}="/awips2/edex"; -$ENV{apps_dir}="/awips2/edex/data/share/hydroapps"; -our $BIN_DIR = `get_apps_defaults.LX whfs_bin_dir`; -chomp($BIN_DIR); -our $LOG_DIR = `get_apps_defaults.LX nrldb_log`; -chomp($LOG_DIR); -my $lids; -my $tables; - -# Set up some inial configuration. Most of this comes from the hydroGen input file: hg.cfg -$ENV{HYDROGENHOME} = "/awips/hydroapps/HydroGen" if ! defined $ENV{HYDROGENHOME}; -my %cfg = ( DEBUG => 0, # debug mode on or off - PEDANTIC => 0, # be patient with warnings/errors - CREATE => 1, # create variables, defining not required... - GLOBAL => { # for all config options unless overridden... - EXPAND => EXPAND_ALL, # expand ~, $ENV{*}, and $(var) - ARGCOUNT => ARGCOUNT_ONE, # each config expects an arg unless overriden... - ARGS => '=s' # each arg is a string unless overriden - } - ); - -my $config = AppConfig->new(\%cfg); # create config object - -$config->define('version',{ ALIAS => 'V',ARGCOUNT => ARGCOUNT_NONE, ARGS => '!',DEFAULT => 0}); -$config->define('help',{ ALIAS => 'h',ARGCOUNT => ARGCOUNT_NONE, ARGS => '!',DEFAULT => 0}); -$config->define('man',{ ALIAS => 'm',ARGCOUNT => ARGCOUNT_NONE, ARGS => '!',DEFAULT => 0}); -$config->define('DBengine',{ VALIDATE => '[\w]+',DEFAULT => "Pg"}); -$config->define('DBname',{ VALIDATE => '[\w]+',DEFAULT => "hd_ob8xxx"}); -$config->define('DBhost',{ VALIDATE => '[-\w]+',DEFAULT => "dx1f"}); -$config->define('DBport',{ ARGS => '=i',DEFAULT => 5432}); -$config->define('master',{ VALIDATE => '[.\w]+',DEFAULT => "HGstation"}); -$config->define('basedir',{ VALIDATE => '[- /.\w]+',DEFAULT => $ENV{HYDROGENHOME} . "/bin"}); - -$config->file($ENV{HYDROGENHOME} . "/input/hg.cfg"); # look in user's $HYDROGENHOME to find configured settings -$config->args(\@ARGV); # get config settings from the command-line, overwriting any settings from the file... - -my $master = $config->get('master'); # name of DB table or view which holds master list of IDs for which MXD files are to be generated... -my $DBengine = $config->get('DBengine'); -my $DBname = $config->get('DBname'); -my $DBhost = $config->get('DBhost'); -my $DBport = $config->get('DBport'); -my $baseDir = `pwd`; -chomp $baseDir; -my $DBstr; -my $wildcard; - -#Open a database connection and get the list of LIDs from the IHFS DB -if($DBengine eq "Pg") { - $DBstr = "dbi:$DBengine:dbname=$DBname;host=$DBhost;port=$DBport"; - $wildcard = '%'; -} else { - $DBstr = "dbi:$DBengine:$DBname"; - $wildcard = '*'; -} - -my $dbh = DBI->connect("$DBstr",undef,undef,{ChopBlanks => 1}) or warn $DBI::errstr; -# creates the list of WFOs based on the HydroGen .xxx_backup files -# and builds the query to create the list of LIDs -my $wfo=`ls -a /awips/hydroapps/HydroGen/ | grep _backup | cut -c2-4`; -my $list_len=length $wfo; -my $num_wfos=$list_len/4; -my $index=1; -my $off=0; -my $wfoid=substr($wfo,$off,3); -my $wfoID=uc $wfoid; -my $wfo_query = "(location.hsa = \'$wfoID\'"; -while ($index < $num_wfos){ - $off+=4; - $wfoid=substr($wfo,$off,3); - $wfoID=uc $wfoid; - $wfo_query .= " or location.hsa = \'$wfoID\'"; - $index++; -} -$wfo_query .= ")"; - -#my $list_type="river"; -our $mw = MainWindow->new; -$mw->title('Ad-Hoc NRLDB Update'); - -my $lst_lab= $mw->Label(-text => 'Add any Unlisted Locations (comma-separated): '); -my $sql = "select distinct hgstation.lid,location.name,location.hsa from hgstation,location where hgstation.lid = location.lid and $wfo_query order by 3,1;"; - -# get the list of LIDs -my $qhw = $dbh->prepare("$sql") or warn $DBI::errstr; - -our @lid_list; # = ($wildcard); - -#get the data from the DB -get_results($qhw,\@lid_list); -#print "ct: " . @lid_list; - -#set up a static array with the tables that are allowed for ad-hoc updates -#table_list is the actual name of the DB tables, while tabledesc is a friendlier description that is displayed to the user -our @table_list = ('location','riverstat','crest','floodstmt','hgstation','floodcat','lowwater'); -my @tabledesc = ('Location','Riverstat','Crest History','Impacts','HGstation','Flood Categories','Low Water'); - -$dbh->disconnect(); - -#manipulate the results of the lid/hsa/name query for better display -my @liddeschsa; -our @lidsend; -$index=0; -my $num_lids=scalar(@lid_list); -while ($index < $num_lids){ - my $line = $lid_list[$index]; -# print "line: $line\n"; - my @results = split('\|',$line); - #my $lid = $lid_list[$index]; - my $lid_lid = $results[0]; - my $lid_name = $results[1]; - my $lid_hsa = $results[2]; -# print "lid: $lid_lid name: $lid_name hsa: $lid_hsa\n"; - push(@liddeschsa,"$lid_hsa | $lid_lid | $lid_name"); - push(@lidsend,$lid_lid); - $index++; -} - -# Create the GUI object -#my $mw = MainWindow->new; -#$mw->title('Ad-Hoc NRLDB Update'); - -#my $lst_lab= $mw->Label(-text => 'Locations List: '); -#my $lst_rad_riv = $mw-> Radiobutton(-text=>'AHPS River Points', -# -value=>'river', -variable=>\$list_type); -#my $lst_rad_precip = $mw-> Radiobutton(-text=>'Precip Points', -# -value=>'precip', -variable=>\$list_type); -# Labels for the LID and table scroll boxes -my $misc_ent = $mw->Entry(); -my $label1 = $mw->Label(-text => 'HSA|LID|Location Name'); -my $label2 = $mw->Label(-text => 'Tables'); - -# Create the scroll boxes for the LIDs and tables -my $lb1 = $mw->Scrolled('Listbox', - -scrollbars => 'osoe',-width=>50, - -selectmode => 'multiple', -exportselection=>0); -my $lb2 = $mw->Scrolled('Listbox', - -scrollbars => 'osow',-width=>20, - -selectmode => 'multiple',-exportselection=>0); - -# Add the arrays that we want to display in the list boxes -$lb1->insert('end', @liddeschsa); -$lb2->insert('end', @tabledesc); - -# Create the buttons -my $exit = $mw->Button(-text => 'Exit', - -command => [$mw => 'destroy']); -my $send = $mw->Button(-text => 'Send', - -command => \&send_button); -my $show_log = $mw->Button(-text => 'Show Log', - -command => \&show_log); -my $update_list = $mw->Button(-text => 'Update List', -command => \&upd_list); -# create the label and text box for the last pdate window -my $status_box = $mw->Text(-width=>20, -height=>3); -my $lb_status = $mw->Label(-width=>20, -height=>3,-text=>"Last Ad-Hoc Update:"); -my $last_update = `cat $LOG_DIR/last_nrldb_update.txt`; - -$status_box->insert('end',"$last_update"); - -# Crate the GUI using grid to specify the physical locations of the objects -#$lst_rad_riv->grid(-row=>1, -column=>2, -columnspan=>1); -#$lst_rad_precip->grid(-row=>1, -column=>3, -columnspan=>1); -$label1->grid(-row=>1, -column=>1, -columnspan=>3) ; -$label2->grid(-row=>1, -column=>4) ; -$lb1->grid(-row=>2, -column=>1, -columnspan=>3, -sticky=>"ew") ;#pack; -$lb2->grid(-row=>2, -column=>4, -columnspan=>1, -sticky=>"w") ;#pack; -$lst_lab->grid(-row=>3, -column=>1, -columnspan=>1); -$misc_ent->grid(-row=>3, -column=>2); -$lb_status->grid(-row=>4, -column=>1); -$status_box->grid(-row=>4, -column=>2, -columnspan=>3, -sticky=>"ew"); -$send->grid(-row=>5, -column=>1) ;#pack; -$show_log->grid(-row=>5,-column=>2); -$exit->grid(-row=>5, -column=>4) ;#pack; - -MainLoop; - -# End of main -# -#sub upd_list { -# $mw => 'destroy'; -# my $cmd = "${DIR}/update_nrldb.pl.exp $list_type\n"; -# print "cmd: $cmd\n"; -# system($cmd); -#} - -# The Send button functionality function -sub send_button { - # Get the indices of the selected array items - my @LIDindex = $lb1->curselection; - my @Tableindex = $lb2->curselection; - my $index=1; - my $misc_lid = $misc_ent-> get(); - # build the lists of LIDs and tables - $tables = $table_list[$Tableindex[0]]; - my $numLIDs=@LIDindex; - print "numLIDs: $numLIDs\n"; - my $numTables=@Tableindex; - if ($numLIDs > 0){ - $lids = $lidsend[$LIDindex[0]]; - while ($index < $numLIDs){ - $lids .= "," . $lidsend[$LIDindex[$index]]; - $index++; - } - $lids .= "," . $misc_lid; - } else { - $lids=$misc_lid; - } - $index=1; - while ($index < $numTables){ - $tables .= "," . $table_list[$Tableindex[$index]]; - $index++; - } -# print "l0: ${lid_list[$LIDindex[0]]} t0: ${table_list[$Tableindex[0]]} lids: $lids tables: $tables\n"; - - # Create the call to the script and execute it using system() - my $cmd = "${BIN_DIR}/send_nrldb_update.sh -table $tables -lid $lids > ${LOG_DIR}/send_nrldb_update.log\n"; -# print "cmd: $cmd\n"; - system($cmd); - - # Create a dialog box to inform the user that their data has been sent - my $dsend=$mw->Dialog(-title=>'Sent NRLDB Update',-buttons=>['OK']); - my $text_field="NRLDB Update Sent for LIDs: $lids \n and tables: $tables\n"; -# my $addbox=$dsend->('Label',-text=>"$text_field")->pack(-side => 'left',-fill => 'both',-expand => 1); - my $box=$dsend->add('Label',-text=>"$text_field")->pack(-side => 'left',-fill => 'both',-expand => 1); - my $button = $dsend->Show; -} -# This subroutine, copied from Mark Fenbers bless program, takes a db query and returns an array of results -sub get_results -{ - my $qh = shift; - my $array = shift; - my $record; - -#print "qh: $qh\n"; - if(defined $qh) { - if($qh->execute(@_)) { - while($record = $qh->fetchrow_arrayref) { - foreach (@$record) { $_ = "" if ! defined $_; } - push @$array,(join '|',@$record); - } - } else { - warn $DBI::errstr; -# print $qh->errstr; - } - } else { warn "unable to prepare query \"$sql\"\n"; } -} - -#This subroutine displays the log from the send script in the form of a dialog box -sub show_log -{ - use Tk::Dialog; - my $text_field=`cat ${LOG_DIR}/send_nrldb_update.log`; - my $d = $mw->Dialog(-title=>'Show Log',-buttons => ['OK']); - my $box=$d->add('Label',-text=>"$text_field")->pack(-side => 'left',-fill => 'both',-expand => 1); - my $button = $d->Show; -# exit; -} - diff --git a/nativeLib/files.native/awipsShare/hydroapps/whfs/local/data/app/nrldb/nrldb.conf b/nativeLib/files.native/awipsShare/hydroapps/whfs/local/data/app/nrldb/nrldb.conf deleted file mode 100644 index 4a3ce4eb68..0000000000 --- a/nativeLib/files.native/awipsShare/hydroapps/whfs/local/data/app/nrldb/nrldb.conf +++ /dev/null @@ -1,6 +0,0 @@ -dbhost = "dx1f" -dbuser = "awips" -dbpass = "" -nrldb_host = "165.92.28.1" -site = "CCC" -dbname = "hd_ob92ccc" diff --git a/nativeLib/files.native/awipsShare/hydroapps/whfs/local/data/app/nrldb/nrldb_control_wfo b/nativeLib/files.native/awipsShare/hydroapps/whfs/local/data/app/nrldb/nrldb_control_wfo deleted file mode 100644 index f76ac5221e..0000000000 --- a/nativeLib/files.native/awipsShare/hydroapps/whfs/local/data/app/nrldb/nrldb_control_wfo +++ /dev/null @@ -1,174 +0,0 @@ -#NRLDB national configuration file -# -# -[hsa] -fields = ALL - -[wfo] -fields = ALL - -[state] -fields = ALL - -[counties] -fields = ALL - -[network] -fields = ALL - -[rfc] -fields = ALL - -[timezone] -fields = ALL - -#[admin] -#fields = ALL - -[coopcomms] -fields = ALL - -[cooprecip] -fields = ALL - -[coopspons] -fields = ALL - -[dcpowner] -fields = ALL - -#[eligzon] -#fields = ALL - -[gagemaint] -fields = ALL - -[gageowner] -fields = ALL - -[gagetype] -fields = ALL - -[proximity] -fields = ALL - -[telmtype] -fields = ALL - -[telmowner] -fields = ALL - -[telmpayor] -fields = ALL - -[resowner] -fields = ALL - -[damtypes] -fields = ALL - -[location] -fields = ALL - -[riverstat] -fields = ALL - -[benchmark] -fields = lid, bnum, elev, remark - -[observer] -fields = ALL - -#[zonenum] -#fields = lid, state, zonenum - -[reservoir] -fields = ALL - -[crest] -fields = ALL - -[datum] -fields = ALL - -#[dcp] -#fields = ALL -[dcp] -fields = lid, criteria, owner, goes, rptfreq, rptime, notify, obsvfreq, randrept - -[descrip] -fields = ALL - -[flood] -fields = ALL - -[floodcat] -fields = ALL - -[floodstmt] -fields = ALL - -[gage] -fields = ALL - -[lowwater] -fields = ALL - -[pub] -fields = ALL - -[refer] -fields = ALL - -#[telem] -#fields = ALL -[telem] -fields = lid, type, payor, cost, criteria, owner, phone, sensorid, rptfreq, notify, obsvfreq - -[rating] -fields = ALL - -[ratingshift] -fields = ALL - -[contacts] -fields = ALL - -[countynum] -fields = ALL - -[unitgraph] -fields = ALL - -[hgstation] -fields = ALL - -#[floodts] -#fields = ALL - -[lwstmt] -fields = ALL - -[rpffcstgroup] -fields = ALL - -[rpffcstpoint] -fields = ALL - -[locdatalimits] -fields = lid,pe,dur,monthdaystart,monthdayend,gross_range_min,gross_range_max,reason_range_min,reason_range_max,roc_max - -[sshpconfig] -fields = ALL - -[shefpe] -fields = ALL - -[shefdur] -fields = ALL - -#[ingestfilter] -#fields = ALL - -[locarea] -fields = ALL diff --git a/nativeLib/files.native/awipsShare/hydroapps/whfs/local/data/app/nrldb/sed_script.txt b/nativeLib/files.native/awipsShare/hydroapps/whfs/local/data/app/nrldb/sed_script.txt deleted file mode 100644 index 99f27bad14..0000000000 --- a/nativeLib/files.native/awipsShare/hydroapps/whfs/local/data/app/nrldb/sed_script.txt +++ /dev/null @@ -1 +0,0 @@ -s/'/\\'/g diff --git a/nativeLib/files.native/edex/bin/runso b/nativeLib/files.native/edex/bin/runso index 7ee690b5d8..d48279da95 100755 Binary files a/nativeLib/files.native/edex/bin/runso and b/nativeLib/files.native/edex/bin/runso differ diff --git a/nativeLib/files.native/edex/lib/native/linux32/libecpg.so.6.0 b/nativeLib/files.native/edex/lib/native/linux32/libecpg.so.6.0 index 732b086cfe..25f7c7205e 100755 Binary files a/nativeLib/files.native/edex/lib/native/linux32/libecpg.so.6.0 and b/nativeLib/files.native/edex/lib/native/linux32/libecpg.so.6.0 differ diff --git a/nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so.3.0 b/nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so.3.0 index 54a73b2b0b..528ffbacb8 100755 Binary files a/nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so.3.0 and b/nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so.3.0 differ diff --git a/nativeLib/files.native/edex/lib/native/linux32/libjasper.so.1.0.0 b/nativeLib/files.native/edex/lib/native/linux32/libjasper.so.1.0.0 index c720732e99..7f23227c4d 100755 Binary files a/nativeLib/files.native/edex/lib/native/linux32/libjasper.so.1.0.0 and b/nativeLib/files.native/edex/lib/native/linux32/libjasper.so.1.0.0 differ diff --git a/nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so.3.0 b/nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so.3.0 index b24a5dc603..c7319c7b3e 100755 Binary files a/nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so.3.0 and b/nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so.3.0 differ diff --git a/nativeLib/files.native/edex/lib/native/linux32/library.empty.motif.so b/nativeLib/files.native/edex/lib/native/linux32/library.empty.motif.so old mode 100644 new mode 100755 index a026e3d168..46ab5f519f Binary files a/nativeLib/files.native/edex/lib/native/linux32/library.empty.motif.so and b/nativeLib/files.native/edex/lib/native/linux32/library.empty.motif.so differ diff --git a/nativeLib/files.native/edex/lib/native/linux32/library.ohd.ofs.so.REMOVED.git-id b/nativeLib/files.native/edex/lib/native/linux32/library.ohd.ofs.so.REMOVED.git-id index 670b0bb934..0de4c22f16 100644 --- a/nativeLib/files.native/edex/lib/native/linux32/library.ohd.ofs.so.REMOVED.git-id +++ b/nativeLib/files.native/edex/lib/native/linux32/library.ohd.ofs.so.REMOVED.git-id @@ -1 +1 @@ -cbeec8412bbae976431cb0dbe85fc6b9c170253e \ No newline at end of file +1a32b06c313e625de84f906b3a788e18d5fbf5a4 \ No newline at end of file diff --git a/nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so.REMOVED.git-id b/nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so.REMOVED.git-id index 2291591ae6..9e29681c5a 100644 --- a/nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so.REMOVED.git-id +++ b/nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so.REMOVED.git-id @@ -1 +1 @@ -2d8d4c03270ef631f167570cf0c03461ff832fea \ No newline at end of file +a86124ed46f7a16af33a87ae5ba9a1c02b870c80 \ No newline at end of file diff --git a/nativeLib/files.native/edex/lib/native/linux32/library.ohd.util.so b/nativeLib/files.native/edex/lib/native/linux32/library.ohd.util.so index 921c7422ff..636b0abd2a 100755 Binary files a/nativeLib/files.native/edex/lib/native/linux32/library.ohd.util.so and b/nativeLib/files.native/edex/lib/native/linux32/library.ohd.util.so differ diff --git a/nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so b/nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so index 58ee78671b..ffc2a0e804 100755 Binary files a/nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so and b/nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so differ diff --git a/nativeLib/gridslice/.cproject b/nativeLib/gridslice/.cproject index 3f7ddeb12b..8a58349e55 100644 --- a/nativeLib/gridslice/.cproject +++ b/nativeLib/gridslice/.cproject @@ -2,637 +2,392 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nativeLib/ncep_grib2module/.cproject b/nativeLib/ncep_grib2module/.cproject index edcdb86632..3459feebf0 100644 --- a/nativeLib/ncep_grib2module/.cproject +++ b/nativeLib/ncep_grib2module/.cproject @@ -110,504 +110,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -719,507 +221,508 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nativeLib/ncep_grib2module/dependencies/src/g2clib-1.1.8/g2_getfld.c b/nativeLib/ncep_grib2module/dependencies/src/g2clib-1.1.8/g2_getfld.c index baf54663e3..aeb88c784d 100755 --- a/nativeLib/ncep_grib2module/dependencies/src/g2clib-1.1.8/g2_getfld.c +++ b/nativeLib/ncep_grib2module/dependencies/src/g2clib-1.1.8/g2_getfld.c @@ -395,6 +395,7 @@ g2int g2_getfld(unsigned char *cgrib,g2int ifldnum,g2int unpack,g2int expand, lgfld->numoct_opt=igds[2]; lgfld->interp_opt=igds[3]; lgfld->igdtnum=igds[4]; + free(igds); } else { ierr=10; diff --git a/nativeLib/ncep_grib2module/dependencies/src/g2clib-1.1.8/g2_unpack3.c b/nativeLib/ncep_grib2module/dependencies/src/g2clib-1.1.8/g2_unpack3.c index 44ba01069c..5d5cbf8eef 100755 --- a/nativeLib/ncep_grib2module/dependencies/src/g2clib-1.1.8/g2_unpack3.c +++ b/nativeLib/ncep_grib2module/dependencies/src/g2clib-1.1.8/g2_unpack3.c @@ -212,6 +212,5 @@ g2int g2_unpack3(unsigned char *cgrib,g2int *iofst,g2int **igds,g2int **igdstmpl *idefnum=0; *ideflist=0; // NULL } - free(ligds); return(ierr); // End of Section 3 processing } diff --git a/nativeLib/org.apache.qpid/.cproject b/nativeLib/org.apache.qpid/.cproject deleted file mode 100644 index ba731c98e8..0000000000 --- a/nativeLib/org.apache.qpid/.cproject +++ /dev/null @@ -1,940 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/nativeLib/org.apache.qpid/.project b/nativeLib/org.apache.qpid/.project deleted file mode 100644 index 6b61b5c08a..0000000000 --- a/nativeLib/org.apache.qpid/.project +++ /dev/null @@ -1,83 +0,0 @@ - - - org.apache.qpid - - - - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - clean,full,incremental, - - - ?name? - - - - org.eclipse.cdt.make.core.append_environment - true - - - org.eclipse.cdt.make.core.autoBuildTarget - all - - - org.eclipse.cdt.make.core.buildArguments - - - - org.eclipse.cdt.make.core.buildCommand - make - - - org.eclipse.cdt.make.core.buildLocation - ${workspace_loc:/org.apache.qpid/Debug} - - - org.eclipse.cdt.make.core.cleanBuildTarget - clean - - - org.eclipse.cdt.make.core.contents - org.eclipse.cdt.make.core.activeConfigSettings - - - org.eclipse.cdt.make.core.enableAutoBuild - false - - - org.eclipse.cdt.make.core.enableCleanBuild - true - - - org.eclipse.cdt.make.core.enableFullBuild - true - - - org.eclipse.cdt.make.core.fullBuildTarget - all - - - org.eclipse.cdt.make.core.stopOnError - true - - - org.eclipse.cdt.make.core.useDefaultBuildCmd - true - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.core.ccnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - diff --git a/nativeLib/org.apache.qpid/README b/nativeLib/org.apache.qpid/README deleted file mode 100644 index 95a3f9becf..0000000000 --- a/nativeLib/org.apache.qpid/README +++ /dev/null @@ -1,8 +0,0 @@ -Version = 0.7.946106 - -Origin ------- -(extracted from the qpid source rpm - available from multiple sources) -qpid-cpp-mrg-0.7.946106-28.el5.centos.1.src.rpm - -also in the AWIPS II Baseline - rpms/awips2.qpid/SOURCES/qpid-cpp-mrg-0.7.946106.tar.gz diff --git a/nativeLib/org.apache.qpid/include/qpid/Address.h b/nativeLib/org.apache.qpid/include/qpid/Address.h deleted file mode 100644 index 57c9139f87..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/Address.h +++ /dev/null @@ -1,55 +0,0 @@ -#ifndef QPID_ADDRESS_H -#define QPID_ADDRESS_H - -/* - * - * Copyright (c) 2006 The Apache Software Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include "qpid/sys/IntegerTypes.h" -#include "qpid/CommonImportExport.h" -#include -#include - -namespace qpid { -namespace client { struct ConnectionSettings; } - - -/** - * Contains the protocol address of an AMQP broker. - */ -struct Address { -public: - static const std::string TCP; // Default TCP protocol tag. - static const uint16_t AMQP_PORT=5672; // Default AMQP port. - - QPID_COMMON_EXTERN explicit Address( - const std::string& protocol_=std::string(), - const std::string& host_=std::string(), - uint16_t port_=0 - ) : protocol(protocol_), host(host_), port(port_) {} - - std::string protocol; - std::string host; - uint16_t port; -}; - -QPID_COMMON_EXTERN std::ostream& operator<<(std::ostream& os, const Address& addr); -QPID_COMMON_EXTERN bool operator==(const Address& x, const Address& y); - -} // namespace qpid - -#endif /*!QPID_ADDRESS_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/CommonImportExport.h b/nativeLib/org.apache.qpid/include/qpid/CommonImportExport.h deleted file mode 100644 index 02c06ed7af..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/CommonImportExport.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef QPID_COMMON_IMPORT_EXPORT_H -#define QPID_COMMON_IMPORT_EXPORT_H - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -#if defined(WIN32) && !defined(QPID_DECLARE_STATIC) -#if defined(COMMON_EXPORT) || defined (qpidcommon_EXPORTS) -#define QPID_COMMON_EXTERN __declspec(dllexport) -#else -#define QPID_COMMON_EXTERN __declspec(dllimport) -#endif -#else -#define QPID_COMMON_EXTERN -#endif - -#endif diff --git a/nativeLib/org.apache.qpid/include/qpid/Exception.h b/nativeLib/org.apache.qpid/include/qpid/Exception.h deleted file mode 100644 index fa7111160c..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/Exception.h +++ /dev/null @@ -1,91 +0,0 @@ -#ifndef _Exception_ -#define _Exception_ - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include "qpid/framing/amqp_types.h" -#include "qpid/framing/constants.h" -#include "qpid/framing/enum.h" -#include "qpid/sys/StrError.h" -#include "qpid/CommonImportExport.h" -#include -#include - -namespace qpid -{ - -/** - * Base class for Qpid runtime exceptions. - */ -class Exception : public std::exception -{ - public: - QPID_COMMON_EXTERN explicit Exception(const std::string& message=std::string()) throw(); - QPID_COMMON_EXTERN virtual ~Exception() throw(); - QPID_COMMON_EXTERN virtual const char* what() const throw(); // prefix: message - QPID_COMMON_EXTERN virtual std::string getMessage() const; // Unprefixed message - QPID_COMMON_EXTERN virtual std::string getPrefix() const; // Prefix - - private: - std::string message; - mutable std::string whatStr; -}; - -/** Exception that includes an errno message. */ -struct ErrnoException : public Exception { - ErrnoException(const std::string& msg, int err) : Exception(msg+": "+qpid::sys::strError(err)) {} - ErrnoException(const std::string& msg) : Exception(msg+": "+qpid::sys::strError(errno)) {} -}; - -struct SessionException : public Exception { - const framing::execution::ErrorCode code; - SessionException(framing::execution::ErrorCode code_, const std::string& message) - : Exception(message), code(code_) {} -}; - -struct ChannelException : public Exception { - const framing::session::DetachCode code; - ChannelException(framing::session::DetachCode _code, const std::string& message) - : Exception(message), code(_code) {} -}; - -struct ConnectionException : public Exception { - const framing::connection::CloseCode code; - ConnectionException(framing::connection::CloseCode _code, const std::string& message) - : Exception(message), code(_code) {} -}; - -struct ClosedException : public Exception { - QPID_COMMON_EXTERN ClosedException(const std::string& msg=std::string()); - QPID_COMMON_EXTERN std::string getPrefix() const; -}; - -/** - * Exception representing transport failure - */ -struct TransportFailure : public Exception { - TransportFailure(const std::string& msg=std::string()) : Exception(msg) {} -}; - -} // namespace qpid - -#endif /*!_Exception_*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/InlineAllocator.h b/nativeLib/org.apache.qpid/include/qpid/InlineAllocator.h deleted file mode 100644 index 2502545dcb..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/InlineAllocator.h +++ /dev/null @@ -1,101 +0,0 @@ -#ifndef QPID_INLINEALLOCATOR_H -#define QPID_INLINEALLOCATOR_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include -#include -#include -#include - -namespace qpid { - -template -struct InlineRebind; - - -/** - * An allocator that has inline storage for up to Max objects - * of type BaseAllocator::value_type. - */ -template -class InlineAllocator : public BaseAllocator { - public: - typedef typename BaseAllocator::pointer pointer; - typedef typename BaseAllocator::size_type size_type; - typedef typename BaseAllocator::value_type value_type; - - InlineAllocator() : allocated(false) {} - InlineAllocator(const InlineAllocator& x) : BaseAllocator(x), allocated(false) {} - - pointer allocate(size_type n) { - if (n <= Max && !allocated) { - allocated=true; - return reinterpret_cast(address()); - } - else - return BaseAllocator::allocate(n, 0); - } - - void deallocate(pointer p, size_type n) { - if (p == address()) { - assert(allocated); - allocated=false; - } - else - BaseAllocator::deallocate(p, n); - } - - template - struct rebind { - typedef typename InlineRebind::other other; - }; - - private: - // POD object with alignment and size to hold Max value_types. - static const size_t ALIGNMENT=boost::alignment_of::value; - typedef typename boost::type_with_alignment::type Aligner; - union Store { - Aligner aligner_; - char sizer_[sizeof(value_type)*Max]; - } store; - value_type* address() { return reinterpret_cast(&store); } - bool allocated; -}; - - -// Rebind: if RequestedType == InlineType, use the InlineAllocator, -// otherwise, use the BaseAllocator without any inlining. - -template -struct InlineRebind { - typedef typename BaseAllocator::template rebind::other other; -}; - -template -struct InlineRebind { - typedef typename qpid::InlineAllocator other; -}; - -} // namespace qpid - -#endif /*!QPID_INLINEALLOCATOR_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/InlineVector.h b/nativeLib/org.apache.qpid/include/qpid/InlineVector.h deleted file mode 100644 index c55db295f3..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/InlineVector.h +++ /dev/null @@ -1,68 +0,0 @@ -#ifndef QPID_INLINEVECTOR_H -#define QPID_INLINEVECTOR_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include "qpid/InlineAllocator.h" -#include - -namespace qpid { - -/** - * A vector that stores up to Max elements in inline storage, - * otherwise uses normal vector allocation. - * - * NOTE: depends on some non-standard but highly probably assumptions - * about how std::vector uses its allocator, they are true for g++. - * - default constructor does not allocate. - * - reserve(N) does not allocate more than N elements. - * - vector never re-allocates when size() < capacity() - */ -template > -class InlineVector : public std::vector > -{ - typedef std::vector > Base; - public: - typedef typename Base::allocator_type allocator_type; - typedef typename Base::value_type value_type; - typedef typename Base::size_type size_type; - - explicit InlineVector(const allocator_type& a=allocator_type()) : Base(a) { - this->reserve(Max); - } - - explicit InlineVector(size_type n, const value_type& x = value_type(), - const allocator_type& a=allocator_type()) : Base(a) - { - this->reserve(std::max(n, Max)); - this->insert(this->end(), n, x); - } - - InlineVector(const InlineVector& x) : Base() { - this->reserve(std::max(x.size(), Max)); - *this = x; - } -}; - -} // namespace qpid - -#endif /*!QPID_INLINEVECTOR_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/Msg.h b/nativeLib/org.apache.qpid/include/qpid/Msg.h deleted file mode 100644 index e1837c29e5..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/Msg.h +++ /dev/null @@ -1,78 +0,0 @@ -#ifndef QPID_MSG_H -#define QPID_MSG_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include -#include - -namespace qpid { - -/** A simple wrapper for std::ostringstream that allows - * in place construction of a message and automatic conversion - * to string. - * E.g. - *@code - * void foo(const std::string&); - * foo(Msg() << "hello " << 32); - *@endcode - * Will construct the string "hello 32" and pass it to foo() - */ -struct Msg { - std::ostringstream os; - Msg() {} - Msg(const Msg& m) : os(m.str()) {} - std::string str() const { return os.str(); } - operator std::string() const { return str(); } - - Msg& operator<<(long n) { os << n; return *this; } - Msg& operator<<(unsigned long n) { os << n; return *this; } - Msg& operator<<(bool n) { os << n; return *this; } - Msg& operator<<(short n) { os << n; return *this; } - Msg& operator<<(unsigned short n) { os << n; return *this; } - Msg& operator<<(int n) { os << n; return *this; } - Msg& operator<<(unsigned int n) { os << n; return *this; } -#ifdef _GLIBCXX_USE_LONG_LONG - Msg& operator<<(long long n) { os << n; return *this; } - Msg& operator<<(unsigned long long n) { os << n; return *this; } -#endif - Msg& operator<<(double n) { os << n; return *this; } - Msg& operator<<(float n) { os << n; return *this; } - Msg& operator<<(long double n) { os << n; return *this; } - - template Msg& operator<<(const T& t) { os < -#include - -#ifdef _MSC_VER -# pragma warning(pop) -#endif - -#include -#include -#include -#include -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace po=boost::program_options; - - - -///@internal -QPID_COMMON_EXTERN std::string prettyArg(const std::string&, const std::string&); - -/** @internal Normally only constructed by optValue() */ -template -class OptionValue : public po::typed_value { - public: - OptionValue(T& value, const std::string& arg) - : po::typed_value(&value), argName(arg) {} - std::string name() const { return argName; } - - private: - std::string argName; -}; - - -/** Create an option value. - * name, value appear after the option name in help like this: - * (=) - * T must support operator <<. - *@see Options for example of use. - */ -template -po::value_semantic* optValue(T& value, const char* name) { - std::string valstr(boost::lexical_cast(value)); - return new OptionValue(value, prettyArg(name, valstr)); -} - -/** Create a vector value. Multiple occurences of the option are - * accumulated into the vector - */ -template -po::value_semantic* optValue(std::vector& value, const char* name) { - using namespace std; - ostringstream os; - copy(value.begin(), value.end(), ostream_iterator(os, " ")); - string val=os.str(); - if (!val.empty()) - val.erase(val.end()-1); // Remove trailing " " - return (new OptionValue >(value, prettyArg(name, val))); -} - -/** Create a boolean switch value. Presence of the option sets the value. */ -inline po::value_semantic* optValue(bool& value) { return po::bool_switch(&value); } - -/** - * Base class for options. - * Example of use: - @code - struct MySubOptions : public Options { - int x; - string y; - MySubOptions() : Options("Sub options") { - addOptions() - ("x", optValue(x,"XUNIT"), "Option X") - ("y", optValue(y, "YUNIT"), "Option Y"); - } - }; - - struct MyOptions : public Options { - bool z; - vector foo; - MySubOptions subOptions; - MyOptions() : Options("My Options") { - addOptions() - ("z", boolSwitch(z), "Option Z") - ("foo", optValue(foo), "Multiple option foo"); - add(subOptions); - } - - main(int argc, char** argv) { - Options opts; - opts.parse(argc, char** argv); - // Use values - dosomething(opts.subOptions.x); - if (error) - cout << opts << end; // Help message. - } - - @endcode - */ - - - - -/* - * --------------------------------------------- - * Explanation for Boost 103200 conditional code - * --------------------------------------------- - * - * This boost version has an implementation of the program_options library - * that has no provision for allowing unregistered options to pass by. - * - * But that means that, if you have a program that loads optional modules - * after start-up, and those modules each have their own set of options, - * then if you parse the command line too soon, you will get spurious - * reports of unrecognized options -- and the program will exit! - * - * And we must process the command-line before module-loading, because we - * need to look at the "bootstrap" options. - * - * This conditional code: - * - * 1. implements it's own functor class, derived from the Boost - * "options_description_easy_init" class. This functor is used - * to process added options and do the functor chaining, so that - * I can snoop on the arguments before doing an explicit call - * to its parent. - * - * 2. It implements two static vectors, one to hold long names, and - * one for short names, so that options declared by modules are - * not forgotten when their options_description goes out of scope. - * - * I will be thrilled to personally delete this code if we ever decide - * that qpid doesn't really need to support this antique version of Boost. - * - */ - -#if ( BOOST_VERSION == 103200 ) -struct Options; - - -struct -options_description_less_easy_init - : public po::options_description_easy_init -{ - options_description_less_easy_init ( Options * my_owner, - po::options_description * my_parents_owner - ) - : po::options_description_easy_init(my_parents_owner) - { - owner = my_owner; - } - - - options_description_less_easy_init& - operator()(char const * name, - char const * description); - - - options_description_less_easy_init& - operator()(char const * name, - const po::value_semantic* s); - - - options_description_less_easy_init& - operator()(const char* name, - const po::value_semantic* s, - const char* description); - - - Options * owner; -}; -#endif - - -struct Options : public po::options_description { - - struct Exception : public qpid::Exception { - Exception(const std::string& msg) : qpid::Exception(msg) {} - }; - - QPID_COMMON_EXTERN Options(const std::string& name=std::string()); - - /** - * Parses options from argc/argv, environment variables and config file. - * Note the filename argument can reference an options variable that - * is updated by argc/argv or environment variable parsing. - */ - QPID_COMMON_EXTERN void parse(int argc, char const* const* argv, - const std::string& configfile=std::string(), - bool allowUnknown = false); - - - #if ( BOOST_VERSION == 103200 ) - options_description_less_easy_init m_less_easy; - - options_description_less_easy_init addOptions() { - return m_less_easy; - } - - bool - is_registered_option ( std::string s ); - - void - register_names ( std::string s ); - - static std::vector long_names; - static std::vector short_names; - #else - boost::program_options::options_description_easy_init addOptions() { - return add_options(); - } - #endif -}; - - - -/** - * Standard options for configuration - */ -struct CommonOptions : public Options { - QPID_COMMON_EXTERN CommonOptions(const std::string& name=std::string(), - const std::string& configfile=std::string()); - bool help; - bool version; - std::string config; -}; - - - - -} // namespace qpid - -#endif /*!QPID_COMMONOPTIONS_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/RangeSet.h b/nativeLib/org.apache.qpid/include/qpid/RangeSet.h deleted file mode 100644 index 1b2e4201a6..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/RangeSet.h +++ /dev/null @@ -1,330 +0,0 @@ -#ifndef QPID_RANGESET_H -#define QPID_RANGESET_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include "qpid/InlineVector.h" -#include -#include -#include -#include -#include - -namespace qpid { - -/** A range of values, used in RangeSet. - * Range(begin, end) includes begin but excludes end. - * Range::makeClosed(first,last) includes both first and last. - */ -template -class Range { - public: - static Range makeClosed(const T& first, T last) { return Range(first, ++last); } - - Range() : begin_(), end_() {} - explicit Range(const T& t) : begin_(t), end_(t) { ++end_; } - Range(const T& b, const T& e) : begin_(b), end_(e) { assert(b <= e); } - - T begin() const { return begin_; } - /** End of _open_ range, i.e. !contains(end()) */ - T end() const { return end_; } - - T first() const { assert(!empty()); return begin_; } - /** Last in closed range, i.e. contains(end()) */ - T last() const { assert(!empty()); T ret=end_; return --ret; } - - void begin(const T& t) { begin_ = t; } - void end(const T& t) { end_ = t; } - size_t size() const { return end_ - begin_; } - bool empty() const { return begin_ == end_; } - - bool contains(const T& x) const { return begin_ <= x && x < end_; } - bool contains(const Range& r) const { return begin_ <= r.begin_ && r.end_ <= end_; } - bool strictContains(const Range& r) const { return begin_ < r.begin_ && r.end_ < end_; } - - bool operator==(const Range& x) { return begin_ == x.begin_ && end_== x.end_; } - - bool operator<(const T& t) const { return end_ < t; } - bool operator<(const Range& r) const { return end_ < r.begin_; } - - /** touching ranges can be merged into a single range. */ - bool touching(const Range& r) const { - return std::max(begin_, r.begin_) <= std::min(end_, r.end_); - } - - /** @pre touching */ - void merge(const Range& r) { - assert(touching(r)); - begin_ = std::min(begin_, r.begin_); - end_ = std::max(end_, r.end_); - } - - operator bool() const { return !empty(); } - - template void serialize(S& s) { s(begin_)(end_); } - - private: - T begin_, end_; -}; - - -/** - * A set implemented as a list of [begin, end) ranges. - * T must be LessThanComparable and Incrementable. - * RangeSet only provides const iterators. - */ -template -class RangeSet - : boost::additive1, - boost::additive2, Range, - boost::additive2, T> > > -{ - typedef InlineVector, 3> Ranges; // TODO aconway 2008-04-21: what's the optimial inlined value? - - public: - - class iterator : public boost::iterator_facade< - iterator, - const T, - boost::forward_traversal_tag> - { - public: - iterator() : ranges(), iter(), value() {} - - private: - typedef typename Ranges::const_iterator RangesIter; - iterator(const Ranges& r, const RangesIter& i, const T& t) - : ranges(&r), iter(i), value(t) {} - - void increment(); - bool equal(const iterator& i) const; - const T& dereference() const { return value; } - - const Ranges* ranges; - RangesIter iter; - T value; - - friend class RangeSet; - friend class boost::iterator_core_access; - }; - - typedef iterator const_iterator; - - RangeSet() {} - explicit RangeSet(const Range& r) { *this += r; } - RangeSet(const T& a, const T& b) { *this += Range(a,b); } - - bool contiguous() const { return ranges.size() <= 1; } - - bool contains(const T& t) const; - bool contains(const Range&) const; - - /**@pre contiguous() */ - Range toRange() const; - - bool operator==(const RangeSet&) const; - - void addRange (const Range&); - void addSet (const RangeSet&); - - RangeSet& operator+=(const T& t) { return *this += Range(t); } - RangeSet& operator+=(const Range& r) { addRange(r); return *this; } - RangeSet& operator+=(const RangeSet& s) { addSet(s); return *this; } - - void removeRange (const Range&); - void removeSet (const RangeSet&); - - RangeSet& operator-=(const T& t) { return *this -= Range(t); } - RangeSet& operator-=(const Range& r) { removeRange(r); return *this; } - RangeSet& operator-=(const RangeSet& s) { removeSet(s); return *this; } - - T front() const { return ranges.front().begin(); } - T back() const { return ranges.back().end(); } - - // Iterate over elements in the set. - iterator begin() const; - iterator end() const; - - // Iterate over ranges in the set. - typedef typename Ranges::const_iterator RangeIterator; - RangeIterator rangesBegin() const { return ranges.begin(); } - RangeIterator rangesEnd() const { return ranges.end(); } - size_t rangesSize() const { return ranges.size(); } - - // The difference between the start and end of this range set - uint32_t span() const; - - size_t size() const; - bool empty() const { return ranges.empty(); } - void clear() { ranges.clear(); } - - /** Return the largest contiguous range containing x. - * Returns the empty range [x,x) if x is not in the set. - */ - Range rangeContaining(const T&) const; - - template void serialize(S& s) { s.split(*this); s(ranges.begin(), ranges.end()); } - template void encode(S& s) const { s(uint16_t(ranges.size()*sizeof(Range))); } - template void decode(S& s) { uint16_t sz; s(sz); ranges.resize(sz/sizeof(Range)); } - - private: - static size_t accumulateSize(size_t s, const Range& r) { return s+r.size(); } - Ranges ranges; - - template friend std::ostream& operator<<(std::ostream& o, const RangeSet& r); - - friend class iterator; -}; - -template -std::ostream& operator<<(std::ostream& o, const Range& r) { - return o << "[" << r.begin() << "," << r.end() << ")"; -} - -template -std::ostream& operator<<(std::ostream& o, const RangeSet& rs) { - std::ostream_iterator > i(o, " "); - o << "{ "; - std::copy(rs.ranges.begin(), rs.ranges.end(), i); - return o << "}"; -} - -template -bool RangeSet::contains(const T& t) const { - typename Ranges::const_iterator i = - std::lower_bound(ranges.begin(), ranges.end(), Range(t)); - return i != ranges.end() && i->contains(t); -} - -template -bool RangeSet::contains(const Range& r) const { - typename Ranges::const_iterator i = - std::lower_bound(ranges.begin(), ranges.end(), r); - return i != ranges.end() && i->contains(r); -} - -template void RangeSet::addRange(const Range& r) { - if (r.empty()) return; - typename Ranges::iterator i = - std::lower_bound(ranges.begin(), ranges.end(), r); - if (i == ranges.end() || !i->touching(r)) - ranges.insert(i, r); - else { - i->merge(r); - typename Ranges::iterator j = i; - if (++j != ranges.end() && i->touching(*j)) { - i->merge(*j); - ranges.erase(j); - } - } -} - - -template void RangeSet::addSet(const RangeSet& s) { - typedef RangeSet& (RangeSet::*RangeSetRangeOp)(const Range&); - std::for_each(s.ranges.begin(), s.ranges.end(), - boost::bind((RangeSetRangeOp)&RangeSet::operator+=, this, _1)); -} - -template void RangeSet::removeRange(const Range& r) { - if (r.empty()) return; - typename Ranges::iterator i,j; - i = std::lower_bound(ranges.begin(), ranges.end(), r); - if (i == ranges.end() || i->begin() >= r.end()) - return; // Outside of set - if (*i == r) // Erase i - ranges.erase(i); - else if (i->strictContains(r)) { // Split i - Range i1(i->begin(), r.begin()); - Range i2(r.end(), i->end()); - *i = i2; - ranges.insert(i, i1); - } else { - if (i->begin() < r.begin()) { // Truncate i - i->end(r.begin()); - ++i; - } - for (j = i; j != ranges.end() && r.contains(*j); ++j) - ; // Ranges to erase. - if (j != ranges.end() && j->end() > r.end()) - j->begin(r.end()); // Truncate j - ranges.erase(i,j); - } -} - -template void RangeSet::removeSet(const RangeSet& r) { - std::for_each( - r.ranges.begin(), r.ranges.end(), - boost::bind(&RangeSet::removeRange, this, _1)); -} - -template Range RangeSet::toRange() const { - assert(contiguous()); - return empty() ? Range() : ranges.front(); -} - -template void RangeSet::iterator::increment() { - assert(ranges && iter != ranges->end()); - if (!iter->contains(++value)) { - ++iter; - if (iter == ranges->end()) - *this=iterator(); // end() iterator - else - value=iter->begin(); - } -} - -template bool RangeSet::operator==(const RangeSet& r) const { - return ranges.size() == r.ranges.size() && std::equal(ranges.begin(), ranges.end(), r.ranges.begin()); -} - -template typename RangeSet::iterator RangeSet::begin() const { - return empty() ? end() : iterator(ranges, ranges.begin(), front()); -} - -template typename RangeSet::iterator RangeSet::end() const { - return iterator(); -} - -template bool RangeSet::iterator::equal(const iterator& i) const { - return ranges==i.ranges && (ranges==0 || value==i.value); -} - -template Range RangeSet::rangeContaining(const T& t) const { - typename Ranges::const_iterator i = - std::lower_bound(ranges.begin(), ranges.end(), Range(t)); - return (i != ranges.end() && i->contains(t)) ? *i : Range(t,t); -} - -template uint32_t RangeSet::span() const { - if (ranges.empty()) return 0; - return ranges.back().last() - ranges.front().first(); -} - -template size_t RangeSet::size() const { - return std::accumulate(rangesBegin(), rangesEnd(), 0, &RangeSet::accumulateSize); -} - -} // namespace qpid - - -#endif /*!QPID_RANGESET_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/SessionId.h b/nativeLib/org.apache.qpid/include/qpid/SessionId.h deleted file mode 100644 index e18b360999..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/SessionId.h +++ /dev/null @@ -1,60 +0,0 @@ -#ifndef QPID_SESSIONID_H -#define QPID_SESSIONID_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include -#include -#include - -namespace qpid { - -/** Identifier for a session. - * There are two parts to a session identifier: - * - * getUserId() returns the authentication principal associated with - * the session's connection. - * - * getName() returns the session name. - * - * The name must be unique among sessions with the same authentication - * principal. - */ -class SessionId : boost::totally_ordered1 { - std::string userId; - std::string name; - public: - QPID_COMMON_EXTERN SessionId(const std::string& userId=std::string(), const std::string& name=std::string()); - std::string getUserId() const { return userId; } - std::string getName() const { return name; } - QPID_COMMON_EXTERN bool operator<(const SessionId&) const ; - QPID_COMMON_EXTERN bool operator==(const SessionId& id) const; - // Convert to a string - QPID_COMMON_EXTERN std::string str() const; -}; - -QPID_COMMON_EXTERN std::ostream& operator<<(std::ostream&, const SessionId&); - - -} // namespace qpid - -#endif /*!QPID_SESSIONID_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/Url.h b/nativeLib/org.apache.qpid/include/qpid/Url.h deleted file mode 100644 index 353e9d5599..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/Url.h +++ /dev/null @@ -1,99 +0,0 @@ -#ifndef QPID_URL_H -#define QPID_URL_H - -/* - * - * Copyright (c) 2006 The Apache Software Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include "qpid/Address.h" -#include "qpid/Exception.h" -#include -#include -#include -#include -#include "qpid/CommonImportExport.h" - -namespace qpid { - -/** An AMQP URL contains a list of addresses */ -struct Url : public std::vector
{ - - /** Url with the hostname as returned by gethostname(2) */ - QPID_COMMON_EXTERN static Url getHostNameUrl(uint16_t port); - - /** Url with local IP address(es), may be more than one address - * on a multi-homed host. */ - QPID_COMMON_EXTERN static Url getIpAddressesUrl(uint16_t port); - - struct Invalid : public Exception { Invalid(const std::string& s); }; - - /** Convert to string form. */ - QPID_COMMON_EXTERN std::string str() const; - - /** Empty URL. */ - Url() {} - - /** URL containing a single address */ - explicit Url(const Address& addr) { push_back(addr); } - - /** Parse url, throw Invalid if invalid. */ - explicit Url(const std::string& url) { parse(url.c_str()); } - - /** Parse url, throw Invalid if invalid. */ - explicit Url(const char* url) { parse(url); } - - Url& operator=(const char* s) { parse(s); return *this; } - Url& operator=(const std::string& s) { parse(s); return *this; } - - /** Throw Invalid if the URL does not contain any addresses. */ - QPID_COMMON_EXTERN void throwIfEmpty() const; - - /** Replace contents with parsed url - *@exception Invalid if the url is invalid. - */ - QPID_COMMON_EXTERN void parse(const char* url); - QPID_COMMON_EXTERN void parse(const std::string& url) { parse(url.c_str()); } - - /** Replace contesnts with parsed URL. Replace with empty URL if invalid. */ - QPID_COMMON_EXTERN void parseNoThrow(const char* url); - - /** Add a protocol tag to be recognzed in URLs. - * Only for use by protcol plug-in initializers. - */ - QPID_COMMON_EXTERN static void addProtocol(const std::string& tag); - - QPID_COMMON_EXTERN void setUser(const std::string&); - QPID_COMMON_EXTERN void setPass(const std::string&); - QPID_COMMON_EXTERN std::string getUser() const; - QPID_COMMON_EXTERN std::string getPass() const; - - private: - mutable std::string cache; // cache string form for efficiency. - std::string user, pass; - - friend class UrlParser; -}; - -inline bool operator==(const Url& a, const Url& b) { return a.str()==b.str(); } -inline bool operator!=(const Url& a, const Url& b) { return a.str()!=b.str(); } - -QPID_COMMON_EXTERN std::ostream& operator<<(std::ostream& os, const Url& url); -QPID_COMMON_EXTERN std::istream& operator>>(std::istream& is, Url& url); - -} // namespace qpid - -#endif /*!QPID_URL_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/agent/ManagementAgent.h b/nativeLib/org.apache.qpid/include/qpid/agent/ManagementAgent.h deleted file mode 100644 index e2451244c1..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/agent/ManagementAgent.h +++ /dev/null @@ -1,205 +0,0 @@ -#ifndef _qpid_agent_ManagementAgent_ -#define _qpid_agent_ManagementAgent_ - -// -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -// - -#include "qpid/agent/QmfAgentImportExport.h" -#include "qpid/management/ManagementObject.h" -#include "qpid/management/ManagementEvent.h" -#include "qpid/management/Manageable.h" -#include "qpid/management/ConnectionSettings.h" - -namespace qpid { -namespace management { - -class Notifyable { -public: - virtual ~Notifyable() {} - virtual void notify() = 0; -}; - -class ManagementAgent -{ - public: - - class Singleton { - public: - QMF_AGENT_EXTERN Singleton(bool disableManagement = false); - QMF_AGENT_EXTERN ~Singleton(); - QMF_AGENT_EXTERN static ManagementAgent* getInstance(); - }; - - typedef enum { - SEV_EMERG = 0, - SEV_ALERT = 1, - SEV_CRIT = 2, - SEV_ERROR = 3, - SEV_WARN = 4, - SEV_NOTE = 5, - SEV_INFO = 6, - SEV_DEBUG = 7, - SEV_DEFAULT = 8 - } severity_t; - - ManagementAgent() {} - virtual ~ManagementAgent() {} - - virtual int getMaxThreads() = 0; - - // Set the name of the agent - // - // vendor - Vendor name or domain (i.e. "apache.org") - // product - Product name (i.e. "qpid") - // instance - A unique identifier for this instance of the agent. - // If empty, the agent will create a GUID for the instance. - // Note: the ":" character is reserved - do no use it in the vendor or product name. - // - virtual void setName(const std::string& vendor, - const std::string& product, - const std::string& instance="") = 0; - - // Retrieve the name of the agent as assigned by setName() - // - virtual void getName(std::string& vendor, - std::string& product, - std::string& instance) = 0; - - // Obtain the fully qualified name of the agent - // - virtual const std::string& getAddress() = 0; - - // Connect to a management broker - // - // brokerHost - Hostname or IP address (dotted-quad) of broker. - // - // brokerPort - TCP port of broker. - // - // intervalSeconds - The interval (in seconds) that this agent shall use - // between broadcast updates to the broker. - // - // useExternalThread - If true, the thread of control used for callbacks - // must be supplied by the user of the object (via the - // pollCallbacks method). - // - // If false, callbacks shall be invoked on the management - // agent's thread. In this case, the callback implementations - // MUST be thread safe. - // - // storeFile - File where this process has read and write access. This - // file shall be used to store persistent state. - // - virtual void init(const std::string& brokerHost = "localhost", - uint16_t brokerPort = 5672, - uint16_t intervalSeconds = 10, - bool useExternalThread = false, - const std::string& storeFile = "", - const std::string& uid = "guest", - const std::string& pwd = "guest", - const std::string& mech = "PLAIN", - const std::string& proto = "tcp") = 0; - - virtual void init(const management::ConnectionSettings& settings, - uint16_t intervalSeconds = 10, - bool useExternalThread = false, - const std::string& storeFile = "") = 0; - - - // Register a schema with the management agent. This is normally called by the - // package initializer generated by the management code generator. - // - virtual void - registerClass(const std::string& packageName, - const std::string& className, - uint8_t* md5Sum, - management::ManagementObject::writeSchemaCall_t schemaCall) = 0; - - virtual void - registerEvent(const std::string& packageName, - const std::string& eventName, - uint8_t* md5Sum, - management::ManagementEvent::writeSchemaCall_t schemaCall) = 0; - - // Add a management object to the agent. Once added, this object shall be visible - // in the greater management context. - // - // Please note that ManagementObject instances are not explicitly deleted from - // the management agent. When the core object represented by a management object - // is deleted, the "resourceDestroy" method on the management object must be called. - // It will then be reclaimed in due course by the management agent. - // - // Once a ManagementObject instance is added to the agent, the agent then owns the - // instance. The caller MUST NOT free the resources of the instance at any time. - // When it is no longer needed, invoke its "resourceDestroy" method and discard the - // pointer. This allows the management agent to report the deletion of the object - // in an orderly way. - // - virtual ObjectId addObject(ManagementObject* objectPtr, uint64_t persistId = 0) = 0; - virtual ObjectId addObject(ManagementObject* objectPtr, - const std::string& key, - bool persistent = true) = 0; - - // - // - virtual void raiseEvent(const ManagementEvent& event, - severity_t severity = SEV_DEFAULT) = 0; - - // If "useExternalThread" was set to true in init, this method must - // be called to provide a thread for any pending method calls that have arrived. - // The method calls for ManagementObject instances shall be invoked synchronously - // during the execution of this method. - // - // callLimit may optionally be used to limit the number of callbacks invoked. - // if 0, no limit is imposed. - // - // The return value is the number of callbacks that remain queued after this - // call is complete. It can be used to determine whether or not further calls - // to pollCallbacks are necessary to clear the backlog. If callLimit is zero, - // the return value will also be zero. - // - virtual uint32_t pollCallbacks(uint32_t callLimit = 0) = 0; - - // In the "useExternalThread" scenario, there are three ways that an application can - // use to be notified that there is work to do. Of course the application may periodically - // call pollCallbacks if it wishes, but this will cause long latencies in the responses - // to method calls. - // - // The notification methods are: - // - // 1) Register a C-style callback by providing a pointer to a function - // 2) Register a C++-style callback by providing an object of a class that is derived - // from Notifyable - // 3) Call getSignalFd() to get a file descriptor that can be used in a select - // call. The file descriptor shall become readable when the agent has work to - // do. Note that this mechanism is specific to Posix-based operating environments. - // getSignalFd will probably not function correctly on Windows. - // - // If a callback is registered, the callback function will be called on the agent's - // thread. The callback function must perform no work other than to signal the application - // thread to call pollCallbacks. - // - typedef void (*cb_t)(void*); - virtual void setSignalCallback(cb_t callback, void* context) = 0; - virtual void setSignalCallback(Notifyable& notifyable) = 0; - virtual int getSignalFd() = 0; -}; - -}} - -#endif /*!_qpid_agent_ManagementAgent_*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/agent/QmfAgentImportExport.h b/nativeLib/org.apache.qpid/include/qpid/agent/QmfAgentImportExport.h deleted file mode 100644 index e41425a7ba..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/agent/QmfAgentImportExport.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef QMF_AGENT_IMPORT_EXPORT_H -#define QMF_AGENT_IMPORT_EXPORT_H - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -#if defined(WIN32) && !defined(QPID_DECLARE_STATIC) -#if defined (qmf_EXPORTS) -#define QMF_AGENT_EXTERN __declspec(dllexport) -#else -#define QMF_AGENT_EXTERN __declspec(dllimport) -#endif -#else -#define QMF_AGENT_EXTERN -#endif - -#endif diff --git a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/ApplyCommand.h b/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/ApplyCommand.h deleted file mode 100644 index b39d84deaf..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/ApplyCommand.h +++ /dev/null @@ -1,167 +0,0 @@ -#ifndef QPID_AMQP_0_10_APPLYCOMMAND_H -#define QPID_AMQP_0_10_APPLYCOMMAND_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/amqp_0_10/CommandVisitor.h" -#include "qpid/amqp_0_10/apply.h" - -namespace qpid { -namespace amqp_0_10 { - -template -struct ApplyVisitor: - public ApplyVisitorBase -{ - virtual void visit(execution::Sync& x) { this->invoke(x); } - virtual void visit(execution::Result& x) { this->invoke(x); } - virtual void visit(execution::Exception& x) { this->invoke(x); } - virtual void visit(message::Transfer& x) { this->invoke(x); } - virtual void visit(message::Accept& x) { this->invoke(x); } - virtual void visit(message::Reject& x) { this->invoke(x); } - virtual void visit(message::Release& x) { this->invoke(x); } - virtual void visit(message::Acquire& x) { this->invoke(x); } - virtual void visit(message::Resume& x) { this->invoke(x); } - virtual void visit(message::Subscribe& x) { this->invoke(x); } - virtual void visit(message::Cancel& x) { this->invoke(x); } - virtual void visit(message::SetFlowMode& x) { this->invoke(x); } - virtual void visit(message::Flow& x) { this->invoke(x); } - virtual void visit(message::Flush& x) { this->invoke(x); } - virtual void visit(message::Stop& x) { this->invoke(x); } - virtual void visit(tx::Select& x) { this->invoke(x); } - virtual void visit(tx::Commit& x) { this->invoke(x); } - virtual void visit(tx::Rollback& x) { this->invoke(x); } - virtual void visit(dtx::Select& x) { this->invoke(x); } - virtual void visit(dtx::Start& x) { this->invoke(x); } - virtual void visit(dtx::End& x) { this->invoke(x); } - virtual void visit(dtx::Commit& x) { this->invoke(x); } - virtual void visit(dtx::Forget& x) { this->invoke(x); } - virtual void visit(dtx::GetTimeout& x) { this->invoke(x); } - virtual void visit(dtx::Prepare& x) { this->invoke(x); } - virtual void visit(dtx::Recover& x) { this->invoke(x); } - virtual void visit(dtx::Rollback& x) { this->invoke(x); } - virtual void visit(dtx::SetTimeout& x) { this->invoke(x); } - virtual void visit(exchange::Declare& x) { this->invoke(x); } - virtual void visit(exchange::Delete& x) { this->invoke(x); } - virtual void visit(exchange::Query& x) { this->invoke(x); } - virtual void visit(exchange::Bind& x) { this->invoke(x); } - virtual void visit(exchange::Unbind& x) { this->invoke(x); } - virtual void visit(exchange::Bound& x) { this->invoke(x); } - virtual void visit(queue::Declare& x) { this->invoke(x); } - virtual void visit(queue::Delete& x) { this->invoke(x); } - virtual void visit(queue::Purge& x) { this->invoke(x); } - virtual void visit(queue::Query& x) { this->invoke(x); } - virtual void visit(file::Qos& x) { this->invoke(x); } - virtual void visit(file::QosOk& x) { this->invoke(x); } - virtual void visit(file::Consume& x) { this->invoke(x); } - virtual void visit(file::ConsumeOk& x) { this->invoke(x); } - virtual void visit(file::Cancel& x) { this->invoke(x); } - virtual void visit(file::Open& x) { this->invoke(x); } - virtual void visit(file::OpenOk& x) { this->invoke(x); } - virtual void visit(file::Stage& x) { this->invoke(x); } - virtual void visit(file::Publish& x) { this->invoke(x); } - virtual void visit(file::Return& x) { this->invoke(x); } - virtual void visit(file::Deliver& x) { this->invoke(x); } - virtual void visit(file::Ack& x) { this->invoke(x); } - virtual void visit(file::Reject& x) { this->invoke(x); } - virtual void visit(stream::Qos& x) { this->invoke(x); } - virtual void visit(stream::QosOk& x) { this->invoke(x); } - virtual void visit(stream::Consume& x) { this->invoke(x); } - virtual void visit(stream::ConsumeOk& x) { this->invoke(x); } - virtual void visit(stream::Cancel& x) { this->invoke(x); } - virtual void visit(stream::Publish& x) { this->invoke(x); } - virtual void visit(stream::Return& x) { this->invoke(x); } - virtual void visit(stream::Deliver& x) { this->invoke(x); } -}; -template -struct ApplyVisitor: - public ApplyVisitorBase -{ - virtual void visit(const execution::Sync& x) { this->invoke(x); } - virtual void visit(const execution::Result& x) { this->invoke(x); } - virtual void visit(const execution::Exception& x) { this->invoke(x); } - virtual void visit(const message::Transfer& x) { this->invoke(x); } - virtual void visit(const message::Accept& x) { this->invoke(x); } - virtual void visit(const message::Reject& x) { this->invoke(x); } - virtual void visit(const message::Release& x) { this->invoke(x); } - virtual void visit(const message::Acquire& x) { this->invoke(x); } - virtual void visit(const message::Resume& x) { this->invoke(x); } - virtual void visit(const message::Subscribe& x) { this->invoke(x); } - virtual void visit(const message::Cancel& x) { this->invoke(x); } - virtual void visit(const message::SetFlowMode& x) { this->invoke(x); } - virtual void visit(const message::Flow& x) { this->invoke(x); } - virtual void visit(const message::Flush& x) { this->invoke(x); } - virtual void visit(const message::Stop& x) { this->invoke(x); } - virtual void visit(const tx::Select& x) { this->invoke(x); } - virtual void visit(const tx::Commit& x) { this->invoke(x); } - virtual void visit(const tx::Rollback& x) { this->invoke(x); } - virtual void visit(const dtx::Select& x) { this->invoke(x); } - virtual void visit(const dtx::Start& x) { this->invoke(x); } - virtual void visit(const dtx::End& x) { this->invoke(x); } - virtual void visit(const dtx::Commit& x) { this->invoke(x); } - virtual void visit(const dtx::Forget& x) { this->invoke(x); } - virtual void visit(const dtx::GetTimeout& x) { this->invoke(x); } - virtual void visit(const dtx::Prepare& x) { this->invoke(x); } - virtual void visit(const dtx::Recover& x) { this->invoke(x); } - virtual void visit(const dtx::Rollback& x) { this->invoke(x); } - virtual void visit(const dtx::SetTimeout& x) { this->invoke(x); } - virtual void visit(const exchange::Declare& x) { this->invoke(x); } - virtual void visit(const exchange::Delete& x) { this->invoke(x); } - virtual void visit(const exchange::Query& x) { this->invoke(x); } - virtual void visit(const exchange::Bind& x) { this->invoke(x); } - virtual void visit(const exchange::Unbind& x) { this->invoke(x); } - virtual void visit(const exchange::Bound& x) { this->invoke(x); } - virtual void visit(const queue::Declare& x) { this->invoke(x); } - virtual void visit(const queue::Delete& x) { this->invoke(x); } - virtual void visit(const queue::Purge& x) { this->invoke(x); } - virtual void visit(const queue::Query& x) { this->invoke(x); } - virtual void visit(const file::Qos& x) { this->invoke(x); } - virtual void visit(const file::QosOk& x) { this->invoke(x); } - virtual void visit(const file::Consume& x) { this->invoke(x); } - virtual void visit(const file::ConsumeOk& x) { this->invoke(x); } - virtual void visit(const file::Cancel& x) { this->invoke(x); } - virtual void visit(const file::Open& x) { this->invoke(x); } - virtual void visit(const file::OpenOk& x) { this->invoke(x); } - virtual void visit(const file::Stage& x) { this->invoke(x); } - virtual void visit(const file::Publish& x) { this->invoke(x); } - virtual void visit(const file::Return& x) { this->invoke(x); } - virtual void visit(const file::Deliver& x) { this->invoke(x); } - virtual void visit(const file::Ack& x) { this->invoke(x); } - virtual void visit(const file::Reject& x) { this->invoke(x); } - virtual void visit(const stream::Qos& x) { this->invoke(x); } - virtual void visit(const stream::QosOk& x) { this->invoke(x); } - virtual void visit(const stream::Consume& x) { this->invoke(x); } - virtual void visit(const stream::ConsumeOk& x) { this->invoke(x); } - virtual void visit(const stream::Cancel& x) { this->invoke(x); } - virtual void visit(const stream::Publish& x) { this->invoke(x); } - virtual void visit(const stream::Return& x) { this->invoke(x); } - virtual void visit(const stream::Deliver& x) { this->invoke(x); } -}; - -}} // namespace qpid::amqp_0_10 - -#endif /*!QPID_AMQP_0_10_APPLYCOMMAND_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/ApplyControl.h b/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/ApplyControl.h deleted file mode 100644 index 7101178ade..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/ApplyControl.h +++ /dev/null @@ -1,177 +0,0 @@ -#ifndef QPID_AMQP_0_10_APPLYCONTROL_H -#define QPID_AMQP_0_10_APPLYCONTROL_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/amqp_0_10/ControlVisitor.h" -#include "qpid/amqp_0_10/apply.h" - -namespace qpid { -namespace amqp_0_10 { - -template -struct ApplyVisitor: - public ApplyVisitorBase -{ - virtual void visit(connection::Start& x) { this->invoke(x); } - virtual void visit(connection::StartOk& x) { this->invoke(x); } - virtual void visit(connection::Secure& x) { this->invoke(x); } - virtual void visit(connection::SecureOk& x) { this->invoke(x); } - virtual void visit(connection::Tune& x) { this->invoke(x); } - virtual void visit(connection::TuneOk& x) { this->invoke(x); } - virtual void visit(connection::Open& x) { this->invoke(x); } - virtual void visit(connection::OpenOk& x) { this->invoke(x); } - virtual void visit(connection::Redirect& x) { this->invoke(x); } - virtual void visit(connection::Heartbeat& x) { this->invoke(x); } - virtual void visit(connection::Close& x) { this->invoke(x); } - virtual void visit(connection::CloseOk& x) { this->invoke(x); } - virtual void visit(session::Attach& x) { this->invoke(x); } - virtual void visit(session::Attached& x) { this->invoke(x); } - virtual void visit(session::Detach& x) { this->invoke(x); } - virtual void visit(session::Detached& x) { this->invoke(x); } - virtual void visit(session::RequestTimeout& x) { this->invoke(x); } - virtual void visit(session::Timeout& x) { this->invoke(x); } - virtual void visit(session::CommandPoint& x) { this->invoke(x); } - virtual void visit(session::Expected& x) { this->invoke(x); } - virtual void visit(session::Confirmed& x) { this->invoke(x); } - virtual void visit(session::Completed& x) { this->invoke(x); } - virtual void visit(session::KnownCompleted& x) { this->invoke(x); } - virtual void visit(session::Flush& x) { this->invoke(x); } - virtual void visit(session::Gap& x) { this->invoke(x); } - virtual void visit(cluster::UpdateRequest& x) { this->invoke(x); } - virtual void visit(cluster::UpdateOffer& x) { this->invoke(x); } - virtual void visit(cluster::RetractOffer& x) { this->invoke(x); } - virtual void visit(cluster::InitialStatus& x) { this->invoke(x); } - virtual void visit(cluster::Ready& x) { this->invoke(x); } - virtual void visit(cluster::ConfigChange& x) { this->invoke(x); } - virtual void visit(cluster::MessageExpired& x) { this->invoke(x); } - virtual void visit(cluster::ErrorCheck& x) { this->invoke(x); } - virtual void visit(cluster::TimerWakeup& x) { this->invoke(x); } - virtual void visit(cluster::TimerDrop& x) { this->invoke(x); } - virtual void visit(cluster::Shutdown& x) { this->invoke(x); } - virtual void visit(cluster::DeliverToQueue& x) { this->invoke(x); } - virtual void visit(cluster-connection::Announce& x) { this->invoke(x); } - virtual void visit(cluster-connection::DeliverClose& x) { this->invoke(x); } - virtual void visit(cluster-connection::DeliverDoOutput& x) { this->invoke(x); } - virtual void visit(cluster-connection::Abort& x) { this->invoke(x); } - virtual void visit(cluster-connection::ShadowSetUser& x) { this->invoke(x); } - virtual void visit(cluster-connection::ShadowPrepare& x) { this->invoke(x); } - virtual void visit(cluster-connection::ConsumerState& x) { this->invoke(x); } - virtual void visit(cluster-connection::DeliveryRecord& x) { this->invoke(x); } - virtual void visit(cluster-connection::TxStart& x) { this->invoke(x); } - virtual void visit(cluster-connection::TxAccept& x) { this->invoke(x); } - virtual void visit(cluster-connection::TxDequeue& x) { this->invoke(x); } - virtual void visit(cluster-connection::TxEnqueue& x) { this->invoke(x); } - virtual void visit(cluster-connection::TxPublish& x) { this->invoke(x); } - virtual void visit(cluster-connection::TxEnd& x) { this->invoke(x); } - virtual void visit(cluster-connection::AccumulatedAck& x) { this->invoke(x); } - virtual void visit(cluster-connection::OutputTask& x) { this->invoke(x); } - virtual void visit(cluster-connection::SessionState& x) { this->invoke(x); } - virtual void visit(cluster-connection::ShadowReady& x) { this->invoke(x); } - virtual void visit(cluster-connection::Membership& x) { this->invoke(x); } - virtual void visit(cluster-connection::RetractOffer& x) { this->invoke(x); } - virtual void visit(cluster-connection::QueuePosition& x) { this->invoke(x); } - virtual void visit(cluster-connection::Exchange& x) { this->invoke(x); } - virtual void visit(cluster-connection::Queue& x) { this->invoke(x); } - virtual void visit(cluster-connection::ExpiryId& x) { this->invoke(x); } - virtual void visit(cluster-connection::AddQueueListener& x) { this->invoke(x); } - virtual void visit(cluster-connection::ManagementSetupState& x) { this->invoke(x); } - virtual void visit(cluster-connection::Config& x) { this->invoke(x); } -}; -template -struct ApplyVisitor: - public ApplyVisitorBase -{ - virtual void visit(const connection::Start& x) { this->invoke(x); } - virtual void visit(const connection::StartOk& x) { this->invoke(x); } - virtual void visit(const connection::Secure& x) { this->invoke(x); } - virtual void visit(const connection::SecureOk& x) { this->invoke(x); } - virtual void visit(const connection::Tune& x) { this->invoke(x); } - virtual void visit(const connection::TuneOk& x) { this->invoke(x); } - virtual void visit(const connection::Open& x) { this->invoke(x); } - virtual void visit(const connection::OpenOk& x) { this->invoke(x); } - virtual void visit(const connection::Redirect& x) { this->invoke(x); } - virtual void visit(const connection::Heartbeat& x) { this->invoke(x); } - virtual void visit(const connection::Close& x) { this->invoke(x); } - virtual void visit(const connection::CloseOk& x) { this->invoke(x); } - virtual void visit(const session::Attach& x) { this->invoke(x); } - virtual void visit(const session::Attached& x) { this->invoke(x); } - virtual void visit(const session::Detach& x) { this->invoke(x); } - virtual void visit(const session::Detached& x) { this->invoke(x); } - virtual void visit(const session::RequestTimeout& x) { this->invoke(x); } - virtual void visit(const session::Timeout& x) { this->invoke(x); } - virtual void visit(const session::CommandPoint& x) { this->invoke(x); } - virtual void visit(const session::Expected& x) { this->invoke(x); } - virtual void visit(const session::Confirmed& x) { this->invoke(x); } - virtual void visit(const session::Completed& x) { this->invoke(x); } - virtual void visit(const session::KnownCompleted& x) { this->invoke(x); } - virtual void visit(const session::Flush& x) { this->invoke(x); } - virtual void visit(const session::Gap& x) { this->invoke(x); } - virtual void visit(const cluster::UpdateRequest& x) { this->invoke(x); } - virtual void visit(const cluster::UpdateOffer& x) { this->invoke(x); } - virtual void visit(const cluster::RetractOffer& x) { this->invoke(x); } - virtual void visit(const cluster::InitialStatus& x) { this->invoke(x); } - virtual void visit(const cluster::Ready& x) { this->invoke(x); } - virtual void visit(const cluster::ConfigChange& x) { this->invoke(x); } - virtual void visit(const cluster::MessageExpired& x) { this->invoke(x); } - virtual void visit(const cluster::ErrorCheck& x) { this->invoke(x); } - virtual void visit(const cluster::TimerWakeup& x) { this->invoke(x); } - virtual void visit(const cluster::TimerDrop& x) { this->invoke(x); } - virtual void visit(const cluster::Shutdown& x) { this->invoke(x); } - virtual void visit(const cluster::DeliverToQueue& x) { this->invoke(x); } - virtual void visit(const cluster-connection::Announce& x) { this->invoke(x); } - virtual void visit(const cluster-connection::DeliverClose& x) { this->invoke(x); } - virtual void visit(const cluster-connection::DeliverDoOutput& x) { this->invoke(x); } - virtual void visit(const cluster-connection::Abort& x) { this->invoke(x); } - virtual void visit(const cluster-connection::ShadowSetUser& x) { this->invoke(x); } - virtual void visit(const cluster-connection::ShadowPrepare& x) { this->invoke(x); } - virtual void visit(const cluster-connection::ConsumerState& x) { this->invoke(x); } - virtual void visit(const cluster-connection::DeliveryRecord& x) { this->invoke(x); } - virtual void visit(const cluster-connection::TxStart& x) { this->invoke(x); } - virtual void visit(const cluster-connection::TxAccept& x) { this->invoke(x); } - virtual void visit(const cluster-connection::TxDequeue& x) { this->invoke(x); } - virtual void visit(const cluster-connection::TxEnqueue& x) { this->invoke(x); } - virtual void visit(const cluster-connection::TxPublish& x) { this->invoke(x); } - virtual void visit(const cluster-connection::TxEnd& x) { this->invoke(x); } - virtual void visit(const cluster-connection::AccumulatedAck& x) { this->invoke(x); } - virtual void visit(const cluster-connection::OutputTask& x) { this->invoke(x); } - virtual void visit(const cluster-connection::SessionState& x) { this->invoke(x); } - virtual void visit(const cluster-connection::ShadowReady& x) { this->invoke(x); } - virtual void visit(const cluster-connection::Membership& x) { this->invoke(x); } - virtual void visit(const cluster-connection::RetractOffer& x) { this->invoke(x); } - virtual void visit(const cluster-connection::QueuePosition& x) { this->invoke(x); } - virtual void visit(const cluster-connection::Exchange& x) { this->invoke(x); } - virtual void visit(const cluster-connection::Queue& x) { this->invoke(x); } - virtual void visit(const cluster-connection::ExpiryId& x) { this->invoke(x); } - virtual void visit(const cluster-connection::AddQueueListener& x) { this->invoke(x); } - virtual void visit(const cluster-connection::ManagementSetupState& x) { this->invoke(x); } - virtual void visit(const cluster-connection::Config& x) { this->invoke(x); } -}; - -}} // namespace qpid::amqp_0_10 - -#endif /*!QPID_AMQP_0_10_APPLYCONTROL_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/ApplyStruct.h b/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/ApplyStruct.h deleted file mode 100644 index 3d2a16e4ff..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/ApplyStruct.h +++ /dev/null @@ -1,79 +0,0 @@ -#ifndef QPID_AMQP_0_10_APPLYSTRUCT_H -#define QPID_AMQP_0_10_APPLYSTRUCT_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/amqp_0_10/StructVisitor.h" -#include "qpid/amqp_0_10/apply.h" - -namespace qpid { -namespace amqp_0_10 { - -template -struct ApplyVisitor: - public ApplyVisitorBase -{ - virtual void visit(message::DeliveryProperties& x) { this->invoke(x); } - virtual void visit(message::FragmentProperties& x) { this->invoke(x); } - virtual void visit(message::MessageProperties& x) { this->invoke(x); } - virtual void visit(message::Acquired& x) { this->invoke(x); } - virtual void visit(message::MessageResumeResult& x) { this->invoke(x); } - virtual void visit(dtx::XaResult& x) { this->invoke(x); } - virtual void visit(dtx::Xid& x) { this->invoke(x); } - virtual void visit(dtx::GetTimeoutResult& x) { this->invoke(x); } - virtual void visit(dtx::RecoverResult& x) { this->invoke(x); } - virtual void visit(exchange::ExchangeQueryResult& x) { this->invoke(x); } - virtual void visit(exchange::ExchangeBoundResult& x) { this->invoke(x); } - virtual void visit(queue::QueueQueryResult& x) { this->invoke(x); } - virtual void visit(file::FileProperties& x) { this->invoke(x); } - virtual void visit(stream::StreamProperties& x) { this->invoke(x); } - virtual void visit(UnknownStruct& x) { this->invoke(x); } -}; -template -struct ApplyVisitor: - public ApplyVisitorBase -{ - virtual void visit(const message::DeliveryProperties& x) { this->invoke(x); } - virtual void visit(const message::FragmentProperties& x) { this->invoke(x); } - virtual void visit(const message::MessageProperties& x) { this->invoke(x); } - virtual void visit(const message::Acquired& x) { this->invoke(x); } - virtual void visit(const message::MessageResumeResult& x) { this->invoke(x); } - virtual void visit(const dtx::XaResult& x) { this->invoke(x); } - virtual void visit(const dtx::Xid& x) { this->invoke(x); } - virtual void visit(const dtx::GetTimeoutResult& x) { this->invoke(x); } - virtual void visit(const dtx::RecoverResult& x) { this->invoke(x); } - virtual void visit(const exchange::ExchangeQueryResult& x) { this->invoke(x); } - virtual void visit(const exchange::ExchangeBoundResult& x) { this->invoke(x); } - virtual void visit(const queue::QueueQueryResult& x) { this->invoke(x); } - virtual void visit(const file::FileProperties& x) { this->invoke(x); } - virtual void visit(const stream::StreamProperties& x) { this->invoke(x); } - virtual void visit(const UnknownStruct& x) { this->invoke(x); } -}; - -}} // namespace qpid::amqp_0_10 - -#endif /*!QPID_AMQP_0_10_APPLYSTRUCT_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/CodeForType.h b/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/CodeForType.h deleted file mode 100644 index 00e1253e55..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/CodeForType.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_AMQP_0_10_CODEFORTYPE_H -#define QPID_AMQP_0_10_CODEFORTYPE_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/amqp_0_10/built_in_types.h" - -namespace qpid { -namespace amqp_0_10 { - - -template struct CodeForType; - -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; -template <> struct CodeForType { static const uint8_t value; }; - -template uint8_t codeFor(const T&) { return CodeForType::value; } - -}} // namespace qpid::amqp_0_10 - -#endif /*!QPID_AMQP_0_10_CODEFORTYPE_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/Codecs.h b/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/Codecs.h deleted file mode 100644 index 08275402fc..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/Codecs.h +++ /dev/null @@ -1,77 +0,0 @@ -#ifndef QPID_AMQP_0_10_CODECS_H -#define QPID_AMQP_0_10_CODECS_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include "qpid/CommonImportExport.h" -#include "qpid/types/Variant.h" - -namespace qpid { -namespace framing { -class FieldTable; -} -namespace amqp_0_10 { -/** - * Codec for encoding/decoding a map of Variants using the AMQP 0-10 - * map encoding. - */ -class QPID_COMMON_EXTERN MapCodec -{ - public: - typedef qpid::types::Variant::Map ObjectType; - static void encode(const ObjectType&, std::string&); - static void decode(const std::string&, ObjectType&); - static size_t encodedSize(const ObjectType&); - static const std::string contentType; - private: -}; - -/** - * Codec for encoding/decoding a list of Variants using the AMQP 0-10 - * list encoding. - */ -class QPID_COMMON_EXTERN ListCodec -{ - public: - typedef qpid::types::Variant::List ObjectType; - static void encode(const ObjectType&, std::string&); - static void decode(const std::string&, ObjectType&); - static size_t encodedSize(const ObjectType&); - static const std::string contentType; - private: -}; - -/** - * @internal - * - * Conversion functions between qpid::types:Variant::Map and the - * deprecated qpid::framing::FieldTable. - * - */ -QPID_COMMON_EXTERN void translate(const qpid::types::Variant::Map& from, - qpid::framing::FieldTable& to); -QPID_COMMON_EXTERN void translate(const qpid::framing::FieldTable& from, - qpid::types::Variant::Map& to); - -}} // namespace qpid::amqp_0_10 - -#endif /*!QPID_AMQP_0_10_CODECS_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/CommandHolder.h b/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/CommandHolder.h deleted file mode 100644 index 557f5925c7..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/CommandHolder.h +++ /dev/null @@ -1,117 +0,0 @@ -#ifndef QPID_AMQP_0_10_COMMANDHOLDER_H -#define QPID_AMQP_0_10_COMMANDHOLDER_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/amqp_0_10/ApplyCommand.h" -#include "qpid/amqp_0_10/Holder.h" -#include "qpid/amqp_0_10/specification.h" - -namespace qpid { -namespace amqp_0_10 { - - -namespace command_max { - -static const size_t MAX000=0; -static const size_t MAX001 = sizeof(execution::Sync) > MAX000 ? sizeof(execution::Sync) : MAX000; -static const size_t MAX002 = sizeof(execution::Result) > MAX001 ? sizeof(execution::Result) : MAX001; -static const size_t MAX003 = sizeof(execution::Exception) > MAX002 ? sizeof(execution::Exception) : MAX002; -static const size_t MAX004 = sizeof(message::Transfer) > MAX003 ? sizeof(message::Transfer) : MAX003; -static const size_t MAX005 = sizeof(message::Accept) > MAX004 ? sizeof(message::Accept) : MAX004; -static const size_t MAX006 = sizeof(message::Reject) > MAX005 ? sizeof(message::Reject) : MAX005; -static const size_t MAX007 = sizeof(message::Release) > MAX006 ? sizeof(message::Release) : MAX006; -static const size_t MAX008 = sizeof(message::Acquire) > MAX007 ? sizeof(message::Acquire) : MAX007; -static const size_t MAX009 = sizeof(message::Resume) > MAX008 ? sizeof(message::Resume) : MAX008; -static const size_t MAX010 = sizeof(message::Subscribe) > MAX009 ? sizeof(message::Subscribe) : MAX009; -static const size_t MAX011 = sizeof(message::Cancel) > MAX010 ? sizeof(message::Cancel) : MAX010; -static const size_t MAX012 = sizeof(message::SetFlowMode) > MAX011 ? sizeof(message::SetFlowMode) : MAX011; -static const size_t MAX013 = sizeof(message::Flow) > MAX012 ? sizeof(message::Flow) : MAX012; -static const size_t MAX014 = sizeof(message::Flush) > MAX013 ? sizeof(message::Flush) : MAX013; -static const size_t MAX015 = sizeof(message::Stop) > MAX014 ? sizeof(message::Stop) : MAX014; -static const size_t MAX016 = sizeof(tx::Select) > MAX015 ? sizeof(tx::Select) : MAX015; -static const size_t MAX017 = sizeof(tx::Commit) > MAX016 ? sizeof(tx::Commit) : MAX016; -static const size_t MAX018 = sizeof(tx::Rollback) > MAX017 ? sizeof(tx::Rollback) : MAX017; -static const size_t MAX019 = sizeof(dtx::Select) > MAX018 ? sizeof(dtx::Select) : MAX018; -static const size_t MAX020 = sizeof(dtx::Start) > MAX019 ? sizeof(dtx::Start) : MAX019; -static const size_t MAX021 = sizeof(dtx::End) > MAX020 ? sizeof(dtx::End) : MAX020; -static const size_t MAX022 = sizeof(dtx::Commit) > MAX021 ? sizeof(dtx::Commit) : MAX021; -static const size_t MAX023 = sizeof(dtx::Forget) > MAX022 ? sizeof(dtx::Forget) : MAX022; -static const size_t MAX024 = sizeof(dtx::GetTimeout) > MAX023 ? sizeof(dtx::GetTimeout) : MAX023; -static const size_t MAX025 = sizeof(dtx::Prepare) > MAX024 ? sizeof(dtx::Prepare) : MAX024; -static const size_t MAX026 = sizeof(dtx::Recover) > MAX025 ? sizeof(dtx::Recover) : MAX025; -static const size_t MAX027 = sizeof(dtx::Rollback) > MAX026 ? sizeof(dtx::Rollback) : MAX026; -static const size_t MAX028 = sizeof(dtx::SetTimeout) > MAX027 ? sizeof(dtx::SetTimeout) : MAX027; -static const size_t MAX029 = sizeof(exchange::Declare) > MAX028 ? sizeof(exchange::Declare) : MAX028; -static const size_t MAX030 = sizeof(exchange::Delete) > MAX029 ? sizeof(exchange::Delete) : MAX029; -static const size_t MAX031 = sizeof(exchange::Query) > MAX030 ? sizeof(exchange::Query) : MAX030; -static const size_t MAX032 = sizeof(exchange::Bind) > MAX031 ? sizeof(exchange::Bind) : MAX031; -static const size_t MAX033 = sizeof(exchange::Unbind) > MAX032 ? sizeof(exchange::Unbind) : MAX032; -static const size_t MAX034 = sizeof(exchange::Bound) > MAX033 ? sizeof(exchange::Bound) : MAX033; -static const size_t MAX035 = sizeof(queue::Declare) > MAX034 ? sizeof(queue::Declare) : MAX034; -static const size_t MAX036 = sizeof(queue::Delete) > MAX035 ? sizeof(queue::Delete) : MAX035; -static const size_t MAX037 = sizeof(queue::Purge) > MAX036 ? sizeof(queue::Purge) : MAX036; -static const size_t MAX038 = sizeof(queue::Query) > MAX037 ? sizeof(queue::Query) : MAX037; -static const size_t MAX039 = sizeof(file::Qos) > MAX038 ? sizeof(file::Qos) : MAX038; -static const size_t MAX040 = sizeof(file::QosOk) > MAX039 ? sizeof(file::QosOk) : MAX039; -static const size_t MAX041 = sizeof(file::Consume) > MAX040 ? sizeof(file::Consume) : MAX040; -static const size_t MAX042 = sizeof(file::ConsumeOk) > MAX041 ? sizeof(file::ConsumeOk) : MAX041; -static const size_t MAX043 = sizeof(file::Cancel) > MAX042 ? sizeof(file::Cancel) : MAX042; -static const size_t MAX044 = sizeof(file::Open) > MAX043 ? sizeof(file::Open) : MAX043; -static const size_t MAX045 = sizeof(file::OpenOk) > MAX044 ? sizeof(file::OpenOk) : MAX044; -static const size_t MAX046 = sizeof(file::Stage) > MAX045 ? sizeof(file::Stage) : MAX045; -static const size_t MAX047 = sizeof(file::Publish) > MAX046 ? sizeof(file::Publish) : MAX046; -static const size_t MAX048 = sizeof(file::Return) > MAX047 ? sizeof(file::Return) : MAX047; -static const size_t MAX049 = sizeof(file::Deliver) > MAX048 ? sizeof(file::Deliver) : MAX048; -static const size_t MAX050 = sizeof(file::Ack) > MAX049 ? sizeof(file::Ack) : MAX049; -static const size_t MAX051 = sizeof(file::Reject) > MAX050 ? sizeof(file::Reject) : MAX050; -static const size_t MAX052 = sizeof(stream::Qos) > MAX051 ? sizeof(stream::Qos) : MAX051; -static const size_t MAX053 = sizeof(stream::QosOk) > MAX052 ? sizeof(stream::QosOk) : MAX052; -static const size_t MAX054 = sizeof(stream::Consume) > MAX053 ? sizeof(stream::Consume) : MAX053; -static const size_t MAX055 = sizeof(stream::ConsumeOk) > MAX054 ? sizeof(stream::ConsumeOk) : MAX054; -static const size_t MAX056 = sizeof(stream::Cancel) > MAX055 ? sizeof(stream::Cancel) : MAX055; -static const size_t MAX057 = sizeof(stream::Publish) > MAX056 ? sizeof(stream::Publish) : MAX056; -static const size_t MAX058 = sizeof(stream::Return) > MAX057 ? sizeof(stream::Return) : MAX057; -static const size_t MAX059 = sizeof(stream::Deliver) > MAX058 ? sizeof(stream::Deliver) : MAX058; -static const int MAX=MAX059; - -} // namespace command_max - -struct CommandHolder: - public amqp_0_10::Holder -{ - CommandHolder() {} - template explicit CommandHolder(const T& t) : amqp_0_10::Holder(t) {} - using amqp_0_10::Holder::operator=; - void set(uint8_t classCode, uint8_t code); -}; - -std::ostream& operator<<(std::ostream& o, const CommandHolder& h); - -}} // namespace qpid::amqp_0_10 - -#endif /*!QPID_AMQP_0_10_COMMANDHOLDER_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/CommandVisitor.h b/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/CommandVisitor.h deleted file mode 100644 index 16fb750e33..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/CommandVisitor.h +++ /dev/null @@ -1,166 +0,0 @@ -#ifndef QPID_AMQP_0_10_COMMANDVISITOR_H -#define QPID_AMQP_0_10_COMMANDVISITOR_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/amqp_0_10/specification.h" - -namespace qpid { -namespace amqp_0_10 { - -struct CommandVisitor -{ - virtual ~CommandVisitor() {} - typedef Command BaseType; - virtual void visit(execution::Sync&) = 0; - virtual void visit(execution::Result&) = 0; - virtual void visit(execution::Exception&) = 0; - virtual void visit(message::Transfer&) = 0; - virtual void visit(message::Accept&) = 0; - virtual void visit(message::Reject&) = 0; - virtual void visit(message::Release&) = 0; - virtual void visit(message::Acquire&) = 0; - virtual void visit(message::Resume&) = 0; - virtual void visit(message::Subscribe&) = 0; - virtual void visit(message::Cancel&) = 0; - virtual void visit(message::SetFlowMode&) = 0; - virtual void visit(message::Flow&) = 0; - virtual void visit(message::Flush&) = 0; - virtual void visit(message::Stop&) = 0; - virtual void visit(tx::Select&) = 0; - virtual void visit(tx::Commit&) = 0; - virtual void visit(tx::Rollback&) = 0; - virtual void visit(dtx::Select&) = 0; - virtual void visit(dtx::Start&) = 0; - virtual void visit(dtx::End&) = 0; - virtual void visit(dtx::Commit&) = 0; - virtual void visit(dtx::Forget&) = 0; - virtual void visit(dtx::GetTimeout&) = 0; - virtual void visit(dtx::Prepare&) = 0; - virtual void visit(dtx::Recover&) = 0; - virtual void visit(dtx::Rollback&) = 0; - virtual void visit(dtx::SetTimeout&) = 0; - virtual void visit(exchange::Declare&) = 0; - virtual void visit(exchange::Delete&) = 0; - virtual void visit(exchange::Query&) = 0; - virtual void visit(exchange::Bind&) = 0; - virtual void visit(exchange::Unbind&) = 0; - virtual void visit(exchange::Bound&) = 0; - virtual void visit(queue::Declare&) = 0; - virtual void visit(queue::Delete&) = 0; - virtual void visit(queue::Purge&) = 0; - virtual void visit(queue::Query&) = 0; - virtual void visit(file::Qos&) = 0; - virtual void visit(file::QosOk&) = 0; - virtual void visit(file::Consume&) = 0; - virtual void visit(file::ConsumeOk&) = 0; - virtual void visit(file::Cancel&) = 0; - virtual void visit(file::Open&) = 0; - virtual void visit(file::OpenOk&) = 0; - virtual void visit(file::Stage&) = 0; - virtual void visit(file::Publish&) = 0; - virtual void visit(file::Return&) = 0; - virtual void visit(file::Deliver&) = 0; - virtual void visit(file::Ack&) = 0; - virtual void visit(file::Reject&) = 0; - virtual void visit(stream::Qos&) = 0; - virtual void visit(stream::QosOk&) = 0; - virtual void visit(stream::Consume&) = 0; - virtual void visit(stream::ConsumeOk&) = 0; - virtual void visit(stream::Cancel&) = 0; - virtual void visit(stream::Publish&) = 0; - virtual void visit(stream::Return&) = 0; - virtual void visit(stream::Deliver&) = 0; -}; -struct ConstCommandVisitor -{ - virtual ~ConstCommandVisitor() {} - typedef const Command BaseType; - virtual void visit(const execution::Sync&) = 0; - virtual void visit(const execution::Result&) = 0; - virtual void visit(const execution::Exception&) = 0; - virtual void visit(const message::Transfer&) = 0; - virtual void visit(const message::Accept&) = 0; - virtual void visit(const message::Reject&) = 0; - virtual void visit(const message::Release&) = 0; - virtual void visit(const message::Acquire&) = 0; - virtual void visit(const message::Resume&) = 0; - virtual void visit(const message::Subscribe&) = 0; - virtual void visit(const message::Cancel&) = 0; - virtual void visit(const message::SetFlowMode&) = 0; - virtual void visit(const message::Flow&) = 0; - virtual void visit(const message::Flush&) = 0; - virtual void visit(const message::Stop&) = 0; - virtual void visit(const tx::Select&) = 0; - virtual void visit(const tx::Commit&) = 0; - virtual void visit(const tx::Rollback&) = 0; - virtual void visit(const dtx::Select&) = 0; - virtual void visit(const dtx::Start&) = 0; - virtual void visit(const dtx::End&) = 0; - virtual void visit(const dtx::Commit&) = 0; - virtual void visit(const dtx::Forget&) = 0; - virtual void visit(const dtx::GetTimeout&) = 0; - virtual void visit(const dtx::Prepare&) = 0; - virtual void visit(const dtx::Recover&) = 0; - virtual void visit(const dtx::Rollback&) = 0; - virtual void visit(const dtx::SetTimeout&) = 0; - virtual void visit(const exchange::Declare&) = 0; - virtual void visit(const exchange::Delete&) = 0; - virtual void visit(const exchange::Query&) = 0; - virtual void visit(const exchange::Bind&) = 0; - virtual void visit(const exchange::Unbind&) = 0; - virtual void visit(const exchange::Bound&) = 0; - virtual void visit(const queue::Declare&) = 0; - virtual void visit(const queue::Delete&) = 0; - virtual void visit(const queue::Purge&) = 0; - virtual void visit(const queue::Query&) = 0; - virtual void visit(const file::Qos&) = 0; - virtual void visit(const file::QosOk&) = 0; - virtual void visit(const file::Consume&) = 0; - virtual void visit(const file::ConsumeOk&) = 0; - virtual void visit(const file::Cancel&) = 0; - virtual void visit(const file::Open&) = 0; - virtual void visit(const file::OpenOk&) = 0; - virtual void visit(const file::Stage&) = 0; - virtual void visit(const file::Publish&) = 0; - virtual void visit(const file::Return&) = 0; - virtual void visit(const file::Deliver&) = 0; - virtual void visit(const file::Ack&) = 0; - virtual void visit(const file::Reject&) = 0; - virtual void visit(const stream::Qos&) = 0; - virtual void visit(const stream::QosOk&) = 0; - virtual void visit(const stream::Consume&) = 0; - virtual void visit(const stream::ConsumeOk&) = 0; - virtual void visit(const stream::Cancel&) = 0; - virtual void visit(const stream::Publish&) = 0; - virtual void visit(const stream::Return&) = 0; - virtual void visit(const stream::Deliver&) = 0; -}; - -}} // namespace qpid::amqp_0_10 - -#endif /*!QPID_AMQP_0_10_COMMANDVISITOR_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/ControlHolder.h b/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/ControlHolder.h deleted file mode 100644 index 90a15bc1be..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/ControlHolder.h +++ /dev/null @@ -1,122 +0,0 @@ -#ifndef QPID_AMQP_0_10_CONTROLHOLDER_H -#define QPID_AMQP_0_10_CONTROLHOLDER_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/amqp_0_10/ApplyControl.h" -#include "qpid/amqp_0_10/Holder.h" -#include "qpid/amqp_0_10/specification.h" - -namespace qpid { -namespace amqp_0_10 { - - -namespace control_max { - -static const size_t MAX000=0; -static const size_t MAX001 = sizeof(connection::Start) > MAX000 ? sizeof(connection::Start) : MAX000; -static const size_t MAX002 = sizeof(connection::StartOk) > MAX001 ? sizeof(connection::StartOk) : MAX001; -static const size_t MAX003 = sizeof(connection::Secure) > MAX002 ? sizeof(connection::Secure) : MAX002; -static const size_t MAX004 = sizeof(connection::SecureOk) > MAX003 ? sizeof(connection::SecureOk) : MAX003; -static const size_t MAX005 = sizeof(connection::Tune) > MAX004 ? sizeof(connection::Tune) : MAX004; -static const size_t MAX006 = sizeof(connection::TuneOk) > MAX005 ? sizeof(connection::TuneOk) : MAX005; -static const size_t MAX007 = sizeof(connection::Open) > MAX006 ? sizeof(connection::Open) : MAX006; -static const size_t MAX008 = sizeof(connection::OpenOk) > MAX007 ? sizeof(connection::OpenOk) : MAX007; -static const size_t MAX009 = sizeof(connection::Redirect) > MAX008 ? sizeof(connection::Redirect) : MAX008; -static const size_t MAX010 = sizeof(connection::Heartbeat) > MAX009 ? sizeof(connection::Heartbeat) : MAX009; -static const size_t MAX011 = sizeof(connection::Close) > MAX010 ? sizeof(connection::Close) : MAX010; -static const size_t MAX012 = sizeof(connection::CloseOk) > MAX011 ? sizeof(connection::CloseOk) : MAX011; -static const size_t MAX013 = sizeof(session::Attach) > MAX012 ? sizeof(session::Attach) : MAX012; -static const size_t MAX014 = sizeof(session::Attached) > MAX013 ? sizeof(session::Attached) : MAX013; -static const size_t MAX015 = sizeof(session::Detach) > MAX014 ? sizeof(session::Detach) : MAX014; -static const size_t MAX016 = sizeof(session::Detached) > MAX015 ? sizeof(session::Detached) : MAX015; -static const size_t MAX017 = sizeof(session::RequestTimeout) > MAX016 ? sizeof(session::RequestTimeout) : MAX016; -static const size_t MAX018 = sizeof(session::Timeout) > MAX017 ? sizeof(session::Timeout) : MAX017; -static const size_t MAX019 = sizeof(session::CommandPoint) > MAX018 ? sizeof(session::CommandPoint) : MAX018; -static const size_t MAX020 = sizeof(session::Expected) > MAX019 ? sizeof(session::Expected) : MAX019; -static const size_t MAX021 = sizeof(session::Confirmed) > MAX020 ? sizeof(session::Confirmed) : MAX020; -static const size_t MAX022 = sizeof(session::Completed) > MAX021 ? sizeof(session::Completed) : MAX021; -static const size_t MAX023 = sizeof(session::KnownCompleted) > MAX022 ? sizeof(session::KnownCompleted) : MAX022; -static const size_t MAX024 = sizeof(session::Flush) > MAX023 ? sizeof(session::Flush) : MAX023; -static const size_t MAX025 = sizeof(session::Gap) > MAX024 ? sizeof(session::Gap) : MAX024; -static const size_t MAX026 = sizeof(cluster::UpdateRequest) > MAX025 ? sizeof(cluster::UpdateRequest) : MAX025; -static const size_t MAX027 = sizeof(cluster::UpdateOffer) > MAX026 ? sizeof(cluster::UpdateOffer) : MAX026; -static const size_t MAX028 = sizeof(cluster::RetractOffer) > MAX027 ? sizeof(cluster::RetractOffer) : MAX027; -static const size_t MAX029 = sizeof(cluster::InitialStatus) > MAX028 ? sizeof(cluster::InitialStatus) : MAX028; -static const size_t MAX030 = sizeof(cluster::Ready) > MAX029 ? sizeof(cluster::Ready) : MAX029; -static const size_t MAX031 = sizeof(cluster::ConfigChange) > MAX030 ? sizeof(cluster::ConfigChange) : MAX030; -static const size_t MAX032 = sizeof(cluster::MessageExpired) > MAX031 ? sizeof(cluster::MessageExpired) : MAX031; -static const size_t MAX033 = sizeof(cluster::ErrorCheck) > MAX032 ? sizeof(cluster::ErrorCheck) : MAX032; -static const size_t MAX034 = sizeof(cluster::TimerWakeup) > MAX033 ? sizeof(cluster::TimerWakeup) : MAX033; -static const size_t MAX035 = sizeof(cluster::TimerDrop) > MAX034 ? sizeof(cluster::TimerDrop) : MAX034; -static const size_t MAX036 = sizeof(cluster::Shutdown) > MAX035 ? sizeof(cluster::Shutdown) : MAX035; -static const size_t MAX037 = sizeof(cluster::DeliverToQueue) > MAX036 ? sizeof(cluster::DeliverToQueue) : MAX036; -static const size_t MAX038 = sizeof(cluster-connection::Announce) > MAX037 ? sizeof(cluster-connection::Announce) : MAX037; -static const size_t MAX039 = sizeof(cluster-connection::DeliverClose) > MAX038 ? sizeof(cluster-connection::DeliverClose) : MAX038; -static const size_t MAX040 = sizeof(cluster-connection::DeliverDoOutput) > MAX039 ? sizeof(cluster-connection::DeliverDoOutput) : MAX039; -static const size_t MAX041 = sizeof(cluster-connection::Abort) > MAX040 ? sizeof(cluster-connection::Abort) : MAX040; -static const size_t MAX042 = sizeof(cluster-connection::ShadowSetUser) > MAX041 ? sizeof(cluster-connection::ShadowSetUser) : MAX041; -static const size_t MAX043 = sizeof(cluster-connection::ShadowPrepare) > MAX042 ? sizeof(cluster-connection::ShadowPrepare) : MAX042; -static const size_t MAX044 = sizeof(cluster-connection::ConsumerState) > MAX043 ? sizeof(cluster-connection::ConsumerState) : MAX043; -static const size_t MAX045 = sizeof(cluster-connection::DeliveryRecord) > MAX044 ? sizeof(cluster-connection::DeliveryRecord) : MAX044; -static const size_t MAX046 = sizeof(cluster-connection::TxStart) > MAX045 ? sizeof(cluster-connection::TxStart) : MAX045; -static const size_t MAX047 = sizeof(cluster-connection::TxAccept) > MAX046 ? sizeof(cluster-connection::TxAccept) : MAX046; -static const size_t MAX048 = sizeof(cluster-connection::TxDequeue) > MAX047 ? sizeof(cluster-connection::TxDequeue) : MAX047; -static const size_t MAX049 = sizeof(cluster-connection::TxEnqueue) > MAX048 ? sizeof(cluster-connection::TxEnqueue) : MAX048; -static const size_t MAX050 = sizeof(cluster-connection::TxPublish) > MAX049 ? sizeof(cluster-connection::TxPublish) : MAX049; -static const size_t MAX051 = sizeof(cluster-connection::TxEnd) > MAX050 ? sizeof(cluster-connection::TxEnd) : MAX050; -static const size_t MAX052 = sizeof(cluster-connection::AccumulatedAck) > MAX051 ? sizeof(cluster-connection::AccumulatedAck) : MAX051; -static const size_t MAX053 = sizeof(cluster-connection::OutputTask) > MAX052 ? sizeof(cluster-connection::OutputTask) : MAX052; -static const size_t MAX054 = sizeof(cluster-connection::SessionState) > MAX053 ? sizeof(cluster-connection::SessionState) : MAX053; -static const size_t MAX055 = sizeof(cluster-connection::ShadowReady) > MAX054 ? sizeof(cluster-connection::ShadowReady) : MAX054; -static const size_t MAX056 = sizeof(cluster-connection::Membership) > MAX055 ? sizeof(cluster-connection::Membership) : MAX055; -static const size_t MAX057 = sizeof(cluster-connection::RetractOffer) > MAX056 ? sizeof(cluster-connection::RetractOffer) : MAX056; -static const size_t MAX058 = sizeof(cluster-connection::QueuePosition) > MAX057 ? sizeof(cluster-connection::QueuePosition) : MAX057; -static const size_t MAX059 = sizeof(cluster-connection::Exchange) > MAX058 ? sizeof(cluster-connection::Exchange) : MAX058; -static const size_t MAX060 = sizeof(cluster-connection::Queue) > MAX059 ? sizeof(cluster-connection::Queue) : MAX059; -static const size_t MAX061 = sizeof(cluster-connection::ExpiryId) > MAX060 ? sizeof(cluster-connection::ExpiryId) : MAX060; -static const size_t MAX062 = sizeof(cluster-connection::AddQueueListener) > MAX061 ? sizeof(cluster-connection::AddQueueListener) : MAX061; -static const size_t MAX063 = sizeof(cluster-connection::ManagementSetupState) > MAX062 ? sizeof(cluster-connection::ManagementSetupState) : MAX062; -static const size_t MAX064 = sizeof(cluster-connection::Config) > MAX063 ? sizeof(cluster-connection::Config) : MAX063; -static const int MAX=MAX064; - -} // namespace control_max - -struct ControlHolder: - public amqp_0_10::Holder -{ - ControlHolder() {} - template explicit ControlHolder(const T& t) : amqp_0_10::Holder(t) {} - using amqp_0_10::Holder::operator=; - void set(uint8_t classCode, uint8_t code); -}; - -std::ostream& operator<<(std::ostream& o, const ControlHolder& h); - -}} // namespace qpid::amqp_0_10 - -#endif /*!QPID_AMQP_0_10_CONTROLHOLDER_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/ControlVisitor.h b/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/ControlVisitor.h deleted file mode 100644 index 3d8a804be0..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/ControlVisitor.h +++ /dev/null @@ -1,176 +0,0 @@ -#ifndef QPID_AMQP_0_10_CONTROLVISITOR_H -#define QPID_AMQP_0_10_CONTROLVISITOR_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/amqp_0_10/specification.h" - -namespace qpid { -namespace amqp_0_10 { - -struct ControlVisitor -{ - virtual ~ControlVisitor() {} - typedef Control BaseType; - virtual void visit(connection::Start&) = 0; - virtual void visit(connection::StartOk&) = 0; - virtual void visit(connection::Secure&) = 0; - virtual void visit(connection::SecureOk&) = 0; - virtual void visit(connection::Tune&) = 0; - virtual void visit(connection::TuneOk&) = 0; - virtual void visit(connection::Open&) = 0; - virtual void visit(connection::OpenOk&) = 0; - virtual void visit(connection::Redirect&) = 0; - virtual void visit(connection::Heartbeat&) = 0; - virtual void visit(connection::Close&) = 0; - virtual void visit(connection::CloseOk&) = 0; - virtual void visit(session::Attach&) = 0; - virtual void visit(session::Attached&) = 0; - virtual void visit(session::Detach&) = 0; - virtual void visit(session::Detached&) = 0; - virtual void visit(session::RequestTimeout&) = 0; - virtual void visit(session::Timeout&) = 0; - virtual void visit(session::CommandPoint&) = 0; - virtual void visit(session::Expected&) = 0; - virtual void visit(session::Confirmed&) = 0; - virtual void visit(session::Completed&) = 0; - virtual void visit(session::KnownCompleted&) = 0; - virtual void visit(session::Flush&) = 0; - virtual void visit(session::Gap&) = 0; - virtual void visit(cluster::UpdateRequest&) = 0; - virtual void visit(cluster::UpdateOffer&) = 0; - virtual void visit(cluster::RetractOffer&) = 0; - virtual void visit(cluster::InitialStatus&) = 0; - virtual void visit(cluster::Ready&) = 0; - virtual void visit(cluster::ConfigChange&) = 0; - virtual void visit(cluster::MessageExpired&) = 0; - virtual void visit(cluster::ErrorCheck&) = 0; - virtual void visit(cluster::TimerWakeup&) = 0; - virtual void visit(cluster::TimerDrop&) = 0; - virtual void visit(cluster::Shutdown&) = 0; - virtual void visit(cluster::DeliverToQueue&) = 0; - virtual void visit(cluster-connection::Announce&) = 0; - virtual void visit(cluster-connection::DeliverClose&) = 0; - virtual void visit(cluster-connection::DeliverDoOutput&) = 0; - virtual void visit(cluster-connection::Abort&) = 0; - virtual void visit(cluster-connection::ShadowSetUser&) = 0; - virtual void visit(cluster-connection::ShadowPrepare&) = 0; - virtual void visit(cluster-connection::ConsumerState&) = 0; - virtual void visit(cluster-connection::DeliveryRecord&) = 0; - virtual void visit(cluster-connection::TxStart&) = 0; - virtual void visit(cluster-connection::TxAccept&) = 0; - virtual void visit(cluster-connection::TxDequeue&) = 0; - virtual void visit(cluster-connection::TxEnqueue&) = 0; - virtual void visit(cluster-connection::TxPublish&) = 0; - virtual void visit(cluster-connection::TxEnd&) = 0; - virtual void visit(cluster-connection::AccumulatedAck&) = 0; - virtual void visit(cluster-connection::OutputTask&) = 0; - virtual void visit(cluster-connection::SessionState&) = 0; - virtual void visit(cluster-connection::ShadowReady&) = 0; - virtual void visit(cluster-connection::Membership&) = 0; - virtual void visit(cluster-connection::RetractOffer&) = 0; - virtual void visit(cluster-connection::QueuePosition&) = 0; - virtual void visit(cluster-connection::Exchange&) = 0; - virtual void visit(cluster-connection::Queue&) = 0; - virtual void visit(cluster-connection::ExpiryId&) = 0; - virtual void visit(cluster-connection::AddQueueListener&) = 0; - virtual void visit(cluster-connection::ManagementSetupState&) = 0; - virtual void visit(cluster-connection::Config&) = 0; -}; -struct ConstControlVisitor -{ - virtual ~ConstControlVisitor() {} - typedef const Control BaseType; - virtual void visit(const connection::Start&) = 0; - virtual void visit(const connection::StartOk&) = 0; - virtual void visit(const connection::Secure&) = 0; - virtual void visit(const connection::SecureOk&) = 0; - virtual void visit(const connection::Tune&) = 0; - virtual void visit(const connection::TuneOk&) = 0; - virtual void visit(const connection::Open&) = 0; - virtual void visit(const connection::OpenOk&) = 0; - virtual void visit(const connection::Redirect&) = 0; - virtual void visit(const connection::Heartbeat&) = 0; - virtual void visit(const connection::Close&) = 0; - virtual void visit(const connection::CloseOk&) = 0; - virtual void visit(const session::Attach&) = 0; - virtual void visit(const session::Attached&) = 0; - virtual void visit(const session::Detach&) = 0; - virtual void visit(const session::Detached&) = 0; - virtual void visit(const session::RequestTimeout&) = 0; - virtual void visit(const session::Timeout&) = 0; - virtual void visit(const session::CommandPoint&) = 0; - virtual void visit(const session::Expected&) = 0; - virtual void visit(const session::Confirmed&) = 0; - virtual void visit(const session::Completed&) = 0; - virtual void visit(const session::KnownCompleted&) = 0; - virtual void visit(const session::Flush&) = 0; - virtual void visit(const session::Gap&) = 0; - virtual void visit(const cluster::UpdateRequest&) = 0; - virtual void visit(const cluster::UpdateOffer&) = 0; - virtual void visit(const cluster::RetractOffer&) = 0; - virtual void visit(const cluster::InitialStatus&) = 0; - virtual void visit(const cluster::Ready&) = 0; - virtual void visit(const cluster::ConfigChange&) = 0; - virtual void visit(const cluster::MessageExpired&) = 0; - virtual void visit(const cluster::ErrorCheck&) = 0; - virtual void visit(const cluster::TimerWakeup&) = 0; - virtual void visit(const cluster::TimerDrop&) = 0; - virtual void visit(const cluster::Shutdown&) = 0; - virtual void visit(const cluster::DeliverToQueue&) = 0; - virtual void visit(const cluster-connection::Announce&) = 0; - virtual void visit(const cluster-connection::DeliverClose&) = 0; - virtual void visit(const cluster-connection::DeliverDoOutput&) = 0; - virtual void visit(const cluster-connection::Abort&) = 0; - virtual void visit(const cluster-connection::ShadowSetUser&) = 0; - virtual void visit(const cluster-connection::ShadowPrepare&) = 0; - virtual void visit(const cluster-connection::ConsumerState&) = 0; - virtual void visit(const cluster-connection::DeliveryRecord&) = 0; - virtual void visit(const cluster-connection::TxStart&) = 0; - virtual void visit(const cluster-connection::TxAccept&) = 0; - virtual void visit(const cluster-connection::TxDequeue&) = 0; - virtual void visit(const cluster-connection::TxEnqueue&) = 0; - virtual void visit(const cluster-connection::TxPublish&) = 0; - virtual void visit(const cluster-connection::TxEnd&) = 0; - virtual void visit(const cluster-connection::AccumulatedAck&) = 0; - virtual void visit(const cluster-connection::OutputTask&) = 0; - virtual void visit(const cluster-connection::SessionState&) = 0; - virtual void visit(const cluster-connection::ShadowReady&) = 0; - virtual void visit(const cluster-connection::Membership&) = 0; - virtual void visit(const cluster-connection::RetractOffer&) = 0; - virtual void visit(const cluster-connection::QueuePosition&) = 0; - virtual void visit(const cluster-connection::Exchange&) = 0; - virtual void visit(const cluster-connection::Queue&) = 0; - virtual void visit(const cluster-connection::ExpiryId&) = 0; - virtual void visit(const cluster-connection::AddQueueListener&) = 0; - virtual void visit(const cluster-connection::ManagementSetupState&) = 0; - virtual void visit(const cluster-connection::Config&) = 0; -}; - -}} // namespace qpid::amqp_0_10 - -#endif /*!QPID_AMQP_0_10_CONTROLVISITOR_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/ProxyTemplate.h b/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/ProxyTemplate.h deleted file mode 100644 index 26479e3285..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/ProxyTemplate.h +++ /dev/null @@ -1,1195 +0,0 @@ -#ifndef QPID_AMQP_0_10_PROXYTEMPLATE_H -#define QPID_AMQP_0_10_PROXYTEMPLATE_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/amqp_0_10/specification.h" - -namespace qpid { -namespace amqp_0_10 { - -template -class ProxyTemplate -{ - public: - ProxyTemplate(F f=F()) : functor(f) {} - - - R connectionStart( - const Map& serverProperties_, - const Str16Array& mechanisms_, - const Str16Array& locales_ - ) - { - connection::Start start(serverProperties_, mechanisms_, locales_); - return functor(start); - } - - - R connectionStartOk( - const Map& clientProperties_, - const Str8& mechanism_, - const Vbin32& response_, - const Str8& locale_ - ) - { - connection::StartOk startOk(clientProperties_, mechanism_, response_, locale_); - return functor(startOk); - } - - - R connectionSecure(const Vbin32& challenge_) - { - connection::Secure secure(challenge_); - return functor(secure); - } - - - R connectionSecureOk(const Vbin32& response_) - { - connection::SecureOk secureOk(response_); - return functor(secureOk); - } - - - R connectionTune( - Uint16 channelMax_, - Uint16 maxFrameSize_, - Uint16 heartbeatMin_, - Uint16 heartbeatMax_ - ) - { - connection::Tune tune(channelMax_, maxFrameSize_, heartbeatMin_, heartbeatMax_); - return functor(tune); - } - - - R connectionTuneOk( - Uint16 channelMax_, - Uint16 maxFrameSize_, - Uint16 heartbeat_ - ) - { - connection::TuneOk tuneOk(channelMax_, maxFrameSize_, heartbeat_); - return functor(tuneOk); - } - - - R connectionOpen( - const Str8& virtualHost_, - const Str16Array& capabilities_, - Bit insist_ - ) - { - connection::Open open(virtualHost_, capabilities_, insist_); - return functor(open); - } - - - R connectionOpenOk(const connection::AmqpHostArray& knownHosts_) - { - connection::OpenOk openOk(knownHosts_); - return functor(openOk); - } - - - R connectionRedirect( - const connection::AmqpHostUrl& host_, - const connection::AmqpHostArray& knownHosts_ - ) - { - connection::Redirect redirect(host_, knownHosts_); - return functor(redirect); - } - - - R connectionHeartbeat() - { - connection::Heartbeat heartbeat; - return functor(heartbeat); - } - - - R connectionClose( - const connection::CloseCode& replyCode_, - const Str8& replyText_ - ) - { - connection::Close close(replyCode_, replyText_); - return functor(close); - } - - - R connectionCloseOk() - { - connection::CloseOk closeOk; - return functor(closeOk); - } - - - R sessionAttach( - const session::Name& name_, - Bit force_ - ) - { - session::Attach attach(name_, force_); - return functor(attach); - } - - - R sessionAttached(const session::Name& name_) - { - session::Attached attached(name_); - return functor(attached); - } - - - R sessionDetach(const session::Name& name_) - { - session::Detach detach(name_); - return functor(detach); - } - - - R sessionDetached( - const session::Name& name_, - const session::DetachCode& code_ - ) - { - session::Detached detached(name_, code_); - return functor(detached); - } - - - R sessionRequestTimeout(Uint32 timeout_) - { - session::RequestTimeout requestTimeout(timeout_); - return functor(requestTimeout); - } - - - R sessionTimeout(Uint32 timeout_) - { - session::Timeout timeout(timeout_); - return functor(timeout); - } - - - R sessionCommandPoint( - const SequenceNo& commandId_, - Uint64 commandOffset_ - ) - { - session::CommandPoint commandPoint(commandId_, commandOffset_); - return functor(commandPoint); - } - - - R sessionExpected( - const session::Commands& commands_, - const session::CommandFragments& fragments_ - ) - { - session::Expected expected(commands_, fragments_); - return functor(expected); - } - - - R sessionConfirmed( - const session::Commands& commands_, - const session::CommandFragments& fragments_ - ) - { - session::Confirmed confirmed(commands_, fragments_); - return functor(confirmed); - } - - - R sessionCompleted( - const session::Commands& commands_, - Bit timelyReply_ - ) - { - session::Completed completed(commands_, timelyReply_); - return functor(completed); - } - - - R sessionKnownCompleted(const session::Commands& commands_) - { - session::KnownCompleted knownCompleted(commands_); - return functor(knownCompleted); - } - - - R sessionFlush( - Bit expected_, - Bit confirmed_, - Bit completed_ - ) - { - session::Flush flush(expected_, confirmed_, completed_); - return functor(flush); - } - - - R sessionGap(const session::Commands& commands_) - { - session::Gap gap(commands_); - return functor(gap); - } - - - R executionSync() - { - execution::Sync sync; - return functor(sync); - } - - - R executionResult( - const SequenceNo& commandId_, - const Struct32& value_ - ) - { - execution::Result result(commandId_, value_); - return functor(result); - } - - - R executionException( - const execution::ErrorCode& errorCode_, - const SequenceNo& commandId_, - Uint8 classCode_, - Uint8 commandCode_, - Uint8 fieldIndex_, - const Str16& description_, - const Map& errorInfo_ - ) - { - execution::Exception exception(errorCode_, commandId_, classCode_, commandCode_, fieldIndex_, description_, errorInfo_); - return functor(exception); - } - - - R messageTransfer( - const message::Destination& destination_, - const message::AcceptMode& acceptMode_, - const message::AcquireMode& acquireMode_ - ) - { - message::Transfer transfer(destination_, acceptMode_, acquireMode_); - return functor(transfer); - } - - - R messageAccept(const session::Commands& transfers_) - { - message::Accept accept(transfers_); - return functor(accept); - } - - - R messageReject( - const session::Commands& transfers_, - const message::RejectCode& code_, - const Str8& text_ - ) - { - message::Reject reject(transfers_, code_, text_); - return functor(reject); - } - - - R messageRelease( - const session::Commands& transfers_, - Bit setRedelivered_ - ) - { - message::Release release(transfers_, setRedelivered_); - return functor(release); - } - - - R messageAcquire(const session::Commands& transfers_) - { - message::Acquire acquire(transfers_); - return functor(acquire); - } - - - R messageResume( - const message::Destination& destination_, - const message::ResumeId& resumeId_ - ) - { - message::Resume resume(destination_, resumeId_); - return functor(resume); - } - - - R messageSubscribe( - const queue::Name& queue_, - const message::Destination& destination_, - const message::AcceptMode& acceptMode_, - const message::AcquireMode& acquireMode_, - Bit exclusive_, - const message::ResumeId& resumeId_, - Uint64 resumeTtl_, - const Map& arguments_ - ) - { - message::Subscribe subscribe(queue_, destination_, acceptMode_, acquireMode_, exclusive_, resumeId_, resumeTtl_, arguments_); - return functor(subscribe); - } - - - R messageCancel(const message::Destination& destination_) - { - message::Cancel cancel(destination_); - return functor(cancel); - } - - - R messageSetFlowMode( - const message::Destination& destination_, - const message::FlowMode& flowMode_ - ) - { - message::SetFlowMode setFlowMode(destination_, flowMode_); - return functor(setFlowMode); - } - - - R messageFlow( - const message::Destination& destination_, - const message::CreditUnit& unit_, - Uint32 value_ - ) - { - message::Flow flow(destination_, unit_, value_); - return functor(flow); - } - - - R messageFlush(const message::Destination& destination_) - { - message::Flush flush(destination_); - return functor(flush); - } - - - R messageStop(const message::Destination& destination_) - { - message::Stop stop(destination_); - return functor(stop); - } - - - R txSelect() - { - tx::Select select; - return functor(select); - } - - - R txCommit() - { - tx::Commit commit; - return functor(commit); - } - - - R txRollback() - { - tx::Rollback rollback; - return functor(rollback); - } - - - R dtxSelect() - { - dtx::Select select; - return functor(select); - } - - - R dtxStart( - const dtx::Xid& xid_, - Bit join_, - Bit resume_ - ) - { - dtx::Start start(xid_, join_, resume_); - return functor(start); - } - - - R dtxEnd( - const dtx::Xid& xid_, - Bit fail_, - Bit suspend_ - ) - { - dtx::End end(xid_, fail_, suspend_); - return functor(end); - } - - - R dtxCommit( - const dtx::Xid& xid_, - Bit onePhase_ - ) - { - dtx::Commit commit(xid_, onePhase_); - return functor(commit); - } - - - R dtxForget(const dtx::Xid& xid_) - { - dtx::Forget forget(xid_); - return functor(forget); - } - - - R dtxGetTimeout(const dtx::Xid& xid_) - { - dtx::GetTimeout getTimeout(xid_); - return functor(getTimeout); - } - - - R dtxPrepare(const dtx::Xid& xid_) - { - dtx::Prepare prepare(xid_); - return functor(prepare); - } - - - R dtxRecover() - { - dtx::Recover recover; - return functor(recover); - } - - - R dtxRollback(const dtx::Xid& xid_) - { - dtx::Rollback rollback(xid_); - return functor(rollback); - } - - - R dtxSetTimeout( - const dtx::Xid& xid_, - Uint32 timeout_ - ) - { - dtx::SetTimeout setTimeout(xid_, timeout_); - return functor(setTimeout); - } - - - R exchangeDeclare( - const exchange::Name& exchange_, - const Str8& type_, - const exchange::Name& alternateExchange_, - Bit passive_, - Bit durable_, - Bit autoDelete_, - const Map& arguments_ - ) - { - exchange::Declare declare(exchange_, type_, alternateExchange_, passive_, durable_, autoDelete_, arguments_); - return functor(declare); - } - - - R exchangeDelete( - const exchange::Name& exchange_, - Bit ifUnused_ - ) - { - exchange::Delete delete_(exchange_, ifUnused_); - return functor(delete_); - } - - - R exchangeQuery(const Str8& name_) - { - exchange::Query query(name_); - return functor(query); - } - - - R exchangeBind( - const queue::Name& queue_, - const exchange::Name& exchange_, - const Str8& bindingKey_, - const Map& arguments_ - ) - { - exchange::Bind bind(queue_, exchange_, bindingKey_, arguments_); - return functor(bind); - } - - - R exchangeUnbind( - const queue::Name& queue_, - const exchange::Name& exchange_, - const Str8& bindingKey_ - ) - { - exchange::Unbind unbind(queue_, exchange_, bindingKey_); - return functor(unbind); - } - - - R exchangeBound( - const Str8& exchange_, - const Str8& queue_, - const Str8& bindingKey_, - const Map& arguments_ - ) - { - exchange::Bound bound(exchange_, queue_, bindingKey_, arguments_); - return functor(bound); - } - - - R queueDeclare( - const queue::Name& queue_, - const exchange::Name& alternateExchange_, - Bit passive_, - Bit durable_, - Bit exclusive_, - Bit autoDelete_, - const Map& arguments_ - ) - { - queue::Declare declare(queue_, alternateExchange_, passive_, durable_, exclusive_, autoDelete_, arguments_); - return functor(declare); - } - - - R queueDelete( - const queue::Name& queue_, - Bit ifUnused_, - Bit ifEmpty_ - ) - { - queue::Delete delete_(queue_, ifUnused_, ifEmpty_); - return functor(delete_); - } - - - R queuePurge(const queue::Name& queue_) - { - queue::Purge purge(queue_); - return functor(purge); - } - - - R queueQuery(const queue::Name& queue_) - { - queue::Query query(queue_); - return functor(query); - } - - - R fileQos( - Uint32 prefetchSize_, - Uint16 prefetchCount_, - Bit global_ - ) - { - file::Qos qos(prefetchSize_, prefetchCount_, global_); - return functor(qos); - } - - - R fileQosOk() - { - file::QosOk qosOk; - return functor(qosOk); - } - - - R fileConsume( - const queue::Name& queue_, - const Str8& consumerTag_, - Bit noLocal_, - Bit noAck_, - Bit exclusive_, - Bit nowait_, - const Map& arguments_ - ) - { - file::Consume consume(queue_, consumerTag_, noLocal_, noAck_, exclusive_, nowait_, arguments_); - return functor(consume); - } - - - R fileConsumeOk(const Str8& consumerTag_) - { - file::ConsumeOk consumeOk(consumerTag_); - return functor(consumeOk); - } - - - R fileCancel(const Str8& consumerTag_) - { - file::Cancel cancel(consumerTag_); - return functor(cancel); - } - - - R fileOpen( - const Str8& identifier_, - Uint64 contentSize_ - ) - { - file::Open open(identifier_, contentSize_); - return functor(open); - } - - - R fileOpenOk(Uint64 stagedSize_) - { - file::OpenOk openOk(stagedSize_); - return functor(openOk); - } - - - R fileStage() - { - file::Stage stage; - return functor(stage); - } - - - R filePublish( - const exchange::Name& exchange_, - const Str8& routingKey_, - Bit mandatory_, - Bit immediate_, - const Str8& identifier_ - ) - { - file::Publish publish(exchange_, routingKey_, mandatory_, immediate_, identifier_); - return functor(publish); - } - - - R fileReturn( - const file::ReturnCode& replyCode_, - const Str8& replyText_, - const exchange::Name& exchange_, - const Str8& routingKey_ - ) - { - file::Return return_(replyCode_, replyText_, exchange_, routingKey_); - return functor(return_); - } - - - R fileDeliver( - const Str8& consumerTag_, - Uint64 deliveryTag_, - Bit redelivered_, - const exchange::Name& exchange_, - const Str8& routingKey_, - const Str8& identifier_ - ) - { - file::Deliver deliver(consumerTag_, deliveryTag_, redelivered_, exchange_, routingKey_, identifier_); - return functor(deliver); - } - - - R fileAck( - Uint64 deliveryTag_, - Bit multiple_ - ) - { - file::Ack ack(deliveryTag_, multiple_); - return functor(ack); - } - - - R fileReject( - Uint64 deliveryTag_, - Bit requeue_ - ) - { - file::Reject reject(deliveryTag_, requeue_); - return functor(reject); - } - - - R streamQos( - Uint32 prefetchSize_, - Uint16 prefetchCount_, - Uint32 consumeRate_, - Bit global_ - ) - { - stream::Qos qos(prefetchSize_, prefetchCount_, consumeRate_, global_); - return functor(qos); - } - - - R streamQosOk() - { - stream::QosOk qosOk; - return functor(qosOk); - } - - - R streamConsume( - const queue::Name& queue_, - const Str8& consumerTag_, - Bit noLocal_, - Bit exclusive_, - Bit nowait_, - const Map& arguments_ - ) - { - stream::Consume consume(queue_, consumerTag_, noLocal_, exclusive_, nowait_, arguments_); - return functor(consume); - } - - - R streamConsumeOk(const Str8& consumerTag_) - { - stream::ConsumeOk consumeOk(consumerTag_); - return functor(consumeOk); - } - - - R streamCancel(const Str8& consumerTag_) - { - stream::Cancel cancel(consumerTag_); - return functor(cancel); - } - - - R streamPublish( - const exchange::Name& exchange_, - const Str8& routingKey_, - Bit mandatory_, - Bit immediate_ - ) - { - stream::Publish publish(exchange_, routingKey_, mandatory_, immediate_); - return functor(publish); - } - - - R streamReturn( - const stream::ReturnCode& replyCode_, - const Str8& replyText_, - const exchange::Name& exchange_, - const Str8& routingKey_ - ) - { - stream::Return return_(replyCode_, replyText_, exchange_, routingKey_); - return functor(return_); - } - - - R streamDeliver( - const Str8& consumerTag_, - Uint64 deliveryTag_, - const exchange::Name& exchange_, - const queue::Name& queue_ - ) - { - stream::Deliver deliver(consumerTag_, deliveryTag_, exchange_, queue_); - return functor(deliver); - } - - - R clusterUpdateRequest(const Str16& url_) - { - cluster::UpdateRequest updateRequest(url_); - return functor(updateRequest); - } - - - R clusterUpdateOffer(Uint64 updatee_) - { - cluster::UpdateOffer updateOffer(updatee_); - return functor(updateOffer); - } - - - R clusterRetractOffer(Uint64 updatee_) - { - cluster::RetractOffer retractOffer(updatee_); - return functor(retractOffer); - } - - - R clusterInitialStatus( - Uint32 version_, - Bit active_, - const Uuid& clusterId_, - const cluster::StoreState& storeState_, - const Uuid& shutdownId_, - const Str16& firstConfig_ - ) - { - cluster::InitialStatus initialStatus(version_, active_, clusterId_, storeState_, shutdownId_, firstConfig_); - return functor(initialStatus); - } - - - R clusterReady(const Str16& url_) - { - cluster::Ready ready(url_); - return functor(ready); - } - - - R clusterConfigChange( - const Vbin16& members_, - const Vbin16& joined_, - const Vbin16& left_ - ) - { - cluster::ConfigChange configChange(members_, joined_, left_); - return functor(configChange); - } - - - R clusterMessageExpired(Uint64 id_) - { - cluster::MessageExpired messageExpired(id_); - return functor(messageExpired); - } - - - R clusterErrorCheck( - const cluster::ErrorType& type_, - const SequenceNo& frameSeq_ - ) - { - cluster::ErrorCheck errorCheck(type_, frameSeq_); - return functor(errorCheck); - } - - - R clusterTimerWakeup(const Str16& name_) - { - cluster::TimerWakeup timerWakeup(name_); - return functor(timerWakeup); - } - - - R clusterTimerDrop(const Str16& name_) - { - cluster::TimerDrop timerDrop(name_); - return functor(timerDrop); - } - - - R clusterShutdown(const Uuid& shutdownId_) - { - cluster::Shutdown shutdown(shutdownId_); - return functor(shutdown); - } - - - R clusterDeliverToQueue( - const Str16& queue_, - const Vbin32& message_ - ) - { - cluster::DeliverToQueue deliverToQueue(queue_, message_); - return functor(deliverToQueue); - } - - - R clusterConnectionAnnounce( - const Str16& managementId_, - Uint32 ssf_, - const Str16& authid_, - Bit nodict_, - const Str32& username_, - const Str32& initialFrames_ - ) - { - cluster-connection::Announce announce(managementId_, ssf_, authid_, nodict_, username_, initialFrames_); - return functor(announce); - } - - - R clusterConnectionDeliverClose() - { - cluster-connection::DeliverClose deliverClose; - return functor(deliverClose); - } - - - R clusterConnectionDeliverDoOutput(Uint32 limit_) - { - cluster-connection::DeliverDoOutput deliverDoOutput(limit_); - return functor(deliverDoOutput); - } - - - R clusterConnectionAbort() - { - cluster-connection::Abort abort; - return functor(abort); - } - - - R clusterConnectionShadowSetUser(const Str16& userId_) - { - cluster-connection::ShadowSetUser shadowSetUser(userId_); - return functor(shadowSetUser); - } - - - R clusterConnectionShadowPrepare(const Str16& managementId_) - { - cluster-connection::ShadowPrepare shadowPrepare(managementId_); - return functor(shadowPrepare); - } - - - R clusterConnectionConsumerState( - const Str8& name_, - Bit blocked_, - Bit notifyEnabled_, - const SequenceNo& position_ - ) - { - cluster-connection::ConsumerState consumerState(name_, blocked_, notifyEnabled_, position_); - return functor(consumerState); - } - - - R clusterConnectionDeliveryRecord( - const Str8& queue_, - const SequenceNo& position_, - const Str8& tag_, - const SequenceNo& id_, - Bit acquired_, - Bit accepted_, - Bit cancelled_, - Bit completed_, - Bit ended_, - Bit windowing_, - Bit enqueued_, - Uint32 credit_ - ) - { - cluster-connection::DeliveryRecord deliveryRecord(queue_, position_, tag_, id_, acquired_, accepted_, cancelled_, completed_, ended_, windowing_, enqueued_, credit_); - return functor(deliveryRecord); - } - - - R clusterConnectionTxStart() - { - cluster-connection::TxStart txStart; - return functor(txStart); - } - - - R clusterConnectionTxAccept(const SequenceSet& commands_) - { - cluster-connection::TxAccept txAccept(commands_); - return functor(txAccept); - } - - - R clusterConnectionTxDequeue(const Str8& queue_) - { - cluster-connection::TxDequeue txDequeue(queue_); - return functor(txDequeue); - } - - - R clusterConnectionTxEnqueue(const Str8& queue_) - { - cluster-connection::TxEnqueue txEnqueue(queue_); - return functor(txEnqueue); - } - - - R clusterConnectionTxPublish( - const ArrayDomain & queues_, - Bit delivered_ - ) - { - cluster-connection::TxPublish txPublish(queues_, delivered_); - return functor(txPublish); - } - - - R clusterConnectionTxEnd() - { - cluster-connection::TxEnd txEnd; - return functor(txEnd); - } - - - R clusterConnectionAccumulatedAck(const SequenceSet& commands_) - { - cluster-connection::AccumulatedAck accumulatedAck(commands_); - return functor(accumulatedAck); - } - - - R clusterConnectionOutputTask( - Uint16 channel_, - const Str8& name_ - ) - { - cluster-connection::OutputTask outputTask(channel_, name_); - return functor(outputTask); - } - - - R clusterConnectionSessionState( - const SequenceNo& replayStart_, - const SequenceNo& commandPoint_, - const SequenceSet& sentIncomplete_, - const SequenceNo& expected_, - const SequenceNo& received_, - const SequenceSet& unknownCompleted_, - const SequenceSet& receivedIncomplete_ - ) - { - cluster-connection::SessionState sessionState(replayStart_, commandPoint_, sentIncomplete_, expected_, received_, unknownCompleted_, receivedIncomplete_); - return functor(sessionState); - } - - - R clusterConnectionShadowReady( - Uint64 memberId_, - Uint64 connectionId_, - const Str16& managementId_, - const Str8& userName_, - const Str32& fragment_, - Uint32 sendMax_ - ) - { - cluster-connection::ShadowReady shadowReady(memberId_, connectionId_, managementId_, userName_, fragment_, sendMax_); - return functor(shadowReady); - } - - - R clusterConnectionMembership( - const Map& joiners_, - const Map& members_, - const SequenceNo& frameSeq_ - ) - { - cluster-connection::Membership membership(joiners_, members_, frameSeq_); - return functor(membership); - } - - - R clusterConnectionRetractOffer() - { - cluster-connection::RetractOffer retractOffer; - return functor(retractOffer); - } - - - R clusterConnectionQueuePosition( - const Str8& queue_, - const SequenceNo& position_ - ) - { - cluster-connection::QueuePosition queuePosition(queue_, position_); - return functor(queuePosition); - } - - - R clusterConnectionExchange(const Str32& encoded_) - { - cluster-connection::Exchange exchange(encoded_); - return functor(exchange); - } - - - R clusterConnectionQueue(const Str32& encoded_) - { - cluster-connection::Queue queue(encoded_); - return functor(queue); - } - - - R clusterConnectionExpiryId(Uint64 expiryId_) - { - cluster-connection::ExpiryId expiryId(expiryId_); - return functor(expiryId); - } - - - R clusterConnectionAddQueueListener( - const Str8& queue_, - Uint32 consumer_ - ) - { - cluster-connection::AddQueueListener addQueueListener(queue_, consumer_); - return functor(addQueueListener); - } - - - R clusterConnectionManagementSetupState( - Uint64 objectNum_, - Uint16 bootSequence_, - const Uuid& brokerId_, - const Str32& vendor_, - const Str32& product_, - const Str32& instance_ - ) - { - cluster-connection::ManagementSetupState managementSetupState(objectNum_, bootSequence_, brokerId_, vendor_, product_, instance_); - return functor(managementSetupState); - } - - - R clusterConnectionConfig(const Str32& encoded_) - { - cluster-connection::Config config(encoded_); - return functor(config); - } - private: - F functor; -}; - -}} // namespace qpid::amqp_0_10 - -#endif /*!QPID_AMQP_0_10_PROXYTEMPLATE_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/StructHolder.h b/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/StructHolder.h deleted file mode 100644 index cd74ab375b..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/StructHolder.h +++ /dev/null @@ -1,73 +0,0 @@ -#ifndef QPID_AMQP_0_10_STRUCTHOLDER_H -#define QPID_AMQP_0_10_STRUCTHOLDER_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/amqp_0_10/ApplyStruct.h" -#include "qpid/amqp_0_10/Holder.h" -#include "qpid/amqp_0_10/structs.h" - -namespace qpid { -namespace amqp_0_10 { - - -namespace struct_max { - -static const size_t MAX000=0; -static const size_t MAX001 = sizeof(message::DeliveryProperties) > MAX000 ? sizeof(message::DeliveryProperties) : MAX000; -static const size_t MAX002 = sizeof(message::FragmentProperties) > MAX001 ? sizeof(message::FragmentProperties) : MAX001; -static const size_t MAX003 = sizeof(message::MessageProperties) > MAX002 ? sizeof(message::MessageProperties) : MAX002; -static const size_t MAX004 = sizeof(message::Acquired) > MAX003 ? sizeof(message::Acquired) : MAX003; -static const size_t MAX005 = sizeof(message::MessageResumeResult) > MAX004 ? sizeof(message::MessageResumeResult) : MAX004; -static const size_t MAX006 = sizeof(dtx::XaResult) > MAX005 ? sizeof(dtx::XaResult) : MAX005; -static const size_t MAX007 = sizeof(dtx::Xid) > MAX006 ? sizeof(dtx::Xid) : MAX006; -static const size_t MAX008 = sizeof(dtx::GetTimeoutResult) > MAX007 ? sizeof(dtx::GetTimeoutResult) : MAX007; -static const size_t MAX009 = sizeof(dtx::RecoverResult) > MAX008 ? sizeof(dtx::RecoverResult) : MAX008; -static const size_t MAX010 = sizeof(exchange::ExchangeQueryResult) > MAX009 ? sizeof(exchange::ExchangeQueryResult) : MAX009; -static const size_t MAX011 = sizeof(exchange::ExchangeBoundResult) > MAX010 ? sizeof(exchange::ExchangeBoundResult) : MAX010; -static const size_t MAX012 = sizeof(queue::QueueQueryResult) > MAX011 ? sizeof(queue::QueueQueryResult) : MAX011; -static const size_t MAX013 = sizeof(file::FileProperties) > MAX012 ? sizeof(file::FileProperties) : MAX012; -static const size_t MAX014 = sizeof(stream::StreamProperties) > MAX013 ? sizeof(stream::StreamProperties) : MAX013; -static const size_t MAX015 = sizeof(UnknownStruct) > MAX014 ? sizeof(UnknownStruct) : MAX014; -static const int MAX=MAX015; - -} // namespace struct_max - -struct StructHolder: - public amqp_0_10::Holder -{ - StructHolder() {} - template explicit StructHolder(const T& t) : amqp_0_10::Holder(t) {} - using amqp_0_10::Holder::operator=; - void set(uint8_t classCode, uint8_t code); -}; - -std::ostream& operator<<(std::ostream& o, const StructHolder& h); - -}} // namespace qpid::amqp_0_10 - -#endif /*!QPID_AMQP_0_10_STRUCTHOLDER_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/StructVisitor.h b/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/StructVisitor.h deleted file mode 100644 index adb2370c75..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/StructVisitor.h +++ /dev/null @@ -1,78 +0,0 @@ -#ifndef QPID_AMQP_0_10_STRUCTVISITOR_H -#define QPID_AMQP_0_10_STRUCTVISITOR_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/amqp_0_10/structs.h" - -namespace qpid { -namespace amqp_0_10 { - -struct StructVisitor -{ - virtual ~StructVisitor() {} - typedef Struct BaseType; - virtual void visit(message::DeliveryProperties&) = 0; - virtual void visit(message::FragmentProperties&) = 0; - virtual void visit(message::MessageProperties&) = 0; - virtual void visit(message::Acquired&) = 0; - virtual void visit(message::MessageResumeResult&) = 0; - virtual void visit(dtx::XaResult&) = 0; - virtual void visit(dtx::Xid&) = 0; - virtual void visit(dtx::GetTimeoutResult&) = 0; - virtual void visit(dtx::RecoverResult&) = 0; - virtual void visit(exchange::ExchangeQueryResult&) = 0; - virtual void visit(exchange::ExchangeBoundResult&) = 0; - virtual void visit(queue::QueueQueryResult&) = 0; - virtual void visit(file::FileProperties&) = 0; - virtual void visit(stream::StreamProperties&) = 0; - virtual void visit(UnknownStruct&) = 0; -}; -struct ConstStructVisitor -{ - virtual ~ConstStructVisitor() {} - typedef const Struct BaseType; - virtual void visit(const message::DeliveryProperties&) = 0; - virtual void visit(const message::FragmentProperties&) = 0; - virtual void visit(const message::MessageProperties&) = 0; - virtual void visit(const message::Acquired&) = 0; - virtual void visit(const message::MessageResumeResult&) = 0; - virtual void visit(const dtx::XaResult&) = 0; - virtual void visit(const dtx::Xid&) = 0; - virtual void visit(const dtx::GetTimeoutResult&) = 0; - virtual void visit(const dtx::RecoverResult&) = 0; - virtual void visit(const exchange::ExchangeQueryResult&) = 0; - virtual void visit(const exchange::ExchangeBoundResult&) = 0; - virtual void visit(const queue::QueueQueryResult&) = 0; - virtual void visit(const file::FileProperties&) = 0; - virtual void visit(const stream::StreamProperties&) = 0; - virtual void visit(const UnknownStruct&) = 0; -}; - -}} // namespace qpid::amqp_0_10 - -#endif /*!QPID_AMQP_0_10_STRUCTVISITOR_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/TypeForCode.h b/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/TypeForCode.h deleted file mode 100644 index 6fa2b9dd03..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/TypeForCode.h +++ /dev/null @@ -1,135 +0,0 @@ -#ifndef QPID_AMQP_0_10_TYPEFORCODE_H -#define QPID_AMQP_0_10_TYPEFORCODE_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/amqp_0_10/built_in_types.h" -#include "qpid/amqp_0_10/UnknownType.h" - -namespace qpid { -namespace amqp_0_10 { - - -template struct TypeForCode; - -template <> struct TypeForCode<0x00> { typedef Bin8 type; }; -template <> struct TypeForCode<0x01> { typedef Int8 type; }; -template <> struct TypeForCode<0x02> { typedef Uint8 type; }; -template <> struct TypeForCode<0x04> { typedef Char type; }; -template <> struct TypeForCode<0x08> { typedef Boolean type; }; -template <> struct TypeForCode<0x10> { typedef Bin16 type; }; -template <> struct TypeForCode<0x11> { typedef Int16 type; }; -template <> struct TypeForCode<0x12> { typedef Uint16 type; }; -template <> struct TypeForCode<0x20> { typedef Bin32 type; }; -template <> struct TypeForCode<0x21> { typedef Int32 type; }; -template <> struct TypeForCode<0x22> { typedef Uint32 type; }; -template <> struct TypeForCode<0x23> { typedef Float type; }; -template <> struct TypeForCode<0x27> { typedef CharUtf32 type; }; -template <> struct TypeForCode<0x30> { typedef Bin64 type; }; -template <> struct TypeForCode<0x31> { typedef Int64 type; }; -template <> struct TypeForCode<0x32> { typedef Uint64 type; }; -template <> struct TypeForCode<0x33> { typedef Double type; }; -template <> struct TypeForCode<0x38> { typedef Datetime type; }; -template <> struct TypeForCode<0x40> { typedef Bin128 type; }; -template <> struct TypeForCode<0x48> { typedef Uuid type; }; -template <> struct TypeForCode<0x50> { typedef Bin256 type; }; -template <> struct TypeForCode<0x60> { typedef Bin512 type; }; -template <> struct TypeForCode<0x70> { typedef Bin1024 type; }; -template <> struct TypeForCode<0x80> { typedef Vbin8 type; }; -template <> struct TypeForCode<0x84> { typedef Str8Latin type; }; -template <> struct TypeForCode<0x85> { typedef Str8 type; }; -template <> struct TypeForCode<0x86> { typedef Str8Utf16 type; }; -template <> struct TypeForCode<0x90> { typedef Vbin16 type; }; -template <> struct TypeForCode<0x94> { typedef Str16Latin type; }; -template <> struct TypeForCode<0x95> { typedef Str16 type; }; -template <> struct TypeForCode<0x96> { typedef Str16Utf16 type; }; -template <> struct TypeForCode<0xa0> { typedef Vbin32 type; }; -template <> struct TypeForCode<0xa8> { typedef Map type; }; -template <> struct TypeForCode<0xa9> { typedef List type; }; -template <> struct TypeForCode<0xaa> { typedef Array type; }; -template <> struct TypeForCode<0xab> { typedef Struct32 type; }; -template <> struct TypeForCode<0xc0> { typedef Bin40 type; }; -template <> struct TypeForCode<0xc8> { typedef Dec32 type; }; -template <> struct TypeForCode<0xd0> { typedef Bin72 type; }; -template <> struct TypeForCode<0xd8> { typedef Dec64 type; }; -template <> struct TypeForCode<0xf0> { typedef Void type; }; -template <> struct TypeForCode<0xf1> { typedef Bit type; }; - -template typename V::result_type -apply_visitor(V& visitor, uint8_t code) { - switch (code) { - case 0x00: return visitor((Bin8*)0); - case 0x01: return visitor((Int8*)0); - case 0x02: return visitor((Uint8*)0); - case 0x04: return visitor((Char*)0); - case 0x08: return visitor((Boolean*)0); - case 0x10: return visitor((Bin16*)0); - case 0x11: return visitor((Int16*)0); - case 0x12: return visitor((Uint16*)0); - case 0x20: return visitor((Bin32*)0); - case 0x21: return visitor((Int32*)0); - case 0x22: return visitor((Uint32*)0); - case 0x23: return visitor((Float*)0); - case 0x27: return visitor((CharUtf32*)0); - case 0x30: return visitor((Bin64*)0); - case 0x31: return visitor((Int64*)0); - case 0x32: return visitor((Uint64*)0); - case 0x33: return visitor((Double*)0); - case 0x38: return visitor((Datetime*)0); - case 0x40: return visitor((Bin128*)0); - case 0x48: return visitor((Uuid*)0); - case 0x50: return visitor((Bin256*)0); - case 0x60: return visitor((Bin512*)0); - case 0x70: return visitor((Bin1024*)0); - case 0x80: return visitor((Vbin8*)0); - case 0x84: return visitor((Str8Latin*)0); - case 0x85: return visitor((Str8*)0); - case 0x86: return visitor((Str8Utf16*)0); - case 0x90: return visitor((Vbin16*)0); - case 0x94: return visitor((Str16Latin*)0); - case 0x95: return visitor((Str16*)0); - case 0x96: return visitor((Str16Utf16*)0); - case 0xa0: return visitor((Vbin32*)0); - case 0xa8: return visitor((Map*)0); - case 0xa9: return visitor((List*)0); - case 0xaa: return visitor((Array*)0); - case 0xab: return visitor((Struct32*)0); - case 0xc0: return visitor((Bin40*)0); - case 0xc8: return visitor((Dec32*)0); - case 0xd0: return visitor((Bin72*)0); - case 0xd8: return visitor((Dec64*)0); - case 0xf0: return visitor((Void*)0); - case 0xf1: return visitor((Bit*)0); - default: return visitor((UnknownType*)0); - } -} - -std::string typeName(uint8_t code); - -}} // namespace qpid::amqp_0_10 - -#endif /*!QPID_AMQP_0_10_TYPEFORCODE_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/exceptions.h b/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/exceptions.h deleted file mode 100644 index 654b50aa25..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/exceptions.h +++ /dev/null @@ -1,428 +0,0 @@ -#ifndef QPID_AMQP_0_10_EXCEPTIONS_H -#define QPID_AMQP_0_10_EXCEPTIONS_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/amqp_0_10/Exception.h" - -namespace qpid { -namespace amqp_0_10 { - - -/** - * - * The client attempted to work with a server entity to which it has no access due to - * security settings. - * - */ -struct UnauthorizedAccessException: - public SessionAbortedException -{ - UnauthorizedAccessException(const std::string& msg=std::string()) - : SessionAbortedException(execution::UNAUTHORIZED_ACCESS, msg) {} - protected: - std::string getPrefix() const { return "UnauthorizedAccessException"; } -}; - -/** - * - * The client attempted to work with a server entity that does not exist. - * - */ -struct NotFoundException: - public SessionAbortedException -{ - NotFoundException(const std::string& msg=std::string()) - : SessionAbortedException(execution::NOT_FOUND, msg) {} - protected: - std::string getPrefix() const { return "NotFoundException"; } -}; - -/** - * - * The client attempted to work with a server entity to which it has no access because - * another client is working with it. - * - */ -struct ResourceLockedException: - public SessionAbortedException -{ - ResourceLockedException(const std::string& msg=std::string()) - : SessionAbortedException(execution::RESOURCE_LOCKED, msg) {} - protected: - std::string getPrefix() const { return "ResourceLockedException"; } -}; - -/** - * - * The client requested a command that was not allowed because some precondition failed. - * - */ -struct PreconditionFailedException: - public SessionAbortedException -{ - PreconditionFailedException(const std::string& msg=std::string()) - : SessionAbortedException(execution::PRECONDITION_FAILED, msg) {} - protected: - std::string getPrefix() const { return "PreconditionFailedException"; } -}; - -/** - * - * A server entity the client is working with has been deleted. - * - */ -struct ResourceDeletedException: - public SessionAbortedException -{ - ResourceDeletedException(const std::string& msg=std::string()) - : SessionAbortedException(execution::RESOURCE_DELETED, msg) {} - protected: - std::string getPrefix() const { return "ResourceDeletedException"; } -}; - -/** - * - * The peer sent a command that is not permitted in the current state of the session. - * - */ -struct IllegalStateException: - public SessionAbortedException -{ - IllegalStateException(const std::string& msg=std::string()) - : SessionAbortedException(execution::ILLEGAL_STATE, msg) {} - protected: - std::string getPrefix() const { return "IllegalStateException"; } -}; - -/** - * - * The command segments could not be decoded. - * - */ -struct CommandInvalidException: - public SessionAbortedException -{ - CommandInvalidException(const std::string& msg=std::string()) - : SessionAbortedException(execution::COMMAND_INVALID, msg) {} - protected: - std::string getPrefix() const { return "CommandInvalidException"; } -}; - -/** - * - * The client exceeded its resource allocation. - * - */ -struct ResourceLimitExceededException: - public SessionAbortedException -{ - ResourceLimitExceededException(const std::string& msg=std::string()) - : SessionAbortedException(execution::RESOURCE_LIMIT_EXCEEDED, msg) {} - protected: - std::string getPrefix() const { return "ResourceLimitExceededException"; } -}; - -/** - * - * The peer tried to use a command a manner that is inconsistent with the rules described - * in the specification. - * - */ -struct NotAllowedException: - public SessionAbortedException -{ - NotAllowedException(const std::string& msg=std::string()) - : SessionAbortedException(execution::NOT_ALLOWED, msg) {} - protected: - std::string getPrefix() const { return "NotAllowedException"; } -}; - -/** - * - * The command argument is malformed, i.e. it does not fall within the specified domain. - * The illegal-argument exception can be raised on execution of any command which has - * domain valued fields. - * - */ -struct IllegalArgumentException: - public SessionAbortedException -{ - IllegalArgumentException(const std::string& msg=std::string()) - : SessionAbortedException(execution::ILLEGAL_ARGUMENT, msg) {} - protected: - std::string getPrefix() const { return "IllegalArgumentException"; } -}; - -/** - * - * The peer tried to use functionality that is not implemented in its partner. - * - */ -struct NotImplementedException: - public SessionAbortedException -{ - NotImplementedException(const std::string& msg=std::string()) - : SessionAbortedException(execution::NOT_IMPLEMENTED, msg) {} - protected: - std::string getPrefix() const { return "NotImplementedException"; } -}; - -/** - * - * The peer could not complete the command because of an internal error. The peer may - * require intervention by an operator in order to resume normal operations. - * - */ -struct InternalErrorException: - public SessionAbortedException -{ - InternalErrorException(const std::string& msg=std::string()) - : SessionAbortedException(execution::INTERNAL_ERROR, msg) {} - protected: - std::string getPrefix() const { return "InternalErrorException"; } -}; - -/** - * - * An invalid argument was passed to a command, and the operation could not - * proceed. An invalid argument is not illegal (see illegal-argument), i.e. it matches - * the domain definition; however the particular value is invalid in this context. - * - */ -struct InvalidArgumentException: - public SessionAbortedException -{ - InvalidArgumentException(const std::string& msg=std::string()) - : SessionAbortedException(execution::INVALID_ARGUMENT, msg) {} - protected: - std::string getPrefix() const { return "InvalidArgumentException"; } -}; - - -/** - * - * The session was detached by request. - * - */ -struct NormalDetachedException: - public SessionDetachedException -{ - NormalDetachedException(const std::string& msg=std::string()) - : SessionDetachedException(session::NORMAL, msg) {} - protected: - std::string getPrefix() const { return "NormalDetachedException"; } -}; - -/** - * - * The session is currently attached to another transport. - * - */ -struct SessionBusyDetachedException: - public SessionDetachedException -{ - SessionBusyDetachedException(const std::string& msg=std::string()) - : SessionDetachedException(session::SESSION_BUSY, msg) {} - protected: - std::string getPrefix() const { return "SessionBusyDetachedException"; } -}; - -/** - * - * The transport is currently attached to another session. - * - */ -struct TransportBusyDetachedException: - public SessionDetachedException -{ - TransportBusyDetachedException(const std::string& msg=std::string()) - : SessionDetachedException(session::TRANSPORT_BUSY, msg) {} - protected: - std::string getPrefix() const { return "TransportBusyDetachedException"; } -}; - -/** - * - * The transport is not currently attached to any session. - * - */ -struct NotAttachedDetachedException: - public SessionDetachedException -{ - NotAttachedDetachedException(const std::string& msg=std::string()) - : SessionDetachedException(session::NOT_ATTACHED, msg) {} - protected: - std::string getPrefix() const { return "NotAttachedDetachedException"; } -}; - -/** - * - * Command data was received prior to any use of the command-point control. - * - */ -struct UnknownIdsDetachedException: - public SessionDetachedException -{ - UnknownIdsDetachedException(const std::string& msg=std::string()) - : SessionDetachedException(session::UNKNOWN_IDS, msg) {} - protected: - std::string getPrefix() const { return "UnknownIdsDetachedException"; } -}; - - -/** - * - * The session was detached by request. - * - */ -struct NormalExpiredException: - public SessionExpiredException -{ - NormalExpiredException(const std::string& msg=std::string()) - : SessionExpiredException(session::NORMAL, msg) {} - protected: - std::string getPrefix() const { return "NormalExpiredException"; } -}; - -/** - * - * The session is currently attached to another transport. - * - */ -struct SessionBusyExpiredException: - public SessionExpiredException -{ - SessionBusyExpiredException(const std::string& msg=std::string()) - : SessionExpiredException(session::SESSION_BUSY, msg) {} - protected: - std::string getPrefix() const { return "SessionBusyExpiredException"; } -}; - -/** - * - * The transport is currently attached to another session. - * - */ -struct TransportBusyExpiredException: - public SessionExpiredException -{ - TransportBusyExpiredException(const std::string& msg=std::string()) - : SessionExpiredException(session::TRANSPORT_BUSY, msg) {} - protected: - std::string getPrefix() const { return "TransportBusyExpiredException"; } -}; - -/** - * - * The transport is not currently attached to any session. - * - */ -struct NotAttachedExpiredException: - public SessionExpiredException -{ - NotAttachedExpiredException(const std::string& msg=std::string()) - : SessionExpiredException(session::NOT_ATTACHED, msg) {} - protected: - std::string getPrefix() const { return "NotAttachedExpiredException"; } -}; - -/** - * - * Command data was received prior to any use of the command-point control. - * - */ -struct UnknownIdsExpiredException: - public SessionExpiredException -{ - UnknownIdsExpiredException(const std::string& msg=std::string()) - : SessionExpiredException(session::UNKNOWN_IDS, msg) {} - protected: - std::string getPrefix() const { return "UnknownIdsExpiredException"; } -}; - - -/** - * - * The connection closed normally. - * - */ -struct NormalException: - public ConnectionException -{ - NormalException(const std::string& msg=std::string()) - : ConnectionException(connection::NORMAL, msg) {} - protected: - std::string getPrefix() const { return "NormalException"; } -}; - -/** - * - * An operator intervened to close the connection for some reason. The client may retry at - * some later date. - * - */ -struct ConnectionForcedException: - public ConnectionException -{ - ConnectionForcedException(const std::string& msg=std::string()) - : ConnectionException(connection::CONNECTION_FORCED, msg) {} - protected: - std::string getPrefix() const { return "ConnectionForcedException"; } -}; - -/** - * - * The client tried to work with an unknown virtual host. - * - */ -struct InvalidPathException: - public ConnectionException -{ - InvalidPathException(const std::string& msg=std::string()) - : ConnectionException(connection::INVALID_PATH, msg) {} - protected: - std::string getPrefix() const { return "InvalidPathException"; } -}; - -/** - * - * A valid frame header cannot be formed from the incoming byte stream. - * - */ -struct FramingErrorException: - public ConnectionException -{ - FramingErrorException(const std::string& msg=std::string()) - : ConnectionException(connection::FRAMING_ERROR, msg) {} - protected: - std::string getPrefix() const { return "FramingErrorException"; } -}; - -}} // namespace qpid::amqp_0_10 - -#endif /*!QPID_AMQP_0_10_EXCEPTIONS_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/handlers.h b/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/handlers.h deleted file mode 100644 index 9ec90229c8..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/handlers.h +++ /dev/null @@ -1,169 +0,0 @@ -#ifndef QPID_AMQP_0_10_HANDLERS_H -#define QPID_AMQP_0_10_HANDLERS_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/amqp_0_10/specification.h" - -namespace qpid { -namespace amqp_0_10 { - - -struct CommandHandler: - public execution::Sync::Handler, - public execution::Result::Handler, - public execution::Exception::Handler, - public message::Transfer::Handler, - public message::Accept::Handler, - public message::Reject::Handler, - public message::Release::Handler, - public message::Acquire::Handler, - public message::Resume::Handler, - public message::Subscribe::Handler, - public message::Cancel::Handler, - public message::SetFlowMode::Handler, - public message::Flow::Handler, - public message::Flush::Handler, - public message::Stop::Handler, - public tx::Select::Handler, - public tx::Commit::Handler, - public tx::Rollback::Handler, - public dtx::Select::Handler, - public dtx::Start::Handler, - public dtx::End::Handler, - public dtx::Commit::Handler, - public dtx::Forget::Handler, - public dtx::GetTimeout::Handler, - public dtx::Prepare::Handler, - public dtx::Recover::Handler, - public dtx::Rollback::Handler, - public dtx::SetTimeout::Handler, - public exchange::Declare::Handler, - public exchange::Delete::Handler, - public exchange::Query::Handler, - public exchange::Bind::Handler, - public exchange::Unbind::Handler, - public exchange::Bound::Handler, - public queue::Declare::Handler, - public queue::Delete::Handler, - public queue::Purge::Handler, - public queue::Query::Handler, - public file::Qos::Handler, - public file::QosOk::Handler, - public file::Consume::Handler, - public file::ConsumeOk::Handler, - public file::Cancel::Handler, - public file::Open::Handler, - public file::OpenOk::Handler, - public file::Stage::Handler, - public file::Publish::Handler, - public file::Return::Handler, - public file::Deliver::Handler, - public file::Ack::Handler, - public file::Reject::Handler, - public stream::Qos::Handler, - public stream::QosOk::Handler, - public stream::Consume::Handler, - public stream::ConsumeOk::Handler, - public stream::Cancel::Handler, - public stream::Publish::Handler, - public stream::Return::Handler, - public stream::Deliver::Handler -{ -}; - -struct ControlHandler: - public connection::Start::Handler, - public connection::StartOk::Handler, - public connection::Secure::Handler, - public connection::SecureOk::Handler, - public connection::Tune::Handler, - public connection::TuneOk::Handler, - public connection::Open::Handler, - public connection::OpenOk::Handler, - public connection::Redirect::Handler, - public connection::Heartbeat::Handler, - public connection::Close::Handler, - public connection::CloseOk::Handler, - public session::Attach::Handler, - public session::Attached::Handler, - public session::Detach::Handler, - public session::Detached::Handler, - public session::RequestTimeout::Handler, - public session::Timeout::Handler, - public session::CommandPoint::Handler, - public session::Expected::Handler, - public session::Confirmed::Handler, - public session::Completed::Handler, - public session::KnownCompleted::Handler, - public session::Flush::Handler, - public session::Gap::Handler, - public cluster::UpdateRequest::Handler, - public cluster::UpdateOffer::Handler, - public cluster::RetractOffer::Handler, - public cluster::InitialStatus::Handler, - public cluster::Ready::Handler, - public cluster::ConfigChange::Handler, - public cluster::MessageExpired::Handler, - public cluster::ErrorCheck::Handler, - public cluster::TimerWakeup::Handler, - public cluster::TimerDrop::Handler, - public cluster::Shutdown::Handler, - public cluster::DeliverToQueue::Handler, - public cluster-connection::Announce::Handler, - public cluster-connection::DeliverClose::Handler, - public cluster-connection::DeliverDoOutput::Handler, - public cluster-connection::Abort::Handler, - public cluster-connection::ShadowSetUser::Handler, - public cluster-connection::ShadowPrepare::Handler, - public cluster-connection::ConsumerState::Handler, - public cluster-connection::DeliveryRecord::Handler, - public cluster-connection::TxStart::Handler, - public cluster-connection::TxAccept::Handler, - public cluster-connection::TxDequeue::Handler, - public cluster-connection::TxEnqueue::Handler, - public cluster-connection::TxPublish::Handler, - public cluster-connection::TxEnd::Handler, - public cluster-connection::AccumulatedAck::Handler, - public cluster-connection::OutputTask::Handler, - public cluster-connection::SessionState::Handler, - public cluster-connection::ShadowReady::Handler, - public cluster-connection::Membership::Handler, - public cluster-connection::RetractOffer::Handler, - public cluster-connection::QueuePosition::Handler, - public cluster-connection::Exchange::Handler, - public cluster-connection::Queue::Handler, - public cluster-connection::ExpiryId::Handler, - public cluster-connection::AddQueueListener::Handler, - public cluster-connection::ManagementSetupState::Handler, - public cluster-connection::Config::Handler -{ -}; - -}} // namespace qpid::amqp_0_10 - -#endif /*!QPID_AMQP_0_10_HANDLERS_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/specification.h b/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/specification.h deleted file mode 100644 index 859759db91..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/specification.h +++ /dev/null @@ -1,4622 +0,0 @@ -#ifndef QPID_AMQP_0_10_SPECIFICATION_H -#define QPID_AMQP_0_10_SPECIFICATION_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/amqp_0_10/specification_fwd.h" -#include "qpid/amqp_0_10/Map.h" -#include "qpid/amqp_0_10/Array.h" -#include "qpid/amqp_0_10/UnknownType.h" -#include "qpid/amqp_0_10/Struct32.h" -#include "qpid/amqp_0_10/Control.h" -#include "qpid/amqp_0_10/Command.h" -#include "qpid/amqp_0_10/Packer.h" -#include - -namespace qpid { -namespace amqp_0_10 { - - -namespace connection { - - -struct Start: - public Control -{ - Map serverProperties; - Str16Array mechanisms; - Str16Array locales; - - static const char* NAME; - static const uint8_t CODE=0x1; - static const uint8_t CLASS_CODE=connection::CODE; - static const char* CLASS_NAME; - explicit Start( - const Map& serverProperties_=Map(), - const Str16Array& mechanisms_=Str16Array(), - const Str16Array& locales_=Str16Array() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(serverProperties)(mechanisms)(locales); - } - - struct Handler - { - void connectionStart( - const Map& serverProperties_, - const Str16Array& mechanisms_, - const Str16Array& locales_ - ); - }; - - template void invoke(T& target)const - { - target.connectionStart(serverProperties, mechanisms, locales ); - } -}; -inline Packer serializable(Start& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const Start&); -bool operator==(const Start&, const Start&); - -struct StartOk: - public Control -{ - Map clientProperties; - Str8 mechanism; - Vbin32 response; - Str8 locale; - - static const char* NAME; - static const uint8_t CODE=0x2; - static const uint8_t CLASS_CODE=connection::CODE; - static const char* CLASS_NAME; - explicit StartOk( - const Map& clientProperties_=Map(), - const Str8& mechanism_=Str8(), - const Vbin32& response_=Vbin32(), - const Str8& locale_=Str8() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(clientProperties)(mechanism)(response)(locale); - } - - struct Handler - { - void connectionStartOk( - const Map& clientProperties_, - const Str8& mechanism_, - const Vbin32& response_, - const Str8& locale_ - ); - }; - - template void invoke(T& target)const - { - target.connectionStartOk(clientProperties, mechanism, response, locale ); - } -}; -inline Packer serializable(StartOk& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const StartOk&); -bool operator==(const StartOk&, const StartOk&); - -struct Secure: - public Control -{ - Vbin32 challenge; - - static const char* NAME; - static const uint8_t CODE=0x3; - static const uint8_t CLASS_CODE=connection::CODE; - static const char* CLASS_NAME; - explicit Secure(const Vbin32& challenge_=Vbin32()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(challenge); - } - - struct Handler - { - void connectionSecure( - const Vbin32& challenge_ - ); - }; - - template void invoke(T& target)const - { - target.connectionSecure(challenge ); - } -}; -inline Packer serializable(Secure& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const Secure&); -bool operator==(const Secure&, const Secure&); - -struct SecureOk: - public Control -{ - Vbin32 response; - - static const char* NAME; - static const uint8_t CODE=0x4; - static const uint8_t CLASS_CODE=connection::CODE; - static const char* CLASS_NAME; - explicit SecureOk(const Vbin32& response_=Vbin32()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(response); - } - - struct Handler - { - void connectionSecureOk( - const Vbin32& response_ - ); - }; - - template void invoke(T& target)const - { - target.connectionSecureOk(response ); - } -}; -inline Packer serializable(SecureOk& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const SecureOk&); -bool operator==(const SecureOk&, const SecureOk&); - -struct Tune: - public Control -{ - Uint16 channelMax; - Uint16 maxFrameSize; - Uint16 heartbeatMin; - Uint16 heartbeatMax; - - static const char* NAME; - static const uint8_t CODE=0x5; - static const uint8_t CLASS_CODE=connection::CODE; - static const char* CLASS_NAME; - explicit Tune( - Uint16 channelMax_=Uint16(), - Uint16 maxFrameSize_=Uint16(), - Uint16 heartbeatMin_=Uint16(), - Uint16 heartbeatMax_=Uint16() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(channelMax)(maxFrameSize)(heartbeatMin)(heartbeatMax); - } - - struct Handler - { - void connectionTune( - Uint16 channelMax_, - Uint16 maxFrameSize_, - Uint16 heartbeatMin_, - Uint16 heartbeatMax_ - ); - }; - - template void invoke(T& target)const - { - target.connectionTune(channelMax, maxFrameSize, heartbeatMin, heartbeatMax ); - } -}; -inline Packer serializable(Tune& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const Tune&); -bool operator==(const Tune&, const Tune&); - -struct TuneOk: - public Control -{ - Uint16 channelMax; - Uint16 maxFrameSize; - Uint16 heartbeat; - - static const char* NAME; - static const uint8_t CODE=0x6; - static const uint8_t CLASS_CODE=connection::CODE; - static const char* CLASS_NAME; - explicit TuneOk( - Uint16 channelMax_=Uint16(), - Uint16 maxFrameSize_=Uint16(), - Uint16 heartbeat_=Uint16() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(channelMax)(maxFrameSize)(heartbeat); - } - - struct Handler - { - void connectionTuneOk( - Uint16 channelMax_, - Uint16 maxFrameSize_, - Uint16 heartbeat_ - ); - }; - - template void invoke(T& target)const - { - target.connectionTuneOk(channelMax, maxFrameSize, heartbeat ); - } -}; -inline Packer serializable(TuneOk& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const TuneOk&); -bool operator==(const TuneOk&, const TuneOk&); - -struct Open: - public Control -{ - Str8 virtualHost; - Str16Array capabilities; - Bit insist; - - static const char* NAME; - static const uint8_t CODE=0x7; - static const uint8_t CLASS_CODE=connection::CODE; - static const char* CLASS_NAME; - explicit Open( - const Str8& virtualHost_=Str8(), - const Str16Array& capabilities_=Str16Array(), - Bit insist_=Bit() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(virtualHost)(capabilities)(insist); - } - - struct Handler - { - void connectionOpen( - const Str8& virtualHost_, - const Str16Array& capabilities_, - Bit insist_ - ); - }; - - template void invoke(T& target)const - { - target.connectionOpen(virtualHost, capabilities, insist ); - } -}; -inline Packer serializable(Open& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const Open&); -bool operator==(const Open&, const Open&); - -struct OpenOk: - public Control -{ - AmqpHostArray knownHosts; - - static const char* NAME; - static const uint8_t CODE=0x8; - static const uint8_t CLASS_CODE=connection::CODE; - static const char* CLASS_NAME; - explicit OpenOk(const connection::AmqpHostArray& knownHosts_=connection::AmqpHostArray()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(knownHosts); - } - - struct Handler - { - void connectionOpenOk( - const connection::AmqpHostArray& knownHosts_ - ); - }; - - template void invoke(T& target)const - { - target.connectionOpenOk(knownHosts ); - } -}; -inline Packer serializable(OpenOk& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const OpenOk&); -bool operator==(const OpenOk&, const OpenOk&); - -struct Redirect: - public Control -{ - AmqpHostUrl host; - AmqpHostArray knownHosts; - - static const char* NAME; - static const uint8_t CODE=0x9; - static const uint8_t CLASS_CODE=connection::CODE; - static const char* CLASS_NAME; - explicit Redirect( - const connection::AmqpHostUrl& host_=connection::AmqpHostUrl(), - const connection::AmqpHostArray& knownHosts_=connection::AmqpHostArray() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(host)(knownHosts); - } - - struct Handler - { - void connectionRedirect( - const connection::AmqpHostUrl& host_, - const connection::AmqpHostArray& knownHosts_ - ); - }; - - template void invoke(T& target)const - { - target.connectionRedirect(host, knownHosts ); - } -}; -inline Packer serializable(Redirect& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const Redirect&); -bool operator==(const Redirect&, const Redirect&); - -struct Heartbeat: - public Control -{ - - static const char* NAME; - static const uint8_t CODE=0xa; - static const uint8_t CLASS_CODE=connection::CODE; - static const char* CLASS_NAME; - explicit Heartbeat(); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S&) {} - - struct Handler - { - void connectionHeartbeat( - - ); - }; - - template void invoke(T& target)const - { - target.connectionHeartbeat( ); - } -}; -inline Packer serializable(Heartbeat& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const Heartbeat&); -bool operator==(const Heartbeat&, const Heartbeat&); - -struct Close: - public Control -{ - CloseCode replyCode; - Str8 replyText; - - static const char* NAME; - static const uint8_t CODE=0xb; - static const uint8_t CLASS_CODE=connection::CODE; - static const char* CLASS_NAME; - explicit Close( - const connection::CloseCode& replyCode_=connection::CloseCode(), - const Str8& replyText_=Str8() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(replyCode)(replyText); - } - - struct Handler - { - void connectionClose( - const connection::CloseCode& replyCode_, - const Str8& replyText_ - ); - }; - - template void invoke(T& target)const - { - target.connectionClose(replyCode, replyText ); - } -}; -inline Packer serializable(Close& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const Close&); -bool operator==(const Close&, const Close&); - -struct CloseOk: - public Control -{ - - static const char* NAME; - static const uint8_t CODE=0xc; - static const uint8_t CLASS_CODE=connection::CODE; - static const char* CLASS_NAME; - explicit CloseOk(); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S&) {} - - struct Handler - { - void connectionCloseOk( - - ); - }; - - template void invoke(T& target)const - { - target.connectionCloseOk( ); - } -}; -inline Packer serializable(CloseOk& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const CloseOk&); -bool operator==(const CloseOk&, const CloseOk&); - -} // namespace connection - - -namespace session { - - -struct Attach: - public Control -{ - Name name; - Bit force; - - static const char* NAME; - static const uint8_t CODE=0x1; - static const uint8_t CLASS_CODE=session::CODE; - static const char* CLASS_NAME; - explicit Attach( - const session::Name& name_=session::Name(), - Bit force_=Bit() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(name)(force); - } - - struct Handler - { - void sessionAttach( - const session::Name& name_, - Bit force_ - ); - }; - - template void invoke(T& target)const - { - target.sessionAttach(name, force ); - } -}; -inline Packer serializable(Attach& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const Attach&); -bool operator==(const Attach&, const Attach&); - -struct Attached: - public Control -{ - Name name; - - static const char* NAME; - static const uint8_t CODE=0x2; - static const uint8_t CLASS_CODE=session::CODE; - static const char* CLASS_NAME; - explicit Attached(const session::Name& name_=session::Name()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(name); - } - - struct Handler - { - void sessionAttached( - const session::Name& name_ - ); - }; - - template void invoke(T& target)const - { - target.sessionAttached(name ); - } -}; -inline Packer serializable(Attached& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const Attached&); -bool operator==(const Attached&, const Attached&); - -struct Detach: - public Control -{ - Name name; - - static const char* NAME; - static const uint8_t CODE=0x3; - static const uint8_t CLASS_CODE=session::CODE; - static const char* CLASS_NAME; - explicit Detach(const session::Name& name_=session::Name()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(name); - } - - struct Handler - { - void sessionDetach( - const session::Name& name_ - ); - }; - - template void invoke(T& target)const - { - target.sessionDetach(name ); - } -}; -inline Packer serializable(Detach& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const Detach&); -bool operator==(const Detach&, const Detach&); - -struct Detached: - public Control -{ - Name name; - DetachCode code; - - static const char* NAME; - static const uint8_t CODE=0x4; - static const uint8_t CLASS_CODE=session::CODE; - static const char* CLASS_NAME; - explicit Detached( - const session::Name& name_=session::Name(), - const session::DetachCode& code_=session::DetachCode() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(name)(code); - } - - struct Handler - { - void sessionDetached( - const session::Name& name_, - const session::DetachCode& code_ - ); - }; - - template void invoke(T& target)const - { - target.sessionDetached(name, code ); - } -}; -inline Packer serializable(Detached& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const Detached&); -bool operator==(const Detached&, const Detached&); - -struct RequestTimeout: - public Control -{ - Uint32 timeout; - - static const char* NAME; - static const uint8_t CODE=0x5; - static const uint8_t CLASS_CODE=session::CODE; - static const char* CLASS_NAME; - explicit RequestTimeout(Uint32 timeout_=Uint32()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(timeout); - } - - struct Handler - { - void sessionRequestTimeout( - Uint32 timeout_ - ); - }; - - template void invoke(T& target)const - { - target.sessionRequestTimeout(timeout ); - } -}; -inline Packer serializable(RequestTimeout& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const RequestTimeout&); -bool operator==(const RequestTimeout&, const RequestTimeout&); - -struct Timeout: - public Control -{ - Uint32 timeout; - - static const char* NAME; - static const uint8_t CODE=0x6; - static const uint8_t CLASS_CODE=session::CODE; - static const char* CLASS_NAME; - explicit Timeout(Uint32 timeout_=Uint32()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(timeout); - } - - struct Handler - { - void sessionTimeout( - Uint32 timeout_ - ); - }; - - template void invoke(T& target)const - { - target.sessionTimeout(timeout ); - } -}; -inline Packer serializable(Timeout& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const Timeout&); -bool operator==(const Timeout&, const Timeout&); - -struct CommandPoint: - public Control -{ - SequenceNo commandId; - Uint64 commandOffset; - - static const char* NAME; - static const uint8_t CODE=0x7; - static const uint8_t CLASS_CODE=session::CODE; - static const char* CLASS_NAME; - explicit CommandPoint( - const SequenceNo& commandId_=SequenceNo(), - Uint64 commandOffset_=Uint64() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(commandId)(commandOffset); - } - - struct Handler - { - void sessionCommandPoint( - const SequenceNo& commandId_, - Uint64 commandOffset_ - ); - }; - - template void invoke(T& target)const - { - target.sessionCommandPoint(commandId, commandOffset ); - } -}; -inline Packer serializable(CommandPoint& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const CommandPoint&); -bool operator==(const CommandPoint&, const CommandPoint&); - -struct Expected: - public Control -{ - Commands commands; - CommandFragments fragments; - - static const char* NAME; - static const uint8_t CODE=0x8; - static const uint8_t CLASS_CODE=session::CODE; - static const char* CLASS_NAME; - explicit Expected( - const session::Commands& commands_=session::Commands(), - const session::CommandFragments& fragments_=session::CommandFragments() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(commands)(fragments); - } - - struct Handler - { - void sessionExpected( - const session::Commands& commands_, - const session::CommandFragments& fragments_ - ); - }; - - template void invoke(T& target)const - { - target.sessionExpected(commands, fragments ); - } -}; -inline Packer serializable(Expected& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const Expected&); -bool operator==(const Expected&, const Expected&); - -struct Confirmed: - public Control -{ - Commands commands; - CommandFragments fragments; - - static const char* NAME; - static const uint8_t CODE=0x9; - static const uint8_t CLASS_CODE=session::CODE; - static const char* CLASS_NAME; - explicit Confirmed( - const session::Commands& commands_=session::Commands(), - const session::CommandFragments& fragments_=session::CommandFragments() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(commands)(fragments); - } - - struct Handler - { - void sessionConfirmed( - const session::Commands& commands_, - const session::CommandFragments& fragments_ - ); - }; - - template void invoke(T& target)const - { - target.sessionConfirmed(commands, fragments ); - } -}; -inline Packer serializable(Confirmed& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const Confirmed&); -bool operator==(const Confirmed&, const Confirmed&); - -struct Completed: - public Control -{ - Commands commands; - Bit timelyReply; - - static const char* NAME; - static const uint8_t CODE=0xa; - static const uint8_t CLASS_CODE=session::CODE; - static const char* CLASS_NAME; - explicit Completed( - const session::Commands& commands_=session::Commands(), - Bit timelyReply_=Bit() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(commands)(timelyReply); - } - - struct Handler - { - void sessionCompleted( - const session::Commands& commands_, - Bit timelyReply_ - ); - }; - - template void invoke(T& target)const - { - target.sessionCompleted(commands, timelyReply ); - } -}; -inline Packer serializable(Completed& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const Completed&); -bool operator==(const Completed&, const Completed&); - -struct KnownCompleted: - public Control -{ - Commands commands; - - static const char* NAME; - static const uint8_t CODE=0xb; - static const uint8_t CLASS_CODE=session::CODE; - static const char* CLASS_NAME; - explicit KnownCompleted(const session::Commands& commands_=session::Commands()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(commands); - } - - struct Handler - { - void sessionKnownCompleted( - const session::Commands& commands_ - ); - }; - - template void invoke(T& target)const - { - target.sessionKnownCompleted(commands ); - } -}; -inline Packer serializable(KnownCompleted& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const KnownCompleted&); -bool operator==(const KnownCompleted&, const KnownCompleted&); - -struct Flush: - public Control -{ - Bit expected; - Bit confirmed; - Bit completed; - - static const char* NAME; - static const uint8_t CODE=0xc; - static const uint8_t CLASS_CODE=session::CODE; - static const char* CLASS_NAME; - explicit Flush( - Bit expected_=Bit(), - Bit confirmed_=Bit(), - Bit completed_=Bit() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(expected)(confirmed)(completed); - } - - struct Handler - { - void sessionFlush( - Bit expected_, - Bit confirmed_, - Bit completed_ - ); - }; - - template void invoke(T& target)const - { - target.sessionFlush(expected, confirmed, completed ); - } -}; -inline Packer serializable(Flush& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const Flush&); -bool operator==(const Flush&, const Flush&); - -struct Gap: - public Control -{ - Commands commands; - - static const char* NAME; - static const uint8_t CODE=0xd; - static const uint8_t CLASS_CODE=session::CODE; - static const char* CLASS_NAME; - explicit Gap(const session::Commands& commands_=session::Commands()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(commands); - } - - struct Handler - { - void sessionGap( - const session::Commands& commands_ - ); - }; - - template void invoke(T& target)const - { - target.sessionGap(commands ); - } -}; -inline Packer serializable(Gap& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const Gap&); -bool operator==(const Gap&, const Gap&); - -} // namespace session - - -namespace execution { - - -struct Sync: - public Command -{ - - static const char* NAME; - static const uint8_t CODE=0x1; - static const uint8_t CLASS_CODE=execution::CODE; - static const char* CLASS_NAME; - explicit Sync(); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S&) {} - - struct Handler - { - void executionSync( - - ); - }; - - template void invoke(T& target)const - { - target.executionSync( ); - } -}; -inline CommandPacker serializable(Sync& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Sync&); -bool operator==(const Sync&, const Sync&); - -struct Result: - public Command -{ - SequenceNo commandId; - Struct32 value; - - static const char* NAME; - static const uint8_t CODE=0x2; - static const uint8_t CLASS_CODE=execution::CODE; - static const char* CLASS_NAME; - explicit Result( - const SequenceNo& commandId_=SequenceNo(), - const Struct32& value_=Struct32() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(commandId)(value); - } - - struct Handler - { - void executionResult( - const SequenceNo& commandId_, - const Struct32& value_ - ); - }; - - template void invoke(T& target)const - { - target.executionResult(commandId, value ); - } -}; -inline CommandPacker serializable(Result& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Result&); -bool operator==(const Result&, const Result&); - -struct Exception: - public Command -{ - ErrorCode errorCode; - SequenceNo commandId; - Uint8 classCode; - Uint8 commandCode; - Uint8 fieldIndex; - Str16 description; - Map errorInfo; - - static const char* NAME; - static const uint8_t CODE=0x3; - static const uint8_t CLASS_CODE=execution::CODE; - static const char* CLASS_NAME; - explicit Exception( - const execution::ErrorCode& errorCode_=execution::ErrorCode(), - const SequenceNo& commandId_=SequenceNo(), - Uint8 classCode_=Uint8(), - Uint8 commandCode_=Uint8(), - Uint8 fieldIndex_=Uint8(), - const Str16& description_=Str16(), - const Map& errorInfo_=Map() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(errorCode)(commandId)(classCode)(commandCode)(fieldIndex)(description)(errorInfo); - } - - struct Handler - { - void executionException( - const execution::ErrorCode& errorCode_, - const SequenceNo& commandId_, - Uint8 classCode_, - Uint8 commandCode_, - Uint8 fieldIndex_, - const Str16& description_, - const Map& errorInfo_ - ); - }; - - template void invoke(T& target)const - { - target.executionException(errorCode, commandId, classCode, commandCode, fieldIndex, description, errorInfo ); - } -}; -inline CommandPacker serializable(Exception& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Exception&); -bool operator==(const Exception&, const Exception&); - -} // namespace execution - - -namespace message { - - -struct Transfer: - public Command -{ - Destination destination; - AcceptMode acceptMode; - AcquireMode acquireMode; - - static const char* NAME; - static const uint8_t CODE=0x1; - static const uint8_t CLASS_CODE=message::CODE; - static const char* CLASS_NAME; - explicit Transfer( - const message::Destination& destination_=message::Destination(), - const message::AcceptMode& acceptMode_=message::AcceptMode(), - const message::AcquireMode& acquireMode_=message::AcquireMode() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(destination)(acceptMode)(acquireMode); - } - - struct Handler - { - void messageTransfer( - const message::Destination& destination_, - const message::AcceptMode& acceptMode_, - const message::AcquireMode& acquireMode_ - ); - }; - - template void invoke(T& target)const - { - target.messageTransfer(destination, acceptMode, acquireMode ); - } -}; -inline CommandPacker serializable(Transfer& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Transfer&); -bool operator==(const Transfer&, const Transfer&); - -struct Accept: - public Command -{ - session::Commands transfers; - - static const char* NAME; - static const uint8_t CODE=0x2; - static const uint8_t CLASS_CODE=message::CODE; - static const char* CLASS_NAME; - explicit Accept(const session::Commands& transfers_=session::Commands()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(transfers); - } - - struct Handler - { - void messageAccept( - const session::Commands& transfers_ - ); - }; - - template void invoke(T& target)const - { - target.messageAccept(transfers ); - } -}; -inline CommandPacker serializable(Accept& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Accept&); -bool operator==(const Accept&, const Accept&); - -struct Reject: - public Command -{ - session::Commands transfers; - RejectCode code; - Str8 text; - - static const char* NAME; - static const uint8_t CODE=0x3; - static const uint8_t CLASS_CODE=message::CODE; - static const char* CLASS_NAME; - explicit Reject( - const session::Commands& transfers_=session::Commands(), - const message::RejectCode& code_=message::RejectCode(), - const Str8& text_=Str8() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(transfers)(code)(text); - } - - struct Handler - { - void messageReject( - const session::Commands& transfers_, - const message::RejectCode& code_, - const Str8& text_ - ); - }; - - template void invoke(T& target)const - { - target.messageReject(transfers, code, text ); - } -}; -inline CommandPacker serializable(Reject& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Reject&); -bool operator==(const Reject&, const Reject&); - -struct Release: - public Command -{ - session::Commands transfers; - Bit setRedelivered; - - static const char* NAME; - static const uint8_t CODE=0x4; - static const uint8_t CLASS_CODE=message::CODE; - static const char* CLASS_NAME; - explicit Release( - const session::Commands& transfers_=session::Commands(), - Bit setRedelivered_=Bit() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(transfers)(setRedelivered); - } - - struct Handler - { - void messageRelease( - const session::Commands& transfers_, - Bit setRedelivered_ - ); - }; - - template void invoke(T& target)const - { - target.messageRelease(transfers, setRedelivered ); - } -}; -inline CommandPacker serializable(Release& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Release&); -bool operator==(const Release&, const Release&); - -struct Acquire: - public Command -{ - session::Commands transfers; - - static const char* NAME; - static const uint8_t CODE=0x5; - static const uint8_t CLASS_CODE=message::CODE; - static const char* CLASS_NAME; - explicit Acquire(const session::Commands& transfers_=session::Commands()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(transfers); - } - - struct Handler - { - void messageAcquire( - const session::Commands& transfers_ - ); - }; - - template void invoke(T& target)const - { - target.messageAcquire(transfers ); - } -}; -inline CommandPacker serializable(Acquire& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Acquire&); -bool operator==(const Acquire&, const Acquire&); - -struct Resume: - public Command -{ - Destination destination; - ResumeId resumeId; - - static const char* NAME; - static const uint8_t CODE=0x6; - static const uint8_t CLASS_CODE=message::CODE; - static const char* CLASS_NAME; - explicit Resume( - const message::Destination& destination_=message::Destination(), - const message::ResumeId& resumeId_=message::ResumeId() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(destination)(resumeId); - } - - struct Handler - { - void messageResume( - const message::Destination& destination_, - const message::ResumeId& resumeId_ - ); - }; - - template void invoke(T& target)const - { - target.messageResume(destination, resumeId ); - } -}; -inline CommandPacker serializable(Resume& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Resume&); -bool operator==(const Resume&, const Resume&); - -struct Subscribe: - public Command -{ - queue::Name queue; - Destination destination; - AcceptMode acceptMode; - AcquireMode acquireMode; - Bit exclusive; - ResumeId resumeId; - Uint64 resumeTtl; - Map arguments; - - static const char* NAME; - static const uint8_t CODE=0x7; - static const uint8_t CLASS_CODE=message::CODE; - static const char* CLASS_NAME; - explicit Subscribe( - const queue::Name& queue_=queue::Name(), - const message::Destination& destination_=message::Destination(), - const message::AcceptMode& acceptMode_=message::AcceptMode(), - const message::AcquireMode& acquireMode_=message::AcquireMode(), - Bit exclusive_=Bit(), - const message::ResumeId& resumeId_=message::ResumeId(), - Uint64 resumeTtl_=Uint64(), - const Map& arguments_=Map() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(queue)(destination)(acceptMode)(acquireMode)(exclusive)(resumeId)(resumeTtl)(arguments); - } - - struct Handler - { - void messageSubscribe( - const queue::Name& queue_, - const message::Destination& destination_, - const message::AcceptMode& acceptMode_, - const message::AcquireMode& acquireMode_, - Bit exclusive_, - const message::ResumeId& resumeId_, - Uint64 resumeTtl_, - const Map& arguments_ - ); - }; - - template void invoke(T& target)const - { - target.messageSubscribe(queue, destination, acceptMode, acquireMode, exclusive, resumeId, resumeTtl, arguments ); - } -}; -inline CommandPacker serializable(Subscribe& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Subscribe&); -bool operator==(const Subscribe&, const Subscribe&); - -struct Cancel: - public Command -{ - Destination destination; - - static const char* NAME; - static const uint8_t CODE=0x8; - static const uint8_t CLASS_CODE=message::CODE; - static const char* CLASS_NAME; - explicit Cancel(const message::Destination& destination_=message::Destination()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(destination); - } - - struct Handler - { - void messageCancel( - const message::Destination& destination_ - ); - }; - - template void invoke(T& target)const - { - target.messageCancel(destination ); - } -}; -inline CommandPacker serializable(Cancel& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Cancel&); -bool operator==(const Cancel&, const Cancel&); - -struct SetFlowMode: - public Command -{ - Destination destination; - FlowMode flowMode; - - static const char* NAME; - static const uint8_t CODE=0x9; - static const uint8_t CLASS_CODE=message::CODE; - static const char* CLASS_NAME; - explicit SetFlowMode( - const message::Destination& destination_=message::Destination(), - const message::FlowMode& flowMode_=message::FlowMode() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(destination)(flowMode); - } - - struct Handler - { - void messageSetFlowMode( - const message::Destination& destination_, - const message::FlowMode& flowMode_ - ); - }; - - template void invoke(T& target)const - { - target.messageSetFlowMode(destination, flowMode ); - } -}; -inline CommandPacker serializable(SetFlowMode& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const SetFlowMode&); -bool operator==(const SetFlowMode&, const SetFlowMode&); - -struct Flow: - public Command -{ - Destination destination; - CreditUnit unit; - Uint32 value; - - static const char* NAME; - static const uint8_t CODE=0xa; - static const uint8_t CLASS_CODE=message::CODE; - static const char* CLASS_NAME; - explicit Flow( - const message::Destination& destination_=message::Destination(), - const message::CreditUnit& unit_=message::CreditUnit(), - Uint32 value_=Uint32() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(destination)(unit)(value); - } - - struct Handler - { - void messageFlow( - const message::Destination& destination_, - const message::CreditUnit& unit_, - Uint32 value_ - ); - }; - - template void invoke(T& target)const - { - target.messageFlow(destination, unit, value ); - } -}; -inline CommandPacker serializable(Flow& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Flow&); -bool operator==(const Flow&, const Flow&); - -struct Flush: - public Command -{ - Destination destination; - - static const char* NAME; - static const uint8_t CODE=0xb; - static const uint8_t CLASS_CODE=message::CODE; - static const char* CLASS_NAME; - explicit Flush(const message::Destination& destination_=message::Destination()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(destination); - } - - struct Handler - { - void messageFlush( - const message::Destination& destination_ - ); - }; - - template void invoke(T& target)const - { - target.messageFlush(destination ); - } -}; -inline CommandPacker serializable(Flush& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Flush&); -bool operator==(const Flush&, const Flush&); - -struct Stop: - public Command -{ - Destination destination; - - static const char* NAME; - static const uint8_t CODE=0xc; - static const uint8_t CLASS_CODE=message::CODE; - static const char* CLASS_NAME; - explicit Stop(const message::Destination& destination_=message::Destination()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(destination); - } - - struct Handler - { - void messageStop( - const message::Destination& destination_ - ); - }; - - template void invoke(T& target)const - { - target.messageStop(destination ); - } -}; -inline CommandPacker serializable(Stop& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Stop&); -bool operator==(const Stop&, const Stop&); - -} // namespace message - - -namespace tx { - - -struct Select: - public Command -{ - - static const char* NAME; - static const uint8_t CODE=0x1; - static const uint8_t CLASS_CODE=tx::CODE; - static const char* CLASS_NAME; - explicit Select(); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S&) {} - - struct Handler - { - void txSelect( - - ); - }; - - template void invoke(T& target)const - { - target.txSelect( ); - } -}; -inline CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Select&); -bool operator==(const Select&, const Select&); - -struct Commit: - public Command -{ - - static const char* NAME; - static const uint8_t CODE=0x2; - static const uint8_t CLASS_CODE=tx::CODE; - static const char* CLASS_NAME; - explicit Commit(); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S&) {} - - struct Handler - { - void txCommit( - - ); - }; - - template void invoke(T& target)const - { - target.txCommit( ); - } -}; -inline CommandPacker serializable(Commit& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Commit&); -bool operator==(const Commit&, const Commit&); - -struct Rollback: - public Command -{ - - static const char* NAME; - static const uint8_t CODE=0x3; - static const uint8_t CLASS_CODE=tx::CODE; - static const char* CLASS_NAME; - explicit Rollback(); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S&) {} - - struct Handler - { - void txRollback( - - ); - }; - - template void invoke(T& target)const - { - target.txRollback( ); - } -}; -inline CommandPacker serializable(Rollback& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Rollback&); -bool operator==(const Rollback&, const Rollback&); - -} // namespace tx - - -namespace dtx { - - -struct Select: - public Command -{ - - static const char* NAME; - static const uint8_t CODE=0x1; - static const uint8_t CLASS_CODE=dtx::CODE; - static const char* CLASS_NAME; - explicit Select(); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S&) {} - - struct Handler - { - void dtxSelect( - - ); - }; - - template void invoke(T& target)const - { - target.dtxSelect( ); - } -}; -inline CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Select&); -bool operator==(const Select&, const Select&); - -struct Start: - public Command -{ - Xid xid; - Bit join; - Bit resume; - - static const char* NAME; - static const uint8_t CODE=0x2; - static const uint8_t CLASS_CODE=dtx::CODE; - static const char* CLASS_NAME; - explicit Start( - const dtx::Xid& xid_=dtx::Xid(), - Bit join_=Bit(), - Bit resume_=Bit() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(xid)(join)(resume); - } - - struct Handler - { - void dtxStart( - const dtx::Xid& xid_, - Bit join_, - Bit resume_ - ); - }; - - template void invoke(T& target)const - { - target.dtxStart(xid, join, resume ); - } -}; -inline CommandPacker serializable(Start& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Start&); -bool operator==(const Start&, const Start&); - -struct End: - public Command -{ - Xid xid; - Bit fail; - Bit suspend; - - static const char* NAME; - static const uint8_t CODE=0x3; - static const uint8_t CLASS_CODE=dtx::CODE; - static const char* CLASS_NAME; - explicit End( - const dtx::Xid& xid_=dtx::Xid(), - Bit fail_=Bit(), - Bit suspend_=Bit() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(xid)(fail)(suspend); - } - - struct Handler - { - void dtxEnd( - const dtx::Xid& xid_, - Bit fail_, - Bit suspend_ - ); - }; - - template void invoke(T& target)const - { - target.dtxEnd(xid, fail, suspend ); - } -}; -inline CommandPacker serializable(End& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const End&); -bool operator==(const End&, const End&); - -struct Commit: - public Command -{ - Xid xid; - Bit onePhase; - - static const char* NAME; - static const uint8_t CODE=0x4; - static const uint8_t CLASS_CODE=dtx::CODE; - static const char* CLASS_NAME; - explicit Commit( - const dtx::Xid& xid_=dtx::Xid(), - Bit onePhase_=Bit() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(xid)(onePhase); - } - - struct Handler - { - void dtxCommit( - const dtx::Xid& xid_, - Bit onePhase_ - ); - }; - - template void invoke(T& target)const - { - target.dtxCommit(xid, onePhase ); - } -}; -inline CommandPacker serializable(Commit& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Commit&); -bool operator==(const Commit&, const Commit&); - -struct Forget: - public Command -{ - Xid xid; - - static const char* NAME; - static const uint8_t CODE=0x5; - static const uint8_t CLASS_CODE=dtx::CODE; - static const char* CLASS_NAME; - explicit Forget(const dtx::Xid& xid_=dtx::Xid()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(xid); - } - - struct Handler - { - void dtxForget( - const dtx::Xid& xid_ - ); - }; - - template void invoke(T& target)const - { - target.dtxForget(xid ); - } -}; -inline CommandPacker serializable(Forget& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Forget&); -bool operator==(const Forget&, const Forget&); - -struct GetTimeout: - public Command -{ - Xid xid; - - static const char* NAME; - static const uint8_t CODE=0x6; - static const uint8_t CLASS_CODE=dtx::CODE; - static const char* CLASS_NAME; - explicit GetTimeout(const dtx::Xid& xid_=dtx::Xid()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(xid); - } - - struct Handler - { - void dtxGetTimeout( - const dtx::Xid& xid_ - ); - }; - - template void invoke(T& target)const - { - target.dtxGetTimeout(xid ); - } -}; -inline CommandPacker serializable(GetTimeout& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const GetTimeout&); -bool operator==(const GetTimeout&, const GetTimeout&); - -struct Prepare: - public Command -{ - Xid xid; - - static const char* NAME; - static const uint8_t CODE=0x7; - static const uint8_t CLASS_CODE=dtx::CODE; - static const char* CLASS_NAME; - explicit Prepare(const dtx::Xid& xid_=dtx::Xid()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(xid); - } - - struct Handler - { - void dtxPrepare( - const dtx::Xid& xid_ - ); - }; - - template void invoke(T& target)const - { - target.dtxPrepare(xid ); - } -}; -inline CommandPacker serializable(Prepare& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Prepare&); -bool operator==(const Prepare&, const Prepare&); - -struct Recover: - public Command -{ - - static const char* NAME; - static const uint8_t CODE=0x8; - static const uint8_t CLASS_CODE=dtx::CODE; - static const char* CLASS_NAME; - explicit Recover(); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S&) {} - - struct Handler - { - void dtxRecover( - - ); - }; - - template void invoke(T& target)const - { - target.dtxRecover( ); - } -}; -inline CommandPacker serializable(Recover& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Recover&); -bool operator==(const Recover&, const Recover&); - -struct Rollback: - public Command -{ - Xid xid; - - static const char* NAME; - static const uint8_t CODE=0x9; - static const uint8_t CLASS_CODE=dtx::CODE; - static const char* CLASS_NAME; - explicit Rollback(const dtx::Xid& xid_=dtx::Xid()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(xid); - } - - struct Handler - { - void dtxRollback( - const dtx::Xid& xid_ - ); - }; - - template void invoke(T& target)const - { - target.dtxRollback(xid ); - } -}; -inline CommandPacker serializable(Rollback& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Rollback&); -bool operator==(const Rollback&, const Rollback&); - -struct SetTimeout: - public Command -{ - Xid xid; - Uint32 timeout; - - static const char* NAME; - static const uint8_t CODE=0xa; - static const uint8_t CLASS_CODE=dtx::CODE; - static const char* CLASS_NAME; - explicit SetTimeout( - const dtx::Xid& xid_=dtx::Xid(), - Uint32 timeout_=Uint32() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(xid)(timeout); - } - - struct Handler - { - void dtxSetTimeout( - const dtx::Xid& xid_, - Uint32 timeout_ - ); - }; - - template void invoke(T& target)const - { - target.dtxSetTimeout(xid, timeout ); - } -}; -inline CommandPacker serializable(SetTimeout& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const SetTimeout&); -bool operator==(const SetTimeout&, const SetTimeout&); - -} // namespace dtx - - -namespace exchange { - - -struct Declare: - public Command -{ - Name exchange; - Str8 type; - Name alternateExchange; - Bit passive; - Bit durable; - Bit autoDelete; - Map arguments; - - static const char* NAME; - static const uint8_t CODE=0x1; - static const uint8_t CLASS_CODE=exchange::CODE; - static const char* CLASS_NAME; - explicit Declare( - const exchange::Name& exchange_=exchange::Name(), - const Str8& type_=Str8(), - const exchange::Name& alternateExchange_=exchange::Name(), - Bit passive_=Bit(), - Bit durable_=Bit(), - Bit autoDelete_=Bit(), - const Map& arguments_=Map() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(exchange)(type)(alternateExchange)(passive)(durable)(autoDelete)(arguments); - } - - struct Handler - { - void exchangeDeclare( - const exchange::Name& exchange_, - const Str8& type_, - const exchange::Name& alternateExchange_, - Bit passive_, - Bit durable_, - Bit autoDelete_, - const Map& arguments_ - ); - }; - - template void invoke(T& target)const - { - target.exchangeDeclare(exchange, type, alternateExchange, passive, durable, autoDelete, arguments ); - } -}; -inline CommandPacker serializable(Declare& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Declare&); -bool operator==(const Declare&, const Declare&); - -struct Delete: - public Command -{ - Name exchange; - Bit ifUnused; - - static const char* NAME; - static const uint8_t CODE=0x2; - static const uint8_t CLASS_CODE=exchange::CODE; - static const char* CLASS_NAME; - explicit Delete( - const exchange::Name& exchange_=exchange::Name(), - Bit ifUnused_=Bit() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(exchange)(ifUnused); - } - - struct Handler - { - void exchangeDelete( - const exchange::Name& exchange_, - Bit ifUnused_ - ); - }; - - template void invoke(T& target)const - { - target.exchangeDelete(exchange, ifUnused ); - } -}; -inline CommandPacker serializable(Delete& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Delete&); -bool operator==(const Delete&, const Delete&); - -struct Query: - public Command -{ - Str8 name; - - static const char* NAME; - static const uint8_t CODE=0x3; - static const uint8_t CLASS_CODE=exchange::CODE; - static const char* CLASS_NAME; - explicit Query(const Str8& name_=Str8()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(name); - } - - struct Handler - { - void exchangeQuery( - const Str8& name_ - ); - }; - - template void invoke(T& target)const - { - target.exchangeQuery(name ); - } -}; -inline CommandPacker serializable(Query& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Query&); -bool operator==(const Query&, const Query&); - -struct Bind: - public Command -{ - queue::Name queue; - Name exchange; - Str8 bindingKey; - Map arguments; - - static const char* NAME; - static const uint8_t CODE=0x4; - static const uint8_t CLASS_CODE=exchange::CODE; - static const char* CLASS_NAME; - explicit Bind( - const queue::Name& queue_=queue::Name(), - const exchange::Name& exchange_=exchange::Name(), - const Str8& bindingKey_=Str8(), - const Map& arguments_=Map() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(queue)(exchange)(bindingKey)(arguments); - } - - struct Handler - { - void exchangeBind( - const queue::Name& queue_, - const exchange::Name& exchange_, - const Str8& bindingKey_, - const Map& arguments_ - ); - }; - - template void invoke(T& target)const - { - target.exchangeBind(queue, exchange, bindingKey, arguments ); - } -}; -inline CommandPacker serializable(Bind& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Bind&); -bool operator==(const Bind&, const Bind&); - -struct Unbind: - public Command -{ - queue::Name queue; - Name exchange; - Str8 bindingKey; - - static const char* NAME; - static const uint8_t CODE=0x5; - static const uint8_t CLASS_CODE=exchange::CODE; - static const char* CLASS_NAME; - explicit Unbind( - const queue::Name& queue_=queue::Name(), - const exchange::Name& exchange_=exchange::Name(), - const Str8& bindingKey_=Str8() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(queue)(exchange)(bindingKey); - } - - struct Handler - { - void exchangeUnbind( - const queue::Name& queue_, - const exchange::Name& exchange_, - const Str8& bindingKey_ - ); - }; - - template void invoke(T& target)const - { - target.exchangeUnbind(queue, exchange, bindingKey ); - } -}; -inline CommandPacker serializable(Unbind& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Unbind&); -bool operator==(const Unbind&, const Unbind&); - -struct Bound: - public Command -{ - Str8 exchange; - Str8 queue; - Str8 bindingKey; - Map arguments; - - static const char* NAME; - static const uint8_t CODE=0x6; - static const uint8_t CLASS_CODE=exchange::CODE; - static const char* CLASS_NAME; - explicit Bound( - const Str8& exchange_=Str8(), - const Str8& queue_=Str8(), - const Str8& bindingKey_=Str8(), - const Map& arguments_=Map() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(exchange)(queue)(bindingKey)(arguments); - } - - struct Handler - { - void exchangeBound( - const Str8& exchange_, - const Str8& queue_, - const Str8& bindingKey_, - const Map& arguments_ - ); - }; - - template void invoke(T& target)const - { - target.exchangeBound(exchange, queue, bindingKey, arguments ); - } -}; -inline CommandPacker serializable(Bound& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Bound&); -bool operator==(const Bound&, const Bound&); - -} // namespace exchange - - -namespace queue { - - -struct Declare: - public Command -{ - Name queue; - exchange::Name alternateExchange; - Bit passive; - Bit durable; - Bit exclusive; - Bit autoDelete; - Map arguments; - - static const char* NAME; - static const uint8_t CODE=0x1; - static const uint8_t CLASS_CODE=queue::CODE; - static const char* CLASS_NAME; - explicit Declare( - const queue::Name& queue_=queue::Name(), - const exchange::Name& alternateExchange_=exchange::Name(), - Bit passive_=Bit(), - Bit durable_=Bit(), - Bit exclusive_=Bit(), - Bit autoDelete_=Bit(), - const Map& arguments_=Map() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(queue)(alternateExchange)(passive)(durable)(exclusive)(autoDelete)(arguments); - } - - struct Handler - { - void queueDeclare( - const queue::Name& queue_, - const exchange::Name& alternateExchange_, - Bit passive_, - Bit durable_, - Bit exclusive_, - Bit autoDelete_, - const Map& arguments_ - ); - }; - - template void invoke(T& target)const - { - target.queueDeclare(queue, alternateExchange, passive, durable, exclusive, autoDelete, arguments ); - } -}; -inline CommandPacker serializable(Declare& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Declare&); -bool operator==(const Declare&, const Declare&); - -struct Delete: - public Command -{ - Name queue; - Bit ifUnused; - Bit ifEmpty; - - static const char* NAME; - static const uint8_t CODE=0x2; - static const uint8_t CLASS_CODE=queue::CODE; - static const char* CLASS_NAME; - explicit Delete( - const queue::Name& queue_=queue::Name(), - Bit ifUnused_=Bit(), - Bit ifEmpty_=Bit() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(queue)(ifUnused)(ifEmpty); - } - - struct Handler - { - void queueDelete( - const queue::Name& queue_, - Bit ifUnused_, - Bit ifEmpty_ - ); - }; - - template void invoke(T& target)const - { - target.queueDelete(queue, ifUnused, ifEmpty ); - } -}; -inline CommandPacker serializable(Delete& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Delete&); -bool operator==(const Delete&, const Delete&); - -struct Purge: - public Command -{ - Name queue; - - static const char* NAME; - static const uint8_t CODE=0x3; - static const uint8_t CLASS_CODE=queue::CODE; - static const char* CLASS_NAME; - explicit Purge(const queue::Name& queue_=queue::Name()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(queue); - } - - struct Handler - { - void queuePurge( - const queue::Name& queue_ - ); - }; - - template void invoke(T& target)const - { - target.queuePurge(queue ); - } -}; -inline CommandPacker serializable(Purge& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Purge&); -bool operator==(const Purge&, const Purge&); - -struct Query: - public Command -{ - Name queue; - - static const char* NAME; - static const uint8_t CODE=0x4; - static const uint8_t CLASS_CODE=queue::CODE; - static const char* CLASS_NAME; - explicit Query(const queue::Name& queue_=queue::Name()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(queue); - } - - struct Handler - { - void queueQuery( - const queue::Name& queue_ - ); - }; - - template void invoke(T& target)const - { - target.queueQuery(queue ); - } -}; -inline CommandPacker serializable(Query& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Query&); -bool operator==(const Query&, const Query&); - -} // namespace queue - - -namespace file { - - -struct Qos: - public Command -{ - Uint32 prefetchSize; - Uint16 prefetchCount; - Bit global; - - static const char* NAME; - static const uint8_t CODE=0x1; - static const uint8_t CLASS_CODE=file::CODE; - static const char* CLASS_NAME; - explicit Qos( - Uint32 prefetchSize_=Uint32(), - Uint16 prefetchCount_=Uint16(), - Bit global_=Bit() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(prefetchSize)(prefetchCount)(global); - } - - struct Handler - { - void fileQos( - Uint32 prefetchSize_, - Uint16 prefetchCount_, - Bit global_ - ); - }; - - template void invoke(T& target)const - { - target.fileQos(prefetchSize, prefetchCount, global ); - } -}; -inline CommandPacker serializable(Qos& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Qos&); -bool operator==(const Qos&, const Qos&); - -struct QosOk: - public Command -{ - - static const char* NAME; - static const uint8_t CODE=0x2; - static const uint8_t CLASS_CODE=file::CODE; - static const char* CLASS_NAME; - explicit QosOk(); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S&) {} - - struct Handler - { - void fileQosOk( - - ); - }; - - template void invoke(T& target)const - { - target.fileQosOk( ); - } -}; -inline CommandPacker serializable(QosOk& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const QosOk&); -bool operator==(const QosOk&, const QosOk&); - -struct Consume: - public Command -{ - queue::Name queue; - Str8 consumerTag; - Bit noLocal; - Bit noAck; - Bit exclusive; - Bit nowait; - Map arguments; - - static const char* NAME; - static const uint8_t CODE=0x3; - static const uint8_t CLASS_CODE=file::CODE; - static const char* CLASS_NAME; - explicit Consume( - const queue::Name& queue_=queue::Name(), - const Str8& consumerTag_=Str8(), - Bit noLocal_=Bit(), - Bit noAck_=Bit(), - Bit exclusive_=Bit(), - Bit nowait_=Bit(), - const Map& arguments_=Map() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(queue)(consumerTag)(noLocal)(noAck)(exclusive)(nowait)(arguments); - } - - struct Handler - { - void fileConsume( - const queue::Name& queue_, - const Str8& consumerTag_, - Bit noLocal_, - Bit noAck_, - Bit exclusive_, - Bit nowait_, - const Map& arguments_ - ); - }; - - template void invoke(T& target)const - { - target.fileConsume(queue, consumerTag, noLocal, noAck, exclusive, nowait, arguments ); - } -}; -inline CommandPacker serializable(Consume& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Consume&); -bool operator==(const Consume&, const Consume&); - -struct ConsumeOk: - public Command -{ - Str8 consumerTag; - - static const char* NAME; - static const uint8_t CODE=0x4; - static const uint8_t CLASS_CODE=file::CODE; - static const char* CLASS_NAME; - explicit ConsumeOk(const Str8& consumerTag_=Str8()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(consumerTag); - } - - struct Handler - { - void fileConsumeOk( - const Str8& consumerTag_ - ); - }; - - template void invoke(T& target)const - { - target.fileConsumeOk(consumerTag ); - } -}; -inline CommandPacker serializable(ConsumeOk& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const ConsumeOk&); -bool operator==(const ConsumeOk&, const ConsumeOk&); - -struct Cancel: - public Command -{ - Str8 consumerTag; - - static const char* NAME; - static const uint8_t CODE=0x5; - static const uint8_t CLASS_CODE=file::CODE; - static const char* CLASS_NAME; - explicit Cancel(const Str8& consumerTag_=Str8()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(consumerTag); - } - - struct Handler - { - void fileCancel( - const Str8& consumerTag_ - ); - }; - - template void invoke(T& target)const - { - target.fileCancel(consumerTag ); - } -}; -inline CommandPacker serializable(Cancel& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Cancel&); -bool operator==(const Cancel&, const Cancel&); - -struct Open: - public Command -{ - Str8 identifier; - Uint64 contentSize; - - static const char* NAME; - static const uint8_t CODE=0x6; - static const uint8_t CLASS_CODE=file::CODE; - static const char* CLASS_NAME; - explicit Open( - const Str8& identifier_=Str8(), - Uint64 contentSize_=Uint64() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(identifier)(contentSize); - } - - struct Handler - { - void fileOpen( - const Str8& identifier_, - Uint64 contentSize_ - ); - }; - - template void invoke(T& target)const - { - target.fileOpen(identifier, contentSize ); - } -}; -inline CommandPacker serializable(Open& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Open&); -bool operator==(const Open&, const Open&); - -struct OpenOk: - public Command -{ - Uint64 stagedSize; - - static const char* NAME; - static const uint8_t CODE=0x7; - static const uint8_t CLASS_CODE=file::CODE; - static const char* CLASS_NAME; - explicit OpenOk(Uint64 stagedSize_=Uint64()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(stagedSize); - } - - struct Handler - { - void fileOpenOk( - Uint64 stagedSize_ - ); - }; - - template void invoke(T& target)const - { - target.fileOpenOk(stagedSize ); - } -}; -inline CommandPacker serializable(OpenOk& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const OpenOk&); -bool operator==(const OpenOk&, const OpenOk&); - -struct Stage: - public Command -{ - - static const char* NAME; - static const uint8_t CODE=0x8; - static const uint8_t CLASS_CODE=file::CODE; - static const char* CLASS_NAME; - explicit Stage(); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S&) {} - - struct Handler - { - void fileStage( - - ); - }; - - template void invoke(T& target)const - { - target.fileStage( ); - } -}; -inline CommandPacker serializable(Stage& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Stage&); -bool operator==(const Stage&, const Stage&); - -struct Publish: - public Command -{ - exchange::Name exchange; - Str8 routingKey; - Bit mandatory; - Bit immediate; - Str8 identifier; - - static const char* NAME; - static const uint8_t CODE=0x9; - static const uint8_t CLASS_CODE=file::CODE; - static const char* CLASS_NAME; - explicit Publish( - const exchange::Name& exchange_=exchange::Name(), - const Str8& routingKey_=Str8(), - Bit mandatory_=Bit(), - Bit immediate_=Bit(), - const Str8& identifier_=Str8() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(exchange)(routingKey)(mandatory)(immediate)(identifier); - } - - struct Handler - { - void filePublish( - const exchange::Name& exchange_, - const Str8& routingKey_, - Bit mandatory_, - Bit immediate_, - const Str8& identifier_ - ); - }; - - template void invoke(T& target)const - { - target.filePublish(exchange, routingKey, mandatory, immediate, identifier ); - } -}; -inline CommandPacker serializable(Publish& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Publish&); -bool operator==(const Publish&, const Publish&); - -struct Return: - public Command -{ - ReturnCode replyCode; - Str8 replyText; - exchange::Name exchange; - Str8 routingKey; - - static const char* NAME; - static const uint8_t CODE=0xa; - static const uint8_t CLASS_CODE=file::CODE; - static const char* CLASS_NAME; - explicit Return( - const file::ReturnCode& replyCode_=file::ReturnCode(), - const Str8& replyText_=Str8(), - const exchange::Name& exchange_=exchange::Name(), - const Str8& routingKey_=Str8() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(replyCode)(replyText)(exchange)(routingKey); - } - - struct Handler - { - void fileReturn( - const file::ReturnCode& replyCode_, - const Str8& replyText_, - const exchange::Name& exchange_, - const Str8& routingKey_ - ); - }; - - template void invoke(T& target)const - { - target.fileReturn(replyCode, replyText, exchange, routingKey ); - } -}; -inline CommandPacker serializable(Return& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Return&); -bool operator==(const Return&, const Return&); - -struct Deliver: - public Command -{ - Str8 consumerTag; - Uint64 deliveryTag; - Bit redelivered; - exchange::Name exchange; - Str8 routingKey; - Str8 identifier; - - static const char* NAME; - static const uint8_t CODE=0xb; - static const uint8_t CLASS_CODE=file::CODE; - static const char* CLASS_NAME; - explicit Deliver( - const Str8& consumerTag_=Str8(), - Uint64 deliveryTag_=Uint64(), - Bit redelivered_=Bit(), - const exchange::Name& exchange_=exchange::Name(), - const Str8& routingKey_=Str8(), - const Str8& identifier_=Str8() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(consumerTag)(deliveryTag)(redelivered)(exchange)(routingKey)(identifier); - } - - struct Handler - { - void fileDeliver( - const Str8& consumerTag_, - Uint64 deliveryTag_, - Bit redelivered_, - const exchange::Name& exchange_, - const Str8& routingKey_, - const Str8& identifier_ - ); - }; - - template void invoke(T& target)const - { - target.fileDeliver(consumerTag, deliveryTag, redelivered, exchange, routingKey, identifier ); - } -}; -inline CommandPacker serializable(Deliver& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Deliver&); -bool operator==(const Deliver&, const Deliver&); - -struct Ack: - public Command -{ - Uint64 deliveryTag; - Bit multiple; - - static const char* NAME; - static const uint8_t CODE=0xc; - static const uint8_t CLASS_CODE=file::CODE; - static const char* CLASS_NAME; - explicit Ack( - Uint64 deliveryTag_=Uint64(), - Bit multiple_=Bit() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(deliveryTag)(multiple); - } - - struct Handler - { - void fileAck( - Uint64 deliveryTag_, - Bit multiple_ - ); - }; - - template void invoke(T& target)const - { - target.fileAck(deliveryTag, multiple ); - } -}; -inline CommandPacker serializable(Ack& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Ack&); -bool operator==(const Ack&, const Ack&); - -struct Reject: - public Command -{ - Uint64 deliveryTag; - Bit requeue; - - static const char* NAME; - static const uint8_t CODE=0xd; - static const uint8_t CLASS_CODE=file::CODE; - static const char* CLASS_NAME; - explicit Reject( - Uint64 deliveryTag_=Uint64(), - Bit requeue_=Bit() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(deliveryTag)(requeue); - } - - struct Handler - { - void fileReject( - Uint64 deliveryTag_, - Bit requeue_ - ); - }; - - template void invoke(T& target)const - { - target.fileReject(deliveryTag, requeue ); - } -}; -inline CommandPacker serializable(Reject& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Reject&); -bool operator==(const Reject&, const Reject&); - -} // namespace file - - -namespace stream { - - -struct Qos: - public Command -{ - Uint32 prefetchSize; - Uint16 prefetchCount; - Uint32 consumeRate; - Bit global; - - static const char* NAME; - static const uint8_t CODE=0x1; - static const uint8_t CLASS_CODE=stream::CODE; - static const char* CLASS_NAME; - explicit Qos( - Uint32 prefetchSize_=Uint32(), - Uint16 prefetchCount_=Uint16(), - Uint32 consumeRate_=Uint32(), - Bit global_=Bit() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(prefetchSize)(prefetchCount)(consumeRate)(global); - } - - struct Handler - { - void streamQos( - Uint32 prefetchSize_, - Uint16 prefetchCount_, - Uint32 consumeRate_, - Bit global_ - ); - }; - - template void invoke(T& target)const - { - target.streamQos(prefetchSize, prefetchCount, consumeRate, global ); - } -}; -inline CommandPacker serializable(Qos& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Qos&); -bool operator==(const Qos&, const Qos&); - -struct QosOk: - public Command -{ - - static const char* NAME; - static const uint8_t CODE=0x2; - static const uint8_t CLASS_CODE=stream::CODE; - static const char* CLASS_NAME; - explicit QosOk(); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S&) {} - - struct Handler - { - void streamQosOk( - - ); - }; - - template void invoke(T& target)const - { - target.streamQosOk( ); - } -}; -inline CommandPacker serializable(QosOk& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const QosOk&); -bool operator==(const QosOk&, const QosOk&); - -struct Consume: - public Command -{ - queue::Name queue; - Str8 consumerTag; - Bit noLocal; - Bit exclusive; - Bit nowait; - Map arguments; - - static const char* NAME; - static const uint8_t CODE=0x3; - static const uint8_t CLASS_CODE=stream::CODE; - static const char* CLASS_NAME; - explicit Consume( - const queue::Name& queue_=queue::Name(), - const Str8& consumerTag_=Str8(), - Bit noLocal_=Bit(), - Bit exclusive_=Bit(), - Bit nowait_=Bit(), - const Map& arguments_=Map() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(queue)(consumerTag)(noLocal)(exclusive)(nowait)(arguments); - } - - struct Handler - { - void streamConsume( - const queue::Name& queue_, - const Str8& consumerTag_, - Bit noLocal_, - Bit exclusive_, - Bit nowait_, - const Map& arguments_ - ); - }; - - template void invoke(T& target)const - { - target.streamConsume(queue, consumerTag, noLocal, exclusive, nowait, arguments ); - } -}; -inline CommandPacker serializable(Consume& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Consume&); -bool operator==(const Consume&, const Consume&); - -struct ConsumeOk: - public Command -{ - Str8 consumerTag; - - static const char* NAME; - static const uint8_t CODE=0x4; - static const uint8_t CLASS_CODE=stream::CODE; - static const char* CLASS_NAME; - explicit ConsumeOk(const Str8& consumerTag_=Str8()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(consumerTag); - } - - struct Handler - { - void streamConsumeOk( - const Str8& consumerTag_ - ); - }; - - template void invoke(T& target)const - { - target.streamConsumeOk(consumerTag ); - } -}; -inline CommandPacker serializable(ConsumeOk& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const ConsumeOk&); -bool operator==(const ConsumeOk&, const ConsumeOk&); - -struct Cancel: - public Command -{ - Str8 consumerTag; - - static const char* NAME; - static const uint8_t CODE=0x5; - static const uint8_t CLASS_CODE=stream::CODE; - static const char* CLASS_NAME; - explicit Cancel(const Str8& consumerTag_=Str8()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(consumerTag); - } - - struct Handler - { - void streamCancel( - const Str8& consumerTag_ - ); - }; - - template void invoke(T& target)const - { - target.streamCancel(consumerTag ); - } -}; -inline CommandPacker serializable(Cancel& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Cancel&); -bool operator==(const Cancel&, const Cancel&); - -struct Publish: - public Command -{ - exchange::Name exchange; - Str8 routingKey; - Bit mandatory; - Bit immediate; - - static const char* NAME; - static const uint8_t CODE=0x6; - static const uint8_t CLASS_CODE=stream::CODE; - static const char* CLASS_NAME; - explicit Publish( - const exchange::Name& exchange_=exchange::Name(), - const Str8& routingKey_=Str8(), - Bit mandatory_=Bit(), - Bit immediate_=Bit() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(exchange)(routingKey)(mandatory)(immediate); - } - - struct Handler - { - void streamPublish( - const exchange::Name& exchange_, - const Str8& routingKey_, - Bit mandatory_, - Bit immediate_ - ); - }; - - template void invoke(T& target)const - { - target.streamPublish(exchange, routingKey, mandatory, immediate ); - } -}; -inline CommandPacker serializable(Publish& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Publish&); -bool operator==(const Publish&, const Publish&); - -struct Return: - public Command -{ - ReturnCode replyCode; - Str8 replyText; - exchange::Name exchange; - Str8 routingKey; - - static const char* NAME; - static const uint8_t CODE=0x7; - static const uint8_t CLASS_CODE=stream::CODE; - static const char* CLASS_NAME; - explicit Return( - const stream::ReturnCode& replyCode_=stream::ReturnCode(), - const Str8& replyText_=Str8(), - const exchange::Name& exchange_=exchange::Name(), - const Str8& routingKey_=Str8() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(replyCode)(replyText)(exchange)(routingKey); - } - - struct Handler - { - void streamReturn( - const stream::ReturnCode& replyCode_, - const Str8& replyText_, - const exchange::Name& exchange_, - const Str8& routingKey_ - ); - }; - - template void invoke(T& target)const - { - target.streamReturn(replyCode, replyText, exchange, routingKey ); - } -}; -inline CommandPacker serializable(Return& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Return&); -bool operator==(const Return&, const Return&); - -struct Deliver: - public Command -{ - Str8 consumerTag; - Uint64 deliveryTag; - exchange::Name exchange; - queue::Name queue; - - static const char* NAME; - static const uint8_t CODE=0x8; - static const uint8_t CLASS_CODE=stream::CODE; - static const char* CLASS_NAME; - explicit Deliver( - const Str8& consumerTag_=Str8(), - Uint64 deliveryTag_=Uint64(), - const exchange::Name& exchange_=exchange::Name(), - const queue::Name& queue_=queue::Name() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(consumerTag)(deliveryTag)(exchange)(queue); - } - - struct Handler - { - void streamDeliver( - const Str8& consumerTag_, - Uint64 deliveryTag_, - const exchange::Name& exchange_, - const queue::Name& queue_ - ); - }; - - template void invoke(T& target)const - { - target.streamDeliver(consumerTag, deliveryTag, exchange, queue ); - } -}; -inline CommandPacker serializable(Deliver& x) { return CommandPacker(x); } -std::ostream& operator << (std::ostream&, const Deliver&); -bool operator==(const Deliver&, const Deliver&); - -} // namespace stream - - -namespace cluster { - - -struct UpdateRequest: - public Control -{ - Str16 url; - - static const char* NAME; - static const uint8_t CODE=0x1; - static const uint8_t CLASS_CODE=cluster::CODE; - static const char* CLASS_NAME; - explicit UpdateRequest(const Str16& url_=Str16()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(url); - } - - struct Handler - { - void clusterUpdateRequest( - const Str16& url_ - ); - }; - - template void invoke(T& target)const - { - target.clusterUpdateRequest(url ); - } -}; -inline Packer serializable(UpdateRequest& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const UpdateRequest&); -bool operator==(const UpdateRequest&, const UpdateRequest&); - -struct UpdateOffer: - public Control -{ - Uint64 updatee; - - static const char* NAME; - static const uint8_t CODE=0x2; - static const uint8_t CLASS_CODE=cluster::CODE; - static const char* CLASS_NAME; - explicit UpdateOffer(Uint64 updatee_=Uint64()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(updatee); - } - - struct Handler - { - void clusterUpdateOffer( - Uint64 updatee_ - ); - }; - - template void invoke(T& target)const - { - target.clusterUpdateOffer(updatee ); - } -}; -inline Packer serializable(UpdateOffer& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const UpdateOffer&); -bool operator==(const UpdateOffer&, const UpdateOffer&); - -struct RetractOffer: - public Control -{ - Uint64 updatee; - - static const char* NAME; - static const uint8_t CODE=0x3; - static const uint8_t CLASS_CODE=cluster::CODE; - static const char* CLASS_NAME; - explicit RetractOffer(Uint64 updatee_=Uint64()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(updatee); - } - - struct Handler - { - void clusterRetractOffer( - Uint64 updatee_ - ); - }; - - template void invoke(T& target)const - { - target.clusterRetractOffer(updatee ); - } -}; -inline Packer serializable(RetractOffer& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const RetractOffer&); -bool operator==(const RetractOffer&, const RetractOffer&); - -struct InitialStatus: - public Control -{ - Uint32 version; - Bit active; - Uuid clusterId; - StoreState storeState; - Uuid shutdownId; - Str16 firstConfig; - - static const char* NAME; - static const uint8_t CODE=0x5; - static const uint8_t CLASS_CODE=cluster::CODE; - static const char* CLASS_NAME; - explicit InitialStatus( - Uint32 version_=Uint32(), - Bit active_=Bit(), - const Uuid& clusterId_=Uuid(), - const cluster::StoreState& storeState_=cluster::StoreState(), - const Uuid& shutdownId_=Uuid(), - const Str16& firstConfig_=Str16() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(version)(active)(clusterId)(storeState)(shutdownId)(firstConfig); - } - - struct Handler - { - void clusterInitialStatus( - Uint32 version_, - Bit active_, - const Uuid& clusterId_, - const cluster::StoreState& storeState_, - const Uuid& shutdownId_, - const Str16& firstConfig_ - ); - }; - - template void invoke(T& target)const - { - target.clusterInitialStatus(version, active, clusterId, storeState, shutdownId, firstConfig ); - } -}; -inline Packer serializable(InitialStatus& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const InitialStatus&); -bool operator==(const InitialStatus&, const InitialStatus&); - -struct Ready: - public Control -{ - Str16 url; - - static const char* NAME; - static const uint8_t CODE=0x10; - static const uint8_t CLASS_CODE=cluster::CODE; - static const char* CLASS_NAME; - explicit Ready(const Str16& url_=Str16()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(url); - } - - struct Handler - { - void clusterReady( - const Str16& url_ - ); - }; - - template void invoke(T& target)const - { - target.clusterReady(url ); - } -}; -inline Packer serializable(Ready& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const Ready&); -bool operator==(const Ready&, const Ready&); - -struct ConfigChange: - public Control -{ - Vbin16 members; - Vbin16 joined; - Vbin16 left; - - static const char* NAME; - static const uint8_t CODE=0x11; - static const uint8_t CLASS_CODE=cluster::CODE; - static const char* CLASS_NAME; - explicit ConfigChange( - const Vbin16& members_=Vbin16(), - const Vbin16& joined_=Vbin16(), - const Vbin16& left_=Vbin16() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(members)(joined)(left); - } - - struct Handler - { - void clusterConfigChange( - const Vbin16& members_, - const Vbin16& joined_, - const Vbin16& left_ - ); - }; - - template void invoke(T& target)const - { - target.clusterConfigChange(members, joined, left ); - } -}; -inline Packer serializable(ConfigChange& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const ConfigChange&); -bool operator==(const ConfigChange&, const ConfigChange&); - -struct MessageExpired: - public Control -{ - Uint64 id; - - static const char* NAME; - static const uint8_t CODE=0x12; - static const uint8_t CLASS_CODE=cluster::CODE; - static const char* CLASS_NAME; - explicit MessageExpired(Uint64 id_=Uint64()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(id); - } - - struct Handler - { - void clusterMessageExpired( - Uint64 id_ - ); - }; - - template void invoke(T& target)const - { - target.clusterMessageExpired(id ); - } -}; -inline Packer serializable(MessageExpired& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const MessageExpired&); -bool operator==(const MessageExpired&, const MessageExpired&); - -struct ErrorCheck: - public Control -{ - ErrorType type; - SequenceNo frameSeq; - - static const char* NAME; - static const uint8_t CODE=0x14; - static const uint8_t CLASS_CODE=cluster::CODE; - static const char* CLASS_NAME; - explicit ErrorCheck( - const cluster::ErrorType& type_=cluster::ErrorType(), - const SequenceNo& frameSeq_=SequenceNo() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(type)(frameSeq); - } - - struct Handler - { - void clusterErrorCheck( - const cluster::ErrorType& type_, - const SequenceNo& frameSeq_ - ); - }; - - template void invoke(T& target)const - { - target.clusterErrorCheck(type, frameSeq ); - } -}; -inline Packer serializable(ErrorCheck& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const ErrorCheck&); -bool operator==(const ErrorCheck&, const ErrorCheck&); - -struct TimerWakeup: - public Control -{ - Str16 name; - - static const char* NAME; - static const uint8_t CODE=0x15; - static const uint8_t CLASS_CODE=cluster::CODE; - static const char* CLASS_NAME; - explicit TimerWakeup(const Str16& name_=Str16()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(name); - } - - struct Handler - { - void clusterTimerWakeup( - const Str16& name_ - ); - }; - - template void invoke(T& target)const - { - target.clusterTimerWakeup(name ); - } -}; -inline Packer serializable(TimerWakeup& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const TimerWakeup&); -bool operator==(const TimerWakeup&, const TimerWakeup&); - -struct TimerDrop: - public Control -{ - Str16 name; - - static const char* NAME; - static const uint8_t CODE=0x16; - static const uint8_t CLASS_CODE=cluster::CODE; - static const char* CLASS_NAME; - explicit TimerDrop(const Str16& name_=Str16()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(name); - } - - struct Handler - { - void clusterTimerDrop( - const Str16& name_ - ); - }; - - template void invoke(T& target)const - { - target.clusterTimerDrop(name ); - } -}; -inline Packer serializable(TimerDrop& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const TimerDrop&); -bool operator==(const TimerDrop&, const TimerDrop&); - -struct Shutdown: - public Control -{ - Uuid shutdownId; - - static const char* NAME; - static const uint8_t CODE=0x20; - static const uint8_t CLASS_CODE=cluster::CODE; - static const char* CLASS_NAME; - explicit Shutdown(const Uuid& shutdownId_=Uuid()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(shutdownId); - } - - struct Handler - { - void clusterShutdown( - const Uuid& shutdownId_ - ); - }; - - template void invoke(T& target)const - { - target.clusterShutdown(shutdownId ); - } -}; -inline Packer serializable(Shutdown& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const Shutdown&); -bool operator==(const Shutdown&, const Shutdown&); - -struct DeliverToQueue: - public Control -{ - Str16 queue; - Vbin32 message; - - static const char* NAME; - static const uint8_t CODE=0x21; - static const uint8_t CLASS_CODE=cluster::CODE; - static const char* CLASS_NAME; - explicit DeliverToQueue( - const Str16& queue_=Str16(), - const Vbin32& message_=Vbin32() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(queue)(message); - } - - struct Handler - { - void clusterDeliverToQueue( - const Str16& queue_, - const Vbin32& message_ - ); - }; - - template void invoke(T& target)const - { - target.clusterDeliverToQueue(queue, message ); - } -}; -inline Packer serializable(DeliverToQueue& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const DeliverToQueue&); -bool operator==(const DeliverToQueue&, const DeliverToQueue&); - -} // namespace cluster - - -namespace cluster_connection { - - -struct Announce: - public Control -{ - Str16 managementId; - Uint32 ssf; - Str16 authid; - Bit nodict; - Str32 username; - Str32 initialFrames; - - static const char* NAME; - static const uint8_t CODE=0x1; - static const uint8_t CLASS_CODE=cluster_connection::CODE; - static const char* CLASS_NAME; - explicit Announce( - const Str16& managementId_=Str16(), - Uint32 ssf_=Uint32(), - const Str16& authid_=Str16(), - Bit nodict_=Bit(), - const Str32& username_=Str32(), - const Str32& initialFrames_=Str32() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(managementId)(ssf)(authid)(nodict)(username)(initialFrames); - } - - struct Handler - { - void clusterConnectionAnnounce( - const Str16& managementId_, - Uint32 ssf_, - const Str16& authid_, - Bit nodict_, - const Str32& username_, - const Str32& initialFrames_ - ); - }; - - template void invoke(T& target)const - { - target.clusterConnectionAnnounce(managementId, ssf, authid, nodict, username, initialFrames ); - } -}; -inline Packer serializable(Announce& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const Announce&); -bool operator==(const Announce&, const Announce&); - -struct DeliverClose: - public Control -{ - - static const char* NAME; - static const uint8_t CODE=0x2; - static const uint8_t CLASS_CODE=cluster_connection::CODE; - static const char* CLASS_NAME; - explicit DeliverClose(); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S&) {} - - struct Handler - { - void clusterConnectionDeliverClose( - - ); - }; - - template void invoke(T& target)const - { - target.clusterConnectionDeliverClose( ); - } -}; -inline Packer serializable(DeliverClose& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const DeliverClose&); -bool operator==(const DeliverClose&, const DeliverClose&); - -struct DeliverDoOutput: - public Control -{ - Uint32 limit; - - static const char* NAME; - static const uint8_t CODE=0x3; - static const uint8_t CLASS_CODE=cluster_connection::CODE; - static const char* CLASS_NAME; - explicit DeliverDoOutput(Uint32 limit_=Uint32()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(limit); - } - - struct Handler - { - void clusterConnectionDeliverDoOutput( - Uint32 limit_ - ); - }; - - template void invoke(T& target)const - { - target.clusterConnectionDeliverDoOutput(limit ); - } -}; -inline Packer serializable(DeliverDoOutput& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const DeliverDoOutput&); -bool operator==(const DeliverDoOutput&, const DeliverDoOutput&); - -struct Abort: - public Control -{ - - static const char* NAME; - static const uint8_t CODE=0x4; - static const uint8_t CLASS_CODE=cluster_connection::CODE; - static const char* CLASS_NAME; - explicit Abort(); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S&) {} - - struct Handler - { - void clusterConnectionAbort( - - ); - }; - - template void invoke(T& target)const - { - target.clusterConnectionAbort( ); - } -}; -inline Packer serializable(Abort& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const Abort&); -bool operator==(const Abort&, const Abort&); - -struct ShadowSetUser: - public Control -{ - Str16 userId; - - static const char* NAME; - static const uint8_t CODE=0x0E; - static const uint8_t CLASS_CODE=cluster_connection::CODE; - static const char* CLASS_NAME; - explicit ShadowSetUser(const Str16& userId_=Str16()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(userId); - } - - struct Handler - { - void clusterConnectionShadowSetUser( - const Str16& userId_ - ); - }; - - template void invoke(T& target)const - { - target.clusterConnectionShadowSetUser(userId ); - } -}; -inline Packer serializable(ShadowSetUser& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const ShadowSetUser&); -bool operator==(const ShadowSetUser&, const ShadowSetUser&); - -struct ShadowPrepare: - public Control -{ - Str16 managementId; - - static const char* NAME; - static const uint8_t CODE=0x0F; - static const uint8_t CLASS_CODE=cluster_connection::CODE; - static const char* CLASS_NAME; - explicit ShadowPrepare(const Str16& managementId_=Str16()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(managementId); - } - - struct Handler - { - void clusterConnectionShadowPrepare( - const Str16& managementId_ - ); - }; - - template void invoke(T& target)const - { - target.clusterConnectionShadowPrepare(managementId ); - } -}; -inline Packer serializable(ShadowPrepare& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const ShadowPrepare&); -bool operator==(const ShadowPrepare&, const ShadowPrepare&); - -struct ConsumerState: - public Control -{ - Str8 name; - Bit blocked; - Bit notifyEnabled; - SequenceNo position; - - static const char* NAME; - static const uint8_t CODE=0x10; - static const uint8_t CLASS_CODE=cluster_connection::CODE; - static const char* CLASS_NAME; - explicit ConsumerState( - const Str8& name_=Str8(), - Bit blocked_=Bit(), - Bit notifyEnabled_=Bit(), - const SequenceNo& position_=SequenceNo() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(name)(blocked)(notifyEnabled)(position); - } - - struct Handler - { - void clusterConnectionConsumerState( - const Str8& name_, - Bit blocked_, - Bit notifyEnabled_, - const SequenceNo& position_ - ); - }; - - template void invoke(T& target)const - { - target.clusterConnectionConsumerState(name, blocked, notifyEnabled, position ); - } -}; -inline Packer serializable(ConsumerState& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const ConsumerState&); -bool operator==(const ConsumerState&, const ConsumerState&); - -struct DeliveryRecord: - public Control -{ - Str8 queue; - SequenceNo position; - Str8 tag; - SequenceNo id; - Bit acquired; - Bit accepted; - Bit cancelled; - Bit completed; - Bit ended; - Bit windowing; - Bit enqueued; - Uint32 credit; - - static const char* NAME; - static const uint8_t CODE=0x11; - static const uint8_t CLASS_CODE=cluster_connection::CODE; - static const char* CLASS_NAME; - explicit DeliveryRecord( - const Str8& queue_=Str8(), - const SequenceNo& position_=SequenceNo(), - const Str8& tag_=Str8(), - const SequenceNo& id_=SequenceNo(), - Bit acquired_=Bit(), - Bit accepted_=Bit(), - Bit cancelled_=Bit(), - Bit completed_=Bit(), - Bit ended_=Bit(), - Bit windowing_=Bit(), - Bit enqueued_=Bit(), - Uint32 credit_=Uint32() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(queue)(position)(tag)(id)(acquired)(accepted)(cancelled)(completed)(ended)(windowing)(enqueued)(credit); - } - - struct Handler - { - void clusterConnectionDeliveryRecord( - const Str8& queue_, - const SequenceNo& position_, - const Str8& tag_, - const SequenceNo& id_, - Bit acquired_, - Bit accepted_, - Bit cancelled_, - Bit completed_, - Bit ended_, - Bit windowing_, - Bit enqueued_, - Uint32 credit_ - ); - }; - - template void invoke(T& target)const - { - target.clusterConnectionDeliveryRecord(queue, position, tag, id, acquired, accepted, cancelled, completed, ended, windowing, enqueued, credit ); - } -}; -inline Packer serializable(DeliveryRecord& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const DeliveryRecord&); -bool operator==(const DeliveryRecord&, const DeliveryRecord&); - -struct TxStart: - public Control -{ - - static const char* NAME; - static const uint8_t CODE=0x12; - static const uint8_t CLASS_CODE=cluster_connection::CODE; - static const char* CLASS_NAME; - explicit TxStart(); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S&) {} - - struct Handler - { - void clusterConnectionTxStart( - - ); - }; - - template void invoke(T& target)const - { - target.clusterConnectionTxStart( ); - } -}; -inline Packer serializable(TxStart& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const TxStart&); -bool operator==(const TxStart&, const TxStart&); - -struct TxAccept: - public Control -{ - SequenceSet commands; - - static const char* NAME; - static const uint8_t CODE=0x13; - static const uint8_t CLASS_CODE=cluster_connection::CODE; - static const char* CLASS_NAME; - explicit TxAccept(const SequenceSet& commands_=SequenceSet()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(commands); - } - - struct Handler - { - void clusterConnectionTxAccept( - const SequenceSet& commands_ - ); - }; - - template void invoke(T& target)const - { - target.clusterConnectionTxAccept(commands ); - } -}; -inline Packer serializable(TxAccept& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const TxAccept&); -bool operator==(const TxAccept&, const TxAccept&); - -struct TxDequeue: - public Control -{ - Str8 queue; - - static const char* NAME; - static const uint8_t CODE=0x14; - static const uint8_t CLASS_CODE=cluster_connection::CODE; - static const char* CLASS_NAME; - explicit TxDequeue(const Str8& queue_=Str8()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(queue); - } - - struct Handler - { - void clusterConnectionTxDequeue( - const Str8& queue_ - ); - }; - - template void invoke(T& target)const - { - target.clusterConnectionTxDequeue(queue ); - } -}; -inline Packer serializable(TxDequeue& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const TxDequeue&); -bool operator==(const TxDequeue&, const TxDequeue&); - -struct TxEnqueue: - public Control -{ - Str8 queue; - - static const char* NAME; - static const uint8_t CODE=0x15; - static const uint8_t CLASS_CODE=cluster_connection::CODE; - static const char* CLASS_NAME; - explicit TxEnqueue(const Str8& queue_=Str8()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(queue); - } - - struct Handler - { - void clusterConnectionTxEnqueue( - const Str8& queue_ - ); - }; - - template void invoke(T& target)const - { - target.clusterConnectionTxEnqueue(queue ); - } -}; -inline Packer serializable(TxEnqueue& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const TxEnqueue&); -bool operator==(const TxEnqueue&, const TxEnqueue&); - -struct TxPublish: - public Control -{ - ArrayDomain queues; - Bit delivered; - - static const char* NAME; - static const uint8_t CODE=0x16; - static const uint8_t CLASS_CODE=cluster_connection::CODE; - static const char* CLASS_NAME; - explicit TxPublish( - const ArrayDomain & queues_=ArrayDomain (), - Bit delivered_=Bit() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(queues)(delivered); - } - - struct Handler - { - void clusterConnectionTxPublish( - const ArrayDomain & queues_, - Bit delivered_ - ); - }; - - template void invoke(T& target)const - { - target.clusterConnectionTxPublish(queues, delivered ); - } -}; -inline Packer serializable(TxPublish& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const TxPublish&); -bool operator==(const TxPublish&, const TxPublish&); - -struct TxEnd: - public Control -{ - - static const char* NAME; - static const uint8_t CODE=0x17; - static const uint8_t CLASS_CODE=cluster_connection::CODE; - static const char* CLASS_NAME; - explicit TxEnd(); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S&) {} - - struct Handler - { - void clusterConnectionTxEnd( - - ); - }; - - template void invoke(T& target)const - { - target.clusterConnectionTxEnd( ); - } -}; -inline Packer serializable(TxEnd& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const TxEnd&); -bool operator==(const TxEnd&, const TxEnd&); - -struct AccumulatedAck: - public Control -{ - SequenceSet commands; - - static const char* NAME; - static const uint8_t CODE=0x18; - static const uint8_t CLASS_CODE=cluster_connection::CODE; - static const char* CLASS_NAME; - explicit AccumulatedAck(const SequenceSet& commands_=SequenceSet()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(commands); - } - - struct Handler - { - void clusterConnectionAccumulatedAck( - const SequenceSet& commands_ - ); - }; - - template void invoke(T& target)const - { - target.clusterConnectionAccumulatedAck(commands ); - } -}; -inline Packer serializable(AccumulatedAck& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const AccumulatedAck&); -bool operator==(const AccumulatedAck&, const AccumulatedAck&); - -struct OutputTask: - public Control -{ - Uint16 channel; - Str8 name; - - static const char* NAME; - static const uint8_t CODE=0x19; - static const uint8_t CLASS_CODE=cluster_connection::CODE; - static const char* CLASS_NAME; - explicit OutputTask( - Uint16 channel_=Uint16(), - const Str8& name_=Str8() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(channel)(name); - } - - struct Handler - { - void clusterConnectionOutputTask( - Uint16 channel_, - const Str8& name_ - ); - }; - - template void invoke(T& target)const - { - target.clusterConnectionOutputTask(channel, name ); - } -}; -inline Packer serializable(OutputTask& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const OutputTask&); -bool operator==(const OutputTask&, const OutputTask&); - -struct SessionState: - public Control -{ - SequenceNo replayStart; - SequenceNo commandPoint; - SequenceSet sentIncomplete; - SequenceNo expected; - SequenceNo received; - SequenceSet unknownCompleted; - SequenceSet receivedIncomplete; - - static const char* NAME; - static const uint8_t CODE=0x1F; - static const uint8_t CLASS_CODE=cluster_connection::CODE; - static const char* CLASS_NAME; - explicit SessionState( - const SequenceNo& replayStart_=SequenceNo(), - const SequenceNo& commandPoint_=SequenceNo(), - const SequenceSet& sentIncomplete_=SequenceSet(), - const SequenceNo& expected_=SequenceNo(), - const SequenceNo& received_=SequenceNo(), - const SequenceSet& unknownCompleted_=SequenceSet(), - const SequenceSet& receivedIncomplete_=SequenceSet() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(replayStart)(commandPoint)(sentIncomplete)(expected)(received)(unknownCompleted)(receivedIncomplete); - } - - struct Handler - { - void clusterConnectionSessionState( - const SequenceNo& replayStart_, - const SequenceNo& commandPoint_, - const SequenceSet& sentIncomplete_, - const SequenceNo& expected_, - const SequenceNo& received_, - const SequenceSet& unknownCompleted_, - const SequenceSet& receivedIncomplete_ - ); - }; - - template void invoke(T& target)const - { - target.clusterConnectionSessionState(replayStart, commandPoint, sentIncomplete, expected, received, unknownCompleted, receivedIncomplete ); - } -}; -inline Packer serializable(SessionState& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const SessionState&); -bool operator==(const SessionState&, const SessionState&); - -struct ShadowReady: - public Control -{ - Uint64 memberId; - Uint64 connectionId; - Str16 managementId; - Str8 userName; - Str32 fragment; - Uint32 sendMax; - - static const char* NAME; - static const uint8_t CODE=0x20; - static const uint8_t CLASS_CODE=cluster_connection::CODE; - static const char* CLASS_NAME; - explicit ShadowReady( - Uint64 memberId_=Uint64(), - Uint64 connectionId_=Uint64(), - const Str16& managementId_=Str16(), - const Str8& userName_=Str8(), - const Str32& fragment_=Str32(), - Uint32 sendMax_=Uint32() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(memberId)(connectionId)(managementId)(userName)(fragment)(sendMax); - } - - struct Handler - { - void clusterConnectionShadowReady( - Uint64 memberId_, - Uint64 connectionId_, - const Str16& managementId_, - const Str8& userName_, - const Str32& fragment_, - Uint32 sendMax_ - ); - }; - - template void invoke(T& target)const - { - target.clusterConnectionShadowReady(memberId, connectionId, managementId, userName, fragment, sendMax ); - } -}; -inline Packer serializable(ShadowReady& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const ShadowReady&); -bool operator==(const ShadowReady&, const ShadowReady&); - -struct Membership: - public Control -{ - Map joiners; - Map members; - SequenceNo frameSeq; - - static const char* NAME; - static const uint8_t CODE=0x21; - static const uint8_t CLASS_CODE=cluster_connection::CODE; - static const char* CLASS_NAME; - explicit Membership( - const Map& joiners_=Map(), - const Map& members_=Map(), - const SequenceNo& frameSeq_=SequenceNo() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(joiners)(members)(frameSeq); - } - - struct Handler - { - void clusterConnectionMembership( - const Map& joiners_, - const Map& members_, - const SequenceNo& frameSeq_ - ); - }; - - template void invoke(T& target)const - { - target.clusterConnectionMembership(joiners, members, frameSeq ); - } -}; -inline Packer serializable(Membership& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const Membership&); -bool operator==(const Membership&, const Membership&); - -struct RetractOffer: - public Control -{ - - static const char* NAME; - static const uint8_t CODE=0x22; - static const uint8_t CLASS_CODE=cluster_connection::CODE; - static const char* CLASS_NAME; - explicit RetractOffer(); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S&) {} - - struct Handler - { - void clusterConnectionRetractOffer( - - ); - }; - - template void invoke(T& target)const - { - target.clusterConnectionRetractOffer( ); - } -}; -inline Packer serializable(RetractOffer& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const RetractOffer&); -bool operator==(const RetractOffer&, const RetractOffer&); - -struct QueuePosition: - public Control -{ - Str8 queue; - SequenceNo position; - - static const char* NAME; - static const uint8_t CODE=0x30; - static const uint8_t CLASS_CODE=cluster_connection::CODE; - static const char* CLASS_NAME; - explicit QueuePosition( - const Str8& queue_=Str8(), - const SequenceNo& position_=SequenceNo() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(queue)(position); - } - - struct Handler - { - void clusterConnectionQueuePosition( - const Str8& queue_, - const SequenceNo& position_ - ); - }; - - template void invoke(T& target)const - { - target.clusterConnectionQueuePosition(queue, position ); - } -}; -inline Packer serializable(QueuePosition& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const QueuePosition&); -bool operator==(const QueuePosition&, const QueuePosition&); - -struct Exchange: - public Control -{ - Str32 encoded; - - static const char* NAME; - static const uint8_t CODE=0x31; - static const uint8_t CLASS_CODE=cluster_connection::CODE; - static const char* CLASS_NAME; - explicit Exchange(const Str32& encoded_=Str32()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(encoded); - } - - struct Handler - { - void clusterConnectionExchange( - const Str32& encoded_ - ); - }; - - template void invoke(T& target)const - { - target.clusterConnectionExchange(encoded ); - } -}; -inline Packer serializable(Exchange& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const Exchange&); -bool operator==(const Exchange&, const Exchange&); - -struct Queue: - public Control -{ - Str32 encoded; - - static const char* NAME; - static const uint8_t CODE=0x32; - static const uint8_t CLASS_CODE=cluster_connection::CODE; - static const char* CLASS_NAME; - explicit Queue(const Str32& encoded_=Str32()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(encoded); - } - - struct Handler - { - void clusterConnectionQueue( - const Str32& encoded_ - ); - }; - - template void invoke(T& target)const - { - target.clusterConnectionQueue(encoded ); - } -}; -inline Packer serializable(Queue& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const Queue&); -bool operator==(const Queue&, const Queue&); - -struct ExpiryId: - public Control -{ - Uint64 expiryId; - - static const char* NAME; - static const uint8_t CODE=0x33; - static const uint8_t CLASS_CODE=cluster_connection::CODE; - static const char* CLASS_NAME; - explicit ExpiryId(Uint64 expiryId_=Uint64()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(expiryId); - } - - struct Handler - { - void clusterConnectionExpiryId( - Uint64 expiryId_ - ); - }; - - template void invoke(T& target)const - { - target.clusterConnectionExpiryId(expiryId ); - } -}; -inline Packer serializable(ExpiryId& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const ExpiryId&); -bool operator==(const ExpiryId&, const ExpiryId&); - -struct AddQueueListener: - public Control -{ - Str8 queue; - Uint32 consumer; - - static const char* NAME; - static const uint8_t CODE=0x34; - static const uint8_t CLASS_CODE=cluster_connection::CODE; - static const char* CLASS_NAME; - explicit AddQueueListener( - const Str8& queue_=Str8(), - Uint32 consumer_=Uint32() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(queue)(consumer); - } - - struct Handler - { - void clusterConnectionAddQueueListener( - const Str8& queue_, - Uint32 consumer_ - ); - }; - - template void invoke(T& target)const - { - target.clusterConnectionAddQueueListener(queue, consumer ); - } -}; -inline Packer serializable(AddQueueListener& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const AddQueueListener&); -bool operator==(const AddQueueListener&, const AddQueueListener&); - -struct ManagementSetupState: - public Control -{ - Uint64 objectNum; - Uint16 bootSequence; - Uuid brokerId; - Str32 vendor; - Str32 product; - Str32 instance; - - static const char* NAME; - static const uint8_t CODE=0x36; - static const uint8_t CLASS_CODE=cluster_connection::CODE; - static const char* CLASS_NAME; - explicit ManagementSetupState( - Uint64 objectNum_=Uint64(), - Uint16 bootSequence_=Uint16(), - const Uuid& brokerId_=Uuid(), - const Str32& vendor_=Str32(), - const Str32& product_=Str32(), - const Str32& instance_=Str32() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(objectNum)(bootSequence)(brokerId)(vendor)(product)(instance); - } - - struct Handler - { - void clusterConnectionManagementSetupState( - Uint64 objectNum_, - Uint16 bootSequence_, - const Uuid& brokerId_, - const Str32& vendor_, - const Str32& product_, - const Str32& instance_ - ); - }; - - template void invoke(T& target)const - { - target.clusterConnectionManagementSetupState(objectNum, bootSequence, brokerId, vendor, product, instance ); - } -}; -inline Packer serializable(ManagementSetupState& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const ManagementSetupState&); -bool operator==(const ManagementSetupState&, const ManagementSetupState&); - -struct Config: - public Control -{ - Str32 encoded; - - static const char* NAME; - static const uint8_t CODE=0x37; - static const uint8_t CLASS_CODE=cluster_connection::CODE; - static const char* CLASS_NAME; - explicit Config(const Str32& encoded_=Str32()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(encoded); - } - - struct Handler - { - void clusterConnectionConfig( - const Str32& encoded_ - ); - }; - - template void invoke(T& target)const - { - target.clusterConnectionConfig(encoded ); - } -}; -inline Packer serializable(Config& x) { return Packer(x); } -std::ostream& operator << (std::ostream&, const Config&); -bool operator==(const Config&, const Config&); - -} // namespace cluster_connection - - -}} // namespace qpid::amqp_0_10 - -#endif /*!QPID_AMQP_0_10_SPECIFICATION_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/specification_fwd.h b/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/specification_fwd.h deleted file mode 100644 index 5e9f94099f..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/specification_fwd.h +++ /dev/null @@ -1,450 +0,0 @@ -#ifndef QPID_AMQP_0_10_SPECIFICATION_FWD_H -#define QPID_AMQP_0_10_SPECIFICATION_FWD_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/amqp_0_10/built_in_types.h" - -namespace qpid { -namespace amqp_0_10 { - - -typedef ArrayDomain Str16Array; - -namespace connection { - -const uint8_t CODE=0x1; -extern const char* NAME; - -enum CloseCode { - NORMAL = 200, - CONNECTION_FORCED = 320, - INVALID_PATH = 402, - FRAMING_ERROR = 501 -}; -inline SerializeAs serializable(CloseCode& e) { - return SerializeAs(e); -} - -typedef Str16 AmqpHostUrl; - -typedef ArrayDomain AmqpHostArray; -class Start; -class StartOk; -class Secure; -class SecureOk; -class Tune; -class TuneOk; -class Open; -class OpenOk; -class Redirect; -class Heartbeat; -class Close; -class CloseOk; - -} // namespace connection - - -namespace session { - -const uint8_t CODE=0x2; -extern const char* NAME; - -typedef Vbin16 Name; - -enum DetachCode { - NORMAL = 0, - SESSION_BUSY = 1, - TRANSPORT_BUSY = 2, - NOT_ATTACHED = 3, - UNKNOWN_IDS = 4 -}; -inline SerializeAs serializable(DetachCode& e) { - return SerializeAs(e); -} - -typedef SequenceSet Commands; -class Header; -class CommandFragment; - -typedef ArrayDomain CommandFragments; -class Attach; -class Attached; -class Detach; -class Detached; -class RequestTimeout; -class Timeout; -class CommandPoint; -class Expected; -class Confirmed; -class Completed; -class KnownCompleted; -class Flush; -class Gap; - -} // namespace session - - -namespace execution { - -const uint8_t CODE=0x3; -extern const char* NAME; - -enum ErrorCode { - UNAUTHORIZED_ACCESS = 403, - NOT_FOUND = 404, - RESOURCE_LOCKED = 405, - PRECONDITION_FAILED = 406, - RESOURCE_DELETED = 408, - ILLEGAL_STATE = 409, - COMMAND_INVALID = 503, - RESOURCE_LIMIT_EXCEEDED = 506, - NOT_ALLOWED = 530, - ILLEGAL_ARGUMENT = 531, - NOT_IMPLEMENTED = 540, - INTERNAL_ERROR = 541, - INVALID_ARGUMENT = 542 -}; -inline SerializeAs serializable(ErrorCode& e) { - return SerializeAs(e); -} -class Sync; -class Result; -class Exception; - -} // namespace execution - - -namespace message { - -const uint8_t CODE=0x4; -extern const char* NAME; - -typedef Str8 Destination; - -enum AcceptMode { - EXPLICIT = 0, - NONE = 1 -}; -inline SerializeAs serializable(AcceptMode& e) { - return SerializeAs(e); -} - -enum AcquireMode { - PRE_ACQUIRED = 0, - NOT_ACQUIRED = 1 -}; -inline SerializeAs serializable(AcquireMode& e) { - return SerializeAs(e); -} - -enum RejectCode { - UNSPECIFIED = 0, - UNROUTABLE = 1, - IMMEDIATE = 2 -}; -inline SerializeAs serializable(RejectCode& e) { - return SerializeAs(e); -} - -typedef Str16 ResumeId; - -enum DeliveryMode { - NON_PERSISTENT = 1, - PERSISTENT = 2 -}; -inline SerializeAs serializable(DeliveryMode& e) { - return SerializeAs(e); -} - -enum DeliveryPriority { - LOWEST = 0, - LOWER = 1, - LOW = 2, - BELOW_AVERAGE = 3, - MEDIUM = 4, - ABOVE_AVERAGE = 5, - HIGH = 6, - HIGHER = 7, - VERY_HIGH = 8, - HIGHEST = 9 -}; -inline SerializeAs serializable(DeliveryPriority& e) { - return SerializeAs(e); -} -class DeliveryProperties; -class FragmentProperties; -class ReplyTo; -class MessageProperties; - -enum FlowMode { - CREDIT = 0, - WINDOW = 1 -}; -inline SerializeAs serializable(FlowMode& e) { - return SerializeAs(e); -} - -enum CreditUnit { - MESSAGE = 0, - BYTE = 1 -}; -inline SerializeAs serializable(CreditUnit& e) { - return SerializeAs(e); -} -class Transfer; -class Accept; -class Reject; -class Release; -class Acquire; -class Acquired; -class Resume; -class MessageResumeResult; -class Subscribe; -class Cancel; -class SetFlowMode; -class Flow; -class Flush; -class Stop; - -} // namespace message - - -namespace tx { - -const uint8_t CODE=0x5; -extern const char* NAME; -class Select; -class Commit; -class Rollback; - -} // namespace tx - - -namespace dtx { - -const uint8_t CODE=0x6; -extern const char* NAME; - -enum XaStatus { - XA_OK = 0, - XA_RBROLLBACK = 1, - XA_RBTIMEOUT = 2, - XA_HEURHAZ = 3, - XA_HEURCOM = 4, - XA_HEURRB = 5, - XA_HEURMIX = 6, - XA_RDONLY = 7 -}; -inline SerializeAs serializable(XaStatus& e) { - return SerializeAs(e); -} -class XaResult; -class Xid; -class Select; -class Start; -class End; -class Commit; -class Forget; -class GetTimeout; -class GetTimeoutResult; -class Prepare; -class Recover; -class RecoverResult; -class Rollback; -class SetTimeout; - -} // namespace dtx - - -namespace exchange { - -const uint8_t CODE=0x7; -extern const char* NAME; - -typedef Str8 Name; -class Declare; -class Delete; -class Query; -class ExchangeQueryResult; -class Bind; -class Unbind; -class Bound; -class ExchangeBoundResult; - -} // namespace exchange - - -namespace queue { - -const uint8_t CODE=0x8; -extern const char* NAME; - -typedef Str8 Name; -class Declare; -class Delete; -class Purge; -class Query; -class QueueQueryResult; - -} // namespace queue - - -namespace file { - -const uint8_t CODE=0x9; -extern const char* NAME; -class FileProperties; - -enum ReturnCode { - CONTENT_TOO_LARGE = 311, - NO_ROUTE = 312, - NO_CONSUMERS = 313 -}; -inline SerializeAs serializable(ReturnCode& e) { - return SerializeAs(e); -} -class Qos; -class QosOk; -class Consume; -class ConsumeOk; -class Cancel; -class Open; -class OpenOk; -class Stage; -class Publish; -class Return; -class Deliver; -class Ack; -class Reject; - -} // namespace file - - -namespace stream { - -const uint8_t CODE=0xa; -extern const char* NAME; -class StreamProperties; - -enum ReturnCode { - CONTENT_TOO_LARGE = 311, - NO_ROUTE = 312, - NO_CONSUMERS = 313 -}; -inline SerializeAs serializable(ReturnCode& e) { - return SerializeAs(e); -} -class Qos; -class QosOk; -class Consume; -class ConsumeOk; -class Cancel; -class Publish; -class Return; -class Deliver; - -} // namespace stream - - -namespace cluster { - -const uint8_t CODE=0x80; -extern const char* NAME; -class UpdateRequest; -class UpdateOffer; -class RetractOffer; - -enum StoreState { - NO_STORE = 0, - EMPTY_STORE = 1, - CLEAN_STORE = 2, - DIRTY_STORE = 3 -}; -inline SerializeAs serializable(StoreState& e) { - return SerializeAs(e); -} -class InitialStatus; -class Ready; -class ConfigChange; -class MessageExpired; - -enum ErrorType { - NONE = 0, - SESSION = 1, - CONNECTION = 2 -}; -inline SerializeAs serializable(ErrorType& e) { - return SerializeAs(e); -} -class ErrorCheck; -class TimerWakeup; -class TimerDrop; -class Shutdown; -class DeliverToQueue; - -} // namespace cluster - - -namespace cluster_connection { - -const uint8_t CODE=0x81; -extern const char* NAME; -class Announce; -class DeliverClose; -class DeliverDoOutput; -class Abort; -class ShadowSetUser; -class ShadowPrepare; -class ConsumerState; -class DeliveryRecord; -class TxStart; -class TxAccept; -class TxDequeue; -class TxEnqueue; -class TxPublish; -class TxEnd; -class AccumulatedAck; -class OutputTask; -class SessionState; -class ShadowReady; -class Membership; -class RetractOffer; -class QueuePosition; -class Exchange; -class Queue; -class ExpiryId; -class AddQueueListener; -class ManagementSetupState; -class Config; - -} // namespace cluster_connection - - -}} // namespace qpid::amqp_0_10 - -#endif /*!QPID_AMQP_0_10_SPECIFICATION_FWD_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/structs.h b/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/structs.h deleted file mode 100644 index 53fbaf1218..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/amqp_0_10/structs.h +++ /dev/null @@ -1,620 +0,0 @@ -#ifndef QPID_AMQP_0_10_STRUCTS_H -#define QPID_AMQP_0_10_STRUCTS_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/amqp_0_10/specification_fwd.h" -#include "qpid/amqp_0_10/Map.h" -#include "qpid/amqp_0_10/Array.h" -#include "qpid/amqp_0_10/Struct.h" -#include "qpid/amqp_0_10/UnknownStruct.h" -#include "qpid/amqp_0_10/Packer.h" - -namespace qpid { -namespace amqp_0_10 { - - -namespace connection { - - -} // namespace connection - - -namespace session { - - -struct Header -{ - Bit sync; - - static const char* NAME; - static const uint8_t SIZE=1; - static const uint8_t PACK=1; - static const uint8_t CODE=0; - static const uint8_t CLASS_CODE=session::CODE; - static const char* CLASS_NAME; - explicit Header(Bit sync_=Bit()); - template void serialize(S& s) { - s(sync); - } - -}; -inline SizedPacker
serializable(Header& x) { return SizedPacker
(x); } -std::ostream& operator << (std::ostream&, const Header&); -bool operator==(const Header&, const Header&); - -struct CommandFragment -{ - SequenceNo commandId; - ByteRanges byteRanges; - - static const char* NAME; - static const uint8_t SIZE=0; - static const uint8_t PACK=0; - static const uint8_t CODE=0; - static const uint8_t CLASS_CODE=session::CODE; - static const char* CLASS_NAME; - explicit CommandFragment( - const SequenceNo& commandId_=SequenceNo(), - const ByteRanges& byteRanges_=ByteRanges() - ); - template void serialize(S& s) { - s(commandId)(byteRanges); - } - -}; -std::ostream& operator << (std::ostream&, const CommandFragment&); -bool operator==(const CommandFragment&, const CommandFragment&); - -} // namespace session - - -namespace execution { - - -} // namespace execution - - -namespace message { - - -struct DeliveryProperties: - public Struct -{ - Bit discardUnroutable; - Bit immediate; - Bit redelivered; - DeliveryPriority priority; - DeliveryMode deliveryMode; - Uint64 ttl; - Datetime timestamp; - Datetime expiration; - exchange::Name exchange; - Str8 routingKey; - ResumeId resumeId; - Uint64 resumeTtl; - - static const char* NAME; - static const uint8_t SIZE=4; - static const uint8_t PACK=2; - static const uint8_t CODE=0x1; - static const uint8_t CLASS_CODE=message::CODE; - static const char* CLASS_NAME; - explicit DeliveryProperties( - Bit discardUnroutable_=Bit(), - Bit immediate_=Bit(), - Bit redelivered_=Bit(), - const message::DeliveryPriority& priority_=message::DeliveryPriority(), - const message::DeliveryMode& deliveryMode_=message::DeliveryMode(), - Uint64 ttl_=Uint64(), - const Datetime& timestamp_=Datetime(), - const Datetime& expiration_=Datetime(), - const exchange::Name& exchange_=exchange::Name(), - const Str8& routingKey_=Str8(), - const message::ResumeId& resumeId_=message::ResumeId(), - Uint64 resumeTtl_=Uint64() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(discardUnroutable)(immediate)(redelivered)(priority)(deliveryMode)(ttl)(timestamp)(expiration)(exchange)(routingKey)(resumeId)(resumeTtl); - } - -}; -inline SizedPacker serializable(DeliveryProperties& x) { return SizedPacker(x); } -std::ostream& operator << (std::ostream&, const DeliveryProperties&); -bool operator==(const DeliveryProperties&, const DeliveryProperties&); - -struct FragmentProperties: - public Struct -{ - Bit first; - Bit last; - Uint64 fragmentSize; - - static const char* NAME; - static const uint8_t SIZE=4; - static const uint8_t PACK=2; - static const uint8_t CODE=0x2; - static const uint8_t CLASS_CODE=message::CODE; - static const char* CLASS_NAME; - explicit FragmentProperties( - Bit first_=Bit(), - Bit last_=Bit(), - Uint64 fragmentSize_=Uint64() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(first)(last)(fragmentSize); - } - -}; -inline SizedPacker serializable(FragmentProperties& x) { return SizedPacker(x); } -std::ostream& operator << (std::ostream&, const FragmentProperties&); -bool operator==(const FragmentProperties&, const FragmentProperties&); - -struct ReplyTo -{ - exchange::Name exchange; - Str8 routingKey; - - static const char* NAME; - static const uint8_t SIZE=2; - static const uint8_t PACK=2; - static const uint8_t CODE=0; - static const uint8_t CLASS_CODE=message::CODE; - static const char* CLASS_NAME; - explicit ReplyTo( - const exchange::Name& exchange_=exchange::Name(), - const Str8& routingKey_=Str8() - ); - template void serialize(S& s) { - s(exchange)(routingKey); - } - -}; -inline SizedPacker serializable(ReplyTo& x) { return SizedPacker(x); } -std::ostream& operator << (std::ostream&, const ReplyTo&); -bool operator==(const ReplyTo&, const ReplyTo&); - -struct MessageProperties: - public Struct -{ - Uint64 contentLength; - Uuid messageId; - Vbin16 correlationId; - ReplyTo replyTo; - Str8 contentType; - Str8 contentEncoding; - Vbin16 userId; - Vbin16 appId; - Map applicationHeaders; - - static const char* NAME; - static const uint8_t SIZE=4; - static const uint8_t PACK=2; - static const uint8_t CODE=0x3; - static const uint8_t CLASS_CODE=message::CODE; - static const char* CLASS_NAME; - explicit MessageProperties( - Uint64 contentLength_=Uint64(), - const Uuid& messageId_=Uuid(), - const Vbin16& correlationId_=Vbin16(), - const message::ReplyTo& replyTo_=message::ReplyTo(), - const Str8& contentType_=Str8(), - const Str8& contentEncoding_=Str8(), - const Vbin16& userId_=Vbin16(), - const Vbin16& appId_=Vbin16(), - const Map& applicationHeaders_=Map() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(contentLength)(messageId)(correlationId)(replyTo)(contentType)(contentEncoding)(userId)(appId)(applicationHeaders); - } - -}; -inline SizedPacker serializable(MessageProperties& x) { return SizedPacker(x); } -std::ostream& operator << (std::ostream&, const MessageProperties&); -bool operator==(const MessageProperties&, const MessageProperties&); - -struct Acquired: - public Struct -{ - session::Commands transfers; - - static const char* NAME; - static const uint8_t SIZE=4; - static const uint8_t PACK=2; - static const uint8_t CODE=0x4; - static const uint8_t CLASS_CODE=message::CODE; - static const char* CLASS_NAME; - explicit Acquired(const session::Commands& transfers_=session::Commands()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(transfers); - } - -}; -inline SizedPacker serializable(Acquired& x) { return SizedPacker(x); } -std::ostream& operator << (std::ostream&, const Acquired&); -bool operator==(const Acquired&, const Acquired&); - -struct MessageResumeResult: - public Struct -{ - Uint64 offset; - - static const char* NAME; - static const uint8_t SIZE=4; - static const uint8_t PACK=2; - static const uint8_t CODE=0x5; - static const uint8_t CLASS_CODE=message::CODE; - static const char* CLASS_NAME; - explicit MessageResumeResult(Uint64 offset_=Uint64()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(offset); - } - -}; -inline SizedPacker serializable(MessageResumeResult& x) { return SizedPacker(x); } -std::ostream& operator << (std::ostream&, const MessageResumeResult&); -bool operator==(const MessageResumeResult&, const MessageResumeResult&); - -} // namespace message - - -namespace tx { - - -} // namespace tx - - -namespace dtx { - - -struct XaResult: - public Struct -{ - XaStatus status; - - static const char* NAME; - static const uint8_t SIZE=4; - static const uint8_t PACK=2; - static const uint8_t CODE=0x1; - static const uint8_t CLASS_CODE=dtx::CODE; - static const char* CLASS_NAME; - explicit XaResult(const dtx::XaStatus& status_=dtx::XaStatus()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(status); - } - -}; -inline SizedPacker serializable(XaResult& x) { return SizedPacker(x); } -std::ostream& operator << (std::ostream&, const XaResult&); -bool operator==(const XaResult&, const XaResult&); - -struct Xid: - public Struct -{ - Uint32 format; - Vbin8 globalId; - Vbin8 branchId; - - static const char* NAME; - static const uint8_t SIZE=4; - static const uint8_t PACK=2; - static const uint8_t CODE=0x4; - static const uint8_t CLASS_CODE=dtx::CODE; - static const char* CLASS_NAME; - explicit Xid( - Uint32 format_=Uint32(), - const Vbin8& globalId_=Vbin8(), - const Vbin8& branchId_=Vbin8() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(format)(globalId)(branchId); - } - -}; -inline SizedPacker serializable(Xid& x) { return SizedPacker(x); } -std::ostream& operator << (std::ostream&, const Xid&); -bool operator==(const Xid&, const Xid&); - -struct GetTimeoutResult: - public Struct -{ - Uint32 timeout; - - static const char* NAME; - static const uint8_t SIZE=4; - static const uint8_t PACK=2; - static const uint8_t CODE=0x2; - static const uint8_t CLASS_CODE=dtx::CODE; - static const char* CLASS_NAME; - explicit GetTimeoutResult(Uint32 timeout_=Uint32()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(timeout); - } - -}; -inline SizedPacker serializable(GetTimeoutResult& x) { return SizedPacker(x); } -std::ostream& operator << (std::ostream&, const GetTimeoutResult&); -bool operator==(const GetTimeoutResult&, const GetTimeoutResult&); - -struct RecoverResult: - public Struct -{ - ArrayDomain inDoubt; - - static const char* NAME; - static const uint8_t SIZE=4; - static const uint8_t PACK=2; - static const uint8_t CODE=0x3; - static const uint8_t CLASS_CODE=dtx::CODE; - static const char* CLASS_NAME; - explicit RecoverResult(const ArrayDomain & inDoubt_=ArrayDomain ()); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(inDoubt); - } - -}; -inline SizedPacker serializable(RecoverResult& x) { return SizedPacker(x); } -std::ostream& operator << (std::ostream&, const RecoverResult&); -bool operator==(const RecoverResult&, const RecoverResult&); - -} // namespace dtx - - -namespace exchange { - - -struct ExchangeQueryResult: - public Struct -{ - Str8 type; - Bit durable; - Bit notFound; - Map arguments; - - static const char* NAME; - static const uint8_t SIZE=4; - static const uint8_t PACK=2; - static const uint8_t CODE=0x1; - static const uint8_t CLASS_CODE=exchange::CODE; - static const char* CLASS_NAME; - explicit ExchangeQueryResult( - const Str8& type_=Str8(), - Bit durable_=Bit(), - Bit notFound_=Bit(), - const Map& arguments_=Map() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(type)(durable)(notFound)(arguments); - } - -}; -inline SizedPacker serializable(ExchangeQueryResult& x) { return SizedPacker(x); } -std::ostream& operator << (std::ostream&, const ExchangeQueryResult&); -bool operator==(const ExchangeQueryResult&, const ExchangeQueryResult&); - -struct ExchangeBoundResult: - public Struct -{ - Bit exchangeNotFound; - Bit queueNotFound; - Bit queueNotMatched; - Bit keyNotMatched; - Bit argsNotMatched; - - static const char* NAME; - static const uint8_t SIZE=4; - static const uint8_t PACK=2; - static const uint8_t CODE=0x2; - static const uint8_t CLASS_CODE=exchange::CODE; - static const char* CLASS_NAME; - explicit ExchangeBoundResult( - Bit exchangeNotFound_=Bit(), - Bit queueNotFound_=Bit(), - Bit queueNotMatched_=Bit(), - Bit keyNotMatched_=Bit(), - Bit argsNotMatched_=Bit() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(exchangeNotFound)(queueNotFound)(queueNotMatched)(keyNotMatched)(argsNotMatched); - } - -}; -inline SizedPacker serializable(ExchangeBoundResult& x) { return SizedPacker(x); } -std::ostream& operator << (std::ostream&, const ExchangeBoundResult&); -bool operator==(const ExchangeBoundResult&, const ExchangeBoundResult&); - -} // namespace exchange - - -namespace queue { - - -struct QueueQueryResult: - public Struct -{ - Name queue; - exchange::Name alternateExchange; - Bit durable; - Bit exclusive; - Bit autoDelete; - Map arguments; - Uint32 messageCount; - Uint32 subscriberCount; - - static const char* NAME; - static const uint8_t SIZE=4; - static const uint8_t PACK=2; - static const uint8_t CODE=0x1; - static const uint8_t CLASS_CODE=queue::CODE; - static const char* CLASS_NAME; - explicit QueueQueryResult( - const queue::Name& queue_=queue::Name(), - const exchange::Name& alternateExchange_=exchange::Name(), - Bit durable_=Bit(), - Bit exclusive_=Bit(), - Bit autoDelete_=Bit(), - const Map& arguments_=Map(), - Uint32 messageCount_=Uint32(), - Uint32 subscriberCount_=Uint32() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(queue)(alternateExchange)(durable)(exclusive)(autoDelete)(arguments)(messageCount)(subscriberCount); - } - -}; -inline SizedPacker serializable(QueueQueryResult& x) { return SizedPacker(x); } -std::ostream& operator << (std::ostream&, const QueueQueryResult&); -bool operator==(const QueueQueryResult&, const QueueQueryResult&); - -} // namespace queue - - -namespace file { - - -struct FileProperties: - public Struct -{ - Str8 contentType; - Str8 contentEncoding; - Map headers; - Uint8 priority; - Str8 replyTo; - Str8 messageId; - Str8 filename; - Datetime timestamp; - Str8 clusterId; - - static const char* NAME; - static const uint8_t SIZE=4; - static const uint8_t PACK=2; - static const uint8_t CODE=0x1; - static const uint8_t CLASS_CODE=file::CODE; - static const char* CLASS_NAME; - explicit FileProperties( - const Str8& contentType_=Str8(), - const Str8& contentEncoding_=Str8(), - const Map& headers_=Map(), - Uint8 priority_=Uint8(), - const Str8& replyTo_=Str8(), - const Str8& messageId_=Str8(), - const Str8& filename_=Str8(), - const Datetime& timestamp_=Datetime(), - const Str8& clusterId_=Str8() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(contentType)(contentEncoding)(headers)(priority)(replyTo)(messageId)(filename)(timestamp)(clusterId); - } - -}; -inline SizedPacker serializable(FileProperties& x) { return SizedPacker(x); } -std::ostream& operator << (std::ostream&, const FileProperties&); -bool operator==(const FileProperties&, const FileProperties&); - -} // namespace file - - -namespace stream { - - -struct StreamProperties: - public Struct -{ - Str8 contentType; - Str8 contentEncoding; - Map headers; - Uint8 priority; - Datetime timestamp; - - static const char* NAME; - static const uint8_t SIZE=4; - static const uint8_t PACK=2; - static const uint8_t CODE=0x1; - static const uint8_t CLASS_CODE=stream::CODE; - static const char* CLASS_NAME; - explicit StreamProperties( - const Str8& contentType_=Str8(), - const Str8& contentEncoding_=Str8(), - const Map& headers_=Map(), - Uint8 priority_=Uint8(), - const Datetime& timestamp_=Datetime() - ); - void accept(Visitor&); - void accept(ConstVisitor&) const; - template void serialize(S& s) { - s(contentType)(contentEncoding)(headers)(priority)(timestamp); - } - -}; -inline SizedPacker serializable(StreamProperties& x) { return SizedPacker(x); } -std::ostream& operator << (std::ostream&, const StreamProperties&); -bool operator==(const StreamProperties&, const StreamProperties&); - -} // namespace stream - - -namespace cluster { - - -} // namespace cluster - - -namespace cluster_connection { - - -} // namespace cluster_connection - - -}} // namespace qpid::amqp_0_10 - -#endif /*!QPID_AMQP_0_10_STRUCTS_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/client/AsyncSession.h b/nativeLib/org.apache.qpid/include/qpid/client/AsyncSession.h deleted file mode 100644 index d91efeb4f1..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/client/AsyncSession.h +++ /dev/null @@ -1,38 +0,0 @@ -#ifndef QPID_CLIENT_ASYNCSESSION_H -#define QPID_CLIENT_ASYNCSESSION_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#include "qpid/client/AsyncSession_0_10.h" - -namespace qpid { -namespace client { - -/** - * AsyncSession is an alias for Session_0_10 - * - * \ingroup clientapi - */ -typedef AsyncSession_0_10 AsyncSession; - -}} // namespace qpid::client - -#endif /*!QPID_CLIENT_ASYNCSESSION_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/client/AsyncSession_0_10.h b/nativeLib/org.apache.qpid/include/qpid/client/AsyncSession_0_10.h deleted file mode 100644 index be001ad53e..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/client/AsyncSession_0_10.h +++ /dev/null @@ -1,566 +0,0 @@ -#ifndef QPID_CLIENT_ASYNCSESSION_0_10_H -#define QPID_CLIENT_ASYNCSESSION_0_10_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/client/no_keyword/AsyncSession_0_10.h" -#include "qpid/client/arg.h" -#include "qpid/client/ClientImportExport.h" - -namespace qpid { -namespace client { - -/** - * AMQP 0-10 session API with keyword arguments. - * This class provides the same set of functions as no_keyword::AsyncSession_0_10, but also - * allows parameters be passed using keywords. The keyword is the - * parameter name in the namespace "arg". - * - * For example given the normal function "foo(int x=0, int y=0, int z=0)" - * you could call it in either of the following ways: - * - * @code - * session.foo(1,2,3); // Normal no keywords - * session.foo(arg::z=3, arg::x=1); // Keywords and a default - * @endcode - * - * The keyword functions are easy to use but their declarations are hard - * to read. You may find it easier to read the documentation for no_keyword::AsyncSession_0_10 - * which provides the same set of functions using normal non-keyword - * declarations. - * - * \ingroup clientapi - * - * - * \details - * - *

Publishing Messages

- *
    - *
  • messageTransfer()

    - *
    session.messageTransfer(arg::content=message, arg::destination="amq.topic");
  • - *
  • messageTransfer() — asynchronous

    - *
    #include <qpid/client/AsyncSession.h>
    - * 
    - * for (int i=0; i<10; i++) {
    - *     message.setData(message_data.str());
    - *     async(session).messageTransfer(arg::content=message,  arg::destination="amq.direct");        
    - * }
    - * 
    - * session.sync();
    - * 
    - *
  • - *
- * - *

Exchanges

- *
    - *
  • exchangeBind()

    - *
    session.exchangeBind(arg::exchange="amq.topic", arg::queue=queue, arg::bindingKey=routing_key);
    - *
  • - *
  • exchangeUnbind()

    - *
    session.exchangeUnBind(arg::exchange="amq.topic", arg::queue=queue, arg::bindingKey=routing_key);
  • - *
  • exchangeBound()

    - *
    if (session.exchangeBound(arg::exchange="amq.topic", arg::queue=queue, arg::bindingKey=rk)){...}
    - *
    if (session.exchangeBound(arg::exchange="amq.topic", arg::queue=queue)){...}
    - *
  • - *
  • exchangeDeclare()

    - *
    session.exchangeDeclare(arg::exchange="my.topic", arg::type="topic");
    - *
    session.exchangeDeclare(arg::exchange="xml", arg::type="xml");
    - *
  • - *
  • exchangeDelete()

    - *
    session.exchangeDeclare(arg::exchange="my.topic");
    - *
    session.exchangeDeclare(arg::exchange="xml", arg::ifUnused=true);
    - *
  • - *
  • exchangeQuery()

    - *
    ExchangeQueryResult eqr = session.exchangeQuery(arg::exchange="my.topic");
  • - *
- * - * - *

Configuring exchanges in session.exchangeDeclare

- * - *
arg::durable=true
- *

Default: false.

- *

If durable=true, an exchange remains active even if the server is restarted. If durable=false, an exchange is purged when a server restarts.

- * - *
arg::autoDelete=true
- *

Default: false.

- *

If autoDelete=true, deleting the last binding for an exchange also deletes the exchange.

- * - *
arg::alternatExchange="my.exchange"
- *

Default: none.

- *

If an alternate exchange is specified, messages that can not be delivered to any queue are sent to the alternate exchange.

- * - *

Queues

- *
    - *
  • queueDeclare()

    - *
    session.queueDeclare(arg::queue="message_queue");
    - *
  • - *
  • queueDelete()

    - *
    session.queueDelete(arg::queue="message_queue");
  • - *
  • queuePurge()

    - *
    session.queuePurge(arg::queue="message_queue");
  • - *
  • queueQuery()

    - *
    QueueQueryResult qqr = session.queueQuery(arg::queue="message_queue");
  • - *
- * - * - *

Configuring queues with session.queueDeclare

- *
arg::durable=true
- *

Default: false.

- *

If durable=true, a queue remains active if the server is restarted. If durable=false, a queue and its contents are lost when a server restarts.

- *
- * - *
arg::autoDelete=true
- *

Default: false.

- *

If autoDelete=true, the queue is deleted when the last active Subscription to the Queue is canceled.

- *
- * - *
arg::exclusive=true
- *

Default: false.

- *

If exclusive=true, only the Session that created a queue can access it.

- *
- * - *
arg::alternateExchange="my.exchange"
- *

Default: none.

- *

If an alternate exchange is specified, messages are routed to it if (1) they are rejected by a client, or (2) they remain on the queue when it is deleted.

- *
- * - * - *

Accepting, Acquiring, Rejecting, or Releasing Messages

- *
    - *
  • messageAccept() — acknowledges messages

    - *
    SequenceSet tobeAccepted; 
    - * toAccepted.add(msg.getId()); 
    - * session.messageAccept(toBeAccepted);
    - *
  • - *
  • messageAcquire()

    - *
    SequenceSet tobeAcquired;
    - * toBeAcquired.add(msg.getId()); 
    - * session.messageAcquire(toBeAcquired);
    - *
  • - *
  • messageReject()

    - *
    SequenceSet tobeRejected; 
    - * toRejected.add(msg.getId()); 
    - * session.messageReject(toBeRejected);
    - *
  • - *
  • messageRelease()

    - *
    SequenceSet tobeReleased; 
    - * toReleased.add(msg.getId()); 
    - * session.messageRelease(toBeReleased);
  • - *
- * - *

Transactions

- *
    - *
  • txSelect()

    - *
    session.txSelect();
    - *
  • - *
  • txCommit()

    - *
    session.txSelect();
  • - *
  • txRollback()

    - *
    session.txRollback();
  • - *
- * - * - * - */ -class AsyncSession_0_10: - public no_keyword::AsyncSession_0_10 -{ - public: - - QPID_CLIENT_EXTERN AsyncSession_0_10(); - QPID_CLIENT_EXTERN AsyncSession_0_10(const SessionBase_0_10& other); - QPID_CLIENT_EXTERN AsyncSession_0_10& operator=(const SessionBase_0_10& other); - private: - typedef boost::parameter::parameters ExecutionSyncParameters; - - typedef boost::parameter::parameters ExecutionResultParameters; - - typedef boost::parameter::parameters ExecutionExceptionParameters; - - typedef boost::parameter::parameters MessageTransferParameters; - - typedef boost::parameter::parameters MessageAcceptParameters; - - typedef boost::parameter::parameters MessageRejectParameters; - - typedef boost::parameter::parameters MessageReleaseParameters; - - typedef boost::parameter::parameters MessageAcquireParameters; - - typedef boost::parameter::parameters MessageResumeParameters; - - typedef boost::parameter::parameters MessageSubscribeParameters; - - typedef boost::parameter::parameters MessageCancelParameters; - - typedef boost::parameter::parameters MessageSetFlowModeParameters; - - typedef boost::parameter::parameters MessageFlowParameters; - - typedef boost::parameter::parameters MessageFlushParameters; - - typedef boost::parameter::parameters MessageStopParameters; - - typedef boost::parameter::parameters TxSelectParameters; - - typedef boost::parameter::parameters TxCommitParameters; - - typedef boost::parameter::parameters TxRollbackParameters; - - typedef boost::parameter::parameters DtxSelectParameters; - - typedef boost::parameter::parameters DtxStartParameters; - - typedef boost::parameter::parameters DtxEndParameters; - - typedef boost::parameter::parameters DtxCommitParameters; - - typedef boost::parameter::parameters DtxForgetParameters; - - typedef boost::parameter::parameters DtxGetTimeoutParameters; - - typedef boost::parameter::parameters DtxPrepareParameters; - - typedef boost::parameter::parameters DtxRecoverParameters; - - typedef boost::parameter::parameters DtxRollbackParameters; - - typedef boost::parameter::parameters DtxSetTimeoutParameters; - - typedef boost::parameter::parameters ExchangeDeclareParameters; - - typedef boost::parameter::parameters ExchangeDeleteParameters; - - typedef boost::parameter::parameters ExchangeQueryParameters; - - typedef boost::parameter::parameters ExchangeBindParameters; - - typedef boost::parameter::parameters ExchangeUnbindParameters; - - typedef boost::parameter::parameters ExchangeBoundParameters; - - typedef boost::parameter::parameters QueueDeclareParameters; - - typedef boost::parameter::parameters QueueDeleteParameters; - - typedef boost::parameter::parameters QueuePurgeParameters; - - typedef boost::parameter::parameters QueueQueryParameters; - - friend class Connection; - public: - BOOST_PARAMETER_MEMFUN(Completion, executionSync, 0, 1, ExecutionSyncParameters) { - return no_keyword::AsyncSession_0_10::executionSync( - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(Completion, executionResult, 0, 3, ExecutionResultParameters) { - return no_keyword::AsyncSession_0_10::executionResult( - p[arg::commandId|SequenceNumber()], - p[arg::value|string()], - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(Completion, executionException, 0, 8, ExecutionExceptionParameters) { - return no_keyword::AsyncSession_0_10::executionException( - p[arg::errorCode|0], - p[arg::commandId|SequenceNumber()], - p[arg::classCode|0], - p[arg::commandCode|0], - p[arg::fieldIndex|0], - p[arg::description|string()], - p[arg::errorInfo|FieldTable()], - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(Completion, messageTransfer, 0, 5, MessageTransferParameters) { - return no_keyword::AsyncSession_0_10::messageTransfer( - p[arg::destination|string()], - p[arg::acceptMode|1], - p[arg::acquireMode|0], - p[arg::content|Message(std::string())], - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(Completion, messageAccept, 0, 2, MessageAcceptParameters) { - return no_keyword::AsyncSession_0_10::messageAccept( - p[arg::transfers|SequenceSet()], - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(Completion, messageReject, 0, 4, MessageRejectParameters) { - return no_keyword::AsyncSession_0_10::messageReject( - p[arg::transfers|SequenceSet()], - p[arg::code|0], - p[arg::text|string()], - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(Completion, messageRelease, 0, 3, MessageReleaseParameters) { - return no_keyword::AsyncSession_0_10::messageRelease( - p[arg::transfers|SequenceSet()], - p[arg::setRedelivered|false], - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(TypedResult, messageAcquire, 0, 2, MessageAcquireParameters) { - return no_keyword::AsyncSession_0_10::messageAcquire( - p[arg::transfers|SequenceSet()], - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(TypedResult, messageResume, 0, 3, MessageResumeParameters) { - return no_keyword::AsyncSession_0_10::messageResume( - p[arg::destination|string()], - p[arg::resumeId|string()], - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(Completion, messageSubscribe, 0, 9, MessageSubscribeParameters) { - return no_keyword::AsyncSession_0_10::messageSubscribe( - p[arg::queue|string()], - p[arg::destination|string()], - p[arg::acceptMode|0], - p[arg::acquireMode|0], - p[arg::exclusive|false], - p[arg::resumeId|string()], - p[arg::resumeTtl|0], - p[arg::arguments|FieldTable()], - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(Completion, messageCancel, 0, 2, MessageCancelParameters) { - return no_keyword::AsyncSession_0_10::messageCancel( - p[arg::destination|string()], - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(Completion, messageSetFlowMode, 0, 3, MessageSetFlowModeParameters) { - return no_keyword::AsyncSession_0_10::messageSetFlowMode( - p[arg::destination|string()], - p[arg::flowMode|0], - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(Completion, messageFlow, 0, 4, MessageFlowParameters) { - return no_keyword::AsyncSession_0_10::messageFlow( - p[arg::destination|string()], - p[arg::unit|0], - p[arg::value|0], - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(Completion, messageFlush, 0, 2, MessageFlushParameters) { - return no_keyword::AsyncSession_0_10::messageFlush( - p[arg::destination|string()], - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(Completion, messageStop, 0, 2, MessageStopParameters) { - return no_keyword::AsyncSession_0_10::messageStop( - p[arg::destination|string()], - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(Completion, txSelect, 0, 1, TxSelectParameters) { - return no_keyword::AsyncSession_0_10::txSelect( - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(Completion, txCommit, 0, 1, TxCommitParameters) { - return no_keyword::AsyncSession_0_10::txCommit( - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(Completion, txRollback, 0, 1, TxRollbackParameters) { - return no_keyword::AsyncSession_0_10::txRollback( - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(Completion, dtxSelect, 0, 1, DtxSelectParameters) { - return no_keyword::AsyncSession_0_10::dtxSelect( - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(TypedResult, dtxStart, 0, 4, DtxStartParameters) { - return no_keyword::AsyncSession_0_10::dtxStart( - p[arg::xid|Xid()], - p[arg::join|false], - p[arg::resume|false], - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(TypedResult, dtxEnd, 0, 4, DtxEndParameters) { - return no_keyword::AsyncSession_0_10::dtxEnd( - p[arg::xid|Xid()], - p[arg::fail|false], - p[arg::suspend|false], - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(TypedResult, dtxCommit, 0, 3, DtxCommitParameters) { - return no_keyword::AsyncSession_0_10::dtxCommit( - p[arg::xid|Xid()], - p[arg::onePhase|false], - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(Completion, dtxForget, 0, 2, DtxForgetParameters) { - return no_keyword::AsyncSession_0_10::dtxForget( - p[arg::xid|Xid()], - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(TypedResult, dtxGetTimeout, 0, 2, DtxGetTimeoutParameters) { - return no_keyword::AsyncSession_0_10::dtxGetTimeout( - p[arg::xid|Xid()], - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(TypedResult, dtxPrepare, 0, 2, DtxPrepareParameters) { - return no_keyword::AsyncSession_0_10::dtxPrepare( - p[arg::xid|Xid()], - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(TypedResult, dtxRecover, 0, 1, DtxRecoverParameters) { - return no_keyword::AsyncSession_0_10::dtxRecover( - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(TypedResult, dtxRollback, 0, 2, DtxRollbackParameters) { - return no_keyword::AsyncSession_0_10::dtxRollback( - p[arg::xid|Xid()], - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(Completion, dtxSetTimeout, 0, 3, DtxSetTimeoutParameters) { - return no_keyword::AsyncSession_0_10::dtxSetTimeout( - p[arg::xid|Xid()], - p[arg::timeout|0], - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(Completion, exchangeDeclare, 0, 8, ExchangeDeclareParameters) { - return no_keyword::AsyncSession_0_10::exchangeDeclare( - p[arg::exchange|string()], - p[arg::type|string()], - p[arg::alternateExchange|string()], - p[arg::passive|false], - p[arg::durable|false], - p[arg::autoDelete|false], - p[arg::arguments|FieldTable()], - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(Completion, exchangeDelete, 0, 3, ExchangeDeleteParameters) { - return no_keyword::AsyncSession_0_10::exchangeDelete( - p[arg::exchange|string()], - p[arg::ifUnused|false], - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(TypedResult, exchangeQuery, 0, 2, ExchangeQueryParameters) { - return no_keyword::AsyncSession_0_10::exchangeQuery( - p[arg::name|string()], - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(Completion, exchangeBind, 0, 5, ExchangeBindParameters) { - return no_keyword::AsyncSession_0_10::exchangeBind( - p[arg::queue|string()], - p[arg::exchange|string()], - p[arg::bindingKey|string()], - p[arg::arguments|FieldTable()], - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(Completion, exchangeUnbind, 0, 4, ExchangeUnbindParameters) { - return no_keyword::AsyncSession_0_10::exchangeUnbind( - p[arg::queue|string()], - p[arg::exchange|string()], - p[arg::bindingKey|string()], - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(TypedResult, exchangeBound, 0, 5, ExchangeBoundParameters) { - return no_keyword::AsyncSession_0_10::exchangeBound( - p[arg::exchange|string()], - p[arg::queue|string()], - p[arg::bindingKey|string()], - p[arg::arguments|FieldTable()], - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(Completion, queueDeclare, 0, 8, QueueDeclareParameters) { - return no_keyword::AsyncSession_0_10::queueDeclare( - p[arg::queue|string()], - p[arg::alternateExchange|string()], - p[arg::passive|false], - p[arg::durable|false], - p[arg::exclusive|false], - p[arg::autoDelete|false], - p[arg::arguments|FieldTable()], - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(Completion, queueDelete, 0, 4, QueueDeleteParameters) { - return no_keyword::AsyncSession_0_10::queueDelete( - p[arg::queue|string()], - p[arg::ifUnused|false], - p[arg::ifEmpty|false], - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(Completion, queuePurge, 0, 2, QueuePurgeParameters) { - return no_keyword::AsyncSession_0_10::queuePurge( - p[arg::queue|string()], - p[arg::sync|false]); - } - - BOOST_PARAMETER_MEMFUN(TypedResult, queueQuery, 0, 2, QueueQueryParameters) { - return no_keyword::AsyncSession_0_10::queueQuery( - p[arg::queue|string()], - p[arg::sync|false]); - } - -}; -/** Conversion to AsyncSession_0_10 from another session type */ -inline AsyncSession_0_10 async(const SessionBase_0_10& other) { return (other); } - -inline AsyncSession_0_10::AsyncSession_0_10() {} -inline AsyncSession_0_10::AsyncSession_0_10(const SessionBase_0_10& other) { - *this = other; -} -inline AsyncSession_0_10& AsyncSession_0_10::operator=(const SessionBase_0_10& other) { - impl = static_cast(other).impl; - return *this; -} - -}} // namespace qpid::client - -#endif /*!QPID_CLIENT_ASYNCSESSION_0_10_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/client/ClientImportExport.h b/nativeLib/org.apache.qpid/include/qpid/client/ClientImportExport.h deleted file mode 100644 index 42b02e33c3..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/client/ClientImportExport.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef QPID_CLIENT_IMPORT_EXPORT_H -#define QPID_CLIENT_IMPORT_EXPORT_H - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -#if defined(WIN32) && !defined(QPID_DECLARE_STATIC) -#if defined(CLIENT_EXPORT) || defined (qpidclient_EXPORTS) -#define QPID_CLIENT_EXTERN __declspec(dllexport) -#else -#define QPID_CLIENT_EXTERN __declspec(dllimport) -#endif -#else -#define QPID_CLIENT_EXTERN -#endif - -#endif diff --git a/nativeLib/org.apache.qpid/include/qpid/client/Completion.h b/nativeLib/org.apache.qpid/include/qpid/client/Completion.h deleted file mode 100644 index 99d940f031..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/client/Completion.h +++ /dev/null @@ -1,71 +0,0 @@ -#ifndef QPID_CLIENT_COMPLETION_H -#define QPID_CLIENT_COMPLETION_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include "qpid/client/Handle.h" -#include "qpid/client/ClientImportExport.h" -#include - -namespace qpid { -namespace client { - -class CompletionImpl; -template class PrivateImplRef; - -/** - * Asynchronous commands that do not return a result will return a - * Completion. You can use the completion to wait for that specific - * command to complete. - * - *@see TypedResult - * - *\ingroup clientapi - */ -class Completion : public Handle -{ -public: - QPID_CLIENT_EXTERN Completion(CompletionImpl* = 0); - QPID_CLIENT_EXTERN Completion(const Completion&); - QPID_CLIENT_EXTERN ~Completion(); - QPID_CLIENT_EXTERN Completion& operator=(const Completion&); - - /** Wait for the asynchronous command that returned this - *Completion to complete. - * - *@exception If the command returns an error. - */ - QPID_CLIENT_EXTERN void wait(); - QPID_CLIENT_EXTERN bool isComplete(); - - protected: - QPID_CLIENT_EXTERN std::string getResult(); - - private: - typedef CompletionImpl Impl; - friend class PrivateImplRef; -}; - -}} - - -#endif /*!QPID_CLIENT_COMPLETION_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/client/Connection.h b/nativeLib/org.apache.qpid/include/qpid/client/Connection.h deleted file mode 100644 index 6ed0d98bc0..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/client/Connection.h +++ /dev/null @@ -1,228 +0,0 @@ -#ifndef QPID_CLIENT_CONNECTION_H -#define QPID_CLIENT_CONNECTION_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#include -#include -#include "qpid/client/Session.h" -#include "qpid/client/ClientImportExport.h" -#include "qpid/client/ConnectionSettings.h" -#include "qpid/framing/ProtocolVersion.h" - -#include "boost/function.hpp" - -namespace qpid { - -struct Url; - -namespace client { - -class ConnectionImpl; - -/** - * Represents a connection to an AMQP broker. All communication is - * initiated by establishing a connection, then creating one or more - * Session objects using the connection. @see newSession() - * - * \ingroup clientapi - * - * Some methods use an AMQP 0-10 URL to specify connection parameters. - * This is defined in the AMQP 0-10 specification (http://jira.amqp.org/confluence/display/AMQP/AMQP+Specification). - * - * amqp_url = "amqp:" prot_addr_list - * prot_addr_list = [prot_addr ","]* prot_addr - * prot_addr = tcp_prot_addr | tls_prot_addr - * - * tcp_prot_addr = tcp_id tcp_addr - * tcp_id = "tcp:" | "" - * tcp_addr = [host [":" port] ] - * host = - * port = number]]> - * - */ - -class Connection -{ - framing::ProtocolVersion version; - - boost::function failureCallback; - - - protected: - boost::shared_ptr impl; - - - public: - /** - * Creates a Connection object, but does not open the connection. - * @see open() - */ - QPID_CLIENT_EXTERN Connection(); - - /** - * Destroys a Connection object but does not close the connection if it - * was open. @see close() - */ - QPID_CLIENT_EXTERN ~Connection(); - - /** - * Opens a connection to a broker. - * - * @param host the host on which the broker is running. - * - * @param port the port on the which the broker is listening. - * - * @param uid the userid to connect with. - * - * @param pwd the password to connect with (currently SASL - * PLAIN is the only authentication method supported so this - * is sent in clear text). - * - * @param virtualhost the AMQP virtual host to use (virtual - * hosts, where implemented(!), provide namespace partitioning - * within a single broker). - */ - QPID_CLIENT_EXTERN void open(const std::string& host, int port = 5672, - const std::string& uid = "guest", - const std::string& pwd = "guest", - const std::string& virtualhost = "/", uint16_t maxFrameSize=65535); - - /** - * Opens a connection to a broker using a URL. - * If the URL contains multiple addresses, try each in turn - * till connection is successful. - * - * @url address of the broker to connect to. - * - * @param uid the userid to connect with. - * - * @param pwd the password to connect with (currently SASL - * PLAIN is the only authentication method supported so this - * is sent in clear text). - * - * @param virtualhost the AMQP virtual host to use (virtual - * hosts, where implemented(!), provide namespace partitioning - * within a single broker). - */ - QPID_CLIENT_EXTERN void open(const Url& url, - const std::string& uid = "guest", - const std::string& pwd = "guest", - const std::string& virtualhost = "/", uint16_t maxFrameSize=65535); - - /** - * Opens a connection to a broker using a URL. - * If the URL contains multiple addresses, try each in turn - * till connection is successful. - * - * @url address of the broker to connect to. - * - * @param settings used for any settings not provided by the URL. - * Settings provided by the url (e.g. host, port) are ignored. - */ - QPID_CLIENT_EXTERN void open(const Url& url, const ConnectionSettings& settings); - - /** - * Opens a connection to a broker. - * - * @param the settings to use (host, port etc). @see ConnectionSettings. - */ - QPID_CLIENT_EXTERN void open(const ConnectionSettings& settings); - - /** - * Close the connection. - * - * Any further use of this connection (without reopening it) will - * not succeed. - */ - QPID_CLIENT_EXTERN void close(); - - /** - * Create a new session on this connection. Sessions allow - * multiple streams of work to be multiplexed over the same - * connection. The returned Session provides functions to send - * commands to the broker. - * - * Session functions are synchronous. In other words, a Session - * function will send a command to the broker and does not return - * until it receives the broker's response confirming the command - * was executed. - * - * AsyncSession provides asynchronous versions of the same - * functions. These functions send a command to the broker but do - * not wait for a response. - * - * You can convert a Session s into an AsyncSession as follows: - * @code - * #include - * AsyncSession as = async(s); - * @endcode - * - * You can execute a single command asynchronously will a Session s - * like ths: - * @code - * async(s).messageTransfer(...); - * @endcode - * - * Using an AsyncSession is faster for sending large numbers of - * commands, since each command is sent as soon as possible - * without waiting for the previous command to be confirmed. - * - * However with AsyncSession you cannot assume that a command has - * completed until you explicitly synchronize. The simplest way to - * do this is to call Session::sync() or AsyncSession::sync(). - * Both of these functions wait for the broker to confirm all - * commands issued so far on the session. - * - *@param name: A name to identify the session. @see qpid::SessionId - * If the name is empty (the default) then a unique name will be - * chosen using a Universally-unique identifier (UUID) algorithm. - */ - QPID_CLIENT_EXTERN Session newSession(const std::string& name=std::string(), uint32_t timeoutSeconds = 0); - - /** - * Resume a suspended session. A session may be resumed - * on a different connection to the one that created it. - */ - QPID_CLIENT_EXTERN void resume(Session& session); - - QPID_CLIENT_EXTERN bool isOpen() const; - - /** In a cluster, returns the initial set of known broker URLs - * at the time of connection. - */ - QPID_CLIENT_EXTERN std::vector getInitialBrokers(); - - QPID_CLIENT_EXTERN void registerFailureCallback ( boost::function fn ); - - /** - * Return the set of client negotiated settings - */ - QPID_CLIENT_EXTERN const ConnectionSettings& getNegotiatedSettings(); - - friend struct ConnectionAccess; ///<@internal - friend class SessionBase_0_10; ///<@internal -}; - -}} // namespace qpid::client - - -#endif /*!QPID_CLIENT_CONNECTION_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/client/ConnectionSettings.h b/nativeLib/org.apache.qpid/include/qpid/client/ConnectionSettings.h deleted file mode 100644 index bf060e73bb..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/client/ConnectionSettings.h +++ /dev/null @@ -1,129 +0,0 @@ -#ifndef QPID_CLIENT_CONNECTIONSETTINGS_H -#define QPID_CLIENT_CONNECTIONSETTINGS_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include "qpid/client/ClientImportExport.h" -#include "qpid/sys/IntegerTypes.h" -#include - -namespace qpid { - -namespace sys { -class Socket; -} - -namespace client { - -/** - * Settings for a Connection. - */ -struct ConnectionSettings { - - QPID_CLIENT_EXTERN ConnectionSettings(); - QPID_CLIENT_EXTERN virtual ~ConnectionSettings(); - - /** - * Allows socket to be configured; default only sets tcp-nodelay - * based on the flag set. Can be overridden. - */ - QPID_CLIENT_EXTERN virtual void configureSocket(qpid::sys::Socket&) const; - - /** - * The protocol used for the connection (defaults to 'tcp') - */ - std::string protocol; - - /** - * The host (or ip address) to connect to (defaults to 'localhost'). - */ - std::string host; - /** - * The port to connect to (defaults to 5672). - */ - uint16_t port; - /** - * Allows an AMQP 'virtual host' to be specified for the - * connection. - */ - std::string virtualhost; - - /** - * The username to use when authenticating the connection. If not - * specified the current users login is used if available. - */ - std::string username; - /** - * The password to use when authenticating the connection. - */ - std::string password; - /** - * The SASL mechanism to use when authenticating the connection; - * the options are currently PLAIN or ANONYMOUS. - */ - std::string mechanism; - /** - * Allows a locale to be specified for the connection. - */ - std::string locale; - /** - * Allows a heartbeat frequency to be specified - */ - uint16_t heartbeat; - /** - * The maximum number of channels that the client will request for - * use on this connection. - */ - uint16_t maxChannels; - /** - * The maximum frame size that the client will request for this - * connection. - */ - uint16_t maxFrameSize; - /** - * Limit the size of the connections send buffer . The buffer - * is limited to bounds * maxFrameSize. - */ - unsigned int bounds; - /** - * If true, TCP_NODELAY will be set for the connection. - */ - bool tcpNoDelay; - /** - * SASL service name - */ - std::string service; - /** - * Minimum acceptable strength of any SASL negotiated security - * layer. 0 means no security layer required. - */ - unsigned int minSsf; - /** - * Maximum acceptable strength of any SASL negotiated security - * layer. 0 means no security layer allowed. - */ - unsigned int maxSsf; -}; - -}} // namespace qpid::client - -#endif /*!QPID_CLIENT_CONNECTIONSETTINGS_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/client/FailoverListener.h b/nativeLib/org.apache.qpid/include/qpid/client/FailoverListener.h deleted file mode 100644 index 8414b80f2b..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/client/FailoverListener.h +++ /dev/null @@ -1,81 +0,0 @@ -#ifndef QPID_CLIENT_FAILOVERLISTENER_H -#define QPID_CLIENT_FAILOVERLISTENER_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include "qpid/client/ClientImportExport.h" -#include "qpid/client/MessageListener.h" -#include "qpid/client/Connection.h" -#include "qpid/client/Session.h" -#include "qpid/client/SubscriptionManager.h" -#include "qpid/Url.h" -#include "qpid/sys/Mutex.h" -#include "qpid/sys/Runnable.h" -#include "qpid/sys/Thread.h" -#include - -namespace qpid { -namespace client { - - -/** - * Listen for updates from the amq.failover exchange. - * - * In a cluster, the amq.failover exchange provides updates whenever - * the cluster membership changes. This class subscribes to the - * failover exchange and providees the latest list of known brokers. - * - * You can also subscribe to amq.failover yourself and use - * FailoverListener::decode to extract a list of broker URLs from a - * failover exchange message. - */ -class FailoverListener : private MessageListener, private qpid::sys::Runnable -{ - public: - /** The name of the standard failover exchange amq.failover */ - static QPID_CLIENT_EXTERN const std::string AMQ_FAILOVER; - - /** Extract the broker list from a failover exchange message */ - static QPID_CLIENT_EXTERN std::vector getKnownBrokers(const Message& m); - - /** Subscribe to amq.failover exchange. */ - QPID_CLIENT_EXTERN FailoverListener(Connection); - - QPID_CLIENT_EXTERN ~FailoverListener(); - - /** Returns the latest list of known broker URLs. */ - QPID_CLIENT_EXTERN std::vector getKnownBrokers() const; - - private: - void received(Message& msg); - void run(); - - mutable sys::Mutex lock; - Connection connection; - Session session; - SubscriptionManager subscriptions; - sys::Thread thread; - std::vector knownBrokers; -}; -}} // namespace qpid::client - -#endif /*!QPID_CLIENT_FAILOVERLISTENER_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/client/FailoverManager.h b/nativeLib/org.apache.qpid/include/qpid/client/FailoverManager.h deleted file mode 100644 index 0d30e2ed60..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/client/FailoverManager.h +++ /dev/null @@ -1,137 +0,0 @@ -#ifndef QPID_CLIENT_FAILOVERMANAGER_H -#define QPID_CLIENT_FAILOVERMANAGER_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include "qpid/Exception.h" -#include "qpid/client/AsyncSession.h" -#include "qpid/client/ClientImportExport.h" -#include "qpid/client/Connection.h" -#include "qpid/client/ConnectionSettings.h" -#include "qpid/client/FailoverListener.h" -#include "qpid/sys/Monitor.h" -#include - -namespace qpid { -namespace client { - -struct CannotConnectException : qpid::Exception -{ - CannotConnectException(const std::string& m) : qpid::Exception(m) {} -}; - -/** - * Utility to manage failover. - */ -class FailoverManager -{ - public: - /** - * Interface to implement for doing work that can be resumed on - * failover - */ - struct Command - { - /** - * This method will be called with isRetry=false when the - * command is first executed. The session to use for the work - * will be passed to the implementing class. If the connection - * fails while the execute call is in progress, the - * FailoverManager controlling the execution will re-establish - * a connection, open a new session and call back to the - * Command implementations execute method with the new session - * and isRetry=true. - */ - virtual void execute(AsyncSession& session, bool isRetry) = 0; - virtual ~Command() {} - }; - - struct ReconnectionStrategy - { - /** - * This method is called by the FailoverManager prior to - * establishing a connection (or re-connection) and can be - * used if the application wishes to edit or re-order the list - * which will default to the list of known brokers for the - * last connection. - */ - virtual void editUrlList(std::vector& urls) = 0; - virtual ~ReconnectionStrategy() {} - }; - - /** - * Create a manager to control failover for a logical connection. - * - * @param settings the initial connection settings - * @param strategy optional stratgey callback allowing application - * to edit or reorder the list of urls to which reconnection is - * attempted - */ - QPID_CLIENT_EXTERN FailoverManager(const ConnectionSettings& settings, ReconnectionStrategy* strategy = 0); - /** - * Return the current connection if open or attept to reconnect to - * the specified list of urls. If no list is specified the list of - * known brokers from the last connection will be used. If no list - * is specified and this is the first connect attempt, the host - * and port from the initial settings will be used. - * - * If the full list is tried and all attempts fail, - * CannotConnectException is thrown. - */ - QPID_CLIENT_EXTERN Connection& connect(std::vector brokers = std::vector()); - /** - * Return the current connection whether open or not - */ - QPID_CLIENT_EXTERN Connection& getConnection(); - /** - * Close the current connection - */ - QPID_CLIENT_EXTERN void close(); - /** - * Reliably execute the specified command. This involves creating - * a session on which to carry out the work of the command, - * handling failover occuring while exeuting that command and - * re-starting the work. - * - * Multiple concurrent threads can call execute with different - * commands; each thread will be allocated its own - * session. FailoverManager will coordinate the different threads - * on failover to ensure they continue to use the same logical - * connection. - */ - QPID_CLIENT_EXTERN void execute(Command&); - private: - enum State {IDLE, CONNECTING, CANT_CONNECT}; - - qpid::sys::Monitor lock; - Connection connection; - std::auto_ptr failoverListener; - ConnectionSettings settings; - ReconnectionStrategy* strategy; - State state; - - void attempt(Connection&, ConnectionSettings settings, std::vector urls); - void attempt(Connection&, ConnectionSettings settings); -}; -}} // namespace qpid::client - -#endif /*!QPID_CLIENT_FAILOVERMANAGER_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/client/FlowControl.h b/nativeLib/org.apache.qpid/include/qpid/client/FlowControl.h deleted file mode 100644 index bff7071b3b..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/client/FlowControl.h +++ /dev/null @@ -1,75 +0,0 @@ -#ifndef QPID_CLIENT_FLOWCONTROL_H -#define QPID_CLIENT_FLOWCONTROL_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include - -namespace qpid { -namespace client { - -/** - * Flow control works by associating a finite amount of "credit" - * with a subscription. - * - * Credit includes a message count and a byte count. Each message - * received decreases the message count by one, and the byte count by - * the size of the message. Either count can have the special value - * UNLIMITED which is never decreased. - * - * A subscription's credit is exhausted when the message count is 0 or - * the byte count is too small for the next available message. The - * subscription will not receive any further messages until is credit - * is renewed. - * - * In "window mode" credit is automatically renewed when a message is - * completed (which by default happens when it is accepted). In - * non-window mode credit is not automatically renewed, it must be - * explicitly re-set (@see Subscription) - */ -struct FlowControl { - static const uint32_t UNLIMITED=0xFFFFFFFF; - FlowControl(uint32_t messages_=0, uint32_t bytes_=0, bool window_=false) - : messages(messages_), bytes(bytes_), window(window_) {} - - static FlowControl messageCredit(uint32_t messages_) { return FlowControl(messages_,UNLIMITED,false); } - static FlowControl messageWindow(uint32_t messages_) { return FlowControl(messages_,UNLIMITED,true); } - static FlowControl byteCredit(uint32_t bytes_) { return FlowControl(UNLIMITED,bytes_,false); } - static FlowControl byteWindow(uint32_t bytes_) { return FlowControl(UNLIMITED,bytes_,true); } - static FlowControl unlimited() { return FlowControl(UNLIMITED, UNLIMITED, false); } - static FlowControl zero() { return FlowControl(0, 0, false); } - - /** Message credit: subscription can accept up to this many messages. */ - uint32_t messages; - /** Byte credit: subscription can accept up to this many bytes of message content. */ - uint32_t bytes; - /** Window mode. If true credit is automatically renewed as messages are acknowledged. */ - bool window; - - bool operator==(const FlowControl& x) { - return messages == x.messages && bytes == x.bytes && window == x.window; - }; -}; - -}} // namespace qpid::client - -#endif /*!QPID_CLIENT_FLOWCONTROL_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/client/Future.h b/nativeLib/org.apache.qpid/include/qpid/client/Future.h deleted file mode 100644 index 09088e68f6..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/client/Future.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#ifndef _Future_ -#define _Future_ - -#include -#include -#include "qpid/Exception.h" -#include "qpid/framing/SequenceNumber.h" -#include "qpid/client/FutureCompletion.h" -#include "qpid/client/FutureResult.h" -#include "qpid/client/ClientImportExport.h" - -namespace qpid { -namespace client { - -/**@internal */ -class Future -{ - framing::SequenceNumber command; - boost::shared_ptr result; - bool complete; - -public: - Future() : complete(false) {} - Future(const framing::SequenceNumber& id) : command(id), complete(false) {} - - std::string getResult(SessionImpl& session) { - if (result) return result->getResult(session); - else throw Exception("Result not expected"); - } - - QPID_CLIENT_EXTERN void wait(SessionImpl& session); - QPID_CLIENT_EXTERN bool isComplete(SessionImpl& session); - QPID_CLIENT_EXTERN void setFutureResult(boost::shared_ptr r); -}; - -}} - -#endif diff --git a/nativeLib/org.apache.qpid/include/qpid/client/FutureCompletion.h b/nativeLib/org.apache.qpid/include/qpid/client/FutureCompletion.h deleted file mode 100644 index 0970f494b7..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/client/FutureCompletion.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#ifndef _FutureCompletion_ -#define _FutureCompletion_ - -#include "qpid/framing/amqp_framing.h" -#include "qpid/sys/Monitor.h" - -namespace qpid { -namespace client { - -///@internal -class FutureCompletion -{ -protected: - mutable sys::Monitor lock; - bool complete; - -public: - FutureCompletion(); - virtual ~FutureCompletion(){} - bool isComplete() const; - void waitForCompletion() const; - void completed(); -}; - -}} - - -#endif diff --git a/nativeLib/org.apache.qpid/include/qpid/client/FutureResult.h b/nativeLib/org.apache.qpid/include/qpid/client/FutureResult.h deleted file mode 100644 index b2b663daa1..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/client/FutureResult.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#ifndef _FutureResult_ -#define _FutureResult_ - -#include - -#include "qpid/client/ClientImportExport.h" -#include "qpid/framing/amqp_framing.h" -#include "qpid/client/FutureCompletion.h" - -namespace qpid { -namespace client { - -class SessionImpl; - -///@internal -class FutureResult : public FutureCompletion -{ - std::string result; -public: - QPID_CLIENT_EXTERN const std::string& getResult(SessionImpl& session) const; - void received(const std::string& result); -}; - -}} - - - -#endif diff --git a/nativeLib/org.apache.qpid/include/qpid/client/Handle.h b/nativeLib/org.apache.qpid/include/qpid/client/Handle.h deleted file mode 100644 index 088e836fcf..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/client/Handle.h +++ /dev/null @@ -1,71 +0,0 @@ -#ifndef QPID_CLIENT_HANDLE_H -#define QPID_CLIENT_HANDLE_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include "qpid/client/ClientImportExport.h" - -namespace qpid { -namespace client { - -template class PrivateImplRef; - -/** - * A handle is like a pointer: refers to an underlying implementation object. - * Copying the handle does not copy the object. - * - * Handles can be null, like a 0 pointer. Use isValid(), isNull() or the - * conversion to bool to test for a null handle. - */ -template class Handle { - public: - - /**@return true if handle is valid, i.e. not null. */ - QPID_CLIENT_EXTERN bool isValid() const { return impl; } - - /**@return true if handle is null. It is an error to call any function on a null handle. */ - QPID_CLIENT_EXTERN bool isNull() const { return !impl; } - - /** Conversion to bool supports idiom if (handle) { handle->... } */ - QPID_CLIENT_EXTERN operator bool() const { return impl; } - - /** Operator ! supports idiom if (!handle) { do_if_handle_is_null(); } */ - QPID_CLIENT_EXTERN bool operator !() const { return !impl; } - - void swap(Handle& h) { T* t = h.impl; h.impl = impl; impl = t; } - - protected: - typedef T Impl; - QPID_CLIENT_EXTERN Handle() :impl() {} - - // Not implemented,subclasses must implement. - QPID_CLIENT_EXTERN Handle(const Handle&); - QPID_CLIENT_EXTERN Handle& operator=(const Handle&); - - Impl* impl; - - friend class PrivateImplRef; // FIXME aconway 2009-04-30: Specify -}; - -}} // namespace qpid::client - -#endif /*!QPID_CLIENT_HANDLE_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/client/LocalQueue.h b/nativeLib/org.apache.qpid/include/qpid/client/LocalQueue.h deleted file mode 100644 index 70e4cebcf1..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/client/LocalQueue.h +++ /dev/null @@ -1,120 +0,0 @@ -#ifndef QPID_CLIENT_LOCALQUEUE_H -#define QPID_CLIENT_LOCALQUEUE_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include "qpid/client/ClientImportExport.h" -#include "qpid/client/Handle.h" -#include "qpid/client/Message.h" -#include "qpid/sys/Time.h" - -namespace qpid { -namespace client { - -class LocalQueueImpl; -template class PrivateImplRef; - -/** - * A local queue to collect messages retrieved from a remote broker - * queue. Create a queue and subscribe it using the SubscriptionManager. - * Messages from the remote queue on the broker will be stored in the - * local queue until you retrieve them. - * - * \ingroup clientapi - * - * \details Using a Local Queue - * - *
- * LocalQueue local_queue;
- * subscriptions.subscribe(local_queue, string("message_queue"));
- * for (int i=0; i<10; i++) {
- *   Message message = local_queue.get();
- *   std::cout << message.getData() << std::endl;
- * }
- * 
- * - *

Getting Messages

- * - *
  • - *

    get()

    - *
    Message message = local_queue.get();
    - *
    // Specifying timeouts (TIME_SEC, TIME_MSEC, TIME_USEC, TIME_NSEC)
    - *#include 
    - *Message message;
    - *local_queue.get(message, 5*sys::TIME_SEC);
- * - *

Checking size

- *
  • - *

    empty()

    - *
    if (local_queue.empty()) { ... }
  • - *
  • size()

    - *
    std::cout << local_queue.size();
  • - *
- */ - -class LocalQueue : public Handle { - public: - /** Create a local queue. Subscribe the local queue to a remote broker - * queue with a SubscriptionManager. - * - * LocalQueue is an alternative to implementing a MessageListener. - */ - QPID_CLIENT_EXTERN LocalQueue(); - QPID_CLIENT_EXTERN LocalQueue(const LocalQueue&); - QPID_CLIENT_EXTERN ~LocalQueue(); - QPID_CLIENT_EXTERN LocalQueue& operator=(const LocalQueue&); - - /** Wait up to timeout for the next message from the local queue. - *@param result Set to the message from the queue. - *@param timeout wait up this timeout for a message to appear. - *@return true if result was set, false if queue was empty after timeout. - */ - QPID_CLIENT_EXTERN bool get(Message& result, sys::Duration timeout=0); - - /** Get the next message off the local queue, or wait up to the timeout - * for message from the broker queue. - *@param timeout wait up this timeout for a message to appear. - *@return message from the queue. - *@throw ClosedException if subscription is closed or timeout exceeded. - */ - QPID_CLIENT_EXTERN Message get(sys::Duration timeout=sys::TIME_INFINITE); - - /** Synonym for get() */ - QPID_CLIENT_EXTERN Message pop(sys::Duration timeout=sys::TIME_INFINITE); - - /** Return true if local queue is empty. */ - QPID_CLIENT_EXTERN bool empty() const; - - /** Number of messages on the local queue */ - QPID_CLIENT_EXTERN size_t size() const; - - LocalQueue(LocalQueueImpl*); ///<@internal - - - private: - typedef LocalQueueImpl Impl; - friend class PrivateImplRef; -}; - -}} // namespace qpid::client - -#endif /*!QPID_CLIENT_LOCALQUEUE_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/client/Message.h b/nativeLib/org.apache.qpid/include/qpid/client/Message.h deleted file mode 100644 index 2401cbdc92..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/client/Message.h +++ /dev/null @@ -1,175 +0,0 @@ -#ifndef QPID_CLIENT_MESSAGE_H -#define QPID_CLIENT_MESSAGE_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include "qpid/client/ClientImportExport.h" -#include "qpid/framing/MessageProperties.h" -#include "qpid/framing/DeliveryProperties.h" -#include - -namespace qpid { - -namespace framing { -class FieldTable; -class SequenceNumber; // FIXME aconway 2009-04-17: remove with getID? -} - -namespace client { - -class MessageImpl; - -/** - * A message sent to or received from the broker. - * - * \ingroup clientapi - * \details - * - *

Getting and setting message contents

- * - *
    - *
  • - *

    getData()

    - *
    std::cout << "Response: " << message.getData() << std::endl;
    - *
  • - *
  • - *

    setData()

    - *
    message.setData("That's all, folks!");
  • - *
  • - *

    appendData()

    - *
    message.appendData(" ... let's add a bit more ...");
  • - *
- * - *

Getting and Setting Delivery Properties

- * - *
    - *
  • - *

    getDeliveryProperties()

    - *
    message.getDeliveryProperties().setRoutingKey("control");
    - *
    message.getDeliveryProperties().setDeliveryMode(PERSISTENT);
    - *
    message.getDeliveryProperties().setPriority(9);
    - *
    message.getDeliveryProperties().setTtl(100);
  • - * - *
  • - *

    hasDeliveryProperties()

    - *
    if (! message.hasDeliveryProperties()) {
    - *  ...
    - *}
  • - *
- * - *

Getting and Setting Message Properties

- * - *
    - *
  • - *

    getMessageProperties()

    - *
    - *request.getMessageProperties().setReplyTo(ReplyTo("amq.direct", response_queue.str()));
    - * 
    - *
    - *routingKey = request.getMessageProperties().getReplyTo().getRoutingKey();
    - *exchange = request.getMessageProperties().getReplyTo().getExchange();
    - * 
    - *
    message.getMessageProperties().setContentType("text/plain");
    - *
    message.getMessageProperties().setContentEncoding("text/plain");
    - *
  • - *
  • - *

    hasMessageProperties()

    - *
    request.getMessageProperties().hasReplyTo();
    - *
  • - *
- * - *

Getting and Setting Application Headers

- * - *
    - *
  • - *

    getHeaders()

    - *
    - *message.getHeaders().getString("control");
    - * 
    - *
    - *message.getHeaders().setString("control","continue");
    - * 
  • - *
- * - * - */ -class Message -{ -public: - /** Create a Message. - *@param data Data for the message body. - *@param routingKey Passed to the exchange that routes the message. - */ - QPID_CLIENT_EXTERN Message( - const std::string& data=std::string(), - const std::string& routingKey=std::string()); - Message(MessageImpl*); ///< @internal - QPID_CLIENT_EXTERN Message(const Message&); - QPID_CLIENT_EXTERN ~Message(); - QPID_CLIENT_EXTERN Message& operator=(const Message&); - QPID_CLIENT_EXTERN void swap(Message&); - - QPID_CLIENT_EXTERN void setData(const std::string&); - QPID_CLIENT_EXTERN const std::string& getData() const; - QPID_CLIENT_EXTERN std::string& getData(); - - QPID_CLIENT_EXTERN void appendData(const std::string&); - - QPID_CLIENT_EXTERN bool hasMessageProperties() const; - QPID_CLIENT_EXTERN framing::MessageProperties& getMessageProperties(); - QPID_CLIENT_EXTERN const framing::MessageProperties& getMessageProperties() const; - - QPID_CLIENT_EXTERN bool hasDeliveryProperties() const; - QPID_CLIENT_EXTERN framing::DeliveryProperties& getDeliveryProperties(); - QPID_CLIENT_EXTERN const framing::DeliveryProperties& getDeliveryProperties() const; - - - /** The destination of messages sent to the broker is the exchange - * name. The destination of messages received from the broker is - * the delivery tag identifyig the local subscription (often this - * is the name of the subscribed queue.) - */ - QPID_CLIENT_EXTERN std::string getDestination() const; - - /** Check the redelivered flag. */ - QPID_CLIENT_EXTERN bool isRedelivered() const; - /** Set the redelivered flag. */ - QPID_CLIENT_EXTERN void setRedelivered(bool redelivered); - - /** Get a modifyable reference to the message headers. */ - QPID_CLIENT_EXTERN framing::FieldTable& getHeaders(); - - /** Get a non-modifyable reference to the message headers. */ - QPID_CLIENT_EXTERN const framing::FieldTable& getHeaders() const; - - // FIXME aconway 2009-04-17: does this need to be in public API? - ///@internal - QPID_CLIENT_EXTERN const framing::SequenceNumber& getId() const; - - private: - MessageImpl* impl; - friend class MessageImpl; // Helper template for implementation -}; - -}} - -#endif /*!QPID_CLIENT_MESSAGE_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/client/MessageListener.h b/nativeLib/org.apache.qpid/include/qpid/client/MessageListener.h deleted file mode 100644 index d200f8cf21..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/client/MessageListener.h +++ /dev/null @@ -1,101 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#include -#include "qpid/client/ClientImportExport.h" - -#ifndef _MessageListener_ -#define _MessageListener_ - -#include "qpid/client/Message.h" - -namespace qpid { -namespace client { - - /** - * Implement a subclass of MessageListener and subscribe it using - * the SubscriptionManager to receive messages. - * - * Another way to receive messages is by using a LocalQueue. - * - * \ingroup clientapi - * \details - * - *

Using a MessageListener

- * - *
    - *
  • - *

    The received() function is called when a message arrives:

    - *
    virtual void received(Message& message)=0;
    - *
  • - *
  • - *

    Derive your own listener, implement the received() function:

    - *
    -     * class Listener : public MessageListener {
    -     *  private:
    -     *    SubscriptionManager& subscriptions;
    -     *  public:
    -     *    Listener(SubscriptionManager& subscriptions);
    -     *    virtual void received(Message& message);
    -     * };
    -     *
    -     * Listener::Listener(SubscriptionManager& subs) : subscriptions(subs)
    -     * {}
    -     *
    -     * void Listener::received(Message& message) {
    -     *   std::cout << "Message: " << message.getData() << std::endl;
    -     *   if (message.getData() == "That's all, folks!") {
    -     *       std::cout << "Shutting down listener for " << message.getDestination()
    -     *                << std::endl;
    -     *       subscriptions.cancel(message.getDestination());
    -     *   }
    -     * }
    -     *
    - *
    -     * SubscriptionManager subscriptions(session);
    -     *
    -     * // Create a listener and subscribe it to the queue named "message_queue"
    -     * Listener listener(subscriptions);
    -     * subscriptions.subscribe(listener, "message_queue");
    -     *
    -     * // Receive messages until the subscription is cancelled
    -     * // by Listener::received()
    -     * subscriptions.run();
    -     * 
    - *
  • - *
- * - */ - - class MessageListener{ - public: - QPID_CLIENT_EXTERN virtual ~MessageListener(); - - /** Called for each message arriving from the broker. Override - * in your own subclass to process messages. - */ - virtual void received(Message& msg) = 0; - }; - -} -} - - -#endif diff --git a/nativeLib/org.apache.qpid/include/qpid/client/MessageReplayTracker.h b/nativeLib/org.apache.qpid/include/qpid/client/MessageReplayTracker.h deleted file mode 100644 index 6f5a0f4ac3..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/client/MessageReplayTracker.h +++ /dev/null @@ -1,73 +0,0 @@ -#ifndef QPID_CLIENT_MESSAGEREPLAYTRACKER_H -#define QPID_CLIENT_MESSAGEREPLAYTRACKER_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#include "qpid/client/AsyncSession.h" -#include "qpid/client/Message.h" -#include "qpid/client/ClientImportExport.h" -#include -#include - -namespace qpid { -namespace client { - -/** - * Utility to track messages sent asynchronously, allowing those that - * are indoubt to be replayed over a new session. - */ -class MessageReplayTracker -{ - public: - QPID_CLIENT_EXTERN MessageReplayTracker(uint flushInterval); - QPID_CLIENT_EXTERN void send(const Message& message, const std::string& destination = ""); - QPID_CLIENT_EXTERN void init(AsyncSession session); - QPID_CLIENT_EXTERN void replay(AsyncSession session); - QPID_CLIENT_EXTERN void setFlushInterval(uint interval); - QPID_CLIENT_EXTERN uint getFlushInterval(); - QPID_CLIENT_EXTERN void checkCompletion(); - - template void foreach(F& f) { - for (std::list::const_iterator i = buffer.begin(); i != buffer.end(); i++) { - f(i->message); - } - } - - private: - struct ReplayRecord - { - Completion status; - Message message; - std::string destination; - - ReplayRecord(const Message& message, const std::string& destination); - void send(MessageReplayTracker&); - bool isComplete(); - }; - - AsyncSession session; - uint flushInterval; - uint count; - std::list buffer; -}; -}} // namespace qpid::client - -#endif /*!QPID_CLIENT_MESSAGEREPLAYTRACKER_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/client/QueueOptions.h b/nativeLib/org.apache.qpid/include/qpid/client/QueueOptions.h deleted file mode 100644 index f8a4963f06..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/client/QueueOptions.h +++ /dev/null @@ -1,129 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include "qpid/client/ClientImportExport.h" -#include "qpid/framing/FieldTable.h" - -#ifndef _QueueOptions_ -#define _QueueOptions_ - -namespace qpid { -namespace client { - -enum QueueSizePolicy {NONE, REJECT, FLOW_TO_DISK, RING, RING_STRICT}; -enum QueueOrderingPolicy {FIFO, LVQ, LVQ_NO_BROWSE}; - -/** - * A help class to set options on the Queue. Create a configured args while - * still allowing any custom configuration via the FieldTable base class - */ -class QueueOptions: public framing::FieldTable -{ - public: - QPID_CLIENT_EXTERN QueueOptions(); - QPID_CLIENT_EXTERN virtual ~QueueOptions(); - - /** - * Sets the queue sizing policy - * - * @param sp SizePolicy - * REJECT - reject if queue greater than size/count - * FLOW_TO_DISK - page messages to disk from this point is greater than size/count - * RING - limit the queue to size/count and over-write old messages round a ring - * RING_STRICT - limit the queue to size/count and reject is head == tail - * NONE - Use default broker sizing policy - * @param maxSize Set the max number of bytes for the sizing policies - * @param setMaxCount Set the max number of messages for the sizing policies - */ - QPID_CLIENT_EXTERN void setSizePolicy(QueueSizePolicy sp, uint64_t maxSize, uint32_t maxCount ); - - /** - * Enables the persisting of a queue to the store module when a cluster fails down to it's last - * node. Does so optimistically. Will start persisting when cluster count >1 again. - */ - QPID_CLIENT_EXTERN void setPersistLastNode(); - - /** - * Sets the odering policy on the Queue, default ordering is FIFO. - */ - QPID_CLIENT_EXTERN void setOrdering(QueueOrderingPolicy op); - - /** - * Use broker defualt sizing ploicy - */ - QPID_CLIENT_EXTERN void clearSizePolicy(); - - /** - * Clear Persist Last Node Policy - */ - QPID_CLIENT_EXTERN void clearPersistLastNode(); - - /** - * get the key used match LVQ in args for message transfer - */ - QPID_CLIENT_EXTERN void getLVQKey(std::string& key); - - /** - * Use default odering policy - */ - QPID_CLIENT_EXTERN void clearOrdering(); - - /** - * Turns on event generation for this queue (either enqueue only - * or for enqueue and dequeue events); the events can then be - * processed by a regsitered broker plugin. - * - * DEPRECATED - * - * This is confusing to anyone who sees only the function call - * and not the variable name / doxygen. Consider the following call: - * - * options.enableQueueEvents(false); - * - * It looks like it disables queue events, but what it really does is - * enable both enqueue and dequeue events. - * - * Use setInt() instead: - * - * options.setInt("qpid.queue_event_generation", 2); - */ - - QPID_CLIENT_EXTERN void enableQueueEvents(bool enqueueOnly); - - static QPID_CLIENT_EXTERN const std::string strMaxCountKey; - static QPID_CLIENT_EXTERN const std::string strMaxSizeKey; - static QPID_CLIENT_EXTERN const std::string strTypeKey; - static QPID_CLIENT_EXTERN const std::string strREJECT; - static QPID_CLIENT_EXTERN const std::string strFLOW_TO_DISK; - static QPID_CLIENT_EXTERN const std::string strRING; - static QPID_CLIENT_EXTERN const std::string strRING_STRICT; - static QPID_CLIENT_EXTERN const std::string strLastValueQueue; - static QPID_CLIENT_EXTERN const std::string strPersistLastNode; - static QPID_CLIENT_EXTERN const std::string strLVQMatchProperty; - static QPID_CLIENT_EXTERN const std::string strLastValueQueueNoBrowse; - static QPID_CLIENT_EXTERN const std::string strQueueEventMode; -}; - -} -} - - -#endif diff --git a/nativeLib/org.apache.qpid/include/qpid/client/Session.h b/nativeLib/org.apache.qpid/include/qpid/client/Session.h deleted file mode 100644 index c40549bbc5..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/client/Session.h +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef QPID_CLIENT_SESSION_H -#define QPID_CLIENT_SESSION_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#include "qpid/client/Session_0_10.h" - -namespace qpid { -namespace client { - -/** - * Session is an alias for Session_0_10 - * - * \ingroup clientapi - */ -typedef Session_0_10 Session; - - -}} // namespace qpid::client - -#endif /*!QPID_CLIENT_SESSION_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/client/SessionBase_0_10.h b/nativeLib/org.apache.qpid/include/qpid/client/SessionBase_0_10.h deleted file mode 100644 index 3b5c84e74b..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/client/SessionBase_0_10.h +++ /dev/null @@ -1,110 +0,0 @@ -#ifndef QPID_CLIENT_SESSIONBASE_H -#define QPID_CLIENT_SESSIONBASE_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include "qpid/SessionId.h" -#include "qpid/framing/amqp_structs.h" -#include "qpid/client/Message.h" -#include "qpid/client/Completion.h" -#include "qpid/client/TypedResult.h" -#include "qpid/client/ClientImportExport.h" -#include - -namespace qpid { -namespace client { - -class Connection; -class SessionImpl; - -using std::string; -using framing::Content; -using framing::FieldTable; -using framing::SequenceNumber; -using framing::SequenceSet; -using framing::SequenceNumberSet; -using qpid::SessionId; -using framing::Xid; - -/** Unit of message credit: messages or bytes */ -enum CreditUnit { MESSAGE_CREDIT=0, BYTE_CREDIT=1, UNLIMITED_CREDIT=0xFFFFFFFF }; - -/** - * Base class for handles to an AMQP session. - * - * Subclasses provide the AMQP commands for a given - * version of the protocol. - */ -class SessionBase_0_10 { - public: - - ///@internal - QPID_CLIENT_EXTERN SessionBase_0_10(); - QPID_CLIENT_EXTERN ~SessionBase_0_10(); - - /** Get the session ID */ - QPID_CLIENT_EXTERN SessionId getId() const; - - /** Close the session. - * A session is automatically closed when all handles to it are destroyed. - */ - QPID_CLIENT_EXTERN void close(); - - /** - * Synchronize the session: sync() waits until all commands issued - * on this session so far have been completed by the broker. - * - * Note sync() is always synchronous, even on an AsyncSession object - * because that's almost always what you want. You can call - * AsyncSession::executionSync() directly in the unusual event - * that you want to do an asynchronous sync. - */ - QPID_CLIENT_EXTERN void sync(); - - /** Set the timeout for this session. */ - QPID_CLIENT_EXTERN uint32_t timeout(uint32_t seconds); - - /** Suspend the session - detach it from its connection */ - QPID_CLIENT_EXTERN void suspend(); - - /** Resume a suspended session with a new connection */ - QPID_CLIENT_EXTERN void resume(Connection); - - /** Get the channel associated with this session */ - QPID_CLIENT_EXTERN uint16_t getChannel() const; - - QPID_CLIENT_EXTERN void flush(); - QPID_CLIENT_EXTERN void markCompleted(const framing::SequenceSet& ids, bool notifyPeer); - QPID_CLIENT_EXTERN void markCompleted(const framing::SequenceNumber& id, bool cumulative, bool notifyPeer); - QPID_CLIENT_EXTERN void sendCompletion(); - - QPID_CLIENT_EXTERN bool isValid() const; - - QPID_CLIENT_EXTERN Connection getConnection(); - protected: - boost::shared_ptr impl; - friend class SessionBase_0_10Access; -}; - -}} // namespace qpid::client - -#endif /*!QPID_CLIENT_SESSIONBASE_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/client/Session_0_10.h b/nativeLib/org.apache.qpid/include/qpid/client/Session_0_10.h deleted file mode 100644 index 2b4ec83fc5..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/client/Session_0_10.h +++ /dev/null @@ -1,566 +0,0 @@ -#ifndef QPID_CLIENT_SESSION_0_10_H -#define QPID_CLIENT_SESSION_0_10_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/client/no_keyword/Session_0_10.h" -#include "qpid/client/arg.h" -#include "qpid/client/ClientImportExport.h" - -namespace qpid { -namespace client { - -/** - * AMQP 0-10 session API with keyword arguments. - * This class provides the same set of functions as no_keyword::Session_0_10, but also - * allows parameters be passed using keywords. The keyword is the - * parameter name in the namespace "arg". - * - * For example given the normal function "foo(int x=0, int y=0, int z=0)" - * you could call it in either of the following ways: - * - * @code - * session.foo(1,2,3); // Normal no keywords - * session.foo(arg::z=3, arg::x=1); // Keywords and a default - * @endcode - * - * The keyword functions are easy to use but their declarations are hard - * to read. You may find it easier to read the documentation for no_keyword::Session_0_10 - * which provides the same set of functions using normal non-keyword - * declarations. - * - * \ingroup clientapi - * - * - * \details - * - *

Publishing Messages

- *
    - *
  • messageTransfer()

    - *
    session.messageTransfer(arg::content=message, arg::destination="amq.topic");
  • - *
  • messageTransfer() — asynchronous

    - *
    #include <qpid/client/AsyncSession.h>
    - * 
    - * for (int i=0; i<10; i++) {
    - *     message.setData(message_data.str());
    - *     async(session).messageTransfer(arg::content=message,  arg::destination="amq.direct");        
    - * }
    - * 
    - * session.sync();
    - * 
    - *
  • - *
- * - *

Exchanges

- *
    - *
  • exchangeBind()

    - *
    session.exchangeBind(arg::exchange="amq.topic", arg::queue=queue, arg::bindingKey=routing_key);
    - *
  • - *
  • exchangeUnbind()

    - *
    session.exchangeUnBind(arg::exchange="amq.topic", arg::queue=queue, arg::bindingKey=routing_key);
  • - *
  • exchangeBound()

    - *
    if (session.exchangeBound(arg::exchange="amq.topic", arg::queue=queue, arg::bindingKey=rk)){...}
    - *
    if (session.exchangeBound(arg::exchange="amq.topic", arg::queue=queue)){...}
    - *
  • - *
  • exchangeDeclare()

    - *
    session.exchangeDeclare(arg::exchange="my.topic", arg::type="topic");
    - *
    session.exchangeDeclare(arg::exchange="xml", arg::type="xml");
    - *
  • - *
  • exchangeDelete()

    - *
    session.exchangeDeclare(arg::exchange="my.topic");
    - *
    session.exchangeDeclare(arg::exchange="xml", arg::ifUnused=true);
    - *
  • - *
  • exchangeQuery()

    - *
    ExchangeQueryResult eqr = session.exchangeQuery(arg::exchange="my.topic");
  • - *
- * - * - *

Configuring exchanges in session.exchangeDeclare

- * - *
arg::durable=true
- *

Default: false.

- *

If durable=true, an exchange remains active even if the server is restarted. If durable=false, an exchange is purged when a server restarts.

- * - *
arg::autoDelete=true
- *

Default: false.

- *

If autoDelete=true, deleting the last binding for an exchange also deletes the exchange.

- * - *
arg::alternatExchange="my.exchange"
- *

Default: none.

- *

If an alternate exchange is specified, messages that can not be delivered to any queue are sent to the alternate exchange.

- * - *

Queues

- *
    - *
  • queueDeclare()

    - *
    session.queueDeclare(arg::queue="message_queue");
    - *
  • - *
  • queueDelete()

    - *
    session.queueDelete(arg::queue="message_queue");
  • - *
  • queuePurge()

    - *
    session.queuePurge(arg::queue="message_queue");
  • - *
  • queueQuery()

    - *
    QueueQueryResult qqr = session.queueQuery(arg::queue="message_queue");
  • - *
- * - * - *

Configuring queues with session.queueDeclare

- *
arg::durable=true
- *

Default: false.

- *

If durable=true, a queue remains active if the server is restarted. If durable=false, a queue and its contents are lost when a server restarts.

- *
- * - *
arg::autoDelete=true
- *

Default: false.

- *

If autoDelete=true, the queue is deleted when the last active Subscription to the Queue is canceled.

- *
- * - *
arg::exclusive=true
- *

Default: false.

- *

If exclusive=true, only the Session that created a queue can access it.

- *
- * - *
arg::alternateExchange="my.exchange"
- *

Default: none.

- *

If an alternate exchange is specified, messages are routed to it if (1) they are rejected by a client, or (2) they remain on the queue when it is deleted.

- *
- * - * - *

Accepting, Acquiring, Rejecting, or Releasing Messages

- *
    - *
  • messageAccept() — acknowledges messages

    - *
    SequenceSet tobeAccepted; 
    - * toAccepted.add(msg.getId()); 
    - * session.messageAccept(toBeAccepted);
    - *
  • - *
  • messageAcquire()

    - *
    SequenceSet tobeAcquired;
    - * toBeAcquired.add(msg.getId()); 
    - * session.messageAcquire(toBeAcquired);
    - *
  • - *
  • messageReject()

    - *
    SequenceSet tobeRejected; 
    - * toRejected.add(msg.getId()); 
    - * session.messageReject(toBeRejected);
    - *
  • - *
  • messageRelease()

    - *
    SequenceSet tobeReleased; 
    - * toReleased.add(msg.getId()); 
    - * session.messageRelease(toBeReleased);
  • - *
- * - *

Transactions

- *
    - *
  • txSelect()

    - *
    session.txSelect();
    - *
  • - *
  • txCommit()

    - *
    session.txSelect();
  • - *
  • txRollback()

    - *
    session.txRollback();
  • - *
- * - * - * - */ -class Session_0_10: - public no_keyword::Session_0_10 -{ - public: - - QPID_CLIENT_EXTERN Session_0_10(); - QPID_CLIENT_EXTERN Session_0_10(const SessionBase_0_10& other); - QPID_CLIENT_EXTERN Session_0_10& operator=(const SessionBase_0_10& other); - private: - typedef boost::parameter::parameters ExecutionSyncParameters; - - typedef boost::parameter::parameters ExecutionResultParameters; - - typedef boost::parameter::parameters ExecutionExceptionParameters; - - typedef boost::parameter::parameters MessageTransferParameters; - - typedef boost::parameter::parameters MessageAcceptParameters; - - typedef boost::parameter::parameters MessageRejectParameters; - - typedef boost::parameter::parameters MessageReleaseParameters; - - typedef boost::parameter::parameters MessageAcquireParameters; - - typedef boost::parameter::parameters MessageResumeParameters; - - typedef boost::parameter::parameters MessageSubscribeParameters; - - typedef boost::parameter::parameters MessageCancelParameters; - - typedef boost::parameter::parameters MessageSetFlowModeParameters; - - typedef boost::parameter::parameters MessageFlowParameters; - - typedef boost::parameter::parameters MessageFlushParameters; - - typedef boost::parameter::parameters MessageStopParameters; - - typedef boost::parameter::parameters TxSelectParameters; - - typedef boost::parameter::parameters TxCommitParameters; - - typedef boost::parameter::parameters TxRollbackParameters; - - typedef boost::parameter::parameters DtxSelectParameters; - - typedef boost::parameter::parameters DtxStartParameters; - - typedef boost::parameter::parameters DtxEndParameters; - - typedef boost::parameter::parameters DtxCommitParameters; - - typedef boost::parameter::parameters DtxForgetParameters; - - typedef boost::parameter::parameters DtxGetTimeoutParameters; - - typedef boost::parameter::parameters DtxPrepareParameters; - - typedef boost::parameter::parameters DtxRecoverParameters; - - typedef boost::parameter::parameters DtxRollbackParameters; - - typedef boost::parameter::parameters DtxSetTimeoutParameters; - - typedef boost::parameter::parameters ExchangeDeclareParameters; - - typedef boost::parameter::parameters ExchangeDeleteParameters; - - typedef boost::parameter::parameters ExchangeQueryParameters; - - typedef boost::parameter::parameters ExchangeBindParameters; - - typedef boost::parameter::parameters ExchangeUnbindParameters; - - typedef boost::parameter::parameters ExchangeBoundParameters; - - typedef boost::parameter::parameters QueueDeclareParameters; - - typedef boost::parameter::parameters QueueDeleteParameters; - - typedef boost::parameter::parameters QueuePurgeParameters; - - typedef boost::parameter::parameters QueueQueryParameters; - - friend class Connection; - public: - BOOST_PARAMETER_MEMFUN(void, executionSync, 0, 1, ExecutionSyncParameters) { - return no_keyword::Session_0_10::executionSync( - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(void, executionResult, 0, 3, ExecutionResultParameters) { - return no_keyword::Session_0_10::executionResult( - p[arg::commandId|SequenceNumber()], - p[arg::value|string()], - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(void, executionException, 0, 8, ExecutionExceptionParameters) { - return no_keyword::Session_0_10::executionException( - p[arg::errorCode|0], - p[arg::commandId|SequenceNumber()], - p[arg::classCode|0], - p[arg::commandCode|0], - p[arg::fieldIndex|0], - p[arg::description|string()], - p[arg::errorInfo|FieldTable()], - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(void, messageTransfer, 0, 5, MessageTransferParameters) { - return no_keyword::Session_0_10::messageTransfer( - p[arg::destination|string()], - p[arg::acceptMode|1], - p[arg::acquireMode|0], - p[arg::content|Message(std::string())], - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(void, messageAccept, 0, 2, MessageAcceptParameters) { - return no_keyword::Session_0_10::messageAccept( - p[arg::transfers|SequenceSet()], - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(void, messageReject, 0, 4, MessageRejectParameters) { - return no_keyword::Session_0_10::messageReject( - p[arg::transfers|SequenceSet()], - p[arg::code|0], - p[arg::text|string()], - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(void, messageRelease, 0, 3, MessageReleaseParameters) { - return no_keyword::Session_0_10::messageRelease( - p[arg::transfers|SequenceSet()], - p[arg::setRedelivered|false], - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(qpid::framing::MessageAcquireResult, messageAcquire, 0, 2, MessageAcquireParameters) { - return no_keyword::Session_0_10::messageAcquire( - p[arg::transfers|SequenceSet()], - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(qpid::framing::MessageResumeResult, messageResume, 0, 3, MessageResumeParameters) { - return no_keyword::Session_0_10::messageResume( - p[arg::destination|string()], - p[arg::resumeId|string()], - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(void, messageSubscribe, 0, 9, MessageSubscribeParameters) { - return no_keyword::Session_0_10::messageSubscribe( - p[arg::queue|string()], - p[arg::destination|string()], - p[arg::acceptMode|0], - p[arg::acquireMode|0], - p[arg::exclusive|false], - p[arg::resumeId|string()], - p[arg::resumeTtl|0], - p[arg::arguments|FieldTable()], - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(void, messageCancel, 0, 2, MessageCancelParameters) { - return no_keyword::Session_0_10::messageCancel( - p[arg::destination|string()], - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(void, messageSetFlowMode, 0, 3, MessageSetFlowModeParameters) { - return no_keyword::Session_0_10::messageSetFlowMode( - p[arg::destination|string()], - p[arg::flowMode|0], - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(void, messageFlow, 0, 4, MessageFlowParameters) { - return no_keyword::Session_0_10::messageFlow( - p[arg::destination|string()], - p[arg::unit|0], - p[arg::value|0], - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(void, messageFlush, 0, 2, MessageFlushParameters) { - return no_keyword::Session_0_10::messageFlush( - p[arg::destination|string()], - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(void, messageStop, 0, 2, MessageStopParameters) { - return no_keyword::Session_0_10::messageStop( - p[arg::destination|string()], - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(void, txSelect, 0, 1, TxSelectParameters) { - return no_keyword::Session_0_10::txSelect( - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(void, txCommit, 0, 1, TxCommitParameters) { - return no_keyword::Session_0_10::txCommit( - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(void, txRollback, 0, 1, TxRollbackParameters) { - return no_keyword::Session_0_10::txRollback( - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(void, dtxSelect, 0, 1, DtxSelectParameters) { - return no_keyword::Session_0_10::dtxSelect( - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(qpid::framing::XaResult, dtxStart, 0, 4, DtxStartParameters) { - return no_keyword::Session_0_10::dtxStart( - p[arg::xid|Xid()], - p[arg::join|false], - p[arg::resume|false], - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(qpid::framing::XaResult, dtxEnd, 0, 4, DtxEndParameters) { - return no_keyword::Session_0_10::dtxEnd( - p[arg::xid|Xid()], - p[arg::fail|false], - p[arg::suspend|false], - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(qpid::framing::XaResult, dtxCommit, 0, 3, DtxCommitParameters) { - return no_keyword::Session_0_10::dtxCommit( - p[arg::xid|Xid()], - p[arg::onePhase|false], - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(void, dtxForget, 0, 2, DtxForgetParameters) { - return no_keyword::Session_0_10::dtxForget( - p[arg::xid|Xid()], - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(qpid::framing::DtxGetTimeoutResult, dtxGetTimeout, 0, 2, DtxGetTimeoutParameters) { - return no_keyword::Session_0_10::dtxGetTimeout( - p[arg::xid|Xid()], - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(qpid::framing::XaResult, dtxPrepare, 0, 2, DtxPrepareParameters) { - return no_keyword::Session_0_10::dtxPrepare( - p[arg::xid|Xid()], - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(qpid::framing::DtxRecoverResult, dtxRecover, 0, 1, DtxRecoverParameters) { - return no_keyword::Session_0_10::dtxRecover( - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(qpid::framing::XaResult, dtxRollback, 0, 2, DtxRollbackParameters) { - return no_keyword::Session_0_10::dtxRollback( - p[arg::xid|Xid()], - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(void, dtxSetTimeout, 0, 3, DtxSetTimeoutParameters) { - return no_keyword::Session_0_10::dtxSetTimeout( - p[arg::xid|Xid()], - p[arg::timeout|0], - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(void, exchangeDeclare, 0, 8, ExchangeDeclareParameters) { - return no_keyword::Session_0_10::exchangeDeclare( - p[arg::exchange|string()], - p[arg::type|string()], - p[arg::alternateExchange|string()], - p[arg::passive|false], - p[arg::durable|false], - p[arg::autoDelete|false], - p[arg::arguments|FieldTable()], - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(void, exchangeDelete, 0, 3, ExchangeDeleteParameters) { - return no_keyword::Session_0_10::exchangeDelete( - p[arg::exchange|string()], - p[arg::ifUnused|false], - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(qpid::framing::ExchangeQueryResult, exchangeQuery, 0, 2, ExchangeQueryParameters) { - return no_keyword::Session_0_10::exchangeQuery( - p[arg::name|string()], - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(void, exchangeBind, 0, 5, ExchangeBindParameters) { - return no_keyword::Session_0_10::exchangeBind( - p[arg::queue|string()], - p[arg::exchange|string()], - p[arg::bindingKey|string()], - p[arg::arguments|FieldTable()], - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(void, exchangeUnbind, 0, 4, ExchangeUnbindParameters) { - return no_keyword::Session_0_10::exchangeUnbind( - p[arg::queue|string()], - p[arg::exchange|string()], - p[arg::bindingKey|string()], - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(qpid::framing::ExchangeBoundResult, exchangeBound, 0, 5, ExchangeBoundParameters) { - return no_keyword::Session_0_10::exchangeBound( - p[arg::exchange|string()], - p[arg::queue|string()], - p[arg::bindingKey|string()], - p[arg::arguments|FieldTable()], - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(void, queueDeclare, 0, 8, QueueDeclareParameters) { - return no_keyword::Session_0_10::queueDeclare( - p[arg::queue|string()], - p[arg::alternateExchange|string()], - p[arg::passive|false], - p[arg::durable|false], - p[arg::exclusive|false], - p[arg::autoDelete|false], - p[arg::arguments|FieldTable()], - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(void, queueDelete, 0, 4, QueueDeleteParameters) { - return no_keyword::Session_0_10::queueDelete( - p[arg::queue|string()], - p[arg::ifUnused|false], - p[arg::ifEmpty|false], - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(void, queuePurge, 0, 2, QueuePurgeParameters) { - return no_keyword::Session_0_10::queuePurge( - p[arg::queue|string()], - p[arg::sync|true]); - } - - BOOST_PARAMETER_MEMFUN(qpid::framing::QueueQueryResult, queueQuery, 0, 2, QueueQueryParameters) { - return no_keyword::Session_0_10::queueQuery( - p[arg::queue|string()], - p[arg::sync|true]); - } - -}; -/** Conversion to Session_0_10 from another session type */ -inline Session_0_10 sync(const SessionBase_0_10& other) { return (other); } - -inline Session_0_10::Session_0_10() {} -inline Session_0_10::Session_0_10(const SessionBase_0_10& other) { - *this = other; -} -inline Session_0_10& Session_0_10::operator=(const SessionBase_0_10& other) { - impl = static_cast(other).impl; - return *this; -} - -}} // namespace qpid::client - -#endif /*!QPID_CLIENT_SESSION_0_10_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/client/Subscription.h b/nativeLib/org.apache.qpid/include/qpid/client/Subscription.h deleted file mode 100644 index 425b6b92e2..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/client/Subscription.h +++ /dev/null @@ -1,123 +0,0 @@ -#ifndef QPID_CLIENT_SUBSCRIPTION_H -#define QPID_CLIENT_SUBSCRIPTION_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include "qpid/client/Handle.h" -#include "qpid/client/Session.h" -#include "qpid/client/SubscriptionSettings.h" -#include "qpid/client/Message.h" -#include "qpid/client/ClientImportExport.h" - -namespace qpid { -namespace client { - -template class PrivateImplRef; -class SubscriptionImpl; -class SubscriptionManager; - -/** - * A handle to an active subscription. Provides methods to query the subscription status - * and control acknowledgement (acquire and accept) of messages. - */ -class Subscription : public Handle { - public: - QPID_CLIENT_EXTERN Subscription(SubscriptionImpl* = 0); - QPID_CLIENT_EXTERN Subscription(const Subscription&); - QPID_CLIENT_EXTERN ~Subscription(); - QPID_CLIENT_EXTERN Subscription& operator=(const Subscription&); - - - /** The name of the subscription, used as the "destination" for messages from the broker. - * Usually the same as the queue name but can be set differently. - */ - QPID_CLIENT_EXTERN std::string getName() const; - - /** Name of the queue this subscription subscribes to */ - QPID_CLIENT_EXTERN std::string getQueue() const; - - /** Get the flow control and acknowledgement settings for this subscription */ - QPID_CLIENT_EXTERN const SubscriptionSettings& getSettings() const; - - /** Set the flow control parameters */ - QPID_CLIENT_EXTERN void setFlowControl(const FlowControl&); - - /** Automatically acknowledge (acquire and accept) batches of n messages. - * You can disable auto-acknowledgement by setting n=0, and use acquire() and accept() - * to manually acquire and accept messages. - */ - QPID_CLIENT_EXTERN void setAutoAck(unsigned int n); - - /** Get the set of ID's for messages received by this subscription but not yet acquired. - * This will always be empty if getSettings().acquireMode=ACQUIRE_MODE_PRE_ACQUIRED - */ - QPID_CLIENT_EXTERN SequenceSet getUnacquired() const; - - /** Get the set of ID's for messages received by this subscription but not yet accepted. */ - QPID_CLIENT_EXTERN SequenceSet getUnaccepted() const; - - /** Acquire messageIds and remove them from the unacquired set. - * oAdd them to the unaccepted set if getSettings().acceptMode == ACCEPT_MODE_EXPLICIT. - */ - QPID_CLIENT_EXTERN void acquire(const SequenceSet& messageIds); - - /** Accept messageIds and remove them from the unaccepted set. - *@pre messageIds is a subset of getUnaccepted() - */ - QPID_CLIENT_EXTERN void accept(const SequenceSet& messageIds); - - /** Release messageIds and remove them from the unaccepted set. - *@pre messageIds is a subset of getUnaccepted() - */ - QPID_CLIENT_EXTERN void release(const SequenceSet& messageIds); - - /* Acquire a single message */ - QPID_CLIENT_EXTERN void acquire(const Message& m) { acquire(SequenceSet(m.getId())); } - - /* Accept a single message */ - QPID_CLIENT_EXTERN void accept(const Message& m) { accept(SequenceSet(m.getId())); } - - /* Release a single message */ - QPID_CLIENT_EXTERN void release(const Message& m) { release(SequenceSet(m.getId())); } - - /** Get the session associated with this subscription */ - QPID_CLIENT_EXTERN Session getSession() const; - - /** Get the subscription manager associated with this subscription */ - QPID_CLIENT_EXTERN SubscriptionManager getSubscriptionManager(); - - /** Cancel the subscription. */ - QPID_CLIENT_EXTERN void cancel(); - - /** Grant the specified amount of message credit */ - QPID_CLIENT_EXTERN void grantMessageCredit(uint32_t); - - /** Grant the specified amount of byte credit */ - QPID_CLIENT_EXTERN void grantByteCredit(uint32_t); - - private: - friend class PrivateImplRef; - friend class SubscriptionManager; -}; -}} // namespace qpid::client - -#endif /*!QPID_CLIENT_SUBSCRIPTION_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/client/SubscriptionManager.h b/nativeLib/org.apache.qpid/include/qpid/client/SubscriptionManager.h deleted file mode 100644 index e70e05f73a..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/client/SubscriptionManager.h +++ /dev/null @@ -1,292 +0,0 @@ -#ifndef QPID_CLIENT_SUBSCRIPTIONMANAGER_H -#define QPID_CLIENT_SUBSCRIPTIONMANAGER_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include "qpid/client/Session.h" -#include "qpid/client/Subscription.h" -#include "qpid/sys/Runnable.h" -#include "qpid/sys/Thread.h" -#include "qpid/client/ClientImportExport.h" -#include "qpid/client/MessageListener.h" -#include "qpid/client/LocalQueue.h" -#include "qpid/client/Handle.h" -#include - -namespace qpid { -namespace client { - -class SubscriptionManagerImpl; - -/** - * A class to help create and manage subscriptions. - * - * Set up your subscriptions, then call run() to have messages - * delivered. - * - * \ingroup clientapi - * - * \details - * - *

Subscribing and canceling subscriptions

- * - *
    - *
  • - *

    subscribe()

    - *
     SubscriptionManager subscriptions(session);
    - * Listener listener(subscriptions);
    - * subscriptions.subscribe(listener, myQueue);
    - *
     SubscriptionManager subscriptions(session);
    - * LocalQueue local_queue;
    - * subscriptions.subscribe(local_queue, string("message_queue"));
  • - *
  • - *

    cancel()

    - *
    subscriptions.cancel();
  • - *
- * - *

Waiting for messages (and returning)

- * - *
    - *
  • - *

    run()

    - *
     // Give up control to receive messages
    - * subscriptions.run();
  • - *
  • - *

    stop()

    - *
    .// Use this code in a listener to return from run()
    - * subscriptions.stop();
  • - *
  • - *

    setAutoStop()

    - *
    .// Return from subscriptions.run() when last subscription is cancelled
    - *.subscriptions.setAutoStop(true);
    - *.subscriptons.run();
    - * 
  • - *
  • - *

    Ending a subscription in a listener

    - *
    - * void Listener::received(Message& message) {
    - *
    - *  if (message.getData() == "That's all, folks!") {
    - *       subscriptions.cancel(message.getDestination());
    - *   }
    - * }
    - * 
    - *
  • - *
- * - */ -class SubscriptionManager : public sys::Runnable, public Handle -{ - public: - /** Create a new SubscriptionManager associated with a session */ - QPID_CLIENT_EXTERN SubscriptionManager(const Session& session); - QPID_CLIENT_EXTERN SubscriptionManager(const SubscriptionManager&); - QPID_CLIENT_EXTERN ~SubscriptionManager(); - QPID_CLIENT_EXTERN SubscriptionManager& operator=(const SubscriptionManager&); - - /** - * Subscribe a MessagesListener to receive messages from queue. - * - * Provide your own subclass of MessagesListener to process - * incoming messages. It will be called for each message received. - * - *@param listener Listener object to receive messages. - *@param queue Name of the queue to subscribe to. - *@param settings settings for the subscription. - *@param name unique destination name for the subscription, defaults to queue name. - */ - QPID_CLIENT_EXTERN Subscription subscribe(MessageListener& listener, - const std::string& queue, - const SubscriptionSettings& settings, - const std::string& name=std::string()); - - /** - * Subscribe a LocalQueue to receive messages from queue. - * - * Incoming messages are stored in the queue for you to retrieve. - * - *@param queue Name of the queue to subscribe to. - *@param flow initial FlowControl for the subscription. - *@param name unique destination name for the subscription, defaults to queue name. - * If not specified, the queue name is used. - */ - QPID_CLIENT_EXTERN Subscription subscribe(LocalQueue& localQueue, - const std::string& queue, - const SubscriptionSettings& settings, - const std::string& name=std::string()); - - /** - * Subscribe a MessagesListener to receive messages from queue. - * - * Provide your own subclass of MessagesListener to process - * incoming messages. It will be called for each message received. - * - *@param listener Listener object to receive messages. - *@param queue Name of the queue to subscribe to. - *@param name unique destination name for the subscription, defaults to queue name. - * If not specified, the queue name is used. - */ - QPID_CLIENT_EXTERN Subscription subscribe(MessageListener& listener, - const std::string& queue, - const std::string& name=std::string()); - - /** - * Subscribe a LocalQueue to receive messages from queue. - * - * Incoming messages are stored in the queue for you to retrieve. - * - *@param queue Name of the queue to subscribe to. - *@param name unique destination name for the subscription, defaults to queue name. - * If not specified, the queue name is used. - */ - QPID_CLIENT_EXTERN Subscription subscribe(LocalQueue& localQueue, - const std::string& queue, - const std::string& name=std::string()); - - - /** Get a single message from a queue. - * (Note: this currently uses a subscription per invocation and is - * thus relatively expensive. The subscription is cancelled as - * part of each call which can trigger auto-deletion). - *@param result is set to the message from the queue. - *@param timeout wait up this timeout for a message to appear. - *@return true if result was set, false if no message available after timeout. - */ - QPID_CLIENT_EXTERN bool get(Message& result, const std::string& queue, sys::Duration timeout=0); - - /** Get a single message from a queue. - * (Note: this currently uses a subscription per invocation and is - * thus relatively expensive. The subscription is cancelled as - * part of each call which can trigger auto-deletion). - *@param timeout wait up this timeout for a message to appear. - *@return message from the queue. - *@throw Exception if the timeout is exceeded. - */ - QPID_CLIENT_EXTERN Message get(const std::string& queue, sys::Duration timeout=sys::TIME_INFINITE); - - /** Get a subscription by name. - *@throw Exception if not found. - */ - QPID_CLIENT_EXTERN Subscription getSubscription(const std::string& name) const; - - /** Cancel a subscription. See also: Subscription.cancel() */ - QPID_CLIENT_EXTERN void cancel(const std::string& name); - - /** Deliver messages in the current thread until stop() is called. - * Only one thread may be running in a SubscriptionManager at a time. - * @see run - */ - QPID_CLIENT_EXTERN void run(); - - /** Start a new thread to deliver messages. - * Only one thread may be running in a SubscriptionManager at a time. - * @see start - */ - QPID_CLIENT_EXTERN void start(); - - /** - * Wait for the thread started by a call to start() to complete. - */ - QPID_CLIENT_EXTERN void wait(); - - /** If set true, run() will stop when all subscriptions - * are cancelled. If false, run will only stop when stop() - * is called. True by default. - */ - QPID_CLIENT_EXTERN void setAutoStop(bool set=true); - - /** Stop delivery. Causes run() to return, or the thread started with start() to exit. */ - QPID_CLIENT_EXTERN void stop(); - - static const uint32_t UNLIMITED=0xFFFFFFFF; - - /** Set the flow control for a subscription. */ - QPID_CLIENT_EXTERN void setFlowControl(const std::string& name, const FlowControl& flow); - - /** Set the flow control for a subscription. - *@param name: name of the subscription. - *@param messages: message credit. - *@param bytes: byte credit. - *@param window: if true use window-based flow control. - */ - QPID_CLIENT_EXTERN void setFlowControl(const std::string& name, uint32_t messages, uint32_t bytes, bool window=true); - - /** Set the default settings for subscribe() calls that don't - * include a SubscriptionSettings parameter. - */ - QPID_CLIENT_EXTERN void setDefaultSettings(const SubscriptionSettings& s); - - /** Get the default settings for subscribe() calls that don't - * include a SubscriptionSettings parameter. - */ - QPID_CLIENT_EXTERN const SubscriptionSettings& getDefaultSettings() const; - - /** Get the default settings for subscribe() calls that don't - * include a SubscriptionSettings parameter. - */ - QPID_CLIENT_EXTERN SubscriptionSettings& getDefaultSettings(); - - /** - * Set the default flow control settings for subscribe() calls - * that don't include a SubscriptionSettings parameter. - * - *@param messages: message credit. - *@param bytes: byte credit. - *@param window: if true use window-based flow control. - */ - QPID_CLIENT_EXTERN void setFlowControl(uint32_t messages, uint32_t bytes, bool window=true); - - /** - *Set the default accept-mode for subscribe() calls that don't - *include a SubscriptionSettings parameter. - */ - QPID_CLIENT_EXTERN void setAcceptMode(AcceptMode mode); - - /** - * Set the default acquire-mode subscribe()s that don't specify SubscriptionSettings. - */ - QPID_CLIENT_EXTERN void setAcquireMode(AcquireMode mode); - - QPID_CLIENT_EXTERN void registerFailoverHandler ( boost::function fh ); - - QPID_CLIENT_EXTERN Session getSession() const; - - SubscriptionManager(SubscriptionManagerImpl*); ///<@internal - - private: - typedef SubscriptionManagerImpl Impl; - friend class PrivateImplRef; -}; - -/** AutoCancel cancels a subscription in its destructor */ -class AutoCancel { - public: - AutoCancel(SubscriptionManager& sm_, const std::string& tag_) : sm(sm_), tag(tag_) {} - ~AutoCancel() { sm.cancel(tag); } - private: - SubscriptionManager& sm; - std::string tag; -}; - -}} // namespace qpid::client - -#endif /*!QPID_CLIENT_SUBSCRIPTIONMANAGER_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/client/SubscriptionSettings.h b/nativeLib/org.apache.qpid/include/qpid/client/SubscriptionSettings.h deleted file mode 100644 index b4cb302b56..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/client/SubscriptionSettings.h +++ /dev/null @@ -1,123 +0,0 @@ -#ifndef QPID_CLIENT_SUBSCRIPTIONSETTINGS_H -#define QPID_CLIENT_SUBSCRIPTIONSETTINGS_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#include "qpid/client/FlowControl.h" -#include "qpid/framing/enum.h" - -namespace qpid { -namespace client { - -/** Bring AMQP enum definitions for message class into this namespace. */ -using namespace qpid::framing::message; - -enum CompletionMode { - MANUAL_COMPLETION = 0, - COMPLETE_ON_DELIVERY = 1, - COMPLETE_ON_ACCEPT = 2 -}; -/** - * Settings for a subscription. - */ -struct SubscriptionSettings -{ - SubscriptionSettings( - FlowControl flow=FlowControl::unlimited(), - AcceptMode accept=ACCEPT_MODE_EXPLICIT, - AcquireMode acquire=ACQUIRE_MODE_PRE_ACQUIRED, - unsigned int autoAck_=1, - CompletionMode completion=COMPLETE_ON_DELIVERY - ) : flowControl(flow), acceptMode(accept), acquireMode(acquire), autoAck(autoAck_), completionMode(completion), exclusive(false) {} - - FlowControl flowControl; ///@< Flow control settings. @see FlowControl - /** - * The acceptMode determines whether the broker should expect - * delivery of messages to be acknowledged by the client - * indicating that it accepts them. A value of - * ACCEPT_MODE_EXPLICIT means that messages must be accepted - * (note: this may be done automatically by the library - see - * autoAck - or through an explicit call be the application - see - * Subscription::accept()) before they can be dequeued. A value of - * ACCEPT_MODE_NONE means that the broker can dequeue a message as - * soon as it is acquired. - */ - AcceptMode acceptMode; ///@< ACCEPT_MODE_EXPLICIT or ACCEPT_MODE_NONE - /** - * The acquireMode determines whether messages are locked for the - * subscriber when delivered, and thus are not delivered to any - * other subscriber unless this subscriber releases them. - * - * The default is ACQUIRE_MODE_PRE_ACQUIRED meaning that the - * subscriber expects to have been given that message exclusively - * (i.e. the message will not be given to any other subscriber - * unless released explicitly or by this subscribers session - * failing without having accepted the message). - * - * Delivery of message in ACQUIRE_MODE_NOT_ACQUIRED mode means the - * message will still be available for other subscribers to - * receive. The application can if desired acquire a (set of) - * messages through an explicit acquire call - see - * Subscription::acquire(). - */ - AcquireMode acquireMode; ///@< ACQUIRE_MODE_PRE_ACQUIRED or ACQUIRE_MODE_NOT_ACQUIRED - - /** - * Configures the frequency at which messages are automatically - * accepted (e.g. a value of 5 means that messages are accepted in - * batches of 5). A value of 0 means no automatic acknowledgement - * will occur and the application will itself be responsible for - * accepting messages. - */ - unsigned int autoAck; - /** - * In windowing mode, completion of a message will cause the - * credit used up by that message to be reallocated. The - * subscriptions completion mode controls how completion is - * managed. - * - * If set to COMPLETE_ON_DELIVERY (which is the default), messages - * will be marked as completed once they have been received. The - * server will be explicitly notified of all completed messages - * for the session when the next accept is sent through the - * subscription (either explictly or through autAck). However the - * server may also periodically request information on the - * completed messages. - * - * If set to COMPLETE_ON_ACCEPT, messages will be marked as - * completed once they are accepted (via the Subscription class) - * and the server will also be notified of all completed messages - * for the session. - * - * If set to MANUAL_COMPLETION the application is responsible for - * completing messages (@see Session::markCompleted()). - */ - CompletionMode completionMode; - /** - * If set, requests that no other subscriber be allowed to access - * the queue while this subscription is active. - */ - bool exclusive; -}; - -}} // namespace qpid::client - -#endif /*!QPID_CLIENT_SUBSCRIPTIONSETTINGS_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/client/TypedResult.h b/nativeLib/org.apache.qpid/include/qpid/client/TypedResult.h deleted file mode 100644 index 8e1a16580c..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/client/TypedResult.h +++ /dev/null @@ -1,65 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#ifndef _TypedResult_ -#define _TypedResult_ - -#include "qpid/client/Completion.h" -#include "qpid/framing/StructHelper.h" - -namespace qpid { -namespace client { - -/** - * Returned by asynchronous commands that return a result. - * You can use get() to wait for completion and get the result value. - * \ingroup clientapi - */ -template class TypedResult : public Completion -{ - T result; - bool decoded; - -public: - ///@internal - TypedResult(const Completion& c) : Completion(c), decoded(false) {} - - /** - * Wait for the asynchronous command that returned this TypedResult to complete - * and return its result. - * - *@return The result returned by the command. - *@exception If the command returns an error, get() throws an exception. - * - */ - T& get() { - if (!decoded) { - framing::StructHelper helper; - helper.decode(result, getResult()); - decoded = true; - } - return result; - } -}; - -}} - -#endif diff --git a/nativeLib/org.apache.qpid/include/qpid/client/arg.h b/nativeLib/org.apache.qpid/include/qpid/client/arg.h deleted file mode 100644 index 9d65a83e0c..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/client/arg.h +++ /dev/null @@ -1,81 +0,0 @@ -#ifndef QPID_CLIENT_ARG_H -#define QPID_CLIENT_ARG_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#define BOOST_PARAMETER_MAX_ARITY 9 -#include - -namespace qpid { -namespace client { -namespace arg { - -BOOST_PARAMETER_KEYWORD(keyword_tags, sync) -BOOST_PARAMETER_KEYWORD(keyword_tags, commandId) -BOOST_PARAMETER_KEYWORD(keyword_tags, value) -BOOST_PARAMETER_KEYWORD(keyword_tags, errorCode) -BOOST_PARAMETER_KEYWORD(keyword_tags, classCode) -BOOST_PARAMETER_KEYWORD(keyword_tags, commandCode) -BOOST_PARAMETER_KEYWORD(keyword_tags, fieldIndex) -BOOST_PARAMETER_KEYWORD(keyword_tags, description) -BOOST_PARAMETER_KEYWORD(keyword_tags, errorInfo) -BOOST_PARAMETER_KEYWORD(keyword_tags, destination) -BOOST_PARAMETER_KEYWORD(keyword_tags, acceptMode) -BOOST_PARAMETER_KEYWORD(keyword_tags, acquireMode) -BOOST_PARAMETER_KEYWORD(keyword_tags, content) -BOOST_PARAMETER_KEYWORD(keyword_tags, transfers) -BOOST_PARAMETER_KEYWORD(keyword_tags, code) -BOOST_PARAMETER_KEYWORD(keyword_tags, text) -BOOST_PARAMETER_KEYWORD(keyword_tags, setRedelivered) -BOOST_PARAMETER_KEYWORD(keyword_tags, resumeId) -BOOST_PARAMETER_KEYWORD(keyword_tags, queue) -BOOST_PARAMETER_KEYWORD(keyword_tags, exclusive) -BOOST_PARAMETER_KEYWORD(keyword_tags, resumeTtl) -BOOST_PARAMETER_KEYWORD(keyword_tags, arguments) -BOOST_PARAMETER_KEYWORD(keyword_tags, flowMode) -BOOST_PARAMETER_KEYWORD(keyword_tags, unit) -BOOST_PARAMETER_KEYWORD(keyword_tags, xid) -BOOST_PARAMETER_KEYWORD(keyword_tags, join) -BOOST_PARAMETER_KEYWORD(keyword_tags, resume) -BOOST_PARAMETER_KEYWORD(keyword_tags, fail) -BOOST_PARAMETER_KEYWORD(keyword_tags, suspend) -BOOST_PARAMETER_KEYWORD(keyword_tags, onePhase) -BOOST_PARAMETER_KEYWORD(keyword_tags, timeout) -BOOST_PARAMETER_KEYWORD(keyword_tags, exchange) -BOOST_PARAMETER_KEYWORD(keyword_tags, type) -BOOST_PARAMETER_KEYWORD(keyword_tags, alternateExchange) -BOOST_PARAMETER_KEYWORD(keyword_tags, passive) -BOOST_PARAMETER_KEYWORD(keyword_tags, durable) -BOOST_PARAMETER_KEYWORD(keyword_tags, autoDelete) -BOOST_PARAMETER_KEYWORD(keyword_tags, ifUnused) -BOOST_PARAMETER_KEYWORD(keyword_tags, name) -BOOST_PARAMETER_KEYWORD(keyword_tags, bindingKey) -BOOST_PARAMETER_KEYWORD(keyword_tags, ifEmpty) - -}}} // namespace qpid::client::arg - -#endif /*!QPID_CLIENT_ARG_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/client/no_keyword/AsyncSession_0_10.h b/nativeLib/org.apache.qpid/include/qpid/client/no_keyword/AsyncSession_0_10.h deleted file mode 100644 index 4306f236ed..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/client/no_keyword/AsyncSession_0_10.h +++ /dev/null @@ -1,955 +0,0 @@ -#ifndef QPID_CLIENT_NO_KEYWORD_ASYNCSESSION_0_10_H -#define QPID_CLIENT_NO_KEYWORD_ASYNCSESSION_0_10_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/client/SessionBase_0_10.h" -#include "qpid/client/ClientImportExport.h" - -namespace qpid { -namespace client { -namespace no_keyword { - -/** - * AMQP 0-10 asynchronous session API. - * - * A session is a named interaction between two peers. Session names are chosen by the upper - * layers and may be used indefinitely. The model layer may associate long-lived or durable state - * with a given session name. The session layer provides transport of commands associated with - * this interaction. - * - */ -class AsyncSession_0_10: - public SessionBase_0_10 -{ - public: - - QPID_CLIENT_EXTERN AsyncSession_0_10(); - QPID_CLIENT_EXTERN AsyncSession_0_10(const SessionBase_0_10& other); - QPID_CLIENT_EXTERN AsyncSession_0_10& operator=(const SessionBase_0_10& other); - - /** - * - * This command is complete when all prior commands are completed. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN Completion executionSync(bool sync=false); - - /** - * - * This command carries data resulting from the execution of a command. - * - * - * @param commandId - * - * @param value - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN Completion executionResult(const SequenceNumber& commandId=SequenceNumber(), const string& value=string(), bool sync=false); - - /** - * - * This command informs a peer of an execution exception. The command-id, when given, - * correlates the error to a specific command. - * - * - * @param errorCode - * - * @param commandId - * - * The command-id of the command which caused the exception. If the exception was not caused - * by a specific command, this value is not set. - * - * - * @param classCode - * - * @param commandCode - * - * @param fieldIndex - * - * The zero based index of the exceptional field within the arguments to the exceptional - * command. If the exception was not caused by a specific field, this value is not set. - * - * - * @param description - * - * The description provided is implementation defined, but MUST be in the language - * appropriate for the selected locale. The intention is that this description is suitable - * for logging or alerting output. - * - * - * @param errorInfo - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN Completion executionException(uint16_t errorCode=0, const SequenceNumber& commandId=SequenceNumber(), uint8_t classCode=0, uint8_t commandCode=0, uint8_t fieldIndex=0, const string& description=string(), const FieldTable& errorInfo=FieldTable(), bool sync=false); - - /** - * - * This command transfers a message between two peers. When a client uses this command to - * publish a message to a broker, the destination identifies a specific exchange. The message - * will then be routed to queues as defined by the exchange configuration. - * - * The client may request a broker to transfer messages to it, from a particular queue, by - * issuing a subscribe command. The subscribe command specifies the destination that the broker - * should use for any resulting transfers. - * - * - * @param destination - * - * Specifies the destination to which the message is to be transferred. - * - * - * @param acceptMode - * - * Indicates whether message.accept, session.complete, or nothing at all is required to - * indicate successful transfer of the message. - * - * - * @param acquireMode - * - * Indicates whether or not the transferred message has been acquired. - * - * - * @param content - * Message content - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN Completion messageTransfer(const string& destination=string(), uint8_t acceptMode=1, uint8_t acquireMode=0, const Message& content=Message(std::string()), bool sync=false); - - /** - * - * Accepts the message. Once a transfer is accepted, the command-id may no longer be referenced - * from other commands. - * - * - * @param transfers - * - * Identifies the messages previously transferred that should be accepted. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN Completion messageAccept(const SequenceSet& transfers=SequenceSet(), bool sync=false); - - /** - * - * Indicates that the message transfers are unprocessable in some way. A server may reject a - * message if it is unroutable. A client may reject a message if it is invalid. A message may - * be rejected for other reasons as well. Once a transfer is rejected, the command-id may no - * longer be referenced from other commands. - * - * - * @param transfers - * - * Identifies the messages previously transferred that should be rejected. - * - * - * @param code - * - * Code describing the reason for rejection. - * - * - * @param text - * - * Text describing the reason for rejection. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN Completion messageReject(const SequenceSet& transfers=SequenceSet(), uint16_t code=0, const string& text=string(), bool sync=false); - - /** - * - * Release previously transferred messages. When acquired messages are released, they become - * available for acquisition by any subscriber. Once a transfer is released, the command-id may - * no longer be referenced from other commands. - * - * - * @param transfers - * - * Indicates the messages to be released. - * - * - * @param setRedelivered - * - * By setting set-redelivered to true, any acquired messages released to a queue with this - * command will be marked as redelivered on their next transfer from that queue. If this flag - * is not set, then an acquired message will retain its original redelivered status on the - * queue. Messages that are not acquired are unaffected by the value of this flag. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN Completion messageRelease(const SequenceSet& transfers=SequenceSet(), bool setRedelivered=false, bool sync=false); - - /** - * - * Acquires previously transferred messages for consumption. The acquired ids (if any) are - * sent via message.acquired. - * - * - * @param transfers - * - * Indicates the messages to be acquired. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN TypedResult messageAcquire(const SequenceSet& transfers=SequenceSet(), bool sync=false); - - /** - * - * This command resumes an interrupted transfer. The recipient should return the amount of - * partially transferred data associated with the given resume-id, or zero if there is no data - * at all. If a non-zero result is returned, the recipient should expect to receive message - * fragment(s) containing the remainder of the interrupted message. - * - * - * @param destination - * - * The destination to which the remaining message fragments are transferred. - * - * - * @param resumeId - * - * The name of the transfer being resumed. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN TypedResult messageResume(const string& destination=string(), const string& resumeId=string(), bool sync=false); - - /** - * This command asks the server to start a "subscription", which is a request for messages - * from a specific queue. Subscriptions last as long as the session they were created on, or - * until the client cancels them. - * - * @param queue - * Specifies the name of the subscribed queue. - * - * @param destination - * The client specified name for the subscription. This is used as the destination for - * all messages transferred from this subscription. The destination is scoped to the session. - * - * - * @param acceptMode - * The accept-mode to use for messages transferred from this subscription. - * - * @param acquireMode - * The acquire-mode to use for messages transferred from this subscription. - * - * @param exclusive - * Request an exclusive subscription. This prevents other subscribers from subscribing to - * the queue. - * - * @param resumeId - * Requests that the broker use the supplied resume-id when transferring messages for - * this subscription. - * - * @param resumeTtl - * Requested duration in milliseconds for the broker use as resume-ttl when transferring - * messages for this subscription. - * - * @param arguments - * The syntax and semantics of these arguments depends on the providers implementation. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN Completion messageSubscribe(const string& queue=string(), const string& destination=string(), uint8_t acceptMode=0, uint8_t acquireMode=0, bool exclusive=false, const string& resumeId=string(), uint64_t resumeTtl=0, const FieldTable& arguments=FieldTable(), bool sync=false); - - /** - * - * This command cancels a subscription. This does not affect already delivered messages, but it - * does mean the server will not send any more messages for that subscription. The client may - * receive an arbitrary number of messages in between sending the cancel command and receiving - * notification that the cancel command is complete. - * - * - * @param destination - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN Completion messageCancel(const string& destination=string(), bool sync=false); - - /** - * - * Sets the mode of flow control used for a given destination to either window or credit based - * flow control. - * - * With credit based flow control, the sender of messages continually maintains its current - * credit balance with the recipient. The credit balance consists of two values, a message - * count, and a byte count. Whenever message data is sent, both counts must be decremented. - * If either value reaches zero, the flow of message data must stop. Additional credit is - * received via the message.flow command. - * - * The sender MUST NOT send partial assemblies. This means that if there is not enough byte - * credit available to send a complete message, the sender must either wait or use message - * fragmentation (see the fragment-properties header struct) to send the first part of the - * message data in a complete assembly. - * - * Window based flow control is identical to credit based flow control, however message - * transfer completion implicitly grants a single unit of message credit, and the size of the - * message in byte credits for each completed message transfer. Completion of the transfer - * command with session.completed is the only way credit is implicitly updated; message.accept, - * message.release, message.reject, tx.commit and tx.rollback have no effect on the outstanding - * credit balances. - * - * - * @param destination - * - * @param flowMode - * - * The new flow control mode. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN Completion messageSetFlowMode(const string& destination=string(), uint8_t flowMode=0, bool sync=false); - - /** - * - * This command controls the flow of message data to a given destination. It is used by the - * recipient of messages to dynamically match the incoming rate of message flow to its - * processing or forwarding capacity. Upon receipt of this command, the sender must add "value" - * number of the specified unit to the available credit balance for the specified destination. - * A value of (0xFFFFFFFF) indicates an infinite amount of credit. This disables any limit for - * the given unit until the credit balance is zeroed with message.stop or message.flush. - * - * - * @param destination - * - * @param unit - * - * The unit of value. - * - * - * @param value - * - * If the value is not set then this indicates an infinite amount of credit. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN Completion messageFlow(const string& destination=string(), uint8_t unit=0, uint32_t value=0, bool sync=false); - - /** - * - * Forces the sender to exhaust his credit supply. The sender's credit will always be zero when - * this command completes. The command completes when immediately available message data has - * been transferred, or when the credit supply is exhausted. - * - * - * @param destination - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN Completion messageFlush(const string& destination=string(), bool sync=false); - - /** - * - * On receipt of this command, a producer of messages MUST set his credit to zero for the given - * destination. When notifying of completion, credit MUST be zero and no further messages will - * be sent until such a time as further credit is received. - * - * - * @param destination - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN Completion messageStop(const string& destination=string(), bool sync=false); - - /** - * - * This command sets the session to use standard transactions. The client must use this command - * exactly once on a session before using the Commit or Rollback commands. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN Completion txSelect(bool sync=false); - - /** - * - * This command commits all messages published and accepted in the current transaction. A - * new transaction starts immediately after a commit. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN Completion txCommit(bool sync=false); - - /** - * - * This command abandons the current transaction. In particular the transfers from Client to - * Server (publishes) and accepts of transfers from Server to Client which occurred in the - * current transaction are discarded. A new transaction starts immediately after a rollback. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN Completion txRollback(bool sync=false); - - /** - * - * This command sets the session to use distributed transactions. The client must use this - * command at least once on a session before using XA demarcation operations. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN Completion dtxSelect(bool sync=false); - - /** - * - * This command is called when messages should be produced and consumed on behalf a transaction - * branch identified by xid. - * - * - * @param xid - * - * Specifies the xid of the transaction branch to be started. - * - * - * @param join - * - * Indicate whether this is joining an already associated xid. Indicate that the start - * applies to joining a transaction previously seen. - * - * - * @param resume - * - * Indicate that the start applies to resuming a suspended transaction branch specified. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN TypedResult dtxStart(const Xid& xid=Xid(), bool join=false, bool resume=false, bool sync=false); - - /** - * - * This command is called when the work done on behalf a transaction branch finishes or needs - * to be suspended. - * - * - * @param xid - * - * Specifies the xid of the transaction branch to be ended. - * - * - * @param fail - * - * If set, indicates that this portion of work has failed; otherwise this portion of work has - * completed successfully. - * - * - * @param suspend - * - * Indicates that the transaction branch is temporarily suspended in an incomplete state. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN TypedResult dtxEnd(const Xid& xid=Xid(), bool fail=false, bool suspend=false, bool sync=false); - - /** - * - * Commit the work done on behalf a transaction branch. This command commits the work - * associated with xid. Any produced messages are made available and any consumed messages are - * discarded. - * - * - * @param xid - * - * Specifies the xid of the transaction branch to be committed. - * - * - * @param onePhase - * - * Used to indicate whether one-phase or two-phase commit is used. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN TypedResult dtxCommit(const Xid& xid=Xid(), bool onePhase=false, bool sync=false); - - /** - * - * This command is called to forget about a heuristically completed transaction branch. - * - * - * @param xid - * - * Specifies the xid of the transaction branch to be forgotten. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN Completion dtxForget(const Xid& xid=Xid(), bool sync=false); - - /** - * - * This command obtains the current transaction timeout value in seconds. If set-timeout was - * not used prior to invoking this command, the return value is the default timeout; otherwise, - * the value used in the previous set-timeout call is returned. - * - * - * @param xid - * - * Specifies the xid of the transaction branch for getting the timeout. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN TypedResult dtxGetTimeout(const Xid& xid=Xid(), bool sync=false); - - /** - * - * This command prepares for commitment any message produced or consumed on behalf of xid. - * - * - * @param xid - * - * Specifies the xid of the transaction branch that can be prepared. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN TypedResult dtxPrepare(const Xid& xid=Xid(), bool sync=false); - - /** - * - * This command is called to obtain a list of transaction branches that are in a prepared or - * heuristically completed state. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN TypedResult dtxRecover(bool sync=false); - - /** - * - * This command rolls back the work associated with xid. Any produced messages are discarded - * and any consumed messages are re-enqueued. - * - * - * @param xid - * - * Specifies the xid of the transaction branch that can be rolled back. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN TypedResult dtxRollback(const Xid& xid=Xid(), bool sync=false); - - /** - * - * Sets the specified transaction branch timeout value in seconds. - * - * - * @param xid - * - * Specifies the xid of the transaction branch for setting the timeout. - * - * - * @param timeout - * - * The transaction timeout value in seconds. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN Completion dtxSetTimeout(const Xid& xid=Xid(), uint32_t timeout=0, bool sync=false); - - /** - * - * This command creates an exchange if it does not already exist, and if the exchange exists, - * verifies that it is of the correct and expected class. - * - * - * @param exchange - * - * @param type - * - * Each exchange belongs to one of a set of exchange types implemented by the server. The - * exchange types define the functionality of the exchange - i.e. how messages are routed - * through it. It is not valid or meaningful to attempt to change the type of an existing - * exchange. - * - * - * @param alternateExchange - * - * In the event that a message cannot be routed, this is the name of the exchange to which - * the message will be sent. Messages transferred using message.transfer will be routed to - * the alternate-exchange only if they are sent with the "none" accept-mode, and the - * discard-unroutable delivery property is set to false, and there is no queue to route to - * for the given message according to the bindings on this exchange. - * - * - * @param passive - * - * If set, the server will not create the exchange. The client can use this to check whether - * an exchange exists without modifying the server state. - * - * - * @param durable - * - * If set when creating a new exchange, the exchange will be marked as durable. Durable - * exchanges remain active when a server restarts. Non-durable exchanges (transient - * exchanges) are purged if/when a server restarts. - * - * - * @param autoDelete - * - * If set, the exchange is deleted automatically when there remain no bindings between the - * exchange and any queue. Such an exchange will not be automatically deleted until at least - * one binding has been made to prevent the immediate deletion of the exchange upon creation. - * - * - * @param arguments - * - * A set of arguments for the declaration. The syntax and semantics of these arguments - * depends on the server implementation. This field is ignored if passive is 1. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN Completion exchangeDeclare(const string& exchange=string(), const string& type=string(), const string& alternateExchange=string(), bool passive=false, bool durable=false, bool autoDelete=false, const FieldTable& arguments=FieldTable(), bool sync=false); - - /** - * - * This command deletes an exchange. When an exchange is deleted all queue bindings on the - * exchange are cancelled. - * - * - * @param exchange - * - * @param ifUnused - * - * If set, the server will only delete the exchange if it has no queue bindings. If the - * exchange has queue bindings the server does not delete it but raises an exception - * instead. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN Completion exchangeDelete(const string& exchange=string(), bool ifUnused=false, bool sync=false); - - /** - * - * This command is used to request information on a particular exchange. - * - * - * @param name - * - * The name of the exchange for which information is requested. If not specified explicitly - * the default exchange is implied. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN TypedResult exchangeQuery(const string& name=string(), bool sync=false); - - /** - * This command binds a queue to an exchange. Until a queue is bound it will not receive - * any messages. In a classic messaging model, store-and-forward queues are bound to a direct - * exchange and subscription queues are bound to a topic exchange. - * - * @param queue - * Specifies the name of the queue to bind. - * - * @param exchange - * - * @param bindingKey - * The binding-key uniquely identifies a binding between a given (exchange, queue) pair. - * Depending on the exchange configuration, the binding key may be matched against the - * message routing key in order to make routing decisions. The match algorithm depends on the - * exchange type. Some exchange types may ignore the binding key when making routing - * decisions. Refer to the specific exchange type documentation. The meaning of an empty - * binding key depends on the exchange implementation. - * - * @param arguments - * A set of arguments for the binding. The syntax and semantics of these arguments - * depends on the exchange class. - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN Completion exchangeBind(const string& queue=string(), const string& exchange=string(), const string& bindingKey=string(), const FieldTable& arguments=FieldTable(), bool sync=false); - - /** - * - * This command unbinds a queue from an exchange. - * - * - * @param queue - * - * Specifies the name of the queue to unbind. - * - * - * @param exchange - * - * The name of the exchange to unbind from. - * - * - * @param bindingKey - * - * Specifies the binding-key of the binding to unbind. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN Completion exchangeUnbind(const string& queue=string(), const string& exchange=string(), const string& bindingKey=string(), bool sync=false); - - /** - * - * This command is used to request information on the bindings to a particular exchange. - * - * - * @param exchange - * - * The name of the exchange for which binding information is being requested. If not - * specified explicitly the default exchange is implied. - * - * - * @param queue - * - * If populated then determine whether the given queue is bound to the exchange. - * - * - * @param bindingKey - * - * If populated defines the binding-key of the binding of interest, if not populated the - * request will ignore the binding-key on bindings when searching for a match. - * - * - * @param arguments - * - * If populated defines the arguments of the binding of interest if not populated the request - * will ignore the arguments on bindings when searching for a match - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN TypedResult exchangeBound(const string& exchange=string(), const string& queue=string(), const string& bindingKey=string(), const FieldTable& arguments=FieldTable(), bool sync=false); - - /** - * - * This command creates or checks a queue. When creating a new queue the client can specify - * various properties that control the durability of the queue and its contents, and the level - * of sharing for the queue. - * - * - * @param queue - * - * @param alternateExchange - * - * The alternate-exchange field specifies how messages on this queue should be treated when - * they are rejected by a subscriber, or when they are orphaned by queue deletion. When - * present, rejected or orphaned messages MUST be routed to the alternate-exchange. In all - * cases the messages MUST be removed from the queue. - * - * - * @param passive - * - * If set, the server will not create the queue. This field allows the client to assert the - * presence of a queue without modifying the server state. - * - * - * @param durable - * - * If set when creating a new queue, the queue will be marked as durable. Durable queues - * remain active when a server restarts. Non-durable queues (transient queues) are purged - * if/when a server restarts. Note that durable queues do not necessarily hold persistent - * messages, although it does not make sense to send persistent messages to a transient - * queue. - * - * - * @param exclusive - * - * Exclusive queues can only be used from one session at a time. Once a session - * declares an exclusive queue, that queue cannot be used by any other session until the - * declaring session closes. - * - * - * @param autoDelete - * - * If this field is set and the exclusive field is also set, then the queue MUST be deleted - * when the session closes. - * - * If this field is set and the exclusive field is not set the queue is deleted when all - * the consumers have finished using it. Last consumer can be cancelled either explicitly - * or because its session is closed. If there was no consumer ever on the queue, it won't - * be deleted. - * - * - * @param arguments - * - * A set of arguments for the declaration. The syntax and semantics of these arguments - * depends on the server implementation. This field is ignored if passive is 1. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN Completion queueDeclare(const string& queue=string(), const string& alternateExchange=string(), bool passive=false, bool durable=false, bool exclusive=false, bool autoDelete=false, const FieldTable& arguments=FieldTable(), bool sync=false); - - /** - * - * This command deletes a queue. When a queue is deleted any pending messages are sent to the - * alternate-exchange if defined, or discarded if it is not. - * - * - * @param queue - * - * Specifies the name of the queue to delete. - * - * - * @param ifUnused - * - * If set, the server will only delete the queue if it has no consumers. If the queue has - * consumers the server does does not delete it but raises an exception instead. - * - * - * @param ifEmpty - * - * If set, the server will only delete the queue if it has no messages. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN Completion queueDelete(const string& queue=string(), bool ifUnused=false, bool ifEmpty=false, bool sync=false); - - /** - * - * This command removes all messages from a queue. It does not cancel subscribers. Purged - * messages are deleted without any formal "undo" mechanism. - * - * - * @param queue - * - * Specifies the name of the queue to purge. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN Completion queuePurge(const string& queue=string(), bool sync=false); - - /** - * - * This command requests information about a queue. - * - * - * @param queue - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN TypedResult queueQuery(const string& queue=string(), bool sync=false); -}; - -}}} // namespace qpid::client::no_keyword - -#endif /*!QPID_CLIENT_NO_KEYWORD_ASYNCSESSION_0_10_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/client/no_keyword/Session_0_10.h b/nativeLib/org.apache.qpid/include/qpid/client/no_keyword/Session_0_10.h deleted file mode 100644 index 4c9023ead2..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/client/no_keyword/Session_0_10.h +++ /dev/null @@ -1,955 +0,0 @@ -#ifndef QPID_CLIENT_NO_KEYWORD_SESSION_0_10_H -#define QPID_CLIENT_NO_KEYWORD_SESSION_0_10_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/client/SessionBase_0_10.h" -#include "qpid/client/ClientImportExport.h" - -namespace qpid { -namespace client { -namespace no_keyword { - -/** - * AMQP 0-10 synchronous session API. - * - * A session is a named interaction between two peers. Session names are chosen by the upper - * layers and may be used indefinitely. The model layer may associate long-lived or durable state - * with a given session name. The session layer provides transport of commands associated with - * this interaction. - * - */ -class Session_0_10: - public SessionBase_0_10 -{ - public: - - QPID_CLIENT_EXTERN Session_0_10(); - QPID_CLIENT_EXTERN Session_0_10(const SessionBase_0_10& other); - QPID_CLIENT_EXTERN Session_0_10& operator=(const SessionBase_0_10& other); - - /** - * - * This command is complete when all prior commands are completed. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN void executionSync(bool sync=true); - - /** - * - * This command carries data resulting from the execution of a command. - * - * - * @param commandId - * - * @param value - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN void executionResult(const SequenceNumber& commandId=SequenceNumber(), const string& value=string(), bool sync=true); - - /** - * - * This command informs a peer of an execution exception. The command-id, when given, - * correlates the error to a specific command. - * - * - * @param errorCode - * - * @param commandId - * - * The command-id of the command which caused the exception. If the exception was not caused - * by a specific command, this value is not set. - * - * - * @param classCode - * - * @param commandCode - * - * @param fieldIndex - * - * The zero based index of the exceptional field within the arguments to the exceptional - * command. If the exception was not caused by a specific field, this value is not set. - * - * - * @param description - * - * The description provided is implementation defined, but MUST be in the language - * appropriate for the selected locale. The intention is that this description is suitable - * for logging or alerting output. - * - * - * @param errorInfo - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN void executionException(uint16_t errorCode=0, const SequenceNumber& commandId=SequenceNumber(), uint8_t classCode=0, uint8_t commandCode=0, uint8_t fieldIndex=0, const string& description=string(), const FieldTable& errorInfo=FieldTable(), bool sync=true); - - /** - * - * This command transfers a message between two peers. When a client uses this command to - * publish a message to a broker, the destination identifies a specific exchange. The message - * will then be routed to queues as defined by the exchange configuration. - * - * The client may request a broker to transfer messages to it, from a particular queue, by - * issuing a subscribe command. The subscribe command specifies the destination that the broker - * should use for any resulting transfers. - * - * - * @param destination - * - * Specifies the destination to which the message is to be transferred. - * - * - * @param acceptMode - * - * Indicates whether message.accept, session.complete, or nothing at all is required to - * indicate successful transfer of the message. - * - * - * @param acquireMode - * - * Indicates whether or not the transferred message has been acquired. - * - * - * @param content - * Message content - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN void messageTransfer(const string& destination=string(), uint8_t acceptMode=1, uint8_t acquireMode=0, const Message& content=Message(std::string()), bool sync=true); - - /** - * - * Accepts the message. Once a transfer is accepted, the command-id may no longer be referenced - * from other commands. - * - * - * @param transfers - * - * Identifies the messages previously transferred that should be accepted. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN void messageAccept(const SequenceSet& transfers=SequenceSet(), bool sync=true); - - /** - * - * Indicates that the message transfers are unprocessable in some way. A server may reject a - * message if it is unroutable. A client may reject a message if it is invalid. A message may - * be rejected for other reasons as well. Once a transfer is rejected, the command-id may no - * longer be referenced from other commands. - * - * - * @param transfers - * - * Identifies the messages previously transferred that should be rejected. - * - * - * @param code - * - * Code describing the reason for rejection. - * - * - * @param text - * - * Text describing the reason for rejection. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN void messageReject(const SequenceSet& transfers=SequenceSet(), uint16_t code=0, const string& text=string(), bool sync=true); - - /** - * - * Release previously transferred messages. When acquired messages are released, they become - * available for acquisition by any subscriber. Once a transfer is released, the command-id may - * no longer be referenced from other commands. - * - * - * @param transfers - * - * Indicates the messages to be released. - * - * - * @param setRedelivered - * - * By setting set-redelivered to true, any acquired messages released to a queue with this - * command will be marked as redelivered on their next transfer from that queue. If this flag - * is not set, then an acquired message will retain its original redelivered status on the - * queue. Messages that are not acquired are unaffected by the value of this flag. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN void messageRelease(const SequenceSet& transfers=SequenceSet(), bool setRedelivered=false, bool sync=true); - - /** - * - * Acquires previously transferred messages for consumption. The acquired ids (if any) are - * sent via message.acquired. - * - * - * @param transfers - * - * Indicates the messages to be acquired. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN qpid::framing::MessageAcquireResult messageAcquire(const SequenceSet& transfers=SequenceSet(), bool sync=true); - - /** - * - * This command resumes an interrupted transfer. The recipient should return the amount of - * partially transferred data associated with the given resume-id, or zero if there is no data - * at all. If a non-zero result is returned, the recipient should expect to receive message - * fragment(s) containing the remainder of the interrupted message. - * - * - * @param destination - * - * The destination to which the remaining message fragments are transferred. - * - * - * @param resumeId - * - * The name of the transfer being resumed. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN qpid::framing::MessageResumeResult messageResume(const string& destination=string(), const string& resumeId=string(), bool sync=true); - - /** - * This command asks the server to start a "subscription", which is a request for messages - * from a specific queue. Subscriptions last as long as the session they were created on, or - * until the client cancels them. - * - * @param queue - * Specifies the name of the subscribed queue. - * - * @param destination - * The client specified name for the subscription. This is used as the destination for - * all messages transferred from this subscription. The destination is scoped to the session. - * - * - * @param acceptMode - * The accept-mode to use for messages transferred from this subscription. - * - * @param acquireMode - * The acquire-mode to use for messages transferred from this subscription. - * - * @param exclusive - * Request an exclusive subscription. This prevents other subscribers from subscribing to - * the queue. - * - * @param resumeId - * Requests that the broker use the supplied resume-id when transferring messages for - * this subscription. - * - * @param resumeTtl - * Requested duration in milliseconds for the broker use as resume-ttl when transferring - * messages for this subscription. - * - * @param arguments - * The syntax and semantics of these arguments depends on the providers implementation. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN void messageSubscribe(const string& queue=string(), const string& destination=string(), uint8_t acceptMode=0, uint8_t acquireMode=0, bool exclusive=false, const string& resumeId=string(), uint64_t resumeTtl=0, const FieldTable& arguments=FieldTable(), bool sync=true); - - /** - * - * This command cancels a subscription. This does not affect already delivered messages, but it - * does mean the server will not send any more messages for that subscription. The client may - * receive an arbitrary number of messages in between sending the cancel command and receiving - * notification that the cancel command is complete. - * - * - * @param destination - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN void messageCancel(const string& destination=string(), bool sync=true); - - /** - * - * Sets the mode of flow control used for a given destination to either window or credit based - * flow control. - * - * With credit based flow control, the sender of messages continually maintains its current - * credit balance with the recipient. The credit balance consists of two values, a message - * count, and a byte count. Whenever message data is sent, both counts must be decremented. - * If either value reaches zero, the flow of message data must stop. Additional credit is - * received via the message.flow command. - * - * The sender MUST NOT send partial assemblies. This means that if there is not enough byte - * credit available to send a complete message, the sender must either wait or use message - * fragmentation (see the fragment-properties header struct) to send the first part of the - * message data in a complete assembly. - * - * Window based flow control is identical to credit based flow control, however message - * transfer completion implicitly grants a single unit of message credit, and the size of the - * message in byte credits for each completed message transfer. Completion of the transfer - * command with session.completed is the only way credit is implicitly updated; message.accept, - * message.release, message.reject, tx.commit and tx.rollback have no effect on the outstanding - * credit balances. - * - * - * @param destination - * - * @param flowMode - * - * The new flow control mode. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN void messageSetFlowMode(const string& destination=string(), uint8_t flowMode=0, bool sync=true); - - /** - * - * This command controls the flow of message data to a given destination. It is used by the - * recipient of messages to dynamically match the incoming rate of message flow to its - * processing or forwarding capacity. Upon receipt of this command, the sender must add "value" - * number of the specified unit to the available credit balance for the specified destination. - * A value of (0xFFFFFFFF) indicates an infinite amount of credit. This disables any limit for - * the given unit until the credit balance is zeroed with message.stop or message.flush. - * - * - * @param destination - * - * @param unit - * - * The unit of value. - * - * - * @param value - * - * If the value is not set then this indicates an infinite amount of credit. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN void messageFlow(const string& destination=string(), uint8_t unit=0, uint32_t value=0, bool sync=true); - - /** - * - * Forces the sender to exhaust his credit supply. The sender's credit will always be zero when - * this command completes. The command completes when immediately available message data has - * been transferred, or when the credit supply is exhausted. - * - * - * @param destination - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN void messageFlush(const string& destination=string(), bool sync=true); - - /** - * - * On receipt of this command, a producer of messages MUST set his credit to zero for the given - * destination. When notifying of completion, credit MUST be zero and no further messages will - * be sent until such a time as further credit is received. - * - * - * @param destination - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN void messageStop(const string& destination=string(), bool sync=true); - - /** - * - * This command sets the session to use standard transactions. The client must use this command - * exactly once on a session before using the Commit or Rollback commands. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN void txSelect(bool sync=true); - - /** - * - * This command commits all messages published and accepted in the current transaction. A - * new transaction starts immediately after a commit. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN void txCommit(bool sync=true); - - /** - * - * This command abandons the current transaction. In particular the transfers from Client to - * Server (publishes) and accepts of transfers from Server to Client which occurred in the - * current transaction are discarded. A new transaction starts immediately after a rollback. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN void txRollback(bool sync=true); - - /** - * - * This command sets the session to use distributed transactions. The client must use this - * command at least once on a session before using XA demarcation operations. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN void dtxSelect(bool sync=true); - - /** - * - * This command is called when messages should be produced and consumed on behalf a transaction - * branch identified by xid. - * - * - * @param xid - * - * Specifies the xid of the transaction branch to be started. - * - * - * @param join - * - * Indicate whether this is joining an already associated xid. Indicate that the start - * applies to joining a transaction previously seen. - * - * - * @param resume - * - * Indicate that the start applies to resuming a suspended transaction branch specified. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN qpid::framing::XaResult dtxStart(const Xid& xid=Xid(), bool join=false, bool resume=false, bool sync=true); - - /** - * - * This command is called when the work done on behalf a transaction branch finishes or needs - * to be suspended. - * - * - * @param xid - * - * Specifies the xid of the transaction branch to be ended. - * - * - * @param fail - * - * If set, indicates that this portion of work has failed; otherwise this portion of work has - * completed successfully. - * - * - * @param suspend - * - * Indicates that the transaction branch is temporarily suspended in an incomplete state. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN qpid::framing::XaResult dtxEnd(const Xid& xid=Xid(), bool fail=false, bool suspend=false, bool sync=true); - - /** - * - * Commit the work done on behalf a transaction branch. This command commits the work - * associated with xid. Any produced messages are made available and any consumed messages are - * discarded. - * - * - * @param xid - * - * Specifies the xid of the transaction branch to be committed. - * - * - * @param onePhase - * - * Used to indicate whether one-phase or two-phase commit is used. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN qpid::framing::XaResult dtxCommit(const Xid& xid=Xid(), bool onePhase=false, bool sync=true); - - /** - * - * This command is called to forget about a heuristically completed transaction branch. - * - * - * @param xid - * - * Specifies the xid of the transaction branch to be forgotten. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN void dtxForget(const Xid& xid=Xid(), bool sync=true); - - /** - * - * This command obtains the current transaction timeout value in seconds. If set-timeout was - * not used prior to invoking this command, the return value is the default timeout; otherwise, - * the value used in the previous set-timeout call is returned. - * - * - * @param xid - * - * Specifies the xid of the transaction branch for getting the timeout. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN qpid::framing::DtxGetTimeoutResult dtxGetTimeout(const Xid& xid=Xid(), bool sync=true); - - /** - * - * This command prepares for commitment any message produced or consumed on behalf of xid. - * - * - * @param xid - * - * Specifies the xid of the transaction branch that can be prepared. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN qpid::framing::XaResult dtxPrepare(const Xid& xid=Xid(), bool sync=true); - - /** - * - * This command is called to obtain a list of transaction branches that are in a prepared or - * heuristically completed state. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN qpid::framing::DtxRecoverResult dtxRecover(bool sync=true); - - /** - * - * This command rolls back the work associated with xid. Any produced messages are discarded - * and any consumed messages are re-enqueued. - * - * - * @param xid - * - * Specifies the xid of the transaction branch that can be rolled back. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN qpid::framing::XaResult dtxRollback(const Xid& xid=Xid(), bool sync=true); - - /** - * - * Sets the specified transaction branch timeout value in seconds. - * - * - * @param xid - * - * Specifies the xid of the transaction branch for setting the timeout. - * - * - * @param timeout - * - * The transaction timeout value in seconds. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN void dtxSetTimeout(const Xid& xid=Xid(), uint32_t timeout=0, bool sync=true); - - /** - * - * This command creates an exchange if it does not already exist, and if the exchange exists, - * verifies that it is of the correct and expected class. - * - * - * @param exchange - * - * @param type - * - * Each exchange belongs to one of a set of exchange types implemented by the server. The - * exchange types define the functionality of the exchange - i.e. how messages are routed - * through it. It is not valid or meaningful to attempt to change the type of an existing - * exchange. - * - * - * @param alternateExchange - * - * In the event that a message cannot be routed, this is the name of the exchange to which - * the message will be sent. Messages transferred using message.transfer will be routed to - * the alternate-exchange only if they are sent with the "none" accept-mode, and the - * discard-unroutable delivery property is set to false, and there is no queue to route to - * for the given message according to the bindings on this exchange. - * - * - * @param passive - * - * If set, the server will not create the exchange. The client can use this to check whether - * an exchange exists without modifying the server state. - * - * - * @param durable - * - * If set when creating a new exchange, the exchange will be marked as durable. Durable - * exchanges remain active when a server restarts. Non-durable exchanges (transient - * exchanges) are purged if/when a server restarts. - * - * - * @param autoDelete - * - * If set, the exchange is deleted automatically when there remain no bindings between the - * exchange and any queue. Such an exchange will not be automatically deleted until at least - * one binding has been made to prevent the immediate deletion of the exchange upon creation. - * - * - * @param arguments - * - * A set of arguments for the declaration. The syntax and semantics of these arguments - * depends on the server implementation. This field is ignored if passive is 1. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN void exchangeDeclare(const string& exchange=string(), const string& type=string(), const string& alternateExchange=string(), bool passive=false, bool durable=false, bool autoDelete=false, const FieldTable& arguments=FieldTable(), bool sync=true); - - /** - * - * This command deletes an exchange. When an exchange is deleted all queue bindings on the - * exchange are cancelled. - * - * - * @param exchange - * - * @param ifUnused - * - * If set, the server will only delete the exchange if it has no queue bindings. If the - * exchange has queue bindings the server does not delete it but raises an exception - * instead. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN void exchangeDelete(const string& exchange=string(), bool ifUnused=false, bool sync=true); - - /** - * - * This command is used to request information on a particular exchange. - * - * - * @param name - * - * The name of the exchange for which information is requested. If not specified explicitly - * the default exchange is implied. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN qpid::framing::ExchangeQueryResult exchangeQuery(const string& name=string(), bool sync=true); - - /** - * This command binds a queue to an exchange. Until a queue is bound it will not receive - * any messages. In a classic messaging model, store-and-forward queues are bound to a direct - * exchange and subscription queues are bound to a topic exchange. - * - * @param queue - * Specifies the name of the queue to bind. - * - * @param exchange - * - * @param bindingKey - * The binding-key uniquely identifies a binding between a given (exchange, queue) pair. - * Depending on the exchange configuration, the binding key may be matched against the - * message routing key in order to make routing decisions. The match algorithm depends on the - * exchange type. Some exchange types may ignore the binding key when making routing - * decisions. Refer to the specific exchange type documentation. The meaning of an empty - * binding key depends on the exchange implementation. - * - * @param arguments - * A set of arguments for the binding. The syntax and semantics of these arguments - * depends on the exchange class. - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN void exchangeBind(const string& queue=string(), const string& exchange=string(), const string& bindingKey=string(), const FieldTable& arguments=FieldTable(), bool sync=true); - - /** - * - * This command unbinds a queue from an exchange. - * - * - * @param queue - * - * Specifies the name of the queue to unbind. - * - * - * @param exchange - * - * The name of the exchange to unbind from. - * - * - * @param bindingKey - * - * Specifies the binding-key of the binding to unbind. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN void exchangeUnbind(const string& queue=string(), const string& exchange=string(), const string& bindingKey=string(), bool sync=true); - - /** - * - * This command is used to request information on the bindings to a particular exchange. - * - * - * @param exchange - * - * The name of the exchange for which binding information is being requested. If not - * specified explicitly the default exchange is implied. - * - * - * @param queue - * - * If populated then determine whether the given queue is bound to the exchange. - * - * - * @param bindingKey - * - * If populated defines the binding-key of the binding of interest, if not populated the - * request will ignore the binding-key on bindings when searching for a match. - * - * - * @param arguments - * - * If populated defines the arguments of the binding of interest if not populated the request - * will ignore the arguments on bindings when searching for a match - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN qpid::framing::ExchangeBoundResult exchangeBound(const string& exchange=string(), const string& queue=string(), const string& bindingKey=string(), const FieldTable& arguments=FieldTable(), bool sync=true); - - /** - * - * This command creates or checks a queue. When creating a new queue the client can specify - * various properties that control the durability of the queue and its contents, and the level - * of sharing for the queue. - * - * - * @param queue - * - * @param alternateExchange - * - * The alternate-exchange field specifies how messages on this queue should be treated when - * they are rejected by a subscriber, or when they are orphaned by queue deletion. When - * present, rejected or orphaned messages MUST be routed to the alternate-exchange. In all - * cases the messages MUST be removed from the queue. - * - * - * @param passive - * - * If set, the server will not create the queue. This field allows the client to assert the - * presence of a queue without modifying the server state. - * - * - * @param durable - * - * If set when creating a new queue, the queue will be marked as durable. Durable queues - * remain active when a server restarts. Non-durable queues (transient queues) are purged - * if/when a server restarts. Note that durable queues do not necessarily hold persistent - * messages, although it does not make sense to send persistent messages to a transient - * queue. - * - * - * @param exclusive - * - * Exclusive queues can only be used from one session at a time. Once a session - * declares an exclusive queue, that queue cannot be used by any other session until the - * declaring session closes. - * - * - * @param autoDelete - * - * If this field is set and the exclusive field is also set, then the queue MUST be deleted - * when the session closes. - * - * If this field is set and the exclusive field is not set the queue is deleted when all - * the consumers have finished using it. Last consumer can be cancelled either explicitly - * or because its session is closed. If there was no consumer ever on the queue, it won't - * be deleted. - * - * - * @param arguments - * - * A set of arguments for the declaration. The syntax and semantics of these arguments - * depends on the server implementation. This field is ignored if passive is 1. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN void queueDeclare(const string& queue=string(), const string& alternateExchange=string(), bool passive=false, bool durable=false, bool exclusive=false, bool autoDelete=false, const FieldTable& arguments=FieldTable(), bool sync=true); - - /** - * - * This command deletes a queue. When a queue is deleted any pending messages are sent to the - * alternate-exchange if defined, or discarded if it is not. - * - * - * @param queue - * - * Specifies the name of the queue to delete. - * - * - * @param ifUnused - * - * If set, the server will only delete the queue if it has no consumers. If the queue has - * consumers the server does does not delete it but raises an exception instead. - * - * - * @param ifEmpty - * - * If set, the server will only delete the queue if it has no messages. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN void queueDelete(const string& queue=string(), bool ifUnused=false, bool ifEmpty=false, bool sync=true); - - /** - * - * This command removes all messages from a queue. It does not cancel subscribers. Purged - * messages are deleted without any formal "undo" mechanism. - * - * - * @param queue - * - * Specifies the name of the queue to purge. - * - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN void queuePurge(const string& queue=string(), bool sync=true); - - /** - * - * This command requests information about a queue. - * - * - * @param queue - * - * @param sync - * If true the broker will respond with completion status as soon as possible. - * - */ - QPID_CLIENT_EXTERN qpid::framing::QueueQueryResult queueQuery(const string& queue=string(), bool sync=true); -}; - -}}} // namespace qpid::client::no_keyword - -#endif /*!QPID_CLIENT_NO_KEYWORD_SESSION_0_10_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/console/Agent.h b/nativeLib/org.apache.qpid/include/qpid/console/Agent.h deleted file mode 100644 index 97d75da250..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/console/Agent.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#ifndef _QPID_CONSOLE_AGENT_H_ -#define _QPID_CONSOLE_AGENT_H_ - -#include "qpid/console/Broker.h" -#include "qpid/console/ConsoleImportExport.h" - -namespace qpid { -namespace console { - - /** - * - * \ingroup qmfconsoleapi - */ - class QPID_CONSOLE_EXTERN Agent { - public: - typedef std::vector Vector; - - Agent(Broker* _broker, uint32_t _bank, const std::string& _label) : - broker(_broker), brokerBank(broker->getBrokerBank()), - agentBank(_bank), label(_label) {} - Broker* getBroker() const { return broker; } - uint32_t getBrokerBank() const { return brokerBank; } - uint32_t getAgentBank() const { return agentBank; } - const std::string& getLabel() const { return label; } - - private: - Broker* broker; - const uint32_t brokerBank; - const uint32_t agentBank; - const std::string label; - }; - - QPID_CONSOLE_EXTERN std::ostream& operator<<(std::ostream& o, const Agent& agent); -} -} - - -#endif diff --git a/nativeLib/org.apache.qpid/include/qpid/console/Broker.h b/nativeLib/org.apache.qpid/include/qpid/console/Broker.h deleted file mode 100644 index 0b2d1bcb61..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/console/Broker.h +++ /dev/null @@ -1,133 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#ifndef _QPID_CONSOLE_BROKER_H_ -#define _QPID_CONSOLE_BROKER_H_ - -#include "qpid/console/ConsoleImportExport.h" -#include "qpid/client/Connection.h" -#include "qpid/client/ConnectionSettings.h" -#include "qpid/client/SubscriptionManager.h" -#include "qpid/client/Session.h" -#include "qpid/client/AsyncSession.h" -#include "qpid/client/Message.h" -#include "qpid/client/MessageListener.h" -#include "qpid/sys/Thread.h" -#include "qpid/sys/Runnable.h" -#include "qpid/sys/Mutex.h" -#include "qpid/sys/Condition.h" -#include "qpid/Url.h" -#include "qpid/framing/Buffer.h" -#include "qpid/framing/Uuid.h" -#include -#include - -namespace qpid { -namespace console { - class SessionManager; - class Agent; - class Object; - - /** - * - * \ingroup qpidconsoleapi - */ - class Broker : public client::MessageListener { - public: - QPID_CONSOLE_EXTERN Broker(SessionManager& sm, - client::ConnectionSettings& settings); - QPID_CONSOLE_EXTERN ~Broker(); - - QPID_CONSOLE_EXTERN bool isConnected() const { return connected; } - QPID_CONSOLE_EXTERN const std::string& getError() const { return error; } - QPID_CONSOLE_EXTERN const std::string& getSessionId() const { return amqpSessionId; } - QPID_CONSOLE_EXTERN const framing::Uuid& getBrokerId() const { return brokerId; } - QPID_CONSOLE_EXTERN uint32_t getBrokerBank() const { return 1; } - QPID_CONSOLE_EXTERN void addBinding(const std::string& key) { - connThreadBody.bindExchange("qpid.management", key); - } - QPID_CONSOLE_EXTERN std::string getUrl() const; - QPID_CONSOLE_EXTERN void waitForStable(); - - private: - friend class SessionManager; - friend class Object; - typedef std::map AgentMap; - static const int SYNC_TIME = 60; - - SessionManager& sessionManager; - AgentMap agents; - bool connected; - std::string error; - std::string amqpSessionId; - client::ConnectionSettings connectionSettings; - sys::Mutex lock; - sys::Condition cond; - framing::Uuid brokerId; - uint32_t reqsOutstanding; - bool syncInFlight; - bool topicBound; - Object* methodObject; - - friend class ConnectionThread; - class ConnectionThread : public sys::Runnable { - bool operational; - bool shuttingDown; - Broker& broker; - framing::Uuid sessionId; - client::Connection connection; - client::Session session; - client::SubscriptionManager* subscriptions; - std::stringstream queueName; - sys::Mutex connLock; - void run(); - public: - ConnectionThread(Broker& _broker) : - operational(false), shuttingDown(false), broker(_broker), subscriptions(0) {} - ~ConnectionThread(); - void sendBuffer(qpid::framing::Buffer& buf, - uint32_t length, - const std::string& exchange = "qpid.management", - const std::string& routingKey = "broker"); - void bindExchange(const std::string& exchange, const std::string& key); - void shutdown(); - }; - - ConnectionThread connThreadBody; - sys::Thread connThread; - - void encodeHeader(framing::Buffer& buf, uint8_t opcode, uint32_t seq = 0) const; - bool checkHeader(framing::Buffer& buf, uint8_t *opcode, uint32_t *seq) const; - void received(client::Message& msg); - void resetAgents(); - void updateAgent(const Object& object); - void incOutstanding(); - void decOutstanding(); - void setBrokerId(const framing::Uuid& id) { brokerId = id; } - void appendAgents(std::vector& agents) const; - - friend QPID_CONSOLE_EXTERN std::ostream& operator<<(std::ostream& o, const Broker& k); - }; - - QPID_CONSOLE_EXTERN std::ostream& operator<<(std::ostream& o, const Broker& k); -} -} - -#endif diff --git a/nativeLib/org.apache.qpid/include/qpid/console/ClassKey.h b/nativeLib/org.apache.qpid/include/qpid/console/ClassKey.h deleted file mode 100644 index 95cd2627f1..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/console/ClassKey.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#ifndef _QPID_CONSOLE_CLASSKEY_H_ -#define _QPID_CONSOLE_CLASSKEY_H_ - -#include -#include "qpid/console/ConsoleImportExport.h" -#include "qpid/console/Package.h" -#include "qpid/framing/Buffer.h" - -namespace qpid { -namespace console { - - /** - * - * \ingroup qmfconsoleapi - */ - class QPID_CONSOLE_EXTERN ClassKey { - public: - static const int HASH_SIZE = 16; - - ClassKey(const std::string& package, const std::string& name, const uint8_t* hash); - - const std::string& getPackageName() const { return package; } - const std::string& getClassName() const { return name; } - const uint8_t* getHash() const { return hash; } - std::string getHashString() const; - std::string str() const; - bool operator==(const ClassKey& other) const; - bool operator!=(const ClassKey& other) const; - bool operator<(const ClassKey& other) const; - bool operator>(const ClassKey& other) const; - bool operator<=(const ClassKey& other) const; - bool operator>=(const ClassKey& other) const; - void encode(framing::Buffer& buffer) const; - - private: - std::string package; - std::string name; - uint8_t hash[HASH_SIZE]; - }; - - QPID_CONSOLE_EXTERN std::ostream& operator<<(std::ostream& o, const ClassKey& k); -} -} - - -#endif diff --git a/nativeLib/org.apache.qpid/include/qpid/console/ConsoleImportExport.h b/nativeLib/org.apache.qpid/include/qpid/console/ConsoleImportExport.h deleted file mode 100644 index c2d7cb3a14..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/console/ConsoleImportExport.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef QPID_CONSOLE_IMPORT_EXPORT_H -#define QPID_CONSOLE_IMPORT_EXPORT_H - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -#if defined(WIN32) && !defined(QPID_DECLARE_STATIC) -#if defined(CONSOLE_EXPORT) || defined (qmfconsole_EXPORTS) -#define QPID_CONSOLE_EXTERN __declspec(dllexport) -#else -#define QPID_CONSOLE_EXTERN __declspec(dllimport) -#endif -#else -#define QPID_CONSOLE_EXTERN -#endif - -#endif diff --git a/nativeLib/org.apache.qpid/include/qpid/console/ConsoleListener.h b/nativeLib/org.apache.qpid/include/qpid/console/ConsoleListener.h deleted file mode 100644 index 7a649da657..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/console/ConsoleListener.h +++ /dev/null @@ -1,97 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#ifndef _QPID_CONSOLE_CONSOLE_LISTENER_H_ -#define _QPID_CONSOLE_CONSOLE_LISTENER_H_ - -#include -#include "qpid/console/ConsoleImportExport.h" -#include "qpid/console/Broker.h" -#include "qpid/console/ClassKey.h" -#include "qpid/console/Object.h" -#include "qpid/console/Event.h" - -namespace qpid { -namespace console { - - /** - * Implement a subclass of ConsoleListener and subscribe it using - * the SessionManager to receive indications. - * - * \ingroup qmfconsoleapi - */ - class QPID_CONSOLE_EXTERN ConsoleListener{ - public: - virtual ~ConsoleListener() {}; - - /** Invoked when a connection is established to a broker - */ - virtual void brokerConnected(const Broker&) {} - - /** Invoked when the connection to a broker is lost - */ - virtual void brokerDisconnected(const Broker&) {} - - /** Invoked when a QMF package is discovered. - */ - virtual void newPackage(const std::string&) {} - - /** Invoked when a new class is discovered. Session.getSchema can be - * used to obtain details about the class. - */ - virtual void newClass(const ClassKey&) {} - - /** Invoked when a QMF agent is discovered. - */ - virtual void newAgent(const Agent&) {} - - /** Invoked when a QMF agent disconects. - */ - virtual void delAgent(const Agent&) {} - - /** Invoked when an object is updated. - */ - virtual void objectProps(Broker&, Object&) {} - - /** Invoked when an object is updated. - */ - virtual void objectStats(Broker&, Object&) {} - - /** Invoked when an event is raised. - */ - virtual void event(Event&) {} - - /** - */ - //virtual void heartbeat(Agent&, uint64_t) {} - - /** - */ - virtual void brokerInfo(Broker&) {} - - /** - */ - //virtual void methodResponse(Broker&, uint32_t seq, MethodResponse&) {} - }; -} -} - - -#endif diff --git a/nativeLib/org.apache.qpid/include/qpid/console/Event.h b/nativeLib/org.apache.qpid/include/qpid/console/Event.h deleted file mode 100644 index ef4ecc791c..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/console/Event.h +++ /dev/null @@ -1,86 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#ifndef _QPID_CONSOLE_EVENT_H_ -#define _QPID_CONSOLE_EVENT_H_ - -#include "qpid/console/ConsoleImportExport.h" -#include "qpid/console/Object.h" -#include "qpid/framing/Uuid.h" -#include "qpid/framing/FieldTable.h" - -namespace qpid { -namespace framing { - class Buffer; -} -namespace console { - - class Broker; - struct SchemaClass; - class ClassKey; - - /** - * - * \ingroup qmfconsoleapi - */ - class Event { - public: - typedef enum { - SEV_EMERGENCY = 0, SEV_ALERT = 1, SEV_CRITICAL = 2, SEV_ERROR = 3, - SEV_WARNING = 4, SEV_NOTICE = 5, SEV_INFO = 6, SEV_DEBUG = 7 - } Severity; - - QPID_CONSOLE_EXTERN Event(Broker* broker, - SchemaClass* schemaClass, - framing::Buffer& buffer); - Broker* getBroker() const { return broker; } - QPID_CONSOLE_EXTERN const ClassKey& getClassKey() const; - SchemaClass* getSchema() const { return schema; } - const Object::AttributeMap& getAttributes() const { return attributes; } - uint64_t getTimestamp() const { return timestamp; } - uint8_t getSeverity() const { return severity; } - QPID_CONSOLE_EXTERN std::string getSeverityString() const; - - QPID_CONSOLE_EXTERN ObjectId attrRef(const std::string& key) const; - QPID_CONSOLE_EXTERN uint32_t attrUint(const std::string& key) const; - QPID_CONSOLE_EXTERN int32_t attrInt(const std::string& key) const; - QPID_CONSOLE_EXTERN uint64_t attrUint64(const std::string& key) const; - QPID_CONSOLE_EXTERN int64_t attrInt64(const std::string& key) const; - QPID_CONSOLE_EXTERN std::string attrString(const std::string& key) const; - QPID_CONSOLE_EXTERN bool attrBool(const std::string& key) const; - QPID_CONSOLE_EXTERN float attrFloat(const std::string& key) const; - QPID_CONSOLE_EXTERN double attrDouble(const std::string& key) const; - QPID_CONSOLE_EXTERN framing::Uuid attrUuid(const std::string& key) const; - QPID_CONSOLE_EXTERN framing::FieldTable attrMap(const std::string& key) const; - - private: - Broker* broker; - SchemaClass* schema; - uint64_t timestamp; - Severity severity; - Object::AttributeMap attributes; - }; - - QPID_CONSOLE_EXTERN std::ostream& operator<<(std::ostream& o, const Event& event); -} -} - - -#endif diff --git a/nativeLib/org.apache.qpid/include/qpid/console/Object.h b/nativeLib/org.apache.qpid/include/qpid/console/Object.h deleted file mode 100644 index 5a29fdf792..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/console/Object.h +++ /dev/null @@ -1,123 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#ifndef _QPID_CONSOLE_OBJECT_H_ -#define _QPID_CONSOLE_OBJECT_H_ - -#include "qpid/console/ConsoleImportExport.h" -#include "qpid/console/ObjectId.h" -#include "qpid/framing/Uuid.h" -#include "qpid/framing/FieldTable.h" -#include -#include -#include -#include - -namespace qpid { -namespace framing { - class Buffer; -} -namespace console { - - class Broker; - struct SchemaClass; - struct SchemaMethod; - class ObjectId; - class ClassKey; - class Value; - - /** - * \ingroup qmfconsoleapi - */ - struct MethodResponse { - uint32_t code; - std::string text; - std::map > arguments; - }; - - class Object { - public: - typedef std::vector Vector; - struct AttributeMap : public std::map > { - QPID_CONSOLE_EXTERN void addRef(const std::string& key, const ObjectId& val); - QPID_CONSOLE_EXTERN void addUint(const std::string& key, uint32_t val); - QPID_CONSOLE_EXTERN void addInt(const std::string& key, int32_t val); - QPID_CONSOLE_EXTERN void addUint64(const std::string& key, uint64_t val); - QPID_CONSOLE_EXTERN void addInt64(const std::string& key, int64_t val); - QPID_CONSOLE_EXTERN void addString(const std::string& key, const std::string& val); - QPID_CONSOLE_EXTERN void addBool(const std::string& key, bool val); - QPID_CONSOLE_EXTERN void addFloat(const std::string& key, float val); - QPID_CONSOLE_EXTERN void addDouble(const std::string& key, double val); - QPID_CONSOLE_EXTERN void addUuid(const std::string& key, const framing::Uuid& val); - QPID_CONSOLE_EXTERN void addMap(const std::string& key, const framing::FieldTable& val); - }; - - QPID_CONSOLE_EXTERN Object(Broker* broker, SchemaClass* schemaClass, framing::Buffer& buffer, bool prop, bool stat); - QPID_CONSOLE_EXTERN ~Object(); - - Broker* getBroker() const { return broker; } - const ObjectId& getObjectId() const { return objectId; } - QPID_CONSOLE_EXTERN const ClassKey& getClassKey() const; - SchemaClass* getSchema() const { return schema; } - uint64_t getCurrentTime() const { return currentTime; } - uint64_t getCreateTime() const { return createTime; } - uint64_t getDeleteTime() const { return deleteTime; } - bool isDeleted() const { return deleteTime != 0; } - QPID_CONSOLE_EXTERN std::string getIndex() const; - QPID_CONSOLE_EXTERN void mergeUpdate(const Object& updated); - const AttributeMap& getAttributes() const { return attributes; } - QPID_CONSOLE_EXTERN void invokeMethod(const std::string name, - const AttributeMap& args, - MethodResponse& result); - QPID_CONSOLE_EXTERN void handleMethodResp(framing::Buffer& buffer, - uint32_t sequence); - - QPID_CONSOLE_EXTERN ObjectId attrRef(const std::string& key) const; - QPID_CONSOLE_EXTERN uint32_t attrUint(const std::string& key) const; - QPID_CONSOLE_EXTERN int32_t attrInt(const std::string& key) const; - QPID_CONSOLE_EXTERN uint64_t attrUint64(const std::string& key) const; - QPID_CONSOLE_EXTERN int64_t attrInt64(const std::string& key) const; - QPID_CONSOLE_EXTERN std::string attrString(const std::string& key) const; - QPID_CONSOLE_EXTERN bool attrBool(const std::string& key) const; - QPID_CONSOLE_EXTERN float attrFloat(const std::string& key) const; - QPID_CONSOLE_EXTERN double attrDouble(const std::string& key) const; - QPID_CONSOLE_EXTERN framing::Uuid attrUuid(const std::string& key) const; - QPID_CONSOLE_EXTERN framing::FieldTable attrMap(const std::string& key) const; - - private: - Broker* broker; - SchemaClass* schema; - ObjectId objectId; - uint64_t currentTime; - uint64_t createTime; - uint64_t deleteTime; - AttributeMap attributes; - SchemaMethod* pendingMethod; - MethodResponse methodResponse; - - void parsePresenceMasks(framing::Buffer& buffer, std::set& excludeList); - }; - - QPID_CONSOLE_EXTERN std::ostream& operator<<(std::ostream& o, const Object& object); -} -} - - -#endif diff --git a/nativeLib/org.apache.qpid/include/qpid/console/ObjectId.h b/nativeLib/org.apache.qpid/include/qpid/console/ObjectId.h deleted file mode 100644 index 7904c85598..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/console/ObjectId.h +++ /dev/null @@ -1,69 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#ifndef _QPID_CONSOLE_OBJECTID_H -#define _QPID_CONSOLE_OBJECTID_H - -#include -#include "qpid/console/ConsoleImportExport.h" -#include "qpid/sys/IntegerTypes.h" - -namespace qpid { -namespace framing { - class Buffer; -} -namespace console { - - /** - * - * \ingroup qmfconsoleapi - */ - class QPID_CONSOLE_EXTERN ObjectId { - public: - ObjectId() : first(0), second(0) {} - ObjectId(framing::Buffer& buffer); - - uint8_t getFlags() const { return (first & 0xF000000000000000LL) >> 60; } - uint16_t getSequence() const { return (first & 0x0FFF000000000000LL) >> 48; } - uint32_t getBrokerBank() const { return (first & 0x0000FFFFF0000000LL) >> 28; } - uint32_t getAgentBank() const { return first & 0x000000000FFFFFFFLL; } - uint64_t getObject() const { return second; } - bool isDurable() const { return getSequence() == 0; } - void decode(framing::Buffer& buffer); - void encode(framing::Buffer& buffer); - void setValue(uint64_t f, uint64_t s) { first = f; second = s; } - - bool operator==(const ObjectId& other) const; - bool operator!=(const ObjectId& other) const; - bool operator<(const ObjectId& other) const; - bool operator>(const ObjectId& other) const; - bool operator<=(const ObjectId& other) const; - bool operator>=(const ObjectId& other) const; - - private: - uint64_t first; - uint64_t second; - }; - - QPID_CONSOLE_EXTERN std::ostream& operator<<(std::ostream& o, const ObjectId& id); -} -} - -#endif diff --git a/nativeLib/org.apache.qpid/include/qpid/console/Package.h b/nativeLib/org.apache.qpid/include/qpid/console/Package.h deleted file mode 100644 index 3b59e366ff..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/console/Package.h +++ /dev/null @@ -1,78 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#ifndef _QPID_CONSOLE_PACKAGE_H_ -#define _QPID_CONSOLE_PACKAGE_H_ - -#include -#include -#include "qpid/console/ConsoleImportExport.h" -#include "qpid/sys/IntegerTypes.h" - -namespace qpid { -namespace console { - struct SchemaClass; - - /** - * - * \ingroup qmfconsoleapi - */ - class Package { - public: - Package(const std::string& n) : name(n) {} - const std::string& getName() const { return name; } - - private: - friend class SessionManager; - struct NameHash { - std::string name; - uint8_t hash[16]; - NameHash(const std::string& n, const uint8_t* h) : name(n) { - for (int i = 0; i < 16; i++) - hash[i] = h[i]; - } - }; - - struct NameHashComp { - bool operator() (const NameHash& lhs, const NameHash& rhs) const - { - if (lhs.name != rhs.name) - return lhs.name < rhs.name; - else - for (int i = 0; i < 16; i++) - if (lhs.hash[i] != rhs.hash[i]) - return lhs.hash[i] < rhs.hash[i]; - return false; - } - }; - - typedef std::map ClassMap; - - const std::string name; - ClassMap classes; - - SchemaClass* getClass(const std::string& className, uint8_t* hash); - void addClass(const std::string& className, uint8_t* hash, - SchemaClass* schemaClass); - }; -} -} - -#endif diff --git a/nativeLib/org.apache.qpid/include/qpid/console/Schema.h b/nativeLib/org.apache.qpid/include/qpid/console/Schema.h deleted file mode 100644 index 6d4e41ab3e..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/console/Schema.h +++ /dev/null @@ -1,105 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#ifndef _QPID_CONSOLE_SCHEMA_H_ -#define _QPID_CONSOLE_SCHEMA_H_ - -#include "qpid/console/ClassKey.h" -#include -#include - -namespace qpid { -namespace framing { - class Buffer; -} -namespace console { - class Value; - - struct SchemaArgument { - SchemaArgument(framing::Buffer& buffer, bool forMethod = false); - boost::shared_ptr decodeValue(framing::Buffer& buffer); - - std::string name; - uint8_t typeCode; - bool dirInput; - bool dirOutput; - std::string unit; - int min; - int max; - int maxLen; - std::string desc; - std::string defaultVal; - }; - - struct SchemaProperty { - SchemaProperty(framing::Buffer& buffer); - boost::shared_ptr decodeValue(framing::Buffer& buffer); - - std::string name; - uint8_t typeCode; - uint8_t accessCode; - bool isIndex; - bool isOptional; - std::string unit; - int min; - int max; - int maxLen; - std::string desc; - }; - - struct SchemaStatistic { - SchemaStatistic(framing::Buffer& buffer); - boost::shared_ptr decodeValue(framing::Buffer& buffer); - - std::string name; - uint8_t typeCode; - std::string unit; - std::string desc; - }; - - struct SchemaMethod { - SchemaMethod(framing::Buffer& buffer); - ~SchemaMethod(); - - std::string name; - std::string desc; - std::vector arguments; - }; - - struct SchemaClass { - static const uint8_t KIND_TABLE = 1; - static const uint8_t KIND_EVENT = 2; - - SchemaClass(const uint8_t kind, const ClassKey& key, framing::Buffer& buffer); - ~SchemaClass(); - const ClassKey& getClassKey() const { return key; } - - const uint8_t kind; - const ClassKey key; - std::vector properties; - std::vector statistics; - std::vector methods; - std::vector arguments; - }; -} -} - - -#endif diff --git a/nativeLib/org.apache.qpid/include/qpid/console/SequenceManager.h b/nativeLib/org.apache.qpid/include/qpid/console/SequenceManager.h deleted file mode 100644 index ea0ccf3f77..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/console/SequenceManager.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#ifndef _QPID_CONSOLE_SEQUENCEMANAGER_H_ -#define _QPID_CONSOLE_SEQUENCEMANAGER_H_ - -#include "qpid/console/ConsoleImportExport.h" -#include "qpid/sys/Mutex.h" -#include -#include -#include - -namespace qpid { -namespace console { - - /** - * - * \ingroup qpidconsoleapi - */ - class SequenceManager { - public: - typedef std::set set; - - SequenceManager() : sequence(0) {} - QPID_CONSOLE_EXTERN uint32_t reserve(const std::string& context = ""); - QPID_CONSOLE_EXTERN std::string release(uint32_t seq); - - private: - sys::Mutex lock; - uint32_t sequence; - std::map pending; - }; -} -} - - -#endif diff --git a/nativeLib/org.apache.qpid/include/qpid/console/SessionManager.h b/nativeLib/org.apache.qpid/include/qpid/console/SessionManager.h deleted file mode 100644 index b46af549ff..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/console/SessionManager.h +++ /dev/null @@ -1,219 +0,0 @@ -#ifndef _QPID_CONSOLE_SESSION_MANAGER_H -#define _QPID_CONSOLE_SESSION_MANAGER_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include "qpid/console/ConsoleImportExport.h" -#include "qpid/console/Broker.h" -#include "qpid/console/Package.h" -#include "qpid/console/SequenceManager.h" -#include "qpid/console/ClassKey.h" -#include "qpid/console/Schema.h" -#include "qpid/console/Agent.h" -#include "qpid/console/Object.h" -#include "qpid/console/ObjectId.h" -#include "qpid/console/Value.h" -#include "qpid/sys/Mutex.h" -#include "qpid/sys/Condition.h" -#include "qpid/client/ConnectionSettings.h" -#include -#include - -namespace qpid { -namespace console { - -class ConsoleListener; - -/** - * - * \ingroup qmfconsoleapi - */ -class SessionManager -{ - public: - typedef std::vector NameVector; - typedef std::vector KeyVector; - QPID_CONSOLE_EXTERN ~SessionManager(); - - struct Settings { - bool rcvObjects; - bool rcvEvents; - bool rcvHeartbeats; - bool userBindings; - uint32_t methodTimeout; - uint32_t getTimeout; - - Settings() : rcvObjects(true), rcvEvents(true), rcvHeartbeats(true), - userBindings(false), methodTimeout(20), getTimeout(20) - {} - }; - - /** Create a new SessionManager - * - * Provide your own subclass of ConsoleListener to receive updates and indications - * asynchronously or leave it as its default and use only synchronous methods. - * - *@param listener Listener object to receive asynchronous indications. - *@param settings.rcvObjects Listener wishes to receive managed object data. - *@param settings.rcvEvents Listener wishes to receive events. - *@param settings.rcvHeartbeats Listener wishes to receive agent heartbeats. - *@param settings.userBindings If rcvObjects is true, userBindings allows the - * console client to control which object classes are received. See the bindPackage - * and bindClass methods. If userBindings is false, the listener will receive - * updates for all object classes. - */ - QPID_CONSOLE_EXTERN SessionManager(ConsoleListener* listener = 0, - Settings settings = Settings()); - - /** Connect a broker to the console session - * - *@param settings Connection settings for client access - *@return broker object if operation is successful - * an exception shall be thrown. - */ - QPID_CONSOLE_EXTERN Broker* addBroker(client::ConnectionSettings& settings); - - /** Disconnect a broker from the console session - * - *@param broker The broker object returned from an earlier call to addBroker. - */ - QPID_CONSOLE_EXTERN void delBroker(Broker* broker); - - /** Get a list of known management packages - * - *@param packages Vector of package names returned by the session manager. - */ - QPID_CONSOLE_EXTERN void getPackages(NameVector& packages); - - /** Get a list of class keys associated with a package - * - *@param classKeys List of class keys returned by the session manager. - *@param packageName Name of package being queried. - */ - QPID_CONSOLE_EXTERN void getClasses(KeyVector& classKeys, - const std::string& packageName); - - /** Get the schema of a class given its class key - * - *@param classKey Class key of the desired schema. - */ - QPID_CONSOLE_EXTERN SchemaClass& getSchema(const ClassKey& classKey); - - /** Request that updates be received for all classes within a package - * - * Note that this method is only meaningful if a ConsoleListener was provided at session - * creation and if the 'userBindings' flag was set to true. - * - *@param packageName Name of the package to which to bind. - */ - QPID_CONSOLE_EXTERN void bindPackage(const std::string& packageName); - - /** Request update to be received for a particular class - * - * Note that this method is only meaningful if a ConsoleListener was provided at session - * creation and if the 'userBindings' flag was set to true. - * - *@param classKey Class key of class to which to bind. - */ - QPID_CONSOLE_EXTERN void bindClass(const ClassKey& classKey); - QPID_CONSOLE_EXTERN void bindClass(const std::string& packageName, - const std::string& className); - - /** Request events from a particular package. - * - * Note that this method is only meaningful if a ConsoleListener was provided at session - * creation and if the 'userBindings' flag was set to true. - * - * @param classKey Class key of event of interest - * @param packageName Name of package of event of interest. - * @param eventName Name of event of interest. Default=All events defined by package. - */ - QPID_CONSOLE_EXTERN void bindEvent(const ClassKey& classKey); - QPID_CONSOLE_EXTERN void bindEvent(const std::string& packageName, - const std::string& eventName=""); - - - /** Get a list of qmf agents known to the session manager. - * - *@param agents Vector of Agent objects returned by the session manager. - *@param broker Return agents registered with this broker only. If NULL, return agents - * from all connected brokers. - */ - QPID_CONSOLE_EXTERN void getAgents(Agent::Vector& agents, - Broker* broker = 0); - - /** Get objects from agents. There are four variants of this method with different ways of - * specifying from which class objects are being queried. - * - *@param objects List of objects received. - *@param classKey ClassKey object identifying class to be queried. - *@param className Class name identifying class to be queried. - *@param objectId Object Id of the single object to be queried. - *@param broker Restrict the query to this broker, or all brokers if NULL. - *@param agent Restrict the query to this agent, or all agents if NULL. - */ - QPID_CONSOLE_EXTERN void getObjects(Object::Vector& objects, - const std::string& className, - Broker* broker = 0, - Agent* agent = 0); - //void getObjects(Object::Vector& objects, const ClassKey& classKey, - // Broker* broker = 0, Agent* agent = 0); - //void getObjects(Object::Vector& objects, const ObjectId& objectId, - // Broker* broker = 0, Agent* agent = 0); - -private: - friend class Broker; - friend class Broker::ConnectionThread; - friend class Object; - sys::Mutex lock; - sys::Mutex brokerListLock; - ConsoleListener* listener; - std::vector brokers; - std::map packages; - SequenceManager sequenceManager; - sys::Condition cv; - SequenceManager::set syncSequenceList; - Object::Vector getResult; - std::string error; - Settings settings; - NameVector bindingKeyList; - - void bindingKeys(); - void allBrokersStable(); - void startProtocol(Broker* broker); - void handleBrokerResp(Broker* broker, framing::Buffer& inBuffer, uint32_t sequence); - void handlePackageInd(Broker* broker, framing::Buffer& inBuffer, uint32_t sequence); - void handleCommandComplete(Broker* broker, framing::Buffer& inBuffer, uint32_t sequence); - void handleClassInd(Broker* broker, framing::Buffer& inBuffer, uint32_t sequence); - void handleMethodResp(Broker* broker, framing::Buffer& inBuffer, uint32_t sequence); - void handleHeartbeatInd(Broker* broker, framing::Buffer& inBuffer, uint32_t sequence); - void handleEventInd(Broker* broker, framing::Buffer& inBuffer, uint32_t sequence); - void handleSchemaResp(Broker* broker, framing::Buffer& inBuffer, uint32_t sequence); - void handleContentInd(Broker* broker, framing::Buffer& inBuffer, uint32_t sequence, bool prop, bool stat); - void handleBrokerConnect(Broker* broker); - void handleBrokerDisconnect(Broker* broker); - -}; - -}} // namespace qpid::console - -#endif /*!_QPID_CONSOLE_SESSION_MANAGER_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/console/Value.h b/nativeLib/org.apache.qpid/include/qpid/console/Value.h deleted file mode 100644 index d9eb65053b..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/console/Value.h +++ /dev/null @@ -1,213 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#ifndef _QPID_CONSOLE_VALUE_H_ -#define _QPID_CONSOLE_VALUE_H_ - -#include "qpid/Exception.h" -#include "qpid/framing/Uuid.h" -#include "qpid/framing/FieldTable.h" -#include "qpid/console/ObjectId.h" -#include - -namespace qpid { -namespace framing { - class Buffer; -} -namespace console { - - /** - * \ingroup qmfconsoleapi - */ - class Value { - - public: - typedef boost::shared_ptr Ptr; - virtual ~Value() {} - virtual std::string str() const = 0; - - virtual bool isNull() const { return false; } - virtual bool isObjectId() const { return false; } - virtual bool isUint() const { return false; } - virtual bool isInt() const { return false; } - virtual bool isUint64() const { return false; } - virtual bool isInt64() const { return false; } - virtual bool isString() const { return false; } - virtual bool isBool() const { return false; } - virtual bool isFloat() const { return false; } - virtual bool isDouble() const { return false; } - virtual bool isUuid() const { return false; } - virtual bool isMap() const { return false; } - - virtual ObjectId asObjectId() const { incompatible(); return ObjectId(); } - virtual uint32_t asUint() const { incompatible(); return 0; } - virtual int32_t asInt() const { incompatible(); return 0; } - virtual uint64_t asUint64() const { incompatible(); return 0; } - virtual int64_t asInt64() const { incompatible(); return 0; } - virtual std::string asString() const { incompatible(); return std::string(); } - virtual bool asBool() const { incompatible(); return false; } - virtual float asFloat() const { incompatible(); return 0.0; } - virtual double asDouble() const { incompatible(); return 0.0; } - virtual framing::Uuid asUuid() const { incompatible(); return framing::Uuid(); } - virtual framing::FieldTable asMap() const { incompatible(); return framing::FieldTable(); } - - private: - void incompatible() const { - throw Exception("Incompatible Type"); - } - }; - - class NullValue : public Value { - public: - NullValue() {} - std::string str() const; - bool isNull() const { return true; } - }; - - class RefValue : public Value { - public: - RefValue(ObjectId v) : value(v) {} - RefValue(framing::Buffer& buffer); - std::string str() const; - bool isObjectId() const { return true; } - ObjectId asObjectId() const { return value; } - private: - ObjectId value; - }; - - class UintValue : public Value { - public: - UintValue(uint32_t v) : value(v) {} - std::string str() const; - bool isUint() const { return true; } - uint32_t asUint() const { return value; } - bool isUint64() const { return true; } - uint64_t asUint64() const { return (uint64_t) value; } - private: - uint32_t value; - }; - - class IntValue : public Value { - public: - IntValue(int32_t v) : value(v) {} - std::string str() const; - bool isInt() const { return true; } - int32_t asInt() const { return value; } - bool isInt64() const { return true; } - int64_t asInt64() const { return (int64_t) value; } - private: - int32_t value; - }; - - class Uint64Value : public Value { - public: - Uint64Value(uint64_t v) : value(v) {} - std::string str() const; - bool isUint64() const { return true; } - uint64_t asUint64() const { return value; } - private: - uint64_t value; - }; - - class Int64Value : public Value { - public: - Int64Value(int64_t v) : value(v) {} - std::string str() const; - bool isInt64() const { return true; } - int64_t asInt64() const { return value; } - private: - int64_t value; - }; - - class StringValue : public Value { - public: - StringValue(const std::string& v) : value(v) {} - StringValue(framing::Buffer& buffer, int tc); - std::string str() const { return value; } - bool isString() const { return true; } - std::string asString() const { return value; } - private: - std::string value; - }; - - class BoolValue : public Value { - public: - BoolValue(bool v) : value(v) {} - BoolValue(uint8_t v) : value(v != 0) {} - std::string str() const; - bool isBool() const { return true; } - bool asBool() const { return value; } - private: - bool value; - }; - - class FloatValue : public Value { - public: - FloatValue(float v) : value(v) {} - std::string str() const; - bool isFloat() const { return true; } - float asFloat() const { return value; } - bool isDouble() const { return true; } - double asDouble() const { return (double) value; } - private: - float value; - }; - - class DoubleValue : public Value { - public: - DoubleValue(double v) : value(v) {} - std::string str() const; - bool isDouble() const { return true; } - double asDouble() const { return value; } - private: - double value; - }; - - class UuidValue : public Value { - public: - UuidValue(const framing::Uuid& v) : value(v) {} - UuidValue(framing::Buffer& buffer); - std::string str() const { return value.str(); } - bool isUuid() const { return true; } - framing::Uuid asUuid() const { return value; } - private: - framing::Uuid value; - }; - - class MapValue : public Value { - public: - MapValue(const framing::FieldTable& v) : value(v) {} - MapValue(framing::Buffer& buffer); - std::string str() const; - bool isMap() const { return true; } - framing::FieldTable asMap() const { return value; } - private: - framing::FieldTable value; - }; - - class ValueFactory { - public: - static Value::Ptr newValue(int typeCode, framing::Buffer& buffer); - static void encodeValue(int typeCode, Value::Ptr value, framing::Buffer& buffer); - }; -} -} - -#endif diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/AMQP_AllOperations.h b/nativeLib/org.apache.qpid/include/qpid/framing/AMQP_AllOperations.h deleted file mode 100644 index 923c1590c0..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/AMQP_AllOperations.h +++ /dev/null @@ -1,593 +0,0 @@ -#ifndef QPID_FRAMING_AMQP_ALLOPERATIONS_H -#define QPID_FRAMING_AMQP_ALLOPERATIONS_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include -#include "qpid/framing/ProtocolVersion.h" -#include "qpid/framing/amqp_structs.h" - -namespace qpid { -namespace framing { - -class AMQMethodBody; - -class AMQP_AllOperations { - public: - class Invoker; // Declared in AllInvoker - - virtual ~AMQP_AllOperations() {} - - virtual ProtocolVersion getVersion() const = 0; - - // Inner classes - // ==================== class ConnectionHandler ==================== - class ConnectionHandler { - // Constructors and destructors - public: - class Invoker; // Declared in AllInvoker - - ConnectionHandler(){}; - virtual ~ConnectionHandler() {} - // Protocol methods - - virtual void start(const FieldTable& serverProperties, - const Array& mechanisms, - const Array& locales) = 0; - - virtual void startOk(const FieldTable& clientProperties, - const string& mechanism, - const string& response, - const string& locale) = 0; - - virtual void secure(const string& challenge) = 0; - - virtual void secureOk(const string& response) = 0; - - virtual void tune(uint16_t channelMax, - uint16_t maxFrameSize, - uint16_t heartbeatMin, - uint16_t heartbeatMax) = 0; - - virtual void tuneOk(uint16_t channelMax, - uint16_t maxFrameSize, - uint16_t heartbeat) = 0; - - virtual void open(const string& virtualHost, - const Array& capabilities, - bool insist) = 0; - - virtual void openOk(const Array& knownHosts) = 0; - - virtual void redirect(const string& host, - const Array& knownHosts) = 0; - - virtual void heartbeat( ) = 0; - - virtual void close(uint16_t replyCode, - const string& replyText) = 0; - - virtual void closeOk( ) = 0; - }; // class ConnectionHandler - - - // ==================== class SessionHandler ==================== - class SessionHandler { - // Constructors and destructors - public: - class Invoker; // Declared in AllInvoker - - SessionHandler(){}; - virtual ~SessionHandler() {} - // Protocol methods - - virtual void attach(const string& name, - bool force) = 0; - - virtual void attached(const string& name) = 0; - - virtual void detach(const string& name) = 0; - - virtual void detached(const string& name, - uint8_t code) = 0; - - virtual void requestTimeout(uint32_t timeout) = 0; - - virtual void timeout(uint32_t timeout) = 0; - - virtual void commandPoint(const SequenceNumber& commandId, - uint64_t commandOffset) = 0; - - virtual void expected(const SequenceSet& commands, - const Array& fragments) = 0; - - virtual void confirmed(const SequenceSet& commands, - const Array& fragments) = 0; - - virtual void completed(const SequenceSet& commands, - bool timelyReply) = 0; - - virtual void knownCompleted(const SequenceSet& commands) = 0; - - virtual void flush(bool expected, - bool confirmed, - bool completed) = 0; - - virtual void gap(const SequenceSet& commands) = 0; - }; // class SessionHandler - - - // ==================== class ExecutionHandler ==================== - class ExecutionHandler { - // Constructors and destructors - public: - class Invoker; // Declared in AllInvoker - - ExecutionHandler(){}; - virtual ~ExecutionHandler() {} - // Protocol methods - - virtual void sync( ) = 0; - - virtual void result(const SequenceNumber& commandId, - const string& value) = 0; - - virtual void exception(uint16_t errorCode, - const SequenceNumber& commandId, - uint8_t classCode, - uint8_t commandCode, - uint8_t fieldIndex, - const string& description, - const FieldTable& errorInfo) = 0; - }; // class ExecutionHandler - - - // ==================== class MessageHandler ==================== - class MessageHandler { - // Constructors and destructors - public: - class Invoker; // Declared in AllInvoker - - MessageHandler(){}; - virtual ~MessageHandler() {} - // Protocol methods - - virtual void accept(const SequenceSet& transfers) = 0; - - virtual void reject(const SequenceSet& transfers, - uint16_t code, - const string& text) = 0; - - virtual void release(const SequenceSet& transfers, - bool setRedelivered) = 0; - - virtual MessageAcquireResult acquire(const SequenceSet& transfers) = 0; - - virtual MessageResumeResult resume(const string& destination, - const string& resumeId) = 0; - - virtual void subscribe(const string& queue, - const string& destination, - uint8_t acceptMode, - uint8_t acquireMode, - bool exclusive, - const string& resumeId, - uint64_t resumeTtl, - const FieldTable& arguments) = 0; - - virtual void cancel(const string& destination) = 0; - - virtual void setFlowMode(const string& destination, - uint8_t flowMode) = 0; - - virtual void flow(const string& destination, - uint8_t unit, - uint32_t value) = 0; - - virtual void flush(const string& destination) = 0; - - virtual void stop(const string& destination) = 0; - }; // class MessageHandler - - - // ==================== class TxHandler ==================== - class TxHandler { - // Constructors and destructors - public: - class Invoker; // Declared in AllInvoker - - TxHandler(){}; - virtual ~TxHandler() {} - // Protocol methods - - virtual void select( ) = 0; - - virtual void commit( ) = 0; - - virtual void rollback( ) = 0; - }; // class TxHandler - - - // ==================== class DtxHandler ==================== - class DtxHandler { - // Constructors and destructors - public: - class Invoker; // Declared in AllInvoker - - DtxHandler(){}; - virtual ~DtxHandler() {} - // Protocol methods - - virtual void select( ) = 0; - - virtual XaResult start(const Xid& xid, - bool join, - bool resume) = 0; - - virtual XaResult end(const Xid& xid, - bool fail, - bool suspend) = 0; - - virtual XaResult commit(const Xid& xid, - bool onePhase) = 0; - - virtual void forget(const Xid& xid) = 0; - - virtual DtxGetTimeoutResult getTimeout(const Xid& xid) = 0; - - virtual XaResult prepare(const Xid& xid) = 0; - - virtual DtxRecoverResult recover( ) = 0; - - virtual XaResult rollback(const Xid& xid) = 0; - - virtual void setTimeout(const Xid& xid, - uint32_t timeout) = 0; - }; // class DtxHandler - - - // ==================== class ExchangeHandler ==================== - class ExchangeHandler { - // Constructors and destructors - public: - class Invoker; // Declared in AllInvoker - - ExchangeHandler(){}; - virtual ~ExchangeHandler() {} - // Protocol methods - - virtual void declare(const string& exchange, - const string& type, - const string& alternateExchange, - bool passive, - bool durable, - bool autoDelete, - const FieldTable& arguments) = 0; - - virtual void delete_(const string& exchange, - bool ifUnused) = 0; - - virtual ExchangeQueryResult query(const string& name) = 0; - - virtual void bind(const string& queue, - const string& exchange, - const string& bindingKey, - const FieldTable& arguments) = 0; - - virtual void unbind(const string& queue, - const string& exchange, - const string& bindingKey) = 0; - - virtual ExchangeBoundResult bound(const string& exchange, - const string& queue, - const string& bindingKey, - const FieldTable& arguments) = 0; - }; // class ExchangeHandler - - - // ==================== class QueueHandler ==================== - class QueueHandler { - // Constructors and destructors - public: - class Invoker; // Declared in AllInvoker - - QueueHandler(){}; - virtual ~QueueHandler() {} - // Protocol methods - - virtual void declare(const string& queue, - const string& alternateExchange, - bool passive, - bool durable, - bool exclusive, - bool autoDelete, - const FieldTable& arguments) = 0; - - virtual void delete_(const string& queue, - bool ifUnused, - bool ifEmpty) = 0; - - virtual void purge(const string& queue) = 0; - - virtual QueueQueryResult query(const string& queue) = 0; - }; // class QueueHandler - - - // ==================== class FileHandler ==================== - class FileHandler { - // Constructors and destructors - public: - class Invoker; // Declared in AllInvoker - - FileHandler(){}; - virtual ~FileHandler() {} - // Protocol methods - - virtual void qos(uint32_t prefetchSize, - uint16_t prefetchCount, - bool global) = 0; - - virtual void qosOk( ) = 0; - - virtual void consume(const string& queue, - const string& consumerTag, - bool noLocal, - bool noAck, - bool exclusive, - bool nowait, - const FieldTable& arguments) = 0; - - virtual void consumeOk(const string& consumerTag) = 0; - - virtual void cancel(const string& consumerTag) = 0; - - virtual void open(const string& identifier, - uint64_t contentSize) = 0; - - virtual void openOk(uint64_t stagedSize) = 0; - - virtual void publish(const string& exchange, - const string& routingKey, - bool mandatory, - bool immediate, - const string& identifier) = 0; - - virtual void deliver(const string& consumerTag, - uint64_t deliveryTag, - bool redelivered, - const string& exchange, - const string& routingKey, - const string& identifier) = 0; - - virtual void ack(uint64_t deliveryTag, - bool multiple) = 0; - - virtual void reject(uint64_t deliveryTag, - bool requeue) = 0; - }; // class FileHandler - - - // ==================== class StreamHandler ==================== - class StreamHandler { - // Constructors and destructors - public: - class Invoker; // Declared in AllInvoker - - StreamHandler(){}; - virtual ~StreamHandler() {} - // Protocol methods - - virtual void qos(uint32_t prefetchSize, - uint16_t prefetchCount, - uint32_t consumeRate, - bool global) = 0; - - virtual void qosOk( ) = 0; - - virtual void consume(const string& queue, - const string& consumerTag, - bool noLocal, - bool exclusive, - bool nowait, - const FieldTable& arguments) = 0; - - virtual void consumeOk(const string& consumerTag) = 0; - - virtual void cancel(const string& consumerTag) = 0; - }; // class StreamHandler - - - // ==================== class ClusterHandler ==================== - class ClusterHandler { - // Constructors and destructors - public: - class Invoker; // Declared in AllInvoker - - ClusterHandler(){}; - virtual ~ClusterHandler() {} - // Protocol methods - - virtual void updateRequest(const string& url) = 0; - - virtual void updateOffer(uint64_t updatee) = 0; - - virtual void retractOffer(uint64_t updatee) = 0; - - virtual void initialStatus(uint32_t version, - bool active, - const Uuid& clusterId, - uint8_t storeState, - const Uuid& shutdownId, - const string& firstConfig) = 0; - - virtual void ready(const string& url) = 0; - - virtual void configChange(const string& members, - const string& joined, - const string& left) = 0; - - virtual void messageExpired(uint64_t id) = 0; - - virtual void errorCheck(uint8_t type, - const SequenceNumber& frameSeq) = 0; - - virtual void timerWakeup(const string& name) = 0; - - virtual void timerDrop(const string& name) = 0; - - virtual void shutdown(const Uuid& shutdownId) = 0; - - virtual void deliverToQueue(const string& queue, - const string& message) = 0; - }; // class ClusterHandler - - - // ==================== class ClusterConnectionHandler ==================== - class ClusterConnectionHandler { - // Constructors and destructors - public: - class Invoker; // Declared in AllInvoker - - ClusterConnectionHandler(){}; - virtual ~ClusterConnectionHandler() {} - // Protocol methods - - virtual void announce(const string& managementId, - uint32_t ssf, - const string& authid, - bool nodict, - const string& username, - const string& initialFrames) = 0; - - virtual void deliverClose( ) = 0; - - virtual void deliverDoOutput(uint32_t limit) = 0; - - virtual void abort( ) = 0; - - virtual void shadowSetUser(const string& userId) = 0; - - virtual void shadowPrepare(const string& managementId) = 0; - - virtual void consumerState(const string& name, - bool blocked, - bool notifyEnabled, - const SequenceNumber& position) = 0; - - virtual void deliveryRecord(const string& queue, - const SequenceNumber& position, - const string& tag, - const SequenceNumber& id, - bool acquired, - bool accepted, - bool cancelled, - bool completed, - bool ended, - bool windowing, - bool enqueued, - uint32_t credit) = 0; - - virtual void txStart( ) = 0; - - virtual void txAccept(const SequenceSet& commands) = 0; - - virtual void txDequeue(const string& queue) = 0; - - virtual void txEnqueue(const string& queue) = 0; - - virtual void txPublish(const Array& queues, - bool delivered) = 0; - - virtual void txEnd( ) = 0; - - virtual void accumulatedAck(const SequenceSet& commands) = 0; - - virtual void outputTask(uint16_t channel, - const string& name) = 0; - - virtual void sessionState(const SequenceNumber& replayStart, - const SequenceNumber& commandPoint, - const SequenceSet& sentIncomplete, - const SequenceNumber& expected, - const SequenceNumber& received, - const SequenceSet& unknownCompleted, - const SequenceSet& receivedIncomplete) = 0; - - virtual void shadowReady(uint64_t memberId, - uint64_t connectionId, - const string& managementId, - const string& userName, - const string& fragment, - uint32_t sendMax) = 0; - - virtual void membership(const FieldTable& joiners, - const FieldTable& members, - const SequenceNumber& frameSeq) = 0; - - virtual void retractOffer( ) = 0; - - virtual void queuePosition(const string& queue, - const SequenceNumber& position) = 0; - - virtual void exchange(const string& encoded) = 0; - - virtual void queue(const string& encoded) = 0; - - virtual void expiryId(uint64_t expiryId) = 0; - - virtual void addQueueListener(const string& queue, - uint32_t consumer) = 0; - - virtual void managementSetupState(uint64_t objectNum, - uint16_t bootSequence, - const Uuid& brokerId, - const string& vendor, - const string& product, - const string& instance) = 0; - - virtual void config(const string& encoded) = 0; - }; // class ClusterConnectionHandler - - - - // Method handler get methods - - virtual ConnectionHandler* getConnectionHandler() = 0; - virtual SessionHandler* getSessionHandler() = 0; - virtual ExecutionHandler* getExecutionHandler() = 0; - virtual MessageHandler* getMessageHandler() = 0; - virtual TxHandler* getTxHandler() = 0; - virtual DtxHandler* getDtxHandler() = 0; - virtual ExchangeHandler* getExchangeHandler() = 0; - virtual QueueHandler* getQueueHandler() = 0; - virtual FileHandler* getFileHandler() = 0; - virtual StreamHandler* getStreamHandler() = 0; - virtual ClusterHandler* getClusterHandler() = 0; - virtual ClusterConnectionHandler* getClusterConnectionHandler() = 0; -}; /* class AMQP_AllOperations */ -}} -#endif /*!QPID_FRAMING_AMQP_ALLOPERATIONS_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/AMQP_AllProxy.h b/nativeLib/org.apache.qpid/include/qpid/framing/AMQP_AllProxy.h deleted file mode 100644 index 32d971e25b..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/AMQP_AllProxy.h +++ /dev/null @@ -1,592 +0,0 @@ -#ifndef QPID_FRAMING_AMQP_ALLPROXY_H -#define QPID_FRAMING_AMQP_ALLPROXY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/Proxy.h" -#include "qpid/framing/Array.h" -#include "qpid/framing/amqp_types.h" -#include "qpid/framing/amqp_structs.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class AMQP_AllProxy: - public Proxy -{ - public: - QPID_COMMON_EXTERN AMQP_AllProxy(FrameHandler& out); - - class Connection: - public Proxy - { - public: - Connection(FrameHandler& f) : Proxy(f) {} - static Connection& get(AMQP_AllProxy& proxy) { return proxy.getConnection(); } - QPID_COMMON_EXTERN virtual void start(const FieldTable& serverProperties, - const Array& mechanisms, - const Array& locales); - - QPID_COMMON_EXTERN virtual void startOk(const FieldTable& clientProperties, - const string& mechanism, - const string& response, - const string& locale); - - QPID_COMMON_EXTERN virtual void secure(const string& challenge); - - QPID_COMMON_EXTERN virtual void secureOk(const string& response); - - QPID_COMMON_EXTERN virtual void tune(uint16_t channelMax, - uint16_t maxFrameSize, - uint16_t heartbeatMin, - uint16_t heartbeatMax); - - QPID_COMMON_EXTERN virtual void tuneOk(uint16_t channelMax, - uint16_t maxFrameSize, - uint16_t heartbeat); - - QPID_COMMON_EXTERN virtual void open(const string& virtualHost, - const Array& capabilities, - bool insist); - - QPID_COMMON_EXTERN virtual void openOk(const Array& knownHosts); - - QPID_COMMON_EXTERN virtual void redirect(const string& host, - const Array& knownHosts); - - QPID_COMMON_EXTERN virtual void heartbeat(); - - QPID_COMMON_EXTERN virtual void close(uint16_t replyCode, - const string& replyText); - - QPID_COMMON_EXTERN virtual void closeOk(); - - }; - - Connection& getConnection() { return connectionProxy; } - - class Session: - public Proxy - { - public: - Session(FrameHandler& f) : Proxy(f) {} - static Session& get(AMQP_AllProxy& proxy) { return proxy.getSession(); } - QPID_COMMON_EXTERN virtual void attach(const string& name, - bool force); - - QPID_COMMON_EXTERN virtual void attached(const string& name); - - QPID_COMMON_EXTERN virtual void detach(const string& name); - - QPID_COMMON_EXTERN virtual void detached(const string& name, - uint8_t code); - - QPID_COMMON_EXTERN virtual void requestTimeout(uint32_t timeout); - - QPID_COMMON_EXTERN virtual void timeout(uint32_t timeout); - - QPID_COMMON_EXTERN virtual void commandPoint(const SequenceNumber& commandId, - uint64_t commandOffset); - - QPID_COMMON_EXTERN virtual void expected(const SequenceSet& commands, - const Array& fragments); - - QPID_COMMON_EXTERN virtual void confirmed(const SequenceSet& commands, - const Array& fragments); - - QPID_COMMON_EXTERN virtual void completed(const SequenceSet& commands, - bool timelyReply); - - QPID_COMMON_EXTERN virtual void knownCompleted(const SequenceSet& commands); - - QPID_COMMON_EXTERN virtual void flush(bool expected, - bool confirmed, - bool completed); - - QPID_COMMON_EXTERN virtual void gap(const SequenceSet& commands); - - }; - - Session& getSession() { return sessionProxy; } - - class Execution: - public Proxy - { - public: - Execution(FrameHandler& f) : Proxy(f) {} - static Execution& get(AMQP_AllProxy& proxy) { return proxy.getExecution(); } - QPID_COMMON_EXTERN virtual void sync(); - - QPID_COMMON_EXTERN virtual void result(const SequenceNumber& commandId, - const string& value); - - QPID_COMMON_EXTERN virtual void exception(uint16_t errorCode, - const SequenceNumber& commandId, - uint8_t classCode, - uint8_t commandCode, - uint8_t fieldIndex, - const string& description, - const FieldTable& errorInfo); - - }; - - Execution& getExecution() { return executionProxy; } - - class Message: - public Proxy - { - public: - Message(FrameHandler& f) : Proxy(f) {} - static Message& get(AMQP_AllProxy& proxy) { return proxy.getMessage(); } - QPID_COMMON_EXTERN virtual void transfer(const string& destination, - uint8_t acceptMode, - uint8_t acquireMode); - - QPID_COMMON_EXTERN virtual void accept(const SequenceSet& transfers); - - QPID_COMMON_EXTERN virtual void reject(const SequenceSet& transfers, - uint16_t code, - const string& text); - - QPID_COMMON_EXTERN virtual void release(const SequenceSet& transfers, - bool setRedelivered); - - QPID_COMMON_EXTERN virtual void acquire(const SequenceSet& transfers); - - QPID_COMMON_EXTERN virtual void resume(const string& destination, - const string& resumeId); - - QPID_COMMON_EXTERN virtual void subscribe(const string& queue, - const string& destination, - uint8_t acceptMode, - uint8_t acquireMode, - bool exclusive, - const string& resumeId, - uint64_t resumeTtl, - const FieldTable& arguments); - - QPID_COMMON_EXTERN virtual void cancel(const string& destination); - - QPID_COMMON_EXTERN virtual void setFlowMode(const string& destination, - uint8_t flowMode); - - QPID_COMMON_EXTERN virtual void flow(const string& destination, - uint8_t unit, - uint32_t value); - - QPID_COMMON_EXTERN virtual void flush(const string& destination); - - QPID_COMMON_EXTERN virtual void stop(const string& destination); - - }; - - Message& getMessage() { return messageProxy; } - - class Tx: - public Proxy - { - public: - Tx(FrameHandler& f) : Proxy(f) {} - static Tx& get(AMQP_AllProxy& proxy) { return proxy.getTx(); } - QPID_COMMON_EXTERN virtual void select(); - - QPID_COMMON_EXTERN virtual void commit(); - - QPID_COMMON_EXTERN virtual void rollback(); - - }; - - Tx& getTx() { return txProxy; } - - class Dtx: - public Proxy - { - public: - Dtx(FrameHandler& f) : Proxy(f) {} - static Dtx& get(AMQP_AllProxy& proxy) { return proxy.getDtx(); } - QPID_COMMON_EXTERN virtual void select(); - - QPID_COMMON_EXTERN virtual void start(const Xid& xid, - bool join, - bool resume); - - QPID_COMMON_EXTERN virtual void end(const Xid& xid, - bool fail, - bool suspend); - - QPID_COMMON_EXTERN virtual void commit(const Xid& xid, - bool onePhase); - - QPID_COMMON_EXTERN virtual void forget(const Xid& xid); - - QPID_COMMON_EXTERN virtual void getTimeout(const Xid& xid); - - QPID_COMMON_EXTERN virtual void prepare(const Xid& xid); - - QPID_COMMON_EXTERN virtual void recover(); - - QPID_COMMON_EXTERN virtual void rollback(const Xid& xid); - - QPID_COMMON_EXTERN virtual void setTimeout(const Xid& xid, - uint32_t timeout); - - }; - - Dtx& getDtx() { return dtxProxy; } - - class Exchange: - public Proxy - { - public: - Exchange(FrameHandler& f) : Proxy(f) {} - static Exchange& get(AMQP_AllProxy& proxy) { return proxy.getExchange(); } - QPID_COMMON_EXTERN virtual void declare(const string& exchange, - const string& type, - const string& alternateExchange, - bool passive, - bool durable, - bool autoDelete, - const FieldTable& arguments); - - QPID_COMMON_EXTERN virtual void delete_(const string& exchange, - bool ifUnused); - - QPID_COMMON_EXTERN virtual void query(const string& name); - - QPID_COMMON_EXTERN virtual void bind(const string& queue, - const string& exchange, - const string& bindingKey, - const FieldTable& arguments); - - QPID_COMMON_EXTERN virtual void unbind(const string& queue, - const string& exchange, - const string& bindingKey); - - QPID_COMMON_EXTERN virtual void bound(const string& exchange, - const string& queue, - const string& bindingKey, - const FieldTable& arguments); - - }; - - Exchange& getExchange() { return exchangeProxy; } - - class Queue: - public Proxy - { - public: - Queue(FrameHandler& f) : Proxy(f) {} - static Queue& get(AMQP_AllProxy& proxy) { return proxy.getQueue(); } - QPID_COMMON_EXTERN virtual void declare(const string& queue, - const string& alternateExchange, - bool passive, - bool durable, - bool exclusive, - bool autoDelete, - const FieldTable& arguments); - - QPID_COMMON_EXTERN virtual void delete_(const string& queue, - bool ifUnused, - bool ifEmpty); - - QPID_COMMON_EXTERN virtual void purge(const string& queue); - - QPID_COMMON_EXTERN virtual void query(const string& queue); - - }; - - Queue& getQueue() { return queueProxy; } - - class File: - public Proxy - { - public: - File(FrameHandler& f) : Proxy(f) {} - static File& get(AMQP_AllProxy& proxy) { return proxy.getFile(); } - QPID_COMMON_EXTERN virtual void qos(uint32_t prefetchSize, - uint16_t prefetchCount, - bool global); - - QPID_COMMON_EXTERN virtual void qosOk(); - - QPID_COMMON_EXTERN virtual void consume(const string& queue, - const string& consumerTag, - bool noLocal, - bool noAck, - bool exclusive, - bool nowait, - const FieldTable& arguments); - - QPID_COMMON_EXTERN virtual void consumeOk(const string& consumerTag); - - QPID_COMMON_EXTERN virtual void cancel(const string& consumerTag); - - QPID_COMMON_EXTERN virtual void open(const string& identifier, - uint64_t contentSize); - - QPID_COMMON_EXTERN virtual void openOk(uint64_t stagedSize); - - QPID_COMMON_EXTERN virtual void stage(); - - QPID_COMMON_EXTERN virtual void publish(const string& exchange, - const string& routingKey, - bool mandatory, - bool immediate, - const string& identifier); - - QPID_COMMON_EXTERN virtual void return_(uint16_t replyCode, - const string& replyText, - const string& exchange, - const string& routingKey); - - QPID_COMMON_EXTERN virtual void deliver(const string& consumerTag, - uint64_t deliveryTag, - bool redelivered, - const string& exchange, - const string& routingKey, - const string& identifier); - - QPID_COMMON_EXTERN virtual void ack(uint64_t deliveryTag, - bool multiple); - - QPID_COMMON_EXTERN virtual void reject(uint64_t deliveryTag, - bool requeue); - - }; - - File& getFile() { return fileProxy; } - - class Stream: - public Proxy - { - public: - Stream(FrameHandler& f) : Proxy(f) {} - static Stream& get(AMQP_AllProxy& proxy) { return proxy.getStream(); } - QPID_COMMON_EXTERN virtual void qos(uint32_t prefetchSize, - uint16_t prefetchCount, - uint32_t consumeRate, - bool global); - - QPID_COMMON_EXTERN virtual void qosOk(); - - QPID_COMMON_EXTERN virtual void consume(const string& queue, - const string& consumerTag, - bool noLocal, - bool exclusive, - bool nowait, - const FieldTable& arguments); - - QPID_COMMON_EXTERN virtual void consumeOk(const string& consumerTag); - - QPID_COMMON_EXTERN virtual void cancel(const string& consumerTag); - - QPID_COMMON_EXTERN virtual void publish(const string& exchange, - const string& routingKey, - bool mandatory, - bool immediate); - - QPID_COMMON_EXTERN virtual void return_(uint16_t replyCode, - const string& replyText, - const string& exchange, - const string& routingKey); - - QPID_COMMON_EXTERN virtual void deliver(const string& consumerTag, - uint64_t deliveryTag, - const string& exchange, - const string& queue); - - }; - - Stream& getStream() { return streamProxy; } - - class Cluster: - public Proxy - { - public: - Cluster(FrameHandler& f) : Proxy(f) {} - static Cluster& get(AMQP_AllProxy& proxy) { return proxy.getCluster(); } - QPID_COMMON_EXTERN virtual void updateRequest(const string& url); - - QPID_COMMON_EXTERN virtual void updateOffer(uint64_t updatee); - - QPID_COMMON_EXTERN virtual void retractOffer(uint64_t updatee); - - QPID_COMMON_EXTERN virtual void initialStatus(uint32_t version, - bool active, - const Uuid& clusterId, - uint8_t storeState, - const Uuid& shutdownId, - const string& firstConfig); - - QPID_COMMON_EXTERN virtual void ready(const string& url); - - QPID_COMMON_EXTERN virtual void configChange(const string& members, - const string& joined, - const string& left); - - QPID_COMMON_EXTERN virtual void messageExpired(uint64_t id); - - QPID_COMMON_EXTERN virtual void errorCheck(uint8_t type, - const SequenceNumber& frameSeq); - - QPID_COMMON_EXTERN virtual void timerWakeup(const string& name); - - QPID_COMMON_EXTERN virtual void timerDrop(const string& name); - - QPID_COMMON_EXTERN virtual void shutdown(const Uuid& shutdownId); - - QPID_COMMON_EXTERN virtual void deliverToQueue(const string& queue, - const string& message); - - }; - - Cluster& getCluster() { return clusterProxy; } - - class ClusterConnection: - public Proxy - { - public: - ClusterConnection(FrameHandler& f) : Proxy(f) {} - static ClusterConnection& get(AMQP_AllProxy& proxy) { return proxy.getClusterConnection(); } - QPID_COMMON_EXTERN virtual void announce(const string& managementId, - uint32_t ssf, - const string& authid, - bool nodict, - const string& username, - const string& initialFrames); - - QPID_COMMON_EXTERN virtual void deliverClose(); - - QPID_COMMON_EXTERN virtual void deliverDoOutput(uint32_t limit); - - QPID_COMMON_EXTERN virtual void abort(); - - QPID_COMMON_EXTERN virtual void shadowSetUser(const string& userId); - - QPID_COMMON_EXTERN virtual void shadowPrepare(const string& managementId); - - QPID_COMMON_EXTERN virtual void consumerState(const string& name, - bool blocked, - bool notifyEnabled, - const SequenceNumber& position); - - QPID_COMMON_EXTERN virtual void deliveryRecord(const string& queue, - const SequenceNumber& position, - const string& tag, - const SequenceNumber& id, - bool acquired, - bool accepted, - bool cancelled, - bool completed, - bool ended, - bool windowing, - bool enqueued, - uint32_t credit); - - QPID_COMMON_EXTERN virtual void txStart(); - - QPID_COMMON_EXTERN virtual void txAccept(const SequenceSet& commands); - - QPID_COMMON_EXTERN virtual void txDequeue(const string& queue); - - QPID_COMMON_EXTERN virtual void txEnqueue(const string& queue); - - QPID_COMMON_EXTERN virtual void txPublish(const Array& queues, - bool delivered); - - QPID_COMMON_EXTERN virtual void txEnd(); - - QPID_COMMON_EXTERN virtual void accumulatedAck(const SequenceSet& commands); - - QPID_COMMON_EXTERN virtual void outputTask(uint16_t channel, - const string& name); - - QPID_COMMON_EXTERN virtual void sessionState(const SequenceNumber& replayStart, - const SequenceNumber& commandPoint, - const SequenceSet& sentIncomplete, - const SequenceNumber& expected, - const SequenceNumber& received, - const SequenceSet& unknownCompleted, - const SequenceSet& receivedIncomplete); - - QPID_COMMON_EXTERN virtual void shadowReady(uint64_t memberId, - uint64_t connectionId, - const string& managementId, - const string& userName, - const string& fragment, - uint32_t sendMax); - - QPID_COMMON_EXTERN virtual void membership(const FieldTable& joiners, - const FieldTable& members, - const SequenceNumber& frameSeq); - - QPID_COMMON_EXTERN virtual void retractOffer(); - - QPID_COMMON_EXTERN virtual void queuePosition(const string& queue, - const SequenceNumber& position); - - QPID_COMMON_EXTERN virtual void exchange(const string& encoded); - - QPID_COMMON_EXTERN virtual void queue(const string& encoded); - - QPID_COMMON_EXTERN virtual void expiryId(uint64_t expiryId); - - QPID_COMMON_EXTERN virtual void addQueueListener(const string& queue, - uint32_t consumer); - - QPID_COMMON_EXTERN virtual void managementSetupState(uint64_t objectNum, - uint16_t bootSequence, - const Uuid& brokerId, - const string& vendor, - const string& product, - const string& instance); - - QPID_COMMON_EXTERN virtual void config(const string& encoded); - - }; - - ClusterConnection& getClusterConnection() { return clusterConnectionProxy; } - - private: - Connection connectionProxy; - Session sessionProxy; - Execution executionProxy; - Message messageProxy; - Tx txProxy; - Dtx dtxProxy; - Exchange exchangeProxy; - Queue queueProxy; - File fileProxy; - Stream streamProxy; - Cluster clusterProxy; - ClusterConnection clusterConnectionProxy; -}; - -}} // namespace qpid::framing - -#endif /*!QPID_FRAMING_AMQP_ALLPROXY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/AMQP_ClientOperations.h b/nativeLib/org.apache.qpid/include/qpid/framing/AMQP_ClientOperations.h deleted file mode 100644 index 63b7652c36..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/AMQP_ClientOperations.h +++ /dev/null @@ -1,242 +0,0 @@ -#ifndef QPID_FRAMING_AMQP_CLIENTOPERATIONS_H -#define QPID_FRAMING_AMQP_CLIENTOPERATIONS_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include -#include "qpid/framing/ProtocolVersion.h" -#include "qpid/framing/amqp_structs.h" - -namespace qpid { -namespace framing { - -class AMQMethodBody; - -class AMQP_ClientOperations { - public: - class Invoker; // Declared in ClientInvoker - - virtual ~AMQP_ClientOperations() {} - - virtual ProtocolVersion getVersion() const = 0; - - // Inner classes - // ==================== class ConnectionHandler ==================== - class ConnectionHandler { - // Constructors and destructors - public: - class Invoker; // Declared in ClientInvoker - - ConnectionHandler(){}; - virtual ~ConnectionHandler() {} - // Protocol methods - - virtual void start(const FieldTable& serverProperties, - const Array& mechanisms, - const Array& locales) = 0; - - virtual void secure(const string& challenge) = 0; - - virtual void tune(uint16_t channelMax, - uint16_t maxFrameSize, - uint16_t heartbeatMin, - uint16_t heartbeatMax) = 0; - - virtual void openOk(const Array& knownHosts) = 0; - - virtual void redirect(const string& host, - const Array& knownHosts) = 0; - - virtual void heartbeat( ) = 0; - - virtual void close(uint16_t replyCode, - const string& replyText) = 0; - - virtual void closeOk( ) = 0; - }; // class ConnectionHandler - - - // ==================== class SessionHandler ==================== - class SessionHandler { - // Constructors and destructors - public: - class Invoker; // Declared in ClientInvoker - - SessionHandler(){}; - virtual ~SessionHandler() {} - // Protocol methods - - virtual void attach(const string& name, - bool force) = 0; - - virtual void attached(const string& name) = 0; - - virtual void detach(const string& name) = 0; - - virtual void detached(const string& name, - uint8_t code) = 0; - - virtual void requestTimeout(uint32_t timeout) = 0; - - virtual void timeout(uint32_t timeout) = 0; - - virtual void commandPoint(const SequenceNumber& commandId, - uint64_t commandOffset) = 0; - - virtual void expected(const SequenceSet& commands, - const Array& fragments) = 0; - - virtual void confirmed(const SequenceSet& commands, - const Array& fragments) = 0; - - virtual void completed(const SequenceSet& commands, - bool timelyReply) = 0; - - virtual void knownCompleted(const SequenceSet& commands) = 0; - - virtual void flush(bool expected, - bool confirmed, - bool completed) = 0; - - virtual void gap(const SequenceSet& commands) = 0; - }; // class SessionHandler - - - // ==================== class ExecutionHandler ==================== - class ExecutionHandler { - // Constructors and destructors - public: - class Invoker; // Declared in ClientInvoker - - ExecutionHandler(){}; - virtual ~ExecutionHandler() {} - // Protocol methods - - virtual void sync( ) = 0; - - virtual void result(const SequenceNumber& commandId, - const string& value) = 0; - - virtual void exception(uint16_t errorCode, - const SequenceNumber& commandId, - uint8_t classCode, - uint8_t commandCode, - uint8_t fieldIndex, - const string& description, - const FieldTable& errorInfo) = 0; - }; // class ExecutionHandler - - - // ==================== class MessageHandler ==================== - class MessageHandler { - // Constructors and destructors - public: - class Invoker; // Declared in ClientInvoker - - MessageHandler(){}; - virtual ~MessageHandler() {} - // Protocol methods - - virtual void accept(const SequenceSet& transfers) = 0; - - virtual void reject(const SequenceSet& transfers, - uint16_t code, - const string& text) = 0; - - virtual void release(const SequenceSet& transfers, - bool setRedelivered) = 0; - - virtual MessageResumeResult resume(const string& destination, - const string& resumeId) = 0; - - virtual void setFlowMode(const string& destination, - uint8_t flowMode) = 0; - - virtual void flow(const string& destination, - uint8_t unit, - uint32_t value) = 0; - - virtual void stop(const string& destination) = 0; - }; // class MessageHandler - - - // ==================== class FileHandler ==================== - class FileHandler { - // Constructors and destructors - public: - class Invoker; // Declared in ClientInvoker - - FileHandler(){}; - virtual ~FileHandler() {} - // Protocol methods - - virtual void qosOk( ) = 0; - - virtual void consumeOk(const string& consumerTag) = 0; - - virtual void open(const string& identifier, - uint64_t contentSize) = 0; - - virtual void openOk(uint64_t stagedSize) = 0; - - virtual void deliver(const string& consumerTag, - uint64_t deliveryTag, - bool redelivered, - const string& exchange, - const string& routingKey, - const string& identifier) = 0; - }; // class FileHandler - - - // ==================== class StreamHandler ==================== - class StreamHandler { - // Constructors and destructors - public: - class Invoker; // Declared in ClientInvoker - - StreamHandler(){}; - virtual ~StreamHandler() {} - // Protocol methods - - virtual void qosOk( ) = 0; - - virtual void consumeOk(const string& consumerTag) = 0; - }; // class StreamHandler - - - - // Method handler get methods - - virtual ConnectionHandler* getConnectionHandler() = 0; - virtual SessionHandler* getSessionHandler() = 0; - virtual ExecutionHandler* getExecutionHandler() = 0; - virtual MessageHandler* getMessageHandler() = 0; - virtual FileHandler* getFileHandler() = 0; - virtual StreamHandler* getStreamHandler() = 0; -}; /* class AMQP_ClientOperations */ -}} -#endif /*!QPID_FRAMING_AMQP_CLIENTOPERATIONS_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/AMQP_ClientProxy.h b/nativeLib/org.apache.qpid/include/qpid/framing/AMQP_ClientProxy.h deleted file mode 100644 index 1522c2641d..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/AMQP_ClientProxy.h +++ /dev/null @@ -1,314 +0,0 @@ -#ifndef QPID_FRAMING_AMQP_CLIENTPROXY_H -#define QPID_FRAMING_AMQP_CLIENTPROXY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/Proxy.h" -#include "qpid/framing/Array.h" -#include "qpid/framing/amqp_types.h" -#include "qpid/framing/amqp_structs.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class AMQP_ClientProxy: - public Proxy -{ - public: - QPID_COMMON_EXTERN AMQP_ClientProxy(FrameHandler& out); - - class Connection: - public Proxy - { - public: - Connection(FrameHandler& f) : Proxy(f) {} - static Connection& get(AMQP_ClientProxy& proxy) { return proxy.getConnection(); } - QPID_COMMON_EXTERN virtual void start(const FieldTable& serverProperties, - const Array& mechanisms, - const Array& locales); - - QPID_COMMON_EXTERN virtual void secure(const string& challenge); - - QPID_COMMON_EXTERN virtual void tune(uint16_t channelMax, - uint16_t maxFrameSize, - uint16_t heartbeatMin, - uint16_t heartbeatMax); - - QPID_COMMON_EXTERN virtual void openOk(const Array& knownHosts); - - QPID_COMMON_EXTERN virtual void redirect(const string& host, - const Array& knownHosts); - - QPID_COMMON_EXTERN virtual void heartbeat(); - - QPID_COMMON_EXTERN virtual void close(uint16_t replyCode, - const string& replyText); - - QPID_COMMON_EXTERN virtual void closeOk(); - - }; - - Connection& getConnection() { return connectionProxy; } - - class Session: - public Proxy - { - public: - Session(FrameHandler& f) : Proxy(f) {} - static Session& get(AMQP_ClientProxy& proxy) { return proxy.getSession(); } - QPID_COMMON_EXTERN virtual void attach(const string& name, - bool force); - - QPID_COMMON_EXTERN virtual void attached(const string& name); - - QPID_COMMON_EXTERN virtual void detach(const string& name); - - QPID_COMMON_EXTERN virtual void detached(const string& name, - uint8_t code); - - QPID_COMMON_EXTERN virtual void requestTimeout(uint32_t timeout); - - QPID_COMMON_EXTERN virtual void timeout(uint32_t timeout); - - QPID_COMMON_EXTERN virtual void commandPoint(const SequenceNumber& commandId, - uint64_t commandOffset); - - QPID_COMMON_EXTERN virtual void expected(const SequenceSet& commands, - const Array& fragments); - - QPID_COMMON_EXTERN virtual void confirmed(const SequenceSet& commands, - const Array& fragments); - - QPID_COMMON_EXTERN virtual void completed(const SequenceSet& commands, - bool timelyReply); - - QPID_COMMON_EXTERN virtual void knownCompleted(const SequenceSet& commands); - - QPID_COMMON_EXTERN virtual void flush(bool expected, - bool confirmed, - bool completed); - - QPID_COMMON_EXTERN virtual void gap(const SequenceSet& commands); - - }; - - Session& getSession() { return sessionProxy; } - - class Execution: - public Proxy - { - public: - Execution(FrameHandler& f) : Proxy(f) {} - static Execution& get(AMQP_ClientProxy& proxy) { return proxy.getExecution(); } - QPID_COMMON_EXTERN virtual void sync(); - - QPID_COMMON_EXTERN virtual void result(const SequenceNumber& commandId, - const string& value); - - QPID_COMMON_EXTERN virtual void exception(uint16_t errorCode, - const SequenceNumber& commandId, - uint8_t classCode, - uint8_t commandCode, - uint8_t fieldIndex, - const string& description, - const FieldTable& errorInfo); - - }; - - Execution& getExecution() { return executionProxy; } - - class Message: - public Proxy - { - public: - Message(FrameHandler& f) : Proxy(f) {} - static Message& get(AMQP_ClientProxy& proxy) { return proxy.getMessage(); } - QPID_COMMON_EXTERN virtual void transfer(const string& destination, - uint8_t acceptMode, - uint8_t acquireMode); - - QPID_COMMON_EXTERN virtual void accept(const SequenceSet& transfers); - - QPID_COMMON_EXTERN virtual void reject(const SequenceSet& transfers, - uint16_t code, - const string& text); - - QPID_COMMON_EXTERN virtual void release(const SequenceSet& transfers, - bool setRedelivered); - - QPID_COMMON_EXTERN virtual void resume(const string& destination, - const string& resumeId); - - QPID_COMMON_EXTERN virtual void setFlowMode(const string& destination, - uint8_t flowMode); - - QPID_COMMON_EXTERN virtual void flow(const string& destination, - uint8_t unit, - uint32_t value); - - QPID_COMMON_EXTERN virtual void stop(const string& destination); - - }; - - Message& getMessage() { return messageProxy; } - - class Tx: - public Proxy - { - public: - Tx(FrameHandler& f) : Proxy(f) {} - static Tx& get(AMQP_ClientProxy& proxy) { return proxy.getTx(); } - }; - - Tx& getTx() { return txProxy; } - - class Dtx: - public Proxy - { - public: - Dtx(FrameHandler& f) : Proxy(f) {} - static Dtx& get(AMQP_ClientProxy& proxy) { return proxy.getDtx(); } - }; - - Dtx& getDtx() { return dtxProxy; } - - class Exchange: - public Proxy - { - public: - Exchange(FrameHandler& f) : Proxy(f) {} - static Exchange& get(AMQP_ClientProxy& proxy) { return proxy.getExchange(); } - }; - - Exchange& getExchange() { return exchangeProxy; } - - class Queue: - public Proxy - { - public: - Queue(FrameHandler& f) : Proxy(f) {} - static Queue& get(AMQP_ClientProxy& proxy) { return proxy.getQueue(); } - }; - - Queue& getQueue() { return queueProxy; } - - class File: - public Proxy - { - public: - File(FrameHandler& f) : Proxy(f) {} - static File& get(AMQP_ClientProxy& proxy) { return proxy.getFile(); } - QPID_COMMON_EXTERN virtual void qosOk(); - - QPID_COMMON_EXTERN virtual void consumeOk(const string& consumerTag); - - QPID_COMMON_EXTERN virtual void open(const string& identifier, - uint64_t contentSize); - - QPID_COMMON_EXTERN virtual void openOk(uint64_t stagedSize); - - QPID_COMMON_EXTERN virtual void stage(); - - QPID_COMMON_EXTERN virtual void return_(uint16_t replyCode, - const string& replyText, - const string& exchange, - const string& routingKey); - - QPID_COMMON_EXTERN virtual void deliver(const string& consumerTag, - uint64_t deliveryTag, - bool redelivered, - const string& exchange, - const string& routingKey, - const string& identifier); - - }; - - File& getFile() { return fileProxy; } - - class Stream: - public Proxy - { - public: - Stream(FrameHandler& f) : Proxy(f) {} - static Stream& get(AMQP_ClientProxy& proxy) { return proxy.getStream(); } - QPID_COMMON_EXTERN virtual void qosOk(); - - QPID_COMMON_EXTERN virtual void consumeOk(const string& consumerTag); - - QPID_COMMON_EXTERN virtual void return_(uint16_t replyCode, - const string& replyText, - const string& exchange, - const string& routingKey); - - QPID_COMMON_EXTERN virtual void deliver(const string& consumerTag, - uint64_t deliveryTag, - const string& exchange, - const string& queue); - - }; - - Stream& getStream() { return streamProxy; } - - class Cluster: - public Proxy - { - public: - Cluster(FrameHandler& f) : Proxy(f) {} - static Cluster& get(AMQP_ClientProxy& proxy) { return proxy.getCluster(); } - }; - - Cluster& getCluster() { return clusterProxy; } - - class ClusterConnection: - public Proxy - { - public: - ClusterConnection(FrameHandler& f) : Proxy(f) {} - static ClusterConnection& get(AMQP_ClientProxy& proxy) { return proxy.getClusterConnection(); } - }; - - ClusterConnection& getClusterConnection() { return clusterConnectionProxy; } - - private: - Connection connectionProxy; - Session sessionProxy; - Execution executionProxy; - Message messageProxy; - Tx txProxy; - Dtx dtxProxy; - Exchange exchangeProxy; - Queue queueProxy; - File fileProxy; - Stream streamProxy; - Cluster clusterProxy; - ClusterConnection clusterConnectionProxy; -}; - -}} // namespace qpid::framing - -#endif /*!QPID_FRAMING_AMQP_CLIENTPROXY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/AMQP_ServerOperations.h b/nativeLib/org.apache.qpid/include/qpid/framing/AMQP_ServerOperations.h deleted file mode 100644 index 2f3e67c10a..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/AMQP_ServerOperations.h +++ /dev/null @@ -1,408 +0,0 @@ -#ifndef QPID_FRAMING_AMQP_SERVEROPERATIONS_H -#define QPID_FRAMING_AMQP_SERVEROPERATIONS_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include -#include "qpid/framing/ProtocolVersion.h" -#include "qpid/framing/amqp_structs.h" - -namespace qpid { -namespace framing { - -class AMQMethodBody; - -class AMQP_ServerOperations { - public: - class Invoker; // Declared in ServerInvoker - - virtual ~AMQP_ServerOperations() {} - - virtual ProtocolVersion getVersion() const = 0; - - // Inner classes - // ==================== class ConnectionHandler ==================== - class ConnectionHandler { - // Constructors and destructors - public: - class Invoker; // Declared in ServerInvoker - - ConnectionHandler(){}; - virtual ~ConnectionHandler() {} - // Protocol methods - - virtual void startOk(const FieldTable& clientProperties, - const string& mechanism, - const string& response, - const string& locale) = 0; - - virtual void secureOk(const string& response) = 0; - - virtual void tuneOk(uint16_t channelMax, - uint16_t maxFrameSize, - uint16_t heartbeat) = 0; - - virtual void open(const string& virtualHost, - const Array& capabilities, - bool insist) = 0; - - virtual void heartbeat( ) = 0; - - virtual void close(uint16_t replyCode, - const string& replyText) = 0; - - virtual void closeOk( ) = 0; - }; // class ConnectionHandler - - - // ==================== class SessionHandler ==================== - class SessionHandler { - // Constructors and destructors - public: - class Invoker; // Declared in ServerInvoker - - SessionHandler(){}; - virtual ~SessionHandler() {} - // Protocol methods - - virtual void attach(const string& name, - bool force) = 0; - - virtual void attached(const string& name) = 0; - - virtual void detach(const string& name) = 0; - - virtual void detached(const string& name, - uint8_t code) = 0; - - virtual void requestTimeout(uint32_t timeout) = 0; - - virtual void timeout(uint32_t timeout) = 0; - - virtual void commandPoint(const SequenceNumber& commandId, - uint64_t commandOffset) = 0; - - virtual void expected(const SequenceSet& commands, - const Array& fragments) = 0; - - virtual void confirmed(const SequenceSet& commands, - const Array& fragments) = 0; - - virtual void completed(const SequenceSet& commands, - bool timelyReply) = 0; - - virtual void knownCompleted(const SequenceSet& commands) = 0; - - virtual void flush(bool expected, - bool confirmed, - bool completed) = 0; - - virtual void gap(const SequenceSet& commands) = 0; - }; // class SessionHandler - - - // ==================== class ExecutionHandler ==================== - class ExecutionHandler { - // Constructors and destructors - public: - class Invoker; // Declared in ServerInvoker - - ExecutionHandler(){}; - virtual ~ExecutionHandler() {} - // Protocol methods - - virtual void sync( ) = 0; - - virtual void result(const SequenceNumber& commandId, - const string& value) = 0; - - virtual void exception(uint16_t errorCode, - const SequenceNumber& commandId, - uint8_t classCode, - uint8_t commandCode, - uint8_t fieldIndex, - const string& description, - const FieldTable& errorInfo) = 0; - }; // class ExecutionHandler - - - // ==================== class MessageHandler ==================== - class MessageHandler { - // Constructors and destructors - public: - class Invoker; // Declared in ServerInvoker - - MessageHandler(){}; - virtual ~MessageHandler() {} - // Protocol methods - - virtual void accept(const SequenceSet& transfers) = 0; - - virtual void reject(const SequenceSet& transfers, - uint16_t code, - const string& text) = 0; - - virtual void release(const SequenceSet& transfers, - bool setRedelivered) = 0; - - virtual MessageAcquireResult acquire(const SequenceSet& transfers) = 0; - - virtual MessageResumeResult resume(const string& destination, - const string& resumeId) = 0; - - virtual void subscribe(const string& queue, - const string& destination, - uint8_t acceptMode, - uint8_t acquireMode, - bool exclusive, - const string& resumeId, - uint64_t resumeTtl, - const FieldTable& arguments) = 0; - - virtual void cancel(const string& destination) = 0; - - virtual void setFlowMode(const string& destination, - uint8_t flowMode) = 0; - - virtual void flow(const string& destination, - uint8_t unit, - uint32_t value) = 0; - - virtual void flush(const string& destination) = 0; - - virtual void stop(const string& destination) = 0; - }; // class MessageHandler - - - // ==================== class TxHandler ==================== - class TxHandler { - // Constructors and destructors - public: - class Invoker; // Declared in ServerInvoker - - TxHandler(){}; - virtual ~TxHandler() {} - // Protocol methods - - virtual void select( ) = 0; - - virtual void commit( ) = 0; - - virtual void rollback( ) = 0; - }; // class TxHandler - - - // ==================== class DtxHandler ==================== - class DtxHandler { - // Constructors and destructors - public: - class Invoker; // Declared in ServerInvoker - - DtxHandler(){}; - virtual ~DtxHandler() {} - // Protocol methods - - virtual void select( ) = 0; - - virtual XaResult start(const Xid& xid, - bool join, - bool resume) = 0; - - virtual XaResult end(const Xid& xid, - bool fail, - bool suspend) = 0; - - virtual XaResult commit(const Xid& xid, - bool onePhase) = 0; - - virtual void forget(const Xid& xid) = 0; - - virtual DtxGetTimeoutResult getTimeout(const Xid& xid) = 0; - - virtual XaResult prepare(const Xid& xid) = 0; - - virtual DtxRecoverResult recover( ) = 0; - - virtual XaResult rollback(const Xid& xid) = 0; - - virtual void setTimeout(const Xid& xid, - uint32_t timeout) = 0; - }; // class DtxHandler - - - // ==================== class ExchangeHandler ==================== - class ExchangeHandler { - // Constructors and destructors - public: - class Invoker; // Declared in ServerInvoker - - ExchangeHandler(){}; - virtual ~ExchangeHandler() {} - // Protocol methods - - virtual void declare(const string& exchange, - const string& type, - const string& alternateExchange, - bool passive, - bool durable, - bool autoDelete, - const FieldTable& arguments) = 0; - - virtual void delete_(const string& exchange, - bool ifUnused) = 0; - - virtual ExchangeQueryResult query(const string& name) = 0; - - virtual void bind(const string& queue, - const string& exchange, - const string& bindingKey, - const FieldTable& arguments) = 0; - - virtual void unbind(const string& queue, - const string& exchange, - const string& bindingKey) = 0; - - virtual ExchangeBoundResult bound(const string& exchange, - const string& queue, - const string& bindingKey, - const FieldTable& arguments) = 0; - }; // class ExchangeHandler - - - // ==================== class QueueHandler ==================== - class QueueHandler { - // Constructors and destructors - public: - class Invoker; // Declared in ServerInvoker - - QueueHandler(){}; - virtual ~QueueHandler() {} - // Protocol methods - - virtual void declare(const string& queue, - const string& alternateExchange, - bool passive, - bool durable, - bool exclusive, - bool autoDelete, - const FieldTable& arguments) = 0; - - virtual void delete_(const string& queue, - bool ifUnused, - bool ifEmpty) = 0; - - virtual void purge(const string& queue) = 0; - - virtual QueueQueryResult query(const string& queue) = 0; - }; // class QueueHandler - - - // ==================== class FileHandler ==================== - class FileHandler { - // Constructors and destructors - public: - class Invoker; // Declared in ServerInvoker - - FileHandler(){}; - virtual ~FileHandler() {} - // Protocol methods - - virtual void qos(uint32_t prefetchSize, - uint16_t prefetchCount, - bool global) = 0; - - virtual void consume(const string& queue, - const string& consumerTag, - bool noLocal, - bool noAck, - bool exclusive, - bool nowait, - const FieldTable& arguments) = 0; - - virtual void cancel(const string& consumerTag) = 0; - - virtual void open(const string& identifier, - uint64_t contentSize) = 0; - - virtual void openOk(uint64_t stagedSize) = 0; - - virtual void publish(const string& exchange, - const string& routingKey, - bool mandatory, - bool immediate, - const string& identifier) = 0; - - virtual void ack(uint64_t deliveryTag, - bool multiple) = 0; - - virtual void reject(uint64_t deliveryTag, - bool requeue) = 0; - }; // class FileHandler - - - // ==================== class StreamHandler ==================== - class StreamHandler { - // Constructors and destructors - public: - class Invoker; // Declared in ServerInvoker - - StreamHandler(){}; - virtual ~StreamHandler() {} - // Protocol methods - - virtual void qos(uint32_t prefetchSize, - uint16_t prefetchCount, - uint32_t consumeRate, - bool global) = 0; - - virtual void consume(const string& queue, - const string& consumerTag, - bool noLocal, - bool exclusive, - bool nowait, - const FieldTable& arguments) = 0; - - virtual void cancel(const string& consumerTag) = 0; - }; // class StreamHandler - - - - // Method handler get methods - - virtual ConnectionHandler* getConnectionHandler() = 0; - virtual SessionHandler* getSessionHandler() = 0; - virtual ExecutionHandler* getExecutionHandler() = 0; - virtual MessageHandler* getMessageHandler() = 0; - virtual TxHandler* getTxHandler() = 0; - virtual DtxHandler* getDtxHandler() = 0; - virtual ExchangeHandler* getExchangeHandler() = 0; - virtual QueueHandler* getQueueHandler() = 0; - virtual FileHandler* getFileHandler() = 0; - virtual StreamHandler* getStreamHandler() = 0; -}; /* class AMQP_ServerOperations */ -}} -#endif /*!QPID_FRAMING_AMQP_SERVEROPERATIONS_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/AMQP_ServerProxy.h b/nativeLib/org.apache.qpid/include/qpid/framing/AMQP_ServerProxy.h deleted file mode 100644 index 3b3659ca67..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/AMQP_ServerProxy.h +++ /dev/null @@ -1,418 +0,0 @@ -#ifndef QPID_FRAMING_AMQP_SERVERPROXY_H -#define QPID_FRAMING_AMQP_SERVERPROXY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/Proxy.h" -#include "qpid/framing/Array.h" -#include "qpid/framing/amqp_types.h" -#include "qpid/framing/amqp_structs.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class AMQP_ServerProxy: - public Proxy -{ - public: - QPID_COMMON_EXTERN AMQP_ServerProxy(FrameHandler& out); - - class Connection: - public Proxy - { - public: - Connection(FrameHandler& f) : Proxy(f) {} - static Connection& get(AMQP_ServerProxy& proxy) { return proxy.getConnection(); } - QPID_COMMON_EXTERN virtual void startOk(const FieldTable& clientProperties, - const string& mechanism, - const string& response, - const string& locale); - - QPID_COMMON_EXTERN virtual void secureOk(const string& response); - - QPID_COMMON_EXTERN virtual void tuneOk(uint16_t channelMax, - uint16_t maxFrameSize, - uint16_t heartbeat); - - QPID_COMMON_EXTERN virtual void open(const string& virtualHost, - const Array& capabilities, - bool insist); - - QPID_COMMON_EXTERN virtual void heartbeat(); - - QPID_COMMON_EXTERN virtual void close(uint16_t replyCode, - const string& replyText); - - QPID_COMMON_EXTERN virtual void closeOk(); - - }; - - Connection& getConnection() { return connectionProxy; } - - class Session: - public Proxy - { - public: - Session(FrameHandler& f) : Proxy(f) {} - static Session& get(AMQP_ServerProxy& proxy) { return proxy.getSession(); } - QPID_COMMON_EXTERN virtual void attach(const string& name, - bool force); - - QPID_COMMON_EXTERN virtual void attached(const string& name); - - QPID_COMMON_EXTERN virtual void detach(const string& name); - - QPID_COMMON_EXTERN virtual void detached(const string& name, - uint8_t code); - - QPID_COMMON_EXTERN virtual void requestTimeout(uint32_t timeout); - - QPID_COMMON_EXTERN virtual void timeout(uint32_t timeout); - - QPID_COMMON_EXTERN virtual void commandPoint(const SequenceNumber& commandId, - uint64_t commandOffset); - - QPID_COMMON_EXTERN virtual void expected(const SequenceSet& commands, - const Array& fragments); - - QPID_COMMON_EXTERN virtual void confirmed(const SequenceSet& commands, - const Array& fragments); - - QPID_COMMON_EXTERN virtual void completed(const SequenceSet& commands, - bool timelyReply); - - QPID_COMMON_EXTERN virtual void knownCompleted(const SequenceSet& commands); - - QPID_COMMON_EXTERN virtual void flush(bool expected, - bool confirmed, - bool completed); - - QPID_COMMON_EXTERN virtual void gap(const SequenceSet& commands); - - }; - - Session& getSession() { return sessionProxy; } - - class Execution: - public Proxy - { - public: - Execution(FrameHandler& f) : Proxy(f) {} - static Execution& get(AMQP_ServerProxy& proxy) { return proxy.getExecution(); } - QPID_COMMON_EXTERN virtual void sync(); - - QPID_COMMON_EXTERN virtual void result(const SequenceNumber& commandId, - const string& value); - - QPID_COMMON_EXTERN virtual void exception(uint16_t errorCode, - const SequenceNumber& commandId, - uint8_t classCode, - uint8_t commandCode, - uint8_t fieldIndex, - const string& description, - const FieldTable& errorInfo); - - }; - - Execution& getExecution() { return executionProxy; } - - class Message: - public Proxy - { - public: - Message(FrameHandler& f) : Proxy(f) {} - static Message& get(AMQP_ServerProxy& proxy) { return proxy.getMessage(); } - QPID_COMMON_EXTERN virtual void transfer(const string& destination, - uint8_t acceptMode, - uint8_t acquireMode); - - QPID_COMMON_EXTERN virtual void accept(const SequenceSet& transfers); - - QPID_COMMON_EXTERN virtual void reject(const SequenceSet& transfers, - uint16_t code, - const string& text); - - QPID_COMMON_EXTERN virtual void release(const SequenceSet& transfers, - bool setRedelivered); - - QPID_COMMON_EXTERN virtual void acquire(const SequenceSet& transfers); - - QPID_COMMON_EXTERN virtual void resume(const string& destination, - const string& resumeId); - - QPID_COMMON_EXTERN virtual void subscribe(const string& queue, - const string& destination, - uint8_t acceptMode, - uint8_t acquireMode, - bool exclusive, - const string& resumeId, - uint64_t resumeTtl, - const FieldTable& arguments); - - QPID_COMMON_EXTERN virtual void cancel(const string& destination); - - QPID_COMMON_EXTERN virtual void setFlowMode(const string& destination, - uint8_t flowMode); - - QPID_COMMON_EXTERN virtual void flow(const string& destination, - uint8_t unit, - uint32_t value); - - QPID_COMMON_EXTERN virtual void flush(const string& destination); - - QPID_COMMON_EXTERN virtual void stop(const string& destination); - - }; - - Message& getMessage() { return messageProxy; } - - class Tx: - public Proxy - { - public: - Tx(FrameHandler& f) : Proxy(f) {} - static Tx& get(AMQP_ServerProxy& proxy) { return proxy.getTx(); } - QPID_COMMON_EXTERN virtual void select(); - - QPID_COMMON_EXTERN virtual void commit(); - - QPID_COMMON_EXTERN virtual void rollback(); - - }; - - Tx& getTx() { return txProxy; } - - class Dtx: - public Proxy - { - public: - Dtx(FrameHandler& f) : Proxy(f) {} - static Dtx& get(AMQP_ServerProxy& proxy) { return proxy.getDtx(); } - QPID_COMMON_EXTERN virtual void select(); - - QPID_COMMON_EXTERN virtual void start(const Xid& xid, - bool join, - bool resume); - - QPID_COMMON_EXTERN virtual void end(const Xid& xid, - bool fail, - bool suspend); - - QPID_COMMON_EXTERN virtual void commit(const Xid& xid, - bool onePhase); - - QPID_COMMON_EXTERN virtual void forget(const Xid& xid); - - QPID_COMMON_EXTERN virtual void getTimeout(const Xid& xid); - - QPID_COMMON_EXTERN virtual void prepare(const Xid& xid); - - QPID_COMMON_EXTERN virtual void recover(); - - QPID_COMMON_EXTERN virtual void rollback(const Xid& xid); - - QPID_COMMON_EXTERN virtual void setTimeout(const Xid& xid, - uint32_t timeout); - - }; - - Dtx& getDtx() { return dtxProxy; } - - class Exchange: - public Proxy - { - public: - Exchange(FrameHandler& f) : Proxy(f) {} - static Exchange& get(AMQP_ServerProxy& proxy) { return proxy.getExchange(); } - QPID_COMMON_EXTERN virtual void declare(const string& exchange, - const string& type, - const string& alternateExchange, - bool passive, - bool durable, - bool autoDelete, - const FieldTable& arguments); - - QPID_COMMON_EXTERN virtual void delete_(const string& exchange, - bool ifUnused); - - QPID_COMMON_EXTERN virtual void query(const string& name); - - QPID_COMMON_EXTERN virtual void bind(const string& queue, - const string& exchange, - const string& bindingKey, - const FieldTable& arguments); - - QPID_COMMON_EXTERN virtual void unbind(const string& queue, - const string& exchange, - const string& bindingKey); - - QPID_COMMON_EXTERN virtual void bound(const string& exchange, - const string& queue, - const string& bindingKey, - const FieldTable& arguments); - - }; - - Exchange& getExchange() { return exchangeProxy; } - - class Queue: - public Proxy - { - public: - Queue(FrameHandler& f) : Proxy(f) {} - static Queue& get(AMQP_ServerProxy& proxy) { return proxy.getQueue(); } - QPID_COMMON_EXTERN virtual void declare(const string& queue, - const string& alternateExchange, - bool passive, - bool durable, - bool exclusive, - bool autoDelete, - const FieldTable& arguments); - - QPID_COMMON_EXTERN virtual void delete_(const string& queue, - bool ifUnused, - bool ifEmpty); - - QPID_COMMON_EXTERN virtual void purge(const string& queue); - - QPID_COMMON_EXTERN virtual void query(const string& queue); - - }; - - Queue& getQueue() { return queueProxy; } - - class File: - public Proxy - { - public: - File(FrameHandler& f) : Proxy(f) {} - static File& get(AMQP_ServerProxy& proxy) { return proxy.getFile(); } - QPID_COMMON_EXTERN virtual void qos(uint32_t prefetchSize, - uint16_t prefetchCount, - bool global); - - QPID_COMMON_EXTERN virtual void consume(const string& queue, - const string& consumerTag, - bool noLocal, - bool noAck, - bool exclusive, - bool nowait, - const FieldTable& arguments); - - QPID_COMMON_EXTERN virtual void cancel(const string& consumerTag); - - QPID_COMMON_EXTERN virtual void open(const string& identifier, - uint64_t contentSize); - - QPID_COMMON_EXTERN virtual void openOk(uint64_t stagedSize); - - QPID_COMMON_EXTERN virtual void stage(); - - QPID_COMMON_EXTERN virtual void publish(const string& exchange, - const string& routingKey, - bool mandatory, - bool immediate, - const string& identifier); - - QPID_COMMON_EXTERN virtual void ack(uint64_t deliveryTag, - bool multiple); - - QPID_COMMON_EXTERN virtual void reject(uint64_t deliveryTag, - bool requeue); - - }; - - File& getFile() { return fileProxy; } - - class Stream: - public Proxy - { - public: - Stream(FrameHandler& f) : Proxy(f) {} - static Stream& get(AMQP_ServerProxy& proxy) { return proxy.getStream(); } - QPID_COMMON_EXTERN virtual void qos(uint32_t prefetchSize, - uint16_t prefetchCount, - uint32_t consumeRate, - bool global); - - QPID_COMMON_EXTERN virtual void consume(const string& queue, - const string& consumerTag, - bool noLocal, - bool exclusive, - bool nowait, - const FieldTable& arguments); - - QPID_COMMON_EXTERN virtual void cancel(const string& consumerTag); - - QPID_COMMON_EXTERN virtual void publish(const string& exchange, - const string& routingKey, - bool mandatory, - bool immediate); - - }; - - Stream& getStream() { return streamProxy; } - - class Cluster: - public Proxy - { - public: - Cluster(FrameHandler& f) : Proxy(f) {} - static Cluster& get(AMQP_ServerProxy& proxy) { return proxy.getCluster(); } - }; - - Cluster& getCluster() { return clusterProxy; } - - class ClusterConnection: - public Proxy - { - public: - ClusterConnection(FrameHandler& f) : Proxy(f) {} - static ClusterConnection& get(AMQP_ServerProxy& proxy) { return proxy.getClusterConnection(); } - }; - - ClusterConnection& getClusterConnection() { return clusterConnectionProxy; } - - private: - Connection connectionProxy; - Session sessionProxy; - Execution executionProxy; - Message messageProxy; - Tx txProxy; - Dtx dtxProxy; - Exchange exchangeProxy; - Queue queueProxy; - File fileProxy; - Stream streamProxy; - Cluster clusterProxy; - ClusterConnection clusterConnectionProxy; -}; - -}} // namespace qpid::framing - -#endif /*!QPID_FRAMING_AMQP_SERVERPROXY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/AllInvoker.h b/nativeLib/org.apache.qpid/include/qpid/framing/AllInvoker.h deleted file mode 100644 index 92711b953a..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/AllInvoker.h +++ /dev/null @@ -1,391 +0,0 @@ -#ifndef QPID_FRAMING_ALLINVOKER_H -#define QPID_FRAMING_ALLINVOKER_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQP_AllOperations.h" -#include "qpid/framing/Invoker.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - - -class AMQP_AllOperations::Invoker: - public qpid::framing::Invoker -{ - AMQP_AllOperations& target; - public: - Invoker(AMQP_AllOperations& target_) : target(target_) {} - using MethodBodyDefaultVisitor::visit; - QPID_COMMON_EXTERN void visit(const ConnectionStartBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionStartOkBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionSecureBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionSecureOkBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionTuneBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionTuneOkBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionOpenBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionOpenOkBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionRedirectBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionHeartbeatBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionCloseBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionCloseOkBody& body); - QPID_COMMON_EXTERN void visit(const SessionAttachBody& body); - QPID_COMMON_EXTERN void visit(const SessionAttachedBody& body); - QPID_COMMON_EXTERN void visit(const SessionDetachBody& body); - QPID_COMMON_EXTERN void visit(const SessionDetachedBody& body); - QPID_COMMON_EXTERN void visit(const SessionRequestTimeoutBody& body); - QPID_COMMON_EXTERN void visit(const SessionTimeoutBody& body); - QPID_COMMON_EXTERN void visit(const SessionCommandPointBody& body); - QPID_COMMON_EXTERN void visit(const SessionExpectedBody& body); - QPID_COMMON_EXTERN void visit(const SessionConfirmedBody& body); - QPID_COMMON_EXTERN void visit(const SessionCompletedBody& body); - QPID_COMMON_EXTERN void visit(const SessionKnownCompletedBody& body); - QPID_COMMON_EXTERN void visit(const SessionFlushBody& body); - QPID_COMMON_EXTERN void visit(const SessionGapBody& body); - QPID_COMMON_EXTERN void visit(const ExecutionSyncBody& body); - QPID_COMMON_EXTERN void visit(const ExecutionResultBody& body); - QPID_COMMON_EXTERN void visit(const ExecutionExceptionBody& body); - QPID_COMMON_EXTERN void visit(const MessageAcceptBody& body); - QPID_COMMON_EXTERN void visit(const MessageRejectBody& body); - QPID_COMMON_EXTERN void visit(const MessageReleaseBody& body); - QPID_COMMON_EXTERN void visit(const MessageAcquireBody& body); - QPID_COMMON_EXTERN void visit(const MessageResumeBody& body); - QPID_COMMON_EXTERN void visit(const MessageSubscribeBody& body); - QPID_COMMON_EXTERN void visit(const MessageCancelBody& body); - QPID_COMMON_EXTERN void visit(const MessageSetFlowModeBody& body); - QPID_COMMON_EXTERN void visit(const MessageFlowBody& body); - QPID_COMMON_EXTERN void visit(const MessageFlushBody& body); - QPID_COMMON_EXTERN void visit(const MessageStopBody& body); - QPID_COMMON_EXTERN void visit(const TxSelectBody& body); - QPID_COMMON_EXTERN void visit(const TxCommitBody& body); - QPID_COMMON_EXTERN void visit(const TxRollbackBody& body); - QPID_COMMON_EXTERN void visit(const DtxSelectBody& body); - QPID_COMMON_EXTERN void visit(const DtxStartBody& body); - QPID_COMMON_EXTERN void visit(const DtxEndBody& body); - QPID_COMMON_EXTERN void visit(const DtxCommitBody& body); - QPID_COMMON_EXTERN void visit(const DtxForgetBody& body); - QPID_COMMON_EXTERN void visit(const DtxGetTimeoutBody& body); - QPID_COMMON_EXTERN void visit(const DtxPrepareBody& body); - QPID_COMMON_EXTERN void visit(const DtxRecoverBody& body); - QPID_COMMON_EXTERN void visit(const DtxRollbackBody& body); - QPID_COMMON_EXTERN void visit(const DtxSetTimeoutBody& body); - QPID_COMMON_EXTERN void visit(const ExchangeDeclareBody& body); - QPID_COMMON_EXTERN void visit(const ExchangeDeleteBody& body); - QPID_COMMON_EXTERN void visit(const ExchangeQueryBody& body); - QPID_COMMON_EXTERN void visit(const ExchangeBindBody& body); - QPID_COMMON_EXTERN void visit(const ExchangeUnbindBody& body); - QPID_COMMON_EXTERN void visit(const ExchangeBoundBody& body); - QPID_COMMON_EXTERN void visit(const QueueDeclareBody& body); - QPID_COMMON_EXTERN void visit(const QueueDeleteBody& body); - QPID_COMMON_EXTERN void visit(const QueuePurgeBody& body); - QPID_COMMON_EXTERN void visit(const QueueQueryBody& body); - QPID_COMMON_EXTERN void visit(const FileQosBody& body); - QPID_COMMON_EXTERN void visit(const FileQosOkBody& body); - QPID_COMMON_EXTERN void visit(const FileConsumeBody& body); - QPID_COMMON_EXTERN void visit(const FileConsumeOkBody& body); - QPID_COMMON_EXTERN void visit(const FileCancelBody& body); - QPID_COMMON_EXTERN void visit(const FileOpenBody& body); - QPID_COMMON_EXTERN void visit(const FileOpenOkBody& body); - QPID_COMMON_EXTERN void visit(const FilePublishBody& body); - QPID_COMMON_EXTERN void visit(const FileDeliverBody& body); - QPID_COMMON_EXTERN void visit(const FileAckBody& body); - QPID_COMMON_EXTERN void visit(const FileRejectBody& body); - QPID_COMMON_EXTERN void visit(const StreamQosBody& body); - QPID_COMMON_EXTERN void visit(const StreamQosOkBody& body); - QPID_COMMON_EXTERN void visit(const StreamConsumeBody& body); - QPID_COMMON_EXTERN void visit(const StreamConsumeOkBody& body); - QPID_COMMON_EXTERN void visit(const StreamCancelBody& body); - QPID_COMMON_EXTERN void visit(const ClusterUpdateRequestBody& body); - QPID_COMMON_EXTERN void visit(const ClusterUpdateOfferBody& body); - QPID_COMMON_EXTERN void visit(const ClusterRetractOfferBody& body); - QPID_COMMON_EXTERN void visit(const ClusterInitialStatusBody& body); - QPID_COMMON_EXTERN void visit(const ClusterReadyBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConfigChangeBody& body); - QPID_COMMON_EXTERN void visit(const ClusterMessageExpiredBody& body); - QPID_COMMON_EXTERN void visit(const ClusterErrorCheckBody& body); - QPID_COMMON_EXTERN void visit(const ClusterTimerWakeupBody& body); - QPID_COMMON_EXTERN void visit(const ClusterTimerDropBody& body); - QPID_COMMON_EXTERN void visit(const ClusterShutdownBody& body); - QPID_COMMON_EXTERN void visit(const ClusterDeliverToQueueBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionAnnounceBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionDeliverCloseBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionDeliverDoOutputBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionAbortBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionShadowSetUserBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionShadowPrepareBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionConsumerStateBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionDeliveryRecordBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionTxStartBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionTxAcceptBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionTxDequeueBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionTxEnqueueBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionTxPublishBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionTxEndBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionAccumulatedAckBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionOutputTaskBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionSessionStateBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionShadowReadyBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionMembershipBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionRetractOfferBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionQueuePositionBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionExchangeBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionQueueBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionExpiryIdBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionAddQueueListenerBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionManagementSetupStateBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionConfigBody& body); -}; - -class AMQP_AllOperations::ConnectionHandler::Invoker: - public qpid::framing::Invoker -{ - AMQP_AllOperations::ConnectionHandler& target; - public: - Invoker(AMQP_AllOperations::ConnectionHandler& target_) : target(target_) {} - using MethodBodyDefaultVisitor::visit; - QPID_COMMON_EXTERN void visit(const ConnectionStartBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionStartOkBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionSecureBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionSecureOkBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionTuneBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionTuneOkBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionOpenBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionOpenOkBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionRedirectBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionHeartbeatBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionCloseBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionCloseOkBody& body); -}; - -class AMQP_AllOperations::SessionHandler::Invoker: - public qpid::framing::Invoker -{ - AMQP_AllOperations::SessionHandler& target; - public: - Invoker(AMQP_AllOperations::SessionHandler& target_) : target(target_) {} - using MethodBodyDefaultVisitor::visit; - QPID_COMMON_EXTERN void visit(const SessionAttachBody& body); - QPID_COMMON_EXTERN void visit(const SessionAttachedBody& body); - QPID_COMMON_EXTERN void visit(const SessionDetachBody& body); - QPID_COMMON_EXTERN void visit(const SessionDetachedBody& body); - QPID_COMMON_EXTERN void visit(const SessionRequestTimeoutBody& body); - QPID_COMMON_EXTERN void visit(const SessionTimeoutBody& body); - QPID_COMMON_EXTERN void visit(const SessionCommandPointBody& body); - QPID_COMMON_EXTERN void visit(const SessionExpectedBody& body); - QPID_COMMON_EXTERN void visit(const SessionConfirmedBody& body); - QPID_COMMON_EXTERN void visit(const SessionCompletedBody& body); - QPID_COMMON_EXTERN void visit(const SessionKnownCompletedBody& body); - QPID_COMMON_EXTERN void visit(const SessionFlushBody& body); - QPID_COMMON_EXTERN void visit(const SessionGapBody& body); -}; - -class AMQP_AllOperations::ExecutionHandler::Invoker: - public qpid::framing::Invoker -{ - AMQP_AllOperations::ExecutionHandler& target; - public: - Invoker(AMQP_AllOperations::ExecutionHandler& target_) : target(target_) {} - using MethodBodyDefaultVisitor::visit; - QPID_COMMON_EXTERN void visit(const ExecutionSyncBody& body); - QPID_COMMON_EXTERN void visit(const ExecutionResultBody& body); - QPID_COMMON_EXTERN void visit(const ExecutionExceptionBody& body); -}; - -class AMQP_AllOperations::MessageHandler::Invoker: - public qpid::framing::Invoker -{ - AMQP_AllOperations::MessageHandler& target; - public: - Invoker(AMQP_AllOperations::MessageHandler& target_) : target(target_) {} - using MethodBodyDefaultVisitor::visit; - QPID_COMMON_EXTERN void visit(const MessageAcceptBody& body); - QPID_COMMON_EXTERN void visit(const MessageRejectBody& body); - QPID_COMMON_EXTERN void visit(const MessageReleaseBody& body); - QPID_COMMON_EXTERN void visit(const MessageAcquireBody& body); - QPID_COMMON_EXTERN void visit(const MessageResumeBody& body); - QPID_COMMON_EXTERN void visit(const MessageSubscribeBody& body); - QPID_COMMON_EXTERN void visit(const MessageCancelBody& body); - QPID_COMMON_EXTERN void visit(const MessageSetFlowModeBody& body); - QPID_COMMON_EXTERN void visit(const MessageFlowBody& body); - QPID_COMMON_EXTERN void visit(const MessageFlushBody& body); - QPID_COMMON_EXTERN void visit(const MessageStopBody& body); -}; - -class AMQP_AllOperations::TxHandler::Invoker: - public qpid::framing::Invoker -{ - AMQP_AllOperations::TxHandler& target; - public: - Invoker(AMQP_AllOperations::TxHandler& target_) : target(target_) {} - using MethodBodyDefaultVisitor::visit; - QPID_COMMON_EXTERN void visit(const TxSelectBody& body); - QPID_COMMON_EXTERN void visit(const TxCommitBody& body); - QPID_COMMON_EXTERN void visit(const TxRollbackBody& body); -}; - -class AMQP_AllOperations::DtxHandler::Invoker: - public qpid::framing::Invoker -{ - AMQP_AllOperations::DtxHandler& target; - public: - Invoker(AMQP_AllOperations::DtxHandler& target_) : target(target_) {} - using MethodBodyDefaultVisitor::visit; - QPID_COMMON_EXTERN void visit(const DtxSelectBody& body); - QPID_COMMON_EXTERN void visit(const DtxStartBody& body); - QPID_COMMON_EXTERN void visit(const DtxEndBody& body); - QPID_COMMON_EXTERN void visit(const DtxCommitBody& body); - QPID_COMMON_EXTERN void visit(const DtxForgetBody& body); - QPID_COMMON_EXTERN void visit(const DtxGetTimeoutBody& body); - QPID_COMMON_EXTERN void visit(const DtxPrepareBody& body); - QPID_COMMON_EXTERN void visit(const DtxRecoverBody& body); - QPID_COMMON_EXTERN void visit(const DtxRollbackBody& body); - QPID_COMMON_EXTERN void visit(const DtxSetTimeoutBody& body); -}; - -class AMQP_AllOperations::ExchangeHandler::Invoker: - public qpid::framing::Invoker -{ - AMQP_AllOperations::ExchangeHandler& target; - public: - Invoker(AMQP_AllOperations::ExchangeHandler& target_) : target(target_) {} - using MethodBodyDefaultVisitor::visit; - QPID_COMMON_EXTERN void visit(const ExchangeDeclareBody& body); - QPID_COMMON_EXTERN void visit(const ExchangeDeleteBody& body); - QPID_COMMON_EXTERN void visit(const ExchangeQueryBody& body); - QPID_COMMON_EXTERN void visit(const ExchangeBindBody& body); - QPID_COMMON_EXTERN void visit(const ExchangeUnbindBody& body); - QPID_COMMON_EXTERN void visit(const ExchangeBoundBody& body); -}; - -class AMQP_AllOperations::QueueHandler::Invoker: - public qpid::framing::Invoker -{ - AMQP_AllOperations::QueueHandler& target; - public: - Invoker(AMQP_AllOperations::QueueHandler& target_) : target(target_) {} - using MethodBodyDefaultVisitor::visit; - QPID_COMMON_EXTERN void visit(const QueueDeclareBody& body); - QPID_COMMON_EXTERN void visit(const QueueDeleteBody& body); - QPID_COMMON_EXTERN void visit(const QueuePurgeBody& body); - QPID_COMMON_EXTERN void visit(const QueueQueryBody& body); -}; - -class AMQP_AllOperations::FileHandler::Invoker: - public qpid::framing::Invoker -{ - AMQP_AllOperations::FileHandler& target; - public: - Invoker(AMQP_AllOperations::FileHandler& target_) : target(target_) {} - using MethodBodyDefaultVisitor::visit; - QPID_COMMON_EXTERN void visit(const FileQosBody& body); - QPID_COMMON_EXTERN void visit(const FileQosOkBody& body); - QPID_COMMON_EXTERN void visit(const FileConsumeBody& body); - QPID_COMMON_EXTERN void visit(const FileConsumeOkBody& body); - QPID_COMMON_EXTERN void visit(const FileCancelBody& body); - QPID_COMMON_EXTERN void visit(const FileOpenBody& body); - QPID_COMMON_EXTERN void visit(const FileOpenOkBody& body); - QPID_COMMON_EXTERN void visit(const FilePublishBody& body); - QPID_COMMON_EXTERN void visit(const FileDeliverBody& body); - QPID_COMMON_EXTERN void visit(const FileAckBody& body); - QPID_COMMON_EXTERN void visit(const FileRejectBody& body); -}; - -class AMQP_AllOperations::StreamHandler::Invoker: - public qpid::framing::Invoker -{ - AMQP_AllOperations::StreamHandler& target; - public: - Invoker(AMQP_AllOperations::StreamHandler& target_) : target(target_) {} - using MethodBodyDefaultVisitor::visit; - QPID_COMMON_EXTERN void visit(const StreamQosBody& body); - QPID_COMMON_EXTERN void visit(const StreamQosOkBody& body); - QPID_COMMON_EXTERN void visit(const StreamConsumeBody& body); - QPID_COMMON_EXTERN void visit(const StreamConsumeOkBody& body); - QPID_COMMON_EXTERN void visit(const StreamCancelBody& body); -}; - -class AMQP_AllOperations::ClusterHandler::Invoker: - public qpid::framing::Invoker -{ - AMQP_AllOperations::ClusterHandler& target; - public: - Invoker(AMQP_AllOperations::ClusterHandler& target_) : target(target_) {} - using MethodBodyDefaultVisitor::visit; - QPID_COMMON_EXTERN void visit(const ClusterUpdateRequestBody& body); - QPID_COMMON_EXTERN void visit(const ClusterUpdateOfferBody& body); - QPID_COMMON_EXTERN void visit(const ClusterRetractOfferBody& body); - QPID_COMMON_EXTERN void visit(const ClusterInitialStatusBody& body); - QPID_COMMON_EXTERN void visit(const ClusterReadyBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConfigChangeBody& body); - QPID_COMMON_EXTERN void visit(const ClusterMessageExpiredBody& body); - QPID_COMMON_EXTERN void visit(const ClusterErrorCheckBody& body); - QPID_COMMON_EXTERN void visit(const ClusterTimerWakeupBody& body); - QPID_COMMON_EXTERN void visit(const ClusterTimerDropBody& body); - QPID_COMMON_EXTERN void visit(const ClusterShutdownBody& body); - QPID_COMMON_EXTERN void visit(const ClusterDeliverToQueueBody& body); -}; - -class AMQP_AllOperations::ClusterConnectionHandler::Invoker: - public qpid::framing::Invoker -{ - AMQP_AllOperations::ClusterConnectionHandler& target; - public: - Invoker(AMQP_AllOperations::ClusterConnectionHandler& target_) : target(target_) {} - using MethodBodyDefaultVisitor::visit; - QPID_COMMON_EXTERN void visit(const ClusterConnectionAnnounceBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionDeliverCloseBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionDeliverDoOutputBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionAbortBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionShadowSetUserBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionShadowPrepareBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionConsumerStateBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionDeliveryRecordBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionTxStartBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionTxAcceptBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionTxDequeueBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionTxEnqueueBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionTxPublishBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionTxEndBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionAccumulatedAckBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionOutputTaskBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionSessionStateBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionShadowReadyBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionMembershipBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionRetractOfferBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionQueuePositionBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionExchangeBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionQueueBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionExpiryIdBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionAddQueueListenerBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionManagementSetupStateBody& body); - QPID_COMMON_EXTERN void visit(const ClusterConnectionConfigBody& body); -}; - -}} // namespace qpid::framing - -#endif /*!QPID_FRAMING_ALLINVOKER_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/Array.h b/nativeLib/org.apache.qpid/include/qpid/framing/Array.h deleted file mode 100644 index d3bdd36aa6..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/Array.h +++ /dev/null @@ -1,97 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#include "qpid/framing/amqp_types.h" -#include "qpid/framing/FieldValue.h" -#include "qpid/framing/TypeCode.h" -#include -#include -#include -#include "qpid/CommonImportExport.h" - -#ifndef _Array_ -#define _Array_ - -namespace qpid { -namespace framing { - -class Buffer; - -class Array -{ - public: - typedef boost::shared_ptr ValuePtr; - typedef std::vector ValueVector; - typedef ValueVector::const_iterator const_iterator; - typedef ValueVector::iterator iterator; - - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN void encode(Buffer& buffer) const; - QPID_COMMON_EXTERN void decode(Buffer& buffer); - - QPID_COMMON_EXTERN int count() const; - QPID_COMMON_EXTERN bool operator==(const Array& other) const; - - QPID_COMMON_EXTERN Array(); - QPID_COMMON_EXTERN Array(TypeCode type); - QPID_COMMON_EXTERN Array(uint8_t type); - //creates a longstr array - QPID_COMMON_EXTERN Array(const std::vector& in); - - QPID_COMMON_EXTERN TypeCode getType() const { return type; } - - // std collection interface. - QPID_COMMON_EXTERN const_iterator begin() const { return values.begin(); } - QPID_COMMON_EXTERN const_iterator end() const { return values.end(); } - QPID_COMMON_EXTERN iterator begin() { return values.begin(); } - QPID_COMMON_EXTERN iterator end(){ return values.end(); } - - QPID_COMMON_EXTERN ValuePtr front() const { return values.front(); } - QPID_COMMON_EXTERN ValuePtr back() const { return values.back(); } - QPID_COMMON_EXTERN size_t size() const { return values.size(); } - - QPID_COMMON_EXTERN void insert(iterator i, ValuePtr value); - QPID_COMMON_EXTERN void erase(iterator i) { values.erase(i); } - QPID_COMMON_EXTERN void push_back(ValuePtr value) { values.insert(end(), value); } - QPID_COMMON_EXTERN void pop_back() { values.pop_back(); } - - // Non-std interface - QPID_COMMON_EXTERN void add(ValuePtr value) { push_back(value); } - - template - void collect(std::vector& out) const - { - for (ValueVector::const_iterator i = values.begin(); i != values.end(); ++i) { - out.push_back((*i)->get()); - } - } - - private: - TypeCode type; - ValueVector values; - - friend QPID_COMMON_EXTERN std::ostream& operator<<(std::ostream& out, const Array& body); -}; - -} -} - - -#endif diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/Buffer.h b/nativeLib/org.apache.qpid/include/qpid/framing/Buffer.h deleted file mode 100644 index 04583433c5..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/Buffer.h +++ /dev/null @@ -1,136 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#include "qpid/framing/amqp_types.h" -#include "qpid/Exception.h" -#include "qpid/CommonImportExport.h" -#include - -#ifndef _Buffer_ -#define _Buffer_ - -namespace qpid { -namespace framing { - -struct OutOfBounds : qpid::Exception { - OutOfBounds() : qpid::Exception(std::string("Out of Bounds")) {} -}; - -class Content; -class FieldTable; - -class Buffer -{ - uint32_t size; - char* data; - uint32_t position; - uint32_t r_position; - - public: - void checkAvailable(uint32_t count) { if (position + count > size) throw OutOfBounds(); } - - /** Buffer input/output iterator. - * Supports using an amqp_0_10::Codec with a framing::Buffer. - */ - class Iterator : public boost::iterator_facade< - Iterator, char, boost::random_access_traversal_tag> - { - public: - Iterator(Buffer& b) : buffer(&b) {} - - private: - friend class boost::iterator_core_access; - char& dereference() const { return buffer->data[buffer->position]; } - void increment() { ++buffer->position; } - bool equal(const Iterator& x) const { return buffer == x.buffer; } - - Buffer* buffer; - }; - - friend class Iterator; - - QPID_COMMON_EXTERN Buffer(char* data=0, uint32_t size=0); - - QPID_COMMON_EXTERN void record(); - QPID_COMMON_EXTERN void restore(bool reRecord = false); - QPID_COMMON_EXTERN void reset(); - - QPID_COMMON_EXTERN uint32_t available() { return size - position; } - QPID_COMMON_EXTERN uint32_t getSize() { return size; } - QPID_COMMON_EXTERN uint32_t getPosition() { return position; } - QPID_COMMON_EXTERN void setPosition(uint32_t p) { position = p; } - QPID_COMMON_EXTERN Iterator getIterator() { return Iterator(*this); } - QPID_COMMON_EXTERN char* getPointer() { return data; } - - QPID_COMMON_EXTERN void putOctet(uint8_t i); - QPID_COMMON_EXTERN void putShort(uint16_t i); - QPID_COMMON_EXTERN void putLong(uint32_t i); - QPID_COMMON_EXTERN void putLongLong(uint64_t i); - QPID_COMMON_EXTERN void putInt8(int8_t i); - QPID_COMMON_EXTERN void putInt16(int16_t i); - QPID_COMMON_EXTERN void putInt32(int32_t i); - QPID_COMMON_EXTERN void putInt64(int64_t i); - QPID_COMMON_EXTERN void putFloat(float f); - QPID_COMMON_EXTERN void putDouble(double f); - QPID_COMMON_EXTERN void putBin128(const uint8_t* b); - - QPID_COMMON_EXTERN uint8_t getOctet(); - QPID_COMMON_EXTERN uint16_t getShort(); - QPID_COMMON_EXTERN uint32_t getLong(); - QPID_COMMON_EXTERN uint64_t getLongLong(); - QPID_COMMON_EXTERN int8_t getInt8(); - QPID_COMMON_EXTERN int16_t getInt16(); - QPID_COMMON_EXTERN int32_t getInt32(); - QPID_COMMON_EXTERN int64_t getInt64(); - QPID_COMMON_EXTERN float getFloat(); - QPID_COMMON_EXTERN double getDouble(); - - template - QPID_COMMON_EXTERN uint64_t getUInt(); - - template - QPID_COMMON_EXTERN void putUInt(uint64_t); - - QPID_COMMON_EXTERN void putShortString(const string& s); - QPID_COMMON_EXTERN void putMediumString(const string& s); - QPID_COMMON_EXTERN void putLongString(const string& s); - QPID_COMMON_EXTERN void getShortString(string& s); - QPID_COMMON_EXTERN void getMediumString(string& s); - QPID_COMMON_EXTERN void getLongString(string& s); - QPID_COMMON_EXTERN void getBin128(uint8_t* b); - - QPID_COMMON_EXTERN void putRawData(const string& s); - QPID_COMMON_EXTERN void getRawData(string& s, uint32_t size); - - QPID_COMMON_EXTERN void putRawData(const uint8_t* data, size_t size); - QPID_COMMON_EXTERN void getRawData(uint8_t* data, size_t size); - - template void put(const T& data) { data.encode(*this); } - template void get(T& data) { data.decode(*this); } - - QPID_COMMON_EXTERN void dump(std::ostream&) const; -}; - -std::ostream& operator<<(std::ostream&, const Buffer&); - -}} // namespace qpid::framing - - -#endif diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClientInvoker.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClientInvoker.h deleted file mode 100644 index 5de99d673c..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClientInvoker.h +++ /dev/null @@ -1,179 +0,0 @@ -#ifndef QPID_FRAMING_CLIENTINVOKER_H -#define QPID_FRAMING_CLIENTINVOKER_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQP_ClientOperations.h" -#include "qpid/framing/Invoker.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - - -class AMQP_ClientOperations::Invoker: - public qpid::framing::Invoker -{ - AMQP_ClientOperations& target; - public: - Invoker(AMQP_ClientOperations& target_) : target(target_) {} - using MethodBodyDefaultVisitor::visit; - QPID_COMMON_EXTERN void visit(const ConnectionStartBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionSecureBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionTuneBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionOpenOkBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionRedirectBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionHeartbeatBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionCloseBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionCloseOkBody& body); - QPID_COMMON_EXTERN void visit(const SessionAttachBody& body); - QPID_COMMON_EXTERN void visit(const SessionAttachedBody& body); - QPID_COMMON_EXTERN void visit(const SessionDetachBody& body); - QPID_COMMON_EXTERN void visit(const SessionDetachedBody& body); - QPID_COMMON_EXTERN void visit(const SessionRequestTimeoutBody& body); - QPID_COMMON_EXTERN void visit(const SessionTimeoutBody& body); - QPID_COMMON_EXTERN void visit(const SessionCommandPointBody& body); - QPID_COMMON_EXTERN void visit(const SessionExpectedBody& body); - QPID_COMMON_EXTERN void visit(const SessionConfirmedBody& body); - QPID_COMMON_EXTERN void visit(const SessionCompletedBody& body); - QPID_COMMON_EXTERN void visit(const SessionKnownCompletedBody& body); - QPID_COMMON_EXTERN void visit(const SessionFlushBody& body); - QPID_COMMON_EXTERN void visit(const SessionGapBody& body); - QPID_COMMON_EXTERN void visit(const ExecutionSyncBody& body); - QPID_COMMON_EXTERN void visit(const ExecutionResultBody& body); - QPID_COMMON_EXTERN void visit(const ExecutionExceptionBody& body); - QPID_COMMON_EXTERN void visit(const MessageAcceptBody& body); - QPID_COMMON_EXTERN void visit(const MessageRejectBody& body); - QPID_COMMON_EXTERN void visit(const MessageReleaseBody& body); - QPID_COMMON_EXTERN void visit(const MessageResumeBody& body); - QPID_COMMON_EXTERN void visit(const MessageSetFlowModeBody& body); - QPID_COMMON_EXTERN void visit(const MessageFlowBody& body); - QPID_COMMON_EXTERN void visit(const MessageStopBody& body); - QPID_COMMON_EXTERN void visit(const FileQosOkBody& body); - QPID_COMMON_EXTERN void visit(const FileConsumeOkBody& body); - QPID_COMMON_EXTERN void visit(const FileOpenBody& body); - QPID_COMMON_EXTERN void visit(const FileOpenOkBody& body); - QPID_COMMON_EXTERN void visit(const FileDeliverBody& body); - QPID_COMMON_EXTERN void visit(const StreamQosOkBody& body); - QPID_COMMON_EXTERN void visit(const StreamConsumeOkBody& body); -}; - -class AMQP_ClientOperations::ConnectionHandler::Invoker: - public qpid::framing::Invoker -{ - AMQP_ClientOperations::ConnectionHandler& target; - public: - Invoker(AMQP_ClientOperations::ConnectionHandler& target_) : target(target_) {} - using MethodBodyDefaultVisitor::visit; - QPID_COMMON_EXTERN void visit(const ConnectionStartBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionSecureBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionTuneBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionOpenOkBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionRedirectBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionHeartbeatBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionCloseBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionCloseOkBody& body); -}; - -class AMQP_ClientOperations::SessionHandler::Invoker: - public qpid::framing::Invoker -{ - AMQP_ClientOperations::SessionHandler& target; - public: - Invoker(AMQP_ClientOperations::SessionHandler& target_) : target(target_) {} - using MethodBodyDefaultVisitor::visit; - QPID_COMMON_EXTERN void visit(const SessionAttachBody& body); - QPID_COMMON_EXTERN void visit(const SessionAttachedBody& body); - QPID_COMMON_EXTERN void visit(const SessionDetachBody& body); - QPID_COMMON_EXTERN void visit(const SessionDetachedBody& body); - QPID_COMMON_EXTERN void visit(const SessionRequestTimeoutBody& body); - QPID_COMMON_EXTERN void visit(const SessionTimeoutBody& body); - QPID_COMMON_EXTERN void visit(const SessionCommandPointBody& body); - QPID_COMMON_EXTERN void visit(const SessionExpectedBody& body); - QPID_COMMON_EXTERN void visit(const SessionConfirmedBody& body); - QPID_COMMON_EXTERN void visit(const SessionCompletedBody& body); - QPID_COMMON_EXTERN void visit(const SessionKnownCompletedBody& body); - QPID_COMMON_EXTERN void visit(const SessionFlushBody& body); - QPID_COMMON_EXTERN void visit(const SessionGapBody& body); -}; - -class AMQP_ClientOperations::ExecutionHandler::Invoker: - public qpid::framing::Invoker -{ - AMQP_ClientOperations::ExecutionHandler& target; - public: - Invoker(AMQP_ClientOperations::ExecutionHandler& target_) : target(target_) {} - using MethodBodyDefaultVisitor::visit; - QPID_COMMON_EXTERN void visit(const ExecutionSyncBody& body); - QPID_COMMON_EXTERN void visit(const ExecutionResultBody& body); - QPID_COMMON_EXTERN void visit(const ExecutionExceptionBody& body); -}; - -class AMQP_ClientOperations::MessageHandler::Invoker: - public qpid::framing::Invoker -{ - AMQP_ClientOperations::MessageHandler& target; - public: - Invoker(AMQP_ClientOperations::MessageHandler& target_) : target(target_) {} - using MethodBodyDefaultVisitor::visit; - QPID_COMMON_EXTERN void visit(const MessageAcceptBody& body); - QPID_COMMON_EXTERN void visit(const MessageRejectBody& body); - QPID_COMMON_EXTERN void visit(const MessageReleaseBody& body); - QPID_COMMON_EXTERN void visit(const MessageResumeBody& body); - QPID_COMMON_EXTERN void visit(const MessageSetFlowModeBody& body); - QPID_COMMON_EXTERN void visit(const MessageFlowBody& body); - QPID_COMMON_EXTERN void visit(const MessageStopBody& body); -}; - -class AMQP_ClientOperations::FileHandler::Invoker: - public qpid::framing::Invoker -{ - AMQP_ClientOperations::FileHandler& target; - public: - Invoker(AMQP_ClientOperations::FileHandler& target_) : target(target_) {} - using MethodBodyDefaultVisitor::visit; - QPID_COMMON_EXTERN void visit(const FileQosOkBody& body); - QPID_COMMON_EXTERN void visit(const FileConsumeOkBody& body); - QPID_COMMON_EXTERN void visit(const FileOpenBody& body); - QPID_COMMON_EXTERN void visit(const FileOpenOkBody& body); - QPID_COMMON_EXTERN void visit(const FileDeliverBody& body); -}; - -class AMQP_ClientOperations::StreamHandler::Invoker: - public qpid::framing::Invoker -{ - AMQP_ClientOperations::StreamHandler& target; - public: - Invoker(AMQP_ClientOperations::StreamHandler& target_) : target(target_) {} - using MethodBodyDefaultVisitor::visit; - QPID_COMMON_EXTERN void visit(const StreamQosOkBody& body); - QPID_COMMON_EXTERN void visit(const StreamConsumeOkBody& body); -}; - -}} // namespace qpid::framing - -#endif /*!QPID_FRAMING_CLIENTINVOKER_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConfigChangeBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConfigChangeBody.h deleted file mode 100644 index 64c670db74..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConfigChangeBody.h +++ /dev/null @@ -1,101 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERCONFIGCHANGEBODY_H -#define QPID_FRAMING_CLUSTERCONFIGCHANGEBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterConfigChangeBody : public ModelMethod { - string members; - string joined; - string left; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x80; - static const MethodId METHOD_ID = 0x11; - ClusterConfigChangeBody( - ProtocolVersion, const string& _members, - const string& _joined, - const string& _left) : - members(_members), - joined(_joined), - left(_left), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - flags |= (1 << 10); - } - ClusterConfigChangeBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setMembers(const string& _members); - QPID_COMMON_EXTERN const string& getMembers() const; - QPID_COMMON_EXTERN bool hasMembers() const; - QPID_COMMON_EXTERN void clearMembersFlag(); - QPID_COMMON_EXTERN void setJoined(const string& _joined); - QPID_COMMON_EXTERN const string& getJoined() const; - QPID_COMMON_EXTERN bool hasJoined() const; - QPID_COMMON_EXTERN void clearJoinedFlag(); - QPID_COMMON_EXTERN void setLeft(const string& _left); - QPID_COMMON_EXTERN const string& getLeft() const; - QPID_COMMON_EXTERN bool hasLeft() const; - QPID_COMMON_EXTERN void clearLeftFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.configChange(getMembers(), getJoined(), getLeft()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterConfigChangeBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERCONFIGCHANGEBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionAbortBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionAbortBody.h deleted file mode 100644 index 60cea5735e..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionAbortBody.h +++ /dev/null @@ -1,74 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERCONNECTIONABORTBODY_H -#define QPID_FRAMING_CLUSTERCONNECTIONABORTBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterConnectionAbortBody : public ModelMethod { - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x81; - static const MethodId METHOD_ID = 0x4; - ClusterConnectionAbortBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.abort(); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterConnectionAbortBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERCONNECTIONABORTBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionAccumulatedAckBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionAccumulatedAckBody.h deleted file mode 100644 index a54461cf39..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionAccumulatedAckBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERCONNECTIONACCUMULATEDACKBODY_H -#define QPID_FRAMING_CLUSTERCONNECTIONACCUMULATEDACKBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterConnectionAccumulatedAckBody : public ModelMethod { - SequenceSet commands; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x81; - static const MethodId METHOD_ID = 0x18; - ClusterConnectionAccumulatedAckBody( - ProtocolVersion, const SequenceSet& _commands) : - commands(_commands), - flags(0){ - flags |= (1 << 8); - } - ClusterConnectionAccumulatedAckBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setCommands(const SequenceSet& _commands); - QPID_COMMON_EXTERN const SequenceSet& getCommands() const; - QPID_COMMON_EXTERN bool hasCommands() const; - QPID_COMMON_EXTERN void clearCommandsFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.accumulatedAck(getCommands()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterConnectionAccumulatedAckBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERCONNECTIONACCUMULATEDACKBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionAddQueueListenerBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionAddQueueListenerBody.h deleted file mode 100644 index ee7da45205..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionAddQueueListenerBody.h +++ /dev/null @@ -1,93 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERCONNECTIONADDQUEUELISTENERBODY_H -#define QPID_FRAMING_CLUSTERCONNECTIONADDQUEUELISTENERBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterConnectionAddQueueListenerBody : public ModelMethod { - string queue; - uint32_t consumer; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x81; - static const MethodId METHOD_ID = 0x34; - ClusterConnectionAddQueueListenerBody( - ProtocolVersion, const string& _queue, - uint32_t _consumer) : - queue(_queue), - consumer(_consumer), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - } - ClusterConnectionAddQueueListenerBody(ProtocolVersion=ProtocolVersion()) : consumer(0), flags(0) {} - - QPID_COMMON_EXTERN void setQueue(const string& _queue); - QPID_COMMON_EXTERN const string& getQueue() const; - QPID_COMMON_EXTERN bool hasQueue() const; - QPID_COMMON_EXTERN void clearQueueFlag(); - QPID_COMMON_EXTERN void setConsumer(uint32_t _consumer); - QPID_COMMON_EXTERN uint32_t getConsumer() const; - QPID_COMMON_EXTERN bool hasConsumer() const; - QPID_COMMON_EXTERN void clearConsumerFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.addQueueListener(getQueue(), getConsumer()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterConnectionAddQueueListenerBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERCONNECTIONADDQUEUELISTENERBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionAnnounceBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionAnnounceBody.h deleted file mode 100644 index 521f1a389f..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionAnnounceBody.h +++ /dev/null @@ -1,121 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERCONNECTIONANNOUNCEBODY_H -#define QPID_FRAMING_CLUSTERCONNECTIONANNOUNCEBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterConnectionAnnounceBody : public ModelMethod { - string managementId; - uint32_t ssf; - string authid; - string username; - string initialFrames; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x81; - static const MethodId METHOD_ID = 0x1; - ClusterConnectionAnnounceBody( - ProtocolVersion, const string& _managementId, - uint32_t _ssf, - const string& _authid, - bool _nodict, - const string& _username, - const string& _initialFrames) : - managementId(_managementId), - ssf(_ssf), - authid(_authid), - username(_username), - initialFrames(_initialFrames), - flags(0){ - setNodict(_nodict); - flags |= (1 << 8); - flags |= (1 << 9); - flags |= (1 << 10); - flags |= (1 << 12); - flags |= (1 << 13); - } - ClusterConnectionAnnounceBody(ProtocolVersion=ProtocolVersion()) : ssf(0), flags(0) {} - - QPID_COMMON_EXTERN void setManagementId(const string& _managementId); - QPID_COMMON_EXTERN const string& getManagementId() const; - QPID_COMMON_EXTERN bool hasManagementId() const; - QPID_COMMON_EXTERN void clearManagementIdFlag(); - QPID_COMMON_EXTERN void setSsf(uint32_t _ssf); - QPID_COMMON_EXTERN uint32_t getSsf() const; - QPID_COMMON_EXTERN bool hasSsf() const; - QPID_COMMON_EXTERN void clearSsfFlag(); - QPID_COMMON_EXTERN void setAuthid(const string& _authid); - QPID_COMMON_EXTERN const string& getAuthid() const; - QPID_COMMON_EXTERN bool hasAuthid() const; - QPID_COMMON_EXTERN void clearAuthidFlag(); - QPID_COMMON_EXTERN void setNodict(bool _nodict); - QPID_COMMON_EXTERN bool getNodict() const; - QPID_COMMON_EXTERN void setUsername(const string& _username); - QPID_COMMON_EXTERN const string& getUsername() const; - QPID_COMMON_EXTERN bool hasUsername() const; - QPID_COMMON_EXTERN void clearUsernameFlag(); - QPID_COMMON_EXTERN void setInitialFrames(const string& _initialFrames); - QPID_COMMON_EXTERN const string& getInitialFrames() const; - QPID_COMMON_EXTERN bool hasInitialFrames() const; - QPID_COMMON_EXTERN void clearInitialFramesFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.announce(getManagementId(), getSsf(), getAuthid(), getNodict(), getUsername(), getInitialFrames()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterConnectionAnnounceBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERCONNECTIONANNOUNCEBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionConfigBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionConfigBody.h deleted file mode 100644 index 09e6669589..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionConfigBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERCONNECTIONCONFIGBODY_H -#define QPID_FRAMING_CLUSTERCONNECTIONCONFIGBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterConnectionConfigBody : public ModelMethod { - string encoded; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x81; - static const MethodId METHOD_ID = 0x37; - ClusterConnectionConfigBody( - ProtocolVersion, const string& _encoded) : - encoded(_encoded), - flags(0){ - flags |= (1 << 8); - } - ClusterConnectionConfigBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setEncoded(const string& _encoded); - QPID_COMMON_EXTERN const string& getEncoded() const; - QPID_COMMON_EXTERN bool hasEncoded() const; - QPID_COMMON_EXTERN void clearEncodedFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.config(getEncoded()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterConnectionConfigBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERCONNECTIONCONFIGBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionConsumerStateBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionConsumerStateBody.h deleted file mode 100644 index 9b3b07c4ef..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionConsumerStateBody.h +++ /dev/null @@ -1,101 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERCONNECTIONCONSUMERSTATEBODY_H -#define QPID_FRAMING_CLUSTERCONNECTIONCONSUMERSTATEBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterConnectionConsumerStateBody : public ModelMethod { - string name; - SequenceNumber position; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x81; - static const MethodId METHOD_ID = 0x10; - ClusterConnectionConsumerStateBody( - ProtocolVersion, const string& _name, - bool _blocked, - bool _notifyEnabled, - const SequenceNumber& _position) : - name(_name), - position(_position), - flags(0){ - setBlocked(_blocked); - setNotifyEnabled(_notifyEnabled); - flags |= (1 << 8); - flags |= (1 << 11); - } - ClusterConnectionConsumerStateBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setName(const string& _name); - QPID_COMMON_EXTERN const string& getName() const; - QPID_COMMON_EXTERN bool hasName() const; - QPID_COMMON_EXTERN void clearNameFlag(); - QPID_COMMON_EXTERN void setBlocked(bool _blocked); - QPID_COMMON_EXTERN bool getBlocked() const; - QPID_COMMON_EXTERN void setNotifyEnabled(bool _notifyEnabled); - QPID_COMMON_EXTERN bool getNotifyEnabled() const; - QPID_COMMON_EXTERN void setPosition(const SequenceNumber& _position); - QPID_COMMON_EXTERN SequenceNumber getPosition() const; - QPID_COMMON_EXTERN bool hasPosition() const; - QPID_COMMON_EXTERN void clearPositionFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.consumerState(getName(), getBlocked(), getNotifyEnabled(), getPosition()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterConnectionConsumerStateBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERCONNECTIONCONSUMERSTATEBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionDeliverCloseBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionDeliverCloseBody.h deleted file mode 100644 index ef492f4530..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionDeliverCloseBody.h +++ /dev/null @@ -1,74 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERCONNECTIONDELIVERCLOSEBODY_H -#define QPID_FRAMING_CLUSTERCONNECTIONDELIVERCLOSEBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterConnectionDeliverCloseBody : public ModelMethod { - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x81; - static const MethodId METHOD_ID = 0x2; - ClusterConnectionDeliverCloseBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.deliverClose(); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterConnectionDeliverCloseBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERCONNECTIONDELIVERCLOSEBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionDeliverDoOutputBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionDeliverDoOutputBody.h deleted file mode 100644 index 3234e56cd9..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionDeliverDoOutputBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERCONNECTIONDELIVERDOOUTPUTBODY_H -#define QPID_FRAMING_CLUSTERCONNECTIONDELIVERDOOUTPUTBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterConnectionDeliverDoOutputBody : public ModelMethod { - uint32_t limit; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x81; - static const MethodId METHOD_ID = 0x3; - ClusterConnectionDeliverDoOutputBody( - ProtocolVersion, uint32_t _limit) : - limit(_limit), - flags(0){ - flags |= (1 << 8); - } - ClusterConnectionDeliverDoOutputBody(ProtocolVersion=ProtocolVersion()) : limit(0), flags(0) {} - - QPID_COMMON_EXTERN void setLimit(uint32_t _limit); - QPID_COMMON_EXTERN uint32_t getLimit() const; - QPID_COMMON_EXTERN bool hasLimit() const; - QPID_COMMON_EXTERN void clearLimitFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.deliverDoOutput(getLimit()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterConnectionDeliverDoOutputBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERCONNECTIONDELIVERDOOUTPUTBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionDeliveryRecordBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionDeliveryRecordBody.h deleted file mode 100644 index 5f62d5932c..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionDeliveryRecordBody.h +++ /dev/null @@ -1,145 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERCONNECTIONDELIVERYRECORDBODY_H -#define QPID_FRAMING_CLUSTERCONNECTIONDELIVERYRECORDBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterConnectionDeliveryRecordBody : public ModelMethod { - string queue; - SequenceNumber position; - string tag; - SequenceNumber id; - uint32_t credit; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x81; - static const MethodId METHOD_ID = 0x11; - ClusterConnectionDeliveryRecordBody( - ProtocolVersion, const string& _queue, - const SequenceNumber& _position, - const string& _tag, - const SequenceNumber& _id, - bool _acquired, - bool _accepted, - bool _cancelled, - bool _completed, - bool _ended, - bool _windowing, - bool _enqueued, - uint32_t _credit) : - queue(_queue), - position(_position), - tag(_tag), - id(_id), - credit(_credit), - flags(0){ - setAcquired(_acquired); - setAccepted(_accepted); - setCancelled(_cancelled); - setCompleted(_completed); - setEnded(_ended); - setWindowing(_windowing); - setEnqueued(_enqueued); - flags |= (1 << 8); - flags |= (1 << 9); - flags |= (1 << 10); - flags |= (1 << 11); - flags |= (1 << 3); - } - ClusterConnectionDeliveryRecordBody(ProtocolVersion=ProtocolVersion()) : credit(0), flags(0) {} - - QPID_COMMON_EXTERN void setQueue(const string& _queue); - QPID_COMMON_EXTERN const string& getQueue() const; - QPID_COMMON_EXTERN bool hasQueue() const; - QPID_COMMON_EXTERN void clearQueueFlag(); - QPID_COMMON_EXTERN void setPosition(const SequenceNumber& _position); - QPID_COMMON_EXTERN SequenceNumber getPosition() const; - QPID_COMMON_EXTERN bool hasPosition() const; - QPID_COMMON_EXTERN void clearPositionFlag(); - QPID_COMMON_EXTERN void setTag(const string& _tag); - QPID_COMMON_EXTERN const string& getTag() const; - QPID_COMMON_EXTERN bool hasTag() const; - QPID_COMMON_EXTERN void clearTagFlag(); - QPID_COMMON_EXTERN void setId(const SequenceNumber& _id); - QPID_COMMON_EXTERN SequenceNumber getId() const; - QPID_COMMON_EXTERN bool hasId() const; - QPID_COMMON_EXTERN void clearIdFlag(); - QPID_COMMON_EXTERN void setAcquired(bool _acquired); - QPID_COMMON_EXTERN bool getAcquired() const; - QPID_COMMON_EXTERN void setAccepted(bool _accepted); - QPID_COMMON_EXTERN bool getAccepted() const; - QPID_COMMON_EXTERN void setCancelled(bool _cancelled); - QPID_COMMON_EXTERN bool getCancelled() const; - QPID_COMMON_EXTERN void setCompleted(bool _completed); - QPID_COMMON_EXTERN bool getCompleted() const; - QPID_COMMON_EXTERN void setEnded(bool _ended); - QPID_COMMON_EXTERN bool getEnded() const; - QPID_COMMON_EXTERN void setWindowing(bool _windowing); - QPID_COMMON_EXTERN bool getWindowing() const; - QPID_COMMON_EXTERN void setEnqueued(bool _enqueued); - QPID_COMMON_EXTERN bool getEnqueued() const; - QPID_COMMON_EXTERN void setCredit(uint32_t _credit); - QPID_COMMON_EXTERN uint32_t getCredit() const; - QPID_COMMON_EXTERN bool hasCredit() const; - QPID_COMMON_EXTERN void clearCreditFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.deliveryRecord(getQueue(), getPosition(), getTag(), getId(), getAcquired(), getAccepted(), getCancelled(), getCompleted(), getEnded(), getWindowing(), getEnqueued(), getCredit()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterConnectionDeliveryRecordBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERCONNECTIONDELIVERYRECORDBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionExchangeBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionExchangeBody.h deleted file mode 100644 index 099de73904..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionExchangeBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERCONNECTIONEXCHANGEBODY_H -#define QPID_FRAMING_CLUSTERCONNECTIONEXCHANGEBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterConnectionExchangeBody : public ModelMethod { - string encoded; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x81; - static const MethodId METHOD_ID = 0x31; - ClusterConnectionExchangeBody( - ProtocolVersion, const string& _encoded) : - encoded(_encoded), - flags(0){ - flags |= (1 << 8); - } - ClusterConnectionExchangeBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setEncoded(const string& _encoded); - QPID_COMMON_EXTERN const string& getEncoded() const; - QPID_COMMON_EXTERN bool hasEncoded() const; - QPID_COMMON_EXTERN void clearEncodedFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.exchange(getEncoded()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterConnectionExchangeBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERCONNECTIONEXCHANGEBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionExpiryIdBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionExpiryIdBody.h deleted file mode 100644 index 70a060aa59..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionExpiryIdBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERCONNECTIONEXPIRYIDBODY_H -#define QPID_FRAMING_CLUSTERCONNECTIONEXPIRYIDBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterConnectionExpiryIdBody : public ModelMethod { - uint64_t expiryId; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x81; - static const MethodId METHOD_ID = 0x33; - ClusterConnectionExpiryIdBody( - ProtocolVersion, uint64_t _expiryId) : - expiryId(_expiryId), - flags(0){ - flags |= (1 << 8); - } - ClusterConnectionExpiryIdBody(ProtocolVersion=ProtocolVersion()) : expiryId(0), flags(0) {} - - QPID_COMMON_EXTERN void setExpiryId(uint64_t _expiryId); - QPID_COMMON_EXTERN uint64_t getExpiryId() const; - QPID_COMMON_EXTERN bool hasExpiryId() const; - QPID_COMMON_EXTERN void clearExpiryIdFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.expiryId(getExpiryId()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterConnectionExpiryIdBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERCONNECTIONEXPIRYIDBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionManagementSetupStateBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionManagementSetupStateBody.h deleted file mode 100644 index 78a1cdea1d..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionManagementSetupStateBody.h +++ /dev/null @@ -1,125 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERCONNECTIONMANAGEMENTSETUPSTATEBODY_H -#define QPID_FRAMING_CLUSTERCONNECTIONMANAGEMENTSETUPSTATEBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterConnectionManagementSetupStateBody : public ModelMethod { - uint64_t objectNum; - uint16_t bootSequence; - Uuid brokerId; - string vendor; - string product; - string instance; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x81; - static const MethodId METHOD_ID = 0x36; - ClusterConnectionManagementSetupStateBody( - ProtocolVersion, uint64_t _objectNum, - uint16_t _bootSequence, - const Uuid& _brokerId, - const string& _vendor, - const string& _product, - const string& _instance) : - objectNum(_objectNum), - bootSequence(_bootSequence), - brokerId(_brokerId), - vendor(_vendor), - product(_product), - instance(_instance), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - flags |= (1 << 10); - flags |= (1 << 11); - flags |= (1 << 12); - flags |= (1 << 13); - } - ClusterConnectionManagementSetupStateBody(ProtocolVersion=ProtocolVersion()) : objectNum(0), bootSequence(0), flags(0) {} - - QPID_COMMON_EXTERN void setObjectNum(uint64_t _objectNum); - QPID_COMMON_EXTERN uint64_t getObjectNum() const; - QPID_COMMON_EXTERN bool hasObjectNum() const; - QPID_COMMON_EXTERN void clearObjectNumFlag(); - QPID_COMMON_EXTERN void setBootSequence(uint16_t _bootSequence); - QPID_COMMON_EXTERN uint16_t getBootSequence() const; - QPID_COMMON_EXTERN bool hasBootSequence() const; - QPID_COMMON_EXTERN void clearBootSequenceFlag(); - QPID_COMMON_EXTERN void setBrokerId(const Uuid& _brokerId); - QPID_COMMON_EXTERN const Uuid& getBrokerId() const; - QPID_COMMON_EXTERN bool hasBrokerId() const; - QPID_COMMON_EXTERN void clearBrokerIdFlag(); - QPID_COMMON_EXTERN void setVendor(const string& _vendor); - QPID_COMMON_EXTERN const string& getVendor() const; - QPID_COMMON_EXTERN bool hasVendor() const; - QPID_COMMON_EXTERN void clearVendorFlag(); - QPID_COMMON_EXTERN void setProduct(const string& _product); - QPID_COMMON_EXTERN const string& getProduct() const; - QPID_COMMON_EXTERN bool hasProduct() const; - QPID_COMMON_EXTERN void clearProductFlag(); - QPID_COMMON_EXTERN void setInstance(const string& _instance); - QPID_COMMON_EXTERN const string& getInstance() const; - QPID_COMMON_EXTERN bool hasInstance() const; - QPID_COMMON_EXTERN void clearInstanceFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.managementSetupState(getObjectNum(), getBootSequence(), getBrokerId(), getVendor(), getProduct(), getInstance()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterConnectionManagementSetupStateBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERCONNECTIONMANAGEMENTSETUPSTATEBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionMembershipBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionMembershipBody.h deleted file mode 100644 index 4c0bde6fda..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionMembershipBody.h +++ /dev/null @@ -1,103 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERCONNECTIONMEMBERSHIPBODY_H -#define QPID_FRAMING_CLUSTERCONNECTIONMEMBERSHIPBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterConnectionMembershipBody : public ModelMethod { - FieldTable joiners; - FieldTable members; - SequenceNumber frameSeq; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x81; - static const MethodId METHOD_ID = 0x21; - ClusterConnectionMembershipBody( - ProtocolVersion, const FieldTable& _joiners, - const FieldTable& _members, - const SequenceNumber& _frameSeq) : - joiners(_joiners), - members(_members), - frameSeq(_frameSeq), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - flags |= (1 << 10); - } - ClusterConnectionMembershipBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setJoiners(const FieldTable& _joiners); - QPID_COMMON_EXTERN const FieldTable& getJoiners() const; - QPID_COMMON_EXTERN FieldTable& getJoiners(); - QPID_COMMON_EXTERN bool hasJoiners() const; - QPID_COMMON_EXTERN void clearJoinersFlag(); - QPID_COMMON_EXTERN void setMembers(const FieldTable& _members); - QPID_COMMON_EXTERN const FieldTable& getMembers() const; - QPID_COMMON_EXTERN FieldTable& getMembers(); - QPID_COMMON_EXTERN bool hasMembers() const; - QPID_COMMON_EXTERN void clearMembersFlag(); - QPID_COMMON_EXTERN void setFrameSeq(const SequenceNumber& _frameSeq); - QPID_COMMON_EXTERN SequenceNumber getFrameSeq() const; - QPID_COMMON_EXTERN bool hasFrameSeq() const; - QPID_COMMON_EXTERN void clearFrameSeqFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.membership(getJoiners(), getMembers(), getFrameSeq()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterConnectionMembershipBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERCONNECTIONMEMBERSHIPBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionOutputTaskBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionOutputTaskBody.h deleted file mode 100644 index 56f7eed48f..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionOutputTaskBody.h +++ /dev/null @@ -1,93 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERCONNECTIONOUTPUTTASKBODY_H -#define QPID_FRAMING_CLUSTERCONNECTIONOUTPUTTASKBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterConnectionOutputTaskBody : public ModelMethod { - uint16_t channel; - string name; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x81; - static const MethodId METHOD_ID = 0x19; - ClusterConnectionOutputTaskBody( - ProtocolVersion, uint16_t _channel, - const string& _name) : - channel(_channel), - name(_name), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - } - ClusterConnectionOutputTaskBody(ProtocolVersion=ProtocolVersion()) : channel(0), flags(0) {} - - QPID_COMMON_EXTERN void setChannel(uint16_t _channel); - QPID_COMMON_EXTERN uint16_t getChannel() const; - QPID_COMMON_EXTERN bool hasChannel() const; - QPID_COMMON_EXTERN void clearChannelFlag(); - QPID_COMMON_EXTERN void setName(const string& _name); - QPID_COMMON_EXTERN const string& getName() const; - QPID_COMMON_EXTERN bool hasName() const; - QPID_COMMON_EXTERN void clearNameFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.outputTask(getChannel(), getName()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterConnectionOutputTaskBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERCONNECTIONOUTPUTTASKBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionQueueBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionQueueBody.h deleted file mode 100644 index 1c69a85724..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionQueueBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERCONNECTIONQUEUEBODY_H -#define QPID_FRAMING_CLUSTERCONNECTIONQUEUEBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterConnectionQueueBody : public ModelMethod { - string encoded; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x81; - static const MethodId METHOD_ID = 0x32; - ClusterConnectionQueueBody( - ProtocolVersion, const string& _encoded) : - encoded(_encoded), - flags(0){ - flags |= (1 << 8); - } - ClusterConnectionQueueBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setEncoded(const string& _encoded); - QPID_COMMON_EXTERN const string& getEncoded() const; - QPID_COMMON_EXTERN bool hasEncoded() const; - QPID_COMMON_EXTERN void clearEncodedFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.queue(getEncoded()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterConnectionQueueBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERCONNECTIONQUEUEBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionQueuePositionBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionQueuePositionBody.h deleted file mode 100644 index 8ac828bb3c..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionQueuePositionBody.h +++ /dev/null @@ -1,93 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERCONNECTIONQUEUEPOSITIONBODY_H -#define QPID_FRAMING_CLUSTERCONNECTIONQUEUEPOSITIONBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterConnectionQueuePositionBody : public ModelMethod { - string queue; - SequenceNumber position; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x81; - static const MethodId METHOD_ID = 0x30; - ClusterConnectionQueuePositionBody( - ProtocolVersion, const string& _queue, - const SequenceNumber& _position) : - queue(_queue), - position(_position), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - } - ClusterConnectionQueuePositionBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setQueue(const string& _queue); - QPID_COMMON_EXTERN const string& getQueue() const; - QPID_COMMON_EXTERN bool hasQueue() const; - QPID_COMMON_EXTERN void clearQueueFlag(); - QPID_COMMON_EXTERN void setPosition(const SequenceNumber& _position); - QPID_COMMON_EXTERN SequenceNumber getPosition() const; - QPID_COMMON_EXTERN bool hasPosition() const; - QPID_COMMON_EXTERN void clearPositionFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.queuePosition(getQueue(), getPosition()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterConnectionQueuePositionBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERCONNECTIONQUEUEPOSITIONBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionRetractOfferBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionRetractOfferBody.h deleted file mode 100644 index f7409ad104..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionRetractOfferBody.h +++ /dev/null @@ -1,74 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERCONNECTIONRETRACTOFFERBODY_H -#define QPID_FRAMING_CLUSTERCONNECTIONRETRACTOFFERBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterConnectionRetractOfferBody : public ModelMethod { - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x81; - static const MethodId METHOD_ID = 0x22; - ClusterConnectionRetractOfferBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.retractOffer(); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterConnectionRetractOfferBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERCONNECTIONRETRACTOFFERBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionSessionStateBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionSessionStateBody.h deleted file mode 100644 index 3cffedd1ad..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionSessionStateBody.h +++ /dev/null @@ -1,133 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERCONNECTIONSESSIONSTATEBODY_H -#define QPID_FRAMING_CLUSTERCONNECTIONSESSIONSTATEBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterConnectionSessionStateBody : public ModelMethod { - SequenceNumber replayStart; - SequenceNumber commandPoint; - SequenceSet sentIncomplete; - SequenceNumber expected; - SequenceNumber received; - SequenceSet unknownCompleted; - SequenceSet receivedIncomplete; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x81; - static const MethodId METHOD_ID = 0x1F; - ClusterConnectionSessionStateBody( - ProtocolVersion, const SequenceNumber& _replayStart, - const SequenceNumber& _commandPoint, - const SequenceSet& _sentIncomplete, - const SequenceNumber& _expected, - const SequenceNumber& _received, - const SequenceSet& _unknownCompleted, - const SequenceSet& _receivedIncomplete) : - replayStart(_replayStart), - commandPoint(_commandPoint), - sentIncomplete(_sentIncomplete), - expected(_expected), - received(_received), - unknownCompleted(_unknownCompleted), - receivedIncomplete(_receivedIncomplete), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - flags |= (1 << 10); - flags |= (1 << 11); - flags |= (1 << 12); - flags |= (1 << 13); - flags |= (1 << 14); - } - ClusterConnectionSessionStateBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setReplayStart(const SequenceNumber& _replayStart); - QPID_COMMON_EXTERN SequenceNumber getReplayStart() const; - QPID_COMMON_EXTERN bool hasReplayStart() const; - QPID_COMMON_EXTERN void clearReplayStartFlag(); - QPID_COMMON_EXTERN void setCommandPoint(const SequenceNumber& _commandPoint); - QPID_COMMON_EXTERN SequenceNumber getCommandPoint() const; - QPID_COMMON_EXTERN bool hasCommandPoint() const; - QPID_COMMON_EXTERN void clearCommandPointFlag(); - QPID_COMMON_EXTERN void setSentIncomplete(const SequenceSet& _sentIncomplete); - QPID_COMMON_EXTERN const SequenceSet& getSentIncomplete() const; - QPID_COMMON_EXTERN bool hasSentIncomplete() const; - QPID_COMMON_EXTERN void clearSentIncompleteFlag(); - QPID_COMMON_EXTERN void setExpected(const SequenceNumber& _expected); - QPID_COMMON_EXTERN SequenceNumber getExpected() const; - QPID_COMMON_EXTERN bool hasExpected() const; - QPID_COMMON_EXTERN void clearExpectedFlag(); - QPID_COMMON_EXTERN void setReceived(const SequenceNumber& _received); - QPID_COMMON_EXTERN SequenceNumber getReceived() const; - QPID_COMMON_EXTERN bool hasReceived() const; - QPID_COMMON_EXTERN void clearReceivedFlag(); - QPID_COMMON_EXTERN void setUnknownCompleted(const SequenceSet& _unknownCompleted); - QPID_COMMON_EXTERN const SequenceSet& getUnknownCompleted() const; - QPID_COMMON_EXTERN bool hasUnknownCompleted() const; - QPID_COMMON_EXTERN void clearUnknownCompletedFlag(); - QPID_COMMON_EXTERN void setReceivedIncomplete(const SequenceSet& _receivedIncomplete); - QPID_COMMON_EXTERN const SequenceSet& getReceivedIncomplete() const; - QPID_COMMON_EXTERN bool hasReceivedIncomplete() const; - QPID_COMMON_EXTERN void clearReceivedIncompleteFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.sessionState(getReplayStart(), getCommandPoint(), getSentIncomplete(), getExpected(), getReceived(), getUnknownCompleted(), getReceivedIncomplete()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterConnectionSessionStateBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERCONNECTIONSESSIONSTATEBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionShadowPrepareBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionShadowPrepareBody.h deleted file mode 100644 index f60798b88c..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionShadowPrepareBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERCONNECTIONSHADOWPREPAREBODY_H -#define QPID_FRAMING_CLUSTERCONNECTIONSHADOWPREPAREBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterConnectionShadowPrepareBody : public ModelMethod { - string managementId; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x81; - static const MethodId METHOD_ID = 0x0F; - ClusterConnectionShadowPrepareBody( - ProtocolVersion, const string& _managementId) : - managementId(_managementId), - flags(0){ - flags |= (1 << 8); - } - ClusterConnectionShadowPrepareBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setManagementId(const string& _managementId); - QPID_COMMON_EXTERN const string& getManagementId() const; - QPID_COMMON_EXTERN bool hasManagementId() const; - QPID_COMMON_EXTERN void clearManagementIdFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.shadowPrepare(getManagementId()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterConnectionShadowPrepareBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERCONNECTIONSHADOWPREPAREBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionShadowReadyBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionShadowReadyBody.h deleted file mode 100644 index cee8b17d71..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionShadowReadyBody.h +++ /dev/null @@ -1,125 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERCONNECTIONSHADOWREADYBODY_H -#define QPID_FRAMING_CLUSTERCONNECTIONSHADOWREADYBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterConnectionShadowReadyBody : public ModelMethod { - uint64_t memberId; - uint64_t connectionId; - string managementId; - string userName; - string fragment; - uint32_t sendMax; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x81; - static const MethodId METHOD_ID = 0x20; - ClusterConnectionShadowReadyBody( - ProtocolVersion, uint64_t _memberId, - uint64_t _connectionId, - const string& _managementId, - const string& _userName, - const string& _fragment, - uint32_t _sendMax) : - memberId(_memberId), - connectionId(_connectionId), - managementId(_managementId), - userName(_userName), - fragment(_fragment), - sendMax(_sendMax), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - flags |= (1 << 10); - flags |= (1 << 11); - flags |= (1 << 12); - flags |= (1 << 13); - } - ClusterConnectionShadowReadyBody(ProtocolVersion=ProtocolVersion()) : memberId(0), connectionId(0), sendMax(0), flags(0) {} - - QPID_COMMON_EXTERN void setMemberId(uint64_t _memberId); - QPID_COMMON_EXTERN uint64_t getMemberId() const; - QPID_COMMON_EXTERN bool hasMemberId() const; - QPID_COMMON_EXTERN void clearMemberIdFlag(); - QPID_COMMON_EXTERN void setConnectionId(uint64_t _connectionId); - QPID_COMMON_EXTERN uint64_t getConnectionId() const; - QPID_COMMON_EXTERN bool hasConnectionId() const; - QPID_COMMON_EXTERN void clearConnectionIdFlag(); - QPID_COMMON_EXTERN void setManagementId(const string& _managementId); - QPID_COMMON_EXTERN const string& getManagementId() const; - QPID_COMMON_EXTERN bool hasManagementId() const; - QPID_COMMON_EXTERN void clearManagementIdFlag(); - QPID_COMMON_EXTERN void setUserName(const string& _userName); - QPID_COMMON_EXTERN const string& getUserName() const; - QPID_COMMON_EXTERN bool hasUserName() const; - QPID_COMMON_EXTERN void clearUserNameFlag(); - QPID_COMMON_EXTERN void setFragment(const string& _fragment); - QPID_COMMON_EXTERN const string& getFragment() const; - QPID_COMMON_EXTERN bool hasFragment() const; - QPID_COMMON_EXTERN void clearFragmentFlag(); - QPID_COMMON_EXTERN void setSendMax(uint32_t _sendMax); - QPID_COMMON_EXTERN uint32_t getSendMax() const; - QPID_COMMON_EXTERN bool hasSendMax() const; - QPID_COMMON_EXTERN void clearSendMaxFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.shadowReady(getMemberId(), getConnectionId(), getManagementId(), getUserName(), getFragment(), getSendMax()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterConnectionShadowReadyBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERCONNECTIONSHADOWREADYBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionShadowSetUserBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionShadowSetUserBody.h deleted file mode 100644 index e53a0a2ad3..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionShadowSetUserBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERCONNECTIONSHADOWSETUSERBODY_H -#define QPID_FRAMING_CLUSTERCONNECTIONSHADOWSETUSERBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterConnectionShadowSetUserBody : public ModelMethod { - string userId; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x81; - static const MethodId METHOD_ID = 0x0E; - ClusterConnectionShadowSetUserBody( - ProtocolVersion, const string& _userId) : - userId(_userId), - flags(0){ - flags |= (1 << 8); - } - ClusterConnectionShadowSetUserBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setUserId(const string& _userId); - QPID_COMMON_EXTERN const string& getUserId() const; - QPID_COMMON_EXTERN bool hasUserId() const; - QPID_COMMON_EXTERN void clearUserIdFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.shadowSetUser(getUserId()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterConnectionShadowSetUserBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERCONNECTIONSHADOWSETUSERBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionTxAcceptBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionTxAcceptBody.h deleted file mode 100644 index 7c78c1cb7d..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionTxAcceptBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERCONNECTIONTXACCEPTBODY_H -#define QPID_FRAMING_CLUSTERCONNECTIONTXACCEPTBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterConnectionTxAcceptBody : public ModelMethod { - SequenceSet commands; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x81; - static const MethodId METHOD_ID = 0x13; - ClusterConnectionTxAcceptBody( - ProtocolVersion, const SequenceSet& _commands) : - commands(_commands), - flags(0){ - flags |= (1 << 8); - } - ClusterConnectionTxAcceptBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setCommands(const SequenceSet& _commands); - QPID_COMMON_EXTERN const SequenceSet& getCommands() const; - QPID_COMMON_EXTERN bool hasCommands() const; - QPID_COMMON_EXTERN void clearCommandsFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.txAccept(getCommands()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterConnectionTxAcceptBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERCONNECTIONTXACCEPTBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionTxDequeueBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionTxDequeueBody.h deleted file mode 100644 index dbf2d82c11..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionTxDequeueBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERCONNECTIONTXDEQUEUEBODY_H -#define QPID_FRAMING_CLUSTERCONNECTIONTXDEQUEUEBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterConnectionTxDequeueBody : public ModelMethod { - string queue; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x81; - static const MethodId METHOD_ID = 0x14; - ClusterConnectionTxDequeueBody( - ProtocolVersion, const string& _queue) : - queue(_queue), - flags(0){ - flags |= (1 << 8); - } - ClusterConnectionTxDequeueBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setQueue(const string& _queue); - QPID_COMMON_EXTERN const string& getQueue() const; - QPID_COMMON_EXTERN bool hasQueue() const; - QPID_COMMON_EXTERN void clearQueueFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.txDequeue(getQueue()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterConnectionTxDequeueBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERCONNECTIONTXDEQUEUEBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionTxEndBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionTxEndBody.h deleted file mode 100644 index d3ec3cfb93..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionTxEndBody.h +++ /dev/null @@ -1,74 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERCONNECTIONTXENDBODY_H -#define QPID_FRAMING_CLUSTERCONNECTIONTXENDBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterConnectionTxEndBody : public ModelMethod { - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x81; - static const MethodId METHOD_ID = 0x17; - ClusterConnectionTxEndBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.txEnd(); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterConnectionTxEndBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERCONNECTIONTXENDBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionTxEnqueueBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionTxEnqueueBody.h deleted file mode 100644 index d5fbe408d8..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionTxEnqueueBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERCONNECTIONTXENQUEUEBODY_H -#define QPID_FRAMING_CLUSTERCONNECTIONTXENQUEUEBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterConnectionTxEnqueueBody : public ModelMethod { - string queue; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x81; - static const MethodId METHOD_ID = 0x15; - ClusterConnectionTxEnqueueBody( - ProtocolVersion, const string& _queue) : - queue(_queue), - flags(0){ - flags |= (1 << 8); - } - ClusterConnectionTxEnqueueBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setQueue(const string& _queue); - QPID_COMMON_EXTERN const string& getQueue() const; - QPID_COMMON_EXTERN bool hasQueue() const; - QPID_COMMON_EXTERN void clearQueueFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.txEnqueue(getQueue()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterConnectionTxEnqueueBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERCONNECTIONTXENQUEUEBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionTxPublishBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionTxPublishBody.h deleted file mode 100644 index 6548b69fc5..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionTxPublishBody.h +++ /dev/null @@ -1,89 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERCONNECTIONTXPUBLISHBODY_H -#define QPID_FRAMING_CLUSTERCONNECTIONTXPUBLISHBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterConnectionTxPublishBody : public ModelMethod { - Array queues; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x81; - static const MethodId METHOD_ID = 0x16; - ClusterConnectionTxPublishBody( - ProtocolVersion, const Array& _queues, - bool _delivered) : - queues(_queues), - flags(0){ - setDelivered(_delivered); - flags |= (1 << 8); - } - ClusterConnectionTxPublishBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setQueues(const Array& _queues); - QPID_COMMON_EXTERN const Array& getQueues() const; - QPID_COMMON_EXTERN bool hasQueues() const; - QPID_COMMON_EXTERN void clearQueuesFlag(); - QPID_COMMON_EXTERN void setDelivered(bool _delivered); - QPID_COMMON_EXTERN bool getDelivered() const; - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.txPublish(getQueues(), getDelivered()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterConnectionTxPublishBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERCONNECTIONTXPUBLISHBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionTxStartBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionTxStartBody.h deleted file mode 100644 index cb8ac7ac9d..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterConnectionTxStartBody.h +++ /dev/null @@ -1,74 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERCONNECTIONTXSTARTBODY_H -#define QPID_FRAMING_CLUSTERCONNECTIONTXSTARTBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterConnectionTxStartBody : public ModelMethod { - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x81; - static const MethodId METHOD_ID = 0x12; - ClusterConnectionTxStartBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.txStart(); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterConnectionTxStartBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERCONNECTIONTXSTARTBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterDeliverToQueueBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterDeliverToQueueBody.h deleted file mode 100644 index 3a66e141a2..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterDeliverToQueueBody.h +++ /dev/null @@ -1,93 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERDELIVERTOQUEUEBODY_H -#define QPID_FRAMING_CLUSTERDELIVERTOQUEUEBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterDeliverToQueueBody : public ModelMethod { - string queue; - string message; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x80; - static const MethodId METHOD_ID = 0x21; - ClusterDeliverToQueueBody( - ProtocolVersion, const string& _queue, - const string& _message) : - queue(_queue), - message(_message), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - } - ClusterDeliverToQueueBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setQueue(const string& _queue); - QPID_COMMON_EXTERN const string& getQueue() const; - QPID_COMMON_EXTERN bool hasQueue() const; - QPID_COMMON_EXTERN void clearQueueFlag(); - QPID_COMMON_EXTERN void setMessage(const string& _message); - QPID_COMMON_EXTERN const string& getMessage() const; - QPID_COMMON_EXTERN bool hasMessage() const; - QPID_COMMON_EXTERN void clearMessageFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.deliverToQueue(getQueue(), getMessage()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterDeliverToQueueBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERDELIVERTOQUEUEBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterErrorCheckBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterErrorCheckBody.h deleted file mode 100644 index 201a8a55eb..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterErrorCheckBody.h +++ /dev/null @@ -1,93 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERERRORCHECKBODY_H -#define QPID_FRAMING_CLUSTERERRORCHECKBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterErrorCheckBody : public ModelMethod { - uint8_t type; - SequenceNumber frameSeq; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x80; - static const MethodId METHOD_ID = 0x14; - ClusterErrorCheckBody( - ProtocolVersion, uint8_t _type, - const SequenceNumber& _frameSeq) : - type(_type), - frameSeq(_frameSeq), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - } - ClusterErrorCheckBody(ProtocolVersion=ProtocolVersion()) : type(0), flags(0) {} - - QPID_COMMON_EXTERN void setType(uint8_t _type); - QPID_COMMON_EXTERN uint8_t getType() const; - QPID_COMMON_EXTERN bool hasType() const; - QPID_COMMON_EXTERN void clearTypeFlag(); - QPID_COMMON_EXTERN void setFrameSeq(const SequenceNumber& _frameSeq); - QPID_COMMON_EXTERN SequenceNumber getFrameSeq() const; - QPID_COMMON_EXTERN bool hasFrameSeq() const; - QPID_COMMON_EXTERN void clearFrameSeqFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.errorCheck(getType(), getFrameSeq()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterErrorCheckBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERERRORCHECKBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterInitialStatusBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterInitialStatusBody.h deleted file mode 100644 index 985706c5ea..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterInitialStatusBody.h +++ /dev/null @@ -1,121 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERINITIALSTATUSBODY_H -#define QPID_FRAMING_CLUSTERINITIALSTATUSBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterInitialStatusBody : public ModelMethod { - uint32_t version; - Uuid clusterId; - uint8_t storeState; - Uuid shutdownId; - string firstConfig; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x80; - static const MethodId METHOD_ID = 0x5; - ClusterInitialStatusBody( - ProtocolVersion, uint32_t _version, - bool _active, - const Uuid& _clusterId, - uint8_t _storeState, - const Uuid& _shutdownId, - const string& _firstConfig) : - version(_version), - clusterId(_clusterId), - storeState(_storeState), - shutdownId(_shutdownId), - firstConfig(_firstConfig), - flags(0){ - setActive(_active); - flags |= (1 << 8); - flags |= (1 << 10); - flags |= (1 << 11); - flags |= (1 << 12); - flags |= (1 << 13); - } - ClusterInitialStatusBody(ProtocolVersion=ProtocolVersion()) : version(0), storeState(0), flags(0) {} - - QPID_COMMON_EXTERN void setVersion(uint32_t _version); - QPID_COMMON_EXTERN uint32_t getVersion() const; - QPID_COMMON_EXTERN bool hasVersion() const; - QPID_COMMON_EXTERN void clearVersionFlag(); - QPID_COMMON_EXTERN void setActive(bool _active); - QPID_COMMON_EXTERN bool getActive() const; - QPID_COMMON_EXTERN void setClusterId(const Uuid& _clusterId); - QPID_COMMON_EXTERN const Uuid& getClusterId() const; - QPID_COMMON_EXTERN bool hasClusterId() const; - QPID_COMMON_EXTERN void clearClusterIdFlag(); - QPID_COMMON_EXTERN void setStoreState(uint8_t _storeState); - QPID_COMMON_EXTERN uint8_t getStoreState() const; - QPID_COMMON_EXTERN bool hasStoreState() const; - QPID_COMMON_EXTERN void clearStoreStateFlag(); - QPID_COMMON_EXTERN void setShutdownId(const Uuid& _shutdownId); - QPID_COMMON_EXTERN const Uuid& getShutdownId() const; - QPID_COMMON_EXTERN bool hasShutdownId() const; - QPID_COMMON_EXTERN void clearShutdownIdFlag(); - QPID_COMMON_EXTERN void setFirstConfig(const string& _firstConfig); - QPID_COMMON_EXTERN const string& getFirstConfig() const; - QPID_COMMON_EXTERN bool hasFirstConfig() const; - QPID_COMMON_EXTERN void clearFirstConfigFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.initialStatus(getVersion(), getActive(), getClusterId(), getStoreState(), getShutdownId(), getFirstConfig()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterInitialStatusBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERINITIALSTATUSBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterMessageExpiredBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterMessageExpiredBody.h deleted file mode 100644 index 85343558aa..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterMessageExpiredBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERMESSAGEEXPIREDBODY_H -#define QPID_FRAMING_CLUSTERMESSAGEEXPIREDBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterMessageExpiredBody : public ModelMethod { - uint64_t id; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x80; - static const MethodId METHOD_ID = 0x12; - ClusterMessageExpiredBody( - ProtocolVersion, uint64_t _id) : - id(_id), - flags(0){ - flags |= (1 << 8); - } - ClusterMessageExpiredBody(ProtocolVersion=ProtocolVersion()) : id(0), flags(0) {} - - QPID_COMMON_EXTERN void setId(uint64_t _id); - QPID_COMMON_EXTERN uint64_t getId() const; - QPID_COMMON_EXTERN bool hasId() const; - QPID_COMMON_EXTERN void clearIdFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.messageExpired(getId()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterMessageExpiredBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERMESSAGEEXPIREDBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterReadyBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterReadyBody.h deleted file mode 100644 index e3f8d2d582..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterReadyBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERREADYBODY_H -#define QPID_FRAMING_CLUSTERREADYBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterReadyBody : public ModelMethod { - string url; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x80; - static const MethodId METHOD_ID = 0x10; - ClusterReadyBody( - ProtocolVersion, const string& _url) : - url(_url), - flags(0){ - flags |= (1 << 8); - } - ClusterReadyBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setUrl(const string& _url); - QPID_COMMON_EXTERN const string& getUrl() const; - QPID_COMMON_EXTERN bool hasUrl() const; - QPID_COMMON_EXTERN void clearUrlFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.ready(getUrl()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterReadyBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERREADYBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterRetractOfferBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterRetractOfferBody.h deleted file mode 100644 index a45e8f4b4a..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterRetractOfferBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERRETRACTOFFERBODY_H -#define QPID_FRAMING_CLUSTERRETRACTOFFERBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterRetractOfferBody : public ModelMethod { - uint64_t updatee; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x80; - static const MethodId METHOD_ID = 0x3; - ClusterRetractOfferBody( - ProtocolVersion, uint64_t _updatee) : - updatee(_updatee), - flags(0){ - flags |= (1 << 8); - } - ClusterRetractOfferBody(ProtocolVersion=ProtocolVersion()) : updatee(0), flags(0) {} - - QPID_COMMON_EXTERN void setUpdatee(uint64_t _updatee); - QPID_COMMON_EXTERN uint64_t getUpdatee() const; - QPID_COMMON_EXTERN bool hasUpdatee() const; - QPID_COMMON_EXTERN void clearUpdateeFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.retractOffer(getUpdatee()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterRetractOfferBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERRETRACTOFFERBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterShutdownBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterShutdownBody.h deleted file mode 100644 index 212e7f50a3..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterShutdownBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERSHUTDOWNBODY_H -#define QPID_FRAMING_CLUSTERSHUTDOWNBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterShutdownBody : public ModelMethod { - Uuid shutdownId; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x80; - static const MethodId METHOD_ID = 0x20; - ClusterShutdownBody( - ProtocolVersion, const Uuid& _shutdownId) : - shutdownId(_shutdownId), - flags(0){ - flags |= (1 << 8); - } - ClusterShutdownBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setShutdownId(const Uuid& _shutdownId); - QPID_COMMON_EXTERN const Uuid& getShutdownId() const; - QPID_COMMON_EXTERN bool hasShutdownId() const; - QPID_COMMON_EXTERN void clearShutdownIdFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.shutdown(getShutdownId()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterShutdownBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERSHUTDOWNBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterTimerDropBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterTimerDropBody.h deleted file mode 100644 index ecb2eda4f9..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterTimerDropBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERTIMERDROPBODY_H -#define QPID_FRAMING_CLUSTERTIMERDROPBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterTimerDropBody : public ModelMethod { - string name; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x80; - static const MethodId METHOD_ID = 0x16; - ClusterTimerDropBody( - ProtocolVersion, const string& _name) : - name(_name), - flags(0){ - flags |= (1 << 8); - } - ClusterTimerDropBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setName(const string& _name); - QPID_COMMON_EXTERN const string& getName() const; - QPID_COMMON_EXTERN bool hasName() const; - QPID_COMMON_EXTERN void clearNameFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.timerDrop(getName()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterTimerDropBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERTIMERDROPBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterTimerWakeupBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterTimerWakeupBody.h deleted file mode 100644 index dd55101ba7..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterTimerWakeupBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERTIMERWAKEUPBODY_H -#define QPID_FRAMING_CLUSTERTIMERWAKEUPBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterTimerWakeupBody : public ModelMethod { - string name; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x80; - static const MethodId METHOD_ID = 0x15; - ClusterTimerWakeupBody( - ProtocolVersion, const string& _name) : - name(_name), - flags(0){ - flags |= (1 << 8); - } - ClusterTimerWakeupBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setName(const string& _name); - QPID_COMMON_EXTERN const string& getName() const; - QPID_COMMON_EXTERN bool hasName() const; - QPID_COMMON_EXTERN void clearNameFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.timerWakeup(getName()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterTimerWakeupBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERTIMERWAKEUPBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterUpdateOfferBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterUpdateOfferBody.h deleted file mode 100644 index 0c089be993..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterUpdateOfferBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERUPDATEOFFERBODY_H -#define QPID_FRAMING_CLUSTERUPDATEOFFERBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterUpdateOfferBody : public ModelMethod { - uint64_t updatee; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x80; - static const MethodId METHOD_ID = 0x2; - ClusterUpdateOfferBody( - ProtocolVersion, uint64_t _updatee) : - updatee(_updatee), - flags(0){ - flags |= (1 << 8); - } - ClusterUpdateOfferBody(ProtocolVersion=ProtocolVersion()) : updatee(0), flags(0) {} - - QPID_COMMON_EXTERN void setUpdatee(uint64_t _updatee); - QPID_COMMON_EXTERN uint64_t getUpdatee() const; - QPID_COMMON_EXTERN bool hasUpdatee() const; - QPID_COMMON_EXTERN void clearUpdateeFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.updateOffer(getUpdatee()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterUpdateOfferBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERUPDATEOFFERBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterUpdateRequestBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ClusterUpdateRequestBody.h deleted file mode 100644 index b9de0cbaad..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ClusterUpdateRequestBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_CLUSTERUPDATEREQUESTBODY_H -#define QPID_FRAMING_CLUSTERUPDATEREQUESTBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ClusterUpdateRequestBody : public ModelMethod { - string url; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x80; - static const MethodId METHOD_ID = 0x1; - ClusterUpdateRequestBody( - ProtocolVersion, const string& _url) : - url(_url), - flags(0){ - flags |= (1 << 8); - } - ClusterUpdateRequestBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setUrl(const string& _url); - QPID_COMMON_EXTERN const string& getUrl() const; - QPID_COMMON_EXTERN bool hasUrl() const; - QPID_COMMON_EXTERN void clearUrlFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.updateRequest(getUrl()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ClusterUpdateRequestBody */ - -}} -#endif /*!QPID_FRAMING_CLUSTERUPDATEREQUESTBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionCloseBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionCloseBody.h deleted file mode 100644 index c6d3b2bfa9..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionCloseBody.h +++ /dev/null @@ -1,93 +0,0 @@ -#ifndef QPID_FRAMING_CONNECTIONCLOSEBODY_H -#define QPID_FRAMING_CONNECTIONCLOSEBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ConnectionCloseBody : public AMQMethodBody { - uint16_t replyCode; - string replyText; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x1; - static const MethodId METHOD_ID = 0xb; - ConnectionCloseBody( - ProtocolVersion, uint16_t _replyCode, - const string& _replyText) : - replyCode(_replyCode), - replyText(_replyText), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - } - ConnectionCloseBody(ProtocolVersion=ProtocolVersion()) : replyCode(0), flags(0) {} - - QPID_COMMON_EXTERN void setReplyCode(uint16_t _replyCode); - QPID_COMMON_EXTERN uint16_t getReplyCode() const; - QPID_COMMON_EXTERN bool hasReplyCode() const; - QPID_COMMON_EXTERN void clearReplyCodeFlag(); - QPID_COMMON_EXTERN void setReplyText(const string& _replyText); - QPID_COMMON_EXTERN const string& getReplyText() const; - QPID_COMMON_EXTERN bool hasReplyText() const; - QPID_COMMON_EXTERN void clearReplyTextFlag(); -virtual uint8_t type() const { return 0;/*control segment*/ } - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.close(getReplyCode(), getReplyText()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return true; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ConnectionCloseBody */ - -}} -#endif /*!QPID_FRAMING_CONNECTIONCLOSEBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionCloseOkBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionCloseOkBody.h deleted file mode 100644 index 418eb53a68..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionCloseOkBody.h +++ /dev/null @@ -1,74 +0,0 @@ -#ifndef QPID_FRAMING_CONNECTIONCLOSEOKBODY_H -#define QPID_FRAMING_CONNECTIONCLOSEOKBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ConnectionCloseOkBody : public AMQMethodBody { - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x1; - static const MethodId METHOD_ID = 0xc; - ConnectionCloseOkBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - -virtual uint8_t type() const { return 0;/*control segment*/ } - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.closeOk(); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ConnectionCloseOkBody */ - -}} -#endif /*!QPID_FRAMING_CONNECTIONCLOSEOKBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionHeartbeatBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionHeartbeatBody.h deleted file mode 100644 index 12fd9a2bb8..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionHeartbeatBody.h +++ /dev/null @@ -1,74 +0,0 @@ -#ifndef QPID_FRAMING_CONNECTIONHEARTBEATBODY_H -#define QPID_FRAMING_CONNECTIONHEARTBEATBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ConnectionHeartbeatBody : public AMQMethodBody { - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x1; - static const MethodId METHOD_ID = 0xa; - ConnectionHeartbeatBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - -virtual uint8_t type() const { return 0;/*control segment*/ } - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.heartbeat(); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ConnectionHeartbeatBody */ - -}} -#endif /*!QPID_FRAMING_CONNECTIONHEARTBEATBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionOpenBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionOpenBody.h deleted file mode 100644 index 8dd1bfa1b6..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionOpenBody.h +++ /dev/null @@ -1,97 +0,0 @@ -#ifndef QPID_FRAMING_CONNECTIONOPENBODY_H -#define QPID_FRAMING_CONNECTIONOPENBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ConnectionOpenBody : public AMQMethodBody { - string virtualHost; - Array capabilities; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x1; - static const MethodId METHOD_ID = 0x7; - ConnectionOpenBody( - ProtocolVersion, const string& _virtualHost, - const Array& _capabilities, - bool _insist) : - virtualHost(_virtualHost), - capabilities(_capabilities), - flags(0){ - setInsist(_insist); - flags |= (1 << 8); - flags |= (1 << 9); - } - ConnectionOpenBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setVirtualHost(const string& _virtualHost); - QPID_COMMON_EXTERN const string& getVirtualHost() const; - QPID_COMMON_EXTERN bool hasVirtualHost() const; - QPID_COMMON_EXTERN void clearVirtualHostFlag(); - QPID_COMMON_EXTERN void setCapabilities(const Array& _capabilities); - QPID_COMMON_EXTERN const Array& getCapabilities() const; - QPID_COMMON_EXTERN bool hasCapabilities() const; - QPID_COMMON_EXTERN void clearCapabilitiesFlag(); - QPID_COMMON_EXTERN void setInsist(bool _insist); - QPID_COMMON_EXTERN bool getInsist() const; -virtual uint8_t type() const { return 0;/*control segment*/ } - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.open(getVirtualHost(), getCapabilities(), getInsist()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return true; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ConnectionOpenBody */ - -}} -#endif /*!QPID_FRAMING_CONNECTIONOPENBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionOpenOkBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionOpenOkBody.h deleted file mode 100644 index 0a53c5a3f1..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionOpenOkBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_CONNECTIONOPENOKBODY_H -#define QPID_FRAMING_CONNECTIONOPENOKBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ConnectionOpenOkBody : public AMQMethodBody { - Array knownHosts; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x1; - static const MethodId METHOD_ID = 0x8; - ConnectionOpenOkBody( - ProtocolVersion, const Array& _knownHosts) : - knownHosts(_knownHosts), - flags(0){ - flags |= (1 << 8); - } - ConnectionOpenOkBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setKnownHosts(const Array& _knownHosts); - QPID_COMMON_EXTERN const Array& getKnownHosts() const; - QPID_COMMON_EXTERN bool hasKnownHosts() const; - QPID_COMMON_EXTERN void clearKnownHostsFlag(); -virtual uint8_t type() const { return 0;/*control segment*/ } - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.openOk(getKnownHosts()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ConnectionOpenOkBody */ - -}} -#endif /*!QPID_FRAMING_CONNECTIONOPENOKBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionRedirectBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionRedirectBody.h deleted file mode 100644 index 6d570f59f0..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionRedirectBody.h +++ /dev/null @@ -1,93 +0,0 @@ -#ifndef QPID_FRAMING_CONNECTIONREDIRECTBODY_H -#define QPID_FRAMING_CONNECTIONREDIRECTBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ConnectionRedirectBody : public AMQMethodBody { - string host; - Array knownHosts; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x1; - static const MethodId METHOD_ID = 0x9; - ConnectionRedirectBody( - ProtocolVersion, const string& _host, - const Array& _knownHosts) : - host(_host), - knownHosts(_knownHosts), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - } - ConnectionRedirectBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setHost(const string& _host); - QPID_COMMON_EXTERN const string& getHost() const; - QPID_COMMON_EXTERN bool hasHost() const; - QPID_COMMON_EXTERN void clearHostFlag(); - QPID_COMMON_EXTERN void setKnownHosts(const Array& _knownHosts); - QPID_COMMON_EXTERN const Array& getKnownHosts() const; - QPID_COMMON_EXTERN bool hasKnownHosts() const; - QPID_COMMON_EXTERN void clearKnownHostsFlag(); -virtual uint8_t type() const { return 0;/*control segment*/ } - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.redirect(getHost(), getKnownHosts()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ConnectionRedirectBody */ - -}} -#endif /*!QPID_FRAMING_CONNECTIONREDIRECTBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionSecureBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionSecureBody.h deleted file mode 100644 index 8350cf8740..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionSecureBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_CONNECTIONSECUREBODY_H -#define QPID_FRAMING_CONNECTIONSECUREBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ConnectionSecureBody : public AMQMethodBody { - string challenge; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x1; - static const MethodId METHOD_ID = 0x3; - ConnectionSecureBody( - ProtocolVersion, const string& _challenge) : - challenge(_challenge), - flags(0){ - flags |= (1 << 8); - } - ConnectionSecureBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setChallenge(const string& _challenge); - QPID_COMMON_EXTERN const string& getChallenge() const; - QPID_COMMON_EXTERN bool hasChallenge() const; - QPID_COMMON_EXTERN void clearChallengeFlag(); -virtual uint8_t type() const { return 0;/*control segment*/ } - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.secure(getChallenge()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return true; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ConnectionSecureBody */ - -}} -#endif /*!QPID_FRAMING_CONNECTIONSECUREBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionSecureOkBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionSecureOkBody.h deleted file mode 100644 index a7cb05326b..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionSecureOkBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_CONNECTIONSECUREOKBODY_H -#define QPID_FRAMING_CONNECTIONSECUREOKBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ConnectionSecureOkBody : public AMQMethodBody { - string response; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x1; - static const MethodId METHOD_ID = 0x4; - ConnectionSecureOkBody( - ProtocolVersion, const string& _response) : - response(_response), - flags(0){ - flags |= (1 << 8); - } - ConnectionSecureOkBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setResponse(const string& _response); - QPID_COMMON_EXTERN const string& getResponse() const; - QPID_COMMON_EXTERN bool hasResponse() const; - QPID_COMMON_EXTERN void clearResponseFlag(); -virtual uint8_t type() const { return 0;/*control segment*/ } - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.secureOk(getResponse()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ConnectionSecureOkBody */ - -}} -#endif /*!QPID_FRAMING_CONNECTIONSECUREOKBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionStartBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionStartBody.h deleted file mode 100644 index 9ebd791cd7..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionStartBody.h +++ /dev/null @@ -1,102 +0,0 @@ -#ifndef QPID_FRAMING_CONNECTIONSTARTBODY_H -#define QPID_FRAMING_CONNECTIONSTARTBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ConnectionStartBody : public AMQMethodBody { - FieldTable serverProperties; - Array mechanisms; - Array locales; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x1; - static const MethodId METHOD_ID = 0x1; - ConnectionStartBody( - ProtocolVersion, const FieldTable& _serverProperties, - const Array& _mechanisms, - const Array& _locales) : - serverProperties(_serverProperties), - mechanisms(_mechanisms), - locales(_locales), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - flags |= (1 << 10); - } - ConnectionStartBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setServerProperties(const FieldTable& _serverProperties); - QPID_COMMON_EXTERN const FieldTable& getServerProperties() const; - QPID_COMMON_EXTERN FieldTable& getServerProperties(); - QPID_COMMON_EXTERN bool hasServerProperties() const; - QPID_COMMON_EXTERN void clearServerPropertiesFlag(); - QPID_COMMON_EXTERN void setMechanisms(const Array& _mechanisms); - QPID_COMMON_EXTERN const Array& getMechanisms() const; - QPID_COMMON_EXTERN bool hasMechanisms() const; - QPID_COMMON_EXTERN void clearMechanismsFlag(); - QPID_COMMON_EXTERN void setLocales(const Array& _locales); - QPID_COMMON_EXTERN const Array& getLocales() const; - QPID_COMMON_EXTERN bool hasLocales() const; - QPID_COMMON_EXTERN void clearLocalesFlag(); -virtual uint8_t type() const { return 0;/*control segment*/ } - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.start(getServerProperties(), getMechanisms(), getLocales()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return true; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ConnectionStartBody */ - -}} -#endif /*!QPID_FRAMING_CONNECTIONSTARTBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionStartOkBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionStartOkBody.h deleted file mode 100644 index b06895afa7..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionStartOkBody.h +++ /dev/null @@ -1,110 +0,0 @@ -#ifndef QPID_FRAMING_CONNECTIONSTARTOKBODY_H -#define QPID_FRAMING_CONNECTIONSTARTOKBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ConnectionStartOkBody : public AMQMethodBody { - FieldTable clientProperties; - string mechanism; - string response; - string locale; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x1; - static const MethodId METHOD_ID = 0x2; - ConnectionStartOkBody( - ProtocolVersion, const FieldTable& _clientProperties, - const string& _mechanism, - const string& _response, - const string& _locale) : - clientProperties(_clientProperties), - mechanism(_mechanism), - response(_response), - locale(_locale), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - flags |= (1 << 10); - flags |= (1 << 11); - } - ConnectionStartOkBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setClientProperties(const FieldTable& _clientProperties); - QPID_COMMON_EXTERN const FieldTable& getClientProperties() const; - QPID_COMMON_EXTERN FieldTable& getClientProperties(); - QPID_COMMON_EXTERN bool hasClientProperties() const; - QPID_COMMON_EXTERN void clearClientPropertiesFlag(); - QPID_COMMON_EXTERN void setMechanism(const string& _mechanism); - QPID_COMMON_EXTERN const string& getMechanism() const; - QPID_COMMON_EXTERN bool hasMechanism() const; - QPID_COMMON_EXTERN void clearMechanismFlag(); - QPID_COMMON_EXTERN void setResponse(const string& _response); - QPID_COMMON_EXTERN const string& getResponse() const; - QPID_COMMON_EXTERN bool hasResponse() const; - QPID_COMMON_EXTERN void clearResponseFlag(); - QPID_COMMON_EXTERN void setLocale(const string& _locale); - QPID_COMMON_EXTERN const string& getLocale() const; - QPID_COMMON_EXTERN bool hasLocale() const; - QPID_COMMON_EXTERN void clearLocaleFlag(); -virtual uint8_t type() const { return 0;/*control segment*/ } - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.startOk(getClientProperties(), getMechanism(), getResponse(), getLocale()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ConnectionStartOkBody */ - -}} -#endif /*!QPID_FRAMING_CONNECTIONSTARTOKBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionTuneBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionTuneBody.h deleted file mode 100644 index b4a4bfd200..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionTuneBody.h +++ /dev/null @@ -1,109 +0,0 @@ -#ifndef QPID_FRAMING_CONNECTIONTUNEBODY_H -#define QPID_FRAMING_CONNECTIONTUNEBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ConnectionTuneBody : public AMQMethodBody { - uint16_t channelMax; - uint16_t maxFrameSize; - uint16_t heartbeatMin; - uint16_t heartbeatMax; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x1; - static const MethodId METHOD_ID = 0x5; - ConnectionTuneBody( - ProtocolVersion, uint16_t _channelMax, - uint16_t _maxFrameSize, - uint16_t _heartbeatMin, - uint16_t _heartbeatMax) : - channelMax(_channelMax), - maxFrameSize(_maxFrameSize), - heartbeatMin(_heartbeatMin), - heartbeatMax(_heartbeatMax), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - flags |= (1 << 10); - flags |= (1 << 11); - } - ConnectionTuneBody(ProtocolVersion=ProtocolVersion()) : channelMax(0), maxFrameSize(0), heartbeatMin(0), heartbeatMax(0), flags(0) {} - - QPID_COMMON_EXTERN void setChannelMax(uint16_t _channelMax); - QPID_COMMON_EXTERN uint16_t getChannelMax() const; - QPID_COMMON_EXTERN bool hasChannelMax() const; - QPID_COMMON_EXTERN void clearChannelMaxFlag(); - QPID_COMMON_EXTERN void setMaxFrameSize(uint16_t _maxFrameSize); - QPID_COMMON_EXTERN uint16_t getMaxFrameSize() const; - QPID_COMMON_EXTERN bool hasMaxFrameSize() const; - QPID_COMMON_EXTERN void clearMaxFrameSizeFlag(); - QPID_COMMON_EXTERN void setHeartbeatMin(uint16_t _heartbeatMin); - QPID_COMMON_EXTERN uint16_t getHeartbeatMin() const; - QPID_COMMON_EXTERN bool hasHeartbeatMin() const; - QPID_COMMON_EXTERN void clearHeartbeatMinFlag(); - QPID_COMMON_EXTERN void setHeartbeatMax(uint16_t _heartbeatMax); - QPID_COMMON_EXTERN uint16_t getHeartbeatMax() const; - QPID_COMMON_EXTERN bool hasHeartbeatMax() const; - QPID_COMMON_EXTERN void clearHeartbeatMaxFlag(); -virtual uint8_t type() const { return 0;/*control segment*/ } - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.tune(getChannelMax(), getMaxFrameSize(), getHeartbeatMin(), getHeartbeatMax()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return true; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ConnectionTuneBody */ - -}} -#endif /*!QPID_FRAMING_CONNECTIONTUNEBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionTuneOkBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionTuneOkBody.h deleted file mode 100644 index 458b607524..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ConnectionTuneOkBody.h +++ /dev/null @@ -1,101 +0,0 @@ -#ifndef QPID_FRAMING_CONNECTIONTUNEOKBODY_H -#define QPID_FRAMING_CONNECTIONTUNEOKBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ConnectionTuneOkBody : public AMQMethodBody { - uint16_t channelMax; - uint16_t maxFrameSize; - uint16_t heartbeat; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x1; - static const MethodId METHOD_ID = 0x6; - ConnectionTuneOkBody( - ProtocolVersion, uint16_t _channelMax, - uint16_t _maxFrameSize, - uint16_t _heartbeat) : - channelMax(_channelMax), - maxFrameSize(_maxFrameSize), - heartbeat(_heartbeat), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - flags |= (1 << 10); - } - ConnectionTuneOkBody(ProtocolVersion=ProtocolVersion()) : channelMax(0), maxFrameSize(0), heartbeat(0), flags(0) {} - - QPID_COMMON_EXTERN void setChannelMax(uint16_t _channelMax); - QPID_COMMON_EXTERN uint16_t getChannelMax() const; - QPID_COMMON_EXTERN bool hasChannelMax() const; - QPID_COMMON_EXTERN void clearChannelMaxFlag(); - QPID_COMMON_EXTERN void setMaxFrameSize(uint16_t _maxFrameSize); - QPID_COMMON_EXTERN uint16_t getMaxFrameSize() const; - QPID_COMMON_EXTERN bool hasMaxFrameSize() const; - QPID_COMMON_EXTERN void clearMaxFrameSizeFlag(); - QPID_COMMON_EXTERN void setHeartbeat(uint16_t _heartbeat); - QPID_COMMON_EXTERN uint16_t getHeartbeat() const; - QPID_COMMON_EXTERN bool hasHeartbeat() const; - QPID_COMMON_EXTERN void clearHeartbeatFlag(); -virtual uint8_t type() const { return 0;/*control segment*/ } - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.tuneOk(getChannelMax(), getMaxFrameSize(), getHeartbeat()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ConnectionTuneOkBody */ - -}} -#endif /*!QPID_FRAMING_CONNECTIONTUNEOKBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/DeliveryProperties.h b/nativeLib/org.apache.qpid/include/qpid/framing/DeliveryProperties.h deleted file mode 100644 index df61862930..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/DeliveryProperties.h +++ /dev/null @@ -1,142 +0,0 @@ -#ifndef QPID_FRAMING_DELIVERYPROPERTIES_H -#define QPID_FRAMING_DELIVERYPROPERTIES_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class DeliveryProperties { - uint8_t priority; - uint8_t deliveryMode; - uint64_t ttl; - uint64_t timestamp; - uint64_t expiration; - string exchange; - string routingKey; - string resumeId; - uint64_t resumeTtl; - uint16_t flags; -public: - static const uint16_t TYPE = 1025; - DeliveryProperties( - bool _discardUnroutable, - bool _immediate, - bool _redelivered, - uint8_t _priority, - uint8_t _deliveryMode, - uint64_t _ttl, - uint64_t _timestamp, - uint64_t _expiration, - const string& _exchange, - const string& _routingKey, - const string& _resumeId, - uint64_t _resumeTtl) : - priority(_priority), - deliveryMode(_deliveryMode), - ttl(_ttl), - timestamp(_timestamp), - expiration(_expiration), - exchange(_exchange), - routingKey(_routingKey), - resumeId(_resumeId), - resumeTtl(_resumeTtl), - flags(0){ - setDiscardUnroutable(_discardUnroutable); - setImmediate(_immediate); - setRedelivered(_redelivered); - flags |= (1 << 11); - flags |= (1 << 12); - flags |= (1 << 13); - flags |= (1 << 14); - flags |= (1 << 15); - flags |= (1 << 0); - flags |= (1 << 1); - flags |= (1 << 2); - flags |= (1 << 3); - } - DeliveryProperties() : priority(0), deliveryMode(0), ttl(0), timestamp(0), expiration(0), resumeTtl(0), flags(0) {} - - QPID_COMMON_EXTERN void setDiscardUnroutable(bool _discardUnroutable); - QPID_COMMON_EXTERN bool getDiscardUnroutable() const; - QPID_COMMON_EXTERN void setImmediate(bool _immediate); - QPID_COMMON_EXTERN bool getImmediate() const; - QPID_COMMON_EXTERN void setRedelivered(bool _redelivered); - QPID_COMMON_EXTERN bool getRedelivered() const; - QPID_COMMON_EXTERN void setPriority(uint8_t _priority); - QPID_COMMON_EXTERN uint8_t getPriority() const; - QPID_COMMON_EXTERN bool hasPriority() const; - QPID_COMMON_EXTERN void clearPriorityFlag(); - QPID_COMMON_EXTERN void setDeliveryMode(uint8_t _deliveryMode); - QPID_COMMON_EXTERN uint8_t getDeliveryMode() const; - QPID_COMMON_EXTERN bool hasDeliveryMode() const; - QPID_COMMON_EXTERN void clearDeliveryModeFlag(); - QPID_COMMON_EXTERN void setTtl(uint64_t _ttl); - QPID_COMMON_EXTERN uint64_t getTtl() const; - QPID_COMMON_EXTERN bool hasTtl() const; - QPID_COMMON_EXTERN void clearTtlFlag(); - QPID_COMMON_EXTERN void setTimestamp(uint64_t _timestamp); - QPID_COMMON_EXTERN uint64_t getTimestamp() const; - QPID_COMMON_EXTERN bool hasTimestamp() const; - QPID_COMMON_EXTERN void clearTimestampFlag(); - QPID_COMMON_EXTERN void setExpiration(uint64_t _expiration); - QPID_COMMON_EXTERN uint64_t getExpiration() const; - QPID_COMMON_EXTERN bool hasExpiration() const; - QPID_COMMON_EXTERN void clearExpirationFlag(); - QPID_COMMON_EXTERN void setExchange(const string& _exchange); - QPID_COMMON_EXTERN const string& getExchange() const; - QPID_COMMON_EXTERN bool hasExchange() const; - QPID_COMMON_EXTERN void clearExchangeFlag(); - QPID_COMMON_EXTERN void setRoutingKey(const string& _routingKey); - QPID_COMMON_EXTERN const string& getRoutingKey() const; - QPID_COMMON_EXTERN bool hasRoutingKey() const; - QPID_COMMON_EXTERN void clearRoutingKeyFlag(); - QPID_COMMON_EXTERN void setResumeId(const string& _resumeId); - QPID_COMMON_EXTERN const string& getResumeId() const; - QPID_COMMON_EXTERN bool hasResumeId() const; - QPID_COMMON_EXTERN void clearResumeIdFlag(); - QPID_COMMON_EXTERN void setResumeTtl(uint64_t _resumeTtl); - QPID_COMMON_EXTERN uint64_t getResumeTtl() const; - QPID_COMMON_EXTERN bool hasResumeTtl() const; - QPID_COMMON_EXTERN void clearResumeTtlFlag(); - QPID_COMMON_EXTERN friend std::ostream& operator<<(std::ostream&, const DeliveryProperties&); - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class DeliveryProperties */ - -}} -#endif /*!QPID_FRAMING_DELIVERYPROPERTIES_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/DtxCommitBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/DtxCommitBody.h deleted file mode 100644 index fed97b66d8..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/DtxCommitBody.h +++ /dev/null @@ -1,90 +0,0 @@ -#ifndef QPID_FRAMING_DTXCOMMITBODY_H -#define QPID_FRAMING_DTXCOMMITBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" -#include "qpid/framing/Xid.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class DtxCommitBody : public ModelMethod { - Xid xid; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x6; - static const MethodId METHOD_ID = 0x4; - DtxCommitBody( - ProtocolVersion, const Xid& _xid, - bool _onePhase) : - xid(_xid), - flags(0){ - setOnePhase(_onePhase); - flags |= (1 << 8); - } - DtxCommitBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setXid(const Xid& _xid); - QPID_COMMON_EXTERN const Xid& getXid() const; - QPID_COMMON_EXTERN bool hasXid() const; - QPID_COMMON_EXTERN void clearXidFlag(); - QPID_COMMON_EXTERN void setOnePhase(bool _onePhase); - QPID_COMMON_EXTERN bool getOnePhase() const; - typedef XaResult ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.commit(getXid(), getOnePhase()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return true; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class DtxCommitBody */ - -}} -#endif /*!QPID_FRAMING_DTXCOMMITBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/DtxEndBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/DtxEndBody.h deleted file mode 100644 index d2012f6ca8..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/DtxEndBody.h +++ /dev/null @@ -1,94 +0,0 @@ -#ifndef QPID_FRAMING_DTXENDBODY_H -#define QPID_FRAMING_DTXENDBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" -#include "qpid/framing/Xid.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class DtxEndBody : public ModelMethod { - Xid xid; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x6; - static const MethodId METHOD_ID = 0x3; - DtxEndBody( - ProtocolVersion, const Xid& _xid, - bool _fail, - bool _suspend) : - xid(_xid), - flags(0){ - setFail(_fail); - setSuspend(_suspend); - flags |= (1 << 8); - } - DtxEndBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setXid(const Xid& _xid); - QPID_COMMON_EXTERN const Xid& getXid() const; - QPID_COMMON_EXTERN bool hasXid() const; - QPID_COMMON_EXTERN void clearXidFlag(); - QPID_COMMON_EXTERN void setFail(bool _fail); - QPID_COMMON_EXTERN bool getFail() const; - QPID_COMMON_EXTERN void setSuspend(bool _suspend); - QPID_COMMON_EXTERN bool getSuspend() const; - typedef XaResult ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.end(getXid(), getFail(), getSuspend()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return true; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class DtxEndBody */ - -}} -#endif /*!QPID_FRAMING_DTXENDBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/DtxForgetBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/DtxForgetBody.h deleted file mode 100644 index 1b6797465e..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/DtxForgetBody.h +++ /dev/null @@ -1,86 +0,0 @@ -#ifndef QPID_FRAMING_DTXFORGETBODY_H -#define QPID_FRAMING_DTXFORGETBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" -#include "qpid/framing/Xid.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class DtxForgetBody : public ModelMethod { - Xid xid; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x6; - static const MethodId METHOD_ID = 0x5; - DtxForgetBody( - ProtocolVersion, const Xid& _xid) : - xid(_xid), - flags(0){ - flags |= (1 << 8); - } - DtxForgetBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setXid(const Xid& _xid); - QPID_COMMON_EXTERN const Xid& getXid() const; - QPID_COMMON_EXTERN bool hasXid() const; - QPID_COMMON_EXTERN void clearXidFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.forget(getXid()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class DtxForgetBody */ - -}} -#endif /*!QPID_FRAMING_DTXFORGETBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/DtxGetTimeoutBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/DtxGetTimeoutBody.h deleted file mode 100644 index 3e242e8aa8..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/DtxGetTimeoutBody.h +++ /dev/null @@ -1,86 +0,0 @@ -#ifndef QPID_FRAMING_DTXGETTIMEOUTBODY_H -#define QPID_FRAMING_DTXGETTIMEOUTBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" -#include "qpid/framing/Xid.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class DtxGetTimeoutBody : public ModelMethod { - Xid xid; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x6; - static const MethodId METHOD_ID = 0x6; - DtxGetTimeoutBody( - ProtocolVersion, const Xid& _xid) : - xid(_xid), - flags(0){ - flags |= (1 << 8); - } - DtxGetTimeoutBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setXid(const Xid& _xid); - QPID_COMMON_EXTERN const Xid& getXid() const; - QPID_COMMON_EXTERN bool hasXid() const; - QPID_COMMON_EXTERN void clearXidFlag(); - typedef DtxGetTimeoutResult ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.getTimeout(getXid()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return true; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class DtxGetTimeoutBody */ - -}} -#endif /*!QPID_FRAMING_DTXGETTIMEOUTBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/DtxGetTimeoutResult.h b/nativeLib/org.apache.qpid/include/qpid/framing/DtxGetTimeoutResult.h deleted file mode 100644 index bc4f9a6077..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/DtxGetTimeoutResult.h +++ /dev/null @@ -1,66 +0,0 @@ -#ifndef QPID_FRAMING_DTXGETTIMEOUTRESULT_H -#define QPID_FRAMING_DTXGETTIMEOUTRESULT_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class DtxGetTimeoutResult { - uint32_t timeout; - uint16_t flags; -public: - static const uint16_t TYPE = 1538; - DtxGetTimeoutResult( - uint32_t _timeout) : - timeout(_timeout), - flags(0){ - flags |= (1 << 8); - } - DtxGetTimeoutResult() : timeout(0), flags(0) {} - - QPID_COMMON_EXTERN void setTimeout(uint32_t _timeout); - QPID_COMMON_EXTERN uint32_t getTimeout() const; - QPID_COMMON_EXTERN bool hasTimeout() const; - QPID_COMMON_EXTERN void clearTimeoutFlag(); - QPID_COMMON_EXTERN friend std::ostream& operator<<(std::ostream&, const DtxGetTimeoutResult&); - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class DtxGetTimeoutResult */ - -}} -#endif /*!QPID_FRAMING_DTXGETTIMEOUTRESULT_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/DtxPrepareBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/DtxPrepareBody.h deleted file mode 100644 index cb4fddc9d4..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/DtxPrepareBody.h +++ /dev/null @@ -1,86 +0,0 @@ -#ifndef QPID_FRAMING_DTXPREPAREBODY_H -#define QPID_FRAMING_DTXPREPAREBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" -#include "qpid/framing/Xid.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class DtxPrepareBody : public ModelMethod { - Xid xid; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x6; - static const MethodId METHOD_ID = 0x7; - DtxPrepareBody( - ProtocolVersion, const Xid& _xid) : - xid(_xid), - flags(0){ - flags |= (1 << 8); - } - DtxPrepareBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setXid(const Xid& _xid); - QPID_COMMON_EXTERN const Xid& getXid() const; - QPID_COMMON_EXTERN bool hasXid() const; - QPID_COMMON_EXTERN void clearXidFlag(); - typedef XaResult ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.prepare(getXid()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return true; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class DtxPrepareBody */ - -}} -#endif /*!QPID_FRAMING_DTXPREPAREBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/DtxRecoverBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/DtxRecoverBody.h deleted file mode 100644 index b6e422e194..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/DtxRecoverBody.h +++ /dev/null @@ -1,74 +0,0 @@ -#ifndef QPID_FRAMING_DTXRECOVERBODY_H -#define QPID_FRAMING_DTXRECOVERBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class DtxRecoverBody : public ModelMethod { - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x6; - static const MethodId METHOD_ID = 0x8; - DtxRecoverBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - typedef DtxRecoverResult ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.recover(); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return true; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class DtxRecoverBody */ - -}} -#endif /*!QPID_FRAMING_DTXRECOVERBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/DtxRecoverResult.h b/nativeLib/org.apache.qpid/include/qpid/framing/DtxRecoverResult.h deleted file mode 100644 index d74038c532..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/DtxRecoverResult.h +++ /dev/null @@ -1,66 +0,0 @@ -#ifndef QPID_FRAMING_DTXRECOVERRESULT_H -#define QPID_FRAMING_DTXRECOVERRESULT_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class DtxRecoverResult { - Array inDoubt; - uint16_t flags; -public: - static const uint16_t TYPE = 1539; - DtxRecoverResult( - const Array& _inDoubt) : - inDoubt(_inDoubt), - flags(0){ - flags |= (1 << 8); - } - DtxRecoverResult() : flags(0) {} - - QPID_COMMON_EXTERN void setInDoubt(const Array& _inDoubt); - QPID_COMMON_EXTERN const Array& getInDoubt() const; - QPID_COMMON_EXTERN bool hasInDoubt() const; - QPID_COMMON_EXTERN void clearInDoubtFlag(); - QPID_COMMON_EXTERN friend std::ostream& operator<<(std::ostream&, const DtxRecoverResult&); - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class DtxRecoverResult */ - -}} -#endif /*!QPID_FRAMING_DTXRECOVERRESULT_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/DtxRollbackBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/DtxRollbackBody.h deleted file mode 100644 index f2f1687790..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/DtxRollbackBody.h +++ /dev/null @@ -1,86 +0,0 @@ -#ifndef QPID_FRAMING_DTXROLLBACKBODY_H -#define QPID_FRAMING_DTXROLLBACKBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" -#include "qpid/framing/Xid.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class DtxRollbackBody : public ModelMethod { - Xid xid; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x6; - static const MethodId METHOD_ID = 0x9; - DtxRollbackBody( - ProtocolVersion, const Xid& _xid) : - xid(_xid), - flags(0){ - flags |= (1 << 8); - } - DtxRollbackBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setXid(const Xid& _xid); - QPID_COMMON_EXTERN const Xid& getXid() const; - QPID_COMMON_EXTERN bool hasXid() const; - QPID_COMMON_EXTERN void clearXidFlag(); - typedef XaResult ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.rollback(getXid()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return true; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class DtxRollbackBody */ - -}} -#endif /*!QPID_FRAMING_DTXROLLBACKBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/DtxSelectBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/DtxSelectBody.h deleted file mode 100644 index 2bacb64acf..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/DtxSelectBody.h +++ /dev/null @@ -1,74 +0,0 @@ -#ifndef QPID_FRAMING_DTXSELECTBODY_H -#define QPID_FRAMING_DTXSELECTBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class DtxSelectBody : public ModelMethod { - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x6; - static const MethodId METHOD_ID = 0x1; - DtxSelectBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.select(); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class DtxSelectBody */ - -}} -#endif /*!QPID_FRAMING_DTXSELECTBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/DtxSetTimeoutBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/DtxSetTimeoutBody.h deleted file mode 100644 index 222af800b8..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/DtxSetTimeoutBody.h +++ /dev/null @@ -1,94 +0,0 @@ -#ifndef QPID_FRAMING_DTXSETTIMEOUTBODY_H -#define QPID_FRAMING_DTXSETTIMEOUTBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" -#include "qpid/framing/Xid.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class DtxSetTimeoutBody : public ModelMethod { - Xid xid; - uint32_t timeout; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x6; - static const MethodId METHOD_ID = 0xa; - DtxSetTimeoutBody( - ProtocolVersion, const Xid& _xid, - uint32_t _timeout) : - xid(_xid), - timeout(_timeout), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - } - DtxSetTimeoutBody(ProtocolVersion=ProtocolVersion()) : timeout(0), flags(0) {} - - QPID_COMMON_EXTERN void setXid(const Xid& _xid); - QPID_COMMON_EXTERN const Xid& getXid() const; - QPID_COMMON_EXTERN bool hasXid() const; - QPID_COMMON_EXTERN void clearXidFlag(); - QPID_COMMON_EXTERN void setTimeout(uint32_t _timeout); - QPID_COMMON_EXTERN uint32_t getTimeout() const; - QPID_COMMON_EXTERN bool hasTimeout() const; - QPID_COMMON_EXTERN void clearTimeoutFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.setTimeout(getXid(), getTimeout()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class DtxSetTimeoutBody */ - -}} -#endif /*!QPID_FRAMING_DTXSETTIMEOUTBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/DtxStartBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/DtxStartBody.h deleted file mode 100644 index 9e12a4a281..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/DtxStartBody.h +++ /dev/null @@ -1,94 +0,0 @@ -#ifndef QPID_FRAMING_DTXSTARTBODY_H -#define QPID_FRAMING_DTXSTARTBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" -#include "qpid/framing/Xid.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class DtxStartBody : public ModelMethod { - Xid xid; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x6; - static const MethodId METHOD_ID = 0x2; - DtxStartBody( - ProtocolVersion, const Xid& _xid, - bool _join, - bool _resume) : - xid(_xid), - flags(0){ - setJoin(_join); - setResume(_resume); - flags |= (1 << 8); - } - DtxStartBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setXid(const Xid& _xid); - QPID_COMMON_EXTERN const Xid& getXid() const; - QPID_COMMON_EXTERN bool hasXid() const; - QPID_COMMON_EXTERN void clearXidFlag(); - QPID_COMMON_EXTERN void setJoin(bool _join); - QPID_COMMON_EXTERN bool getJoin() const; - QPID_COMMON_EXTERN void setResume(bool _resume); - QPID_COMMON_EXTERN bool getResume() const; - typedef XaResult ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.start(getXid(), getJoin(), getResume()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return true; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class DtxStartBody */ - -}} -#endif /*!QPID_FRAMING_DTXSTARTBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ExchangeBindBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ExchangeBindBody.h deleted file mode 100644 index f38e33ab80..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ExchangeBindBody.h +++ /dev/null @@ -1,110 +0,0 @@ -#ifndef QPID_FRAMING_EXCHANGEBINDBODY_H -#define QPID_FRAMING_EXCHANGEBINDBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ExchangeBindBody : public ModelMethod { - string queue; - string exchange; - string bindingKey; - FieldTable arguments; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x7; - static const MethodId METHOD_ID = 0x4; - ExchangeBindBody( - ProtocolVersion, const string& _queue, - const string& _exchange, - const string& _bindingKey, - const FieldTable& _arguments) : - queue(_queue), - exchange(_exchange), - bindingKey(_bindingKey), - arguments(_arguments), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - flags |= (1 << 10); - flags |= (1 << 11); - } - ExchangeBindBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setQueue(const string& _queue); - QPID_COMMON_EXTERN const string& getQueue() const; - QPID_COMMON_EXTERN bool hasQueue() const; - QPID_COMMON_EXTERN void clearQueueFlag(); - QPID_COMMON_EXTERN void setExchange(const string& _exchange); - QPID_COMMON_EXTERN const string& getExchange() const; - QPID_COMMON_EXTERN bool hasExchange() const; - QPID_COMMON_EXTERN void clearExchangeFlag(); - QPID_COMMON_EXTERN void setBindingKey(const string& _bindingKey); - QPID_COMMON_EXTERN const string& getBindingKey() const; - QPID_COMMON_EXTERN bool hasBindingKey() const; - QPID_COMMON_EXTERN void clearBindingKeyFlag(); - QPID_COMMON_EXTERN void setArguments(const FieldTable& _arguments); - QPID_COMMON_EXTERN const FieldTable& getArguments() const; - QPID_COMMON_EXTERN FieldTable& getArguments(); - QPID_COMMON_EXTERN bool hasArguments() const; - QPID_COMMON_EXTERN void clearArgumentsFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.bind(getQueue(), getExchange(), getBindingKey(), getArguments()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ExchangeBindBody */ - -}} -#endif /*!QPID_FRAMING_EXCHANGEBINDBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ExchangeBoundBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ExchangeBoundBody.h deleted file mode 100644 index ba1d07d17a..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ExchangeBoundBody.h +++ /dev/null @@ -1,110 +0,0 @@ -#ifndef QPID_FRAMING_EXCHANGEBOUNDBODY_H -#define QPID_FRAMING_EXCHANGEBOUNDBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ExchangeBoundBody : public ModelMethod { - string exchange; - string queue; - string bindingKey; - FieldTable arguments; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x7; - static const MethodId METHOD_ID = 0x6; - ExchangeBoundBody( - ProtocolVersion, const string& _exchange, - const string& _queue, - const string& _bindingKey, - const FieldTable& _arguments) : - exchange(_exchange), - queue(_queue), - bindingKey(_bindingKey), - arguments(_arguments), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - flags |= (1 << 10); - flags |= (1 << 11); - } - ExchangeBoundBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setExchange(const string& _exchange); - QPID_COMMON_EXTERN const string& getExchange() const; - QPID_COMMON_EXTERN bool hasExchange() const; - QPID_COMMON_EXTERN void clearExchangeFlag(); - QPID_COMMON_EXTERN void setQueue(const string& _queue); - QPID_COMMON_EXTERN const string& getQueue() const; - QPID_COMMON_EXTERN bool hasQueue() const; - QPID_COMMON_EXTERN void clearQueueFlag(); - QPID_COMMON_EXTERN void setBindingKey(const string& _bindingKey); - QPID_COMMON_EXTERN const string& getBindingKey() const; - QPID_COMMON_EXTERN bool hasBindingKey() const; - QPID_COMMON_EXTERN void clearBindingKeyFlag(); - QPID_COMMON_EXTERN void setArguments(const FieldTable& _arguments); - QPID_COMMON_EXTERN const FieldTable& getArguments() const; - QPID_COMMON_EXTERN FieldTable& getArguments(); - QPID_COMMON_EXTERN bool hasArguments() const; - QPID_COMMON_EXTERN void clearArgumentsFlag(); - typedef ExchangeBoundResult ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.bound(getExchange(), getQueue(), getBindingKey(), getArguments()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return true; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ExchangeBoundBody */ - -}} -#endif /*!QPID_FRAMING_EXCHANGEBOUNDBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ExchangeBoundResult.h b/nativeLib/org.apache.qpid/include/qpid/framing/ExchangeBoundResult.h deleted file mode 100644 index 83308d63f6..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ExchangeBoundResult.h +++ /dev/null @@ -1,78 +0,0 @@ -#ifndef QPID_FRAMING_EXCHANGEBOUNDRESULT_H -#define QPID_FRAMING_EXCHANGEBOUNDRESULT_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ExchangeBoundResult { - uint16_t flags; -public: - static const uint16_t TYPE = 1794; - ExchangeBoundResult( - bool _exchangeNotFound, - bool _queueNotFound, - bool _queueNotMatched, - bool _keyNotMatched, - bool _argsNotMatched) : - flags(0){ - setExchangeNotFound(_exchangeNotFound); - setQueueNotFound(_queueNotFound); - setQueueNotMatched(_queueNotMatched); - setKeyNotMatched(_keyNotMatched); - setArgsNotMatched(_argsNotMatched); - } - ExchangeBoundResult() : flags(0) {} - - QPID_COMMON_EXTERN void setExchangeNotFound(bool _exchangeNotFound); - QPID_COMMON_EXTERN bool getExchangeNotFound() const; - QPID_COMMON_EXTERN void setQueueNotFound(bool _queueNotFound); - QPID_COMMON_EXTERN bool getQueueNotFound() const; - QPID_COMMON_EXTERN void setQueueNotMatched(bool _queueNotMatched); - QPID_COMMON_EXTERN bool getQueueNotMatched() const; - QPID_COMMON_EXTERN void setKeyNotMatched(bool _keyNotMatched); - QPID_COMMON_EXTERN bool getKeyNotMatched() const; - QPID_COMMON_EXTERN void setArgsNotMatched(bool _argsNotMatched); - QPID_COMMON_EXTERN bool getArgsNotMatched() const; - QPID_COMMON_EXTERN friend std::ostream& operator<<(std::ostream&, const ExchangeBoundResult&); - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ExchangeBoundResult */ - -}} -#endif /*!QPID_FRAMING_EXCHANGEBOUNDRESULT_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ExchangeDeclareBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ExchangeDeclareBody.h deleted file mode 100644 index a3c154d476..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ExchangeDeclareBody.h +++ /dev/null @@ -1,122 +0,0 @@ -#ifndef QPID_FRAMING_EXCHANGEDECLAREBODY_H -#define QPID_FRAMING_EXCHANGEDECLAREBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ExchangeDeclareBody : public ModelMethod { - string exchange; - string type; - string alternateExchange; - FieldTable arguments; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x7; - static const MethodId METHOD_ID = 0x1; - ExchangeDeclareBody( - ProtocolVersion, const string& _exchange, - const string& _type, - const string& _alternateExchange, - bool _passive, - bool _durable, - bool _autoDelete, - const FieldTable& _arguments) : - exchange(_exchange), - type(_type), - alternateExchange(_alternateExchange), - arguments(_arguments), - flags(0){ - setPassive(_passive); - setDurable(_durable); - setAutoDelete(_autoDelete); - flags |= (1 << 8); - flags |= (1 << 9); - flags |= (1 << 10); - flags |= (1 << 14); - } - ExchangeDeclareBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setExchange(const string& _exchange); - QPID_COMMON_EXTERN const string& getExchange() const; - QPID_COMMON_EXTERN bool hasExchange() const; - QPID_COMMON_EXTERN void clearExchangeFlag(); - QPID_COMMON_EXTERN void setType(const string& _type); - QPID_COMMON_EXTERN const string& getType() const; - QPID_COMMON_EXTERN bool hasType() const; - QPID_COMMON_EXTERN void clearTypeFlag(); - QPID_COMMON_EXTERN void setAlternateExchange(const string& _alternateExchange); - QPID_COMMON_EXTERN const string& getAlternateExchange() const; - QPID_COMMON_EXTERN bool hasAlternateExchange() const; - QPID_COMMON_EXTERN void clearAlternateExchangeFlag(); - QPID_COMMON_EXTERN void setPassive(bool _passive); - QPID_COMMON_EXTERN bool getPassive() const; - QPID_COMMON_EXTERN void setDurable(bool _durable); - QPID_COMMON_EXTERN bool getDurable() const; - QPID_COMMON_EXTERN void setAutoDelete(bool _autoDelete); - QPID_COMMON_EXTERN bool getAutoDelete() const; - QPID_COMMON_EXTERN void setArguments(const FieldTable& _arguments); - QPID_COMMON_EXTERN const FieldTable& getArguments() const; - QPID_COMMON_EXTERN FieldTable& getArguments(); - QPID_COMMON_EXTERN bool hasArguments() const; - QPID_COMMON_EXTERN void clearArgumentsFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.declare(getExchange(), getType(), getAlternateExchange(), getPassive(), getDurable(), getAutoDelete(), getArguments()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ExchangeDeclareBody */ - -}} -#endif /*!QPID_FRAMING_EXCHANGEDECLAREBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ExchangeDeleteBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ExchangeDeleteBody.h deleted file mode 100644 index 72f6e45941..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ExchangeDeleteBody.h +++ /dev/null @@ -1,89 +0,0 @@ -#ifndef QPID_FRAMING_EXCHANGEDELETEBODY_H -#define QPID_FRAMING_EXCHANGEDELETEBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ExchangeDeleteBody : public ModelMethod { - string exchange; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x7; - static const MethodId METHOD_ID = 0x2; - ExchangeDeleteBody( - ProtocolVersion, const string& _exchange, - bool _ifUnused) : - exchange(_exchange), - flags(0){ - setIfUnused(_ifUnused); - flags |= (1 << 8); - } - ExchangeDeleteBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setExchange(const string& _exchange); - QPID_COMMON_EXTERN const string& getExchange() const; - QPID_COMMON_EXTERN bool hasExchange() const; - QPID_COMMON_EXTERN void clearExchangeFlag(); - QPID_COMMON_EXTERN void setIfUnused(bool _ifUnused); - QPID_COMMON_EXTERN bool getIfUnused() const; - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.delete_(getExchange(), getIfUnused()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ExchangeDeleteBody */ - -}} -#endif /*!QPID_FRAMING_EXCHANGEDELETEBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ExchangeQueryBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ExchangeQueryBody.h deleted file mode 100644 index d4d56a56db..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ExchangeQueryBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_EXCHANGEQUERYBODY_H -#define QPID_FRAMING_EXCHANGEQUERYBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ExchangeQueryBody : public ModelMethod { - string name; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x7; - static const MethodId METHOD_ID = 0x3; - ExchangeQueryBody( - ProtocolVersion, const string& _name) : - name(_name), - flags(0){ - flags |= (1 << 8); - } - ExchangeQueryBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setName(const string& _name); - QPID_COMMON_EXTERN const string& getName() const; - QPID_COMMON_EXTERN bool hasName() const; - QPID_COMMON_EXTERN void clearNameFlag(); - typedef ExchangeQueryResult ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.query(getName()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return true; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ExchangeQueryBody */ - -}} -#endif /*!QPID_FRAMING_EXCHANGEQUERYBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ExchangeQueryResult.h b/nativeLib/org.apache.qpid/include/qpid/framing/ExchangeQueryResult.h deleted file mode 100644 index 505a476a0e..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ExchangeQueryResult.h +++ /dev/null @@ -1,83 +0,0 @@ -#ifndef QPID_FRAMING_EXCHANGEQUERYRESULT_H -#define QPID_FRAMING_EXCHANGEQUERYRESULT_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ExchangeQueryResult { - string type; - FieldTable arguments; - uint16_t flags; -public: - static const uint16_t TYPE = 1793; - ExchangeQueryResult( - const string& _type, - bool _durable, - bool _notFound, - const FieldTable& _arguments) : - type(_type), - arguments(_arguments), - flags(0){ - setDurable(_durable); - setNotFound(_notFound); - flags |= (1 << 8); - flags |= (1 << 11); - } - ExchangeQueryResult() : flags(0) {} - - QPID_COMMON_EXTERN void setType(const string& _type); - QPID_COMMON_EXTERN const string& getType() const; - QPID_COMMON_EXTERN bool hasType() const; - QPID_COMMON_EXTERN void clearTypeFlag(); - QPID_COMMON_EXTERN void setDurable(bool _durable); - QPID_COMMON_EXTERN bool getDurable() const; - QPID_COMMON_EXTERN void setNotFound(bool _notFound); - QPID_COMMON_EXTERN bool getNotFound() const; - QPID_COMMON_EXTERN void setArguments(const FieldTable& _arguments); - QPID_COMMON_EXTERN const FieldTable& getArguments() const; - QPID_COMMON_EXTERN FieldTable& getArguments(); - QPID_COMMON_EXTERN bool hasArguments() const; - QPID_COMMON_EXTERN void clearArgumentsFlag(); - QPID_COMMON_EXTERN friend std::ostream& operator<<(std::ostream&, const ExchangeQueryResult&); - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ExchangeQueryResult */ - -}} -#endif /*!QPID_FRAMING_EXCHANGEQUERYRESULT_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ExchangeUnbindBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ExchangeUnbindBody.h deleted file mode 100644 index 669830d0b8..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ExchangeUnbindBody.h +++ /dev/null @@ -1,101 +0,0 @@ -#ifndef QPID_FRAMING_EXCHANGEUNBINDBODY_H -#define QPID_FRAMING_EXCHANGEUNBINDBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ExchangeUnbindBody : public ModelMethod { - string queue; - string exchange; - string bindingKey; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x7; - static const MethodId METHOD_ID = 0x5; - ExchangeUnbindBody( - ProtocolVersion, const string& _queue, - const string& _exchange, - const string& _bindingKey) : - queue(_queue), - exchange(_exchange), - bindingKey(_bindingKey), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - flags |= (1 << 10); - } - ExchangeUnbindBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setQueue(const string& _queue); - QPID_COMMON_EXTERN const string& getQueue() const; - QPID_COMMON_EXTERN bool hasQueue() const; - QPID_COMMON_EXTERN void clearQueueFlag(); - QPID_COMMON_EXTERN void setExchange(const string& _exchange); - QPID_COMMON_EXTERN const string& getExchange() const; - QPID_COMMON_EXTERN bool hasExchange() const; - QPID_COMMON_EXTERN void clearExchangeFlag(); - QPID_COMMON_EXTERN void setBindingKey(const string& _bindingKey); - QPID_COMMON_EXTERN const string& getBindingKey() const; - QPID_COMMON_EXTERN bool hasBindingKey() const; - QPID_COMMON_EXTERN void clearBindingKeyFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.unbind(getQueue(), getExchange(), getBindingKey()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ExchangeUnbindBody */ - -}} -#endif /*!QPID_FRAMING_EXCHANGEUNBINDBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ExecutionExceptionBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ExecutionExceptionBody.h deleted file mode 100644 index 79cea3136f..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ExecutionExceptionBody.h +++ /dev/null @@ -1,134 +0,0 @@ -#ifndef QPID_FRAMING_EXECUTIONEXCEPTIONBODY_H -#define QPID_FRAMING_EXECUTIONEXCEPTIONBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ExecutionExceptionBody : public ModelMethod { - uint16_t errorCode; - SequenceNumber commandId; - uint8_t classCode; - uint8_t commandCode; - uint8_t fieldIndex; - string description; - FieldTable errorInfo; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x3; - static const MethodId METHOD_ID = 0x3; - ExecutionExceptionBody( - ProtocolVersion, uint16_t _errorCode, - const SequenceNumber& _commandId, - uint8_t _classCode, - uint8_t _commandCode, - uint8_t _fieldIndex, - const string& _description, - const FieldTable& _errorInfo) : - errorCode(_errorCode), - commandId(_commandId), - classCode(_classCode), - commandCode(_commandCode), - fieldIndex(_fieldIndex), - description(_description), - errorInfo(_errorInfo), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - flags |= (1 << 10); - flags |= (1 << 11); - flags |= (1 << 12); - flags |= (1 << 13); - flags |= (1 << 14); - } - ExecutionExceptionBody(ProtocolVersion=ProtocolVersion()) : errorCode(0), classCode(0), commandCode(0), fieldIndex(0), flags(0) {} - - QPID_COMMON_EXTERN void setErrorCode(uint16_t _errorCode); - QPID_COMMON_EXTERN uint16_t getErrorCode() const; - QPID_COMMON_EXTERN bool hasErrorCode() const; - QPID_COMMON_EXTERN void clearErrorCodeFlag(); - QPID_COMMON_EXTERN void setCommandId(const SequenceNumber& _commandId); - QPID_COMMON_EXTERN SequenceNumber getCommandId() const; - QPID_COMMON_EXTERN bool hasCommandId() const; - QPID_COMMON_EXTERN void clearCommandIdFlag(); - QPID_COMMON_EXTERN void setClassCode(uint8_t _classCode); - QPID_COMMON_EXTERN uint8_t getClassCode() const; - QPID_COMMON_EXTERN bool hasClassCode() const; - QPID_COMMON_EXTERN void clearClassCodeFlag(); - QPID_COMMON_EXTERN void setCommandCode(uint8_t _commandCode); - QPID_COMMON_EXTERN uint8_t getCommandCode() const; - QPID_COMMON_EXTERN bool hasCommandCode() const; - QPID_COMMON_EXTERN void clearCommandCodeFlag(); - QPID_COMMON_EXTERN void setFieldIndex(uint8_t _fieldIndex); - QPID_COMMON_EXTERN uint8_t getFieldIndex() const; - QPID_COMMON_EXTERN bool hasFieldIndex() const; - QPID_COMMON_EXTERN void clearFieldIndexFlag(); - QPID_COMMON_EXTERN void setDescription(const string& _description); - QPID_COMMON_EXTERN const string& getDescription() const; - QPID_COMMON_EXTERN bool hasDescription() const; - QPID_COMMON_EXTERN void clearDescriptionFlag(); - QPID_COMMON_EXTERN void setErrorInfo(const FieldTable& _errorInfo); - QPID_COMMON_EXTERN const FieldTable& getErrorInfo() const; - QPID_COMMON_EXTERN FieldTable& getErrorInfo(); - QPID_COMMON_EXTERN bool hasErrorInfo() const; - QPID_COMMON_EXTERN void clearErrorInfoFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.exception(getErrorCode(), getCommandId(), getClassCode(), getCommandCode(), getFieldIndex(), getDescription(), getErrorInfo()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ExecutionExceptionBody */ - -}} -#endif /*!QPID_FRAMING_EXECUTIONEXCEPTIONBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ExecutionResultBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ExecutionResultBody.h deleted file mode 100644 index 599b7e3fea..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ExecutionResultBody.h +++ /dev/null @@ -1,93 +0,0 @@ -#ifndef QPID_FRAMING_EXECUTIONRESULTBODY_H -#define QPID_FRAMING_EXECUTIONRESULTBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ExecutionResultBody : public ModelMethod { - SequenceNumber commandId; - string value; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x3; - static const MethodId METHOD_ID = 0x2; - ExecutionResultBody( - ProtocolVersion, const SequenceNumber& _commandId, - const string& _value) : - commandId(_commandId), - value(_value), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - } - ExecutionResultBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setCommandId(const SequenceNumber& _commandId); - QPID_COMMON_EXTERN SequenceNumber getCommandId() const; - QPID_COMMON_EXTERN bool hasCommandId() const; - QPID_COMMON_EXTERN void clearCommandIdFlag(); - QPID_COMMON_EXTERN void setValue(const string& _value); - QPID_COMMON_EXTERN const string& getValue() const; - QPID_COMMON_EXTERN bool hasValue() const; - QPID_COMMON_EXTERN void clearValueFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.result(getCommandId(), getValue()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ExecutionResultBody */ - -}} -#endif /*!QPID_FRAMING_EXECUTIONRESULTBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ExecutionSyncBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/ExecutionSyncBody.h deleted file mode 100644 index 19bbcf63e8..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ExecutionSyncBody.h +++ /dev/null @@ -1,74 +0,0 @@ -#ifndef QPID_FRAMING_EXECUTIONSYNCBODY_H -#define QPID_FRAMING_EXECUTIONSYNCBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ExecutionSyncBody : public ModelMethod { - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x3; - static const MethodId METHOD_ID = 0x1; - ExecutionSyncBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.sync(); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ExecutionSyncBody */ - -}} -#endif /*!QPID_FRAMING_EXECUTIONSYNCBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/FieldTable.h b/nativeLib/org.apache.qpid/include/qpid/framing/FieldTable.h deleted file mode 100644 index fdb1a28b9d..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/FieldTable.h +++ /dev/null @@ -1,129 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#include -#include -#include -#include -#include "qpid/framing/amqp_types.h" -#include "qpid/CommonImportExport.h" - -#ifndef _FieldTable_ -#define _FieldTable_ - -namespace qpid { - /** - * The framing namespace contains classes that are used to create, - * send and receive the basic packets from which AMQP is built. - */ -namespace framing { - -class Array; -class FieldValue; -class Buffer; - -/** - * A set of name-value pairs. (See the AMQP spec for more details on - * AMQP field tables). - * - * \ingroup clientapi - */ -class FieldTable -{ - public: - typedef boost::shared_ptr ValuePtr; - typedef std::map ValueMap; - typedef ValueMap::iterator iterator; - typedef ValueMap::const_iterator const_iterator; - typedef ValueMap::const_reference const_reference; - typedef ValueMap::reference reference; - typedef ValueMap::value_type value_type; - - QPID_COMMON_EXTERN FieldTable() {}; - QPID_COMMON_EXTERN FieldTable(const FieldTable& ft); - QPID_COMMON_EXTERN ~FieldTable(); - QPID_COMMON_EXTERN FieldTable& operator=(const FieldTable& ft); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN void encode(Buffer& buffer) const; - QPID_COMMON_EXTERN void decode(Buffer& buffer); - - QPID_COMMON_EXTERN int count() const; - QPID_COMMON_EXTERN void set(const std::string& name, const ValuePtr& value); - QPID_COMMON_EXTERN ValuePtr get(const std::string& name) const; - QPID_COMMON_EXTERN bool isSet(const std::string& name) const { return get(name).get() != 0; } - - QPID_COMMON_EXTERN void setString(const std::string& name, const std::string& value); - QPID_COMMON_EXTERN void setInt(const std::string& name, const int value); - QPID_COMMON_EXTERN void setInt64(const std::string& name, const int64_t value); - QPID_COMMON_EXTERN void setTimestamp(const std::string& name, const uint64_t value); - QPID_COMMON_EXTERN void setUInt64(const std::string& name, const uint64_t value); - QPID_COMMON_EXTERN void setTable(const std::string& name, const FieldTable& value); - QPID_COMMON_EXTERN void setArray(const std::string& name, const Array& value); - QPID_COMMON_EXTERN void setFloat(const std::string& name, const float value); - QPID_COMMON_EXTERN void setDouble(const std::string& name, const double value); - //void setDecimal(string& name, xxx& value); - - QPID_COMMON_EXTERN int getAsInt(const std::string& name) const; - QPID_COMMON_EXTERN uint64_t getAsUInt64(const std::string& name) const; - QPID_COMMON_EXTERN int64_t getAsInt64(const std::string& name) const; - QPID_COMMON_EXTERN std::string getAsString(const std::string& name) const; - - QPID_COMMON_EXTERN bool getTable(const std::string& name, FieldTable& value) const; - QPID_COMMON_EXTERN bool getArray(const std::string& name, Array& value) const; - QPID_COMMON_EXTERN bool getFloat(const std::string& name, float& value) const; - QPID_COMMON_EXTERN bool getDouble(const std::string& name, double& value) const; - //bool getTimestamp(const std::string& name, uint64_t& value) const; - //bool getDecimal(string& name, xxx& value); - QPID_COMMON_EXTERN void erase(const std::string& name); - - - QPID_COMMON_EXTERN bool operator==(const FieldTable& other) const; - - // Map-like interface. - ValueMap::const_iterator begin() const { return values.begin(); } - ValueMap::const_iterator end() const { return values.end(); } - ValueMap::const_iterator find(const std::string& s) const { return values.find(s); } - - ValueMap::iterator begin() { return values.begin(); } - ValueMap::iterator end() { return values.end(); } - ValueMap::iterator find(const std::string& s) { return values.find(s); } - - QPID_COMMON_EXTERN std::pair insert(const ValueMap::value_type&); - QPID_COMMON_EXTERN ValueMap::iterator insert(ValueMap::iterator, const ValueMap::value_type&); - void clear() { values.clear(); } - - // ### Hack Alert - - ValueMap::iterator getValues() { return values.begin(); } - - private: - ValueMap values; - - QPID_COMMON_EXTERN friend std::ostream& operator<<(std::ostream& out, const FieldTable& body); -}; - -//class FieldNotFoundException{}; -//class UnknownFieldName : public FieldNotFoundException{}; -//class IncorrectFieldType : public FieldNotFoundException{}; -} -} - - -#endif diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/FieldValue.h b/nativeLib/org.apache.qpid/include/qpid/framing/FieldValue.h deleted file mode 100644 index 19220e74d5..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/FieldValue.h +++ /dev/null @@ -1,461 +0,0 @@ -#ifndef _framing_FieldValue_h -#define _framing_FieldValue_h -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include "qpid/Exception.h" -#include "qpid/framing/amqp_types.h" -#include "qpid/framing/Buffer.h" -#include "qpid/framing/FieldTable.h" -#include "qpid/CommonImportExport.h" - -#include -#include -#include - -#include - -namespace qpid { -namespace framing { - -/** - * Exception that is the base exception for all field table errors. - * - * \ingroup clientapi - */ -class FieldValueException : public qpid::Exception {}; - -/** - * Exception thrown when we can't perform requested conversion - * - * \ingroup clientapi - */ -struct InvalidConversionException : public FieldValueException { - InvalidConversionException() {} -}; - -class List; - -/** - * Value that can appear in an AMQP field table - * - * \ingroup clientapi - */ -class FieldValue { - public: - /* - * Abstract type for content of different types - */ - class Data { - public: - virtual ~Data() {}; - virtual uint32_t encodedSize() const = 0; - virtual void encode(Buffer& buffer) = 0; - virtual void decode(Buffer& buffer) = 0; - virtual bool operator==(const Data&) const = 0; - - virtual bool convertsToInt() const { return false; } - virtual bool convertsToString() const { return false; } - virtual int64_t getInt() const { throw InvalidConversionException();} - virtual std::string getString() const { throw InvalidConversionException(); } - - virtual void print(std::ostream& out) const = 0; - }; - - FieldValue(): data(0) {}; - // Default assignment operator is fine - void setType(uint8_t type); - QPID_COMMON_EXTERN uint8_t getType() const; - Data& getData() { return *data; } - uint32_t encodedSize() const { return 1 + data->encodedSize(); }; - bool empty() const { return data.get() == 0; } - void encode(Buffer& buffer); - void decode(Buffer& buffer); - QPID_COMMON_EXTERN bool operator==(const FieldValue&) const; - QPID_COMMON_EXTERN bool operator!=(const FieldValue& v) const { return !(*this == v); } - - QPID_COMMON_EXTERN void print(std::ostream& out) const; - - template bool convertsTo() const { return false; } - template T get() const { throw InvalidConversionException(); } - - template T getIntegerValue() const; - template T getFloatingPointValue() const; - template void getFixedWidthValue(unsigned char*) const; - template bool get(T&) const; - - protected: - FieldValue(uint8_t t, Data* d): typeOctet(t), data(d) {} - - QPID_COMMON_EXTERN static uint8_t* convertIfRequired(uint8_t* const octets, int width); - - private: - uint8_t typeOctet; - std::auto_ptr data; - -}; - -template <> -inline bool FieldValue::convertsTo() const { return data->convertsToInt(); } - -template <> -inline bool FieldValue::convertsTo() const { return data->convertsToInt(); } - -template <> -inline bool FieldValue::convertsTo() const { return data->convertsToString(); } - -template <> -inline int FieldValue::get() const { return static_cast(data->getInt()); } - -template <> -inline int64_t FieldValue::get() const { return data->getInt(); } - -template <> -inline std::string FieldValue::get() const { return data->getString(); } - -inline std::ostream& operator<<(std::ostream& out, const FieldValue& v) { - v.print(out); - return out; -} - -template -class FixedWidthValue : public FieldValue::Data { - uint8_t octets[width]; - - public: - FixedWidthValue() {} - FixedWidthValue(const uint8_t (&data)[width]) : octets(data) {} - FixedWidthValue(const uint8_t* const data) - { - for (int i = 0; i < width; i++) octets[i] = data[i]; - } - FixedWidthValue(uint64_t v) - { - for (int i = width; i > 1; --i) { - octets[i-1] = (uint8_t) (0xFF & v); v >>= 8; - } - octets[0] = (uint8_t) (0xFF & v); - } - uint32_t encodedSize() const { return width; } - void encode(Buffer& buffer) { buffer.putRawData(octets, width); } - void decode(Buffer& buffer) { buffer.getRawData(octets, width); } - bool operator==(const Data& d) const { - const FixedWidthValue* rhs = dynamic_cast< const FixedWidthValue* >(&d); - if (rhs == 0) return false; - else return std::equal(&octets[0], &octets[width], &rhs->octets[0]); - } - - bool convertsToInt() const { return true; } - int64_t getInt() const - { - int64_t v = 0; - for (int i = 0; i < width-1; ++i) { - v |= octets[i]; v <<= 8; - } - v |= octets[width-1]; - return v; - } - uint8_t* rawOctets() { return octets; } - uint8_t* rawOctets() const { return octets; } - - void print(std::ostream& o) const { o << "F" << width << ":"; }; -}; - -template -inline T FieldValue::getIntegerValue() const -{ - FixedWidthValue* const fwv = dynamic_cast< FixedWidthValue* const>(data.get()); - if (fwv) { - uint8_t* octets = fwv->rawOctets(); - T v = 0; - for (int i = 0; i < W-1; ++i) { - v |= octets[i]; v <<= 8; - } - v |= octets[W-1]; - return v; - } else { - throw InvalidConversionException(); - } -} - -template -inline T FieldValue::getFloatingPointValue() const { - FixedWidthValue* const fwv = dynamic_cast< FixedWidthValue* const>(data.get()); - if (fwv) { - T value; - uint8_t* const octets = convertIfRequired(fwv->rawOctets(), W); - uint8_t* const target = reinterpret_cast(&value); - for (size_t i = 0; i < W; ++i) target[i] = octets[i]; - return value; - } else { - throw InvalidConversionException(); - } -} - -template void FieldValue::getFixedWidthValue(unsigned char* value) const -{ - FixedWidthValue* const fwv = dynamic_cast< FixedWidthValue* const>(data.get()); - if (fwv) { - for (size_t i = 0; i < W; ++i) value[i] = fwv->rawOctets()[i]; - } else { - throw InvalidConversionException(); - } -} - -template <> -inline float FieldValue::get() const { - return getFloatingPointValue(); -} - -template <> -inline double FieldValue::get() const { - return getFloatingPointValue(); -} - -template <> -class FixedWidthValue<0> : public FieldValue::Data { - public: - // Implicit default constructor is fine - uint32_t encodedSize() const { return 0; } - void encode(Buffer&) {}; - void decode(Buffer&) {}; - bool operator==(const Data& d) const { - const FixedWidthValue<0>* rhs = dynamic_cast< const FixedWidthValue<0>* >(&d); - return rhs != 0; - } - void print(std::ostream& o) const { o << "F0"; }; -}; - -template -class VariableWidthValue : public FieldValue::Data { - std::vector octets; - - public: - VariableWidthValue() {} - VariableWidthValue(const std::vector& data) : octets(data) {} - VariableWidthValue(const uint8_t* start, const uint8_t* end) : octets(start, end) {} - uint32_t encodedSize() const { return lenwidth + octets.size(); } - void encode(Buffer& buffer) { - buffer.putUInt(octets.size()); - if (octets.size() > 0) - buffer.putRawData(&octets[0], octets.size()); - }; - void decode(Buffer& buffer) { - uint32_t len = buffer.getUInt(); - octets.resize(len); - if (len > 0) - buffer.getRawData(&octets[0], len); - } - bool operator==(const Data& d) const { - const VariableWidthValue* rhs = dynamic_cast< const VariableWidthValue* >(&d); - if (rhs == 0) return false; - else return octets==rhs->octets; - } - - bool convertsToString() const { return true; } - std::string getString() const { return std::string(octets.begin(), octets.end()); } - - void print(std::ostream& o) const { o << "V" << lenwidth << ":" << octets.size() << ":"; }; -}; - -template -class EncodedValue : public FieldValue::Data { - T value; - public: - - EncodedValue() {} - EncodedValue(const T& v) : value(v) {} - - T& getValue() { return value; } - const T& getValue() const { return value; } - - uint32_t encodedSize() const { return value.encodedSize(); } - - void encode(Buffer& buffer) { - value.encode(buffer); - }; - void decode(Buffer& buffer) { - value.decode(buffer); - } - bool operator==(const Data& d) const { - const EncodedValue* rhs = dynamic_cast< const EncodedValue* >(&d); - if (rhs == 0) return false; - else return value==rhs->value; - } - - void print(std::ostream& o) const { o << "[" << value << "]"; }; -}; - -/** - * Accessor that can be used to get values of type FieldTable, Array - * and List. - */ -template -inline bool FieldValue::get(T& t) const -{ - const EncodedValue* v = dynamic_cast< EncodedValue* >(data.get()); - if (v != 0) { - t = v->getValue(); - return true; - } else { - try { - t = get(); - return true; - } catch (const InvalidConversionException&) { - return false; - } - } -} - -class Str8Value : public FieldValue { - public: - QPID_COMMON_EXTERN Str8Value(const std::string& v); -}; - -class Str16Value : public FieldValue { - public: - QPID_COMMON_EXTERN Str16Value(const std::string& v); -}; - -class Var16Value : public FieldValue { - public: - QPID_COMMON_EXTERN Var16Value(const std::string& v, uint8_t code); -}; - -class Var32Value : public FieldValue { - public: - QPID_COMMON_EXTERN Var32Value(const std::string& v, uint8_t code); -}; - -class Struct32Value : public FieldValue { - public: - QPID_COMMON_EXTERN Struct32Value(const std::string& v); -}; - -class FloatValue : public FieldValue -{ - public: - QPID_COMMON_EXTERN FloatValue(float f); -}; -class DoubleValue : public FieldValue -{ - public: - QPID_COMMON_EXTERN DoubleValue(double f); -}; - -/* - * Basic integer value encodes as signed 32 bit - */ -class IntegerValue : public FieldValue { - public: - QPID_COMMON_EXTERN IntegerValue(int v); -}; - -class TimeValue : public FieldValue { - public: - QPID_COMMON_EXTERN TimeValue(uint64_t v); -}; - -class Integer64Value : public FieldValue { - public: - QPID_COMMON_EXTERN Integer64Value(int64_t v); -}; - -class Unsigned64Value : public FieldValue { - public: - QPID_COMMON_EXTERN Unsigned64Value(uint64_t v); -}; - -class FieldTableValue : public FieldValue { - public: - typedef FieldTable ValueType; - QPID_COMMON_EXTERN FieldTableValue(const FieldTable&); -}; - -class ArrayValue : public FieldValue { - public: - QPID_COMMON_EXTERN ArrayValue(const Array&); -}; - -class VoidValue : public FieldValue { - public: - QPID_COMMON_EXTERN VoidValue(); -}; - -class BoolValue : public FieldValue { - public: - QPID_COMMON_EXTERN BoolValue(bool); -}; - -class Unsigned8Value : public FieldValue { - public: - QPID_COMMON_EXTERN Unsigned8Value(uint8_t); -}; - -class Unsigned16Value : public FieldValue { - public: - QPID_COMMON_EXTERN Unsigned16Value(uint16_t); -}; - -class Unsigned32Value : public FieldValue { - public: - QPID_COMMON_EXTERN Unsigned32Value(uint32_t); -}; - -class Integer8Value : public FieldValue { - public: - QPID_COMMON_EXTERN Integer8Value(int8_t); -}; - -class Integer16Value : public FieldValue { - public: - QPID_COMMON_EXTERN Integer16Value(int16_t); -}; - -typedef IntegerValue Integer32Value; - -class ListValue : public FieldValue { - public: - typedef List ValueType; - QPID_COMMON_EXTERN ListValue(const List&); -}; - -class UuidValue : public FieldValue { - public: - QPID_COMMON_EXTERN UuidValue(const unsigned char*); -}; - -template -bool getEncodedValue(FieldTable::ValuePtr vptr, T& value) -{ - if (vptr) { - const EncodedValue* ev = dynamic_cast< EncodedValue* >(&(vptr->getData())); - if (ev != 0) { - value = ev->getValue(); - return true; - } - } - return false; -} - -}} // qpid::framing - -#endif diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/FileAckBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/FileAckBody.h deleted file mode 100644 index fe105da5d0..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/FileAckBody.h +++ /dev/null @@ -1,89 +0,0 @@ -#ifndef QPID_FRAMING_FILEACKBODY_H -#define QPID_FRAMING_FILEACKBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class FileAckBody : public ModelMethod { - uint64_t deliveryTag; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x9; - static const MethodId METHOD_ID = 0xc; - FileAckBody( - ProtocolVersion, uint64_t _deliveryTag, - bool _multiple) : - deliveryTag(_deliveryTag), - flags(0){ - setMultiple(_multiple); - flags |= (1 << 8); - } - FileAckBody(ProtocolVersion=ProtocolVersion()) : deliveryTag(0), flags(0) {} - - QPID_COMMON_EXTERN void setDeliveryTag(uint64_t _deliveryTag); - QPID_COMMON_EXTERN uint64_t getDeliveryTag() const; - QPID_COMMON_EXTERN bool hasDeliveryTag() const; - QPID_COMMON_EXTERN void clearDeliveryTagFlag(); - QPID_COMMON_EXTERN void setMultiple(bool _multiple); - QPID_COMMON_EXTERN bool getMultiple() const; - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.ack(getDeliveryTag(), getMultiple()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class FileAckBody */ - -}} -#endif /*!QPID_FRAMING_FILEACKBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/FileCancelBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/FileCancelBody.h deleted file mode 100644 index a487ed780e..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/FileCancelBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_FILECANCELBODY_H -#define QPID_FRAMING_FILECANCELBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class FileCancelBody : public ModelMethod { - string consumerTag; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x9; - static const MethodId METHOD_ID = 0x5; - FileCancelBody( - ProtocolVersion, const string& _consumerTag) : - consumerTag(_consumerTag), - flags(0){ - flags |= (1 << 8); - } - FileCancelBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setConsumerTag(const string& _consumerTag); - QPID_COMMON_EXTERN const string& getConsumerTag() const; - QPID_COMMON_EXTERN bool hasConsumerTag() const; - QPID_COMMON_EXTERN void clearConsumerTagFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.cancel(getConsumerTag()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class FileCancelBody */ - -}} -#endif /*!QPID_FRAMING_FILECANCELBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/FileConsumeBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/FileConsumeBody.h deleted file mode 100644 index ecd050a9b5..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/FileConsumeBody.h +++ /dev/null @@ -1,118 +0,0 @@ -#ifndef QPID_FRAMING_FILECONSUMEBODY_H -#define QPID_FRAMING_FILECONSUMEBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class FileConsumeBody : public ModelMethod { - string queue; - string consumerTag; - FieldTable arguments; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x9; - static const MethodId METHOD_ID = 0x3; - FileConsumeBody( - ProtocolVersion, const string& _queue, - const string& _consumerTag, - bool _noLocal, - bool _noAck, - bool _exclusive, - bool _nowait, - const FieldTable& _arguments) : - queue(_queue), - consumerTag(_consumerTag), - arguments(_arguments), - flags(0){ - setNoLocal(_noLocal); - setNoAck(_noAck); - setExclusive(_exclusive); - setNowait(_nowait); - flags |= (1 << 8); - flags |= (1 << 9); - flags |= (1 << 14); - } - FileConsumeBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setQueue(const string& _queue); - QPID_COMMON_EXTERN const string& getQueue() const; - QPID_COMMON_EXTERN bool hasQueue() const; - QPID_COMMON_EXTERN void clearQueueFlag(); - QPID_COMMON_EXTERN void setConsumerTag(const string& _consumerTag); - QPID_COMMON_EXTERN const string& getConsumerTag() const; - QPID_COMMON_EXTERN bool hasConsumerTag() const; - QPID_COMMON_EXTERN void clearConsumerTagFlag(); - QPID_COMMON_EXTERN void setNoLocal(bool _noLocal); - QPID_COMMON_EXTERN bool getNoLocal() const; - QPID_COMMON_EXTERN void setNoAck(bool _noAck); - QPID_COMMON_EXTERN bool getNoAck() const; - QPID_COMMON_EXTERN void setExclusive(bool _exclusive); - QPID_COMMON_EXTERN bool getExclusive() const; - QPID_COMMON_EXTERN void setNowait(bool _nowait); - QPID_COMMON_EXTERN bool getNowait() const; - QPID_COMMON_EXTERN void setArguments(const FieldTable& _arguments); - QPID_COMMON_EXTERN const FieldTable& getArguments() const; - QPID_COMMON_EXTERN FieldTable& getArguments(); - QPID_COMMON_EXTERN bool hasArguments() const; - QPID_COMMON_EXTERN void clearArgumentsFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.consume(getQueue(), getConsumerTag(), getNoLocal(), getNoAck(), getExclusive(), getNowait(), getArguments()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return true; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class FileConsumeBody */ - -}} -#endif /*!QPID_FRAMING_FILECONSUMEBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/FileConsumeOkBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/FileConsumeOkBody.h deleted file mode 100644 index 45e2d2dade..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/FileConsumeOkBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_FILECONSUMEOKBODY_H -#define QPID_FRAMING_FILECONSUMEOKBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class FileConsumeOkBody : public ModelMethod { - string consumerTag; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x9; - static const MethodId METHOD_ID = 0x4; - FileConsumeOkBody( - ProtocolVersion, const string& _consumerTag) : - consumerTag(_consumerTag), - flags(0){ - flags |= (1 << 8); - } - FileConsumeOkBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setConsumerTag(const string& _consumerTag); - QPID_COMMON_EXTERN const string& getConsumerTag() const; - QPID_COMMON_EXTERN bool hasConsumerTag() const; - QPID_COMMON_EXTERN void clearConsumerTagFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.consumeOk(getConsumerTag()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class FileConsumeOkBody */ - -}} -#endif /*!QPID_FRAMING_FILECONSUMEOKBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/FileDeliverBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/FileDeliverBody.h deleted file mode 100644 index 9ae8c9ce53..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/FileDeliverBody.h +++ /dev/null @@ -1,121 +0,0 @@ -#ifndef QPID_FRAMING_FILEDELIVERBODY_H -#define QPID_FRAMING_FILEDELIVERBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class FileDeliverBody : public ModelMethod { - string consumerTag; - uint64_t deliveryTag; - string exchange; - string routingKey; - string identifier; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x9; - static const MethodId METHOD_ID = 0xb; - FileDeliverBody( - ProtocolVersion, const string& _consumerTag, - uint64_t _deliveryTag, - bool _redelivered, - const string& _exchange, - const string& _routingKey, - const string& _identifier) : - consumerTag(_consumerTag), - deliveryTag(_deliveryTag), - exchange(_exchange), - routingKey(_routingKey), - identifier(_identifier), - flags(0){ - setRedelivered(_redelivered); - flags |= (1 << 8); - flags |= (1 << 9); - flags |= (1 << 11); - flags |= (1 << 12); - flags |= (1 << 13); - } - FileDeliverBody(ProtocolVersion=ProtocolVersion()) : deliveryTag(0), flags(0) {} - - QPID_COMMON_EXTERN void setConsumerTag(const string& _consumerTag); - QPID_COMMON_EXTERN const string& getConsumerTag() const; - QPID_COMMON_EXTERN bool hasConsumerTag() const; - QPID_COMMON_EXTERN void clearConsumerTagFlag(); - QPID_COMMON_EXTERN void setDeliveryTag(uint64_t _deliveryTag); - QPID_COMMON_EXTERN uint64_t getDeliveryTag() const; - QPID_COMMON_EXTERN bool hasDeliveryTag() const; - QPID_COMMON_EXTERN void clearDeliveryTagFlag(); - QPID_COMMON_EXTERN void setRedelivered(bool _redelivered); - QPID_COMMON_EXTERN bool getRedelivered() const; - QPID_COMMON_EXTERN void setExchange(const string& _exchange); - QPID_COMMON_EXTERN const string& getExchange() const; - QPID_COMMON_EXTERN bool hasExchange() const; - QPID_COMMON_EXTERN void clearExchangeFlag(); - QPID_COMMON_EXTERN void setRoutingKey(const string& _routingKey); - QPID_COMMON_EXTERN const string& getRoutingKey() const; - QPID_COMMON_EXTERN bool hasRoutingKey() const; - QPID_COMMON_EXTERN void clearRoutingKeyFlag(); - QPID_COMMON_EXTERN void setIdentifier(const string& _identifier); - QPID_COMMON_EXTERN const string& getIdentifier() const; - QPID_COMMON_EXTERN bool hasIdentifier() const; - QPID_COMMON_EXTERN void clearIdentifierFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.deliver(getConsumerTag(), getDeliveryTag(), getRedelivered(), getExchange(), getRoutingKey(), getIdentifier()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class FileDeliverBody */ - -}} -#endif /*!QPID_FRAMING_FILEDELIVERBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/FileOpenBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/FileOpenBody.h deleted file mode 100644 index 8d23c3aa16..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/FileOpenBody.h +++ /dev/null @@ -1,93 +0,0 @@ -#ifndef QPID_FRAMING_FILEOPENBODY_H -#define QPID_FRAMING_FILEOPENBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class FileOpenBody : public ModelMethod { - string identifier; - uint64_t contentSize; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x9; - static const MethodId METHOD_ID = 0x6; - FileOpenBody( - ProtocolVersion, const string& _identifier, - uint64_t _contentSize) : - identifier(_identifier), - contentSize(_contentSize), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - } - FileOpenBody(ProtocolVersion=ProtocolVersion()) : contentSize(0), flags(0) {} - - QPID_COMMON_EXTERN void setIdentifier(const string& _identifier); - QPID_COMMON_EXTERN const string& getIdentifier() const; - QPID_COMMON_EXTERN bool hasIdentifier() const; - QPID_COMMON_EXTERN void clearIdentifierFlag(); - QPID_COMMON_EXTERN void setContentSize(uint64_t _contentSize); - QPID_COMMON_EXTERN uint64_t getContentSize() const; - QPID_COMMON_EXTERN bool hasContentSize() const; - QPID_COMMON_EXTERN void clearContentSizeFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.open(getIdentifier(), getContentSize()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return true; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class FileOpenBody */ - -}} -#endif /*!QPID_FRAMING_FILEOPENBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/FileOpenOkBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/FileOpenOkBody.h deleted file mode 100644 index 36b38b39b4..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/FileOpenOkBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_FILEOPENOKBODY_H -#define QPID_FRAMING_FILEOPENOKBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class FileOpenOkBody : public ModelMethod { - uint64_t stagedSize; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x9; - static const MethodId METHOD_ID = 0x7; - FileOpenOkBody( - ProtocolVersion, uint64_t _stagedSize) : - stagedSize(_stagedSize), - flags(0){ - flags |= (1 << 8); - } - FileOpenOkBody(ProtocolVersion=ProtocolVersion()) : stagedSize(0), flags(0) {} - - QPID_COMMON_EXTERN void setStagedSize(uint64_t _stagedSize); - QPID_COMMON_EXTERN uint64_t getStagedSize() const; - QPID_COMMON_EXTERN bool hasStagedSize() const; - QPID_COMMON_EXTERN void clearStagedSizeFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.openOk(getStagedSize()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return true; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class FileOpenOkBody */ - -}} -#endif /*!QPID_FRAMING_FILEOPENOKBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/FileProperties.h b/nativeLib/org.apache.qpid/include/qpid/framing/FileProperties.h deleted file mode 100644 index 7d91643aaa..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/FileProperties.h +++ /dev/null @@ -1,131 +0,0 @@ -#ifndef QPID_FRAMING_FILEPROPERTIES_H -#define QPID_FRAMING_FILEPROPERTIES_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class FileProperties { - string contentType; - string contentEncoding; - FieldTable headers; - uint8_t priority; - string replyTo; - string messageId; - string filename; - uint64_t timestamp; - string clusterId; - uint16_t flags; -public: - static const uint16_t TYPE = 2305; - FileProperties( - const string& _contentType, - const string& _contentEncoding, - const FieldTable& _headers, - uint8_t _priority, - const string& _replyTo, - const string& _messageId, - const string& _filename, - uint64_t _timestamp, - const string& _clusterId) : - contentType(_contentType), - contentEncoding(_contentEncoding), - headers(_headers), - priority(_priority), - replyTo(_replyTo), - messageId(_messageId), - filename(_filename), - timestamp(_timestamp), - clusterId(_clusterId), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - flags |= (1 << 10); - flags |= (1 << 11); - flags |= (1 << 12); - flags |= (1 << 13); - flags |= (1 << 14); - flags |= (1 << 15); - flags |= (1 << 0); - } - FileProperties() : priority(0), timestamp(0), flags(0) {} - - QPID_COMMON_EXTERN void setContentType(const string& _contentType); - QPID_COMMON_EXTERN const string& getContentType() const; - QPID_COMMON_EXTERN bool hasContentType() const; - QPID_COMMON_EXTERN void clearContentTypeFlag(); - QPID_COMMON_EXTERN void setContentEncoding(const string& _contentEncoding); - QPID_COMMON_EXTERN const string& getContentEncoding() const; - QPID_COMMON_EXTERN bool hasContentEncoding() const; - QPID_COMMON_EXTERN void clearContentEncodingFlag(); - QPID_COMMON_EXTERN void setHeaders(const FieldTable& _headers); - QPID_COMMON_EXTERN const FieldTable& getHeaders() const; - QPID_COMMON_EXTERN FieldTable& getHeaders(); - QPID_COMMON_EXTERN bool hasHeaders() const; - QPID_COMMON_EXTERN void clearHeadersFlag(); - QPID_COMMON_EXTERN void setPriority(uint8_t _priority); - QPID_COMMON_EXTERN uint8_t getPriority() const; - QPID_COMMON_EXTERN bool hasPriority() const; - QPID_COMMON_EXTERN void clearPriorityFlag(); - QPID_COMMON_EXTERN void setReplyTo(const string& _replyTo); - QPID_COMMON_EXTERN const string& getReplyTo() const; - QPID_COMMON_EXTERN bool hasReplyTo() const; - QPID_COMMON_EXTERN void clearReplyToFlag(); - QPID_COMMON_EXTERN void setMessageId(const string& _messageId); - QPID_COMMON_EXTERN const string& getMessageId() const; - QPID_COMMON_EXTERN bool hasMessageId() const; - QPID_COMMON_EXTERN void clearMessageIdFlag(); - QPID_COMMON_EXTERN void setFilename(const string& _filename); - QPID_COMMON_EXTERN const string& getFilename() const; - QPID_COMMON_EXTERN bool hasFilename() const; - QPID_COMMON_EXTERN void clearFilenameFlag(); - QPID_COMMON_EXTERN void setTimestamp(uint64_t _timestamp); - QPID_COMMON_EXTERN uint64_t getTimestamp() const; - QPID_COMMON_EXTERN bool hasTimestamp() const; - QPID_COMMON_EXTERN void clearTimestampFlag(); - QPID_COMMON_EXTERN void setClusterId(const string& _clusterId); - QPID_COMMON_EXTERN const string& getClusterId() const; - QPID_COMMON_EXTERN bool hasClusterId() const; - QPID_COMMON_EXTERN void clearClusterIdFlag(); - QPID_COMMON_EXTERN friend std::ostream& operator<<(std::ostream&, const FileProperties&); - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class FileProperties */ - -}} -#endif /*!QPID_FRAMING_FILEPROPERTIES_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/FilePublishBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/FilePublishBody.h deleted file mode 100644 index c28257d039..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/FilePublishBody.h +++ /dev/null @@ -1,109 +0,0 @@ -#ifndef QPID_FRAMING_FILEPUBLISHBODY_H -#define QPID_FRAMING_FILEPUBLISHBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class FilePublishBody : public ModelMethod { - string exchange; - string routingKey; - string identifier; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x9; - static const MethodId METHOD_ID = 0x9; - FilePublishBody( - ProtocolVersion, const string& _exchange, - const string& _routingKey, - bool _mandatory, - bool _immediate, - const string& _identifier) : - exchange(_exchange), - routingKey(_routingKey), - identifier(_identifier), - flags(0){ - setMandatory(_mandatory); - setImmediate(_immediate); - flags |= (1 << 8); - flags |= (1 << 9); - flags |= (1 << 12); - } - FilePublishBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setExchange(const string& _exchange); - QPID_COMMON_EXTERN const string& getExchange() const; - QPID_COMMON_EXTERN bool hasExchange() const; - QPID_COMMON_EXTERN void clearExchangeFlag(); - QPID_COMMON_EXTERN void setRoutingKey(const string& _routingKey); - QPID_COMMON_EXTERN const string& getRoutingKey() const; - QPID_COMMON_EXTERN bool hasRoutingKey() const; - QPID_COMMON_EXTERN void clearRoutingKeyFlag(); - QPID_COMMON_EXTERN void setMandatory(bool _mandatory); - QPID_COMMON_EXTERN bool getMandatory() const; - QPID_COMMON_EXTERN void setImmediate(bool _immediate); - QPID_COMMON_EXTERN bool getImmediate() const; - QPID_COMMON_EXTERN void setIdentifier(const string& _identifier); - QPID_COMMON_EXTERN const string& getIdentifier() const; - QPID_COMMON_EXTERN bool hasIdentifier() const; - QPID_COMMON_EXTERN void clearIdentifierFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.publish(getExchange(), getRoutingKey(), getMandatory(), getImmediate(), getIdentifier()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class FilePublishBody */ - -}} -#endif /*!QPID_FRAMING_FILEPUBLISHBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/FileQosBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/FileQosBody.h deleted file mode 100644 index 78558652aa..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/FileQosBody.h +++ /dev/null @@ -1,97 +0,0 @@ -#ifndef QPID_FRAMING_FILEQOSBODY_H -#define QPID_FRAMING_FILEQOSBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class FileQosBody : public ModelMethod { - uint32_t prefetchSize; - uint16_t prefetchCount; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x9; - static const MethodId METHOD_ID = 0x1; - FileQosBody( - ProtocolVersion, uint32_t _prefetchSize, - uint16_t _prefetchCount, - bool _global) : - prefetchSize(_prefetchSize), - prefetchCount(_prefetchCount), - flags(0){ - setGlobal(_global); - flags |= (1 << 8); - flags |= (1 << 9); - } - FileQosBody(ProtocolVersion=ProtocolVersion()) : prefetchSize(0), prefetchCount(0), flags(0) {} - - QPID_COMMON_EXTERN void setPrefetchSize(uint32_t _prefetchSize); - QPID_COMMON_EXTERN uint32_t getPrefetchSize() const; - QPID_COMMON_EXTERN bool hasPrefetchSize() const; - QPID_COMMON_EXTERN void clearPrefetchSizeFlag(); - QPID_COMMON_EXTERN void setPrefetchCount(uint16_t _prefetchCount); - QPID_COMMON_EXTERN uint16_t getPrefetchCount() const; - QPID_COMMON_EXTERN bool hasPrefetchCount() const; - QPID_COMMON_EXTERN void clearPrefetchCountFlag(); - QPID_COMMON_EXTERN void setGlobal(bool _global); - QPID_COMMON_EXTERN bool getGlobal() const; - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.qos(getPrefetchSize(), getPrefetchCount(), getGlobal()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return true; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class FileQosBody */ - -}} -#endif /*!QPID_FRAMING_FILEQOSBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/FileQosOkBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/FileQosOkBody.h deleted file mode 100644 index 4e596e90eb..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/FileQosOkBody.h +++ /dev/null @@ -1,74 +0,0 @@ -#ifndef QPID_FRAMING_FILEQOSOKBODY_H -#define QPID_FRAMING_FILEQOSOKBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class FileQosOkBody : public ModelMethod { - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x9; - static const MethodId METHOD_ID = 0x2; - FileQosOkBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.qosOk(); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class FileQosOkBody */ - -}} -#endif /*!QPID_FRAMING_FILEQOSOKBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/FileRejectBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/FileRejectBody.h deleted file mode 100644 index b8f3730b4a..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/FileRejectBody.h +++ /dev/null @@ -1,89 +0,0 @@ -#ifndef QPID_FRAMING_FILEREJECTBODY_H -#define QPID_FRAMING_FILEREJECTBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class FileRejectBody : public ModelMethod { - uint64_t deliveryTag; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x9; - static const MethodId METHOD_ID = 0xd; - FileRejectBody( - ProtocolVersion, uint64_t _deliveryTag, - bool _requeue) : - deliveryTag(_deliveryTag), - flags(0){ - setRequeue(_requeue); - flags |= (1 << 8); - } - FileRejectBody(ProtocolVersion=ProtocolVersion()) : deliveryTag(0), flags(0) {} - - QPID_COMMON_EXTERN void setDeliveryTag(uint64_t _deliveryTag); - QPID_COMMON_EXTERN uint64_t getDeliveryTag() const; - QPID_COMMON_EXTERN bool hasDeliveryTag() const; - QPID_COMMON_EXTERN void clearDeliveryTagFlag(); - QPID_COMMON_EXTERN void setRequeue(bool _requeue); - QPID_COMMON_EXTERN bool getRequeue() const; - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.reject(getDeliveryTag(), getRequeue()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class FileRejectBody */ - -}} -#endif /*!QPID_FRAMING_FILEREJECTBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/FileReturnBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/FileReturnBody.h deleted file mode 100644 index 4d6341c11f..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/FileReturnBody.h +++ /dev/null @@ -1,109 +0,0 @@ -#ifndef QPID_FRAMING_FILERETURNBODY_H -#define QPID_FRAMING_FILERETURNBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class FileReturnBody : public ModelMethod { - uint16_t replyCode; - string replyText; - string exchange; - string routingKey; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x9; - static const MethodId METHOD_ID = 0xa; - FileReturnBody( - ProtocolVersion, uint16_t _replyCode, - const string& _replyText, - const string& _exchange, - const string& _routingKey) : - replyCode(_replyCode), - replyText(_replyText), - exchange(_exchange), - routingKey(_routingKey), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - flags |= (1 << 10); - flags |= (1 << 11); - } - FileReturnBody(ProtocolVersion=ProtocolVersion()) : replyCode(0), flags(0) {} - - QPID_COMMON_EXTERN void setReplyCode(uint16_t _replyCode); - QPID_COMMON_EXTERN uint16_t getReplyCode() const; - QPID_COMMON_EXTERN bool hasReplyCode() const; - QPID_COMMON_EXTERN void clearReplyCodeFlag(); - QPID_COMMON_EXTERN void setReplyText(const string& _replyText); - QPID_COMMON_EXTERN const string& getReplyText() const; - QPID_COMMON_EXTERN bool hasReplyText() const; - QPID_COMMON_EXTERN void clearReplyTextFlag(); - QPID_COMMON_EXTERN void setExchange(const string& _exchange); - QPID_COMMON_EXTERN const string& getExchange() const; - QPID_COMMON_EXTERN bool hasExchange() const; - QPID_COMMON_EXTERN void clearExchangeFlag(); - QPID_COMMON_EXTERN void setRoutingKey(const string& _routingKey); - QPID_COMMON_EXTERN const string& getRoutingKey() const; - QPID_COMMON_EXTERN bool hasRoutingKey() const; - QPID_COMMON_EXTERN void clearRoutingKeyFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.return_(getReplyCode(), getReplyText(), getExchange(), getRoutingKey()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return true; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class FileReturnBody */ - -}} -#endif /*!QPID_FRAMING_FILERETURNBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/FileStageBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/FileStageBody.h deleted file mode 100644 index 8b994ca887..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/FileStageBody.h +++ /dev/null @@ -1,74 +0,0 @@ -#ifndef QPID_FRAMING_FILESTAGEBODY_H -#define QPID_FRAMING_FILESTAGEBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class FileStageBody : public ModelMethod { - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x9; - static const MethodId METHOD_ID = 0x8; - FileStageBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.stage(); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return true; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class FileStageBody */ - -}} -#endif /*!QPID_FRAMING_FILESTAGEBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/FragmentProperties.h b/nativeLib/org.apache.qpid/include/qpid/framing/FragmentProperties.h deleted file mode 100644 index 758dcb19af..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/FragmentProperties.h +++ /dev/null @@ -1,74 +0,0 @@ -#ifndef QPID_FRAMING_FRAGMENTPROPERTIES_H -#define QPID_FRAMING_FRAGMENTPROPERTIES_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class FragmentProperties { - uint64_t fragmentSize; - uint16_t flags; -public: - static const uint16_t TYPE = 1026; - FragmentProperties( - bool _first, - bool _last, - uint64_t _fragmentSize) : - fragmentSize(_fragmentSize), - flags(0){ - setFirst(_first); - setLast(_last); - flags |= (1 << 10); - } - FragmentProperties() : fragmentSize(0), flags(0) {} - - QPID_COMMON_EXTERN void setFirst(bool _first); - QPID_COMMON_EXTERN bool getFirst() const; - QPID_COMMON_EXTERN void setLast(bool _last); - QPID_COMMON_EXTERN bool getLast() const; - QPID_COMMON_EXTERN void setFragmentSize(uint64_t _fragmentSize); - QPID_COMMON_EXTERN uint64_t getFragmentSize() const; - QPID_COMMON_EXTERN bool hasFragmentSize() const; - QPID_COMMON_EXTERN void clearFragmentSizeFlag(); - QPID_COMMON_EXTERN friend std::ostream& operator<<(std::ostream&, const FragmentProperties&); - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class FragmentProperties */ - -}} -#endif /*!QPID_FRAMING_FRAGMENTPROPERTIES_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/Header.h b/nativeLib/org.apache.qpid/include/qpid/framing/Header.h deleted file mode 100644 index d7b666d17e..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/Header.h +++ /dev/null @@ -1,61 +0,0 @@ -#ifndef QPID_FRAMING_HEADER_H -#define QPID_FRAMING_HEADER_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class Header { - uint8_t flags; -public: - Header( - bool _sync) : - flags(0){ - setSync(_sync); - } - Header() : flags(0) {} - - QPID_COMMON_EXTERN void setSync(bool _sync); - QPID_COMMON_EXTERN bool getSync() const; - QPID_COMMON_EXTERN friend std::ostream& operator<<(std::ostream&, const Header&); - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class Header */ - -}} -#endif /*!QPID_FRAMING_HEADER_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/List.h b/nativeLib/org.apache.qpid/include/qpid/framing/List.h deleted file mode 100644 index 0f17c7884c..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/List.h +++ /dev/null @@ -1,77 +0,0 @@ -#ifndef QPID_FRAMING_LIST_H -#define QPID_FRAMING_LIST_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#include "qpid/CommonImportExport.h" -#include "qpid/framing/amqp_types.h" -#include -#include -#include - -namespace qpid { -namespace framing { - -class Buffer; -class FieldValue; - -/** - * Representation of an AMQP 0-10 list - */ -class List -{ - public: - typedef boost::shared_ptr ValuePtr; - typedef std::list Values; - typedef Values::const_iterator const_iterator; - typedef Values::iterator iterator; - typedef Values::const_reference const_reference; - typedef Values::reference reference; - - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN void encode(Buffer& buffer) const; - QPID_COMMON_EXTERN void decode(Buffer& buffer); - - QPID_COMMON_EXTERN bool operator==(const List& other) const; - - // std collection interface. - QPID_COMMON_EXTERN const_iterator begin() const { return values.begin(); } - QPID_COMMON_EXTERN const_iterator end() const { return values.end(); } - QPID_COMMON_EXTERN iterator begin() { return values.begin(); } - QPID_COMMON_EXTERN iterator end(){ return values.end(); } - - QPID_COMMON_EXTERN ValuePtr front() const { return values.front(); } - QPID_COMMON_EXTERN ValuePtr back() const { return values.back(); } - QPID_COMMON_EXTERN size_t size() const { return values.size(); } - - QPID_COMMON_EXTERN iterator insert(iterator i, ValuePtr value) { return values.insert(i, value); } - QPID_COMMON_EXTERN void erase(iterator i) { values.erase(i); } - QPID_COMMON_EXTERN void push_back(ValuePtr value) { values.insert(end(), value); } - QPID_COMMON_EXTERN void pop_back() { values.pop_back(); } - - private: - Values values; - - friend QPID_COMMON_EXTERN std::ostream& operator<<(std::ostream& out, const List& list); -}; -}} // namespace qpid::framing - -#endif /*!QPID_FRAMING_LIST_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/MessageAcceptBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/MessageAcceptBody.h deleted file mode 100644 index 60cdcc3361..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/MessageAcceptBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_MESSAGEACCEPTBODY_H -#define QPID_FRAMING_MESSAGEACCEPTBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class MessageAcceptBody : public ModelMethod { - SequenceSet transfers; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x4; - static const MethodId METHOD_ID = 0x2; - MessageAcceptBody( - ProtocolVersion, const SequenceSet& _transfers) : - transfers(_transfers), - flags(0){ - flags |= (1 << 8); - } - MessageAcceptBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setTransfers(const SequenceSet& _transfers); - QPID_COMMON_EXTERN const SequenceSet& getTransfers() const; - QPID_COMMON_EXTERN bool hasTransfers() const; - QPID_COMMON_EXTERN void clearTransfersFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.accept(getTransfers()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class MessageAcceptBody */ - -}} -#endif /*!QPID_FRAMING_MESSAGEACCEPTBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/MessageAcquireBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/MessageAcquireBody.h deleted file mode 100644 index 98c9779ce9..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/MessageAcquireBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_MESSAGEACQUIREBODY_H -#define QPID_FRAMING_MESSAGEACQUIREBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class MessageAcquireBody : public ModelMethod { - SequenceSet transfers; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x4; - static const MethodId METHOD_ID = 0x5; - MessageAcquireBody( - ProtocolVersion, const SequenceSet& _transfers) : - transfers(_transfers), - flags(0){ - flags |= (1 << 8); - } - MessageAcquireBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setTransfers(const SequenceSet& _transfers); - QPID_COMMON_EXTERN const SequenceSet& getTransfers() const; - QPID_COMMON_EXTERN bool hasTransfers() const; - QPID_COMMON_EXTERN void clearTransfersFlag(); - typedef MessageAcquireResult ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.acquire(getTransfers()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return true; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class MessageAcquireBody */ - -}} -#endif /*!QPID_FRAMING_MESSAGEACQUIREBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/MessageAcquireResult.h b/nativeLib/org.apache.qpid/include/qpid/framing/MessageAcquireResult.h deleted file mode 100644 index 71be562481..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/MessageAcquireResult.h +++ /dev/null @@ -1,66 +0,0 @@ -#ifndef QPID_FRAMING_MESSAGEACQUIRERESULT_H -#define QPID_FRAMING_MESSAGEACQUIRERESULT_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class MessageAcquireResult { - SequenceSet transfers; - uint16_t flags; -public: - static const uint16_t TYPE = 1028; - MessageAcquireResult( - const SequenceSet& _transfers) : - transfers(_transfers), - flags(0){ - flags |= (1 << 8); - } - MessageAcquireResult() : flags(0) {} - - QPID_COMMON_EXTERN void setTransfers(const SequenceSet& _transfers); - QPID_COMMON_EXTERN const SequenceSet& getTransfers() const; - QPID_COMMON_EXTERN bool hasTransfers() const; - QPID_COMMON_EXTERN void clearTransfersFlag(); - QPID_COMMON_EXTERN friend std::ostream& operator<<(std::ostream&, const MessageAcquireResult&); - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class MessageAcquireResult */ - -}} -#endif /*!QPID_FRAMING_MESSAGEACQUIRERESULT_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/MessageCancelBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/MessageCancelBody.h deleted file mode 100644 index c10f1c6520..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/MessageCancelBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_MESSAGECANCELBODY_H -#define QPID_FRAMING_MESSAGECANCELBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class MessageCancelBody : public ModelMethod { - string destination; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x4; - static const MethodId METHOD_ID = 0x8; - MessageCancelBody( - ProtocolVersion, const string& _destination) : - destination(_destination), - flags(0){ - flags |= (1 << 8); - } - MessageCancelBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setDestination(const string& _destination); - QPID_COMMON_EXTERN const string& getDestination() const; - QPID_COMMON_EXTERN bool hasDestination() const; - QPID_COMMON_EXTERN void clearDestinationFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.cancel(getDestination()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class MessageCancelBody */ - -}} -#endif /*!QPID_FRAMING_MESSAGECANCELBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/MessageFlowBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/MessageFlowBody.h deleted file mode 100644 index f5c6b76987..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/MessageFlowBody.h +++ /dev/null @@ -1,101 +0,0 @@ -#ifndef QPID_FRAMING_MESSAGEFLOWBODY_H -#define QPID_FRAMING_MESSAGEFLOWBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class MessageFlowBody : public ModelMethod { - string destination; - uint8_t unit; - uint32_t value; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x4; - static const MethodId METHOD_ID = 0xa; - MessageFlowBody( - ProtocolVersion, const string& _destination, - uint8_t _unit, - uint32_t _value) : - destination(_destination), - unit(_unit), - value(_value), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - flags |= (1 << 10); - } - MessageFlowBody(ProtocolVersion=ProtocolVersion()) : unit(0), value(0), flags(0) {} - - QPID_COMMON_EXTERN void setDestination(const string& _destination); - QPID_COMMON_EXTERN const string& getDestination() const; - QPID_COMMON_EXTERN bool hasDestination() const; - QPID_COMMON_EXTERN void clearDestinationFlag(); - QPID_COMMON_EXTERN void setUnit(uint8_t _unit); - QPID_COMMON_EXTERN uint8_t getUnit() const; - QPID_COMMON_EXTERN bool hasUnit() const; - QPID_COMMON_EXTERN void clearUnitFlag(); - QPID_COMMON_EXTERN void setValue(uint32_t _value); - QPID_COMMON_EXTERN uint32_t getValue() const; - QPID_COMMON_EXTERN bool hasValue() const; - QPID_COMMON_EXTERN void clearValueFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.flow(getDestination(), getUnit(), getValue()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class MessageFlowBody */ - -}} -#endif /*!QPID_FRAMING_MESSAGEFLOWBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/MessageFlushBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/MessageFlushBody.h deleted file mode 100644 index 6feebefa57..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/MessageFlushBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_MESSAGEFLUSHBODY_H -#define QPID_FRAMING_MESSAGEFLUSHBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class MessageFlushBody : public ModelMethod { - string destination; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x4; - static const MethodId METHOD_ID = 0xb; - MessageFlushBody( - ProtocolVersion, const string& _destination) : - destination(_destination), - flags(0){ - flags |= (1 << 8); - } - MessageFlushBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setDestination(const string& _destination); - QPID_COMMON_EXTERN const string& getDestination() const; - QPID_COMMON_EXTERN bool hasDestination() const; - QPID_COMMON_EXTERN void clearDestinationFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.flush(getDestination()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class MessageFlushBody */ - -}} -#endif /*!QPID_FRAMING_MESSAGEFLUSHBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/MessageProperties.h b/nativeLib/org.apache.qpid/include/qpid/framing/MessageProperties.h deleted file mode 100644 index 8eba20d10a..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/MessageProperties.h +++ /dev/null @@ -1,132 +0,0 @@ -#ifndef QPID_FRAMING_MESSAGEPROPERTIES_H -#define QPID_FRAMING_MESSAGEPROPERTIES_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/ReplyTo.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class MessageProperties { - uint64_t contentLength; - Uuid messageId; - string correlationId; - ReplyTo replyTo; - string contentType; - string contentEncoding; - string userId; - string appId; - FieldTable applicationHeaders; - uint16_t flags; -public: - static const uint16_t TYPE = 1027; - MessageProperties( - uint64_t _contentLength, - const Uuid& _messageId, - const string& _correlationId, - const ReplyTo& _replyTo, - const string& _contentType, - const string& _contentEncoding, - const string& _userId, - const string& _appId, - const FieldTable& _applicationHeaders) : - contentLength(_contentLength), - messageId(_messageId), - correlationId(_correlationId), - replyTo(_replyTo), - contentType(_contentType), - contentEncoding(_contentEncoding), - userId(_userId), - appId(_appId), - applicationHeaders(_applicationHeaders), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - flags |= (1 << 10); - flags |= (1 << 11); - flags |= (1 << 12); - flags |= (1 << 13); - flags |= (1 << 14); - flags |= (1 << 15); - flags |= (1 << 0); - } - MessageProperties() : contentLength(0), flags(0) {} - - QPID_COMMON_EXTERN void setContentLength(uint64_t _contentLength); - QPID_COMMON_EXTERN uint64_t getContentLength() const; - QPID_COMMON_EXTERN bool hasContentLength() const; - QPID_COMMON_EXTERN void clearContentLengthFlag(); - QPID_COMMON_EXTERN void setMessageId(const Uuid& _messageId); - QPID_COMMON_EXTERN const Uuid& getMessageId() const; - QPID_COMMON_EXTERN bool hasMessageId() const; - QPID_COMMON_EXTERN void clearMessageIdFlag(); - QPID_COMMON_EXTERN void setCorrelationId(const string& _correlationId); - QPID_COMMON_EXTERN const string& getCorrelationId() const; - QPID_COMMON_EXTERN bool hasCorrelationId() const; - QPID_COMMON_EXTERN void clearCorrelationIdFlag(); - QPID_COMMON_EXTERN void setReplyTo(const ReplyTo& _replyTo); - QPID_COMMON_EXTERN const ReplyTo& getReplyTo() const; - QPID_COMMON_EXTERN bool hasReplyTo() const; - QPID_COMMON_EXTERN void clearReplyToFlag(); - QPID_COMMON_EXTERN void setContentType(const string& _contentType); - QPID_COMMON_EXTERN const string& getContentType() const; - QPID_COMMON_EXTERN bool hasContentType() const; - QPID_COMMON_EXTERN void clearContentTypeFlag(); - QPID_COMMON_EXTERN void setContentEncoding(const string& _contentEncoding); - QPID_COMMON_EXTERN const string& getContentEncoding() const; - QPID_COMMON_EXTERN bool hasContentEncoding() const; - QPID_COMMON_EXTERN void clearContentEncodingFlag(); - QPID_COMMON_EXTERN void setUserId(const string& _userId); - QPID_COMMON_EXTERN const string& getUserId() const; - QPID_COMMON_EXTERN bool hasUserId() const; - QPID_COMMON_EXTERN void clearUserIdFlag(); - QPID_COMMON_EXTERN void setAppId(const string& _appId); - QPID_COMMON_EXTERN const string& getAppId() const; - QPID_COMMON_EXTERN bool hasAppId() const; - QPID_COMMON_EXTERN void clearAppIdFlag(); - QPID_COMMON_EXTERN void setApplicationHeaders(const FieldTable& _applicationHeaders); - QPID_COMMON_EXTERN const FieldTable& getApplicationHeaders() const; - QPID_COMMON_EXTERN FieldTable& getApplicationHeaders(); - QPID_COMMON_EXTERN bool hasApplicationHeaders() const; - QPID_COMMON_EXTERN void clearApplicationHeadersFlag(); - QPID_COMMON_EXTERN friend std::ostream& operator<<(std::ostream&, const MessageProperties&); - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class MessageProperties */ - -}} -#endif /*!QPID_FRAMING_MESSAGEPROPERTIES_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/MessageRejectBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/MessageRejectBody.h deleted file mode 100644 index 0b7a2ac2ca..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/MessageRejectBody.h +++ /dev/null @@ -1,101 +0,0 @@ -#ifndef QPID_FRAMING_MESSAGEREJECTBODY_H -#define QPID_FRAMING_MESSAGEREJECTBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class MessageRejectBody : public ModelMethod { - SequenceSet transfers; - uint16_t code; - string text; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x4; - static const MethodId METHOD_ID = 0x3; - MessageRejectBody( - ProtocolVersion, const SequenceSet& _transfers, - uint16_t _code, - const string& _text) : - transfers(_transfers), - code(_code), - text(_text), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - flags |= (1 << 10); - } - MessageRejectBody(ProtocolVersion=ProtocolVersion()) : code(0), flags(0) {} - - QPID_COMMON_EXTERN void setTransfers(const SequenceSet& _transfers); - QPID_COMMON_EXTERN const SequenceSet& getTransfers() const; - QPID_COMMON_EXTERN bool hasTransfers() const; - QPID_COMMON_EXTERN void clearTransfersFlag(); - QPID_COMMON_EXTERN void setCode(uint16_t _code); - QPID_COMMON_EXTERN uint16_t getCode() const; - QPID_COMMON_EXTERN bool hasCode() const; - QPID_COMMON_EXTERN void clearCodeFlag(); - QPID_COMMON_EXTERN void setText(const string& _text); - QPID_COMMON_EXTERN const string& getText() const; - QPID_COMMON_EXTERN bool hasText() const; - QPID_COMMON_EXTERN void clearTextFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.reject(getTransfers(), getCode(), getText()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class MessageRejectBody */ - -}} -#endif /*!QPID_FRAMING_MESSAGEREJECTBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/MessageReleaseBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/MessageReleaseBody.h deleted file mode 100644 index fb7397f82f..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/MessageReleaseBody.h +++ /dev/null @@ -1,89 +0,0 @@ -#ifndef QPID_FRAMING_MESSAGERELEASEBODY_H -#define QPID_FRAMING_MESSAGERELEASEBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class MessageReleaseBody : public ModelMethod { - SequenceSet transfers; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x4; - static const MethodId METHOD_ID = 0x4; - MessageReleaseBody( - ProtocolVersion, const SequenceSet& _transfers, - bool _setRedelivered) : - transfers(_transfers), - flags(0){ - setSetRedelivered(_setRedelivered); - flags |= (1 << 8); - } - MessageReleaseBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setTransfers(const SequenceSet& _transfers); - QPID_COMMON_EXTERN const SequenceSet& getTransfers() const; - QPID_COMMON_EXTERN bool hasTransfers() const; - QPID_COMMON_EXTERN void clearTransfersFlag(); - QPID_COMMON_EXTERN void setSetRedelivered(bool _setRedelivered); - QPID_COMMON_EXTERN bool getSetRedelivered() const; - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.release(getTransfers(), getSetRedelivered()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class MessageReleaseBody */ - -}} -#endif /*!QPID_FRAMING_MESSAGERELEASEBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/MessageResumeBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/MessageResumeBody.h deleted file mode 100644 index 08755aca61..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/MessageResumeBody.h +++ /dev/null @@ -1,93 +0,0 @@ -#ifndef QPID_FRAMING_MESSAGERESUMEBODY_H -#define QPID_FRAMING_MESSAGERESUMEBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class MessageResumeBody : public ModelMethod { - string destination; - string resumeId; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x4; - static const MethodId METHOD_ID = 0x6; - MessageResumeBody( - ProtocolVersion, const string& _destination, - const string& _resumeId) : - destination(_destination), - resumeId(_resumeId), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - } - MessageResumeBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setDestination(const string& _destination); - QPID_COMMON_EXTERN const string& getDestination() const; - QPID_COMMON_EXTERN bool hasDestination() const; - QPID_COMMON_EXTERN void clearDestinationFlag(); - QPID_COMMON_EXTERN void setResumeId(const string& _resumeId); - QPID_COMMON_EXTERN const string& getResumeId() const; - QPID_COMMON_EXTERN bool hasResumeId() const; - QPID_COMMON_EXTERN void clearResumeIdFlag(); - typedef MessageResumeResult ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.resume(getDestination(), getResumeId()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return true; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class MessageResumeBody */ - -}} -#endif /*!QPID_FRAMING_MESSAGERESUMEBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/MessageResumeResult.h b/nativeLib/org.apache.qpid/include/qpid/framing/MessageResumeResult.h deleted file mode 100644 index 8e6531ee28..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/MessageResumeResult.h +++ /dev/null @@ -1,66 +0,0 @@ -#ifndef QPID_FRAMING_MESSAGERESUMERESULT_H -#define QPID_FRAMING_MESSAGERESUMERESULT_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class MessageResumeResult { - uint64_t offset; - uint16_t flags; -public: - static const uint16_t TYPE = 1029; - MessageResumeResult( - uint64_t _offset) : - offset(_offset), - flags(0){ - flags |= (1 << 8); - } - MessageResumeResult() : offset(0), flags(0) {} - - QPID_COMMON_EXTERN void setOffset(uint64_t _offset); - QPID_COMMON_EXTERN uint64_t getOffset() const; - QPID_COMMON_EXTERN bool hasOffset() const; - QPID_COMMON_EXTERN void clearOffsetFlag(); - QPID_COMMON_EXTERN friend std::ostream& operator<<(std::ostream&, const MessageResumeResult&); - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class MessageResumeResult */ - -}} -#endif /*!QPID_FRAMING_MESSAGERESUMERESULT_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/MessageSetFlowModeBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/MessageSetFlowModeBody.h deleted file mode 100644 index f8b3d324f4..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/MessageSetFlowModeBody.h +++ /dev/null @@ -1,93 +0,0 @@ -#ifndef QPID_FRAMING_MESSAGESETFLOWMODEBODY_H -#define QPID_FRAMING_MESSAGESETFLOWMODEBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class MessageSetFlowModeBody : public ModelMethod { - string destination; - uint8_t flowMode; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x4; - static const MethodId METHOD_ID = 0x9; - MessageSetFlowModeBody( - ProtocolVersion, const string& _destination, - uint8_t _flowMode) : - destination(_destination), - flowMode(_flowMode), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - } - MessageSetFlowModeBody(ProtocolVersion=ProtocolVersion()) : flowMode(0), flags(0) {} - - QPID_COMMON_EXTERN void setDestination(const string& _destination); - QPID_COMMON_EXTERN const string& getDestination() const; - QPID_COMMON_EXTERN bool hasDestination() const; - QPID_COMMON_EXTERN void clearDestinationFlag(); - QPID_COMMON_EXTERN void setFlowMode(uint8_t _flowMode); - QPID_COMMON_EXTERN uint8_t getFlowMode() const; - QPID_COMMON_EXTERN bool hasFlowMode() const; - QPID_COMMON_EXTERN void clearFlowModeFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.setFlowMode(getDestination(), getFlowMode()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class MessageSetFlowModeBody */ - -}} -#endif /*!QPID_FRAMING_MESSAGESETFLOWMODEBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/MessageStopBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/MessageStopBody.h deleted file mode 100644 index 58bbea2eaf..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/MessageStopBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_MESSAGESTOPBODY_H -#define QPID_FRAMING_MESSAGESTOPBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class MessageStopBody : public ModelMethod { - string destination; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x4; - static const MethodId METHOD_ID = 0xc; - MessageStopBody( - ProtocolVersion, const string& _destination) : - destination(_destination), - flags(0){ - flags |= (1 << 8); - } - MessageStopBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setDestination(const string& _destination); - QPID_COMMON_EXTERN const string& getDestination() const; - QPID_COMMON_EXTERN bool hasDestination() const; - QPID_COMMON_EXTERN void clearDestinationFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.stop(getDestination()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class MessageStopBody */ - -}} -#endif /*!QPID_FRAMING_MESSAGESTOPBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/MessageSubscribeBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/MessageSubscribeBody.h deleted file mode 100644 index dfe4c9ccf0..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/MessageSubscribeBody.h +++ /dev/null @@ -1,138 +0,0 @@ -#ifndef QPID_FRAMING_MESSAGESUBSCRIBEBODY_H -#define QPID_FRAMING_MESSAGESUBSCRIBEBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class MessageSubscribeBody : public ModelMethod { - string queue; - string destination; - uint8_t acceptMode; - uint8_t acquireMode; - string resumeId; - uint64_t resumeTtl; - FieldTable arguments; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x4; - static const MethodId METHOD_ID = 0x7; - MessageSubscribeBody( - ProtocolVersion, const string& _queue, - const string& _destination, - uint8_t _acceptMode, - uint8_t _acquireMode, - bool _exclusive, - const string& _resumeId, - uint64_t _resumeTtl, - const FieldTable& _arguments) : - queue(_queue), - destination(_destination), - acceptMode(_acceptMode), - acquireMode(_acquireMode), - resumeId(_resumeId), - resumeTtl(_resumeTtl), - arguments(_arguments), - flags(0){ - setExclusive(_exclusive); - flags |= (1 << 8); - flags |= (1 << 9); - flags |= (1 << 10); - flags |= (1 << 11); - flags |= (1 << 13); - flags |= (1 << 14); - flags |= (1 << 15); - } - MessageSubscribeBody(ProtocolVersion=ProtocolVersion()) : acceptMode(0), acquireMode(0), resumeTtl(0), flags(0) {} - - QPID_COMMON_EXTERN void setQueue(const string& _queue); - QPID_COMMON_EXTERN const string& getQueue() const; - QPID_COMMON_EXTERN bool hasQueue() const; - QPID_COMMON_EXTERN void clearQueueFlag(); - QPID_COMMON_EXTERN void setDestination(const string& _destination); - QPID_COMMON_EXTERN const string& getDestination() const; - QPID_COMMON_EXTERN bool hasDestination() const; - QPID_COMMON_EXTERN void clearDestinationFlag(); - QPID_COMMON_EXTERN void setAcceptMode(uint8_t _acceptMode); - QPID_COMMON_EXTERN uint8_t getAcceptMode() const; - QPID_COMMON_EXTERN bool hasAcceptMode() const; - QPID_COMMON_EXTERN void clearAcceptModeFlag(); - QPID_COMMON_EXTERN void setAcquireMode(uint8_t _acquireMode); - QPID_COMMON_EXTERN uint8_t getAcquireMode() const; - QPID_COMMON_EXTERN bool hasAcquireMode() const; - QPID_COMMON_EXTERN void clearAcquireModeFlag(); - QPID_COMMON_EXTERN void setExclusive(bool _exclusive); - QPID_COMMON_EXTERN bool getExclusive() const; - QPID_COMMON_EXTERN void setResumeId(const string& _resumeId); - QPID_COMMON_EXTERN const string& getResumeId() const; - QPID_COMMON_EXTERN bool hasResumeId() const; - QPID_COMMON_EXTERN void clearResumeIdFlag(); - QPID_COMMON_EXTERN void setResumeTtl(uint64_t _resumeTtl); - QPID_COMMON_EXTERN uint64_t getResumeTtl() const; - QPID_COMMON_EXTERN bool hasResumeTtl() const; - QPID_COMMON_EXTERN void clearResumeTtlFlag(); - QPID_COMMON_EXTERN void setArguments(const FieldTable& _arguments); - QPID_COMMON_EXTERN const FieldTable& getArguments() const; - QPID_COMMON_EXTERN FieldTable& getArguments(); - QPID_COMMON_EXTERN bool hasArguments() const; - QPID_COMMON_EXTERN void clearArgumentsFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.subscribe(getQueue(), getDestination(), getAcceptMode(), getAcquireMode(), getExclusive(), getResumeId(), getResumeTtl(), getArguments()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class MessageSubscribeBody */ - -}} -#endif /*!QPID_FRAMING_MESSAGESUBSCRIBEBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/MessageTransferBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/MessageTransferBody.h deleted file mode 100644 index dcd189ebd6..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/MessageTransferBody.h +++ /dev/null @@ -1,101 +0,0 @@ -#ifndef QPID_FRAMING_MESSAGETRANSFERBODY_H -#define QPID_FRAMING_MESSAGETRANSFERBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class MessageTransferBody : public ModelMethod { - string destination; - uint8_t acceptMode; - uint8_t acquireMode; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x4; - static const MethodId METHOD_ID = 0x1; - MessageTransferBody( - ProtocolVersion, const string& _destination, - uint8_t _acceptMode, - uint8_t _acquireMode) : - destination(_destination), - acceptMode(_acceptMode), - acquireMode(_acquireMode), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - flags |= (1 << 10); - } - MessageTransferBody(ProtocolVersion=ProtocolVersion()) : acceptMode(1), acquireMode(0), flags(0) {} - - QPID_COMMON_EXTERN void setDestination(const string& _destination); - QPID_COMMON_EXTERN const string& getDestination() const; - QPID_COMMON_EXTERN bool hasDestination() const; - QPID_COMMON_EXTERN void clearDestinationFlag(); - QPID_COMMON_EXTERN void setAcceptMode(uint8_t _acceptMode); - QPID_COMMON_EXTERN uint8_t getAcceptMode() const; - QPID_COMMON_EXTERN bool hasAcceptMode() const; - QPID_COMMON_EXTERN void clearAcceptModeFlag(); - QPID_COMMON_EXTERN void setAcquireMode(uint8_t _acquireMode); - QPID_COMMON_EXTERN uint8_t getAcquireMode() const; - QPID_COMMON_EXTERN bool hasAcquireMode() const; - QPID_COMMON_EXTERN void clearAcquireModeFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.transfer(getDestination(), getAcceptMode(), getAcquireMode()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return true; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class MessageTransferBody */ - -}} -#endif /*!QPID_FRAMING_MESSAGETRANSFERBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/MethodBodyConstVisitor.h b/nativeLib/org.apache.qpid/include/qpid/framing/MethodBodyConstVisitor.h deleted file mode 100644 index 19e85db755..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/MethodBodyConstVisitor.h +++ /dev/null @@ -1,288 +0,0 @@ -#ifndef QPID_FRAMING_METHODBODYCONSTVISITOR_H -#define QPID_FRAMING_METHODBODYCONSTVISITOR_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - - -namespace qpid { -namespace framing { - -class ConnectionStartBody; -class ConnectionStartOkBody; -class ConnectionSecureBody; -class ConnectionSecureOkBody; -class ConnectionTuneBody; -class ConnectionTuneOkBody; -class ConnectionOpenBody; -class ConnectionOpenOkBody; -class ConnectionRedirectBody; -class ConnectionHeartbeatBody; -class ConnectionCloseBody; -class ConnectionCloseOkBody; -class SessionAttachBody; -class SessionAttachedBody; -class SessionDetachBody; -class SessionDetachedBody; -class SessionRequestTimeoutBody; -class SessionTimeoutBody; -class SessionCommandPointBody; -class SessionExpectedBody; -class SessionConfirmedBody; -class SessionCompletedBody; -class SessionKnownCompletedBody; -class SessionFlushBody; -class SessionGapBody; -class ExecutionSyncBody; -class ExecutionResultBody; -class ExecutionExceptionBody; -class MessageTransferBody; -class MessageAcceptBody; -class MessageRejectBody; -class MessageReleaseBody; -class MessageAcquireBody; -class MessageResumeBody; -class MessageSubscribeBody; -class MessageCancelBody; -class MessageSetFlowModeBody; -class MessageFlowBody; -class MessageFlushBody; -class MessageStopBody; -class TxSelectBody; -class TxCommitBody; -class TxRollbackBody; -class DtxSelectBody; -class DtxStartBody; -class DtxEndBody; -class DtxCommitBody; -class DtxForgetBody; -class DtxGetTimeoutBody; -class DtxPrepareBody; -class DtxRecoverBody; -class DtxRollbackBody; -class DtxSetTimeoutBody; -class ExchangeDeclareBody; -class ExchangeDeleteBody; -class ExchangeQueryBody; -class ExchangeBindBody; -class ExchangeUnbindBody; -class ExchangeBoundBody; -class QueueDeclareBody; -class QueueDeleteBody; -class QueuePurgeBody; -class QueueQueryBody; -class FileQosBody; -class FileQosOkBody; -class FileConsumeBody; -class FileConsumeOkBody; -class FileCancelBody; -class FileOpenBody; -class FileOpenOkBody; -class FileStageBody; -class FilePublishBody; -class FileReturnBody; -class FileDeliverBody; -class FileAckBody; -class FileRejectBody; -class StreamQosBody; -class StreamQosOkBody; -class StreamConsumeBody; -class StreamConsumeOkBody; -class StreamCancelBody; -class StreamPublishBody; -class StreamReturnBody; -class StreamDeliverBody; -class ClusterUpdateRequestBody; -class ClusterUpdateOfferBody; -class ClusterRetractOfferBody; -class ClusterInitialStatusBody; -class ClusterReadyBody; -class ClusterConfigChangeBody; -class ClusterMessageExpiredBody; -class ClusterErrorCheckBody; -class ClusterTimerWakeupBody; -class ClusterTimerDropBody; -class ClusterShutdownBody; -class ClusterDeliverToQueueBody; -class ClusterConnectionAnnounceBody; -class ClusterConnectionDeliverCloseBody; -class ClusterConnectionDeliverDoOutputBody; -class ClusterConnectionAbortBody; -class ClusterConnectionShadowSetUserBody; -class ClusterConnectionShadowPrepareBody; -class ClusterConnectionConsumerStateBody; -class ClusterConnectionDeliveryRecordBody; -class ClusterConnectionTxStartBody; -class ClusterConnectionTxAcceptBody; -class ClusterConnectionTxDequeueBody; -class ClusterConnectionTxEnqueueBody; -class ClusterConnectionTxPublishBody; -class ClusterConnectionTxEndBody; -class ClusterConnectionAccumulatedAckBody; -class ClusterConnectionOutputTaskBody; -class ClusterConnectionSessionStateBody; -class ClusterConnectionShadowReadyBody; -class ClusterConnectionMembershipBody; -class ClusterConnectionRetractOfferBody; -class ClusterConnectionQueuePositionBody; -class ClusterConnectionExchangeBody; -class ClusterConnectionQueueBody; -class ClusterConnectionExpiryIdBody; -class ClusterConnectionAddQueueListenerBody; -class ClusterConnectionManagementSetupStateBody; -class ClusterConnectionConfigBody; -class MethodBodyConstVisitor -{ - public: - virtual ~MethodBodyConstVisitor() {} - virtual void visit(const ConnectionStartBody&) = 0; - virtual void visit(const ConnectionStartOkBody&) = 0; - virtual void visit(const ConnectionSecureBody&) = 0; - virtual void visit(const ConnectionSecureOkBody&) = 0; - virtual void visit(const ConnectionTuneBody&) = 0; - virtual void visit(const ConnectionTuneOkBody&) = 0; - virtual void visit(const ConnectionOpenBody&) = 0; - virtual void visit(const ConnectionOpenOkBody&) = 0; - virtual void visit(const ConnectionRedirectBody&) = 0; - virtual void visit(const ConnectionHeartbeatBody&) = 0; - virtual void visit(const ConnectionCloseBody&) = 0; - virtual void visit(const ConnectionCloseOkBody&) = 0; - virtual void visit(const SessionAttachBody&) = 0; - virtual void visit(const SessionAttachedBody&) = 0; - virtual void visit(const SessionDetachBody&) = 0; - virtual void visit(const SessionDetachedBody&) = 0; - virtual void visit(const SessionRequestTimeoutBody&) = 0; - virtual void visit(const SessionTimeoutBody&) = 0; - virtual void visit(const SessionCommandPointBody&) = 0; - virtual void visit(const SessionExpectedBody&) = 0; - virtual void visit(const SessionConfirmedBody&) = 0; - virtual void visit(const SessionCompletedBody&) = 0; - virtual void visit(const SessionKnownCompletedBody&) = 0; - virtual void visit(const SessionFlushBody&) = 0; - virtual void visit(const SessionGapBody&) = 0; - virtual void visit(const ExecutionSyncBody&) = 0; - virtual void visit(const ExecutionResultBody&) = 0; - virtual void visit(const ExecutionExceptionBody&) = 0; - virtual void visit(const MessageTransferBody&) = 0; - virtual void visit(const MessageAcceptBody&) = 0; - virtual void visit(const MessageRejectBody&) = 0; - virtual void visit(const MessageReleaseBody&) = 0; - virtual void visit(const MessageAcquireBody&) = 0; - virtual void visit(const MessageResumeBody&) = 0; - virtual void visit(const MessageSubscribeBody&) = 0; - virtual void visit(const MessageCancelBody&) = 0; - virtual void visit(const MessageSetFlowModeBody&) = 0; - virtual void visit(const MessageFlowBody&) = 0; - virtual void visit(const MessageFlushBody&) = 0; - virtual void visit(const MessageStopBody&) = 0; - virtual void visit(const TxSelectBody&) = 0; - virtual void visit(const TxCommitBody&) = 0; - virtual void visit(const TxRollbackBody&) = 0; - virtual void visit(const DtxSelectBody&) = 0; - virtual void visit(const DtxStartBody&) = 0; - virtual void visit(const DtxEndBody&) = 0; - virtual void visit(const DtxCommitBody&) = 0; - virtual void visit(const DtxForgetBody&) = 0; - virtual void visit(const DtxGetTimeoutBody&) = 0; - virtual void visit(const DtxPrepareBody&) = 0; - virtual void visit(const DtxRecoverBody&) = 0; - virtual void visit(const DtxRollbackBody&) = 0; - virtual void visit(const DtxSetTimeoutBody&) = 0; - virtual void visit(const ExchangeDeclareBody&) = 0; - virtual void visit(const ExchangeDeleteBody&) = 0; - virtual void visit(const ExchangeQueryBody&) = 0; - virtual void visit(const ExchangeBindBody&) = 0; - virtual void visit(const ExchangeUnbindBody&) = 0; - virtual void visit(const ExchangeBoundBody&) = 0; - virtual void visit(const QueueDeclareBody&) = 0; - virtual void visit(const QueueDeleteBody&) = 0; - virtual void visit(const QueuePurgeBody&) = 0; - virtual void visit(const QueueQueryBody&) = 0; - virtual void visit(const FileQosBody&) = 0; - virtual void visit(const FileQosOkBody&) = 0; - virtual void visit(const FileConsumeBody&) = 0; - virtual void visit(const FileConsumeOkBody&) = 0; - virtual void visit(const FileCancelBody&) = 0; - virtual void visit(const FileOpenBody&) = 0; - virtual void visit(const FileOpenOkBody&) = 0; - virtual void visit(const FileStageBody&) = 0; - virtual void visit(const FilePublishBody&) = 0; - virtual void visit(const FileReturnBody&) = 0; - virtual void visit(const FileDeliverBody&) = 0; - virtual void visit(const FileAckBody&) = 0; - virtual void visit(const FileRejectBody&) = 0; - virtual void visit(const StreamQosBody&) = 0; - virtual void visit(const StreamQosOkBody&) = 0; - virtual void visit(const StreamConsumeBody&) = 0; - virtual void visit(const StreamConsumeOkBody&) = 0; - virtual void visit(const StreamCancelBody&) = 0; - virtual void visit(const StreamPublishBody&) = 0; - virtual void visit(const StreamReturnBody&) = 0; - virtual void visit(const StreamDeliverBody&) = 0; - virtual void visit(const ClusterUpdateRequestBody&) = 0; - virtual void visit(const ClusterUpdateOfferBody&) = 0; - virtual void visit(const ClusterRetractOfferBody&) = 0; - virtual void visit(const ClusterInitialStatusBody&) = 0; - virtual void visit(const ClusterReadyBody&) = 0; - virtual void visit(const ClusterConfigChangeBody&) = 0; - virtual void visit(const ClusterMessageExpiredBody&) = 0; - virtual void visit(const ClusterErrorCheckBody&) = 0; - virtual void visit(const ClusterTimerWakeupBody&) = 0; - virtual void visit(const ClusterTimerDropBody&) = 0; - virtual void visit(const ClusterShutdownBody&) = 0; - virtual void visit(const ClusterDeliverToQueueBody&) = 0; - virtual void visit(const ClusterConnectionAnnounceBody&) = 0; - virtual void visit(const ClusterConnectionDeliverCloseBody&) = 0; - virtual void visit(const ClusterConnectionDeliverDoOutputBody&) = 0; - virtual void visit(const ClusterConnectionAbortBody&) = 0; - virtual void visit(const ClusterConnectionShadowSetUserBody&) = 0; - virtual void visit(const ClusterConnectionShadowPrepareBody&) = 0; - virtual void visit(const ClusterConnectionConsumerStateBody&) = 0; - virtual void visit(const ClusterConnectionDeliveryRecordBody&) = 0; - virtual void visit(const ClusterConnectionTxStartBody&) = 0; - virtual void visit(const ClusterConnectionTxAcceptBody&) = 0; - virtual void visit(const ClusterConnectionTxDequeueBody&) = 0; - virtual void visit(const ClusterConnectionTxEnqueueBody&) = 0; - virtual void visit(const ClusterConnectionTxPublishBody&) = 0; - virtual void visit(const ClusterConnectionTxEndBody&) = 0; - virtual void visit(const ClusterConnectionAccumulatedAckBody&) = 0; - virtual void visit(const ClusterConnectionOutputTaskBody&) = 0; - virtual void visit(const ClusterConnectionSessionStateBody&) = 0; - virtual void visit(const ClusterConnectionShadowReadyBody&) = 0; - virtual void visit(const ClusterConnectionMembershipBody&) = 0; - virtual void visit(const ClusterConnectionRetractOfferBody&) = 0; - virtual void visit(const ClusterConnectionQueuePositionBody&) = 0; - virtual void visit(const ClusterConnectionExchangeBody&) = 0; - virtual void visit(const ClusterConnectionQueueBody&) = 0; - virtual void visit(const ClusterConnectionExpiryIdBody&) = 0; - virtual void visit(const ClusterConnectionAddQueueListenerBody&) = 0; - virtual void visit(const ClusterConnectionManagementSetupStateBody&) = 0; - virtual void visit(const ClusterConnectionConfigBody&) = 0; -}; - -}} // namespace qpid::framing - -#endif /*!QPID_FRAMING_METHODBODYCONSTVISITOR_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/MethodBodyDefaultVisitor.h b/nativeLib/org.apache.qpid/include/qpid/framing/MethodBodyDefaultVisitor.h deleted file mode 100644 index 2f6e124b4e..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/MethodBodyDefaultVisitor.h +++ /dev/null @@ -1,169 +0,0 @@ -#ifndef QPID_FRAMING_METHODBODYDEFAULTVISITOR_H -#define QPID_FRAMING_METHODBODYDEFAULTVISITOR_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class AMQMethodBody; -class MethodBodyDefaultVisitor: - public MethodBodyConstVisitor -{ - public: - virtual void defaultVisit(const AMQMethodBody&) = 0; - QPID_COMMON_EXTERN virtual void visit(const ConnectionStartBody&); - QPID_COMMON_EXTERN virtual void visit(const ConnectionStartOkBody&); - QPID_COMMON_EXTERN virtual void visit(const ConnectionSecureBody&); - QPID_COMMON_EXTERN virtual void visit(const ConnectionSecureOkBody&); - QPID_COMMON_EXTERN virtual void visit(const ConnectionTuneBody&); - QPID_COMMON_EXTERN virtual void visit(const ConnectionTuneOkBody&); - QPID_COMMON_EXTERN virtual void visit(const ConnectionOpenBody&); - QPID_COMMON_EXTERN virtual void visit(const ConnectionOpenOkBody&); - QPID_COMMON_EXTERN virtual void visit(const ConnectionRedirectBody&); - QPID_COMMON_EXTERN virtual void visit(const ConnectionHeartbeatBody&); - QPID_COMMON_EXTERN virtual void visit(const ConnectionCloseBody&); - QPID_COMMON_EXTERN virtual void visit(const ConnectionCloseOkBody&); - QPID_COMMON_EXTERN virtual void visit(const SessionAttachBody&); - QPID_COMMON_EXTERN virtual void visit(const SessionAttachedBody&); - QPID_COMMON_EXTERN virtual void visit(const SessionDetachBody&); - QPID_COMMON_EXTERN virtual void visit(const SessionDetachedBody&); - QPID_COMMON_EXTERN virtual void visit(const SessionRequestTimeoutBody&); - QPID_COMMON_EXTERN virtual void visit(const SessionTimeoutBody&); - QPID_COMMON_EXTERN virtual void visit(const SessionCommandPointBody&); - QPID_COMMON_EXTERN virtual void visit(const SessionExpectedBody&); - QPID_COMMON_EXTERN virtual void visit(const SessionConfirmedBody&); - QPID_COMMON_EXTERN virtual void visit(const SessionCompletedBody&); - QPID_COMMON_EXTERN virtual void visit(const SessionKnownCompletedBody&); - QPID_COMMON_EXTERN virtual void visit(const SessionFlushBody&); - QPID_COMMON_EXTERN virtual void visit(const SessionGapBody&); - QPID_COMMON_EXTERN virtual void visit(const ExecutionSyncBody&); - QPID_COMMON_EXTERN virtual void visit(const ExecutionResultBody&); - QPID_COMMON_EXTERN virtual void visit(const ExecutionExceptionBody&); - QPID_COMMON_EXTERN virtual void visit(const MessageTransferBody&); - QPID_COMMON_EXTERN virtual void visit(const MessageAcceptBody&); - QPID_COMMON_EXTERN virtual void visit(const MessageRejectBody&); - QPID_COMMON_EXTERN virtual void visit(const MessageReleaseBody&); - QPID_COMMON_EXTERN virtual void visit(const MessageAcquireBody&); - QPID_COMMON_EXTERN virtual void visit(const MessageResumeBody&); - QPID_COMMON_EXTERN virtual void visit(const MessageSubscribeBody&); - QPID_COMMON_EXTERN virtual void visit(const MessageCancelBody&); - QPID_COMMON_EXTERN virtual void visit(const MessageSetFlowModeBody&); - QPID_COMMON_EXTERN virtual void visit(const MessageFlowBody&); - QPID_COMMON_EXTERN virtual void visit(const MessageFlushBody&); - QPID_COMMON_EXTERN virtual void visit(const MessageStopBody&); - QPID_COMMON_EXTERN virtual void visit(const TxSelectBody&); - QPID_COMMON_EXTERN virtual void visit(const TxCommitBody&); - QPID_COMMON_EXTERN virtual void visit(const TxRollbackBody&); - QPID_COMMON_EXTERN virtual void visit(const DtxSelectBody&); - QPID_COMMON_EXTERN virtual void visit(const DtxStartBody&); - QPID_COMMON_EXTERN virtual void visit(const DtxEndBody&); - QPID_COMMON_EXTERN virtual void visit(const DtxCommitBody&); - QPID_COMMON_EXTERN virtual void visit(const DtxForgetBody&); - QPID_COMMON_EXTERN virtual void visit(const DtxGetTimeoutBody&); - QPID_COMMON_EXTERN virtual void visit(const DtxPrepareBody&); - QPID_COMMON_EXTERN virtual void visit(const DtxRecoverBody&); - QPID_COMMON_EXTERN virtual void visit(const DtxRollbackBody&); - QPID_COMMON_EXTERN virtual void visit(const DtxSetTimeoutBody&); - QPID_COMMON_EXTERN virtual void visit(const ExchangeDeclareBody&); - QPID_COMMON_EXTERN virtual void visit(const ExchangeDeleteBody&); - QPID_COMMON_EXTERN virtual void visit(const ExchangeQueryBody&); - QPID_COMMON_EXTERN virtual void visit(const ExchangeBindBody&); - QPID_COMMON_EXTERN virtual void visit(const ExchangeUnbindBody&); - QPID_COMMON_EXTERN virtual void visit(const ExchangeBoundBody&); - QPID_COMMON_EXTERN virtual void visit(const QueueDeclareBody&); - QPID_COMMON_EXTERN virtual void visit(const QueueDeleteBody&); - QPID_COMMON_EXTERN virtual void visit(const QueuePurgeBody&); - QPID_COMMON_EXTERN virtual void visit(const QueueQueryBody&); - QPID_COMMON_EXTERN virtual void visit(const FileQosBody&); - QPID_COMMON_EXTERN virtual void visit(const FileQosOkBody&); - QPID_COMMON_EXTERN virtual void visit(const FileConsumeBody&); - QPID_COMMON_EXTERN virtual void visit(const FileConsumeOkBody&); - QPID_COMMON_EXTERN virtual void visit(const FileCancelBody&); - QPID_COMMON_EXTERN virtual void visit(const FileOpenBody&); - QPID_COMMON_EXTERN virtual void visit(const FileOpenOkBody&); - QPID_COMMON_EXTERN virtual void visit(const FileStageBody&); - QPID_COMMON_EXTERN virtual void visit(const FilePublishBody&); - QPID_COMMON_EXTERN virtual void visit(const FileReturnBody&); - QPID_COMMON_EXTERN virtual void visit(const FileDeliverBody&); - QPID_COMMON_EXTERN virtual void visit(const FileAckBody&); - QPID_COMMON_EXTERN virtual void visit(const FileRejectBody&); - QPID_COMMON_EXTERN virtual void visit(const StreamQosBody&); - QPID_COMMON_EXTERN virtual void visit(const StreamQosOkBody&); - QPID_COMMON_EXTERN virtual void visit(const StreamConsumeBody&); - QPID_COMMON_EXTERN virtual void visit(const StreamConsumeOkBody&); - QPID_COMMON_EXTERN virtual void visit(const StreamCancelBody&); - QPID_COMMON_EXTERN virtual void visit(const StreamPublishBody&); - QPID_COMMON_EXTERN virtual void visit(const StreamReturnBody&); - QPID_COMMON_EXTERN virtual void visit(const StreamDeliverBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterUpdateRequestBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterUpdateOfferBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterRetractOfferBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterInitialStatusBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterReadyBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterConfigChangeBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterMessageExpiredBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterErrorCheckBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterTimerWakeupBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterTimerDropBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterShutdownBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterDeliverToQueueBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterConnectionAnnounceBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterConnectionDeliverCloseBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterConnectionDeliverDoOutputBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterConnectionAbortBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterConnectionShadowSetUserBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterConnectionShadowPrepareBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterConnectionConsumerStateBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterConnectionDeliveryRecordBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterConnectionTxStartBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterConnectionTxAcceptBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterConnectionTxDequeueBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterConnectionTxEnqueueBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterConnectionTxPublishBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterConnectionTxEndBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterConnectionAccumulatedAckBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterConnectionOutputTaskBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterConnectionSessionStateBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterConnectionShadowReadyBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterConnectionMembershipBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterConnectionRetractOfferBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterConnectionQueuePositionBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterConnectionExchangeBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterConnectionQueueBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterConnectionExpiryIdBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterConnectionAddQueueListenerBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterConnectionManagementSetupStateBody&); - QPID_COMMON_EXTERN virtual void visit(const ClusterConnectionConfigBody&); -}; - -}} // namespace qpid::framing - -#endif /*!QPID_FRAMING_METHODBODYDEFAULTVISITOR_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ProtocolVersion.h b/nativeLib/org.apache.qpid/include/qpid/framing/ProtocolVersion.h deleted file mode 100644 index e7e75d75f6..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ProtocolVersion.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#ifndef _ProtocolVersion_ -#define _ProtocolVersion_ - -#include "qpid/framing/amqp_types.h" -#include "qpid/CommonImportExport.h" - -namespace qpid -{ -namespace framing -{ - -class ProtocolVersion -{ -private: - uint8_t major_; - uint8_t minor_; - -public: - explicit ProtocolVersion(uint8_t _major=0, uint8_t _minor=0) - : major_(_major), minor_(_minor) {} - - QPID_COMMON_EXTERN uint8_t getMajor() const { return major_; } - QPID_COMMON_EXTERN void setMajor(uint8_t major) { major_ = major; } - QPID_COMMON_EXTERN uint8_t getMinor() const { return minor_; } - QPID_COMMON_EXTERN void setMinor(uint8_t minor) { minor_ = minor; } - QPID_COMMON_EXTERN const std::string toString() const; - - QPID_COMMON_EXTERN ProtocolVersion& operator=(ProtocolVersion p); - - QPID_COMMON_EXTERN bool operator==(ProtocolVersion p) const; - QPID_COMMON_EXTERN bool operator!=(ProtocolVersion p) const { return ! (*this == p); } -}; - -} // namespace framing -} // namespace qpid - - -#endif // ifndef _ProtocolVersion_ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/QueueDeclareBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/QueueDeclareBody.h deleted file mode 100644 index 16a61341e8..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/QueueDeclareBody.h +++ /dev/null @@ -1,118 +0,0 @@ -#ifndef QPID_FRAMING_QUEUEDECLAREBODY_H -#define QPID_FRAMING_QUEUEDECLAREBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class QueueDeclareBody : public ModelMethod { - string queue; - string alternateExchange; - FieldTable arguments; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x8; - static const MethodId METHOD_ID = 0x1; - QueueDeclareBody( - ProtocolVersion, const string& _queue, - const string& _alternateExchange, - bool _passive, - bool _durable, - bool _exclusive, - bool _autoDelete, - const FieldTable& _arguments) : - queue(_queue), - alternateExchange(_alternateExchange), - arguments(_arguments), - flags(0){ - setPassive(_passive); - setDurable(_durable); - setExclusive(_exclusive); - setAutoDelete(_autoDelete); - flags |= (1 << 8); - flags |= (1 << 9); - flags |= (1 << 14); - } - QueueDeclareBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setQueue(const string& _queue); - QPID_COMMON_EXTERN const string& getQueue() const; - QPID_COMMON_EXTERN bool hasQueue() const; - QPID_COMMON_EXTERN void clearQueueFlag(); - QPID_COMMON_EXTERN void setAlternateExchange(const string& _alternateExchange); - QPID_COMMON_EXTERN const string& getAlternateExchange() const; - QPID_COMMON_EXTERN bool hasAlternateExchange() const; - QPID_COMMON_EXTERN void clearAlternateExchangeFlag(); - QPID_COMMON_EXTERN void setPassive(bool _passive); - QPID_COMMON_EXTERN bool getPassive() const; - QPID_COMMON_EXTERN void setDurable(bool _durable); - QPID_COMMON_EXTERN bool getDurable() const; - QPID_COMMON_EXTERN void setExclusive(bool _exclusive); - QPID_COMMON_EXTERN bool getExclusive() const; - QPID_COMMON_EXTERN void setAutoDelete(bool _autoDelete); - QPID_COMMON_EXTERN bool getAutoDelete() const; - QPID_COMMON_EXTERN void setArguments(const FieldTable& _arguments); - QPID_COMMON_EXTERN const FieldTable& getArguments() const; - QPID_COMMON_EXTERN FieldTable& getArguments(); - QPID_COMMON_EXTERN bool hasArguments() const; - QPID_COMMON_EXTERN void clearArgumentsFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.declare(getQueue(), getAlternateExchange(), getPassive(), getDurable(), getExclusive(), getAutoDelete(), getArguments()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class QueueDeclareBody */ - -}} -#endif /*!QPID_FRAMING_QUEUEDECLAREBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/QueueDeleteBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/QueueDeleteBody.h deleted file mode 100644 index e0a55c17a4..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/QueueDeleteBody.h +++ /dev/null @@ -1,93 +0,0 @@ -#ifndef QPID_FRAMING_QUEUEDELETEBODY_H -#define QPID_FRAMING_QUEUEDELETEBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class QueueDeleteBody : public ModelMethod { - string queue; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x8; - static const MethodId METHOD_ID = 0x2; - QueueDeleteBody( - ProtocolVersion, const string& _queue, - bool _ifUnused, - bool _ifEmpty) : - queue(_queue), - flags(0){ - setIfUnused(_ifUnused); - setIfEmpty(_ifEmpty); - flags |= (1 << 8); - } - QueueDeleteBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setQueue(const string& _queue); - QPID_COMMON_EXTERN const string& getQueue() const; - QPID_COMMON_EXTERN bool hasQueue() const; - QPID_COMMON_EXTERN void clearQueueFlag(); - QPID_COMMON_EXTERN void setIfUnused(bool _ifUnused); - QPID_COMMON_EXTERN bool getIfUnused() const; - QPID_COMMON_EXTERN void setIfEmpty(bool _ifEmpty); - QPID_COMMON_EXTERN bool getIfEmpty() const; - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.delete_(getQueue(), getIfUnused(), getIfEmpty()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class QueueDeleteBody */ - -}} -#endif /*!QPID_FRAMING_QUEUEDELETEBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/QueuePurgeBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/QueuePurgeBody.h deleted file mode 100644 index 89ce4a061d..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/QueuePurgeBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_QUEUEPURGEBODY_H -#define QPID_FRAMING_QUEUEPURGEBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class QueuePurgeBody : public ModelMethod { - string queue; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x8; - static const MethodId METHOD_ID = 0x3; - QueuePurgeBody( - ProtocolVersion, const string& _queue) : - queue(_queue), - flags(0){ - flags |= (1 << 8); - } - QueuePurgeBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setQueue(const string& _queue); - QPID_COMMON_EXTERN const string& getQueue() const; - QPID_COMMON_EXTERN bool hasQueue() const; - QPID_COMMON_EXTERN void clearQueueFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.purge(getQueue()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class QueuePurgeBody */ - -}} -#endif /*!QPID_FRAMING_QUEUEPURGEBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/QueueQueryBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/QueueQueryBody.h deleted file mode 100644 index 5e67fe92a8..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/QueueQueryBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_QUEUEQUERYBODY_H -#define QPID_FRAMING_QUEUEQUERYBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class QueueQueryBody : public ModelMethod { - string queue; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x8; - static const MethodId METHOD_ID = 0x4; - QueueQueryBody( - ProtocolVersion, const string& _queue) : - queue(_queue), - flags(0){ - flags |= (1 << 8); - } - QueueQueryBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setQueue(const string& _queue); - QPID_COMMON_EXTERN const string& getQueue() const; - QPID_COMMON_EXTERN bool hasQueue() const; - QPID_COMMON_EXTERN void clearQueueFlag(); - typedef QueueQueryResult ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.query(getQueue()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return true; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class QueueQueryBody */ - -}} -#endif /*!QPID_FRAMING_QUEUEQUERYBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/QueueQueryResult.h b/nativeLib/org.apache.qpid/include/qpid/framing/QueueQueryResult.h deleted file mode 100644 index 57c55760ed..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/QueueQueryResult.h +++ /dev/null @@ -1,111 +0,0 @@ -#ifndef QPID_FRAMING_QUEUEQUERYRESULT_H -#define QPID_FRAMING_QUEUEQUERYRESULT_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class QueueQueryResult { - string queue; - string alternateExchange; - FieldTable arguments; - uint32_t messageCount; - uint32_t subscriberCount; - uint16_t flags; -public: - static const uint16_t TYPE = 2049; - QueueQueryResult( - const string& _queue, - const string& _alternateExchange, - bool _durable, - bool _exclusive, - bool _autoDelete, - const FieldTable& _arguments, - uint32_t _messageCount, - uint32_t _subscriberCount) : - queue(_queue), - alternateExchange(_alternateExchange), - arguments(_arguments), - messageCount(_messageCount), - subscriberCount(_subscriberCount), - flags(0){ - setDurable(_durable); - setExclusive(_exclusive); - setAutoDelete(_autoDelete); - flags |= (1 << 8); - flags |= (1 << 9); - flags |= (1 << 13); - flags |= (1 << 14); - flags |= (1 << 15); - } - QueueQueryResult() : messageCount(0), subscriberCount(0), flags(0) {} - - QPID_COMMON_EXTERN void setQueue(const string& _queue); - QPID_COMMON_EXTERN const string& getQueue() const; - QPID_COMMON_EXTERN bool hasQueue() const; - QPID_COMMON_EXTERN void clearQueueFlag(); - QPID_COMMON_EXTERN void setAlternateExchange(const string& _alternateExchange); - QPID_COMMON_EXTERN const string& getAlternateExchange() const; - QPID_COMMON_EXTERN bool hasAlternateExchange() const; - QPID_COMMON_EXTERN void clearAlternateExchangeFlag(); - QPID_COMMON_EXTERN void setDurable(bool _durable); - QPID_COMMON_EXTERN bool getDurable() const; - QPID_COMMON_EXTERN void setExclusive(bool _exclusive); - QPID_COMMON_EXTERN bool getExclusive() const; - QPID_COMMON_EXTERN void setAutoDelete(bool _autoDelete); - QPID_COMMON_EXTERN bool getAutoDelete() const; - QPID_COMMON_EXTERN void setArguments(const FieldTable& _arguments); - QPID_COMMON_EXTERN const FieldTable& getArguments() const; - QPID_COMMON_EXTERN FieldTable& getArguments(); - QPID_COMMON_EXTERN bool hasArguments() const; - QPID_COMMON_EXTERN void clearArgumentsFlag(); - QPID_COMMON_EXTERN void setMessageCount(uint32_t _messageCount); - QPID_COMMON_EXTERN uint32_t getMessageCount() const; - QPID_COMMON_EXTERN bool hasMessageCount() const; - QPID_COMMON_EXTERN void clearMessageCountFlag(); - QPID_COMMON_EXTERN void setSubscriberCount(uint32_t _subscriberCount); - QPID_COMMON_EXTERN uint32_t getSubscriberCount() const; - QPID_COMMON_EXTERN bool hasSubscriberCount() const; - QPID_COMMON_EXTERN void clearSubscriberCountFlag(); - QPID_COMMON_EXTERN friend std::ostream& operator<<(std::ostream&, const QueueQueryResult&); - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class QueueQueryResult */ - -}} -#endif /*!QPID_FRAMING_QUEUEQUERYRESULT_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ReplyTo.h b/nativeLib/org.apache.qpid/include/qpid/framing/ReplyTo.h deleted file mode 100644 index 81f78be97a..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ReplyTo.h +++ /dev/null @@ -1,73 +0,0 @@ -#ifndef QPID_FRAMING_REPLYTO_H -#define QPID_FRAMING_REPLYTO_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class ReplyTo { - string exchange; - string routingKey; - uint16_t flags; -public: - ReplyTo( - const string& _exchange, - const string& _routingKey) : - exchange(_exchange), - routingKey(_routingKey), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - } - ReplyTo() : flags(0) {} - - QPID_COMMON_EXTERN void setExchange(const string& _exchange); - QPID_COMMON_EXTERN const string& getExchange() const; - QPID_COMMON_EXTERN bool hasExchange() const; - QPID_COMMON_EXTERN void clearExchangeFlag(); - QPID_COMMON_EXTERN void setRoutingKey(const string& _routingKey); - QPID_COMMON_EXTERN const string& getRoutingKey() const; - QPID_COMMON_EXTERN bool hasRoutingKey() const; - QPID_COMMON_EXTERN void clearRoutingKeyFlag(); - QPID_COMMON_EXTERN friend std::ostream& operator<<(std::ostream&, const ReplyTo&); - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class ReplyTo */ - -}} -#endif /*!QPID_FRAMING_REPLYTO_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/SequenceNumber.h b/nativeLib/org.apache.qpid/include/qpid/framing/SequenceNumber.h deleted file mode 100644 index 1e53058df8..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/SequenceNumber.h +++ /dev/null @@ -1,79 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#ifndef _framing_SequenceNumber_h -#define _framing_SequenceNumber_h - -#include "qpid/framing/amqp_types.h" -#include -#include -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class Buffer; - -/** - * 4-byte sequence number that 'wraps around'. - */ -class SequenceNumber : public -boost::equality_comparable< - SequenceNumber, boost::less_than_comparable< - SequenceNumber, boost::incrementable< - SequenceNumber, boost::decrementable > > > -{ - int32_t value; - - public: - SequenceNumber(uint32_t v=0) : value(v) {} - - SequenceNumber& operator++() { ++value; return *this; } - SequenceNumber& operator--() { --value; return *this; } - bool operator==(const SequenceNumber& other) const { return value == other.value; } - bool operator<(const SequenceNumber& other) const { return (value - other.value) < 0; } - uint32_t getValue() const { return uint32_t(value); } - operator uint32_t() const { return uint32_t(value); } - - void encode(Buffer& buffer) const; - void decode(Buffer& buffer); - uint32_t encodedSize() const; - - template void serialize(S& s) { s(value); } - - friend inline int32_t operator-(const SequenceNumber& a, const SequenceNumber& b); -}; - -inline int32_t operator-(const SequenceNumber& a, const SequenceNumber& b) { - return int32_t(a.value - b.value); -} - -struct Window -{ - SequenceNumber hwm; - SequenceNumber lwm; -}; - -QPID_COMMON_EXTERN std::ostream& operator<<(std::ostream& o, const SequenceNumber& n); - -}} // namespace qpid::framing - - -#endif diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/SequenceSet.h b/nativeLib/org.apache.qpid/include/qpid/framing/SequenceSet.h deleted file mode 100644 index 39395e9ad7..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/SequenceSet.h +++ /dev/null @@ -1,69 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#ifndef _framing_SequenceSet_h -#define _framing_SequenceSet_h - -#include "qpid/framing/SequenceNumber.h" -#include "qpid/RangeSet.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { -class Buffer; - -class SequenceSet : public RangeSet { - public: - SequenceSet() {} - SequenceSet(const RangeSet& r) - : RangeSet(r) {} - SequenceSet(const SequenceNumber& s) { add(s); } - SequenceSet(const SequenceNumber& start, const SequenceNumber finish) { add(start,finish); } - - - void encode(Buffer& buffer) const; - void decode(Buffer& buffer); - uint32_t encodedSize() const; - - QPID_COMMON_EXTERN bool contains(const SequenceNumber& s) const; - QPID_COMMON_EXTERN void add(const SequenceNumber& s); - QPID_COMMON_EXTERN void add(const SequenceNumber& start, const SequenceNumber& finish); // Closed range - QPID_COMMON_EXTERN void add(const SequenceSet& set); - QPID_COMMON_EXTERN void remove(const SequenceNumber& s); - QPID_COMMON_EXTERN void remove(const SequenceNumber& start, const SequenceNumber& finish); // Closed range - QPID_COMMON_EXTERN void remove(const SequenceSet& set); - - template void for_each(T& t) const { - for (RangeIterator i = rangesBegin(); i != rangesEnd(); i++) - t(i->first(), i->last()); - } - - template void for_each(const T& t) const { - for (RangeIterator i = rangesBegin(); i != rangesEnd(); i++) - t(i->first(), i->last()); - } - - friend QPID_COMMON_EXTERN std::ostream& operator<<(std::ostream&, const SequenceSet&); -}; - -}} // namespace qpid::framing - - -#endif diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/ServerInvoker.h b/nativeLib/org.apache.qpid/include/qpid/framing/ServerInvoker.h deleted file mode 100644 index 5dfd40f1d8..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/ServerInvoker.h +++ /dev/null @@ -1,275 +0,0 @@ -#ifndef QPID_FRAMING_SERVERINVOKER_H -#define QPID_FRAMING_SERVERINVOKER_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/Invoker.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - - -class AMQP_ServerOperations::Invoker: - public qpid::framing::Invoker -{ - AMQP_ServerOperations& target; - public: - Invoker(AMQP_ServerOperations& target_) : target(target_) {} - using MethodBodyDefaultVisitor::visit; - QPID_COMMON_EXTERN void visit(const ConnectionStartOkBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionSecureOkBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionTuneOkBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionOpenBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionHeartbeatBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionCloseBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionCloseOkBody& body); - QPID_COMMON_EXTERN void visit(const SessionAttachBody& body); - QPID_COMMON_EXTERN void visit(const SessionAttachedBody& body); - QPID_COMMON_EXTERN void visit(const SessionDetachBody& body); - QPID_COMMON_EXTERN void visit(const SessionDetachedBody& body); - QPID_COMMON_EXTERN void visit(const SessionRequestTimeoutBody& body); - QPID_COMMON_EXTERN void visit(const SessionTimeoutBody& body); - QPID_COMMON_EXTERN void visit(const SessionCommandPointBody& body); - QPID_COMMON_EXTERN void visit(const SessionExpectedBody& body); - QPID_COMMON_EXTERN void visit(const SessionConfirmedBody& body); - QPID_COMMON_EXTERN void visit(const SessionCompletedBody& body); - QPID_COMMON_EXTERN void visit(const SessionKnownCompletedBody& body); - QPID_COMMON_EXTERN void visit(const SessionFlushBody& body); - QPID_COMMON_EXTERN void visit(const SessionGapBody& body); - QPID_COMMON_EXTERN void visit(const ExecutionSyncBody& body); - QPID_COMMON_EXTERN void visit(const ExecutionResultBody& body); - QPID_COMMON_EXTERN void visit(const ExecutionExceptionBody& body); - QPID_COMMON_EXTERN void visit(const MessageAcceptBody& body); - QPID_COMMON_EXTERN void visit(const MessageRejectBody& body); - QPID_COMMON_EXTERN void visit(const MessageReleaseBody& body); - QPID_COMMON_EXTERN void visit(const MessageAcquireBody& body); - QPID_COMMON_EXTERN void visit(const MessageResumeBody& body); - QPID_COMMON_EXTERN void visit(const MessageSubscribeBody& body); - QPID_COMMON_EXTERN void visit(const MessageCancelBody& body); - QPID_COMMON_EXTERN void visit(const MessageSetFlowModeBody& body); - QPID_COMMON_EXTERN void visit(const MessageFlowBody& body); - QPID_COMMON_EXTERN void visit(const MessageFlushBody& body); - QPID_COMMON_EXTERN void visit(const MessageStopBody& body); - QPID_COMMON_EXTERN void visit(const TxSelectBody& body); - QPID_COMMON_EXTERN void visit(const TxCommitBody& body); - QPID_COMMON_EXTERN void visit(const TxRollbackBody& body); - QPID_COMMON_EXTERN void visit(const DtxSelectBody& body); - QPID_COMMON_EXTERN void visit(const DtxStartBody& body); - QPID_COMMON_EXTERN void visit(const DtxEndBody& body); - QPID_COMMON_EXTERN void visit(const DtxCommitBody& body); - QPID_COMMON_EXTERN void visit(const DtxForgetBody& body); - QPID_COMMON_EXTERN void visit(const DtxGetTimeoutBody& body); - QPID_COMMON_EXTERN void visit(const DtxPrepareBody& body); - QPID_COMMON_EXTERN void visit(const DtxRecoverBody& body); - QPID_COMMON_EXTERN void visit(const DtxRollbackBody& body); - QPID_COMMON_EXTERN void visit(const DtxSetTimeoutBody& body); - QPID_COMMON_EXTERN void visit(const ExchangeDeclareBody& body); - QPID_COMMON_EXTERN void visit(const ExchangeDeleteBody& body); - QPID_COMMON_EXTERN void visit(const ExchangeQueryBody& body); - QPID_COMMON_EXTERN void visit(const ExchangeBindBody& body); - QPID_COMMON_EXTERN void visit(const ExchangeUnbindBody& body); - QPID_COMMON_EXTERN void visit(const ExchangeBoundBody& body); - QPID_COMMON_EXTERN void visit(const QueueDeclareBody& body); - QPID_COMMON_EXTERN void visit(const QueueDeleteBody& body); - QPID_COMMON_EXTERN void visit(const QueuePurgeBody& body); - QPID_COMMON_EXTERN void visit(const QueueQueryBody& body); - QPID_COMMON_EXTERN void visit(const FileQosBody& body); - QPID_COMMON_EXTERN void visit(const FileConsumeBody& body); - QPID_COMMON_EXTERN void visit(const FileCancelBody& body); - QPID_COMMON_EXTERN void visit(const FileOpenBody& body); - QPID_COMMON_EXTERN void visit(const FileOpenOkBody& body); - QPID_COMMON_EXTERN void visit(const FilePublishBody& body); - QPID_COMMON_EXTERN void visit(const FileAckBody& body); - QPID_COMMON_EXTERN void visit(const FileRejectBody& body); - QPID_COMMON_EXTERN void visit(const StreamQosBody& body); - QPID_COMMON_EXTERN void visit(const StreamConsumeBody& body); - QPID_COMMON_EXTERN void visit(const StreamCancelBody& body); -}; - -class AMQP_ServerOperations::ConnectionHandler::Invoker: - public qpid::framing::Invoker -{ - AMQP_ServerOperations::ConnectionHandler& target; - public: - Invoker(AMQP_ServerOperations::ConnectionHandler& target_) : target(target_) {} - using MethodBodyDefaultVisitor::visit; - QPID_COMMON_EXTERN void visit(const ConnectionStartOkBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionSecureOkBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionTuneOkBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionOpenBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionHeartbeatBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionCloseBody& body); - QPID_COMMON_EXTERN void visit(const ConnectionCloseOkBody& body); -}; - -class AMQP_ServerOperations::SessionHandler::Invoker: - public qpid::framing::Invoker -{ - AMQP_ServerOperations::SessionHandler& target; - public: - Invoker(AMQP_ServerOperations::SessionHandler& target_) : target(target_) {} - using MethodBodyDefaultVisitor::visit; - QPID_COMMON_EXTERN void visit(const SessionAttachBody& body); - QPID_COMMON_EXTERN void visit(const SessionAttachedBody& body); - QPID_COMMON_EXTERN void visit(const SessionDetachBody& body); - QPID_COMMON_EXTERN void visit(const SessionDetachedBody& body); - QPID_COMMON_EXTERN void visit(const SessionRequestTimeoutBody& body); - QPID_COMMON_EXTERN void visit(const SessionTimeoutBody& body); - QPID_COMMON_EXTERN void visit(const SessionCommandPointBody& body); - QPID_COMMON_EXTERN void visit(const SessionExpectedBody& body); - QPID_COMMON_EXTERN void visit(const SessionConfirmedBody& body); - QPID_COMMON_EXTERN void visit(const SessionCompletedBody& body); - QPID_COMMON_EXTERN void visit(const SessionKnownCompletedBody& body); - QPID_COMMON_EXTERN void visit(const SessionFlushBody& body); - QPID_COMMON_EXTERN void visit(const SessionGapBody& body); -}; - -class AMQP_ServerOperations::ExecutionHandler::Invoker: - public qpid::framing::Invoker -{ - AMQP_ServerOperations::ExecutionHandler& target; - public: - Invoker(AMQP_ServerOperations::ExecutionHandler& target_) : target(target_) {} - using MethodBodyDefaultVisitor::visit; - QPID_COMMON_EXTERN void visit(const ExecutionSyncBody& body); - QPID_COMMON_EXTERN void visit(const ExecutionResultBody& body); - QPID_COMMON_EXTERN void visit(const ExecutionExceptionBody& body); -}; - -class AMQP_ServerOperations::MessageHandler::Invoker: - public qpid::framing::Invoker -{ - AMQP_ServerOperations::MessageHandler& target; - public: - Invoker(AMQP_ServerOperations::MessageHandler& target_) : target(target_) {} - using MethodBodyDefaultVisitor::visit; - QPID_COMMON_EXTERN void visit(const MessageAcceptBody& body); - QPID_COMMON_EXTERN void visit(const MessageRejectBody& body); - QPID_COMMON_EXTERN void visit(const MessageReleaseBody& body); - QPID_COMMON_EXTERN void visit(const MessageAcquireBody& body); - QPID_COMMON_EXTERN void visit(const MessageResumeBody& body); - QPID_COMMON_EXTERN void visit(const MessageSubscribeBody& body); - QPID_COMMON_EXTERN void visit(const MessageCancelBody& body); - QPID_COMMON_EXTERN void visit(const MessageSetFlowModeBody& body); - QPID_COMMON_EXTERN void visit(const MessageFlowBody& body); - QPID_COMMON_EXTERN void visit(const MessageFlushBody& body); - QPID_COMMON_EXTERN void visit(const MessageStopBody& body); -}; - -class AMQP_ServerOperations::TxHandler::Invoker: - public qpid::framing::Invoker -{ - AMQP_ServerOperations::TxHandler& target; - public: - Invoker(AMQP_ServerOperations::TxHandler& target_) : target(target_) {} - using MethodBodyDefaultVisitor::visit; - QPID_COMMON_EXTERN void visit(const TxSelectBody& body); - QPID_COMMON_EXTERN void visit(const TxCommitBody& body); - QPID_COMMON_EXTERN void visit(const TxRollbackBody& body); -}; - -class AMQP_ServerOperations::DtxHandler::Invoker: - public qpid::framing::Invoker -{ - AMQP_ServerOperations::DtxHandler& target; - public: - Invoker(AMQP_ServerOperations::DtxHandler& target_) : target(target_) {} - using MethodBodyDefaultVisitor::visit; - QPID_COMMON_EXTERN void visit(const DtxSelectBody& body); - QPID_COMMON_EXTERN void visit(const DtxStartBody& body); - QPID_COMMON_EXTERN void visit(const DtxEndBody& body); - QPID_COMMON_EXTERN void visit(const DtxCommitBody& body); - QPID_COMMON_EXTERN void visit(const DtxForgetBody& body); - QPID_COMMON_EXTERN void visit(const DtxGetTimeoutBody& body); - QPID_COMMON_EXTERN void visit(const DtxPrepareBody& body); - QPID_COMMON_EXTERN void visit(const DtxRecoverBody& body); - QPID_COMMON_EXTERN void visit(const DtxRollbackBody& body); - QPID_COMMON_EXTERN void visit(const DtxSetTimeoutBody& body); -}; - -class AMQP_ServerOperations::ExchangeHandler::Invoker: - public qpid::framing::Invoker -{ - AMQP_ServerOperations::ExchangeHandler& target; - public: - Invoker(AMQP_ServerOperations::ExchangeHandler& target_) : target(target_) {} - using MethodBodyDefaultVisitor::visit; - QPID_COMMON_EXTERN void visit(const ExchangeDeclareBody& body); - QPID_COMMON_EXTERN void visit(const ExchangeDeleteBody& body); - QPID_COMMON_EXTERN void visit(const ExchangeQueryBody& body); - QPID_COMMON_EXTERN void visit(const ExchangeBindBody& body); - QPID_COMMON_EXTERN void visit(const ExchangeUnbindBody& body); - QPID_COMMON_EXTERN void visit(const ExchangeBoundBody& body); -}; - -class AMQP_ServerOperations::QueueHandler::Invoker: - public qpid::framing::Invoker -{ - AMQP_ServerOperations::QueueHandler& target; - public: - Invoker(AMQP_ServerOperations::QueueHandler& target_) : target(target_) {} - using MethodBodyDefaultVisitor::visit; - QPID_COMMON_EXTERN void visit(const QueueDeclareBody& body); - QPID_COMMON_EXTERN void visit(const QueueDeleteBody& body); - QPID_COMMON_EXTERN void visit(const QueuePurgeBody& body); - QPID_COMMON_EXTERN void visit(const QueueQueryBody& body); -}; - -class AMQP_ServerOperations::FileHandler::Invoker: - public qpid::framing::Invoker -{ - AMQP_ServerOperations::FileHandler& target; - public: - Invoker(AMQP_ServerOperations::FileHandler& target_) : target(target_) {} - using MethodBodyDefaultVisitor::visit; - QPID_COMMON_EXTERN void visit(const FileQosBody& body); - QPID_COMMON_EXTERN void visit(const FileConsumeBody& body); - QPID_COMMON_EXTERN void visit(const FileCancelBody& body); - QPID_COMMON_EXTERN void visit(const FileOpenBody& body); - QPID_COMMON_EXTERN void visit(const FileOpenOkBody& body); - QPID_COMMON_EXTERN void visit(const FilePublishBody& body); - QPID_COMMON_EXTERN void visit(const FileAckBody& body); - QPID_COMMON_EXTERN void visit(const FileRejectBody& body); -}; - -class AMQP_ServerOperations::StreamHandler::Invoker: - public qpid::framing::Invoker -{ - AMQP_ServerOperations::StreamHandler& target; - public: - Invoker(AMQP_ServerOperations::StreamHandler& target_) : target(target_) {} - using MethodBodyDefaultVisitor::visit; - QPID_COMMON_EXTERN void visit(const StreamQosBody& body); - QPID_COMMON_EXTERN void visit(const StreamConsumeBody& body); - QPID_COMMON_EXTERN void visit(const StreamCancelBody& body); -}; - -}} // namespace qpid::framing - -#endif /*!QPID_FRAMING_SERVERINVOKER_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/SessionAttachBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/SessionAttachBody.h deleted file mode 100644 index 9140a863ec..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/SessionAttachBody.h +++ /dev/null @@ -1,89 +0,0 @@ -#ifndef QPID_FRAMING_SESSIONATTACHBODY_H -#define QPID_FRAMING_SESSIONATTACHBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class SessionAttachBody : public AMQMethodBody { - string name; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x2; - static const MethodId METHOD_ID = 0x1; - SessionAttachBody( - ProtocolVersion, const string& _name, - bool _force) : - name(_name), - flags(0){ - setForce(_force); - flags |= (1 << 8); - } - SessionAttachBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setName(const string& _name); - QPID_COMMON_EXTERN const string& getName() const; - QPID_COMMON_EXTERN bool hasName() const; - QPID_COMMON_EXTERN void clearNameFlag(); - QPID_COMMON_EXTERN void setForce(bool _force); - QPID_COMMON_EXTERN bool getForce() const; -virtual uint8_t type() const { return 0;/*control segment*/ } - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.attach(getName(), getForce()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return true; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class SessionAttachBody */ - -}} -#endif /*!QPID_FRAMING_SESSIONATTACHBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/SessionAttachedBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/SessionAttachedBody.h deleted file mode 100644 index 27e12dc26b..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/SessionAttachedBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_SESSIONATTACHEDBODY_H -#define QPID_FRAMING_SESSIONATTACHEDBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class SessionAttachedBody : public AMQMethodBody { - string name; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x2; - static const MethodId METHOD_ID = 0x2; - SessionAttachedBody( - ProtocolVersion, const string& _name) : - name(_name), - flags(0){ - flags |= (1 << 8); - } - SessionAttachedBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setName(const string& _name); - QPID_COMMON_EXTERN const string& getName() const; - QPID_COMMON_EXTERN bool hasName() const; - QPID_COMMON_EXTERN void clearNameFlag(); -virtual uint8_t type() const { return 0;/*control segment*/ } - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.attached(getName()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class SessionAttachedBody */ - -}} -#endif /*!QPID_FRAMING_SESSIONATTACHEDBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/SessionCommandPointBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/SessionCommandPointBody.h deleted file mode 100644 index 056598dc56..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/SessionCommandPointBody.h +++ /dev/null @@ -1,93 +0,0 @@ -#ifndef QPID_FRAMING_SESSIONCOMMANDPOINTBODY_H -#define QPID_FRAMING_SESSIONCOMMANDPOINTBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class SessionCommandPointBody : public AMQMethodBody { - SequenceNumber commandId; - uint64_t commandOffset; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x2; - static const MethodId METHOD_ID = 0x7; - SessionCommandPointBody( - ProtocolVersion, const SequenceNumber& _commandId, - uint64_t _commandOffset) : - commandId(_commandId), - commandOffset(_commandOffset), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - } - SessionCommandPointBody(ProtocolVersion=ProtocolVersion()) : commandOffset(0), flags(0) {} - - QPID_COMMON_EXTERN void setCommandId(const SequenceNumber& _commandId); - QPID_COMMON_EXTERN SequenceNumber getCommandId() const; - QPID_COMMON_EXTERN bool hasCommandId() const; - QPID_COMMON_EXTERN void clearCommandIdFlag(); - QPID_COMMON_EXTERN void setCommandOffset(uint64_t _commandOffset); - QPID_COMMON_EXTERN uint64_t getCommandOffset() const; - QPID_COMMON_EXTERN bool hasCommandOffset() const; - QPID_COMMON_EXTERN void clearCommandOffsetFlag(); -virtual uint8_t type() const { return 0;/*control segment*/ } - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.commandPoint(getCommandId(), getCommandOffset()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class SessionCommandPointBody */ - -}} -#endif /*!QPID_FRAMING_SESSIONCOMMANDPOINTBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/SessionCompletedBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/SessionCompletedBody.h deleted file mode 100644 index c9e85982c9..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/SessionCompletedBody.h +++ /dev/null @@ -1,89 +0,0 @@ -#ifndef QPID_FRAMING_SESSIONCOMPLETEDBODY_H -#define QPID_FRAMING_SESSIONCOMPLETEDBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class SessionCompletedBody : public AMQMethodBody { - SequenceSet commands; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x2; - static const MethodId METHOD_ID = 0xa; - SessionCompletedBody( - ProtocolVersion, const SequenceSet& _commands, - bool _timelyReply) : - commands(_commands), - flags(0){ - setTimelyReply(_timelyReply); - flags |= (1 << 8); - } - SessionCompletedBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setCommands(const SequenceSet& _commands); - QPID_COMMON_EXTERN const SequenceSet& getCommands() const; - QPID_COMMON_EXTERN bool hasCommands() const; - QPID_COMMON_EXTERN void clearCommandsFlag(); - QPID_COMMON_EXTERN void setTimelyReply(bool _timelyReply); - QPID_COMMON_EXTERN bool getTimelyReply() const; -virtual uint8_t type() const { return 0;/*control segment*/ } - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.completed(getCommands(), getTimelyReply()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class SessionCompletedBody */ - -}} -#endif /*!QPID_FRAMING_SESSIONCOMPLETEDBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/SessionConfirmedBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/SessionConfirmedBody.h deleted file mode 100644 index a5f07e079f..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/SessionConfirmedBody.h +++ /dev/null @@ -1,93 +0,0 @@ -#ifndef QPID_FRAMING_SESSIONCONFIRMEDBODY_H -#define QPID_FRAMING_SESSIONCONFIRMEDBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class SessionConfirmedBody : public AMQMethodBody { - SequenceSet commands; - Array fragments; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x2; - static const MethodId METHOD_ID = 0x9; - SessionConfirmedBody( - ProtocolVersion, const SequenceSet& _commands, - const Array& _fragments) : - commands(_commands), - fragments(_fragments), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - } - SessionConfirmedBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setCommands(const SequenceSet& _commands); - QPID_COMMON_EXTERN const SequenceSet& getCommands() const; - QPID_COMMON_EXTERN bool hasCommands() const; - QPID_COMMON_EXTERN void clearCommandsFlag(); - QPID_COMMON_EXTERN void setFragments(const Array& _fragments); - QPID_COMMON_EXTERN const Array& getFragments() const; - QPID_COMMON_EXTERN bool hasFragments() const; - QPID_COMMON_EXTERN void clearFragmentsFlag(); -virtual uint8_t type() const { return 0;/*control segment*/ } - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.confirmed(getCommands(), getFragments()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class SessionConfirmedBody */ - -}} -#endif /*!QPID_FRAMING_SESSIONCONFIRMEDBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/SessionDetachBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/SessionDetachBody.h deleted file mode 100644 index 23e60653ff..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/SessionDetachBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_SESSIONDETACHBODY_H -#define QPID_FRAMING_SESSIONDETACHBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class SessionDetachBody : public AMQMethodBody { - string name; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x2; - static const MethodId METHOD_ID = 0x3; - SessionDetachBody( - ProtocolVersion, const string& _name) : - name(_name), - flags(0){ - flags |= (1 << 8); - } - SessionDetachBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setName(const string& _name); - QPID_COMMON_EXTERN const string& getName() const; - QPID_COMMON_EXTERN bool hasName() const; - QPID_COMMON_EXTERN void clearNameFlag(); -virtual uint8_t type() const { return 0;/*control segment*/ } - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.detach(getName()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return true; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class SessionDetachBody */ - -}} -#endif /*!QPID_FRAMING_SESSIONDETACHBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/SessionDetachedBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/SessionDetachedBody.h deleted file mode 100644 index 80059ab43f..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/SessionDetachedBody.h +++ /dev/null @@ -1,93 +0,0 @@ -#ifndef QPID_FRAMING_SESSIONDETACHEDBODY_H -#define QPID_FRAMING_SESSIONDETACHEDBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class SessionDetachedBody : public AMQMethodBody { - string name; - uint8_t code; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x2; - static const MethodId METHOD_ID = 0x4; - SessionDetachedBody( - ProtocolVersion, const string& _name, - uint8_t _code) : - name(_name), - code(_code), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - } - SessionDetachedBody(ProtocolVersion=ProtocolVersion()) : code(0), flags(0) {} - - QPID_COMMON_EXTERN void setName(const string& _name); - QPID_COMMON_EXTERN const string& getName() const; - QPID_COMMON_EXTERN bool hasName() const; - QPID_COMMON_EXTERN void clearNameFlag(); - QPID_COMMON_EXTERN void setCode(uint8_t _code); - QPID_COMMON_EXTERN uint8_t getCode() const; - QPID_COMMON_EXTERN bool hasCode() const; - QPID_COMMON_EXTERN void clearCodeFlag(); -virtual uint8_t type() const { return 0;/*control segment*/ } - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.detached(getName(), getCode()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class SessionDetachedBody */ - -}} -#endif /*!QPID_FRAMING_SESSIONDETACHEDBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/SessionExpectedBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/SessionExpectedBody.h deleted file mode 100644 index d095db2668..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/SessionExpectedBody.h +++ /dev/null @@ -1,93 +0,0 @@ -#ifndef QPID_FRAMING_SESSIONEXPECTEDBODY_H -#define QPID_FRAMING_SESSIONEXPECTEDBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class SessionExpectedBody : public AMQMethodBody { - SequenceSet commands; - Array fragments; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x2; - static const MethodId METHOD_ID = 0x8; - SessionExpectedBody( - ProtocolVersion, const SequenceSet& _commands, - const Array& _fragments) : - commands(_commands), - fragments(_fragments), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - } - SessionExpectedBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setCommands(const SequenceSet& _commands); - QPID_COMMON_EXTERN const SequenceSet& getCommands() const; - QPID_COMMON_EXTERN bool hasCommands() const; - QPID_COMMON_EXTERN void clearCommandsFlag(); - QPID_COMMON_EXTERN void setFragments(const Array& _fragments); - QPID_COMMON_EXTERN const Array& getFragments() const; - QPID_COMMON_EXTERN bool hasFragments() const; - QPID_COMMON_EXTERN void clearFragmentsFlag(); -virtual uint8_t type() const { return 0;/*control segment*/ } - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.expected(getCommands(), getFragments()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class SessionExpectedBody */ - -}} -#endif /*!QPID_FRAMING_SESSIONEXPECTEDBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/SessionFlushBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/SessionFlushBody.h deleted file mode 100644 index 02dc732c6c..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/SessionFlushBody.h +++ /dev/null @@ -1,89 +0,0 @@ -#ifndef QPID_FRAMING_SESSIONFLUSHBODY_H -#define QPID_FRAMING_SESSIONFLUSHBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class SessionFlushBody : public AMQMethodBody { - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x2; - static const MethodId METHOD_ID = 0xc; - SessionFlushBody( - ProtocolVersion, bool _expected, - bool _confirmed, - bool _completed) : - flags(0){ - setExpected(_expected); - setConfirmed(_confirmed); - setCompleted(_completed); - } - SessionFlushBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setExpected(bool _expected); - QPID_COMMON_EXTERN bool getExpected() const; - QPID_COMMON_EXTERN void setConfirmed(bool _confirmed); - QPID_COMMON_EXTERN bool getConfirmed() const; - QPID_COMMON_EXTERN void setCompleted(bool _completed); - QPID_COMMON_EXTERN bool getCompleted() const; -virtual uint8_t type() const { return 0;/*control segment*/ } - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.flush(getExpected(), getConfirmed(), getCompleted()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class SessionFlushBody */ - -}} -#endif /*!QPID_FRAMING_SESSIONFLUSHBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/SessionGapBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/SessionGapBody.h deleted file mode 100644 index 6931858c53..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/SessionGapBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_SESSIONGAPBODY_H -#define QPID_FRAMING_SESSIONGAPBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class SessionGapBody : public AMQMethodBody { - SequenceSet commands; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x2; - static const MethodId METHOD_ID = 0xd; - SessionGapBody( - ProtocolVersion, const SequenceSet& _commands) : - commands(_commands), - flags(0){ - flags |= (1 << 8); - } - SessionGapBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setCommands(const SequenceSet& _commands); - QPID_COMMON_EXTERN const SequenceSet& getCommands() const; - QPID_COMMON_EXTERN bool hasCommands() const; - QPID_COMMON_EXTERN void clearCommandsFlag(); -virtual uint8_t type() const { return 0;/*control segment*/ } - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.gap(getCommands()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class SessionGapBody */ - -}} -#endif /*!QPID_FRAMING_SESSIONGAPBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/SessionKnownCompletedBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/SessionKnownCompletedBody.h deleted file mode 100644 index aefb6404e0..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/SessionKnownCompletedBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_SESSIONKNOWNCOMPLETEDBODY_H -#define QPID_FRAMING_SESSIONKNOWNCOMPLETEDBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class SessionKnownCompletedBody : public AMQMethodBody { - SequenceSet commands; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x2; - static const MethodId METHOD_ID = 0xb; - SessionKnownCompletedBody( - ProtocolVersion, const SequenceSet& _commands) : - commands(_commands), - flags(0){ - flags |= (1 << 8); - } - SessionKnownCompletedBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setCommands(const SequenceSet& _commands); - QPID_COMMON_EXTERN const SequenceSet& getCommands() const; - QPID_COMMON_EXTERN bool hasCommands() const; - QPID_COMMON_EXTERN void clearCommandsFlag(); -virtual uint8_t type() const { return 0;/*control segment*/ } - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.knownCompleted(getCommands()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class SessionKnownCompletedBody */ - -}} -#endif /*!QPID_FRAMING_SESSIONKNOWNCOMPLETEDBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/SessionRequestTimeoutBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/SessionRequestTimeoutBody.h deleted file mode 100644 index 10636f69a3..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/SessionRequestTimeoutBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_SESSIONREQUESTTIMEOUTBODY_H -#define QPID_FRAMING_SESSIONREQUESTTIMEOUTBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class SessionRequestTimeoutBody : public AMQMethodBody { - uint32_t timeout; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x2; - static const MethodId METHOD_ID = 0x5; - SessionRequestTimeoutBody( - ProtocolVersion, uint32_t _timeout) : - timeout(_timeout), - flags(0){ - flags |= (1 << 8); - } - SessionRequestTimeoutBody(ProtocolVersion=ProtocolVersion()) : timeout(0), flags(0) {} - - QPID_COMMON_EXTERN void setTimeout(uint32_t _timeout); - QPID_COMMON_EXTERN uint32_t getTimeout() const; - QPID_COMMON_EXTERN bool hasTimeout() const; - QPID_COMMON_EXTERN void clearTimeoutFlag(); -virtual uint8_t type() const { return 0;/*control segment*/ } - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.requestTimeout(getTimeout()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return true; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class SessionRequestTimeoutBody */ - -}} -#endif /*!QPID_FRAMING_SESSIONREQUESTTIMEOUTBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/SessionTimeoutBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/SessionTimeoutBody.h deleted file mode 100644 index be6cf4868c..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/SessionTimeoutBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_SESSIONTIMEOUTBODY_H -#define QPID_FRAMING_SESSIONTIMEOUTBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class SessionTimeoutBody : public AMQMethodBody { - uint32_t timeout; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x2; - static const MethodId METHOD_ID = 0x6; - SessionTimeoutBody( - ProtocolVersion, uint32_t _timeout) : - timeout(_timeout), - flags(0){ - flags |= (1 << 8); - } - SessionTimeoutBody(ProtocolVersion=ProtocolVersion()) : timeout(0), flags(0) {} - - QPID_COMMON_EXTERN void setTimeout(uint32_t _timeout); - QPID_COMMON_EXTERN uint32_t getTimeout() const; - QPID_COMMON_EXTERN bool hasTimeout() const; - QPID_COMMON_EXTERN void clearTimeoutFlag(); -virtual uint8_t type() const { return 0;/*control segment*/ } - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.timeout(getTimeout()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class SessionTimeoutBody */ - -}} -#endif /*!QPID_FRAMING_SESSIONTIMEOUTBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/StreamCancelBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/StreamCancelBody.h deleted file mode 100644 index 0208d2ca1d..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/StreamCancelBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_STREAMCANCELBODY_H -#define QPID_FRAMING_STREAMCANCELBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class StreamCancelBody : public ModelMethod { - string consumerTag; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0xa; - static const MethodId METHOD_ID = 0x5; - StreamCancelBody( - ProtocolVersion, const string& _consumerTag) : - consumerTag(_consumerTag), - flags(0){ - flags |= (1 << 8); - } - StreamCancelBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setConsumerTag(const string& _consumerTag); - QPID_COMMON_EXTERN const string& getConsumerTag() const; - QPID_COMMON_EXTERN bool hasConsumerTag() const; - QPID_COMMON_EXTERN void clearConsumerTagFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.cancel(getConsumerTag()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class StreamCancelBody */ - -}} -#endif /*!QPID_FRAMING_STREAMCANCELBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/StreamConsumeBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/StreamConsumeBody.h deleted file mode 100644 index dda3f415da..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/StreamConsumeBody.h +++ /dev/null @@ -1,114 +0,0 @@ -#ifndef QPID_FRAMING_STREAMCONSUMEBODY_H -#define QPID_FRAMING_STREAMCONSUMEBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class StreamConsumeBody : public ModelMethod { - string queue; - string consumerTag; - FieldTable arguments; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0xa; - static const MethodId METHOD_ID = 0x3; - StreamConsumeBody( - ProtocolVersion, const string& _queue, - const string& _consumerTag, - bool _noLocal, - bool _exclusive, - bool _nowait, - const FieldTable& _arguments) : - queue(_queue), - consumerTag(_consumerTag), - arguments(_arguments), - flags(0){ - setNoLocal(_noLocal); - setExclusive(_exclusive); - setNowait(_nowait); - flags |= (1 << 8); - flags |= (1 << 9); - flags |= (1 << 13); - } - StreamConsumeBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setQueue(const string& _queue); - QPID_COMMON_EXTERN const string& getQueue() const; - QPID_COMMON_EXTERN bool hasQueue() const; - QPID_COMMON_EXTERN void clearQueueFlag(); - QPID_COMMON_EXTERN void setConsumerTag(const string& _consumerTag); - QPID_COMMON_EXTERN const string& getConsumerTag() const; - QPID_COMMON_EXTERN bool hasConsumerTag() const; - QPID_COMMON_EXTERN void clearConsumerTagFlag(); - QPID_COMMON_EXTERN void setNoLocal(bool _noLocal); - QPID_COMMON_EXTERN bool getNoLocal() const; - QPID_COMMON_EXTERN void setExclusive(bool _exclusive); - QPID_COMMON_EXTERN bool getExclusive() const; - QPID_COMMON_EXTERN void setNowait(bool _nowait); - QPID_COMMON_EXTERN bool getNowait() const; - QPID_COMMON_EXTERN void setArguments(const FieldTable& _arguments); - QPID_COMMON_EXTERN const FieldTable& getArguments() const; - QPID_COMMON_EXTERN FieldTable& getArguments(); - QPID_COMMON_EXTERN bool hasArguments() const; - QPID_COMMON_EXTERN void clearArgumentsFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.consume(getQueue(), getConsumerTag(), getNoLocal(), getExclusive(), getNowait(), getArguments()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return true; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class StreamConsumeBody */ - -}} -#endif /*!QPID_FRAMING_STREAMCONSUMEBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/StreamConsumeOkBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/StreamConsumeOkBody.h deleted file mode 100644 index eb849bcd8a..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/StreamConsumeOkBody.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef QPID_FRAMING_STREAMCONSUMEOKBODY_H -#define QPID_FRAMING_STREAMCONSUMEOKBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class StreamConsumeOkBody : public ModelMethod { - string consumerTag; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0xa; - static const MethodId METHOD_ID = 0x4; - StreamConsumeOkBody( - ProtocolVersion, const string& _consumerTag) : - consumerTag(_consumerTag), - flags(0){ - flags |= (1 << 8); - } - StreamConsumeOkBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setConsumerTag(const string& _consumerTag); - QPID_COMMON_EXTERN const string& getConsumerTag() const; - QPID_COMMON_EXTERN bool hasConsumerTag() const; - QPID_COMMON_EXTERN void clearConsumerTagFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.consumeOk(getConsumerTag()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class StreamConsumeOkBody */ - -}} -#endif /*!QPID_FRAMING_STREAMCONSUMEOKBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/StreamDeliverBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/StreamDeliverBody.h deleted file mode 100644 index 8b6ae944c8..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/StreamDeliverBody.h +++ /dev/null @@ -1,109 +0,0 @@ -#ifndef QPID_FRAMING_STREAMDELIVERBODY_H -#define QPID_FRAMING_STREAMDELIVERBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class StreamDeliverBody : public ModelMethod { - string consumerTag; - uint64_t deliveryTag; - string exchange; - string queue; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0xa; - static const MethodId METHOD_ID = 0x8; - StreamDeliverBody( - ProtocolVersion, const string& _consumerTag, - uint64_t _deliveryTag, - const string& _exchange, - const string& _queue) : - consumerTag(_consumerTag), - deliveryTag(_deliveryTag), - exchange(_exchange), - queue(_queue), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - flags |= (1 << 10); - flags |= (1 << 11); - } - StreamDeliverBody(ProtocolVersion=ProtocolVersion()) : deliveryTag(0), flags(0) {} - - QPID_COMMON_EXTERN void setConsumerTag(const string& _consumerTag); - QPID_COMMON_EXTERN const string& getConsumerTag() const; - QPID_COMMON_EXTERN bool hasConsumerTag() const; - QPID_COMMON_EXTERN void clearConsumerTagFlag(); - QPID_COMMON_EXTERN void setDeliveryTag(uint64_t _deliveryTag); - QPID_COMMON_EXTERN uint64_t getDeliveryTag() const; - QPID_COMMON_EXTERN bool hasDeliveryTag() const; - QPID_COMMON_EXTERN void clearDeliveryTagFlag(); - QPID_COMMON_EXTERN void setExchange(const string& _exchange); - QPID_COMMON_EXTERN const string& getExchange() const; - QPID_COMMON_EXTERN bool hasExchange() const; - QPID_COMMON_EXTERN void clearExchangeFlag(); - QPID_COMMON_EXTERN void setQueue(const string& _queue); - QPID_COMMON_EXTERN const string& getQueue() const; - QPID_COMMON_EXTERN bool hasQueue() const; - QPID_COMMON_EXTERN void clearQueueFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.deliver(getConsumerTag(), getDeliveryTag(), getExchange(), getQueue()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return true; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class StreamDeliverBody */ - -}} -#endif /*!QPID_FRAMING_STREAMDELIVERBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/StreamProperties.h b/nativeLib/org.apache.qpid/include/qpid/framing/StreamProperties.h deleted file mode 100644 index 8c68c1065d..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/StreamProperties.h +++ /dev/null @@ -1,99 +0,0 @@ -#ifndef QPID_FRAMING_STREAMPROPERTIES_H -#define QPID_FRAMING_STREAMPROPERTIES_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class StreamProperties { - string contentType; - string contentEncoding; - FieldTable headers; - uint8_t priority; - uint64_t timestamp; - uint16_t flags; -public: - static const uint16_t TYPE = 2561; - StreamProperties( - const string& _contentType, - const string& _contentEncoding, - const FieldTable& _headers, - uint8_t _priority, - uint64_t _timestamp) : - contentType(_contentType), - contentEncoding(_contentEncoding), - headers(_headers), - priority(_priority), - timestamp(_timestamp), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - flags |= (1 << 10); - flags |= (1 << 11); - flags |= (1 << 12); - } - StreamProperties() : priority(0), timestamp(0), flags(0) {} - - QPID_COMMON_EXTERN void setContentType(const string& _contentType); - QPID_COMMON_EXTERN const string& getContentType() const; - QPID_COMMON_EXTERN bool hasContentType() const; - QPID_COMMON_EXTERN void clearContentTypeFlag(); - QPID_COMMON_EXTERN void setContentEncoding(const string& _contentEncoding); - QPID_COMMON_EXTERN const string& getContentEncoding() const; - QPID_COMMON_EXTERN bool hasContentEncoding() const; - QPID_COMMON_EXTERN void clearContentEncodingFlag(); - QPID_COMMON_EXTERN void setHeaders(const FieldTable& _headers); - QPID_COMMON_EXTERN const FieldTable& getHeaders() const; - QPID_COMMON_EXTERN FieldTable& getHeaders(); - QPID_COMMON_EXTERN bool hasHeaders() const; - QPID_COMMON_EXTERN void clearHeadersFlag(); - QPID_COMMON_EXTERN void setPriority(uint8_t _priority); - QPID_COMMON_EXTERN uint8_t getPriority() const; - QPID_COMMON_EXTERN bool hasPriority() const; - QPID_COMMON_EXTERN void clearPriorityFlag(); - QPID_COMMON_EXTERN void setTimestamp(uint64_t _timestamp); - QPID_COMMON_EXTERN uint64_t getTimestamp() const; - QPID_COMMON_EXTERN bool hasTimestamp() const; - QPID_COMMON_EXTERN void clearTimestampFlag(); - QPID_COMMON_EXTERN friend std::ostream& operator<<(std::ostream&, const StreamProperties&); - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class StreamProperties */ - -}} -#endif /*!QPID_FRAMING_STREAMPROPERTIES_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/StreamPublishBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/StreamPublishBody.h deleted file mode 100644 index 99850ad611..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/StreamPublishBody.h +++ /dev/null @@ -1,101 +0,0 @@ -#ifndef QPID_FRAMING_STREAMPUBLISHBODY_H -#define QPID_FRAMING_STREAMPUBLISHBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class StreamPublishBody : public ModelMethod { - string exchange; - string routingKey; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0xa; - static const MethodId METHOD_ID = 0x6; - StreamPublishBody( - ProtocolVersion, const string& _exchange, - const string& _routingKey, - bool _mandatory, - bool _immediate) : - exchange(_exchange), - routingKey(_routingKey), - flags(0){ - setMandatory(_mandatory); - setImmediate(_immediate); - flags |= (1 << 8); - flags |= (1 << 9); - } - StreamPublishBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - QPID_COMMON_EXTERN void setExchange(const string& _exchange); - QPID_COMMON_EXTERN const string& getExchange() const; - QPID_COMMON_EXTERN bool hasExchange() const; - QPID_COMMON_EXTERN void clearExchangeFlag(); - QPID_COMMON_EXTERN void setRoutingKey(const string& _routingKey); - QPID_COMMON_EXTERN const string& getRoutingKey() const; - QPID_COMMON_EXTERN bool hasRoutingKey() const; - QPID_COMMON_EXTERN void clearRoutingKeyFlag(); - QPID_COMMON_EXTERN void setMandatory(bool _mandatory); - QPID_COMMON_EXTERN bool getMandatory() const; - QPID_COMMON_EXTERN void setImmediate(bool _immediate); - QPID_COMMON_EXTERN bool getImmediate() const; - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.publish(getExchange(), getRoutingKey(), getMandatory(), getImmediate()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return true; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class StreamPublishBody */ - -}} -#endif /*!QPID_FRAMING_STREAMPUBLISHBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/StreamQosBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/StreamQosBody.h deleted file mode 100644 index 0d129ef09a..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/StreamQosBody.h +++ /dev/null @@ -1,105 +0,0 @@ -#ifndef QPID_FRAMING_STREAMQOSBODY_H -#define QPID_FRAMING_STREAMQOSBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class StreamQosBody : public ModelMethod { - uint32_t prefetchSize; - uint16_t prefetchCount; - uint32_t consumeRate; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0xa; - static const MethodId METHOD_ID = 0x1; - StreamQosBody( - ProtocolVersion, uint32_t _prefetchSize, - uint16_t _prefetchCount, - uint32_t _consumeRate, - bool _global) : - prefetchSize(_prefetchSize), - prefetchCount(_prefetchCount), - consumeRate(_consumeRate), - flags(0){ - setGlobal(_global); - flags |= (1 << 8); - flags |= (1 << 9); - flags |= (1 << 10); - } - StreamQosBody(ProtocolVersion=ProtocolVersion()) : prefetchSize(0), prefetchCount(0), consumeRate(0), flags(0) {} - - QPID_COMMON_EXTERN void setPrefetchSize(uint32_t _prefetchSize); - QPID_COMMON_EXTERN uint32_t getPrefetchSize() const; - QPID_COMMON_EXTERN bool hasPrefetchSize() const; - QPID_COMMON_EXTERN void clearPrefetchSizeFlag(); - QPID_COMMON_EXTERN void setPrefetchCount(uint16_t _prefetchCount); - QPID_COMMON_EXTERN uint16_t getPrefetchCount() const; - QPID_COMMON_EXTERN bool hasPrefetchCount() const; - QPID_COMMON_EXTERN void clearPrefetchCountFlag(); - QPID_COMMON_EXTERN void setConsumeRate(uint32_t _consumeRate); - QPID_COMMON_EXTERN uint32_t getConsumeRate() const; - QPID_COMMON_EXTERN bool hasConsumeRate() const; - QPID_COMMON_EXTERN void clearConsumeRateFlag(); - QPID_COMMON_EXTERN void setGlobal(bool _global); - QPID_COMMON_EXTERN bool getGlobal() const; - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.qos(getPrefetchSize(), getPrefetchCount(), getConsumeRate(), getGlobal()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return true; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class StreamQosBody */ - -}} -#endif /*!QPID_FRAMING_STREAMQOSBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/StreamQosOkBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/StreamQosOkBody.h deleted file mode 100644 index 244c6cd782..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/StreamQosOkBody.h +++ /dev/null @@ -1,74 +0,0 @@ -#ifndef QPID_FRAMING_STREAMQOSOKBODY_H -#define QPID_FRAMING_STREAMQOSOKBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class StreamQosOkBody : public ModelMethod { - uint16_t flags; -public: - static const ClassId CLASS_ID = 0xa; - static const MethodId METHOD_ID = 0x2; - StreamQosOkBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.qosOk(); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class StreamQosOkBody */ - -}} -#endif /*!QPID_FRAMING_STREAMQOSOKBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/StreamReturnBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/StreamReturnBody.h deleted file mode 100644 index bf2f346ddf..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/StreamReturnBody.h +++ /dev/null @@ -1,109 +0,0 @@ -#ifndef QPID_FRAMING_STREAMRETURNBODY_H -#define QPID_FRAMING_STREAMRETURNBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class StreamReturnBody : public ModelMethod { - uint16_t replyCode; - string replyText; - string exchange; - string routingKey; - uint16_t flags; -public: - static const ClassId CLASS_ID = 0xa; - static const MethodId METHOD_ID = 0x7; - StreamReturnBody( - ProtocolVersion, uint16_t _replyCode, - const string& _replyText, - const string& _exchange, - const string& _routingKey) : - replyCode(_replyCode), - replyText(_replyText), - exchange(_exchange), - routingKey(_routingKey), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - flags |= (1 << 10); - flags |= (1 << 11); - } - StreamReturnBody(ProtocolVersion=ProtocolVersion()) : replyCode(0), flags(0) {} - - QPID_COMMON_EXTERN void setReplyCode(uint16_t _replyCode); - QPID_COMMON_EXTERN uint16_t getReplyCode() const; - QPID_COMMON_EXTERN bool hasReplyCode() const; - QPID_COMMON_EXTERN void clearReplyCodeFlag(); - QPID_COMMON_EXTERN void setReplyText(const string& _replyText); - QPID_COMMON_EXTERN const string& getReplyText() const; - QPID_COMMON_EXTERN bool hasReplyText() const; - QPID_COMMON_EXTERN void clearReplyTextFlag(); - QPID_COMMON_EXTERN void setExchange(const string& _exchange); - QPID_COMMON_EXTERN const string& getExchange() const; - QPID_COMMON_EXTERN bool hasExchange() const; - QPID_COMMON_EXTERN void clearExchangeFlag(); - QPID_COMMON_EXTERN void setRoutingKey(const string& _routingKey); - QPID_COMMON_EXTERN const string& getRoutingKey() const; - QPID_COMMON_EXTERN bool hasRoutingKey() const; - QPID_COMMON_EXTERN void clearRoutingKeyFlag(); - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.return_(getReplyCode(), getReplyText(), getExchange(), getRoutingKey()); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return true; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class StreamReturnBody */ - -}} -#endif /*!QPID_FRAMING_STREAMRETURNBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/StructHelper.h b/nativeLib/org.apache.qpid/include/qpid/framing/StructHelper.h deleted file mode 100644 index fc9a7909cc..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/StructHelper.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#ifndef _StructHelper_ -#define _StructHelper_ - -#include "qpid/Exception.h" -#include "qpid/CommonImportExport.h" -#include "qpid/framing/Buffer.h" - -#include // For alloca - -namespace qpid { -namespace framing { - -class StructHelper -{ -public: - - template void encode(const T t, std::string& data) { - uint32_t size = t.bodySize() + 2/*type*/; - data.resize(size); - Buffer wbuffer(const_cast(data.data()), size); - wbuffer.putShort(T::TYPE); - t.encodeStructBody(wbuffer); - } - - template void decode(T& t, const std::string& data) { - Buffer rbuffer(const_cast(data.data()), data.length()); - uint16_t type = rbuffer.getShort(); - if (type == T::TYPE) { - t.decodeStructBody(rbuffer); - } else { - throw Exception("Type code does not match"); - } - } -}; - -}} -#endif diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/TxCommitBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/TxCommitBody.h deleted file mode 100644 index d3723a43d2..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/TxCommitBody.h +++ /dev/null @@ -1,74 +0,0 @@ -#ifndef QPID_FRAMING_TXCOMMITBODY_H -#define QPID_FRAMING_TXCOMMITBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class TxCommitBody : public ModelMethod { - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x5; - static const MethodId METHOD_ID = 0x2; - TxCommitBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.commit(); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class TxCommitBody */ - -}} -#endif /*!QPID_FRAMING_TXCOMMITBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/TxRollbackBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/TxRollbackBody.h deleted file mode 100644 index 7b6c142673..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/TxRollbackBody.h +++ /dev/null @@ -1,74 +0,0 @@ -#ifndef QPID_FRAMING_TXROLLBACKBODY_H -#define QPID_FRAMING_TXROLLBACKBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class TxRollbackBody : public ModelMethod { - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x5; - static const MethodId METHOD_ID = 0x3; - TxRollbackBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.rollback(); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class TxRollbackBody */ - -}} -#endif /*!QPID_FRAMING_TXROLLBACKBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/TxSelectBody.h b/nativeLib/org.apache.qpid/include/qpid/framing/TxSelectBody.h deleted file mode 100644 index 78a8c2a7c2..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/TxSelectBody.h +++ /dev/null @@ -1,74 +0,0 @@ -#ifndef QPID_FRAMING_TXSELECTBODY_H -#define QPID_FRAMING_TXSELECTBODY_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/AMQMethodBody.h" -#include "qpid/framing/AMQP_ServerOperations.h" -#include "qpid/framing/MethodBodyConstVisitor.h" -#include "qpid/framing/ModelMethod.h" - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class TxSelectBody : public ModelMethod { - uint16_t flags; -public: - static const ClassId CLASS_ID = 0x5; - static const MethodId METHOD_ID = 0x1; - TxSelectBody(ProtocolVersion=ProtocolVersion()) : flags(0) {} - - typedef void ResultType; - - template ResultType invoke(T& invocable) const { - return invocable.select(); - } - - using AMQMethodBody::accept; - void accept(MethodBodyConstVisitor& v) const { v.visit(*this); } - boost::intrusive_ptr clone() const { return BodyFactory::copy(*this); } - - ClassId amqpClassId() const { return CLASS_ID; } - MethodId amqpMethodId() const { return METHOD_ID; } - bool isContentBearing() const { return false; } - bool resultExpected() const { return false; } - bool responseExpected() const { return false; } - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class TxSelectBody */ - -}} -#endif /*!QPID_FRAMING_TXSELECTBODY_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/TypeCode.h b/nativeLib/org.apache.qpid/include/qpid/framing/TypeCode.h deleted file mode 100644 index a4b515ae98..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/TypeCode.h +++ /dev/null @@ -1,95 +0,0 @@ -#ifndef QPID_FRAMING_TYPECODE_H -#define QPID_FRAMING_TYPECODE_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include -#include "qpid/sys/IntegerTypes.h" - -namespace qpid { -namespace framing { - -enum TypeCode { - TYPE_CODE_BIN8 = 0x00, - TYPE_CODE_INT8 = 0x01, - TYPE_CODE_UINT8 = 0x02, - TYPE_CODE_CHAR = 0x04, - TYPE_CODE_BOOLEAN = 0x08, - TYPE_CODE_BIN16 = 0x10, - TYPE_CODE_INT16 = 0x11, - TYPE_CODE_UINT16 = 0x12, - TYPE_CODE_BIN32 = 0x20, - TYPE_CODE_INT32 = 0x21, - TYPE_CODE_UINT32 = 0x22, - TYPE_CODE_FLOAT = 0x23, - TYPE_CODE_CHAR_UTF32 = 0x27, - TYPE_CODE_BIN64 = 0x30, - TYPE_CODE_INT64 = 0x31, - TYPE_CODE_UINT64 = 0x32, - TYPE_CODE_DOUBLE = 0x33, - TYPE_CODE_DATETIME = 0x38, - TYPE_CODE_BIN128 = 0x40, - TYPE_CODE_UUID = 0x48, - TYPE_CODE_BIN256 = 0x50, - TYPE_CODE_BIN512 = 0x60, - TYPE_CODE_BIN1024 = 0x70, - TYPE_CODE_VBIN8 = 0x80, - TYPE_CODE_STR8_LATIN = 0x84, - TYPE_CODE_STR8 = 0x85, - TYPE_CODE_STR8_UTF16 = 0x86, - TYPE_CODE_VBIN16 = 0x90, - TYPE_CODE_STR16_LATIN = 0x94, - TYPE_CODE_STR16 = 0x95, - TYPE_CODE_STR16_UTF16 = 0x96, - TYPE_CODE_VBIN32 = 0xa0, - TYPE_CODE_MAP = 0xa8, - TYPE_CODE_LIST = 0xa9, - TYPE_CODE_ARRAY = 0xaa, - TYPE_CODE_STRUCT32 = 0xab, - TYPE_CODE_BIN40 = 0xc0, - TYPE_CODE_DEC32 = 0xc8, - TYPE_CODE_BIN72 = 0xd0, - TYPE_CODE_DEC64 = 0xd8, - TYPE_CODE_VOID = 0xf0, - TYPE_CODE_BIT = 0xf1 -}; - -/** True if t is a valid TypeCode value */ -bool isTypeCode(uint8_t t); - -/** Throw exception if not a valid TypeCode */ -TypeCode typeCode(uint8_t); - -/**@return 0 if t is not a valid enum TypeCode value. */ -const char* typeName(TypeCode t); - -std::ostream& operator<<(std::ostream&, TypeCode); - - -}} // namespace qpid::framing - -#endif /*!QPID_FRAMING_TYPECODE_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/Uuid.h b/nativeLib/org.apache.qpid/include/qpid/framing/Uuid.h deleted file mode 100644 index d357538b4d..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/Uuid.h +++ /dev/null @@ -1,90 +0,0 @@ -#ifndef QPID_FRAMING_UUID_H -#define QPID_FRAMING_UUID_H - -/* - * - * Copyright (c) 2006 The Apache Software Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include "qpid/CommonImportExport.h" -#include "qpid/sys/IntegerTypes.h" - -#include - -#include -#include - -namespace qpid { -namespace framing { - -class Buffer; - -/** - * A UUID is represented as a boost::array of 16 bytes. - * - * Full value semantics, operators ==, < etc. are provided by - * boost::array so Uuid can be the key type in a map etc. - * - * TODO: change this implementation as it leaks boost into the - * client API - */ -struct Uuid : public boost::array { - /** If unique is true, generate a unique ID else a null ID. */ - QPID_COMMON_EXTERN Uuid(bool unique=false); - - /** Copy from 16 bytes of data. */ - QPID_COMMON_EXTERN Uuid(const uint8_t* data); - - // Default op= and copy ctor are fine. - // boost::array gives us ==, < etc. - - /** Copy from 16 bytes of data. */ - void assign(const uint8_t* data); - - /** Set to a new unique identifier. */ - QPID_COMMON_EXTERN void generate(); - - /** Set to all zeros. */ - void clear(); - - /** Test for null (all zeros). */ - QPID_COMMON_EXTERN bool isNull() const; - operator bool() const { return !isNull(); } - bool operator!() const { return isNull(); } - - QPID_COMMON_EXTERN void encode(framing::Buffer& buf) const; - QPID_COMMON_EXTERN void decode(framing::Buffer& buf); - QPID_COMMON_EXTERN uint32_t encodedSize() const { return size(); } - - /** String value in format 1b4e28ba-2fa1-11d2-883f-b9a761bde3fb. */ - QPID_COMMON_EXTERN std::string str() const; - - template void serialize(S& s) { - s.raw(begin(), size()); - } -}; - -/** Print in format 1b4e28ba-2fa1-11d2-883f-b9a761bde3fb. */ -QPID_COMMON_EXTERN std::ostream& operator<<(std::ostream&, Uuid); - -/** Read from format 1b4e28ba-2fa1-11d2-883f-b9a761bde3fb. */ -QPID_COMMON_EXTERN std::istream& operator>>(std::istream&, Uuid&); - -}} // namespace qpid::framing - - - -#endif /*!QPID_FRAMING_UUID_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/XaResult.h b/nativeLib/org.apache.qpid/include/qpid/framing/XaResult.h deleted file mode 100644 index 36c0729cd9..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/XaResult.h +++ /dev/null @@ -1,66 +0,0 @@ -#ifndef QPID_FRAMING_XARESULT_H -#define QPID_FRAMING_XARESULT_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class XaResult { - uint16_t status; - uint16_t flags; -public: - static const uint16_t TYPE = 1537; - XaResult( - uint16_t _status) : - status(_status), - flags(0){ - flags |= (1 << 8); - } - XaResult() : status(0), flags(0) {} - - QPID_COMMON_EXTERN void setStatus(uint16_t _status); - QPID_COMMON_EXTERN uint16_t getStatus() const; - QPID_COMMON_EXTERN bool hasStatus() const; - QPID_COMMON_EXTERN void clearStatusFlag(); - QPID_COMMON_EXTERN friend std::ostream& operator<<(std::ostream&, const XaResult&); - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class XaResult */ - -}} -#endif /*!QPID_FRAMING_XARESULT_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/Xid.h b/nativeLib/org.apache.qpid/include/qpid/framing/Xid.h deleted file mode 100644 index e0fbb2e479..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/Xid.h +++ /dev/null @@ -1,82 +0,0 @@ -#ifndef QPID_FRAMING_XID_H -#define QPID_FRAMING_XID_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - - -#include -#include "qpid/framing/amqp_types_full.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - -class Xid { - uint32_t format; - string globalId; - string branchId; - uint16_t flags; -public: - static const uint16_t TYPE = 1540; - Xid( - uint32_t _format, - const string& _globalId, - const string& _branchId) : - format(_format), - globalId(_globalId), - branchId(_branchId), - flags(0){ - flags |= (1 << 8); - flags |= (1 << 9); - flags |= (1 << 10); - } - Xid() : format(0), flags(0) {} - - QPID_COMMON_EXTERN void setFormat(uint32_t _format); - QPID_COMMON_EXTERN uint32_t getFormat() const; - QPID_COMMON_EXTERN bool hasFormat() const; - QPID_COMMON_EXTERN void clearFormatFlag(); - QPID_COMMON_EXTERN void setGlobalId(const string& _globalId); - QPID_COMMON_EXTERN const string& getGlobalId() const; - QPID_COMMON_EXTERN bool hasGlobalId() const; - QPID_COMMON_EXTERN void clearGlobalIdFlag(); - QPID_COMMON_EXTERN void setBranchId(const string& _branchId); - QPID_COMMON_EXTERN const string& getBranchId() const; - QPID_COMMON_EXTERN bool hasBranchId() const; - QPID_COMMON_EXTERN void clearBranchIdFlag(); - QPID_COMMON_EXTERN friend std::ostream& operator<<(std::ostream&, const Xid&); - QPID_COMMON_EXTERN void encode(Buffer&) const; - QPID_COMMON_EXTERN void decode(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN void encodeStructBody(Buffer&) const; - QPID_COMMON_EXTERN void decodeStructBody(Buffer&, uint32_t=0); - QPID_COMMON_EXTERN uint32_t encodedSize() const; - QPID_COMMON_EXTERN uint32_t bodySize() const; - QPID_COMMON_EXTERN void print(std::ostream& out) const; -}; /* class Xid */ - -}} -#endif /*!QPID_FRAMING_XID_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/all_method_bodies.h b/nativeLib/org.apache.qpid/include/qpid/framing/all_method_bodies.h deleted file mode 100644 index b19fcec988..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/all_method_bodies.h +++ /dev/null @@ -1,153 +0,0 @@ -#ifndef QPID_FRAMING_ALL_METHOD_BODIES_H -#define QPID_FRAMING_ALL_METHOD_BODIES_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/ConnectionStartBody.h" -#include "qpid/framing/ConnectionStartOkBody.h" -#include "qpid/framing/ConnectionSecureBody.h" -#include "qpid/framing/ConnectionSecureOkBody.h" -#include "qpid/framing/ConnectionTuneBody.h" -#include "qpid/framing/ConnectionTuneOkBody.h" -#include "qpid/framing/ConnectionOpenBody.h" -#include "qpid/framing/ConnectionOpenOkBody.h" -#include "qpid/framing/ConnectionRedirectBody.h" -#include "qpid/framing/ConnectionHeartbeatBody.h" -#include "qpid/framing/ConnectionCloseBody.h" -#include "qpid/framing/ConnectionCloseOkBody.h" -#include "qpid/framing/SessionAttachBody.h" -#include "qpid/framing/SessionAttachedBody.h" -#include "qpid/framing/SessionDetachBody.h" -#include "qpid/framing/SessionDetachedBody.h" -#include "qpid/framing/SessionRequestTimeoutBody.h" -#include "qpid/framing/SessionTimeoutBody.h" -#include "qpid/framing/SessionCommandPointBody.h" -#include "qpid/framing/SessionExpectedBody.h" -#include "qpid/framing/SessionConfirmedBody.h" -#include "qpid/framing/SessionCompletedBody.h" -#include "qpid/framing/SessionKnownCompletedBody.h" -#include "qpid/framing/SessionFlushBody.h" -#include "qpid/framing/SessionGapBody.h" -#include "qpid/framing/ExecutionSyncBody.h" -#include "qpid/framing/ExecutionResultBody.h" -#include "qpid/framing/ExecutionExceptionBody.h" -#include "qpid/framing/MessageTransferBody.h" -#include "qpid/framing/MessageAcceptBody.h" -#include "qpid/framing/MessageRejectBody.h" -#include "qpid/framing/MessageReleaseBody.h" -#include "qpid/framing/MessageAcquireBody.h" -#include "qpid/framing/MessageResumeBody.h" -#include "qpid/framing/MessageSubscribeBody.h" -#include "qpid/framing/MessageCancelBody.h" -#include "qpid/framing/MessageSetFlowModeBody.h" -#include "qpid/framing/MessageFlowBody.h" -#include "qpid/framing/MessageFlushBody.h" -#include "qpid/framing/MessageStopBody.h" -#include "qpid/framing/TxSelectBody.h" -#include "qpid/framing/TxCommitBody.h" -#include "qpid/framing/TxRollbackBody.h" -#include "qpid/framing/DtxSelectBody.h" -#include "qpid/framing/DtxStartBody.h" -#include "qpid/framing/DtxEndBody.h" -#include "qpid/framing/DtxCommitBody.h" -#include "qpid/framing/DtxForgetBody.h" -#include "qpid/framing/DtxGetTimeoutBody.h" -#include "qpid/framing/DtxPrepareBody.h" -#include "qpid/framing/DtxRecoverBody.h" -#include "qpid/framing/DtxRollbackBody.h" -#include "qpid/framing/DtxSetTimeoutBody.h" -#include "qpid/framing/ExchangeDeclareBody.h" -#include "qpid/framing/ExchangeDeleteBody.h" -#include "qpid/framing/ExchangeQueryBody.h" -#include "qpid/framing/ExchangeBindBody.h" -#include "qpid/framing/ExchangeUnbindBody.h" -#include "qpid/framing/ExchangeBoundBody.h" -#include "qpid/framing/QueueDeclareBody.h" -#include "qpid/framing/QueueDeleteBody.h" -#include "qpid/framing/QueuePurgeBody.h" -#include "qpid/framing/QueueQueryBody.h" -#include "qpid/framing/FileQosBody.h" -#include "qpid/framing/FileQosOkBody.h" -#include "qpid/framing/FileConsumeBody.h" -#include "qpid/framing/FileConsumeOkBody.h" -#include "qpid/framing/FileCancelBody.h" -#include "qpid/framing/FileOpenBody.h" -#include "qpid/framing/FileOpenOkBody.h" -#include "qpid/framing/FileStageBody.h" -#include "qpid/framing/FilePublishBody.h" -#include "qpid/framing/FileReturnBody.h" -#include "qpid/framing/FileDeliverBody.h" -#include "qpid/framing/FileAckBody.h" -#include "qpid/framing/FileRejectBody.h" -#include "qpid/framing/StreamQosBody.h" -#include "qpid/framing/StreamQosOkBody.h" -#include "qpid/framing/StreamConsumeBody.h" -#include "qpid/framing/StreamConsumeOkBody.h" -#include "qpid/framing/StreamCancelBody.h" -#include "qpid/framing/StreamPublishBody.h" -#include "qpid/framing/StreamReturnBody.h" -#include "qpid/framing/StreamDeliverBody.h" -#include "qpid/framing/ClusterUpdateRequestBody.h" -#include "qpid/framing/ClusterUpdateOfferBody.h" -#include "qpid/framing/ClusterRetractOfferBody.h" -#include "qpid/framing/ClusterInitialStatusBody.h" -#include "qpid/framing/ClusterReadyBody.h" -#include "qpid/framing/ClusterConfigChangeBody.h" -#include "qpid/framing/ClusterMessageExpiredBody.h" -#include "qpid/framing/ClusterErrorCheckBody.h" -#include "qpid/framing/ClusterTimerWakeupBody.h" -#include "qpid/framing/ClusterTimerDropBody.h" -#include "qpid/framing/ClusterShutdownBody.h" -#include "qpid/framing/ClusterDeliverToQueueBody.h" -#include "qpid/framing/ClusterConnectionAnnounceBody.h" -#include "qpid/framing/ClusterConnectionDeliverCloseBody.h" -#include "qpid/framing/ClusterConnectionDeliverDoOutputBody.h" -#include "qpid/framing/ClusterConnectionAbortBody.h" -#include "qpid/framing/ClusterConnectionShadowSetUserBody.h" -#include "qpid/framing/ClusterConnectionShadowPrepareBody.h" -#include "qpid/framing/ClusterConnectionConsumerStateBody.h" -#include "qpid/framing/ClusterConnectionDeliveryRecordBody.h" -#include "qpid/framing/ClusterConnectionTxStartBody.h" -#include "qpid/framing/ClusterConnectionTxAcceptBody.h" -#include "qpid/framing/ClusterConnectionTxDequeueBody.h" -#include "qpid/framing/ClusterConnectionTxEnqueueBody.h" -#include "qpid/framing/ClusterConnectionTxPublishBody.h" -#include "qpid/framing/ClusterConnectionTxEndBody.h" -#include "qpid/framing/ClusterConnectionAccumulatedAckBody.h" -#include "qpid/framing/ClusterConnectionOutputTaskBody.h" -#include "qpid/framing/ClusterConnectionSessionStateBody.h" -#include "qpid/framing/ClusterConnectionShadowReadyBody.h" -#include "qpid/framing/ClusterConnectionMembershipBody.h" -#include "qpid/framing/ClusterConnectionRetractOfferBody.h" -#include "qpid/framing/ClusterConnectionQueuePositionBody.h" -#include "qpid/framing/ClusterConnectionExchangeBody.h" -#include "qpid/framing/ClusterConnectionQueueBody.h" -#include "qpid/framing/ClusterConnectionExpiryIdBody.h" -#include "qpid/framing/ClusterConnectionAddQueueListenerBody.h" -#include "qpid/framing/ClusterConnectionManagementSetupStateBody.h" -#include "qpid/framing/ClusterConnectionConfigBody.h" -#endif /*!QPID_FRAMING_ALL_METHOD_BODIES_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/amqp_structs.h b/nativeLib/org.apache.qpid/include/qpid/framing/amqp_structs.h deleted file mode 100644 index 490b4dcb10..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/amqp_structs.h +++ /dev/null @@ -1,46 +0,0 @@ -#ifndef QPID_FRAMING_AMQP_STRUCTS_H -#define QPID_FRAMING_AMQP_STRUCTS_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/framing/Header.h" -#include "qpid/framing/DeliveryProperties.h" -#include "qpid/framing/FragmentProperties.h" -#include "qpid/framing/ReplyTo.h" -#include "qpid/framing/MessageProperties.h" -#include "qpid/framing/MessageAcquireResult.h" -#include "qpid/framing/MessageResumeResult.h" -#include "qpid/framing/XaResult.h" -#include "qpid/framing/Xid.h" -#include "qpid/framing/DtxGetTimeoutResult.h" -#include "qpid/framing/DtxRecoverResult.h" -#include "qpid/framing/ExchangeQueryResult.h" -#include "qpid/framing/ExchangeBoundResult.h" -#include "qpid/framing/QueueQueryResult.h" -#include "qpid/framing/FileProperties.h" -#include "qpid/framing/StreamProperties.h" -#endif /*!QPID_FRAMING_AMQP_STRUCTS_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/amqp_types.h b/nativeLib/org.apache.qpid/include/qpid/framing/amqp_types.h deleted file mode 100644 index d9088b7a12..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/amqp_types.h +++ /dev/null @@ -1,66 +0,0 @@ -#ifndef AMQP_TYPES_H -#define AMQP_TYPES_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/** \file - * Definitions and forward declarations of all types used - * in AMQP messages. - */ - -#include "qpid/sys/IntegerTypes.h" -#include - -namespace qpid { -namespace framing { - -using std::string; -typedef uint8_t FrameType; -typedef uint16_t ChannelId; -typedef uint32_t BatchOffset; -typedef uint8_t ClassId; -typedef uint8_t MethodId; -typedef uint16_t ReplyCode; - -// Types represented by classes. -class Content; -class FieldTable; -class SequenceNumberSet; -struct Uuid; - -// Useful constants - -/** Maximum channel ID used by broker. Reserve high bit for internal use.*/ -const ChannelId CHANNEL_MAX=(ChannelId(~1))>>1; -const ChannelId CHANNEL_HIGH_BIT= ChannelId(~CHANNEL_MAX); - -// Forward declare class types -class FramingContent; -class FieldTable; -class SequenceNumberSet; -class SequenceSet; -struct Uuid; - -// Enum types -enum DeliveryMode { TRANSIENT = 1, PERSISTENT = 2}; - -}} // namespace qpid::framing -#endif diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/amqp_types_full.h b/nativeLib/org.apache.qpid/include/qpid/framing/amqp_types_full.h deleted file mode 100644 index c5d84dedea..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/amqp_types_full.h +++ /dev/null @@ -1,38 +0,0 @@ -#ifndef _framing_amqp_types_decl_h -#define _framing_amqp_types_decl_h - -/* - * - * Copyright (c) 2006 The Apache Software Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -/** \file - * Definitions and full declarations of all types used - * in AMQP messages. - * - * It's better to include amqp_types.h in another header instead of this file - * unless the header actually needs the full declarations. Including - * full declarations when forward declarations would increase compile - * times. - */ - -#include "qpid/framing/amqp_types.h" -#include "qpid/framing/Array.h" -#include "qpid/framing/FieldTable.h" -#include "qpid/framing/SequenceSet.h" -#include "qpid/framing/Uuid.h" - -#endif /*!_framing_amqp_types_decl_h*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/constants.h b/nativeLib/org.apache.qpid/include/qpid/framing/constants.h deleted file mode 100644 index 142700b338..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/constants.h +++ /dev/null @@ -1,175 +0,0 @@ -#ifndef QPID_FRAMING_CONSTANTS_H -#define QPID_FRAMING_CONSTANTS_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - - -namespace qpid { -namespace framing { - -enum AmqpConstant { - MIN_MAX_FRAME_SIZE=4096, - CONNECTION_CLASS_ID=0x1, - CONNECTION_START_METHOD_ID=0x1, - CONNECTION_START_OK_METHOD_ID=0x2, - CONNECTION_SECURE_METHOD_ID=0x3, - CONNECTION_SECURE_OK_METHOD_ID=0x4, - CONNECTION_TUNE_METHOD_ID=0x5, - CONNECTION_TUNE_OK_METHOD_ID=0x6, - CONNECTION_OPEN_METHOD_ID=0x7, - CONNECTION_OPEN_OK_METHOD_ID=0x8, - CONNECTION_REDIRECT_METHOD_ID=0x9, - CONNECTION_HEARTBEAT_METHOD_ID=0xa, - CONNECTION_CLOSE_METHOD_ID=0xb, - CONNECTION_CLOSE_OK_METHOD_ID=0xc, - SESSION_CLASS_ID=0x2, - SESSION_ATTACH_METHOD_ID=0x1, - SESSION_ATTACHED_METHOD_ID=0x2, - SESSION_DETACH_METHOD_ID=0x3, - SESSION_DETACHED_METHOD_ID=0x4, - SESSION_REQUEST_TIMEOUT_METHOD_ID=0x5, - SESSION_TIMEOUT_METHOD_ID=0x6, - SESSION_COMMAND_POINT_METHOD_ID=0x7, - SESSION_EXPECTED_METHOD_ID=0x8, - SESSION_CONFIRMED_METHOD_ID=0x9, - SESSION_COMPLETED_METHOD_ID=0xa, - SESSION_KNOWN_COMPLETED_METHOD_ID=0xb, - SESSION_FLUSH_METHOD_ID=0xc, - SESSION_GAP_METHOD_ID=0xd, - EXECUTION_CLASS_ID=0x3, - EXECUTION_SYNC_METHOD_ID=0x1, - EXECUTION_RESULT_METHOD_ID=0x2, - EXECUTION_EXCEPTION_METHOD_ID=0x3, - MESSAGE_CLASS_ID=0x4, - MESSAGE_TRANSFER_METHOD_ID=0x1, - MESSAGE_ACCEPT_METHOD_ID=0x2, - MESSAGE_REJECT_METHOD_ID=0x3, - MESSAGE_RELEASE_METHOD_ID=0x4, - MESSAGE_ACQUIRE_METHOD_ID=0x5, - MESSAGE_RESUME_METHOD_ID=0x6, - MESSAGE_SUBSCRIBE_METHOD_ID=0x7, - MESSAGE_CANCEL_METHOD_ID=0x8, - MESSAGE_SET_FLOW_MODE_METHOD_ID=0x9, - MESSAGE_FLOW_METHOD_ID=0xa, - MESSAGE_FLUSH_METHOD_ID=0xb, - MESSAGE_STOP_METHOD_ID=0xc, - TX_CLASS_ID=0x5, - TX_SELECT_METHOD_ID=0x1, - TX_COMMIT_METHOD_ID=0x2, - TX_ROLLBACK_METHOD_ID=0x3, - DTX_CLASS_ID=0x6, - DTX_SELECT_METHOD_ID=0x1, - DTX_START_METHOD_ID=0x2, - DTX_END_METHOD_ID=0x3, - DTX_COMMIT_METHOD_ID=0x4, - DTX_FORGET_METHOD_ID=0x5, - DTX_GET_TIMEOUT_METHOD_ID=0x6, - DTX_PREPARE_METHOD_ID=0x7, - DTX_RECOVER_METHOD_ID=0x8, - DTX_ROLLBACK_METHOD_ID=0x9, - DTX_SET_TIMEOUT_METHOD_ID=0xa, - EXCHANGE_CLASS_ID=0x7, - EXCHANGE_DECLARE_METHOD_ID=0x1, - EXCHANGE_DELETE_METHOD_ID=0x2, - EXCHANGE_QUERY_METHOD_ID=0x3, - EXCHANGE_BIND_METHOD_ID=0x4, - EXCHANGE_UNBIND_METHOD_ID=0x5, - EXCHANGE_BOUND_METHOD_ID=0x6, - QUEUE_CLASS_ID=0x8, - QUEUE_DECLARE_METHOD_ID=0x1, - QUEUE_DELETE_METHOD_ID=0x2, - QUEUE_PURGE_METHOD_ID=0x3, - QUEUE_QUERY_METHOD_ID=0x4, - FILE_CLASS_ID=0x9, - FILE_QOS_METHOD_ID=0x1, - FILE_QOS_OK_METHOD_ID=0x2, - FILE_CONSUME_METHOD_ID=0x3, - FILE_CONSUME_OK_METHOD_ID=0x4, - FILE_CANCEL_METHOD_ID=0x5, - FILE_OPEN_METHOD_ID=0x6, - FILE_OPEN_OK_METHOD_ID=0x7, - FILE_STAGE_METHOD_ID=0x8, - FILE_PUBLISH_METHOD_ID=0x9, - FILE_RETURN_METHOD_ID=0xa, - FILE_DELIVER_METHOD_ID=0xb, - FILE_ACK_METHOD_ID=0xc, - FILE_REJECT_METHOD_ID=0xd, - STREAM_CLASS_ID=0xa, - STREAM_QOS_METHOD_ID=0x1, - STREAM_QOS_OK_METHOD_ID=0x2, - STREAM_CONSUME_METHOD_ID=0x3, - STREAM_CONSUME_OK_METHOD_ID=0x4, - STREAM_CANCEL_METHOD_ID=0x5, - STREAM_PUBLISH_METHOD_ID=0x6, - STREAM_RETURN_METHOD_ID=0x7, - STREAM_DELIVER_METHOD_ID=0x8, - CLUSTER_CLASS_ID=0x80, - CLUSTER_UPDATE_REQUEST_METHOD_ID=0x1, - CLUSTER_UPDATE_OFFER_METHOD_ID=0x2, - CLUSTER_RETRACT_OFFER_METHOD_ID=0x3, - CLUSTER_INITIAL_STATUS_METHOD_ID=0x5, - CLUSTER_READY_METHOD_ID=0x10, - CLUSTER_CONFIG_CHANGE_METHOD_ID=0x11, - CLUSTER_MESSAGE_EXPIRED_METHOD_ID=0x12, - CLUSTER_ERROR_CHECK_METHOD_ID=0x14, - CLUSTER_TIMER_WAKEUP_METHOD_ID=0x15, - CLUSTER_TIMER_DROP_METHOD_ID=0x16, - CLUSTER_SHUTDOWN_METHOD_ID=0x20, - CLUSTER_DELIVER_TO_QUEUE_METHOD_ID=0x21, - CLUSTER_CONNECTION_CLASS_ID=0x81, - CLUSTER_CONNECTION_ANNOUNCE_METHOD_ID=0x1, - CLUSTER_CONNECTION_DELIVER_CLOSE_METHOD_ID=0x2, - CLUSTER_CONNECTION_DELIVER_DO_OUTPUT_METHOD_ID=0x3, - CLUSTER_CONNECTION_ABORT_METHOD_ID=0x4, - CLUSTER_CONNECTION_SHADOW_SET_USER_METHOD_ID=0x0E, - CLUSTER_CONNECTION_SHADOW_PREPARE_METHOD_ID=0x0F, - CLUSTER_CONNECTION_CONSUMER_STATE_METHOD_ID=0x10, - CLUSTER_CONNECTION_DELIVERY_RECORD_METHOD_ID=0x11, - CLUSTER_CONNECTION_TX_START_METHOD_ID=0x12, - CLUSTER_CONNECTION_TX_ACCEPT_METHOD_ID=0x13, - CLUSTER_CONNECTION_TX_DEQUEUE_METHOD_ID=0x14, - CLUSTER_CONNECTION_TX_ENQUEUE_METHOD_ID=0x15, - CLUSTER_CONNECTION_TX_PUBLISH_METHOD_ID=0x16, - CLUSTER_CONNECTION_TX_END_METHOD_ID=0x17, - CLUSTER_CONNECTION_ACCUMULATED_ACK_METHOD_ID=0x18, - CLUSTER_CONNECTION_OUTPUT_TASK_METHOD_ID=0x19, - CLUSTER_CONNECTION_SESSION_STATE_METHOD_ID=0x1F, - CLUSTER_CONNECTION_SHADOW_READY_METHOD_ID=0x20, - CLUSTER_CONNECTION_MEMBERSHIP_METHOD_ID=0x21, - CLUSTER_CONNECTION_RETRACT_OFFER_METHOD_ID=0x22, - CLUSTER_CONNECTION_QUEUE_POSITION_METHOD_ID=0x30, - CLUSTER_CONNECTION_EXCHANGE_METHOD_ID=0x31, - CLUSTER_CONNECTION_QUEUE_METHOD_ID=0x32, - CLUSTER_CONNECTION_EXPIRY_ID_METHOD_ID=0x33, - CLUSTER_CONNECTION_ADD_QUEUE_LISTENER_METHOD_ID=0x34, - CLUSTER_CONNECTION_MANAGEMENT_SETUP_STATE_METHOD_ID=0x36, - CLUSTER_CONNECTION_CONFIG_METHOD_ID=0x37 -}; - -}} // namespace qpid::framing - -#endif /*!QPID_FRAMING_CONSTANTS_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/enum.h b/nativeLib/org.apache.qpid/include/qpid/framing/enum.h deleted file mode 100644 index c8b58d0611..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/enum.h +++ /dev/null @@ -1,191 +0,0 @@ -#ifndef QPID_FRAMING_ENUM_H -#define QPID_FRAMING_ENUM_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - - -namespace qpid { -namespace framing { - -enum SegmentType { - SEGMENT_TYPE_CONTROL=0, - SEGMENT_TYPE_COMMAND=1, - SEGMENT_TYPE_HEADER=2, - SEGMENT_TYPE_BODY=3 -}; -enum Track { - TRACK_CONTROL=0, - TRACK_COMMAND=1 -}; - -namespace connection { - -enum CloseCode { - CLOSE_CODE_NORMAL=200, - CLOSE_CODE_CONNECTION_FORCED=320, - CLOSE_CODE_INVALID_PATH=402, - CLOSE_CODE_FRAMING_ERROR=501 -}; - -} // namespace connection - - -namespace session { - -enum DetachCode { - DETACH_CODE_NORMAL=0, - DETACH_CODE_SESSION_BUSY=1, - DETACH_CODE_TRANSPORT_BUSY=2, - DETACH_CODE_NOT_ATTACHED=3, - DETACH_CODE_UNKNOWN_IDS=4 -}; - -} // namespace session - - -namespace execution { - -enum ErrorCode { - ERROR_CODE_UNAUTHORIZED_ACCESS=403, - ERROR_CODE_NOT_FOUND=404, - ERROR_CODE_RESOURCE_LOCKED=405, - ERROR_CODE_PRECONDITION_FAILED=406, - ERROR_CODE_RESOURCE_DELETED=408, - ERROR_CODE_ILLEGAL_STATE=409, - ERROR_CODE_COMMAND_INVALID=503, - ERROR_CODE_RESOURCE_LIMIT_EXCEEDED=506, - ERROR_CODE_NOT_ALLOWED=530, - ERROR_CODE_ILLEGAL_ARGUMENT=531, - ERROR_CODE_NOT_IMPLEMENTED=540, - ERROR_CODE_INTERNAL_ERROR=541, - ERROR_CODE_INVALID_ARGUMENT=542 -}; - -} // namespace execution - - -namespace message { - -enum AcceptMode { - ACCEPT_MODE_EXPLICIT=0, - ACCEPT_MODE_NONE=1 -}; -enum AcquireMode { - ACQUIRE_MODE_PRE_ACQUIRED=0, - ACQUIRE_MODE_NOT_ACQUIRED=1 -}; -enum RejectCode { - REJECT_CODE_UNSPECIFIED=0, - REJECT_CODE_UNROUTABLE=1, - REJECT_CODE_IMMEDIATE=2 -}; -enum DeliveryMode { - DELIVERY_MODE_NON_PERSISTENT=1, - DELIVERY_MODE_PERSISTENT=2 -}; -enum DeliveryPriority { - DELIVERY_PRIORITY_LOWEST=0, - DELIVERY_PRIORITY_LOWER=1, - DELIVERY_PRIORITY_LOW=2, - DELIVERY_PRIORITY_BELOW_AVERAGE=3, - DELIVERY_PRIORITY_MEDIUM=4, - DELIVERY_PRIORITY_ABOVE_AVERAGE=5, - DELIVERY_PRIORITY_HIGH=6, - DELIVERY_PRIORITY_HIGHER=7, - DELIVERY_PRIORITY_VERY_HIGH=8, - DELIVERY_PRIORITY_HIGHEST=9 -}; -enum FlowMode { - FLOW_MODE_CREDIT=0, - FLOW_MODE_WINDOW=1 -}; -enum CreditUnit { - CREDIT_UNIT_MESSAGE=0, - CREDIT_UNIT_BYTE=1 -}; - -} // namespace message - - -namespace dtx { - -enum XaStatus { - XA_STATUS_XA_OK=0, - XA_STATUS_XA_RBROLLBACK=1, - XA_STATUS_XA_RBTIMEOUT=2, - XA_STATUS_XA_HEURHAZ=3, - XA_STATUS_XA_HEURCOM=4, - XA_STATUS_XA_HEURRB=5, - XA_STATUS_XA_HEURMIX=6, - XA_STATUS_XA_RDONLY=7 -}; - -} // namespace dtx - - -namespace file { - -enum ReturnCode { - RETURN_CODE_CONTENT_TOO_LARGE=311, - RETURN_CODE_NO_ROUTE=312, - RETURN_CODE_NO_CONSUMERS=313 -}; - -} // namespace file - - -namespace stream { - -enum ReturnCode { - RETURN_CODE_CONTENT_TOO_LARGE=311, - RETURN_CODE_NO_ROUTE=312, - RETURN_CODE_NO_CONSUMERS=313 -}; - -} // namespace stream - - -namespace cluster { - -enum StoreState { - STORE_STATE_NO_STORE=0, - STORE_STATE_EMPTY_STORE=1, - STORE_STATE_CLEAN_STORE=2, - STORE_STATE_DIRTY_STORE=3 -}; -enum ErrorType { - ERROR_TYPE_NONE=0, - ERROR_TYPE_SESSION=1, - ERROR_TYPE_CONNECTION=2 -}; - -} // namespace cluster - - -}} // namespace qpid::framing - -#endif /*!QPID_FRAMING_ENUM_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/frame_body_lists.h b/nativeLib/org.apache.qpid/include/qpid/framing/frame_body_lists.h deleted file mode 100644 index 4634ebac53..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/frame_body_lists.h +++ /dev/null @@ -1,160 +0,0 @@ -#ifndef QPID_FRAMING_FRAME_BODY_LISTS_H -#define QPID_FRAMING_FRAME_BODY_LISTS_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -/**@file - * Macro lists of frame body classes, used to generate Visitors - */ -#define METHOD_BODIES() \ - (ConnectionStartBody) \ - (ConnectionStartOkBody) \ - (ConnectionSecureBody) \ - (ConnectionSecureOkBody) \ - (ConnectionTuneBody) \ - (ConnectionTuneOkBody) \ - (ConnectionOpenBody) \ - (ConnectionOpenOkBody) \ - (ConnectionRedirectBody) \ - (ConnectionHeartbeatBody) \ - (ConnectionCloseBody) \ - (ConnectionCloseOkBody) \ - (SessionAttachBody) \ - (SessionAttachedBody) \ - (SessionDetachBody) \ - (SessionDetachedBody) \ - (SessionRequestTimeoutBody) \ - (SessionTimeoutBody) \ - (SessionCommandPointBody) \ - (SessionExpectedBody) \ - (SessionConfirmedBody) \ - (SessionCompletedBody) \ - (SessionKnownCompletedBody) \ - (SessionFlushBody) \ - (SessionGapBody) \ - (ExecutionSyncBody) \ - (ExecutionResultBody) \ - (ExecutionExceptionBody) \ - (MessageTransferBody) \ - (MessageAcceptBody) \ - (MessageRejectBody) \ - (MessageReleaseBody) \ - (MessageAcquireBody) \ - (MessageResumeBody) \ - (MessageSubscribeBody) \ - (MessageCancelBody) \ - (MessageSetFlowModeBody) \ - (MessageFlowBody) \ - (MessageFlushBody) \ - (MessageStopBody) \ - (TxSelectBody) \ - (TxCommitBody) \ - (TxRollbackBody) \ - (DtxSelectBody) \ - (DtxStartBody) \ - (DtxEndBody) \ - (DtxCommitBody) \ - (DtxForgetBody) \ - (DtxGetTimeoutBody) \ - (DtxPrepareBody) \ - (DtxRecoverBody) \ - (DtxRollbackBody) \ - (DtxSetTimeoutBody) \ - (ExchangeDeclareBody) \ - (ExchangeDeleteBody) \ - (ExchangeQueryBody) \ - (ExchangeBindBody) \ - (ExchangeUnbindBody) \ - (ExchangeBoundBody) \ - (QueueDeclareBody) \ - (QueueDeleteBody) \ - (QueuePurgeBody) \ - (QueueQueryBody) \ - (FileQosBody) \ - (FileQosOkBody) \ - (FileConsumeBody) \ - (FileConsumeOkBody) \ - (FileCancelBody) \ - (FileOpenBody) \ - (FileOpenOkBody) \ - (FileStageBody) \ - (FilePublishBody) \ - (FileReturnBody) \ - (FileDeliverBody) \ - (FileAckBody) \ - (FileRejectBody) \ - (StreamQosBody) \ - (StreamQosOkBody) \ - (StreamConsumeBody) \ - (StreamConsumeOkBody) \ - (StreamCancelBody) \ - (StreamPublishBody) \ - (StreamReturnBody) \ - (StreamDeliverBody) \ - (ClusterUpdateRequestBody) \ - (ClusterUpdateOfferBody) \ - (ClusterRetractOfferBody) \ - (ClusterInitialStatusBody) \ - (ClusterReadyBody) \ - (ClusterConfigChangeBody) \ - (ClusterMessageExpiredBody) \ - (ClusterErrorCheckBody) \ - (ClusterTimerWakeupBody) \ - (ClusterTimerDropBody) \ - (ClusterShutdownBody) \ - (ClusterDeliverToQueueBody) \ - (ClusterConnectionAnnounceBody) \ - (ClusterConnectionDeliverCloseBody) \ - (ClusterConnectionDeliverDoOutputBody) \ - (ClusterConnectionAbortBody) \ - (ClusterConnectionShadowSetUserBody) \ - (ClusterConnectionShadowPrepareBody) \ - (ClusterConnectionConsumerStateBody) \ - (ClusterConnectionDeliveryRecordBody) \ - (ClusterConnectionTxStartBody) \ - (ClusterConnectionTxAcceptBody) \ - (ClusterConnectionTxDequeueBody) \ - (ClusterConnectionTxEnqueueBody) \ - (ClusterConnectionTxPublishBody) \ - (ClusterConnectionTxEndBody) \ - (ClusterConnectionAccumulatedAckBody) \ - (ClusterConnectionOutputTaskBody) \ - (ClusterConnectionSessionStateBody) \ - (ClusterConnectionShadowReadyBody) \ - (ClusterConnectionMembershipBody) \ - (ClusterConnectionRetractOfferBody) \ - (ClusterConnectionQueuePositionBody) \ - (ClusterConnectionExchangeBody) \ - (ClusterConnectionQueueBody) \ - (ClusterConnectionExpiryIdBody) \ - (ClusterConnectionAddQueueListenerBody) \ - (ClusterConnectionManagementSetupStateBody) \ - (ClusterConnectionConfigBody) - -#define OTHER_BODIES() (AMQContentBody)(AMQHeaderBody)(AMQHeartbeatBody)) - -#endif /*!QPID_FRAMING_FRAME_BODY_LISTS_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/framing/reply_exceptions.h b/nativeLib/org.apache.qpid/include/qpid/framing/reply_exceptions.h deleted file mode 100644 index ffd15117a9..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/framing/reply_exceptions.h +++ /dev/null @@ -1,296 +0,0 @@ -#ifndef QPID_FRAMING_REPLY_EXCEPTIONS_H -#define QPID_FRAMING_REPLY_EXCEPTIONS_H -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/// -/// This file was automatically generated from the AMQP specification. -/// Do not edit. -/// - - -#include "qpid/Exception.h" -#include "qpid/sys/ExceptionHolder.h" -#include "qpid/framing/enum.h" -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace framing { - - -/** - * - * The client attempted to work with a server entity to which it has no access due to - * security settings. - * - */ -struct UnauthorizedAccessException: - SessionException -{ - std::string getPrefix() const { return "unauthorized-access"; } - UnauthorizedAccessException(const std::string& msg=std::string()) : SessionException(execution::ERROR_CODE_UNAUTHORIZED_ACCESS, ""+msg) {} -}; - -/** - * - * The client attempted to work with a server entity that does not exist. - * - */ -struct NotFoundException: - SessionException -{ - std::string getPrefix() const { return "not-found"; } - NotFoundException(const std::string& msg=std::string()) : SessionException(execution::ERROR_CODE_NOT_FOUND, ""+msg) {} -}; - -/** - * - * The client attempted to work with a server entity to which it has no access because - * another client is working with it. - * - */ -struct ResourceLockedException: - SessionException -{ - std::string getPrefix() const { return "resource-locked"; } - ResourceLockedException(const std::string& msg=std::string()) : SessionException(execution::ERROR_CODE_RESOURCE_LOCKED, ""+msg) {} -}; - -/** - * - * The client requested a command that was not allowed because some precondition failed. - * - */ -struct PreconditionFailedException: - SessionException -{ - std::string getPrefix() const { return "precondition-failed"; } - PreconditionFailedException(const std::string& msg=std::string()) : SessionException(execution::ERROR_CODE_PRECONDITION_FAILED, ""+msg) {} -}; - -/** - * - * A server entity the client is working with has been deleted. - * - */ -struct ResourceDeletedException: - SessionException -{ - std::string getPrefix() const { return "resource-deleted"; } - ResourceDeletedException(const std::string& msg=std::string()) : SessionException(execution::ERROR_CODE_RESOURCE_DELETED, ""+msg) {} -}; - -/** - * - * The peer sent a command that is not permitted in the current state of the session. - * - */ -struct IllegalStateException: - SessionException -{ - std::string getPrefix() const { return "illegal-state"; } - IllegalStateException(const std::string& msg=std::string()) : SessionException(execution::ERROR_CODE_ILLEGAL_STATE, ""+msg) {} -}; - -/** - * - * The command segments could not be decoded. - * - */ -struct CommandInvalidException: - SessionException -{ - std::string getPrefix() const { return "command-invalid"; } - CommandInvalidException(const std::string& msg=std::string()) : SessionException(execution::ERROR_CODE_COMMAND_INVALID, ""+msg) {} -}; - -/** - * - * The client exceeded its resource allocation. - * - */ -struct ResourceLimitExceededException: - SessionException -{ - std::string getPrefix() const { return "resource-limit-exceeded"; } - ResourceLimitExceededException(const std::string& msg=std::string()) : SessionException(execution::ERROR_CODE_RESOURCE_LIMIT_EXCEEDED, ""+msg) {} -}; - -/** - * - * The peer tried to use a command a manner that is inconsistent with the rules described - * in the specification. - * - */ -struct NotAllowedException: - SessionException -{ - std::string getPrefix() const { return "not-allowed"; } - NotAllowedException(const std::string& msg=std::string()) : SessionException(execution::ERROR_CODE_NOT_ALLOWED, ""+msg) {} -}; - -/** - * - * The command argument is malformed, i.e. it does not fall within the specified domain. - * The illegal-argument exception can be raised on execution of any command which has - * domain valued fields. - * - */ -struct IllegalArgumentException: - SessionException -{ - std::string getPrefix() const { return "illegal-argument"; } - IllegalArgumentException(const std::string& msg=std::string()) : SessionException(execution::ERROR_CODE_ILLEGAL_ARGUMENT, ""+msg) {} -}; - -/** - * - * The peer tried to use functionality that is not implemented in its partner. - * - */ -struct NotImplementedException: - SessionException -{ - std::string getPrefix() const { return "not-implemented"; } - NotImplementedException(const std::string& msg=std::string()) : SessionException(execution::ERROR_CODE_NOT_IMPLEMENTED, ""+msg) {} -}; - -/** - * - * The peer could not complete the command because of an internal error. The peer may - * require intervention by an operator in order to resume normal operations. - * - */ -struct InternalErrorException: - SessionException -{ - std::string getPrefix() const { return "internal-error"; } - InternalErrorException(const std::string& msg=std::string()) : SessionException(execution::ERROR_CODE_INTERNAL_ERROR, ""+msg) {} -}; - -/** - * - * An invalid argument was passed to a command, and the operation could not - * proceed. An invalid argument is not illegal (see illegal-argument), i.e. it matches - * the domain definition; however the particular value is invalid in this context. - * - */ -struct InvalidArgumentException: - SessionException -{ - std::string getPrefix() const { return "invalid-argument"; } - InvalidArgumentException(const std::string& msg=std::string()) : SessionException(execution::ERROR_CODE_INVALID_ARGUMENT, ""+msg) {} -}; - -QPID_COMMON_EXTERN sys::ExceptionHolder createSessionException(int code, const std::string& text); - -/** - * - * An operator intervened to close the connection for some reason. The client may retry at - * some later date. - * - */ -struct ConnectionForcedException: - ConnectionException -{ - std::string getPrefix() const { return "connection-forced"; } - ConnectionForcedException(const std::string& msg=std::string()) : ConnectionException(connection::CLOSE_CODE_CONNECTION_FORCED, ""+msg) {} -}; - -/** - * - * The client tried to work with an unknown virtual host. - * - */ -struct InvalidPathException: - ConnectionException -{ - std::string getPrefix() const { return "invalid-path"; } - InvalidPathException(const std::string& msg=std::string()) : ConnectionException(connection::CLOSE_CODE_INVALID_PATH, ""+msg) {} -}; - -/** - * - * A valid frame header cannot be formed from the incoming byte stream. - * - */ -struct FramingErrorException: - ConnectionException -{ - std::string getPrefix() const { return "framing-error"; } - FramingErrorException(const std::string& msg=std::string()) : ConnectionException(connection::CLOSE_CODE_FRAMING_ERROR, ""+msg) {} -}; - -QPID_COMMON_EXTERN sys::ExceptionHolder createConnectionException(int code, const std::string& text); - -/** - * - * The session is currently attached to another transport. - * - */ -struct SessionBusyException: - ChannelException -{ - std::string getPrefix() const { return "session-busy"; } - SessionBusyException(const std::string& msg=std::string()) : ChannelException(session::DETACH_CODE_SESSION_BUSY, ""+msg) {} -}; - -/** - * - * The transport is currently attached to another session. - * - */ -struct TransportBusyException: - ChannelException -{ - std::string getPrefix() const { return "transport-busy"; } - TransportBusyException(const std::string& msg=std::string()) : ChannelException(session::DETACH_CODE_TRANSPORT_BUSY, ""+msg) {} -}; - -/** - * - * The transport is not currently attached to any session. - * - */ -struct NotAttachedException: - ChannelException -{ - std::string getPrefix() const { return "not-attached"; } - NotAttachedException(const std::string& msg=std::string()) : ChannelException(session::DETACH_CODE_NOT_ATTACHED, ""+msg) {} -}; - -/** - * - * Command data was received prior to any use of the command-point control. - * - */ -struct UnknownIdsException: - ChannelException -{ - std::string getPrefix() const { return "unknown-ids"; } - UnknownIdsException(const std::string& msg=std::string()) : ChannelException(session::DETACH_CODE_UNKNOWN_IDS, ""+msg) {} -}; - -QPID_COMMON_EXTERN sys::ExceptionHolder createChannelException(int code, const std::string& text); - -}} // namespace qpid::framing - -#endif /*!QPID_FRAMING_REPLY_EXCEPTIONS_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/log/Logger.h b/nativeLib/org.apache.qpid/include/qpid/log/Logger.h deleted file mode 100644 index d7da1f077a..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/log/Logger.h +++ /dev/null @@ -1,114 +0,0 @@ -#ifndef QPID_LOG_LOGGER_H -#define QPID_LOG_LOGGER_H - -/* - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include "qpid/log/Selector.h" -#include "qpid/log/Options.h" -#include "qpid/sys/Mutex.h" -#include -#include -#include -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace log { - -/** - * Central logging agent. - * - * Thread safe, singleton. - * - * The Logger provides all needed functionality for selecting and - * formatting logging output. The actual outputting of log records - * is handled by Logger::Output-derived classes instantiated by the - * platform's sink-related options. - */ -class Logger : private boost::noncopyable { - public: - /** Flags indicating what to include in the log output */ - enum FormatFlag { FILE=1, LINE=2, FUNCTION=4, LEVEL=8, TIME=16, THREAD=32}; - - /** - * Logging output sink. - * - * The Output sink provides an interface to direct logging output to. - * Logging sinks are primarily platform-specific as provided for on - * each platform. - * - * Implementations of Output must be thread safe. - */ - class Output { - public: - QPID_COMMON_EXTERN Output(); - QPID_COMMON_EXTERN virtual ~Output(); - /** Receives the statemnt of origin and formatted message to log. */ - virtual void log(const Statement&, const std::string&) =0; - }; - - QPID_COMMON_EXTERN static Logger& instance(); - - QPID_COMMON_EXTERN Logger(); - QPID_COMMON_EXTERN ~Logger(); - - /** Select the messages to be logged. */ - QPID_COMMON_EXTERN void select(const Selector& s); - - /** Set the formatting flags, bitwise OR of FormatFlag values. */ - QPID_COMMON_EXTERN void format(int formatFlags); - - /** Set format flags from options object. - *@returns computed flags. - */ - QPID_COMMON_EXTERN int format(const Options&); - - /** Configure logger from Options */ - QPID_COMMON_EXTERN void configure(const Options& o); - - /** Add a statement. */ - QPID_COMMON_EXTERN void add(Statement& s); - - /** Log a message. */ - QPID_COMMON_EXTERN void log(const Statement&, const std::string&); - - /** Add an output destination for messages */ - QPID_COMMON_EXTERN void output(std::auto_ptr out); - - /** Set a prefix for all messages */ - QPID_COMMON_EXTERN void setPrefix(const std::string& prefix); - - /** Reset the logger. */ - QPID_COMMON_EXTERN void clear(); - - /** Get the options used to configure the logger. */ - QPID_COMMON_EXTERN const Options& getOptions() const { return options; } - - - private: - typedef boost::ptr_vector Outputs; - typedef std::set Statements; - - sys::Mutex lock; - inline void enable_unlocked(Statement* s); - - Statements statements; - Outputs outputs; - Selector selector; - int flags; - std::string prefix; - Options options; -}; - -}} // namespace qpid::log - - -#endif /*!QPID_LOG_LOGGER_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/log/Options.h b/nativeLib/org.apache.qpid/include/qpid/log/Options.h deleted file mode 100644 index bbc47b47d3..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/log/Options.h +++ /dev/null @@ -1,50 +0,0 @@ -#ifndef QPID_LOG_OPTIONS_H -#define QPID_LOG_OPTIONS_H - -/* - * - * Copyright (c) 2006 The Apache Software Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -#include "qpid/Options.h" -#include "qpid/CommonImportExport.h" -#include "qpid/log/SinkOptions.h" -#include -#include - -namespace qpid { -namespace log { - -/** Logging options for config parser. */ -struct Options : public qpid::Options { - /** Pass argv[0] for use in syslog output */ - QPID_COMMON_EXTERN Options(const std::string& argv0_=std::string(), - const std::string& name_="Logging options"); - QPID_COMMON_EXTERN Options(const Options &); - - QPID_COMMON_EXTERN Options& operator=(const Options&); - - std::string argv0; - std::string name; - std::vector selectors; - bool time, level, thread, source, function; - bool trace; - std::string prefix; - std::auto_ptr sinkOptions; -}; - -}} // namespace qpid::log - -#endif /*!QPID_LOG_OPTIONS_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/log/Selector.h b/nativeLib/org.apache.qpid/include/qpid/log/Selector.h deleted file mode 100644 index 061152d7e2..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/log/Selector.h +++ /dev/null @@ -1,71 +0,0 @@ -#ifndef SELECTOR_H -#define SELECTOR_H - -/* - * - * Copyright (c) 2006 The Apache Software Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include "qpid/log/Statement.h" -#include "qpid/CommonImportExport.h" -#include - -namespace qpid { -namespace log { -struct Options; - -/** - * A selector identifies the set of log messages to enable. - * - * Thread object unsafe, pass-by-value type. - */ -class Selector { - public: - /** Empty selector selects nothing */ - Selector() {} - - /** Set selector from Options */ - QPID_COMMON_EXTERN Selector(const Options&); - - /** Equavlient to: Selector s; s.enable(l, s) */ - Selector(Level l, const std::string& s=std::string()) { - enable(l,s); - } - - Selector(const std::string& enableStr) { enable(enableStr); } - /** - * Enable messages with level in levels where the file - * name contains substring. Empty string matches all. - */ - void enable(Level level, const std::string& substring=std::string()) { - substrings[level].push_back(substring); - } - - /** Enable based on a 'level[+]:file' string */ - QPID_COMMON_EXTERN void enable(const std::string& enableStr); - - /** True if level is enabled for file. */ - QPID_COMMON_EXTERN bool isEnabled(Level level, const char* function); - - private: - std::vector substrings[LevelTraits::COUNT]; -}; - - -}} // namespace qpid::log - - -#endif /*!SELECTOR_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/log/SinkOptions.h b/nativeLib/org.apache.qpid/include/qpid/log/SinkOptions.h deleted file mode 100644 index 7ec2cfbc17..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/log/SinkOptions.h +++ /dev/null @@ -1,64 +0,0 @@ -#ifndef QPID_LOG_SINKOPTIONS_H -#define QPID_LOG_SINKOPTIONS_H - -/* - * - * Copyright (c) 2006 The Apache Software Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include "qpid/Options.h" -#include - -namespace qpid { -namespace log { - -class Logger; - -/** - * Logging sink options. - * - * Most logging sink options will be platform-specific, even if some are - * duplicated. The range of platforms to which this code may be ported - * can't be assumed to all have C++ iostreams or files. Thus, this class - * is primarily for implementing in a platform-specific way. - */ -struct SinkOptions : public qpid::Options { - - // Create a platform's SinkOptions. Pass argv0 as the program name, - // useful for syslog-type logging. - static SinkOptions *create(const std::string& argv0=std::string()); - - SinkOptions(const std::string& name="Logging sink options") - : qpid::Options(name) - {} - virtual ~SinkOptions() {} - - virtual SinkOptions& operator=(const SinkOptions&) = 0; - - // This allows the caller to indicate that there's no normal outputs - // available. For example, when running as a daemon. In these cases, the - // platform's "syslog"-type output should replace the default stderr - // unless some other sink has been selected. - virtual void detached(void) = 0; - - // The Logger acting on these options calls setup() to request any - // Sinks be set up and fed back to the logger. - virtual void setup(Logger *logger) = 0; -}; - -}} // namespace qpid::log - -#endif /*!QPID_LOG_OPTIONS_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/log/Statement.h b/nativeLib/org.apache.qpid/include/qpid/log/Statement.h deleted file mode 100644 index 7b3ab60b81..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/log/Statement.h +++ /dev/null @@ -1,139 +0,0 @@ -#ifndef STATEMENT_H -#define STATEMENT_H - -/* - * - * Copyright (c) 2006 The Apache Software Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include "qpid/Msg.h" -#include "qpid/CommonImportExport.h" -#include - -namespace qpid { -namespace log { - -/** Debugging severity levels - * - trace: High-volume debugging messages. - * - debug: Debugging messages. - * - info: Informational messages. - * - notice: Normal but significant condition. - * - warning: Warn of a possible problem. - * - error: A definite error has occured. - * - critical: System in danger of severe failure. - */ -enum Level { trace, debug, info, notice, warning, error, critical }; -struct LevelTraits { - static const int COUNT=critical+1; - - /** Get level from string name. - *@exception if name invalid. - */ - static Level level(const char* name); - - /** Get level from string name. - *@exception if name invalid. - */ - static Level level(const std::string& name) { - return level(name.c_str()); - } - - /** String name of level */ - static const char* name(Level); -}; - -/** POD struct representing a logging statement in source code. */ -struct Statement { - bool enabled; - const char* file; - int line; - const char* function; - Level level; - - QPID_COMMON_EXTERN void log(const std::string& message); - - struct Initializer { - QPID_COMMON_EXTERN Initializer(Statement& s); - Statement& statement; - }; -}; - -///@internal static initializer for a Statement. -#define QPID_LOG_STATEMENT_INIT(level) \ - { 0, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION, (::qpid::log::level) } - -/** - * Like QPID_LOG but computes an additional boolean test expression - * to determine if the message should be logged. Evaluation of both - * the test and message expressions occurs only if the requested log level - * is enabled. - *@param LEVEL severity Level for message, should be one of: - * debug, info, notice, warning, error, critical. NB no qpid::log:: prefix. - *@param TEST message is logged only if expression TEST evaluates to true. - *@param MESSAGE any object with an @eostream operator<<, or a sequence - * like of ostreamable objects separated by @e<<. - */ -#define QPID_LOG_IF(LEVEL, TEST, MESSAGE) \ - do { \ - using ::qpid::log::Statement; \ - static Statement stmt_= QPID_LOG_STATEMENT_INIT(LEVEL); \ - static Statement::Initializer init_(stmt_); \ - if (stmt_.enabled && (TEST)) \ - stmt_.log(::qpid::Msg() << MESSAGE); \ - } while(0) - -/** - * FLAG must be a boolean variable. Assigns FLAG to true iff logging - * is enabled for LEVEL in the calling context. Use when extra - * support code is needed to generate log messages, to ensure that it - * is only run if the logging level is enabled. - * e.g. - * bool logWarning; - * QPID_LOG_TEST(LEVEL, logWarning); - * if (logWarning) { do stuff needed for warning log messages } - */ -#define QPID_LOG_TEST(LEVEL, FLAG) \ - do { \ - using ::qpid::log::Statement; \ - static Statement stmt_= QPID_LOG_STATEMENT_INIT(LEVEL); \ - static Statement::Initializer init_(stmt_); \ - FLAG = stmt_.enabled; \ - } while(0) - -/** - * Macro for log statements. Example of use: - * @code - * QPID_LOG(debug, "There are " << foocount << " foos in the bar."); - * QPID_LOG(error, boost::format("Dohickey %s exploded") % dohicky.name()); - * @endcode - * - * You can subscribe to log messages by level, by component, by filename - * or a combination @see Configuration. - - *@param LEVEL severity Level for message, should be one of: - * debug, info, notice, warning, error, critical. NB no qpid::log:: prefix. - *@param MESSAGE any object with an @eostream operator<<, or a sequence - * like of ostreamable objects separated by @e<<. - */ -#define QPID_LOG(LEVEL, MESSAGE) QPID_LOG_IF(LEVEL, true, MESSAGE); - -}} // namespace qpid::log - - - - -#endif /*!STATEMENT_H*/ - diff --git a/nativeLib/org.apache.qpid/include/qpid/management/Args.h b/nativeLib/org.apache.qpid/include/qpid/management/Args.h deleted file mode 100644 index 5d1cb7e01d..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/management/Args.h +++ /dev/null @@ -1,44 +0,0 @@ -#ifndef _Args_ -#define _Args_ - -// -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -// - - -namespace qpid { -namespace management { - -class Args -{ - public: - - virtual ~Args (void) = 0; - -}; - -inline Args::~Args (void) {} - -class ArgsNone : public Args -{ -}; - -}} - - -#endif /*!_Args_*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/management/Buffer.h b/nativeLib/org.apache.qpid/include/qpid/management/Buffer.h deleted file mode 100644 index c32494b8c0..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/management/Buffer.h +++ /dev/null @@ -1,106 +0,0 @@ -#ifndef _Management_Buffer_ -#define _Management_Buffer_ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#include "qpid/CommonImportExport.h" -#include "qpid/types/Exception.h" -#include "qpid/types/Variant.h" -#include - -namespace qpid { -namespace framing { - class Buffer; -} - -namespace management { - -struct OutOfBounds : qpid::types::Exception { - OutOfBounds() : qpid::types::Exception(std::string("Out of Bounds")) {} -}; - - -/** - * This class is a wrapper around qpid::framing::Buffer that does not include any dependencies - * from boost or from qpid::framing. - */ -class Buffer -{ -public: - QPID_COMMON_EXTERN Buffer(char* data=0, uint32_t size=0); - QPID_COMMON_EXTERN ~Buffer(); - - QPID_COMMON_EXTERN void record(); - QPID_COMMON_EXTERN void restore(bool reRecord = false); - QPID_COMMON_EXTERN void reset(); - - QPID_COMMON_EXTERN uint32_t available(); - QPID_COMMON_EXTERN uint32_t getSize(); - QPID_COMMON_EXTERN uint32_t getPosition(); - QPID_COMMON_EXTERN char* getPointer(); - - QPID_COMMON_EXTERN void putOctet(uint8_t i); - QPID_COMMON_EXTERN void putShort(uint16_t i); - QPID_COMMON_EXTERN void putLong(uint32_t i); - QPID_COMMON_EXTERN void putLongLong(uint64_t i); - QPID_COMMON_EXTERN void putInt8(int8_t i); - QPID_COMMON_EXTERN void putInt16(int16_t i); - QPID_COMMON_EXTERN void putInt32(int32_t i); - QPID_COMMON_EXTERN void putInt64(int64_t i); - QPID_COMMON_EXTERN void putFloat(float f); - QPID_COMMON_EXTERN void putDouble(double f); - QPID_COMMON_EXTERN void putBin128(const uint8_t* b); - - QPID_COMMON_EXTERN uint8_t getOctet(); - QPID_COMMON_EXTERN uint16_t getShort(); - QPID_COMMON_EXTERN uint32_t getLong(); - QPID_COMMON_EXTERN uint64_t getLongLong(); - QPID_COMMON_EXTERN int8_t getInt8(); - QPID_COMMON_EXTERN int16_t getInt16(); - QPID_COMMON_EXTERN int32_t getInt32(); - QPID_COMMON_EXTERN int64_t getInt64(); - QPID_COMMON_EXTERN float getFloat(); - QPID_COMMON_EXTERN double getDouble(); - - QPID_COMMON_EXTERN void putShortString(const std::string& s); - QPID_COMMON_EXTERN void putMediumString(const std::string& s); - QPID_COMMON_EXTERN void putLongString(const std::string& s); - QPID_COMMON_EXTERN void getShortString(std::string& s); - QPID_COMMON_EXTERN void getMediumString(std::string& s); - QPID_COMMON_EXTERN void getLongString(std::string& s); - QPID_COMMON_EXTERN void getBin128(uint8_t* b); - - QPID_COMMON_EXTERN void putMap(const types::Variant::Map& map); - QPID_COMMON_EXTERN void putList(const types::Variant::List& list); - QPID_COMMON_EXTERN void getMap(types::Variant::Map& map); - QPID_COMMON_EXTERN void getList(types::Variant::List& list); - - QPID_COMMON_EXTERN void putRawData(const std::string& s); - QPID_COMMON_EXTERN void getRawData(std::string& s, uint32_t size); - - QPID_COMMON_EXTERN void putRawData(const uint8_t* data, size_t size); - QPID_COMMON_EXTERN void getRawData(uint8_t* data, size_t size); - -private: - framing::Buffer* impl; -}; - -}} // namespace qpid::management - -#endif diff --git a/nativeLib/org.apache.qpid/include/qpid/management/ConnectionSettings.h b/nativeLib/org.apache.qpid/include/qpid/management/ConnectionSettings.h deleted file mode 100644 index b631ffa658..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/management/ConnectionSettings.h +++ /dev/null @@ -1,118 +0,0 @@ -#ifndef _management_ConnectionSettings_h -#define _management_ConnectionSettings_h -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include "qpid/CommonImportExport.h" -#include "qpid/types/Variant.h" -#include - -namespace qpid { -namespace management { - -/** - * Settings for a Connection. - */ -struct ConnectionSettings { - - QPID_COMMON_EXTERN ConnectionSettings(); - QPID_COMMON_EXTERN virtual ~ConnectionSettings(); - - /** - * The protocol used for the connection (defaults to 'tcp') - */ - std::string protocol; - - /** - * The host (or ip address) to connect to (defaults to 'localhost'). - */ - std::string host; - /** - * The port to connect to (defaults to 5672). - */ - uint16_t port; - /** - * Allows an AMQP 'virtual host' to be specified for the - * connection. - */ - std::string virtualhost; - - /** - * The username to use when authenticating the connection. If not - * specified the current users login is used if available. - */ - std::string username; - /** - * The password to use when authenticating the connection. - */ - std::string password; - /** - * The SASL mechanism to use when authenticating the connection; - * the options are currently PLAIN or ANONYMOUS. - */ - std::string mechanism; - /** - * Allows a locale to be specified for the connection. - */ - std::string locale; - /** - * Allows a heartbeat frequency to be specified - */ - uint16_t heartbeat; - /** - * The maximum number of channels that the client will request for - * use on this connection. - */ - uint16_t maxChannels; - /** - * The maximum frame size that the client will request for this - * connection. - */ - uint16_t maxFrameSize; - /** - * Limit the size of the connections send buffer . The buffer - * is limited to bounds * maxFrameSize. - */ - unsigned int bounds; - /** - * If true, TCP_NODELAY will be set for the connection. - */ - bool tcpNoDelay; - /** - * SASL service name - */ - std::string service; - /** - * Minimum acceptable strength of any SASL negotiated security - * layer. 0 means no security layer required. - */ - unsigned int minSsf; - /** - * Maximum acceptable strength of any SASL negotiated security - * layer. 0 means no security layer allowed. - */ - unsigned int maxSsf; -}; - -}} - -#endif - diff --git a/nativeLib/org.apache.qpid/include/qpid/management/Manageable.h b/nativeLib/org.apache.qpid/include/qpid/management/Manageable.h deleted file mode 100644 index 1e5cd8bc42..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/management/Manageable.h +++ /dev/null @@ -1,77 +0,0 @@ -#ifndef _Manageable_ -#define _Manageable_ - -// -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -// - -#include "qpid/management/ManagementObject.h" -#include "qpid/management/Args.h" -#include -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace management { - -class QPID_COMMON_EXTERN Manageable -{ - public: - - virtual ~Manageable(void) = 0; - - // status_t is a type used to pass completion status from the method handler. - // - typedef uint32_t status_t; - static std::string StatusText(status_t status, std::string text = std::string()); - - static const status_t STATUS_OK = 0; - static const status_t STATUS_UNKNOWN_OBJECT = 1; - static const status_t STATUS_UNKNOWN_METHOD = 2; - static const status_t STATUS_NOT_IMPLEMENTED = 3; - static const status_t STATUS_PARAMETER_INVALID = 4; - static const status_t STATUS_FEATURE_NOT_IMPLEMENTED = 5; - static const status_t STATUS_FORBIDDEN = 6; - static const status_t STATUS_EXCEPTION = 7; - static const status_t STATUS_USER = 0x00010000; - - // Every "Manageable" object must hold a reference to exactly one - // management object. This object is always of a class derived from - // the pure-virtual "ManagementObject". - // - // This accessor function returns a pointer to the management object. - // - virtual ManagementObject* GetManagementObject(void) const = 0; - - // Every "Manageable" object must implement ManagementMethod. This - // function is called when a remote management client invokes a method - // on this object. The input and output arguments are specific to the - // method being called and must be down-cast to the appropriate sub class - // before use. - virtual status_t ManagementMethod(uint32_t methodId, Args& args, std::string& text); - - // This optional method can be overridden to allow the agent application to - // authorize method invocations. Return true iff the authenticated user identified - // in userId us authorized to execute the method. - virtual bool AuthorizeMethod(uint32_t methodId, Args& args, const std::string& userId); -}; - -inline Manageable::~Manageable(void) {} - -}} - -#endif /*!_Manageable_*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/management/ManagementEvent.h b/nativeLib/org.apache.qpid/include/qpid/management/ManagementEvent.h deleted file mode 100644 index e80175096f..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/management/ManagementEvent.h +++ /dev/null @@ -1,53 +0,0 @@ -#ifndef _ManagementEvent_ -#define _ManagementEvent_ - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include "qpid/management/ManagementObject.h" -#include "qpid/types/Variant.h" -#include - -namespace qpid { -namespace management { - -class ManagementAgent; - -class ManagementEvent : public ManagementItem { - public: - static const uint8_t MD5_LEN = 16; - //typedef void (*writeSchemaCall_t)(qpid::framing::Buffer&); - typedef void (*writeSchemaCall_t)(std::string&); - virtual ~ManagementEvent() {} - - virtual writeSchemaCall_t getWriteSchemaCall(void) = 0; - //virtual mapEncodeSchemaCall_t getMapEncodeSchemaCall(void) = 0; - virtual std::string& getEventName() const = 0; - virtual std::string& getPackageName() const = 0; - virtual uint8_t* getMd5Sum() const = 0; - virtual uint8_t getSeverity() const = 0; - virtual void encode(std::string&) const = 0; - virtual void mapEncode(qpid::types::Variant::Map&) const = 0; -}; - -}} - -#endif /*!_ManagementEvent_*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/management/ManagementObject.h b/nativeLib/org.apache.qpid/include/qpid/management/ManagementObject.h deleted file mode 100644 index 747edda150..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/management/ManagementObject.h +++ /dev/null @@ -1,237 +0,0 @@ -#ifndef _ManagementObject_ -#define _ManagementObject_ - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#include "qpid/CommonImportExport.h" - -#include "qpid/management/Mutex.h" -#include "qpid/types/Variant.h" - -#include -#include - -namespace qpid { -namespace management { - -class Manageable; -class ObjectId; -class ManagementObject; - - -class AgentAttachment { - friend class ObjectId; -private: - uint64_t first; -public: - AgentAttachment() : first(0) {} - QPID_COMMON_EXTERN void setBanks(uint32_t broker, uint32_t bank); - uint64_t getFirst() const { return first; } -}; - - -class ObjectId { -protected: - const AgentAttachment* agent; - uint64_t first; - uint64_t second; - uint64_t agentEpoch; - std::string v2Key; - std::string agentName; - void fromString(const std::string&); -public: - QPID_COMMON_EXTERN ObjectId() : agent(0), first(0), second(0), agentEpoch(0) {} - QPID_COMMON_EXTERN ObjectId(const types::Variant& map) : - agent(0), first(0), second(0), agentEpoch(0) { mapDecode(map.asMap()); } - QPID_COMMON_EXTERN ObjectId(uint8_t flags, uint16_t seq, uint32_t broker); - QPID_COMMON_EXTERN ObjectId(AgentAttachment* _agent, uint8_t flags, uint16_t seq); - QPID_COMMON_EXTERN ObjectId(std::istream&); - QPID_COMMON_EXTERN ObjectId(const std::string&); - QPID_COMMON_EXTERN ObjectId(const std::string& agentAddress, const std::string& key, - uint64_t epoch=0) : agent(0), first(0), second(0), - agentEpoch(epoch), v2Key(key), agentName(agentAddress) {} - - // Deprecated: - QPID_COMMON_EXTERN ObjectId(uint8_t flags, uint16_t seq, uint32_t broker, uint64_t object); - QPID_COMMON_EXTERN bool operator==(const ObjectId &other) const; - QPID_COMMON_EXTERN bool operator<(const ObjectId &other) const; - QPID_COMMON_EXTERN void mapEncode(types::Variant::Map& map) const; - QPID_COMMON_EXTERN void mapDecode(const types::Variant::Map& map); - QPID_COMMON_EXTERN operator types::Variant::Map() const; - QPID_COMMON_EXTERN uint32_t encodedSize() const { return 16; }; - QPID_COMMON_EXTERN void encode(std::string& buffer) const; - QPID_COMMON_EXTERN void decode(const std::string& buffer); - QPID_COMMON_EXTERN bool equalV1(const ObjectId &other) const; - QPID_COMMON_EXTERN void setV2Key(const std::string& _key) { v2Key = _key; } - QPID_COMMON_EXTERN void setV2Key(const ManagementObject& object); - QPID_COMMON_EXTERN void setAgentName(const std::string& _name) { agentName = _name; } - QPID_COMMON_EXTERN const std::string& getAgentName() const { return agentName; } - QPID_COMMON_EXTERN const std::string& getV2Key() const { return v2Key; } - friend QPID_COMMON_EXTERN std::ostream& operator<<(std::ostream&, const ObjectId&); -}; - -class ManagementItem { -public: - static const uint8_t TYPE_U8 = 1; - static const uint8_t TYPE_U16 = 2; - static const uint8_t TYPE_U32 = 3; - static const uint8_t TYPE_U64 = 4; - static const uint8_t TYPE_SSTR = 6; - static const uint8_t TYPE_LSTR = 7; - static const uint8_t TYPE_ABSTIME = 8; - static const uint8_t TYPE_DELTATIME = 9; - static const uint8_t TYPE_REF = 10; - static const uint8_t TYPE_BOOL = 11; - static const uint8_t TYPE_FLOAT = 12; - static const uint8_t TYPE_DOUBLE = 13; - static const uint8_t TYPE_UUID = 14; - static const uint8_t TYPE_FTABLE = 15; - static const uint8_t TYPE_S8 = 16; - static const uint8_t TYPE_S16 = 17; - static const uint8_t TYPE_S32 = 18; - static const uint8_t TYPE_S64 = 19; - static const uint8_t TYPE_LIST = 21; - - static const uint8_t ACCESS_RC = 1; - static const uint8_t ACCESS_RW = 2; - static const uint8_t ACCESS_RO = 3; - - static const uint8_t DIR_I = 1; - static const uint8_t DIR_O = 2; - static const uint8_t DIR_IO = 3; - - static const uint8_t FLAG_CONFIG = 0x01; - static const uint8_t FLAG_INDEX = 0x02; - static const uint8_t FLAG_END = 0x80; - - const static uint8_t CLASS_KIND_TABLE = 1; - const static uint8_t CLASS_KIND_EVENT = 2; - - - -public: - virtual ~ManagementItem() {} -}; - -class ManagementObject : public ManagementItem -{ -protected: - - uint64_t createTime; - uint64_t destroyTime; - uint64_t updateTime; - ObjectId objectId; - mutable bool configChanged; - mutable bool instChanged; - bool deleted; - Manageable* coreObject; - mutable Mutex accessLock; - uint32_t flags; - - static int nextThreadIndex; - bool forcePublish; - - QPID_COMMON_EXTERN int getThreadIndex(); - QPID_COMMON_EXTERN void writeTimestamps(std::string& buf) const; - QPID_COMMON_EXTERN void readTimestamps(const std::string& buf); - QPID_COMMON_EXTERN uint32_t writeTimestampsSize() const; - - public: - QPID_COMMON_EXTERN static const uint8_t MD5_LEN = 16; - QPID_COMMON_EXTERN static int maxThreads; - //typedef void (*writeSchemaCall_t) (qpid::framing::Buffer&); - typedef void (*writeSchemaCall_t) (std::string&); - - QPID_COMMON_EXTERN ManagementObject(Manageable* _core); - virtual ~ManagementObject() {} - - virtual writeSchemaCall_t getWriteSchemaCall() = 0; - virtual std::string getKey() const = 0; - - // Encode & Decode the property and statistics values - // for this object. - virtual void mapEncodeValues(types::Variant::Map& map, - bool includeProperties, - bool includeStatistics) = 0; - virtual void mapDecodeValues(const types::Variant::Map& map) = 0; - virtual void doMethod(std::string& methodName, - const types::Variant::Map& inMap, - types::Variant::Map& outMap, - const std::string& userId) = 0; - QPID_COMMON_EXTERN void writeTimestamps(types::Variant::Map& map) const; - QPID_COMMON_EXTERN void readTimestamps(const types::Variant::Map& buf); - - /** - * The following five methods are not pure-virtual because they will only - * be overridden in cases where QMFv1 is to be supported. - */ - virtual uint32_t writePropertiesSize() const { return 0; } - virtual void readProperties(const std::string&) {} - virtual void writeProperties(std::string&) const {} - virtual void writeStatistics(std::string&, bool = false) {} - virtual void doMethod(std::string&, const std::string&, std::string&, const std::string&) {} - - QPID_COMMON_EXTERN virtual void setReference(ObjectId objectId); - - virtual std::string& getClassName() const = 0; - virtual std::string& getPackageName() const = 0; - virtual uint8_t* getMd5Sum() const = 0; - - void setObjectId(ObjectId oid) { objectId = oid; } - ObjectId getObjectId() { return objectId; } - inline bool getConfigChanged() { return configChanged; } - virtual bool getInstChanged() { return instChanged; } - virtual bool hasInst() { return true; } - inline void setForcePublish(bool f) { forcePublish = f; } - inline bool getForcePublish() { return forcePublish; } - QPID_COMMON_EXTERN void setUpdateTime(); - QPID_COMMON_EXTERN void resourceDestroy(); - inline bool isDeleted() { return deleted; } - inline void setFlags(uint32_t f) { flags = f; } - inline uint32_t getFlags() { return flags; } - bool isSameClass(ManagementObject& other) { - for (int idx = 0; idx < MD5_LEN; idx++) - if (other.getMd5Sum()[idx] != getMd5Sum()[idx]) - return false; - return other.getClassName() == getClassName() && - other.getPackageName() == getPackageName(); - } - - // QPID_COMMON_EXTERN void encode(qpid::framing::Buffer& buf) const { writeProperties(buf); } - // QPID_COMMON_EXTERN void decode(qpid::framing::Buffer& buf) { readProperties(buf); } - //QPID_COMMON_EXTERN uint32_t encodedSize() const { return writePropertiesSize(); } - - // Encode/Decode the entire object as a map - //QPID_COMMON_EXTERN void mapEncode(types::Variant::Map& map, - //bool includeProperties=true, - //bool includeStatistics=true); - - //QPID_COMMON_EXTERN void mapDecode(const types::Variant::Map& map); -}; - -typedef std::map ManagementObjectMap; -typedef std::vector ManagementObjectVector; - -}} - - - -#endif /*!_ManagementObject_*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/management/Mutex.h b/nativeLib/org.apache.qpid/include/qpid/management/Mutex.h deleted file mode 100644 index 67ae04bae9..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/management/Mutex.h +++ /dev/null @@ -1,67 +0,0 @@ -#ifndef _management_Mutex_h -#define _management_Mutex_h - -/* - * - * Copyright (c) 2008 The Apache Software Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include "qpid/CommonImportExport.h" - -namespace qpid { - namespace sys { - class Mutex; - } - - namespace management { - - /** - * Scoped lock template: calls lock() in ctor, unlock() in dtor. - * L can be any class with lock() and unlock() functions. - */ - template class ScopedLockTemplate { - public: - ScopedLockTemplate(L& l) : mutex(l) { mutex.lock(); } - ~ScopedLockTemplate() { mutex.unlock(); } - private: - L& mutex; - }; - - template class ScopedUnlockTemplate { - public: - ScopedUnlockTemplate(L& l) : mutex(l) { mutex.unlock(); } - ~ScopedUnlockTemplate() { mutex.lock(); } - private: - L& mutex; - }; - - class Mutex { - public: - typedef ScopedLockTemplate ScopedLock; - typedef ScopedUnlockTemplate ScopedUnlock; - - QPID_COMMON_EXTERN Mutex(); - QPID_COMMON_EXTERN ~Mutex(); - QPID_COMMON_EXTERN void lock(); - QPID_COMMON_EXTERN void unlock(); - private: - sys::Mutex* impl; - }; - } -} - -#endif - diff --git a/nativeLib/org.apache.qpid/include/qpid/messaging/Address.h b/nativeLib/org.apache.qpid/include/qpid/messaging/Address.h deleted file mode 100644 index 2e36d0ae22..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/messaging/Address.h +++ /dev/null @@ -1,162 +0,0 @@ -#ifndef QPID_MESSAGING_ADDRESS_H -#define QPID_MESSAGING_ADDRESS_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#include "qpid/messaging/ImportExport.h" - -#include "qpid/messaging/exceptions.h" -#include "qpid/types/Variant.h" - -#include -#include - -namespace qpid { -namespace messaging { - -class AddressImpl; - -/** \ingroup messaging - * Represents an address to which messages can be sent and from which - * messages can be received. Often a simple name is sufficient for - * this, however this can be augmented with a subject pattern and - * options. - * - * All parts of an address can be specified in a string of the - * following form: - * - * <address> [ / <subject> ] ; [ { <key> : <value> , ... } ] - * - * Here the <address> is a simple name for the addressed - * entity and <subject> is a subject or subject pattern for - * messages sent to or received from this address. The options are - * specified as a series of key value pairs enclosed in curly brackets - * (denoting a map). Values can be nested maps, or lists (which are - * denoted as a comma separated list of values inside square brackets, - * e.g. [a, b, c]). - * - * The currently supported options are as follows: - * - *
- * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - - * - * - * - * - * - * - * - * - * For receivers there is one other option of interest: - * - *
createIndicate whether the address should be automatically created - * or not. Can be one of always, never, - * sender or receiver. The properties of the node - * to be created can be specified via the node options (see - * below). - *
assertIndicate whether or not to assert any specified node - * properties(see below) match the address. Can be one of - * always, never, sender or - * receiver. - *
deleteIndicate whether or not to delete the addressed node when a - * sender or receiver is cancelled. Can be one of always, - * never, sender or receiver. - *
nodeA nested map describing properties of the addressed - * node. Current properties supported are type (topic or queue), - * durable (boolean), x-declare and x-bindings. The x-declare - * option is a nested map in whcih protocol amqp 0-10 specific - * options for queue or exchange declare can be specified. The - * x-bindings option is a nested list, each element of which can - * specify a queue, an exchange, a binding-key and arguments, - * which are used to establish a binding on create. The node - * will be used if queue or exchange values are not specified. - *
linkA nested map through which properties of the 'link' from - * sender/receiver to node can be configured. Current propeties - * are name, durable, realiability, x-declare, x-subscribe and - * x-bindings. - *
- * - *
mode(only relevant for queues) - * indicates whether the subscribe should consume (the default) or - * merely browse the messages. Valid values are 'consume' and - * 'browse'
- * - * An address has value semantics. - */ -class Address -{ - public: - QPID_MESSAGING_EXTERN Address(); - QPID_MESSAGING_EXTERN Address(const std::string& address); - QPID_MESSAGING_EXTERN Address(const std::string& name, const std::string& subject, - const qpid::types::Variant::Map& options, const std::string& type = ""); - QPID_MESSAGING_EXTERN Address(const Address& address); - QPID_MESSAGING_EXTERN ~Address(); - QPID_MESSAGING_EXTERN Address& operator=(const Address&); - QPID_MESSAGING_EXTERN const std::string& getName() const; - QPID_MESSAGING_EXTERN void setName(const std::string&); - QPID_MESSAGING_EXTERN const std::string& getSubject() const; - QPID_MESSAGING_EXTERN void setSubject(const std::string&); - QPID_MESSAGING_EXTERN const qpid::types::Variant::Map& getOptions() const; - QPID_MESSAGING_EXTERN qpid::types::Variant::Map& getOptions(); - QPID_MESSAGING_EXTERN void setOptions(const qpid::types::Variant::Map&); - - QPID_MESSAGING_EXTERN std::string getType() const; - /** - * The type of and addressed node influences how receivers and - * senders are constructed for it. It also affects how a reply-to - * address is encoded. If the type is not specified in the address - * itself, it will be automatically determined by querying the - * broker. The type can be explicitly set to prevent this if - * needed. - */ - QPID_MESSAGING_EXTERN void setType(const std::string&); - - QPID_MESSAGING_EXTERN std::string str() const; - QPID_MESSAGING_EXTERN operator bool() const; - QPID_MESSAGING_EXTERN bool operator !() const; - private: - AddressImpl* impl; -}; - -QPID_MESSAGING_EXTERN std::ostream& operator<<(std::ostream& out, const Address& address); - -}} // namespace qpid::messaging - -#endif /*!QPID_MESSAGING_ADDRESS_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/messaging/Connection.h b/nativeLib/org.apache.qpid/include/qpid/messaging/Connection.h deleted file mode 100644 index 6f2cd54b4b..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/messaging/Connection.h +++ /dev/null @@ -1,109 +0,0 @@ -#ifndef QPID_MESSAGING_CONNECTION_H -#define QPID_MESSAGING_CONNECTION_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#include "qpid/messaging/ImportExport.h" - -#include "qpid/messaging/Handle.h" -#include "qpid/messaging/exceptions.h" -#include "qpid/types/Variant.h" - -#include - -namespace qpid { -namespace messaging { - -template class PrivateImplRef; -class ConnectionImpl; -class Session; - -/** \ingroup messaging - * A connection represents a network connection to a remote endpoint. - */ - -class Connection : public qpid::messaging::Handle -{ - public: - QPID_MESSAGING_EXTERN Connection(ConnectionImpl* impl); - QPID_MESSAGING_EXTERN Connection(const Connection&); - QPID_MESSAGING_EXTERN Connection(); - /** - * Current implementation supports the following options: - * - * username - * password - * heartbeat - * tcp-nodelay - * sasl-mechanism - * sasl-service - * sasl-min-ssf - * sasl-max-ssf - * transport - * - * Reconnect behaviour can be controlled through the following options: - * - * reconnect: true/false (enables/disables reconnect entirely) - * reconnect-timeout: number of seconds (give up and report failure after specified time) - * reconnect-limit: n (give up and report failure after specified number of attempts) - * reconnect-interval-min: number of seconds (initial delay between failed reconnection attempts) - * reconnect-interval-max: number of seconds (maximum delay between failed reconnection attempts) - * reconnect-interval: shorthand for setting the same reconnect_interval_min/max - * reconnect-urls: list of alternate urls to try when connecting - * - * The reconnect-interval is the time that the client waits - * for after a failed attempt to reconnect before retrying. It - * starts at the value of the min-retry-interval and is - * doubled every failure until the value of max-retry-interval - * is reached. - */ - QPID_MESSAGING_EXTERN Connection(const std::string& url, const qpid::types::Variant::Map& options = qpid::types::Variant::Map()); - /** - * Creates a connection using an option string of the form - * {name:value,name2:value2...}, see above for options supported. - * - * @exception InvalidOptionString if the string does not match the correct syntax - */ - QPID_MESSAGING_EXTERN Connection(const std::string& url, const std::string& options); - QPID_MESSAGING_EXTERN ~Connection(); - QPID_MESSAGING_EXTERN Connection& operator=(const Connection&); - QPID_MESSAGING_EXTERN void setOption(const std::string& name, const qpid::types::Variant& value); - QPID_MESSAGING_EXTERN void open(); - QPID_MESSAGING_EXTERN bool isOpen(); - /** - * Closes a connection and all sessions associated with it. An - * opened connection must be closed before the last handle is - * allowed to go out of scope. - */ - QPID_MESSAGING_EXTERN void close(); - QPID_MESSAGING_EXTERN Session createTransactionalSession(const std::string& name = std::string()); - QPID_MESSAGING_EXTERN Session createSession(const std::string& name = std::string()); - - QPID_MESSAGING_EXTERN Session getSession(const std::string& name) const; - QPID_MESSAGING_EXTERN std::string getAuthenticatedUsername(); - private: - friend class qpid::messaging::PrivateImplRef; - -}; - -}} // namespace qpid::messaging - -#endif /*!QPID_MESSAGING_CONNECTION_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/messaging/Duration.h b/nativeLib/org.apache.qpid/include/qpid/messaging/Duration.h deleted file mode 100644 index abcf169090..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/messaging/Duration.h +++ /dev/null @@ -1,55 +0,0 @@ -#ifndef QPID_MESSAGING_DURATION_H -#define QPID_MESSAGING_DURATION_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include "qpid/messaging/ImportExport.h" - -#include "qpid/sys/IntegerTypes.h" - -namespace qpid { -namespace messaging { - -/** \ingroup messaging - * A duration is a time in milliseconds. - */ -class Duration -{ - public: - QPID_MESSAGING_EXTERN explicit Duration(uint64_t milliseconds); - QPID_MESSAGING_EXTERN uint64_t getMilliseconds() const; - QPID_MESSAGING_EXTERN static const Duration FOREVER; - QPID_MESSAGING_EXTERN static const Duration IMMEDIATE; - QPID_MESSAGING_EXTERN static const Duration SECOND; - QPID_MESSAGING_EXTERN static const Duration MINUTE; - private: - uint64_t milliseconds; -}; - -QPID_MESSAGING_EXTERN Duration operator*(const Duration& duration, - uint64_t multiplier); -QPID_MESSAGING_EXTERN Duration operator*(uint64_t multiplier, - const Duration& duration); - -}} // namespace qpid::messaging - -#endif /*!QPID_MESSAGING_DURATION_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/messaging/FailoverUpdates.h b/nativeLib/org.apache.qpid/include/qpid/messaging/FailoverUpdates.h deleted file mode 100644 index fb9d106557..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/messaging/FailoverUpdates.h +++ /dev/null @@ -1,49 +0,0 @@ -#ifndef QPID_CLIENT_AMQP0_10_FAILOVERUPDATES_H -#define QPID_CLIENT_AMQP0_10_FAILOVERUPDATES_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#include "qpid/messaging/ImportExport.h" - -namespace qpid { -namespace messaging { -class Connection; -class FailoverUpdatesImpl; - -/** - * A utility to listen for updates on cluster membership and update - * the list of known urls for a connection accordingly. - */ -class FailoverUpdates -{ - public: - QPID_MESSAGING_EXTERN FailoverUpdates(Connection& connection); - QPID_MESSAGING_EXTERN ~FailoverUpdates(); - private: - FailoverUpdatesImpl* impl; - - //no need to copy instances of this class - FailoverUpdates(const FailoverUpdates&); - FailoverUpdates& operator=(const FailoverUpdates&); -}; -}} // namespace qpid::messaging - -#endif /*!QPID_CLIENT_AMQP0_10_FAILOVERUPDATES_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/messaging/Handle.h b/nativeLib/org.apache.qpid/include/qpid/messaging/Handle.h deleted file mode 100644 index 1e634ef888..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/messaging/Handle.h +++ /dev/null @@ -1,71 +0,0 @@ -#ifndef QPID_MESSAGING_HANDLE_H -#define QPID_MESSAGING_HANDLE_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include "qpid/messaging/ImportExport.h" - -namespace qpid { -namespace messaging { - -template class PrivateImplRef; - -/** \ingroup messaging - * A handle is like a pointer: refers to an underlying implementation object. - * Copying the handle does not copy the object. - * - * Handles can be null, like a 0 pointer. Use isValid(), isNull() or the - * conversion to bool to test for a null handle. - */ -template class Handle { - public: - - /**@return true if handle is valid, i.e. not null. */ - QPID_MESSAGING_EXTERN bool isValid() const { return impl; } - - /**@return true if handle is null. It is an error to call any function on a null handle. */ - QPID_MESSAGING_EXTERN bool isNull() const { return !impl; } - - /** Conversion to bool supports idiom if (handle) { handle->... } */ - QPID_MESSAGING_EXTERN operator bool() const { return impl; } - - /** Operator ! supports idiom if (!handle) { do_if_handle_is_null(); } */ - QPID_MESSAGING_EXTERN bool operator !() const { return !impl; } - - void swap(Handle& h) { T* t = h.impl; h.impl = impl; impl = t; } - - protected: - typedef T Impl; - QPID_MESSAGING_EXTERN Handle() :impl() {} - - // Not implemented,subclasses must implement. - QPID_MESSAGING_EXTERN Handle(const Handle&); - QPID_MESSAGING_EXTERN Handle& operator=(const Handle&); - - Impl* impl; - - friend class PrivateImplRef; -}; - -}} // namespace qpid::messaging - -#endif /*!QPID_MESSAGING_HANDLE_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/messaging/ImportExport.h b/nativeLib/org.apache.qpid/include/qpid/messaging/ImportExport.h deleted file mode 100644 index 52f3eb8568..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/messaging/ImportExport.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef QPID_MESSAGING_IMPORTEXPORT_H -#define QPID_MESSAGING_IMPORTEXPORT_H - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -#if defined(WIN32) && !defined(QPID_DECLARE_STATIC) -#if defined(CLIENT_EXPORT) || defined (qpidmessaging_EXPORTS) -#define QPID_MESSAGING_EXTERN __declspec(dllexport) -#else -#define QPID_MESSAGING_EXTERN __declspec(dllimport) -#endif -#else -#define QPID_MESSAGING_EXTERN -#endif - -#endif /*!QPID_MESSAGING_IMPORTEXPORT_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/messaging/Message.h b/nativeLib/org.apache.qpid/include/qpid/messaging/Message.h deleted file mode 100644 index ba58b5887c..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/messaging/Message.h +++ /dev/null @@ -1,164 +0,0 @@ -#ifndef QPID_MESSAGING_MESSAGE_H -#define QPID_MESSAGING_MESSAGE_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#include "qpid/messaging/ImportExport.h" - -#include "qpid/messaging/Duration.h" -#include "qpid/types/Exception.h" -#include "qpid/types/Variant.h" - -#include - -namespace qpid { -namespace messaging { - -class Address; -class Codec; -struct MessageImpl; - -/** \ingroup messaging - * Representation of a message. - */ -class Message -{ - public: - QPID_MESSAGING_EXTERN Message(const std::string& bytes = std::string()); - QPID_MESSAGING_EXTERN Message(const char*, size_t); - QPID_MESSAGING_EXTERN Message(const Message&); - QPID_MESSAGING_EXTERN ~Message(); - - QPID_MESSAGING_EXTERN Message& operator=(const Message&); - - QPID_MESSAGING_EXTERN void setReplyTo(const Address&); - QPID_MESSAGING_EXTERN const Address& getReplyTo() const; - - QPID_MESSAGING_EXTERN void setSubject(const std::string&); - QPID_MESSAGING_EXTERN const std::string& getSubject() const; - - QPID_MESSAGING_EXTERN void setContentType(const std::string&); - QPID_MESSAGING_EXTERN const std::string& getContentType() const; - - QPID_MESSAGING_EXTERN void setMessageId(const std::string&); - QPID_MESSAGING_EXTERN const std::string& getMessageId() const; - - QPID_MESSAGING_EXTERN void setUserId(const std::string&); - QPID_MESSAGING_EXTERN const std::string& getUserId() const; - - QPID_MESSAGING_EXTERN void setCorrelationId(const std::string&); - QPID_MESSAGING_EXTERN const std::string& getCorrelationId() const; - - QPID_MESSAGING_EXTERN void setPriority(uint8_t); - QPID_MESSAGING_EXTERN uint8_t getPriority() const; - - /** - * Set the time to live for this message in milliseconds. - */ - QPID_MESSAGING_EXTERN void setTtl(Duration ttl); - /** - *Get the time to live for this message in milliseconds. - */ - QPID_MESSAGING_EXTERN Duration getTtl() const; - - QPID_MESSAGING_EXTERN void setDurable(bool durable); - QPID_MESSAGING_EXTERN bool getDurable() const; - - QPID_MESSAGING_EXTERN bool getRedelivered() const; - QPID_MESSAGING_EXTERN void setRedelivered(bool); - - QPID_MESSAGING_EXTERN const qpid::types::Variant::Map& getProperties() const; - QPID_MESSAGING_EXTERN qpid::types::Variant::Map& getProperties(); - - QPID_MESSAGING_EXTERN void setContent(const std::string&); - /** - * Note that chars are copied. - */ - QPID_MESSAGING_EXTERN void setContent(const char* chars, size_t count); - - /** Get the content as a std::string */ - QPID_MESSAGING_EXTERN std::string getContent() const; - /** Get a const pointer to the start of the content data. */ - QPID_MESSAGING_EXTERN const char* getContentPtr() const; - /** Get the size of content in bytes. */ - QPID_MESSAGING_EXTERN size_t getContentSize() const; - private: - MessageImpl* impl; - friend struct MessageImplAccess; -}; - -struct EncodingException : qpid::types::Exception -{ - EncodingException(const std::string& msg); -}; - -/** - * Decodes message content into a Variant::Map. - * - * @param message the message whose content should be decoded - * @param map the map into which the message contents will be decoded - * @param encoding if specified, the encoding to use - this overrides - * any encoding specified by the content-type of the message - * @exception EncodingException - */ -QPID_MESSAGING_EXTERN void decode(const Message& message, - qpid::types::Variant::Map& map, - const std::string& encoding = std::string()); -/** - * Decodes message content into a Variant::List. - * - * @param message the message whose content should be decoded - * @param list the list into which the message contents will be decoded - * @param encoding if specified, the encoding to use - this overrides - * any encoding specified by the content-type of the message - * @exception EncodingException - */ -QPID_MESSAGING_EXTERN void decode(const Message& message, - qpid::types::Variant::List& list, - const std::string& encoding = std::string()); -/** - * Encodes a Variant::Map into a message. - * - * @param map the map to be encoded - * @param message the message whose content should be set to the encoded map - * @param encoding if specified, the encoding to use - this overrides - * any encoding specified by the content-type of the message - * @exception EncodingException - */ -QPID_MESSAGING_EXTERN void encode(const qpid::types::Variant::Map& map, - Message& message, - const std::string& encoding = std::string()); -/** - * Encodes a Variant::List into a message. - * - * @param list the list to be encoded - * @param message the message whose content should be set to the encoded list - * @param encoding if specified, the encoding to use - this overrides - * any encoding specified by the content-type of the message - * @exception EncodingException - */ -QPID_MESSAGING_EXTERN void encode(const qpid::types::Variant::List& list, - Message& message, - const std::string& encoding = std::string()); - -}} // namespace qpid::messaging - -#endif /*!QPID_MESSAGING_MESSAGE_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/messaging/Receiver.h b/nativeLib/org.apache.qpid/include/qpid/messaging/Receiver.h deleted file mode 100644 index a1129975cf..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/messaging/Receiver.h +++ /dev/null @@ -1,140 +0,0 @@ -#ifndef QPID_MESSAGING_RECEIVER_H -#define QPID_MESSAGING_RECEIVER_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#include "qpid/messaging/ImportExport.h" - -#include "qpid/messaging/exceptions.h" -#include "qpid/messaging/Handle.h" -#include "qpid/messaging/Duration.h" - -namespace qpid { -namespace messaging { - -template class PrivateImplRef; - -class Message; -class ReceiverImpl; -class Session; - -/** \ingroup messaging - * Interface through which messages are received. - */ -class Receiver : public qpid::messaging::Handle -{ - public: - QPID_MESSAGING_EXTERN Receiver(ReceiverImpl* impl = 0); - QPID_MESSAGING_EXTERN Receiver(const Receiver&); - QPID_MESSAGING_EXTERN ~Receiver(); - QPID_MESSAGING_EXTERN Receiver& operator=(const Receiver&); - /** - * Retrieves a message from this receivers local queue, or waits - * for upto the specified timeout for a message to become - * available. - */ - QPID_MESSAGING_EXTERN bool get(Message& message, Duration timeout=Duration::FOREVER); - /** - * Retrieves a message from this receivers local queue, or waits - * for up to the specified timeout for a message to become - * available. - * - * @exception NoMessageAvailable if there is no message to give - * after waiting for the specified timeout, or if the Receiver is - * closed, in which case isClose() will be true. - */ - QPID_MESSAGING_EXTERN Message get(Duration timeout=Duration::FOREVER); - /** - * Retrieves a message for this receivers subscription or waits - * for up to the specified timeout for one to become - * available. Unlike get() this method will check with the server - * that there is no message for the subscription this receiver is - * serving before returning false. - * - * @return false if there is no message to give after - * waiting for the specified timeout, or if the Receiver is - * closed, in which case isClose() will be true. - */ - QPID_MESSAGING_EXTERN bool fetch(Message& message, Duration timeout=Duration::FOREVER); - /** - * Retrieves a message for this receivers subscription or waits - * for up to the specified timeout for one to become - * available. Unlike get() this method will check with the server - * that there is no message for the subscription this receiver is - * serving before throwing an exception. - * - * @exception NoMessageAvailable if there is no message to give - * after waiting for the specified timeout, or if the Receiver is - * closed, in which case isClose() will be true. - */ - QPID_MESSAGING_EXTERN Message fetch(Duration timeout=Duration::FOREVER); - /** - * Sets the capacity for the receiver. The capacity determines how - * many incoming messages can be held in the receiver before being - * requested by a client via fetch() (or pushed to a listener). - */ - QPID_MESSAGING_EXTERN void setCapacity(uint32_t); - /** - * @return the capacity of the receiver. The capacity determines - * how many incoming messages can be held in the receiver before - * being requested by a client via fetch() (or pushed to a - * listener). - */ - QPID_MESSAGING_EXTERN uint32_t getCapacity(); - /** - * @return the number of messages received and waiting to be - * fetched. - */ - QPID_MESSAGING_EXTERN uint32_t getAvailable(); - /** - * @return a count of the number of messages received on this - * receiver that have been acknowledged, but for which that - * acknowledgement has not yet been confirmed as processed by the - * server. - */ - QPID_MESSAGING_EXTERN uint32_t getUnsettled(); - - /** - * Cancels this receiver. - */ - QPID_MESSAGING_EXTERN void close(); - - /** - * Return true if the receiver was closed by a call to close() - */ - QPID_MESSAGING_EXTERN bool isClosed() const; - - /** - * Returns the name of this receiver. - */ - QPID_MESSAGING_EXTERN const std::string& getName() const; - - /** - * Returns a handle to the session associated with this receiver. - */ - QPID_MESSAGING_EXTERN Session getSession() const; - - private: - friend class qpid::messaging::PrivateImplRef; -}; -}} // namespace qpid::messaging - -#endif /*!QPID_MESSAGING_RECEIVER_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/messaging/Sender.h b/nativeLib/org.apache.qpid/include/qpid/messaging/Sender.h deleted file mode 100644 index 80ebf517a4..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/messaging/Sender.h +++ /dev/null @@ -1,95 +0,0 @@ -#ifndef QPID_MESSAGING_SENDER_H -#define QPID_MESSAGING_SENDER_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#include "qpid/messaging/ImportExport.h" - -#include "qpid/messaging/Handle.h" -#include "qpid/sys/IntegerTypes.h" - -#include - -namespace qpid { -namespace messaging { - -template class PrivateImplRef; -class Message; -class SenderImpl; -class Session; -/** \ingroup messaging - * Interface through which messages are sent. - */ -class Sender : public qpid::messaging::Handle -{ - public: - QPID_MESSAGING_EXTERN Sender(SenderImpl* impl = 0); - QPID_MESSAGING_EXTERN Sender(const Sender&); - QPID_MESSAGING_EXTERN ~Sender(); - QPID_MESSAGING_EXTERN Sender& operator=(const Sender&); - - /** - * Sends a message - * - * @param message the message to send - * @param sync if true the call will block until the server - * confirms receipt of the messages; if false will only block for - * available capacity (i.e. pending == capacity) - */ - QPID_MESSAGING_EXTERN void send(const Message& message, bool sync=false); - QPID_MESSAGING_EXTERN void close(); - - /** - * Sets the capacity for the sender. The capacity determines how - * many outgoing messages can be held pending confirmation of - * receipt by the broker. - */ - QPID_MESSAGING_EXTERN void setCapacity(uint32_t); - /** - * Returns the capacity of the sender. - * @see setCapacity - */ - QPID_MESSAGING_EXTERN uint32_t getCapacity(); - /** - * Returns the number of sent messages pending confirmation of - * receipt by the broker. (These are the 'in-doubt' messages). - */ - QPID_MESSAGING_EXTERN uint32_t getUnsettled(); - /** - * Returns the number of messages for which there is available - * capacity. - */ - QPID_MESSAGING_EXTERN uint32_t getAvailable(); - /** - * Returns the name of this sender. - */ - QPID_MESSAGING_EXTERN const std::string& getName() const; - - /** - * Returns a handle to the session associated with this sender. - */ - QPID_MESSAGING_EXTERN Session getSession() const; - private: - friend class qpid::messaging::PrivateImplRef; -}; -}} // namespace qpid::messaging - -#endif /*!QPID_MESSAGING_SENDER_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/messaging/Session.h b/nativeLib/org.apache.qpid/include/qpid/messaging/Session.h deleted file mode 100644 index 34fccdb868..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/messaging/Session.h +++ /dev/null @@ -1,169 +0,0 @@ -#ifndef QPID_MESSAGING_SESSION_H -#define QPID_MESSAGING_SESSION_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#include "qpid/messaging/ImportExport.h" - -#include "qpid/messaging/exceptions.h" -#include "qpid/messaging/Duration.h" -#include "qpid/messaging/Handle.h" - -#include - -namespace qpid { -namespace messaging { - -template class PrivateImplRef; -class Address; -class Connection; -class Message; -class MessageListener; -class Sender; -class Receiver; -class SessionImpl; -class Subscription; - -/** \ingroup messaging - * A session represents a distinct 'conversation' which can involve - * sending and receiving messages to and from different addresses. - */ -class Session : public qpid::messaging::Handle -{ - public: - QPID_MESSAGING_EXTERN Session(SessionImpl* impl = 0); - QPID_MESSAGING_EXTERN Session(const Session&); - QPID_MESSAGING_EXTERN ~Session(); - QPID_MESSAGING_EXTERN Session& operator=(const Session&); - - /** - * Closes a session and all associated senders and receivers. An - * opened session should be closed before the last handle to it - * goes out of scope. All a connections sessions can be closed by - * a call to Connection::close(). - */ - QPID_MESSAGING_EXTERN void close(); - - QPID_MESSAGING_EXTERN void commit(); - QPID_MESSAGING_EXTERN void rollback(); - - /** - * Acknowledges all outstanding messages that have been received - * by the application on this session. - * - * @param sync if true, blocks until the acknowledgement has been - * processed by the server - */ - QPID_MESSAGING_EXTERN void acknowledge(bool sync=false); - /** - * Rejects the specified message. This will prevent the message - * being redelivered. This must be called before the message is - * acknowledged. - */ - QPID_MESSAGING_EXTERN void reject(Message&); - /** - * Releases the specified message. This will allow the broker to - * redeliver the message. This must be called before the message - * is acknowledged. - */ - QPID_MESSAGING_EXTERN void release(Message&); - - /** - * Request synchronisation with the server. - * - * @param block if true, this call will block until the server - * confirms completion of all pending operations; if false the - * call will request notifcation from the server but will return - * before receiving it. - */ - QPID_MESSAGING_EXTERN void sync(bool block=true); - - /** - * Returns the total number of messages received and waiting to be - * fetched by all Receivers belonging to this session. This is the - * total number of available messages across all receivers on this - * session. - */ - QPID_MESSAGING_EXTERN uint32_t getReceivable(); - /** - * Returns a count of the number of messages received this session - * that have been acknowledged, but for which that acknowledgement - * has not yet been confirmed as processed by the server. - */ - QPID_MESSAGING_EXTERN uint32_t getUnsettledAcks(); - /** - * Retrieves the receiver for the next available message. If there - * are no available messages at present the call will block for up - * to the specified timeout waiting for one to arrive. Returns - * true if a message was available at the point of return, in - * which case the passed in receiver reference will be set to the - * receiver for that message or false if no message was available. - */ - QPID_MESSAGING_EXTERN bool nextReceiver(Receiver&, Duration timeout=Duration::FOREVER); - /** - * Returns the receiver for the next available message. If there - * are no available messages at present the call will block for up - * to the specified timeout waiting for one to arrive. - * - * @exception Receiver::NoMessageAvailable if no message became - * available in time. - */ - QPID_MESSAGING_EXTERN Receiver nextReceiver(Duration timeout=Duration::FOREVER); - - /** - * Create a new sender through which messages can be sent to the - * specified address. - */ - QPID_MESSAGING_EXTERN Sender createSender(const Address& address); - QPID_MESSAGING_EXTERN Sender createSender(const std::string& address); - - /** - * Create a new receiver through which messages can be received - * from the specified address. - */ - QPID_MESSAGING_EXTERN Receiver createReceiver(const Address& address); - QPID_MESSAGING_EXTERN Receiver createReceiver(const std::string& address); - - /** - * Returns the sender with the specified name. - *@exception KeyError if there is none for that name. - */ - QPID_MESSAGING_EXTERN Sender getSender(const std::string& name) const; - /** - * Returns the receiver with the specified name. - *@exception KeyError if there is none for that name. - */ - QPID_MESSAGING_EXTERN Receiver getReceiver(const std::string& name) const; - /** - * Returns a handle to the connection this session is associated - * with. - */ - QPID_MESSAGING_EXTERN Connection getConnection() const; - - QPID_MESSAGING_EXTERN bool hasError(); - QPID_MESSAGING_EXTERN void checkError(); - - private: - friend class qpid::messaging::PrivateImplRef; -}; -}} // namespace qpid::messaging - -#endif /*!QPID_MESSAGING_SESSION_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/messaging/exceptions.h b/nativeLib/org.apache.qpid/include/qpid/messaging/exceptions.h deleted file mode 100644 index 0ff608b343..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/messaging/exceptions.h +++ /dev/null @@ -1,153 +0,0 @@ -#ifndef QPID_MESSAGING_EXCEPTIONS_H -#define QPID_MESSAGING_EXCEPTIONS_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include "qpid/messaging/ImportExport.h" -#include "qpid/types/Exception.h" -#include "qpid/types/Variant.h" - -namespace qpid { -namespace messaging { - -/** \ingroup messaging - */ - -struct MessagingException : public qpid::types::Exception -{ - QPID_MESSAGING_EXTERN MessagingException(const std::string& msg); - QPID_MESSAGING_EXTERN virtual ~MessagingException() throw(); - - qpid::types::Variant::Map detail; - //TODO: override what() to include detail if present -}; - -struct InvalidOptionString : public MessagingException -{ - QPID_MESSAGING_EXTERN InvalidOptionString(const std::string& msg); -}; - -struct KeyError : public MessagingException -{ - QPID_MESSAGING_EXTERN KeyError(const std::string&); -}; - -struct LinkError : public MessagingException -{ - QPID_MESSAGING_EXTERN LinkError(const std::string&); -}; - -struct AddressError : public LinkError -{ - QPID_MESSAGING_EXTERN AddressError(const std::string&); -}; - -/** - * Thrown when a syntactically correct address cannot be resolved or - * used. - */ -struct ResolutionError : public AddressError -{ - QPID_MESSAGING_EXTERN ResolutionError(const std::string& msg); -}; - -struct AssertionFailed : public ResolutionError -{ - QPID_MESSAGING_EXTERN AssertionFailed(const std::string& msg); -}; - -struct NotFound : public ResolutionError -{ - QPID_MESSAGING_EXTERN NotFound(const std::string& msg); -}; - -/** - * Thrown when an address string with inalid sytanx is used. - */ -struct MalformedAddress : public AddressError -{ - QPID_MESSAGING_EXTERN MalformedAddress(const std::string& msg); -}; - -struct ReceiverError : public LinkError -{ - QPID_MESSAGING_EXTERN ReceiverError(const std::string&); -}; - -struct FetchError : public ReceiverError -{ - QPID_MESSAGING_EXTERN FetchError(const std::string&); -}; - -struct NoMessageAvailable : public FetchError -{ - QPID_MESSAGING_EXTERN NoMessageAvailable(); -}; - -struct SenderError : public LinkError -{ - QPID_MESSAGING_EXTERN SenderError(const std::string&); -}; - -struct SendError : public SenderError -{ - QPID_MESSAGING_EXTERN SendError(const std::string&); -}; - -struct TargetCapacityExceeded : public SendError -{ - QPID_MESSAGING_EXTERN TargetCapacityExceeded(const std::string&); -}; - -struct SessionError : public MessagingException -{ - QPID_MESSAGING_EXTERN SessionError(const std::string&); -}; - -struct TransactionError : public SessionError -{ - QPID_MESSAGING_EXTERN TransactionError(const std::string&); -}; - -struct TransactionAborted : public TransactionError -{ - QPID_MESSAGING_EXTERN TransactionAborted(const std::string&); -}; - -struct UnauthorizedAccess : public SessionError -{ - QPID_MESSAGING_EXTERN UnauthorizedAccess(const std::string&); -}; - -struct ConnectionError : public MessagingException -{ - QPID_MESSAGING_EXTERN ConnectionError(const std::string&); -}; - -struct TransportFailure : public MessagingException -{ - QPID_MESSAGING_EXTERN TransportFailure(const std::string&); -}; - -}} // namespace qpid::messaging - -#endif /*!QPID_MESSAGING_EXCEPTIONS_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/sys/Condition.h b/nativeLib/org.apache.qpid/include/qpid/sys/Condition.h deleted file mode 100644 index 9be4b357fe..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/sys/Condition.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef _sys_Condition_h -#define _sys_Condition_h - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#ifdef USE_APR_PLATFORM -#include "apr/Condition.h" -#elif defined (_WIN32) -#include "windows/Condition.h" -#else -#include "posix/Condition.h" -#endif - -#endif /*!_sys_Condition_h*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/sys/ExceptionHolder.h b/nativeLib/org.apache.qpid/include/qpid/sys/ExceptionHolder.h deleted file mode 100644 index 9eff1d64c7..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/sys/ExceptionHolder.h +++ /dev/null @@ -1,74 +0,0 @@ -#ifndef QPID_EXCEPTIONHOLDER_H -#define QPID_EXCEPTIONHOLDER_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include - - -namespace qpid { -namespace sys { - -struct Raisable { - virtual ~Raisable() {}; - virtual void raise() const=0; - virtual std::string what() const=0; -}; - -/** - * Holder for exceptions. Allows the thread that notices an error condition to - * create an exception and store it to be thrown by another thread. - */ -class ExceptionHolder : public Raisable { - public: - ExceptionHolder() {} - // Use default copy & assign. - - /** Take ownership of ex */ - template ExceptionHolder(Ex* ex) { wrap(ex); } - template ExceptionHolder(const boost::shared_ptr& ex) { wrap(ex.release()); } - - template ExceptionHolder& operator=(Ex* ex) { wrap(ex); return *this; } - template ExceptionHolder& operator=(boost::shared_ptr ex) { wrap(ex.release()); return *this; } - - void raise() const { if (wrapper.get()) wrapper->raise() ; } - std::string what() const { return wrapper.get() ? wrapper->what() : std::string(); } - bool empty() const { return !wrapper.get(); } - operator bool() const { return !empty(); } - void reset() { wrapper.reset(); } - - private: - template struct Wrapper : public Raisable { - Wrapper(Ex* ptr) : exception(ptr) {} - void raise() const { throw *exception; } - std::string what() const { return exception->what(); } - boost::shared_ptr exception; - }; - template void wrap(Ex* ex) { wrapper.reset(new Wrapper(ex)); } - boost::shared_ptr wrapper; -}; - - -}} // namespace qpid::sys - - -#endif /*!QPID_EXCEPTIONHOLDER_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/sys/IOHandle.h b/nativeLib/org.apache.qpid/include/qpid/sys/IOHandle.h deleted file mode 100644 index 45fc8c240a..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/sys/IOHandle.h +++ /dev/null @@ -1,49 +0,0 @@ -#ifndef _sys_IOHandle_h -#define _sys_IOHandle_h - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace sys { - -/** - * This is a class intended to abstract the Unix concept of file descriptor - * or the Windows concept of HANDLE - */ -class PollerHandle; -class IOHandlePrivate; -class IOHandle { - friend class PollerHandle; - friend class IOHandlePrivate; - -protected: - IOHandlePrivate* const impl; - - IOHandle(IOHandlePrivate*); - QPID_COMMON_EXTERN virtual ~IOHandle(); -}; - -}} - -#endif // _sys_IOHandle_h diff --git a/nativeLib/org.apache.qpid/include/qpid/sys/IntegerTypes.h b/nativeLib/org.apache.qpid/include/qpid/sys/IntegerTypes.h deleted file mode 100644 index 89635f033e..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/sys/IntegerTypes.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef QPID_SYS_INTEGERTYPES_H -#define QPID_SYS_INTEGERTYPES_H - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#if (defined(_WINDOWS) || defined (WIN32)) && defined(_MSC_VER) -#include "qpid/sys/windows/IntegerTypes.h" -#endif -#if !defined _WINDOWS && !defined WIN32 -#include "qpid/sys/posix/IntegerTypes.h" -#endif - -#endif /*!QPID_SYS_INTEGERTYPES_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/sys/Monitor.h b/nativeLib/org.apache.qpid/include/qpid/sys/Monitor.h deleted file mode 100644 index 123bf92dcb..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/sys/Monitor.h +++ /dev/null @@ -1,49 +0,0 @@ -#ifndef _sys_Monitor_h -#define _sys_Monitor_h - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include "qpid/sys/Condition.h" - -namespace qpid { -namespace sys { - -/** - * A monitor is a condition variable and a mutex - */ -class Monitor : public Mutex, public Condition { - public: - inline void wait(); - inline bool wait(const AbsTime& absoluteTime); -}; - - -void Monitor::wait() { - Condition::wait(*this); -} - -bool Monitor::wait(const AbsTime& absoluteTime) { - return Condition::wait(*this, absoluteTime); -} - -}} -#endif /*!_sys_Monitor_h*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/sys/Mutex.h b/nativeLib/org.apache.qpid/include/qpid/sys/Mutex.h deleted file mode 100644 index 43a83d4fc3..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/sys/Mutex.h +++ /dev/null @@ -1,91 +0,0 @@ -#ifndef _sys_Mutex_h -#define _sys_Mutex_h - -/* - * - * Copyright (c) 2006 The Apache Software Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -namespace qpid { -namespace sys { - -/** - * Scoped lock template: calls lock() in ctor, unlock() in dtor. - * L can be any class with lock() and unlock() functions. - */ -template -class ScopedLock -{ - public: - ScopedLock(L& l) : mutex(l) { l.lock(); } - ~ScopedLock() { mutex.unlock(); } - private: - L& mutex; -}; - -template -class ScopedUnlock -{ - public: - ScopedUnlock(L& l) : mutex(l) { l.unlock(); } - ~ScopedUnlock() { mutex.lock(); } - private: - L& mutex; -}; - -template -class ScopedRlock -{ - public: - ScopedRlock(L& l) : mutex(l) { l.rlock(); } - ~ScopedRlock() { mutex.unlock(); } - private: - L& mutex; -}; - -template -class ScopedWlock -{ - public: - ScopedWlock(L& l) : mutex(l) { l.wlock(); } - ~ScopedWlock() { mutex.unlock(); } - private: - L& mutex; -}; - -template -class ConditionalScopedLock -{ - public: - ConditionalScopedLock(L& l) : mutex(l) { acquired = l.trylock(); } - ~ConditionalScopedLock() { if (acquired) mutex.unlock(); } - bool lockAcquired() { return acquired; } - private: - L& mutex; - bool acquired; -}; - -}} - -#ifdef USE_APR_PLATFORM -#include "apr/Mutex.h" -#elif defined (_WIN32) -#include "windows/Mutex.h" -#else -#include "posix/Mutex.h" -#endif - -#endif /*!_sys_Mutex_h*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/sys/Runnable.h b/nativeLib/org.apache.qpid/include/qpid/sys/Runnable.h deleted file mode 100644 index 0f1243a277..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/sys/Runnable.h +++ /dev/null @@ -1,51 +0,0 @@ -#ifndef _Runnable_ -#define _Runnable_ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace sys { - -/** - * Interface for objects that can be run, e.g. in a thread. - */ -class Runnable -{ - public: - /** Type to represent a runnable as a Functor */ - typedef boost::function0 Functor; - - QPID_COMMON_EXTERN virtual ~Runnable(); - - /** Derived classes override run(). */ - virtual void run() = 0; - - /** Create a functor object that will call this->run(). */ - Functor functor(); -}; - -}} - - -#endif diff --git a/nativeLib/org.apache.qpid/include/qpid/sys/StrError.h b/nativeLib/org.apache.qpid/include/qpid/sys/StrError.h deleted file mode 100644 index 36489dd0fc..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/sys/StrError.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef _sys_StrError_h -#define _sys_StrError_h - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include -#include "qpid/CommonImportExport.h" - -namespace qpid { -namespace sys { - -/** Get the error message for a system number err, e.g. errno. */ -QPID_COMMON_EXTERN std::string strError(int err); - -}} // namespace qpid - -#endif // _sys_StrError_h diff --git a/nativeLib/org.apache.qpid/include/qpid/sys/SystemInfo.h b/nativeLib/org.apache.qpid/include/qpid/sys/SystemInfo.h deleted file mode 100644 index 23594cf650..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/sys/SystemInfo.h +++ /dev/null @@ -1,86 +0,0 @@ -#ifndef QPID_SYS_SYSTEMINFO_H -#define QPID_SYS_SYSTEMINFO_H - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include "qpid/sys/IntegerTypes.h" -#include "qpid/Address.h" -#include "qpid/CommonImportExport.h" -#include - -namespace qpid { -namespace sys { - -/** - * Retrieve information about the system we are running on. - * Results may be dependent on OS/hardware. - */ -namespace SystemInfo { - /** - * Estimate available concurrency, e.g. number of CPU cores. - * -1 means estimate not available on this platform. - */ - QPID_COMMON_EXTERN long concurrency(); - - /** - * Get the local host name and set it in the specified. - * Returns false if it can't be obtained and sets errno to any error value. - */ - QPID_COMMON_EXTERN bool getLocalHostname (Address &address); - - QPID_COMMON_EXTERN void getLocalIpAddresses (uint16_t port, std::vector
&addrList); - - /** - * Retrieve system identifiers and versions. This is information that can - * generally be retrieved via POSIX uname(). - * - * @param osName Receives the OS name; e.g., GNU/Linux or Windows - * @param nodeName Receives the nodename. This may or may not match the - * set hostname from getLocalHostname(). - * @param release Receives the OS release identifier. - * @param version Receives the OS release version (kernel, build, sp, etc.) - * @param machine Receives the hardware type. - */ - QPID_COMMON_EXTERN void getSystemId (std::string &osName, - std::string &nodeName, - std::string &release, - std::string &version, - std::string &machine); - - /** - * Get the process ID of the current process. - */ - QPID_COMMON_EXTERN uint32_t getProcessId(); - - /** - * Get the process ID of the parent of the current process. - */ - QPID_COMMON_EXTERN uint32_t getParentProcessId(); - - /** - * Get the name of the current process (i.e. the name of the executable) - */ - QPID_COMMON_EXTERN std::string getProcessName(); - - -}}} // namespace qpid::sys::SystemInfo - -#endif /*!QPID_SYS_SYSTEMINFO_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/sys/Thread.h b/nativeLib/org.apache.qpid/include/qpid/sys/Thread.h deleted file mode 100644 index 45a39e796f..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/sys/Thread.h +++ /dev/null @@ -1,67 +0,0 @@ -#ifndef _sys_Thread_h -#define _sys_Thread_h - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#include -#include "qpid/CommonImportExport.h" - -#ifdef _WIN32 -# define QPID_TSS __declspec(thread) -#elif defined (__GNUC__) -# define QPID_TSS __thread -#elif defined (__SUNPRO_CC) -# define QPID_TSS __thread -#else -# error "Dont know how to define QPID_TSS for this platform" -#endif - -namespace qpid { -namespace sys { - -class Runnable; -class ThreadPrivate; - -class Thread -{ - boost::shared_ptr impl; - - public: - QPID_COMMON_EXTERN Thread(); - QPID_COMMON_EXTERN explicit Thread(qpid::sys::Runnable*); - QPID_COMMON_EXTERN explicit Thread(qpid::sys::Runnable&); - - QPID_COMMON_EXTERN operator bool(); - QPID_COMMON_EXTERN bool operator==(const Thread&) const; - QPID_COMMON_EXTERN bool operator!=(const Thread&) const; - - QPID_COMMON_EXTERN void join(); - - QPID_COMMON_EXTERN static Thread current(); - - /** ID of current thread for logging. - * Workaround for broken Thread::current() in APR - */ - QPID_COMMON_EXTERN static unsigned long logId(); -}; - -}} -#endif /*!_sys_Thread_h*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/sys/Time.h b/nativeLib/org.apache.qpid/include/qpid/sys/Time.h deleted file mode 100644 index d3ab832229..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/sys/Time.h +++ /dev/null @@ -1,172 +0,0 @@ -#ifndef _sys_Time_h -#define _sys_Time_h - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include "qpid/sys/IntegerTypes.h" -/* - * The platform defines its notion of time as a TimePrivate type. The - * platform's implementation knows how to handle this type. - */ -#if defined (_WIN32) -# include "windows/Time.h" -#else -# include "posix/Time.h" -#endif - -#include "qpid/CommonImportExport.h" - -#include -#include - -namespace qpid { -namespace sys { - -class Duration; - -/** - * @class AbsTime - * - * Class to represent an instant in time. - * - * The time resolution is in nanosecs, and this is held with 64 bits - * giving a total time span from about 25 million years ago to 25 million - * years hence. As an aside the internal time can sensibly be negative - * meaning before the epoch (probably 1/1/1970 although this class doesn't - * care). - * - * The AbsTime class is a value class and so you don't need to add any - * accessors to its internal state. If you think you want to replace its value, - * you need to construct a new AbsTime and assign it, viz: - * - * AbsTime when = now(); - * ... - * when = AbsTime(when, 2*TIME_SEC); // Advance timer 2 secs - * - * AbsTime is not intended to be used to represent calendar dates/times - * but you can construct a Duration since the Unix Epoch, 1970-1-1-00:00, - * so that you can convert to a date/time if needed: - * - * int64_t nanosec_since_epoch = Duration(EPOCH, now()); - * - * There are some sensible operations that are currently missing from - * AbsTime, but nearly all that's needed can be done with a mixture of - * AbsTimes and Durations. - * - * For example, convenience operators to add a Duration and AbsTime returning - * an AbsTime would fit here (although you can already perform the operation - * with one of the AbsTime constructors). However trying to add 2 AbsTimes - * doesn't make sense. - */ -class AbsTime { - friend class Duration; - friend class Condition; - - TimePrivate timepoint; - -public: - - inline AbsTime() : timepoint() {} - QPID_COMMON_EXTERN AbsTime(const AbsTime& time0, const Duration& duration); - // Default assignment operation fine - // Default copy constructor fine - - QPID_COMMON_EXTERN static AbsTime now(); - QPID_COMMON_EXTERN static AbsTime FarFuture(); - QPID_COMMON_EXTERN static AbsTime Epoch(); - - bool operator==(const AbsTime& t) const { return t.timepoint == timepoint; } - - friend bool operator<(const AbsTime& a, const AbsTime& b); - friend bool operator>(const AbsTime& a, const AbsTime& b); - QPID_COMMON_EXTERN friend std::ostream& operator << (std::ostream&, const AbsTime&); -}; - -QPID_COMMON_EXTERN std::ostream& operator << (std::ostream&, const AbsTime&); - -/** - * @class Duration - * Class to represent the duration between instants of time. - * - * As AbsTime, this class also uses nanosecs for its time - * resolution where possible. For the most part a duration can be dealt - * with like a 64 bit integer, and indeed there is an implicit conversion which - * makes this quite convenient. - */ -class Duration { - static int64_t max() { return std::numeric_limits::max(); } - int64_t nanosecs; - - friend class AbsTime; - -public: - QPID_COMMON_EXTERN inline Duration(int64_t time0 = 0); - QPID_COMMON_EXTERN explicit Duration(const AbsTime& start, const AbsTime& finish); - inline operator int64_t() const; -}; - -std::ostream& operator << (std::ostream&, const Duration&); - -inline AbsTime now() { return AbsTime::now(); } - -inline bool operator<(const AbsTime& a, const AbsTime& b) -{ return a.timepoint < b.timepoint; } -inline bool operator>(const AbsTime& a, const AbsTime& b) -{ return a.timepoint > b.timepoint; } - -Duration::Duration(int64_t time0) : - nanosecs(time0) -{} - -Duration::operator int64_t() const -{ return nanosecs; } - -/** Nanoseconds per second. */ -const Duration TIME_SEC = 1000*1000*1000; -/** Nanoseconds per millisecond */ -const Duration TIME_MSEC = 1000*1000; -/** Nanoseconds per microseconds. */ -const Duration TIME_USEC = 1000; -/** Nanoseconds per nanosecond. */ -const Duration TIME_NSEC = 1; - -/** Value to represent an infinite timeout */ -const Duration TIME_INFINITE = std::numeric_limits::max(); - -/** Absolute time point for the Unix epoch: 1970-01-01T00:00:00 */ -const AbsTime EPOCH = AbsTime::Epoch(); - -/** Time greater than any other time */ -const AbsTime FAR_FUTURE = AbsTime::FarFuture(); - -/** Portable sleep for a number of seconds */ -QPID_COMMON_EXTERN void sleep(int secs); - -/** Portable sleep for a number of microseconds */ -QPID_COMMON_EXTERN void usleep(uint64_t usecs); - -/** Output formatted date/time for now*/ -void outputFormattedNow(std::ostream&); - -}} - -#endif /*!_sys_Time_h*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/sys/posix/Condition.h b/nativeLib/org.apache.qpid/include/qpid/sys/posix/Condition.h deleted file mode 100644 index 36e7557ffd..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/sys/posix/Condition.h +++ /dev/null @@ -1,86 +0,0 @@ -#ifndef _sys_posix_Condition_h -#define _sys_posix_Condition_h - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include "qpid/sys/posix/PrivatePosix.h" - -#include "qpid/sys/Mutex.h" -#include "qpid/sys/Time.h" - -#include -#include -#include - -namespace qpid { -namespace sys { - -/** - * A condition variable for thread synchronization. - */ -class Condition -{ - public: - inline Condition(); - inline ~Condition(); - inline void wait(Mutex&); - inline bool wait(Mutex&, const AbsTime& absoluteTime); - inline void notify(); - inline void notifyAll(); - - private: - pthread_cond_t condition; -}; - -Condition::Condition() { - QPID_POSIX_ASSERT_THROW_IF(pthread_cond_init(&condition, 0)); -} - -Condition::~Condition() { - QPID_POSIX_ABORT_IF(pthread_cond_destroy(&condition)); -} - -void Condition::wait(Mutex& mutex) { - QPID_POSIX_ASSERT_THROW_IF(pthread_cond_wait(&condition, &mutex.mutex)); -} - -bool Condition::wait(Mutex& mutex, const AbsTime& absoluteTime){ - struct timespec ts; - toTimespec(ts, Duration(EPOCH, absoluteTime)); - int status = pthread_cond_timedwait(&condition, &mutex.mutex, &ts); - if (status != 0) { - if (status == ETIMEDOUT) return false; - throw QPID_POSIX_ERROR(status); - } - return true; -} - -void Condition::notify(){ - QPID_POSIX_ASSERT_THROW_IF(pthread_cond_signal(&condition)); -} - -void Condition::notifyAll(){ - QPID_POSIX_ASSERT_THROW_IF(pthread_cond_broadcast(&condition)); -} - -}} -#endif /*!_sys_posix_Condition_h*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/sys/posix/IntegerTypes.h b/nativeLib/org.apache.qpid/include/qpid/sys/posix/IntegerTypes.h deleted file mode 100644 index ce97f7bde8..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/sys/posix/IntegerTypes.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef QPID_SYS_POSIX_INTEGERTYPES_H -#define QPID_SYS_POSIX_INTEGERTYPES_H - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include - -#endif /*!QPID_SYS_INTEGERTYPES_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/sys/posix/Mutex.h b/nativeLib/org.apache.qpid/include/qpid/sys/posix/Mutex.h deleted file mode 100644 index e2b21b5a56..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/sys/posix/Mutex.h +++ /dev/null @@ -1,158 +0,0 @@ -#ifndef _sys_posix_Mutex_h -#define _sys_posix_Mutex_h - -/* - * - * Copyright (c) 2006 The Apache Software Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include "qpid/sys/posix/check.h" - -#include -#include - -namespace qpid { -namespace sys { - -class Condition; - -/** - * Mutex lock. - */ -class Mutex : private boost::noncopyable { - friend class Condition; - static const pthread_mutexattr_t* getAttribute(); - -public: - typedef ::qpid::sys::ScopedLock ScopedLock; - typedef ::qpid::sys::ScopedUnlock ScopedUnlock; - - inline Mutex(); - inline ~Mutex(); - inline void lock(); - inline void unlock(); - inline bool trylock(); - - -protected: - pthread_mutex_t mutex; -}; - -/** - * RW lock. - */ -class RWlock : private boost::noncopyable { - friend class Condition; - -public: - typedef ::qpid::sys::ScopedRlock ScopedRlock; - typedef ::qpid::sys::ScopedWlock ScopedWlock; - - inline RWlock(); - inline ~RWlock(); - inline void wlock(); // will write-lock - inline void rlock(); // will read-lock - inline void unlock(); - inline void trywlock(); // will write-try - inline void tryrlock(); // will read-try - -protected: - pthread_rwlock_t rwlock; -}; - - -/** - * PODMutex is a POD, can be static-initialized with - * PODMutex m = QPID_PODMUTEX_INITIALIZER - */ -struct PODMutex -{ - typedef ::qpid::sys::ScopedLock ScopedLock; - - inline void lock(); - inline void unlock(); - inline bool trylock(); - - // Must be public to be a POD: - pthread_mutex_t mutex; -}; - -#define QPID_MUTEX_INITIALIZER { PTHREAD_MUTEX_INITIALIZER } - -void PODMutex::lock() { - QPID_POSIX_ASSERT_THROW_IF(pthread_mutex_lock(&mutex)); -} - -void PODMutex::unlock() { - QPID_POSIX_ASSERT_THROW_IF(pthread_mutex_unlock(&mutex)); -} - -bool PODMutex::trylock() { - return pthread_mutex_trylock(&mutex) == 0; -} - -Mutex::Mutex() { - QPID_POSIX_ASSERT_THROW_IF(pthread_mutex_init(&mutex, getAttribute())); -} - -Mutex::~Mutex(){ - QPID_POSIX_ABORT_IF(pthread_mutex_destroy(&mutex)); -} - -void Mutex::lock() { - QPID_POSIX_ASSERT_THROW_IF(pthread_mutex_lock(&mutex)); -} - -void Mutex::unlock() { - QPID_POSIX_ASSERT_THROW_IF(pthread_mutex_unlock(&mutex)); -} - -bool Mutex::trylock() { - return pthread_mutex_trylock(&mutex) == 0; -} - - -RWlock::RWlock() { - QPID_POSIX_ASSERT_THROW_IF(pthread_rwlock_init(&rwlock, NULL)); -} - -RWlock::~RWlock(){ - QPID_POSIX_ABORT_IF(pthread_rwlock_destroy(&rwlock)); -} - -void RWlock::wlock() { - QPID_POSIX_ASSERT_THROW_IF(pthread_rwlock_wrlock(&rwlock)); -} - -void RWlock::rlock() { - QPID_POSIX_ASSERT_THROW_IF(pthread_rwlock_rdlock(&rwlock)); -} - -void RWlock::unlock() { - QPID_POSIX_ASSERT_THROW_IF(pthread_rwlock_unlock(&rwlock)); -} - -void RWlock::trywlock() { - QPID_POSIX_ASSERT_THROW_IF(pthread_rwlock_trywrlock(&rwlock)); -} - -void RWlock::tryrlock() { - QPID_POSIX_ASSERT_THROW_IF(pthread_rwlock_tryrdlock(&rwlock)); -} - - -}} -#endif /*!_sys_posix_Mutex_h*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/sys/posix/PrivatePosix.h b/nativeLib/org.apache.qpid/include/qpid/sys/posix/PrivatePosix.h deleted file mode 100644 index 79cb950275..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/sys/posix/PrivatePosix.h +++ /dev/null @@ -1,77 +0,0 @@ -#ifndef _sys_posix_PrivatePosix_h -#define _sys_posix_PrivatePosix_h - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include "qpid/sys/Time.h" -#include "qpid/sys/IOHandle.h" - -struct timespec; -struct timeval; -struct addrinfo; - -namespace qpid { -namespace sys { - -// Private Time related implementation details -struct timespec& toTimespec(struct timespec& ts, const Duration& t); -struct timeval& toTimeval(struct timeval& tv, const Duration& t); -Duration toTime(const struct timespec& ts); - -// Private SocketAddress details -class SocketAddress; -const struct addrinfo& getAddrInfo(const SocketAddress&); - -// Private fd related implementation details -class IOHandlePrivate { -public: - IOHandlePrivate(int f = -1) : - fd(f) - {} - - int fd; -}; - -int toFd(const IOHandlePrivate* h); - -// Posix fd as an IOHandle -class PosixIOHandle : public IOHandle { -public: - PosixIOHandle(int fd) : - IOHandle(new IOHandlePrivate(fd)) - {} -}; - -// Dummy IOHandle for places it's required in the API -// but we promise not to actually try to do any operations on the IOHandle -class NullIOHandle : public IOHandle { -public: - NullIOHandle() : - IOHandle(new IOHandlePrivate) - {} -}; - -extern NullIOHandle DummyIOHandle; - -}} - -#endif /*!_sys_posix_PrivatePosix_h*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/sys/posix/Time.h b/nativeLib/org.apache.qpid/include/qpid/sys/posix/Time.h deleted file mode 100644 index 62d734c816..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/sys/posix/Time.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef QPID_SYS_POSIX_TIME_H -#define QPID_SYS_POSIX_TIME_H - -/* - * - * Copyright (c) 2006 The Apache Software Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include "qpid/sys/IntegerTypes.h" - -namespace qpid { -namespace sys { - -/** - * Class to represent an instant in time. - */ -typedef int64_t TimePrivate; - -}} // namespace qpid::sys - -#endif /*!QPID_SYS_POSIX_TIME_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/sys/posix/check.h b/nativeLib/org.apache.qpid/include/qpid/sys/posix/check.h deleted file mode 100644 index 1bfe5d6d78..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/sys/posix/check.h +++ /dev/null @@ -1,53 +0,0 @@ -#ifndef _posix_check_h -#define _posix_check_h - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include "qpid/Exception.h" -#include "qpid/Msg.h" - -#include -#include -#include -#include - -#define QPID_POSIX_ERROR(ERRNO) qpid::Exception(QPID_MSG(qpid::sys::strError(ERRNO))) - -/** THROW QPID_POSIX_ERROR(errno) if RESULT is less than zero */ -#define QPID_POSIX_CHECK(RESULT) \ - if ((RESULT) < 0) throw QPID_POSIX_ERROR((errno)) - -/** Throw a posix error if ERRNO is non-zero */ -#define QPID_POSIX_THROW_IF(ERRNO) \ - do { int e=(ERRNO); if (e) throw QPID_POSIX_ERROR(e); } while(0) - -/** Same as _THROW_IF in a release build, but abort a debug build */ -#ifdef NDEBUG -#define QPID_POSIX_ASSERT_THROW_IF(ERRNO) QPID_POSIX_THROW_IF(ERRNO) -#else -#define QPID_POSIX_ASSERT_THROW_IF(ERRNO) \ - do { int e=(ERRNO); if (e) { errno=e; ::perror(0); assert(0); } } while(0) -#endif - -#define QPID_POSIX_ABORT_IF(ERRNO) if ((int) ERRNO) { errno=ERRNO; ::perror(0); abort(); } - -#endif /*!_posix_check_h*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/types/Exception.h b/nativeLib/org.apache.qpid/include/qpid/types/Exception.h deleted file mode 100644 index d061a7df0e..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/types/Exception.h +++ /dev/null @@ -1,44 +0,0 @@ -#ifndef QPID_TYPES_EXCEPTION_H -#define QPID_TYPES_EXCEPTION_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include -#include "qpid/types/ImportExport.h" - -namespace qpid { -namespace types { - -class Exception : public std::exception -{ - public: - QPID_TYPES_EXTERN explicit Exception(const std::string& message=std::string()) throw(); - QPID_TYPES_EXTERN virtual ~Exception() throw(); - QPID_TYPES_EXTERN virtual const char* what() const throw(); - - private: - const std::string message; -}; - -}} // namespace qpid::types - -#endif /*!QPID_TYPES_EXCEPTION_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/types/ImportExport.h b/nativeLib/org.apache.qpid/include/qpid/types/ImportExport.h deleted file mode 100644 index bb10575fcd..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/types/ImportExport.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef QPID_TYPES_IMPORTEXPORT_H -#define QPID_TYPES_IMPORTEXPORT_H - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -#if defined(WIN32) && !defined(QPID_DECLARE_STATIC) -#if defined(TYPES_EXPORT) || defined (qpidtypes_EXPORTS) -#define QPID_TYPES_EXTERN __declspec(dllexport) -#else -#define QPID_TYPES_EXTERN __declspec(dllimport) -#endif -#else -#define QPID_TYPES_EXTERN -#endif - -#endif /*!QPID_TYPES_IMPORTEXPORT_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/types/Uuid.h b/nativeLib/org.apache.qpid/include/qpid/types/Uuid.h deleted file mode 100644 index 467a895184..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/types/Uuid.h +++ /dev/null @@ -1,94 +0,0 @@ -#ifndef QPID_TYPES_UUID_H -#define QPID_TYPES_UUID_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include "qpid/types/ImportExport.h" -#include -#include - -namespace qpid { -namespace types { - -class Uuid -{ - public: - static const size_t SIZE; - /** - * If unique is true, this will generate a new unique uuid, if not - * it will construct a null uuid. - */ - QPID_TYPES_EXTERN Uuid(bool unique=false); - QPID_TYPES_EXTERN Uuid(const Uuid&); - QPID_TYPES_EXTERN Uuid& operator=(const Uuid&); - /** Copy the UUID from data16, which must point to a 16-byte UUID */ - QPID_TYPES_EXTERN Uuid(const unsigned char* data16); - - /** Set to a new unique identifier. */ - QPID_TYPES_EXTERN void generate(); - - /** Set to all zeros. */ - QPID_TYPES_EXTERN void clear(); - - /** Test for null (all zeros). */ - QPID_TYPES_EXTERN bool isNull() const; - QPID_TYPES_EXTERN operator bool() const; - QPID_TYPES_EXTERN bool operator!() const; - - /** String value in format 1b4e28ba-2fa1-11d2-883f-b9a761bde3fb. */ - QPID_TYPES_EXTERN std::string str() const; - - QPID_TYPES_EXTERN size_t size() const; - QPID_TYPES_EXTERN const unsigned char* data() const; - - friend QPID_TYPES_EXTERN bool operator==(const Uuid&, const Uuid&); - friend QPID_TYPES_EXTERN bool operator!=(const Uuid&, const Uuid&); - friend QPID_TYPES_EXTERN bool operator<(const Uuid&, const Uuid&); - friend QPID_TYPES_EXTERN bool operator>(const Uuid&, const Uuid&); - friend QPID_TYPES_EXTERN bool operator<=(const Uuid&, const Uuid&); - friend QPID_TYPES_EXTERN bool operator>=(const Uuid&, const Uuid&); - friend QPID_TYPES_EXTERN std::ostream& operator<<(std::ostream&, Uuid); - friend QPID_TYPES_EXTERN std::istream& operator>>(std::istream&, Uuid&); - - private: - unsigned char bytes[16]; -}; - -/** Returns true if the uuids are equal, false otherwise. **/ -QPID_TYPES_EXTERN bool operator==(const Uuid&, const Uuid&); -/** Returns true if the uuids are NOT equal, false if they are. **/ -QPID_TYPES_EXTERN bool operator!=(const Uuid&, const Uuid&); - -QPID_TYPES_EXTERN bool operator<(const Uuid&, const Uuid&); -QPID_TYPES_EXTERN bool operator>(const Uuid&, const Uuid&); -QPID_TYPES_EXTERN bool operator<=(const Uuid&, const Uuid&); -QPID_TYPES_EXTERN bool operator>=(const Uuid&, const Uuid&); - -/** Print in format 1b4e28ba-2fa1-11d2-883f-b9a761bde3fb. */ -QPID_TYPES_EXTERN std::ostream& operator<<(std::ostream&, Uuid); - -/** Read from format 1b4e28ba-2fa1-11d2-883f-b9a761bde3fb. */ -QPID_TYPES_EXTERN std::istream& operator>>(std::istream&, Uuid&); - -}} // namespace qpid::types - -#endif /*!QPID_TYPES_UUID_H*/ diff --git a/nativeLib/org.apache.qpid/include/qpid/types/Variant.h b/nativeLib/org.apache.qpid/include/qpid/types/Variant.h deleted file mode 100644 index 993f1eb0c2..0000000000 --- a/nativeLib/org.apache.qpid/include/qpid/types/Variant.h +++ /dev/null @@ -1,173 +0,0 @@ -#ifndef QPID_TYPES_VARIANT_H -#define QPID_TYPES_VARIANT_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#include -#include -#include -#include -#include "Uuid.h" -#include "qpid/types/Exception.h" -#include "qpid/sys/IntegerTypes.h" -#include "qpid/types/ImportExport.h" - -namespace qpid { -namespace types { - -/** - * Thrown when an illegal conversion of a variant is attempted. - */ -struct InvalidConversion : public Exception -{ - InvalidConversion(const std::string& msg); -}; - -enum VariantType { - VAR_VOID = 0, - VAR_BOOL, - VAR_UINT8, - VAR_UINT16, - VAR_UINT32, - VAR_UINT64, - VAR_INT8, - VAR_INT16, - VAR_INT32, - VAR_INT64, - VAR_FLOAT, - VAR_DOUBLE, - VAR_STRING, - VAR_MAP, - VAR_LIST, - VAR_UUID -}; - -class VariantImpl; - -/** - * Represents a value of variable type. - */ -class Variant -{ - public: - typedef std::map Map; - typedef std::list List; - - QPID_TYPES_EXTERN Variant(); - QPID_TYPES_EXTERN Variant(bool); - QPID_TYPES_EXTERN Variant(uint8_t); - QPID_TYPES_EXTERN Variant(uint16_t); - QPID_TYPES_EXTERN Variant(uint32_t); - QPID_TYPES_EXTERN Variant(uint64_t); - QPID_TYPES_EXTERN Variant(int8_t); - QPID_TYPES_EXTERN Variant(int16_t); - QPID_TYPES_EXTERN Variant(int32_t); - QPID_TYPES_EXTERN Variant(int64_t); - QPID_TYPES_EXTERN Variant(float); - QPID_TYPES_EXTERN Variant(double); - QPID_TYPES_EXTERN Variant(const std::string&); - QPID_TYPES_EXTERN Variant(const char*); - QPID_TYPES_EXTERN Variant(const Map&); - QPID_TYPES_EXTERN Variant(const List&); - QPID_TYPES_EXTERN Variant(const Variant&); - QPID_TYPES_EXTERN Variant(const Uuid&); - - QPID_TYPES_EXTERN ~Variant(); - - QPID_TYPES_EXTERN VariantType getType() const; - QPID_TYPES_EXTERN bool isVoid() const; - - QPID_TYPES_EXTERN Variant& operator=(bool); - QPID_TYPES_EXTERN Variant& operator=(uint8_t); - QPID_TYPES_EXTERN Variant& operator=(uint16_t); - QPID_TYPES_EXTERN Variant& operator=(uint32_t); - QPID_TYPES_EXTERN Variant& operator=(uint64_t); - QPID_TYPES_EXTERN Variant& operator=(int8_t); - QPID_TYPES_EXTERN Variant& operator=(int16_t); - QPID_TYPES_EXTERN Variant& operator=(int32_t); - QPID_TYPES_EXTERN Variant& operator=(int64_t); - QPID_TYPES_EXTERN Variant& operator=(float); - QPID_TYPES_EXTERN Variant& operator=(double); - QPID_TYPES_EXTERN Variant& operator=(const std::string&); - QPID_TYPES_EXTERN Variant& operator=(const char*); - QPID_TYPES_EXTERN Variant& operator=(const Map&); - QPID_TYPES_EXTERN Variant& operator=(const List&); - QPID_TYPES_EXTERN Variant& operator=(const Variant&); - QPID_TYPES_EXTERN Variant& operator=(const Uuid&); - - QPID_TYPES_EXTERN Variant& fromString(const std::string&); - - QPID_TYPES_EXTERN bool asBool() const; - QPID_TYPES_EXTERN uint8_t asUint8() const; - QPID_TYPES_EXTERN uint16_t asUint16() const; - QPID_TYPES_EXTERN uint32_t asUint32() const; - QPID_TYPES_EXTERN uint64_t asUint64() const; - QPID_TYPES_EXTERN int8_t asInt8() const; - QPID_TYPES_EXTERN int16_t asInt16() const; - QPID_TYPES_EXTERN int32_t asInt32() const; - QPID_TYPES_EXTERN int64_t asInt64() const; - QPID_TYPES_EXTERN float asFloat() const; - QPID_TYPES_EXTERN double asDouble() const; - QPID_TYPES_EXTERN std::string asString() const; - QPID_TYPES_EXTERN Uuid asUuid() const; - - QPID_TYPES_EXTERN operator bool() const; - QPID_TYPES_EXTERN operator uint8_t() const; - QPID_TYPES_EXTERN operator uint16_t() const; - QPID_TYPES_EXTERN operator uint32_t() const; - QPID_TYPES_EXTERN operator uint64_t() const; - QPID_TYPES_EXTERN operator int8_t() const; - QPID_TYPES_EXTERN operator int16_t() const; - QPID_TYPES_EXTERN operator int32_t() const; - QPID_TYPES_EXTERN operator int64_t() const; - QPID_TYPES_EXTERN operator float() const; - QPID_TYPES_EXTERN operator double() const; - QPID_TYPES_EXTERN operator std::string() const; - QPID_TYPES_EXTERN operator Uuid() const; - - QPID_TYPES_EXTERN const Map& asMap() const; - QPID_TYPES_EXTERN Map& asMap(); - QPID_TYPES_EXTERN const List& asList() const; - QPID_TYPES_EXTERN List& asList(); - /** - * Unlike asString(), getString() will not do any conversions and - * will throw InvalidConversion if the type is not STRING. - */ - QPID_TYPES_EXTERN const std::string& getString() const; - QPID_TYPES_EXTERN std::string& getString(); - - QPID_TYPES_EXTERN void setEncoding(const std::string&); - QPID_TYPES_EXTERN const std::string& getEncoding() const; - - QPID_TYPES_EXTERN bool isEqualTo(const Variant& a) const; - - QPID_TYPES_EXTERN void reset(); - private: - VariantImpl* impl; -}; - -QPID_TYPES_EXTERN std::ostream& operator<<(std::ostream& out, const Variant& value); -QPID_TYPES_EXTERN std::ostream& operator<<(std::ostream& out, const Variant::Map& map); -QPID_TYPES_EXTERN std::ostream& operator<<(std::ostream& out, const Variant::List& list); -QPID_TYPES_EXTERN bool operator==(const Variant& a, const Variant& b); -}} // namespace qpid::types - -#endif /*!QPID_TYPES_VARIANT_H*/ diff --git a/nativeLib/org.apache.qpid/lib/libqpidclient.so b/nativeLib/org.apache.qpid/lib/libqpidclient.so deleted file mode 100644 index a605493071..0000000000 Binary files a/nativeLib/org.apache.qpid/lib/libqpidclient.so and /dev/null differ diff --git a/nativeLib/org.apache.qpid/lib/libqpidclient.so.4 b/nativeLib/org.apache.qpid/lib/libqpidclient.so.4 deleted file mode 100644 index a605493071..0000000000 Binary files a/nativeLib/org.apache.qpid/lib/libqpidclient.so.4 and /dev/null differ diff --git a/nativeLib/org.apache.qpid/lib/libqpidclient.so.4.0.0 b/nativeLib/org.apache.qpid/lib/libqpidclient.so.4.0.0 deleted file mode 100644 index a605493071..0000000000 Binary files a/nativeLib/org.apache.qpid/lib/libqpidclient.so.4.0.0 and /dev/null differ diff --git a/nativeLib/org.apache.qpid/lib/libqpidcommon.so b/nativeLib/org.apache.qpid/lib/libqpidcommon.so deleted file mode 100644 index 118b5274db..0000000000 Binary files a/nativeLib/org.apache.qpid/lib/libqpidcommon.so and /dev/null differ diff --git a/nativeLib/org.apache.qpid/lib/libqpidcommon.so.4 b/nativeLib/org.apache.qpid/lib/libqpidcommon.so.4 deleted file mode 100644 index 118b5274db..0000000000 Binary files a/nativeLib/org.apache.qpid/lib/libqpidcommon.so.4 and /dev/null differ diff --git a/nativeLib/org.apache.qpid/lib/libqpidcommon.so.4.0.0 b/nativeLib/org.apache.qpid/lib/libqpidcommon.so.4.0.0 deleted file mode 100644 index 118b5274db..0000000000 Binary files a/nativeLib/org.apache.qpid/lib/libqpidcommon.so.4.0.0 and /dev/null differ diff --git a/nativeLib/org.apache.qpid/lib/libqpidmessaging.so b/nativeLib/org.apache.qpid/lib/libqpidmessaging.so deleted file mode 100644 index a1a4dfc0a8..0000000000 Binary files a/nativeLib/org.apache.qpid/lib/libqpidmessaging.so and /dev/null differ diff --git a/nativeLib/org.apache.qpid/lib/libqpidmessaging.so.3 b/nativeLib/org.apache.qpid/lib/libqpidmessaging.so.3 deleted file mode 100644 index a1a4dfc0a8..0000000000 Binary files a/nativeLib/org.apache.qpid/lib/libqpidmessaging.so.3 and /dev/null differ diff --git a/nativeLib/org.apache.qpid/lib/libqpidmessaging.so.3.0.2 b/nativeLib/org.apache.qpid/lib/libqpidmessaging.so.3.0.2 deleted file mode 100644 index a1a4dfc0a8..0000000000 Binary files a/nativeLib/org.apache.qpid/lib/libqpidmessaging.so.3.0.2 and /dev/null differ diff --git a/nativeLib/org.apache.qpid/lib/libqpidtypes.so b/nativeLib/org.apache.qpid/lib/libqpidtypes.so deleted file mode 100644 index dac2b637df..0000000000 Binary files a/nativeLib/org.apache.qpid/lib/libqpidtypes.so and /dev/null differ diff --git a/nativeLib/org.apache.qpid/lib/libqpidtypes.so.1 b/nativeLib/org.apache.qpid/lib/libqpidtypes.so.1 deleted file mode 100644 index dac2b637df..0000000000 Binary files a/nativeLib/org.apache.qpid/lib/libqpidtypes.so.1 and /dev/null differ diff --git a/nativeLib/org.apache.qpid/lib/libqpidtypes.so.1.1.1 b/nativeLib/org.apache.qpid/lib/libqpidtypes.so.1.1.1 deleted file mode 100644 index dac2b637df..0000000000 Binary files a/nativeLib/org.apache.qpid/lib/libqpidtypes.so.1.1.1 and /dev/null differ diff --git a/nativeLib/org.apache.qpid/lib64/libqpidclient.so b/nativeLib/org.apache.qpid/lib64/libqpidclient.so deleted file mode 100644 index 85bfd72782..0000000000 Binary files a/nativeLib/org.apache.qpid/lib64/libqpidclient.so and /dev/null differ diff --git a/nativeLib/org.apache.qpid/lib64/libqpidclient.so.4 b/nativeLib/org.apache.qpid/lib64/libqpidclient.so.4 deleted file mode 100644 index 85bfd72782..0000000000 Binary files a/nativeLib/org.apache.qpid/lib64/libqpidclient.so.4 and /dev/null differ diff --git a/nativeLib/org.apache.qpid/lib64/libqpidclient.so.4.0.0 b/nativeLib/org.apache.qpid/lib64/libqpidclient.so.4.0.0 deleted file mode 100644 index 85bfd72782..0000000000 Binary files a/nativeLib/org.apache.qpid/lib64/libqpidclient.so.4.0.0 and /dev/null differ diff --git a/nativeLib/org.apache.qpid/lib64/libqpidcommon.so b/nativeLib/org.apache.qpid/lib64/libqpidcommon.so deleted file mode 100644 index 0da4707f69..0000000000 Binary files a/nativeLib/org.apache.qpid/lib64/libqpidcommon.so and /dev/null differ diff --git a/nativeLib/org.apache.qpid/lib64/libqpidcommon.so.4 b/nativeLib/org.apache.qpid/lib64/libqpidcommon.so.4 deleted file mode 100644 index 0da4707f69..0000000000 Binary files a/nativeLib/org.apache.qpid/lib64/libqpidcommon.so.4 and /dev/null differ diff --git a/nativeLib/org.apache.qpid/lib64/libqpidcommon.so.4.0.0 b/nativeLib/org.apache.qpid/lib64/libqpidcommon.so.4.0.0 deleted file mode 100644 index 0da4707f69..0000000000 Binary files a/nativeLib/org.apache.qpid/lib64/libqpidcommon.so.4.0.0 and /dev/null differ diff --git a/nativeLib/org.apache.qpid/lib64/libqpidmessaging.so b/nativeLib/org.apache.qpid/lib64/libqpidmessaging.so deleted file mode 100644 index cbd348f53a..0000000000 Binary files a/nativeLib/org.apache.qpid/lib64/libqpidmessaging.so and /dev/null differ diff --git a/nativeLib/org.apache.qpid/lib64/libqpidmessaging.so.3 b/nativeLib/org.apache.qpid/lib64/libqpidmessaging.so.3 deleted file mode 100644 index cbd348f53a..0000000000 Binary files a/nativeLib/org.apache.qpid/lib64/libqpidmessaging.so.3 and /dev/null differ diff --git a/nativeLib/org.apache.qpid/lib64/libqpidmessaging.so.3.0.2 b/nativeLib/org.apache.qpid/lib64/libqpidmessaging.so.3.0.2 deleted file mode 100644 index cbd348f53a..0000000000 Binary files a/nativeLib/org.apache.qpid/lib64/libqpidmessaging.so.3.0.2 and /dev/null differ diff --git a/nativeLib/org.apache.qpid/lib64/libqpidtypes.so b/nativeLib/org.apache.qpid/lib64/libqpidtypes.so deleted file mode 100644 index e3e98656c8..0000000000 Binary files a/nativeLib/org.apache.qpid/lib64/libqpidtypes.so and /dev/null differ diff --git a/nativeLib/org.apache.qpid/lib64/libqpidtypes.so.1 b/nativeLib/org.apache.qpid/lib64/libqpidtypes.so.1 deleted file mode 100644 index e3e98656c8..0000000000 Binary files a/nativeLib/org.apache.qpid/lib64/libqpidtypes.so.1 and /dev/null differ diff --git a/nativeLib/org.apache.qpid/lib64/libqpidtypes.so.1.1.1 b/nativeLib/org.apache.qpid/lib64/libqpidtypes.so.1.1.1 deleted file mode 100644 index e3e98656c8..0000000000 Binary files a/nativeLib/org.apache.qpid/lib64/libqpidtypes.so.1.1.1 and /dev/null differ diff --git a/nativeLib/rary.cots.jasper/.cproject b/nativeLib/rary.cots.jasper/.cproject index ac985b4ed3..c46aa4c3ef 100644 --- a/nativeLib/rary.cots.jasper/.cproject +++ b/nativeLib/rary.cots.jasper/.cproject @@ -41,175 +41,96 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nativeLib/rary.cots.jasper/.settings/org.eclipse.cdt.core.prefs b/nativeLib/rary.cots.jasper/.settings/org.eclipse.cdt.core.prefs index f378cbac38..799c94836e 100644 --- a/nativeLib/rary.cots.jasper/.settings/org.eclipse.cdt.core.prefs +++ b/nativeLib/rary.cots.jasper/.settings/org.eclipse.cdt.core.prefs @@ -1,4 +1,3 @@ -#Tue Feb 07 16:32:45 CST 2012 eclipse.preferences.version=1 environment/project/preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1995602780=\n\n\n\n environment/project/preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1995602780.1155347710= @@ -8,8 +7,8 @@ environment/project/preference.org.eclipse.cdt.managedbuilder.core.configuration environment/project/preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1995602780.1155347710/INSTALL_TO/delimiter=; environment/project/preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1995602780.1155347710/INSTALL_TO/operation=replace environment/project/preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1995602780.1155347710/INSTALL_TO/value=../build.native/i386-pc-linux-gnu -environment/project/preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1995602780.1155347710/LD/delimiter=; -environment/project/preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1995602780.1155347710/LD/operation=replace +environment/project/preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1995602780.1155347710/LD/delimiter=\: +environment/project/preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1995602780.1155347710/LD/operation=append environment/project/preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1995602780.1155347710/LD/value=ld -melf_i386 --hash-style\=sysv environment/project/preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1995602780.1155347710/append=true environment/project/preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1995602780.1155347710/appendContributed=true diff --git a/nativeLib/rary.cots.jepp/.cproject b/nativeLib/rary.cots.jepp/.cproject index 9d417ae7a7..3b99ad9f87 100644 --- a/nativeLib/rary.cots.jepp/.cproject +++ b/nativeLib/rary.cots.jepp/.cproject @@ -42,421 +42,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -494,424 +79,425 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nativeLib/rary.empty.motif/.cproject b/nativeLib/rary.empty.motif/.cproject index 23fad38813..0bdcb332a1 100644 --- a/nativeLib/rary.empty.motif/.cproject +++ b/nativeLib/rary.empty.motif/.cproject @@ -2,422 +2,419 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nativeLib/rary.empty.motif/src/X11.c b/nativeLib/rary.empty.motif/src/X11.c index 9cef33be76..66e52cb8eb 100644 --- a/nativeLib/rary.empty.motif/src/X11.c +++ b/nativeLib/rary.empty.motif/src/X11.c @@ -7,7 +7,7 @@ #include "error.h" -//void XDestroyRegion () {nolibError("Motif");} +void XDestroyRegion () {nolibError("Motif");} void XFreeFont () {nolibError("Motif");} @@ -17,8 +17,8 @@ void XGrabButton () {nolibError("Motif");} void XLoadFont () {nolibError("Motif");} void XMapWindow () {nolibError("Motif");} -//void XPointInRegion () {nolibError("Motif");} -//void XPolygonRegion () {nolibError("Motif");} +void XPointInRegion () {nolibError("Motif");} +void XPolygonRegion () {nolibError("Motif");} void XQueryColor () {nolibError("Motif");} void XQueryFont () {nolibError("Motif");} void XReadBitmapFile () {nolibError("Motif");} diff --git a/nativeLib/rary.meteorological/.cproject b/nativeLib/rary.meteorological/.cproject index 9d280da42d..76ee736fae 100644 --- a/nativeLib/rary.meteorological/.cproject +++ b/nativeLib/rary.meteorological/.cproject @@ -43,7 +43,7 @@ -