Commit graph

6282 commits

Author SHA1 Message Date
Nate Jensen
8aa1e4aacb Merge "Omaha #3163 Fix NPE when styleless strings are sent to 14.3" into omaha_14.4.1
Former-commit-id: 4544d7d3e0 [formerly 181a87e72d] [formerly 5908a4501a [formerly 34250721f97f05be61e9e4e8b6f71758347a9f60]]
Former-commit-id: 5908a4501a
Former-commit-id: 442a3d9683
2014-06-16 09:00:39 -05:00
Greg Armendariz
5fd5c7f8ff Merge "Omaha #3247 - Update qpid dependency" into omaha_14.4.1
Former-commit-id: e73a0de182 [formerly faebbc13f7] [formerly 8c568a223e [formerly 2484a3407392f64b51b93bd3a4dab04194debea5]]
Former-commit-id: 8c568a223e
Former-commit-id: 5c8c3ba6b3
2014-06-16 08:57:12 -05:00
Nate Jensen
50715cc012 Merge "Issue #2903 changed collaboration jaxb xml to be base64 encoded" into omaha_14.3.1
Former-commit-id: eddc8f373a [formerly c2aa87470d] [formerly ed36453f09 [formerly 93f63c0d42941001e4d59a4840df5e5b525592bf]]
Former-commit-id: ed36453f09
Former-commit-id: ef61539a8a
2014-06-16 08:31:30 -05:00
Steve Harris
d7cd0ac02c 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: 97843cf58e [formerly 9213369739] [formerly e1c8ad2611 [formerly 48a7eabebb78db9b97201c44ff5c71af3ee78de7]]
Former-commit-id: e1c8ad2611
Former-commit-id: 362988b9d7
2014-06-16 08:19:12 -05:00
Steve Harris
f2d30c4c62 Merge branch 'master_14.3.1' (14.3.1-10,11) into omaha_14.3.1
Former-commit-id: 0c3dcb77d5 [formerly 1d2b8aeb7b] [formerly 6c82cc5c3d [formerly 4041e8afbb4bf1c0c416624140d74d27e963f9c8]]
Former-commit-id: 6c82cc5c3d
Former-commit-id: 7a8741d8fa
2014-06-16 07:49:58 -05:00
Greg Armendariz
3bd1c7ff81 Omaha #3247 - Update qpid dependency
Former-commit-id: c14107d4cf [formerly db4e94b713] [formerly 70104bc9aa [formerly 9a6a0c9941aaa9b49da7329cccb7e05456ad514c]]
Former-commit-id: 70104bc9aa
Former-commit-id: d2f9344b5f
2014-06-14 08:13:14 -05:00
Ben Steffensmeier
18f1cd9d5b Omaha #3265 Fix potential NPE in D2D time matching.
Former-commit-id: 9caf60a551 [formerly 81fbf3b697] [formerly 29b423645e [formerly 9fea363e4fd21f2e9dc06b9450b71eb174dd0a29]]
Former-commit-id: 29b423645e
Former-commit-id: b0ff6298f1
2014-06-13 16:58:35 -05:00
Ben Steffensmeier
1282f74317 Omaha #3163 Fix NPE when styleless strings are sent to 14.3
Former-commit-id: d2997f9fc0 [formerly 1f8f612d3a] [formerly 7245544e1f [formerly 3c1dd0e7daea7149a02b1a5e2be1a0db27e662d5]]
Former-commit-id: 7245544e1f
Former-commit-id: 59b5076a66
2014-06-13 16:49:25 -05:00
Brian.Dyke
c1bd7a0c55 CM-MERGE:OB13.5.6-3 into 14.1.3
Merge branch 'master_14.1.3_merge' into master_14.1.3


Former-commit-id: 06c565d74f [formerly 30d8644fa5] [formerly 482f915b42 [formerly 4b317062ce5c35823210cbbf023c0f0fc8051ef3]]
Former-commit-id: 482f915b42
Former-commit-id: 072a4a9d63
2014-06-13 14:05:49 -04:00
Brian.Dyke
764b729546 CM-MERGE:OB13.5.6-3 into 14.1.3
Former-commit-id: 5064d24e26 [formerly 346bf852cd] [formerly 81832d97e5 [formerly df99fcb0a4be27d5f2d22935847fb55b8bfbbb58]]
Former-commit-id: 81832d97e5
Former-commit-id: 4bca0769fb
2014-06-13 13:21:19 -04:00
Benjamin Phillippe
2b58b5736d Omaha #3255 Fix Build
Former-commit-id: 67ee2613d7 [formerly a22c77cbfb] [formerly 63d104d18d [formerly 6a4e388f9778101d5edd6a1b8ee1d1dc41e422b6]]
Former-commit-id: 63d104d18d
Former-commit-id: e53e82e5c0
2014-06-13 11:17:55 -05:00
Benjamin Phillippe
990ba586b4 Omaha #3255 Fix Build
Former-commit-id: 9a2b844db1 [formerly 0baf11790f] [formerly 493302f63b [formerly 3182016dc2a85aef65a6f715dc1ed5e60bedb27d]]
Former-commit-id: 493302f63b
Former-commit-id: e3f37f8ddd
2014-06-13 10:55:23 -05:00
Ron Anderson
857be88042 Merge "Omaha #3244 Improved GFE purge error handling" into omaha_14.4.1
Former-commit-id: 606920b67d [formerly ee21383c07] [formerly 97c35aacd2 [formerly a4102501a895730d99e03b6fbafe0e7152b198cd]]
Former-commit-id: 97c35aacd2
Former-commit-id: 47ec04766d
2014-06-13 10:45:48 -05:00
Ron Anderson
2a54c939dd Merge "Omaha #3262 smarter detection of java packages/classes" into omaha_14.4.1
Former-commit-id: 9cc016dbfb [formerly 00eac78a02] [formerly 8857dfe49a [formerly d02af9d53b1f00d21f3d7ef92c54a930d13441ae]]
Former-commit-id: 8857dfe49a
Former-commit-id: 4b4638c5a9
2014-06-12 18:19:25 -05:00
Richard Peter
fa29bb1f50 Merge "Omaha #3229 added bufr buoy support" into omaha_14.4.1
Former-commit-id: 5c343e736a [formerly 9f2854abe8] [formerly 7a750bc86a [formerly e5d608a8977a62143bf487737e1852cd43776cfd]]
Former-commit-id: 7a750bc86a
Former-commit-id: 458ead4d6b
2014-06-12 16:50:20 -05:00
Richard Peter
b645f7423b Merge "Omaha #3280 Sister ticket to 3141 for DD repo. Setup SOAP metadata transfers for DPA" into omaha_14.4.1
Former-commit-id: 581b2cc7b7 [formerly b630aa2971] [formerly 418ad24111 [formerly 5dab0d8232781688132d7df0710a86ea98f93810]]
Former-commit-id: 418ad24111
Former-commit-id: 601a4c7ee0
2014-06-12 16:50:09 -05:00
Benjamin Phillippe
50d1f6b858 Omaha #3255 Fixing bundle version to fix build
Former-commit-id: 025597ee18 [formerly 7da0490ede] [formerly ed5a7a50f2 [formerly 5201bd2f8cc36c2dd39ac7bab51693affa5e6da1]]
Former-commit-id: ed5a7a50f2
Former-commit-id: 13549f05d8
2014-06-12 16:39:25 -05:00
Nate Jensen
55ddf5dbe7 Merge "Omaha #3263 Check for null when mosaic time matches." into omaha_14.4.1
Former-commit-id: 254ba2762f [formerly ba2f130b13] [formerly fc905ca588 [formerly c8f486ed32dfffff69ff9e9fefe1320c4ec009f4]]
Former-commit-id: fc905ca588
Former-commit-id: 907fc445a3
2014-06-12 15:14:50 -05:00
Brian Clements
b1fac777f4 Omaha #3267 fixed collaboration NPE possibility
Change-Id: I9bc68be7d9106396a0c369e3181e15baf25ca260

Former-commit-id: 42e6e38c2e [formerly adbffa5ddd] [formerly 91eb7d40c2 [formerly a23e57f3d1a6f4213216a7e038b85b17b6628faa]]
Former-commit-id: 91eb7d40c2
Former-commit-id: 3bdbf79eeb
2014-06-12 15:06:46 -05:00
Ben Steffensmeier
6309145495 Omaha #3263 Check for null when mosaic time matches.
Former-commit-id: c105de1a4c [formerly 5355ca8c1c] [formerly df2fed2be3 [formerly 913d70b860c1f129d1632dfd1d84e5fbcca5e2d9]]
Former-commit-id: df2fed2be3
Former-commit-id: ab616254bf
2014-06-12 15:00:26 -05:00
Nate Jensen
66c3efd784 Merge "Omaha #2061 Remove dataURI from acars." into omaha_14.4.1
Former-commit-id: dd10c76b19 [formerly 387b0604cc] [formerly d3417d8e45 [formerly 6e2588a672ceb81a922be9fcdac9a4212376ed5f]]
Former-commit-id: d3417d8e45
Former-commit-id: 6220def099
2014-06-12 14:27:47 -05:00
Nate Jensen
2685705310 Merge "Omaha #3270 fix warngen manifest's register buddy" into omaha_14.4.1
Former-commit-id: 67d197dffb [formerly 2ef1293724] [formerly 6ce08839d8 [formerly 6bc86288772152802b164382293f040691fcc262]]
Former-commit-id: 6ce08839d8
Former-commit-id: ed46d95f35
2014-06-12 14:20:47 -05:00
Richard Peter
09e822b13c Merge "Omaha #3255 Registry Security Features (commit 1/5)" into omaha_14.4.1
Former-commit-id: 32323da812 [formerly 912c112e09] [formerly c7a82e08ca [formerly 22b5edf2bbd47eb1a80bfa60a1ffd46c8c4d0d71]]
Former-commit-id: c7a82e08ca
Former-commit-id: 3f80ff0247
2014-06-12 14:16:21 -05:00
Ben Steffensmeier
4e3a8e97fe Omaha #2061 Remove dataURI from acars.
Former-commit-id: 0a6e99e9d1 [formerly f66725a515] [formerly 35ad2f2b8d [formerly e8b5ea58ca12878922be01c815a354703f5f4387]]
Former-commit-id: 35ad2f2b8d
Former-commit-id: e227d408db
2014-06-12 13:59:45 -05:00
Nate Jensen
eeb4824569 Omaha #3270 fix warngen manifest's register buddy
Change-Id: I273bc344c60fb4c824241a28949a1ce9fb3020a2

Former-commit-id: eeb97a239a [formerly 31b3029e02] [formerly 305564d6f0 [formerly 796e242b031087e08b9ba5e44664d6b400405c42]]
Former-commit-id: 305564d6f0
Former-commit-id: 0b185c3b6c
2014-06-12 13:58:27 -05:00
Brian Clements
077976c912 Issue #2903 changed collaboration jaxb xml to be base64 encoded
Change-Id: I0de0db3bf455a14d747520f34ef66d986815e42c

Former-commit-id: 909561d871 [formerly 5424eb0258] [formerly ef0ecfd1d4 [formerly afcfdf1ed08cd64deb085b909f0965e4ab68d92d]]
Former-commit-id: ef0ecfd1d4
Former-commit-id: 9e39c19a7d
2014-06-12 13:40:33 -05:00
Nate Jensen
595cb870bf Merge "Omaha #3269 - Fix editing of Notifiers before saving Amend - Remove save confirmation dialog, rename buttons" into omaha_14.4.1
Former-commit-id: cd10372371 [formerly 4ac8246386] [formerly f118e1b0e9 [formerly 88280dedea4b6065a5603ac26e982eab0a2e0e72]]
Former-commit-id: f118e1b0e9
Former-commit-id: 343b88e3b3
2014-06-12 12:36:14 -05:00
Richard Peter
0ef48baedc Merge "Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200)." into omaha_14.4.1
Former-commit-id: f4cd1ce52d [formerly df86770b4e] [formerly 7731e25983 [formerly 3285557835e929a6b7048f4445d1da45ae8e1325]]
Former-commit-id: 7731e25983
Former-commit-id: 40e2813f50
2014-06-12 12:35:24 -05:00
Dave Hladky
d4bae18c27 Omaha #3280 Sister ticket to 3141 for DD repo. Setup SOAP metadata transfers for DPA
Former-commit-id: d0743f46f4 [formerly 7516b5ffbc] [formerly 65e85058e0 [formerly 8b4bea63939089b805aaa3b08d6907c95c04230e]]
Former-commit-id: 65e85058e0
Former-commit-id: 09e9ffd211
2014-06-12 11:58:42 -05:00
Nate Jensen
08b53fe0fe Omaha #3247 upgrade build.cave's xalan jar
Change-Id: Idd4e0d583ef4ad91bcde99278e3e035f1f12e434

Former-commit-id: 1a94d51831 [formerly d4471bf759] [formerly 95fe41966a [formerly c2d32dddb2bba04b46099d8745ff541989e1a281]]
Former-commit-id: 95fe41966a
Former-commit-id: a6fa27a1b8
2014-06-12 11:38:22 -05:00
Benjamin Phillippe
d46a6df3e0 Omaha #3255 Registry Security Features (commit 1/5)
Change-Id: I3b24ae8696ded86d8157a092eeff81cc45a2f291

Former-commit-id: e05f09bb20 [formerly cfe7bb251f] [formerly fb9e936e0e [formerly ec1b81d28c4b418fada53c684e78d397fee9b97d]]
Former-commit-id: fb9e936e0e
Former-commit-id: c523752519
2014-06-12 11:26:51 -05:00
Slav Korolev
fec8eb4fae Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200).
Former-commit-id: 8175aad0bf [formerly 2b877529ce] [formerly 16ec392c12 [formerly 0172e8f27b646a965e472f969f112a4e170d9f41]]
Former-commit-id: 16ec392c12
Former-commit-id: d8ebeb4778
2014-06-12 12:24:34 -04:00
Mike Duff
0bdefaabdd Omaha #3269 - Fix editing of Notifiers before saving
Amend - Remove save confirmation dialog, rename buttons

Change-Id: I0dd81db4c74d07f0535341fc410c288b077463c4

Former-commit-id: 522d3c70f2 [formerly 80922824a3] [formerly c920a24300 [formerly 47d57692c81757a8b8c0d3217e21f701f18cdf2c]]
Former-commit-id: c920a24300
Former-commit-id: b15b6514fd
2014-06-12 11:21:15 -05:00
Nate Jensen
5cf6041b43 Omaha #3262 smarter detection of java packages/classes
Change-Id: I2f38e02cfa084803c5b40318a2789a236865dda6

Former-commit-id: fde925f383 [formerly d43a01f5d8] [formerly 746daf5f3e [formerly 6afa4c1beeba55509d3222ea908595aee59a7f38]]
Former-commit-id: 746daf5f3e
Former-commit-id: 36c38389a5
2014-06-12 10:40:36 -05:00
Brian Clements
87f60d2e22 Omaha #3229 added bufr buoy support
small bufr obs refactor
fixed empty array issue in bufr parser

Change-Id: Ie21ffdafed8b137264db4751c147ce1dd13eabd2

Former-commit-id: 2e0408ca10 [formerly 99e86f95be] [formerly 5be93b4084 [formerly 763ea813523d2e6a6da3fb6a80c94939ce605f6c]]
Former-commit-id: 5be93b4084
Former-commit-id: bab2785b71
2014-06-12 10:12:13 -05:00
Roger Ferrel
c43758bdbb Omaha #3252 Fix bug in __makeHader to prevent unexpected exception.
Former-commit-id: 09ae36d8de [formerly 960772ea44] [formerly 42fe1bf5b2 [formerly 787261f13c47b5de81b2e7c4f861645614a11f1f]]
Former-commit-id: 42fe1bf5b2
Former-commit-id: 95d7540d05
2014-06-12 10:08:51 -05:00
Ron Anderson
6627d6c913 Omaha #3244 Improved GFE purge error handling
Change-Id: I18fcf443b6c77a323df76659a8a60cb10b65669c

Former-commit-id: 65fbf7f61e [formerly 366e5d7fd3] [formerly 9ac1f19455 [formerly d8955e6dcd8f16b33c54de104596e9743ce7d85e]]
Former-commit-id: 9ac1f19455
Former-commit-id: 864cfd2c30
2014-06-12 08:05:56 -05:00
Lee Venable
33b3bf61ee Merge "Omaha #3217 Add always prompt option to thinclient connectivity dialog." into omaha_14.4.1
Former-commit-id: f7161d6a76 [formerly 041488064b] [formerly aaecd1edaa [formerly 607e2a8ec37798a3620d298077d038417d93007c]]
Former-commit-id: aaecd1edaa
Former-commit-id: 817cff4701
2014-06-12 07:59:53 -05:00
Brian.Dyke
50073f34b2 Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: e802508e98 [formerly a011c0b6bb] [formerly 6fcc2604e0 [formerly 0d441b5eebad07acf51d6d5c28ee5ac7770d9733]]
Former-commit-id: 6fcc2604e0
Former-commit-id: 10696504a0
2014-06-12 07:07:17 -04:00
Ron Anderson
990b79ddb3 Merge "Omaha #2840 log tool can now save html reports to directory" into omaha_14.4.1
Former-commit-id: 801509a7e5 [formerly c474ec8b28] [formerly bb6a28c4c0 [formerly d111434bc3cae174f7e19fe670d3b8b837caad5b]]
Former-commit-id: bb6a28c4c0
Former-commit-id: da54c5f4da
2014-06-11 17:49:11 -05:00
Nate Jensen
aa30d5d5ce Omaha #2840 log tool can now save html reports to directory
Change-Id: Ifa2d9653d2ee689512f33169028705de98f65682

Former-commit-id: 4b1c9f17ca [formerly 3f586a2690] [formerly f681b52b46 [formerly 4aec10e9b7155baa7e4243a4db78ad16440dbba7]]
Former-commit-id: f681b52b46
Former-commit-id: 9e476810dd
2014-06-11 17:13:38 -05:00
Nate Jensen
5821cbfa84 Merge "Omaha #3090 - Added files missed from merging omaha_14.3.1 into omaha_14.4.1 (b6055725)" into omaha_14.4.1
Former-commit-id: eaca89ac58 [formerly 944dee69a4] [formerly 967a446097 [formerly c2e210b7157f82a2a1af625d805e3a6751ff6d0d]]
Former-commit-id: 967a446097
Former-commit-id: cae40316cf
2014-06-11 17:12:07 -05:00
Ben Steffensmeier
726c91ed9e Omaha #3217 Add always prompt option to thinclient connectivity dialog.
Former-commit-id: 13e618cf89 [formerly b8f331bfba] [formerly c70462fb8a [formerly aac3fdd00b429932d9cfa5d950f9729ace54a933]]
Former-commit-id: c70462fb8a
Former-commit-id: 96591c2ddb
2014-06-11 17:00:16 -05:00
Steve Harris
1abf5019f1 Omaha #3090 - Added files missed from merging omaha_14.3.1 into omaha_14.4.1 (b6055725)
Former-commit-id: 975bfdf386 [formerly 6d58f3944e] [formerly fbc6c6c31b [formerly 81aab5e7001eca87d4d8889ae96367eee433ee88]]
Former-commit-id: fbc6c6c31b
Former-commit-id: e53dfdfdca
2014-06-11 16:00:09 -05:00
Ben Steffensmeier
591815e868 Omaha #2061 Fix ogc reference to Metar units.
Former-commit-id: a05e030431 [formerly 048ee71f6a] [formerly cc957caac6 [formerly 4773eaa7d0736a4bd68270742b344a6e069ab0ea]]
Former-commit-id: cc957caac6
Former-commit-id: 357eb13482
2014-06-11 14:41:13 -05:00
Ben Steffensmeier
217734a2ba Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings.
Former-commit-id: 5a4f7a1fd4 [formerly f292f204c9] [formerly fc25774506 [formerly e267e8b0bae314abf3396db6072c6ff8adc732bf]]
Former-commit-id: fc25774506
Former-commit-id: 94b465fa15
2014-06-11 13:45:42 -05:00
Nate Jensen
8e16d5d3e0 Merge "Omaha #2061 Remove IDecoderGettable from all AWIPS2 ncep PDOs." into omaha_14.4.1
Former-commit-id: 22118469d1 [formerly e1912960ec] [formerly 1adc95130a [formerly 33f1a8b41c40fedff816737d38ee35bbd7feb47e]]
Former-commit-id: 1adc95130a
Former-commit-id: 8bcb4d8a29
2014-06-11 13:11:18 -05:00
Nate Jensen
d6e35301cf Merge "Omaha #3266 remove unused attributes and elements from baseline menu xml files" into omaha_14.4.1
Former-commit-id: 17456be16c [formerly 04a6c1d5b7] [formerly 4354bac2d5 [formerly b97df26a25976d58409dad8e43b1ca3ce7471133]]
Former-commit-id: 4354bac2d5
Former-commit-id: 753b7ddd5c
2014-06-11 13:09:34 -05:00
Nate Jensen
419dba85eb Merge "Omaha #2061 Remove IDecoderGettable from all AWIPS2 Raytheon PDOs." into omaha_14.4.1
Former-commit-id: 39a3dae80e [formerly 63d90652a9] [formerly 69251c8d15 [formerly fd2ebb42c382855ab21cb409481905530fdda5de]]
Former-commit-id: 69251c8d15
Former-commit-id: 9cc5e402a6
2014-06-11 13:09:25 -05:00
Steve Harris
f78bc57920 Merge branch 'master_14.2.2' (14.2.2-13) into omaha_14.2.2
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java

Change-Id: If5dae78936eddf1bc4ee63f35beb96a0cb9defb9

Former-commit-id: 3a3277c469 [formerly ad6e9fa5ee] [formerly 9510608b74 [formerly cf56d49dc5a197fa114fa6c468860d63621a9cdc]]
Former-commit-id: 9510608b74
Former-commit-id: 23dea36a2c
2014-06-11 12:55:44 -05:00