Commit graph

3300 commits

Author SHA1 Message Date
Nate Jensen
181da0bc6a Merge "Omaha #3078 added private chat to collaboration" into omaha_14.4.1
Former-commit-id: 7fb85a1acc [formerly 7fb85a1acc [formerly 2c2b3891003076484539ef5fa7d6772b6336c635]]
Former-commit-id: c05ae83ea2
Former-commit-id: 0d71d5dc2b
2014-06-17 16:24:42 -05:00
Nate Jensen
479ccb41f4 Merge "Omaha #3110 Fix typos in revision comment and log message. Changed to log number of messages in queue instead of number being added to queue." into omaha_14.4.1
Former-commit-id: d8dc6eceef [formerly d8dc6eceef [formerly 6efd831efcc5372c7e7bfd52265d13de382407ee]]
Former-commit-id: acd7620d7a
Former-commit-id: 485aced54c
2014-06-17 14:21:55 -05:00
Ron Anderson
b6f47567b2 Merge "Omaha #3274 switch viz to G1 garbage collector" into omaha_14.4.1
Former-commit-id: d5c2170a20 [formerly d5c2170a20 [formerly a971a5b1d27611c8b3a9a47b76efafa0c2c7a9fc]]
Former-commit-id: 855b4ad7c1
Former-commit-id: 79c6182cc9
2014-06-17 13:54:11 -05:00
Ron Anderson
2728191963 Omaha #3110 Fix typos in revision comment and log message.
Changed to log number of messages in queue instead of number being added to queue.

Change-Id: I0f6b2be8e62be964de993c6c66f042b371a80bd7

Former-commit-id: b7843361f6 [formerly b7843361f6 [formerly 0cf0e93eabd440cf0ca3e88ac36c62b3309b6527]]
Former-commit-id: 1a8ccd0181
Former-commit-id: e31eabe77b
2014-06-17 13:46:38 -05:00
Brian Clements
4433482d56 Omaha #3078 added private chat to collaboration
Change-Id: Ifcc4a33c1551e4209721fcc181b0becb49bdb5ae

Former-commit-id: 37699395ef [formerly 37699395ef [formerly 93f7d7088e7d7888a878558c6f2fcc368bf3ab05]]
Former-commit-id: 97a6f5bfe8
Former-commit-id: 60508bf674
2014-06-17 11:52:58 -05:00
Nate Jensen
fe47ecf6ce Omaha #3274 switch viz to G1 garbage collector
Change-Id: I720c4ebb21bd3a37dcc71f8879bb96edb6a0b109

Former-commit-id: 4a91c3320b [formerly 4a91c3320b [formerly 0355813f030ac996427c64dfcb6cbd4dd781ad2f]]
Former-commit-id: 44cb0e6ae6
Former-commit-id: 3981241355
2014-06-17 10:54:57 -05:00
Brian Clements
616315d830 Omaha #3288 collaboration feed venue config comes from server
Change-Id: I5bc747507e44cc31093d7a7f470a263d0cf116c0

Former-commit-id: b6a2bf0ae4 [formerly b6a2bf0ae4 [formerly baab2ea12e1117446295ae60bc06228eb6139895]]
Former-commit-id: 84e3f967d9
Former-commit-id: 5436efb886
2014-06-17 09:26:24 -05:00
Nate Jensen
ea80faede7 Merge "Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings." into omaha_14.4.1
Former-commit-id: b1acd1709a [formerly b1acd1709a [formerly 2ee54c1f78136332f1cd2c40da0c2e7953510e7f]]
Former-commit-id: 9b7ed95e6b
Former-commit-id: 521065548d
2014-06-16 09:26:30 -05:00
Nate Jensen
35ed3931c3 Merge "Omaha #3265 Fix potential NPE in D2D time matching." into omaha_14.4.1
Former-commit-id: 5fad6501a7 [formerly 5fad6501a7 [formerly 83d1a4b6e69e3fe1bb350beba4f36eb3bf34e05d]]
Former-commit-id: b3df7745d4
Former-commit-id: 752fe50104
2014-06-16 09:00:47 -05:00
Nate Jensen
e01ddac6ad Merge "Omaha #3163 Fix NPE when styleless strings are sent to 14.3" into omaha_14.4.1
Former-commit-id: 181a87e72d [formerly 181a87e72d [formerly 34250721f97f05be61e9e4e8b6f71758347a9f60]]
Former-commit-id: 5908a4501a
Former-commit-id: 442a3d9683
2014-06-16 09:00:39 -05:00
Steve Harris
8270fd8a9f Merge branch 'omaha_14.3.1' (14.3.1-10,11) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Vector.py
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CCP.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GVV.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
	edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java

Former-commit-id: 9213369739 [formerly 9213369739 [formerly 48a7eabebb78db9b97201c44ff5c71af3ee78de7]]
Former-commit-id: e1c8ad2611
Former-commit-id: 362988b9d7
2014-06-16 08:19:12 -05:00
Ben Steffensmeier
07f36a59a7 Omaha #3265 Fix potential NPE in D2D time matching.
Former-commit-id: 81fbf3b697 [formerly 81fbf3b697 [formerly 9fea363e4fd21f2e9dc06b9450b71eb174dd0a29]]
Former-commit-id: 29b423645e
Former-commit-id: b0ff6298f1
2014-06-13 16:58:35 -05:00
Ben Steffensmeier
991dff52d2 Omaha #3163 Fix NPE when styleless strings are sent to 14.3
Former-commit-id: 1f8f612d3a [formerly 1f8f612d3a [formerly 3c1dd0e7daea7149a02b1a5e2be1a0db27e662d5]]
Former-commit-id: 7245544e1f
Former-commit-id: 59b5076a66
2014-06-13 16:49:25 -05:00
Nate Jensen
198da6201c Merge "Omaha #3263 Check for null when mosaic time matches." into omaha_14.4.1
Former-commit-id: ba2f130b13 [formerly ba2f130b13 [formerly c8f486ed32dfffff69ff9e9fefe1320c4ec009f4]]
Former-commit-id: fc905ca588
Former-commit-id: 907fc445a3
2014-06-12 15:14:50 -05:00
Brian Clements
e13aeb0ca5 Omaha #3267 fixed collaboration NPE possibility
Change-Id: I9bc68be7d9106396a0c369e3181e15baf25ca260

Former-commit-id: adbffa5ddd [formerly adbffa5ddd [formerly a23e57f3d1a6f4213216a7e038b85b17b6628faa]]
Former-commit-id: 91eb7d40c2
Former-commit-id: 3bdbf79eeb
2014-06-12 15:06:46 -05:00
Ben Steffensmeier
5e433c9871 Omaha #3263 Check for null when mosaic time matches.
Former-commit-id: 5355ca8c1c [formerly 5355ca8c1c [formerly 913d70b860c1f129d1632dfd1d84e5fbcca5e2d9]]
Former-commit-id: df2fed2be3
Former-commit-id: ab616254bf
2014-06-12 15:00:26 -05:00
Nate Jensen
4dc987369a Merge "Omaha #2061 Remove dataURI from acars." into omaha_14.4.1
Former-commit-id: 387b0604cc [formerly 387b0604cc [formerly 6e2588a672ceb81a922be9fcdac9a4212376ed5f]]
Former-commit-id: d3417d8e45
Former-commit-id: 6220def099
2014-06-12 14:27:47 -05:00
Ben Steffensmeier
81b4860e27 Omaha #2061 Remove dataURI from acars.
Former-commit-id: f66725a515 [formerly f66725a515 [formerly e8b5ea58ca12878922be01c815a354703f5f4387]]
Former-commit-id: 35ad2f2b8d
Former-commit-id: e227d408db
2014-06-12 13:59:45 -05:00
Nate Jensen
0a893a8692 Omaha #3270 fix warngen manifest's register buddy
Change-Id: I273bc344c60fb4c824241a28949a1ce9fb3020a2

Former-commit-id: 31b3029e02 [formerly 31b3029e02 [formerly 796e242b031087e08b9ba5e44664d6b400405c42]]
Former-commit-id: 305564d6f0
Former-commit-id: 0b185c3b6c
2014-06-12 13:58:27 -05:00
Nate Jensen
576fc405e5 Merge "Omaha #3269 - Fix editing of Notifiers before saving Amend - Remove save confirmation dialog, rename buttons" into omaha_14.4.1
Former-commit-id: 4ac8246386 [formerly 4ac8246386 [formerly 88280dedea4b6065a5603ac26e982eab0a2e0e72]]
Former-commit-id: f118e1b0e9
Former-commit-id: 343b88e3b3
2014-06-12 12:36:14 -05:00
Richard Peter
52b9f0107f Merge "Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200)." into omaha_14.4.1
Former-commit-id: df86770b4e [formerly df86770b4e [formerly 3285557835e929a6b7048f4445d1da45ae8e1325]]
Former-commit-id: 7731e25983
Former-commit-id: 40e2813f50
2014-06-12 12:35:24 -05:00
Nate Jensen
7fac05ac42 Omaha #3247 upgrade build.cave's xalan jar
Change-Id: Idd4e0d583ef4ad91bcde99278e3e035f1f12e434

Former-commit-id: d4471bf759 [formerly d4471bf759 [formerly c2d32dddb2bba04b46099d8745ff541989e1a281]]
Former-commit-id: 95fe41966a
Former-commit-id: a6fa27a1b8
2014-06-12 11:38:22 -05:00
Slav Korolev
a66dd879c7 Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200).
Former-commit-id: 2b877529ce [formerly 2b877529ce [formerly 0172e8f27b646a965e472f969f112a4e170d9f41]]
Former-commit-id: 16ec392c12
Former-commit-id: d8ebeb4778
2014-06-12 12:24:34 -04:00
Mike Duff
5e0aa25048 Omaha #3269 - Fix editing of Notifiers before saving
Amend - Remove save confirmation dialog, rename buttons

Change-Id: I0dd81db4c74d07f0535341fc410c288b077463c4

Former-commit-id: 80922824a3 [formerly 80922824a3 [formerly 47d57692c81757a8b8c0d3217e21f701f18cdf2c]]
Former-commit-id: c920a24300
Former-commit-id: b15b6514fd
2014-06-12 11:21:15 -05:00
Roger Ferrel
5e9ed74eac Omaha #3252 Fix bug in __makeHader to prevent unexpected exception.
Former-commit-id: 960772ea44 [formerly 960772ea44 [formerly 787261f13c47b5de81b2e7c4f861645614a11f1f]]
Former-commit-id: 42fe1bf5b2
Former-commit-id: 95d7540d05
2014-06-12 10:08:51 -05:00
Ben Steffensmeier
f6ea37ef66 Omaha #3217 Add always prompt option to thinclient connectivity dialog.
Former-commit-id: b8f331bfba [formerly b8f331bfba [formerly aac3fdd00b429932d9cfa5d950f9729ace54a933]]
Former-commit-id: c70462fb8a
Former-commit-id: 96591c2ddb
2014-06-11 17:00:16 -05:00
Ben Steffensmeier
3c8b94e08a Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings.
Former-commit-id: f292f204c9 [formerly f292f204c9 [formerly e267e8b0bae314abf3396db6072c6ff8adc732bf]]
Former-commit-id: fc25774506
Former-commit-id: 94b465fa15
2014-06-11 13:45:42 -05:00
Nate Jensen
717523bf0e Merge "Omaha #3266 remove unused attributes and elements from baseline menu xml files" into omaha_14.4.1
Former-commit-id: 04a6c1d5b7 [formerly 04a6c1d5b7 [formerly b97df26a25976d58409dad8e43b1ca3ce7471133]]
Former-commit-id: 4354bac2d5
Former-commit-id: 753b7ddd5c
2014-06-11 13:09:34 -05:00
Ben Steffensmeier
02c4332c6a Omaha #2061 Remove IDecoderGettable from all AWIPS2 Raytheon PDOs.
Former-commit-id: d838ecc734 [formerly d838ecc734 [formerly b6c63e5791a2438253d6ff039b5164c61105a941]]
Former-commit-id: 30415ae8c5
Former-commit-id: eb7cf7e8da
2014-06-11 12:38:35 -05:00
Nate Jensen
70589056d1 Omaha #3266 remove unused attributes and elements from baseline menu xml
files

Change-Id: I1a1f75f2b2a314679487ddf719f4f0055bdf8d01

Former-commit-id: 205e491d71 [formerly 205e491d71 [formerly 797504a970ec39c4fd56c9e0d51b292acfceea1b]]
Former-commit-id: 955e115c00
Former-commit-id: f634182937
2014-06-10 18:30:14 -05:00
Nate Jensen
57f48654ac Merge "Omaha #2061 Delete PlotResource, rename PlotResource2." into omaha_14.4.1
Former-commit-id: 6890ee0920 [formerly 6890ee0920 [formerly b0903898a40916383f88b920e87dfc072d9cafa9]]
Former-commit-id: 10207907d8
Former-commit-id: 33b22ece81
2014-06-10 17:14:53 -05:00
Ben Steffensmeier
f60667703f Omaha #3263 Synchronize dataTimes of storm track resources.
Former-commit-id: eff1921f70 [formerly eff1921f70 [formerly d0a3a73a3a2375a49dc3e224a1c13956530d3351]]
Former-commit-id: cad15768cc
Former-commit-id: b02383f878
2014-06-10 16:34:44 -05:00
Ben Steffensmeier
6a5b6dcf8e Omaha #2061 Delete PlotResource, rename PlotResource2.
Former-commit-id: 1e37d669d8 [formerly 1e37d669d8 [formerly b569c7c3e175ed1519576aea63048c3f675d3875]]
Former-commit-id: a98872cb89
Former-commit-id: d40c6fd625
2014-06-10 15:59:15 -05:00
Nate Jensen
17e3c5f898 Merge "Omaha #3226 added total lightning decoder" into omaha_14.4.1
Former-commit-id: c8b6324240 [formerly c8b6324240 [formerly ffa3e069c0beb5678ecb863b2950556d8c289ae1]]
Former-commit-id: 19bef8d080
Former-commit-id: 1d619bcf95
2014-06-09 09:38:50 -05:00
Brian Clements
ca1b869647 Omaha #3226 added total lightning decoder
refactored binlightning to support pulse data
renamed strikeCount dataset to pulseCount
added initial cave support for total lightning

Change-Id: I67f8a0f26a615ddefb9ff7f7d7d78bb05f0877f3

Former-commit-id: c278000764 [formerly c278000764 [formerly e2583481a77d08249030838ebd52eed6e54b2986]]
Former-commit-id: f39896b2d1
Former-commit-id: b98a3494fe
2014-06-06 14:39:57 -05:00
Nate Jensen
24f7247805 Merge "Omaha #3232 Radar code improvements." into omaha_14.4.1
Former-commit-id: 3b324093ae [formerly 3b324093ae [formerly 22a5da1feff7e30ea0408f089305d95657befad2]]
Former-commit-id: 920e53628b
Former-commit-id: c0f047b24f
2014-06-05 17:38:32 -05:00
Ben Steffensmeier
9e97750df2 Omaha #3232 Radar code improvements.
Former-commit-id: 8587b9b43b [formerly 8587b9b43b [formerly 696f45d67c5e5b02183f97cfcc139db017f01848]]
Former-commit-id: 26325b57be
Former-commit-id: b8fe181c9a
2014-06-05 14:53:25 -05:00
Roger Ferrel
050c2e87e7 Omaha #3098 Changes to also look at 'Wx' occasional (TEMPO) data.
Change-Id: Ide97fbfd93bf06a6d708bf6fbd74349000ba2ed5

Former-commit-id: e1c011b157 [formerly e1c011b157 [formerly 3e976b7ed5cf46687bbb76073e53f35ffc2c2812]]
Former-commit-id: 10e7a33f08
Former-commit-id: aa085d9e59
2014-06-04 08:14:06 -05:00
Brian.Dyke
75c6886f61 Merge branch 'asm_14.3.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.3.1
Former-commit-id: 61b206be0b [formerly 61b206be0b [formerly 36fa86071fa492bd1d135b3ded6cde54d0567474]]
Former-commit-id: 3919c9ec2f
Former-commit-id: 244467210c
2014-06-04 07:46:16 -04:00
Kenneth Sperow
3e94502542 Merge remote branch 'origin/master_14.3.1' into field_14.3.1. Merge up to dec7b6fa
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml

Change-Id: I9d39ab71514eaf81d6c841dc7358bcc92f46ddd8

Former-commit-id: c302ef8967 [formerly c302ef8967 [formerly b0e1387ccf5f7b12b83c3adbb6c873cca9a7d2a5]]
Former-commit-id: f2a738cc25
Former-commit-id: ca913b6159
2014-06-03 20:55:29 -07:00
brian.dyke
21721fd935 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 79f866fb17 [formerly 79f866fb17 [formerly 2d4751c000176447d28b284337fb23a60cb19cd1]]
Former-commit-id: b3d95ca18d
Former-commit-id: 76cbdf64ff
2014-06-03 16:14:16 -04:00
Ben Steffensmeier
b40e97f5ac Omaha #3163 Fix collaboration string differencing
Former-commit-id: ca2210b3e7 [formerly ca2210b3e7 [formerly e6f30c822de26bafae339a8871c4ba98100e6d1a]]
Former-commit-id: 310e6562e6
Former-commit-id: 72f1d7c950
2014-06-03 13:51:46 -05:00
Ron Anderson
7171bc6f0a Omaha #3052 Improved TopoQuery error handling to throw exceptions with useful error messages.
Change-Id: Ic181682611801ea244b986e8a2ce1400c4dc15d1

Former-commit-id: 3f169399b8 [formerly 3f169399b8 [formerly 0d42d4fdc56122c3df912c93e5e09b0ab28c1b37]]
Former-commit-id: 304364e356
Former-commit-id: 3ff441f9da
2014-06-02 17:14:18 -05:00
Nate Jensen
ba546c3001 Merge "Omaha #2918 Synchronize mosaic dataTimes." into omaha_14.4.1
Former-commit-id: d94a040f29 [formerly d94a040f29 [formerly 4abb30354ef4f6c6520ee993a66371656db0db9f]]
Former-commit-id: a862846e15
Former-commit-id: 1f4daca6e3
2014-06-02 12:44:17 -05:00
Steve Harris
cbceb4ea62 Merge branch 'omaha_14.3.1' (14.3.1-8) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/whfslib/colorthreshold/GetColorValues.java
	edexOsgi/build.edex/edex/common.properties
	edexOsgi/build.edex/esb/conf/modes.xml
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so

Former-commit-id: 7fec0d039c [formerly 7fec0d039c [formerly 45250149681f057cf168f4d3cb27276279f62c05]]
Former-commit-id: 455eb8b39d
Former-commit-id: ec743199f1
2014-06-02 11:21:46 -05:00
Ben Steffensmeier
cbe8c64e73 Omaha #2918 Synchronize mosaic dataTimes.
Former-commit-id: 8a117864d8 [formerly 8a117864d8 [formerly c4d8ed9d0d7eb4c17d8a0922302a3fc50a0ae383]]
Former-commit-id: b078baf67d
Former-commit-id: b4e1a98e23
2014-06-02 10:41:45 -05:00
Steve Harris
46b7122d56 Merge branch 'master_14.3.1' (14.3.1-8) into omaha_14.3.1
Former-commit-id: 65a3390a6a [formerly 65a3390a6a [formerly ee696cb24c8d72f0562126a131824e958b88f090]]
Former-commit-id: 3bde6b3e41
Former-commit-id: c3deafc840
2014-06-02 07:31:14 -05:00
Brian.Dyke
45deec5df6 Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: b8ba378862 [formerly b8ba378862 [formerly dec7b6fa091cab098b89a51551fa46b9f28b959b]]
Former-commit-id: c6244e1950
Former-commit-id: 6edbd149a5
2014-06-02 07:01:37 -04:00
Ron Anderson
ecaa8ab0a9 Omaha #2841 Fix errors when formatters fail to queue due to pending limit.
Change-Id: Icf70e25369a23b7b554718cf235feda02e615f0d

Former-commit-id: 1108744b40 [formerly 1108744b40 [formerly b15cb1632b58c415399ccc8dee6cf2c13140355f]]
Former-commit-id: 22d67fcad1
Former-commit-id: 33abe4a8d3
2014-05-30 10:47:28 -05:00
Brian.Dyke
a23d371522 Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
VLab Issue #3454 - HPE dual-polarization upgrade

Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
	edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults

Former-commit-id: a8737e18f0 [formerly a8737e18f0 [formerly 9d7a819489480e119b65cb5643520818adeb1ebf]]
Former-commit-id: 3f1e12effc
Former-commit-id: 66aacd6578
2014-05-30 10:46:25 -04:00