xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
43024 commits 31 branches 40 tags 3.8 GiB
Commit graph

126 commits

Author SHA1 Message Date
mjames-upc
ee12a80d44 SatMapCoverage fix for GEWCOMP MSAT, GVAR; style rules, purge rules, menus and bundles. 2016-05-01 01:22:56 -05:00
mjames-upc
e2d9ba9a4c merge unidata_15.1.1 to unidata_16.1.4 
Former-commit-id: 0dc3df68aa76348b27e8ce208cb72d91467184c0
 2016-03-25 13:09:32 -05:00
mjames-upc
6ad6d7b5c7 uniwisc product updates in mcidas/physicalElements.xml 
Former-commit-id: 6e3ba6ec90
 2016-01-25 16:57:34 -06:00
mjames-upc
8a1240220e logic cleanup McidasSatelliteDecoder 
Former-commit-id: cd72624503
 2016-01-21 20:48:32 -07:00
JustinB2011
d72e269271 Update physicalElements.xml 
Former-commit-id: 4034638878
 2016-01-20 22:41:32 -05:00
JustinB2011
2afbe3c201 Update McidasSatelliteDecoder.java 
Former-commit-id: 286c038874
 2016-01-20 22:33:45 -05:00
JustinB2011
299c48e7d1 Update McidasSatelliteDecoder.java 
Added custom area range for both Himawari-8 and Meteosat-10

Former-commit-id: f6ab49f3ac
 2016-01-20 22:32:59 -05:00
JustinB2011
10329fa8cb Update physicalElements.xml 
Former-commit-id: ed7b38ee1c
 2016-01-20 22:12:40 -05:00
JustinB2011
eccfcee8f0 Update physicalElements.xml 
Former-commit-id: 54705d2136
 2016-01-20 22:06:21 -05:00
JustinB2011
cbb6da553b Update creatingEntities.xml 
Former-commit-id: 86bf9a9543
 2016-01-20 22:00:22 -05:00
mjames-upc
6b39bbeac0 cleanup sat product names and nwsauth/collab/useradmin plugins 
Former-commit-id: a333d34383
 2015-12-30 15:24:14 -07:00
mjames-upc
3a59fefb09 cleaning up unidata_15.1.1 enough to launch in eclipse 
Former-commit-id: 0b01029e68
 2015-12-29 20:15:31 -07:00
AWIPS User
017444a61e major D2D menu updates for 14.4.2 
Former-commit-id: eb898b9ccd
Former-commit-id: dc8f7f341b
 2015-10-23 18:56:09 -06:00
AWIPS User
d619eb74a2 sat and radar menu organization 
Former-commit-id: ea2729b8d4 [formerly affd4212ed] [formerly 698c0b5166] [formerly 2b0c20177d193699d51d49a8fe1e0b22057117c0 [formerly 8f8b9dd16ea8ae10522f0f5092dcc20a9676444f] [formerly 698c0b5166 [formerly 0943c3edd5]]]
Former-commit-id: c2658d1e39033b56f602a9ebe312abcdfea4f307 [formerly fe06833d7f0b88c2fd77bec7b274dfbdaa6ab9cd] [formerly d3b35a2e3a [formerly 4c91c17326]]
Former-commit-id: d3b35a2e3a
Former-commit-id: 1c682e0af1
 2015-07-22 10:31:01 -06:00
AWIPS User
3dd89482c5 McIDAS decoder now accounts for UNIWISC GOES East and West AREA file ranges 
Former-commit-id: 40e7f7a319 [formerly 0f09ba217e] [formerly cf692bd996] [formerly edbc3794d932cdea574431efa4437f67cd6cf2c8 [formerly 7264d6397f27951aaf83cc8e99551d95fdd66215] [formerly cf692bd996 [formerly 30480ef382]]]
Former-commit-id: f68bef7625cdbdcf0af7f8a886363f6a12ba0840 [formerly e5f5239bad435ec37fd8c810436166e2235329ff] [formerly 6eabcf11fb [formerly ba83017f74]]
Former-commit-id: 16dc0bcee53c770751ed181af03abd4b804bbbb5 [formerly 6eabcf11fb]
Former-commit-id: 9463ff54ba
 2015-07-12 11:52:13 -06:00
AWIPS User
a235f9012b grid and satellite purge rule updates 
Former-commit-id: a5722c6ccb [formerly c15691fca8] [formerly fe14c9d907] [formerly ebb721c69b2d19552332390f7cad48b0d4e8644c [formerly 9845ff47f7af0032cb4ea75ad73f480b745727c5] [formerly fe14c9d907 [formerly f020086ec3]]]
Former-commit-id: 1c5f9fddea8a19bd37f512a53015725dab335e1a [formerly 2ea065b12f4cea15730c550f08f1a0d211f68033] [formerly 1349e3d850 [formerly be6658a8d3]]
Former-commit-id: 1349e3d850
Former-commit-id: 14ae0ddde1
 2015-07-11 12:06:57 -06:00
AWIPS User
df1a5d173e copy constructCRSfromWKT from McidasCRSBuilder because eclipse PDE build fails to import gov.noaa.nws.ncep.edex.common 
Former-commit-id: 84e6751ac7 [formerly bd223f5edc] [formerly 270312e06b] [formerly afcaba2ac83dcb41824fb99819959f3912730dbb [formerly bc759b5222b6bb473e2c1f86a49e45a732d88269] [formerly 270312e06b [formerly c0cc9e88c6]]]
Former-commit-id: d51cedb197a105467015b499ec461a0af1992ed0 [formerly a12c497703f7cb8ad53b34b62eb64a02eccfdae0] [formerly c5185e7a52 [formerly dcd3c56bf3]]
Former-commit-id: 96f09fb54608aca4e88e4e2d1cc5a95925027fe4 [formerly c5185e7a52]
Former-commit-id: c2375590d3
 2015-06-23 16:18:27 -06:00
AWIPS User
ff87734763 GVAR McIDAS native projection support added for Raytheon satellite.mcidas decoder. 
Former-commit-id: 559827ef95 [formerly 6a08478261] [formerly 17f3681bd0] [formerly 96c81854d1cc3f851fc099f985701985b3422d6e [formerly eb151d7a68cb7ba6e2717b0050401f4d9b00618d] [formerly 17f3681bd0 [formerly bf979e7040]]]
Former-commit-id: 93c5ee16f203346fcf4c6998b678c5e81ae43d3d [formerly c2bfd8ad63b90fb7cd356f9e1d100a2bb30e6698] [formerly 659fac2925 [formerly b9f2552744]]
Former-commit-id: 659fac2925
Former-commit-id: b03b498770
 2015-06-16 10:14:16 -06:00
AWIPS User
01910e89ce SPS support added for satellite.mcidas decoder; various menu/SatResource edits to support dynamic area menu items. 
Former-commit-id: 76f03a420e [formerly 75bee340f2] [formerly 9abdc84540] [formerly 6640c90ea44fc0380f845cb0066bbae47625464d [formerly 7574f65f15fe8b817ae358fc7448241484be1ace] [formerly 9abdc84540 [formerly dcb05bac39]]]
Former-commit-id: 150c21205f2f9663a8e676ccd33314008f03f842 [formerly 13f1b1c3d0d48deabc92aa70bd1aff324ac34bdd] [formerly 31d1e4f345 [formerly a0edadacf6]]
Former-commit-id: 31d1e4f345
Former-commit-id: 1420f3b7ea
 2015-06-16 10:13:43 -06:00
AWIPS User
3e0e1df0d3 South polar stereographic CRS support added to satellite.mcidas decoder. Arctic/Antarctic UNIWISC supported. Area name/entity/paramewter table additions for UNIWISC 
Former-commit-id: 44e68c14c7 [formerly 1517852c46] [formerly 6ae2284610] [formerly 43775011b3fdd5bf8219aaa1e67d9cf53108ae09 [formerly 37560f8172352c763a7308969faf710144c9d276] [formerly 6ae2284610 [formerly ceb0c7a739]]]
Former-commit-id: c3993d6362dd260fa3620e1eb9fd637330593fc8 [formerly 4ac86c6b37c5c84fdb1e069b943b152dff3cecde] [formerly dd333fdebc [formerly 2ee11df21d]]
Former-commit-id: dd333fdebc
Former-commit-id: ab315fa55e
 2015-06-16 10:12:47 -06:00
Mark Peters
3a252033ff Omaha #4469 Some files are missing from plugins' build.properties 
Change-Id: Ib36f309d1cce20ad908b32a8a1d1218fde6863d7

Former-commit-id: 4e596c0cde3e6e04a92a3766224b153989feb676
 2015-05-19 11:47:40 -05:00
Nate Jensen
6b7e82c8f5 Omaha #3549 remove jdt prefs for faster builds 
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29

Former-commit-id: e291bd932f [formerly effb6c68bf] [formerly 6c1391e938] [formerly 6c1391e938 [formerly ec28d2f1a0]] [formerly e291bd932f [formerly effb6c68bf] [formerly 6c1391e938] [formerly 6c1391e938 [formerly ec28d2f1a0]] [formerly 8dbe6abbe4 [formerly 6c1391e938 [formerly ec28d2f1a0] [formerly 8dbe6abbe4 [formerly 3ba611e111585d2aa9cd9f647687fedb794077f7]]]]]
Former-commit-id: 8dbe6abbe4
Former-commit-id: 6a3723e9ec [formerly 3202b579c1] [formerly 1c5057a13f] [formerly ad98533de0e16d2987f10853c7d9d9c26929b8a7 [formerly fe8f15a6cf651b03c628440d9b584168f73a916a] [formerly 1c5057a13f [formerly 291de3f039]]]
Former-commit-id: e04e06ff2523a32fc664bd3cf1fd177746c10dfd [formerly 62ac51e4fd5ddf96d1a40756fde9b064052645f9] [formerly 0bb18f02d0 [formerly e53063661e]]
Former-commit-id: 2a87b2577c7e0445a15a2430cd4ab102809a8789 [formerly 0bb18f02d0]
Former-commit-id: ad2a20dd43
 2014-12-03 15:47:10 -06:00
Nate Jensen
8dbe6abbe4 Omaha #3549 remove jdt prefs for faster builds 
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29

Former-commit-id: 3ba611e111585d2aa9cd9f647687fedb794077f7
 2014-12-03 15:47:10 -06:00
Nate Jensen
6c1391e938 Omaha #3549 remove jdt prefs for faster builds 
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29

Former-commit-id: 8dbe6abbe4 [formerly 3ba611e111585d2aa9cd9f647687fedb794077f7]
Former-commit-id: ec28d2f1a0
 2014-12-03 15:47:10 -06:00
Mark Peters
6d409562d7 Omaha #3627 Delete or replace dead or deprecated methods and classes from com.raytheon.uf.edex.decodertools 
Change-Id: I65fee949e595b76be5c998dcd550b287928a1d65

Former-commit-id: 2f0faf4dc4 [formerly bfd99d02af] [formerly 27f5ae502d] [formerly 27f5ae502d [formerly bd5996a599]] [formerly 2f0faf4dc4 [formerly bfd99d02af] [formerly 27f5ae502d] [formerly 27f5ae502d [formerly bd5996a599]] [formerly 9176913542 [formerly 27f5ae502d [formerly bd5996a599] [formerly 9176913542 [formerly 1350720111ceeb83893c5c0129eb41d662d16211]]]]]
Former-commit-id: 9176913542
Former-commit-id: 0e2486c4d7 [formerly 3354a82bbf] [formerly 6ce445d20b] [formerly 255741459bdde66e3595e4550dc0576e2422b745 [formerly 41c20710a323fd74fef56cf65f05fc7f694c60e8] [formerly 6ce445d20b [formerly c9e8228954]]]
Former-commit-id: d4c68a006e4e552ac945e5db195bd742fd276223 [formerly 62734f967b809cdddbabef3d398dab3f8f6a4d43] [formerly 71fdd40be2 [formerly 757ecb423c]]
Former-commit-id: 71fdd40be2
Former-commit-id: da6355c8cd
 2014-09-23 12:12:22 -05:00
Mark Peters
9176913542 Omaha #3627 Delete or replace dead or deprecated methods and classes from com.raytheon.uf.edex.decodertools 
Change-Id: I65fee949e595b76be5c998dcd550b287928a1d65

Former-commit-id: 1350720111ceeb83893c5c0129eb41d662d16211
 2014-09-23 12:12:22 -05:00
Mark Peters
27f5ae502d Omaha #3627 Delete or replace dead or deprecated methods and classes from com.raytheon.uf.edex.decodertools 
Change-Id: I65fee949e595b76be5c998dcd550b287928a1d65

Former-commit-id: 9176913542 [formerly 1350720111ceeb83893c5c0129eb41d662d16211]
Former-commit-id: bd5996a599
 2014-09-23 12:12:22 -05:00
Mark Peters
6d81a6c04b Omaha #3627 Delete or replace dead or deprecated methods and classes from com.raytheon.uf.edex.decodertools 
Change-Id: I95e881042e09a18f45b4410a76dbcf828dac0d4f

Former-commit-id: 1fdba744b6 [formerly d065b2610f] [formerly 68044d2dd7] [formerly 68044d2dd7 [formerly 3f1e21107b]] [formerly 1fdba744b6 [formerly d065b2610f] [formerly 68044d2dd7] [formerly 68044d2dd7 [formerly 3f1e21107b]] [formerly c5da5ccb9b [formerly 68044d2dd7 [formerly 3f1e21107b] [formerly c5da5ccb9b [formerly 4632e2694c2d06c6b61ae9b61eee3b3584c6bebc]]]]]
Former-commit-id: c5da5ccb9b
Former-commit-id: 1b06184e09 [formerly 5866b1672b] [formerly 01fa82955b] [formerly 27fa79ce35d800349c14ec25973acdc1dedb8c4d [formerly 68f23f587842499a379ea50ee1e7d61c11b6329e] [formerly 01fa82955b [formerly edc2745d1f]]]
Former-commit-id: 09a5cfaad52c0d79106489dcd24ebcbe03734936 [formerly 2cb2c28c4886558bdf857b3cad7623d7c1988033] [formerly 11a05cae90 [formerly 54640500a6]]
Former-commit-id: 11a05cae90
Former-commit-id: 32aae0aa64
 2014-09-19 14:02:54 -05:00
Mark Peters
c5da5ccb9b Omaha #3627 Delete or replace dead or deprecated methods and classes from com.raytheon.uf.edex.decodertools 
Change-Id: I95e881042e09a18f45b4410a76dbcf828dac0d4f

Former-commit-id: 4632e2694c2d06c6b61ae9b61eee3b3584c6bebc
 2014-09-19 14:02:54 -05:00
Mark Peters
68044d2dd7 Omaha #3627 Delete or replace dead or deprecated methods and classes from com.raytheon.uf.edex.decodertools 
Change-Id: I95e881042e09a18f45b4410a76dbcf828dac0d4f

Former-commit-id: c5da5ccb9b [formerly 4632e2694c2d06c6b61ae9b61eee3b3584c6bebc]
Former-commit-id: 3f1e21107b
 2014-09-19 14:02:54 -05:00
Nate Jensen
de88b824d1 Omaha #3133 remove unnecessary register buddies 
Change-Id: I2ddc877d402d34a2db78d665f304da5fe212aaf4

Former-commit-id: 71db5ae1b2 [formerly 0556146804] [formerly 6077794cc9] [formerly 6077794cc9 [formerly 9219e1e254]] [formerly 71db5ae1b2 [formerly 0556146804] [formerly 6077794cc9] [formerly 6077794cc9 [formerly 9219e1e254]] [formerly 53633a6ed4 [formerly 6077794cc9 [formerly 9219e1e254] [formerly 53633a6ed4 [formerly c91a7d4084be3753ad51afd11b46b621af0bc878]]]]]
Former-commit-id: 53633a6ed4
Former-commit-id: 214409cb2c [formerly 325e99b711] [formerly 1117e5b995] [formerly 146e1a487703095630365f22120b33dc0851ab28 [formerly 0911e2aed4682ca78820538d0dc0fe963c7ebf04] [formerly 1117e5b995 [formerly 5062338b2d]]]
Former-commit-id: 4f890a51204cda420c3674c3da0ebb4da506bda6 [formerly e76ebd5fe5ff6d669467f7ad5f3bce7a3a3e32c8] [formerly 6d3b2d3119 [formerly 3239b1956b]]
Former-commit-id: 6d3b2d3119
Former-commit-id: 266d148803
 2014-06-23 14:13:19 -05:00
Nate Jensen
53633a6ed4 Omaha #3133 remove unnecessary register buddies 
Change-Id: I2ddc877d402d34a2db78d665f304da5fe212aaf4

Former-commit-id: c91a7d4084be3753ad51afd11b46b621af0bc878
 2014-06-23 14:13:19 -05:00
Nate Jensen
6077794cc9 Omaha #3133 remove unnecessary register buddies 
Change-Id: I2ddc877d402d34a2db78d665f304da5fe212aaf4

Former-commit-id: 53633a6ed4 [formerly c91a7d4084be3753ad51afd11b46b621af0bc878]
Former-commit-id: 9219e1e254
 2014-06-23 14:13:19 -05:00
Nate Jensen
27704b7eb2 Issue #2984 remove unnecessary plugins from features 
remove unnecessary uengine dependencies from manifests

Change-Id: Ic76eb5faa4b14cb4ea133ab74532bacd1a05c23d

Former-commit-id: 75c3217811 [formerly c0df96e085] [formerly e24940ead6] [formerly e24940ead6 [formerly 6e2d68e102]] [formerly 75c3217811 [formerly c0df96e085] [formerly e24940ead6] [formerly e24940ead6 [formerly 6e2d68e102]] [formerly 57f2357f10 [formerly e24940ead6 [formerly 6e2d68e102] [formerly 57f2357f10 [formerly c59a5d99ce31464bacd7c266543f10f523719a07]]]]]
Former-commit-id: 57f2357f10
Former-commit-id: 1d3ccf2d91 [formerly dacc1d5996] [formerly 97f09968b3] [formerly 81903d15828e4386d926f53f4fc2518586479a6f [formerly dad31d1699bb36bcaccd3d7e306c1af3e1f8b973] [formerly 97f09968b3 [formerly d435258fce]]]
Former-commit-id: ddd5af6660945465a91b406226d0bcea92ec2fd3 [formerly 08b4ba0f6890ecc9a2f8f524712a671b0d736980] [formerly 697a7f5b9b [formerly 9ad8236b8d]]
Former-commit-id: 10f42ac1963ef1194862f6590df0fa751c42abd6 [formerly 697a7f5b9b]
Former-commit-id: 148a31d3ad
 2014-04-14 16:50:54 -05:00
Nate Jensen
57f2357f10 Issue #2984 remove unnecessary plugins from features 
remove unnecessary uengine dependencies from manifests

Change-Id: Ic76eb5faa4b14cb4ea133ab74532bacd1a05c23d

Former-commit-id: c59a5d99ce31464bacd7c266543f10f523719a07
 2014-04-14 16:50:54 -05:00
Nate Jensen
e24940ead6 Issue #2984 remove unnecessary plugins from features 
remove unnecessary uengine dependencies from manifests

Change-Id: Ic76eb5faa4b14cb4ea133ab74532bacd1a05c23d

Former-commit-id: 57f2357f10 [formerly c59a5d99ce31464bacd7c266543f10f523719a07]
Former-commit-id: 6e2d68e102
 2014-04-14 16:50:54 -05:00
Richard Peter
e3acf69b67 Issue #2726: Edex graceful shutdown. 
Refactored to use inheritance and separate logic where possible.
             Addressed comments.

Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6

Former-commit-id: 71e346aa6e [formerly 909571ebca] [formerly e4be1f24e7] [formerly e4be1f24e7 [formerly dbba727f3d]] [formerly 71e346aa6e [formerly 909571ebca] [formerly e4be1f24e7] [formerly e4be1f24e7 [formerly dbba727f3d]] [formerly 17196b5dcd [formerly e4be1f24e7 [formerly dbba727f3d] [formerly 17196b5dcd [formerly 6e015b3f61c20635077d6e8271e9b763e5a32fe1]]]]]
Former-commit-id: 17196b5dcd
Former-commit-id: d0a777af20 [formerly b5fa843960] [formerly ff87317bd4] [formerly cbcebac15f275807040d7d9aa3027c2acd7260c5 [formerly f202d7fc11f48792bac7d10cbb20d9ba9077aa8f] [formerly ff87317bd4 [formerly 8b279966d1]]]
Former-commit-id: c48e10bcbfe92998b9a086945e3156a81b57c106 [formerly b1349363c5b25965107de3827211c7bcc6b9e98b] [formerly de624d87d3 [formerly b3fd8e5480]]
Former-commit-id: de624d87d3
Former-commit-id: 5350b3eac8
 2014-04-14 13:10:11 -05:00
Richard Peter
17196b5dcd Issue #2726: Edex graceful shutdown. 
Refactored to use inheritance and separate logic where possible.
             Addressed comments.

Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6

Former-commit-id: 6e015b3f61c20635077d6e8271e9b763e5a32fe1
 2014-04-14 13:10:11 -05:00
Richard Peter
e4be1f24e7 Issue #2726: Edex graceful shutdown. 
Refactored to use inheritance and separate logic where possible.
             Addressed comments.

Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6

Former-commit-id: 17196b5dcd [formerly 6e015b3f61c20635077d6e8271e9b763e5a32fe1]
Former-commit-id: dbba727f3d
 2014-04-14 13:10:11 -05:00
David Friedman
8230919596 Merge branch 'master_14.2.2' into asm_14.2.2 
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.

Conflicts:
	cave/build/static/linux/cave/cave.sh
	cave/build/static/linux/cave/caveUtil.sh
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
	edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d

Former-commit-id: b3492e55de [formerly ee37afaf7b] [formerly 32a7adbe4b] [formerly 32a7adbe4b [formerly fd900e38c2]] [formerly b3492e55de [formerly ee37afaf7b] [formerly 32a7adbe4b] [formerly 32a7adbe4b [formerly fd900e38c2]] [formerly f146c7bcd0 [formerly 32a7adbe4b [formerly fd900e38c2] [formerly f146c7bcd0 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]]]]]
Former-commit-id: f146c7bcd0
Former-commit-id: b0bec4816d [formerly 1e4ac84f99] [formerly 1168a3eae5] [formerly 292af91e33e58076664a7b293339b7ad623ff349 [formerly 06e6f2e7e7ae2f1959eaefcb5e76c2a04c33de99] [formerly 1168a3eae5 [formerly 533d15c863]]]
Former-commit-id: 241abf743c90e94431e5559e7fcdeb450730b8fb [formerly beb961d5304e2c2df6afc0538bae8011c8b6f63f] [formerly 8f8f55dd3c [formerly dde12b4fc3]]
Former-commit-id: 8f8f55dd3c
Former-commit-id: 8ea6e0b064
 2014-03-27 19:17:03 +00:00
David Friedman
f146c7bcd0 Merge branch 'master_14.2.2' into asm_14.2.2 
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.

Conflicts:
	cave/build/static/linux/cave/cave.sh
	cave/build/static/linux/cave/caveUtil.sh
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
	edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d

Former-commit-id: cf35c1870fc4b6b3c2ceaf038274c4701f8046b1
 2014-03-27 19:17:03 +00:00
David Friedman
32a7adbe4b Merge branch 'master_14.2.2' into asm_14.2.2 
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.

Conflicts:
	cave/build/static/linux/cave/cave.sh
	cave/build/static/linux/cave/caveUtil.sh
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
	edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d

Former-commit-id: f146c7bcd0 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]
Former-commit-id: fd900e38c2
 2014-03-27 19:17:03 +00:00
Steve Harris
48ae4a3aa3 Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8) 
merge performed by Richard Peter

Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/build.edex/esb/conf/log4j-registry.xml
	edexOsgi/build.edex/esb/conf/log4j.xml
	edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
	edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
	edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
	ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
	rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh

Former-commit-id: 06c150bcdd [formerly 52226061e9] [formerly 3ba28aabea] [formerly 3ba28aabea [formerly 069093884f]] [formerly 06c150bcdd [formerly 52226061e9] [formerly 3ba28aabea] [formerly 3ba28aabea [formerly 069093884f]] [formerly ffcc34f8d4 [formerly 3ba28aabea [formerly 069093884f] [formerly ffcc34f8d4 [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]]]]
Former-commit-id: ffcc34f8d4
Former-commit-id: 4cfc6d84a7 [formerly d2a6b0c18b] [formerly 587f15a95d] [formerly 1fa0e84ac0f2dd8de749139eafb9aa66140436cc [formerly 075449ff82fabd2fc67648dd472bd7d35adee380] [formerly 587f15a95d [formerly 96658d8ce0]]]
Former-commit-id: 5c0f036af8f316e16fd73f1b69840385e4c7b0bb [formerly 988fe07191d81cd8942573f69248d26d68d20315] [formerly 2db5dcf6eb [formerly 36a0533f19]]
Former-commit-id: 2db5dcf6eb
Former-commit-id: a19beb1e5d
 2014-03-06 08:39:43 -06:00
Steve Harris
ffcc34f8d4 Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8) 
merge performed by Richard Peter

Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/build.edex/esb/conf/log4j-registry.xml
	edexOsgi/build.edex/esb/conf/log4j.xml
	edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
	edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
	edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
	ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
	rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh

Former-commit-id: 889200c9eb3fbb835f8fef067476799f30a7a7e0
 2014-03-06 08:39:43 -06:00
Steve Harris
3ba28aabea Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8) 
merge performed by Richard Peter

Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/build.edex/esb/conf/log4j-registry.xml
	edexOsgi/build.edex/esb/conf/log4j.xml
	edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
	edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
	edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
	ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
	rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh

Former-commit-id: ffcc34f8d4 [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]
Former-commit-id: 069093884f
 2014-03-06 08:39:43 -06:00
Brian.Dyke
020aa7cfab OB_14.1.1-19 baseline 
Former-commit-id: 800e8b558a [formerly 3508e488f5] [formerly 779553142c] [formerly 779553142c [formerly cfa4997978]] [formerly 800e8b558a [formerly 3508e488f5] [formerly 779553142c] [formerly 779553142c [formerly cfa4997978]] [formerly 10b723647b [formerly 779553142c [formerly cfa4997978] [formerly 10b723647b [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]]]]
Former-commit-id: 10b723647b
Former-commit-id: 19d6b57ea2 [formerly 5a11fbbfdb] [formerly c41dd22ff2] [formerly 6b5bf3c8fb87d2dc67f4593e070f4f3c708f8426 [formerly f52dfb462cf92e04bf51f942fd80bfc621074563] [formerly c41dd22ff2 [formerly 64044e7ce5]]]
Former-commit-id: 100eb41e4ae52d44d6ab218523f95c742b10b75d [formerly 8cf9beeb99ea9f03c45e09f6c11fba57ddab3585] [formerly f86f9f8918 [formerly 1b359c2564]]
Former-commit-id: f86f9f8918
Former-commit-id: de9e6553a9
 2014-02-21 06:50:59 -05:00
Brian.Dyke
10b723647b OB_14.1.1-19 baseline 
Former-commit-id: db2a591456383d8f980d33757e8c161bdcc01d3a
 2014-02-21 06:50:59 -05:00
Brian.Dyke
779553142c OB_14.1.1-19 baseline 
Former-commit-id: 10b723647b [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]
Former-commit-id: cfa4997978
 2014-02-21 06:50:59 -05:00
brian.dyke
d0df06c218 merge 14.2.1-3 into asm-14.2.2 
Former-commit-id: 5b74176d3b [formerly becf6322c6] [formerly 4a62e83835] [formerly f121ee384ae6474f6d0db204389a1736d5bede01 [formerly 4a62e83835 [formerly 2294c81a57]]] [formerly 5b74176d3b [formerly becf6322c6] [formerly 4a62e83835] [formerly f121ee384ae6474f6d0db204389a1736d5bede01 [formerly 4a62e83835 [formerly 2294c81a57]]] [formerly f10f6d4e8a [formerly 4a62e83835 [formerly 2294c81a57] [formerly f10f6d4e8a [formerly a116be206fc8a24dd12610db37db6f26c65a19b0]]]]]
Former-commit-id: f10f6d4e8a
Former-commit-id: 21a827151b [formerly ac37e2ea2e] [formerly 621464ac0d] [formerly 9043d578b89b573988a90ad05bb77fa0d18398cc [formerly 83bf7b38976fc3a19f898b0fe2c8e7790a8d7629] [formerly 621464ac0d [formerly e9e2eb3be0]]]
Former-commit-id: 9f664eca18786308211e3ab9e6cacef5813f30a4 [formerly ee40d762efff70a1679bc3c2641d377b51facc3b] [formerly ca9263003a [formerly dcf5f25ed1]]
Former-commit-id: ca9263003a
Former-commit-id: 4744c64069
 2014-01-27 15:27:49 -05:00
brian.dyke
f10f6d4e8a merge 14.2.1-3 into asm-14.2.2 
Former-commit-id: a116be206fc8a24dd12610db37db6f26c65a19b0
 2014-01-27 15:27:49 -05:00