Commit graph

3465 commits

Author SHA1 Message Date
Greg Armendariz
172bc300ca Merge branch 'master_13.5.1' into omaha_13.5.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java

Former-commit-id: b08ce25ac8 [formerly b08ce25ac8 [formerly d79f0ffacc775ed4dc49bcf35adacf4fded994d3]]
Former-commit-id: ffb2bea8ad
Former-commit-id: 566532c40d
2013-08-08 16:24:39 -05:00
Roger Ferrel
6a47c144c7 Issue #2222 Changes to allow display of all selected data.
Change-Id: I1594f7f3cf888a3de7e6458e5e225eaa4d337adb

Former-commit-id: f167ec49cd [formerly f167ec49cd [formerly b49c3147991d87c32aba619521502438c11eb8f6]]
Former-commit-id: efed5777e9
Former-commit-id: 96e6d1f7cc
2013-08-08 16:15:34 -05:00
Greg Armendariz
b66fcc40a5 13.5.1-13 baseline
Former-commit-id: 29b823fee4 [formerly 29b823fee4 [formerly 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4]]
Former-commit-id: 5577e686c1
Former-commit-id: 8bfac41add
2013-08-08 17:00:36 -04:00
Nate Jensen
440756a331 Issue #2142 remove more dependencies on edex.common
Change-Id: Iac9d21fc531c03920fcbb52d6a9cc833a2625a2f

Former-commit-id: a919490d00 [formerly a919490d00 [formerly f650a26ee4c6c944164d2b5d917b5f8b6ad32bb5]]
Former-commit-id: a9f5465c99
Former-commit-id: fe3adecbc2
2013-08-08 14:46:52 -05:00
Greg Armendariz
cbf9e42c21 13.5.1-12 baseline
Former-commit-id: c9898ba8d1 [formerly c9898ba8d1 [formerly eb9cd610891ce5830f4a169db036a49f32c1e63b]]
Former-commit-id: fe51885ba7
Former-commit-id: 9892a1a262
2013-08-08 15:34:01 -04:00
Ron Anderson
15a3ac1082 Merge "Issue #2027 upgrade version of derby" into development
Former-commit-id: b43b05fced [formerly b43b05fced [formerly d3867fbea055fa4b4fac77bc1524c2999db25c23]]
Former-commit-id: 92741fe6dd
Former-commit-id: 609a5c4a7c
2013-08-08 12:48:40 -05:00
Richard Peter
72918d8f81 Merge "Issue #2191 Addressing comments from previous change" into development
Former-commit-id: 95357f0b2c [formerly 95357f0b2c [formerly 8a9557269526e7f8efd21a8c46d50f30fb9f7b6e]]
Former-commit-id: 40c4593896
Former-commit-id: 88768c369a
2013-08-08 09:58:18 -05:00
Benjamin Phillippe
35ee48c73b Issue #2191 Addressing comments from previous change
Change-Id: Ib7e23bdfbecebe7141ef2d086d7b049530d11ce2

Former-commit-id: 59a9aeabf0 [formerly 59a9aeabf0 [formerly c2d5beba2c9656d80851aee1a7beabe4807c14f6]]
Former-commit-id: 3c7ad386ed
Former-commit-id: dc2e0f6a7b
2013-08-08 09:56:35 -05:00
Richard Peter
191ba3bd98 Merge "Issue #2077 Revise pixel size calculations. Change-Id: Ib46ed8030a809d3e935bfa8c85b745c3b98e23a7" into development
Former-commit-id: e412320b39 [formerly e412320b39 [formerly ef55eddb22b9f50dc06496502e66ff170c603493]]
Former-commit-id: f3ba33a84c
Former-commit-id: 22f9c92e4a
2013-08-08 09:52:25 -05:00
David Gillingham
6b03403d65 Issue #1842: Fix ETN assignment for products with multiple NEW segments with the same phensig.
Change-Id: Iba28011bafdff9a01e7039ce7a439d84bf473389

Former-commit-id: 20e0f4b756 [formerly 20e0f4b756 [formerly d0e5cbfdc0ddd13a157ecd85a14af904fb52dc35]]
Former-commit-id: f839ef6f3b
Former-commit-id: 616c023369
2013-08-08 09:41:33 -05:00
Max Schenkelberg
8157d99949 Issue #2190 removed non-existent .so from meteolib build.properties
Change-Id: I40ff45473518215375ace9fbdcd9a8e416ddb438

Former-commit-id: f587206b84 [formerly f587206b84 [formerly 006ea8d18d40c8fb147e4970a1032f0f6efa3cfc]]
Former-commit-id: 7ed0b6c5f8
Former-commit-id: 259f16578c
2013-08-08 09:15:05 -05:00
Ben Steffensmeier
65e33fdae5 Issue #2077 Revise pixel size calculations.
Change-Id: Ib46ed8030a809d3e935bfa8c85b745c3b98e23a7

Former-commit-id: 6c7d1d60a8 [formerly 6c7d1d60a8 [formerly 99fa66319bfe07aa84276bd7f9f0817ed5868798]]
Former-commit-id: 1bd7cc1097
Former-commit-id: 3071e53e45
2013-08-07 18:40:28 -05:00
Ben Steffensmeier
2877836f4d Issue #2235 Fix the build, hopefully.
Change-Id: I09466023c4d15921bc9b86e2d6f0958c1ff83539

Former-commit-id: 95c4e2d65d [formerly 95c4e2d65d [formerly 1545f57a99f47bd8dabb70235914bdaa14025b00]]
Former-commit-id: 4b705b1436
Former-commit-id: cdddcac87b
2013-08-07 17:15:06 -05:00
Nate Jensen
9d4e00d5d1 Issue #2027 upgrade version of derby
Change-Id: Ic84bcde6b411283ce07a4d6d5005e596d4f392c4

Former-commit-id: ec01e6e872 [formerly ec01e6e872 [formerly fe74cd780a74814665121c4ed334829f4a42a0ef]]
Former-commit-id: be9315642b
Former-commit-id: b0f3d536e4
2013-08-07 16:44:30 -05:00
Greg Armendariz
9a1b44efdc Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: ecc9f77f42 [formerly ecc9f77f42 [formerly abb16b014694113cd7f2582542fd0d0f54a2da4e]]
Former-commit-id: 6b1989cb29
Former-commit-id: c46f04dd72
2013-08-07 14:46:30 -05:00
Greg Armendariz
7c87d81235 Merge "Issue #2190 attempt to fix build" into development
Former-commit-id: 614a9a5ca0 [formerly 614a9a5ca0 [formerly 3cf79c8f9e9391b4bac3d6dba05570eb9a1cedfc]]
Former-commit-id: c588a5ce7e
Former-commit-id: 8c8439446a
2013-08-07 14:41:37 -05:00
Nate Jensen
c69abb1d90 Issue #2190 attempt to fix build
Change-Id: I733289250b318c81134bacb676837b36b67fb6c6

Former-commit-id: f56bb10cb2 [formerly f56bb10cb2 [formerly 9e6ca01815f880282ec87fdce72d108131039f2e]]
Former-commit-id: d1e2274f46
Former-commit-id: 8478d68a56
2013-08-07 14:15:50 -05:00
Ron Anderson
f8ad742697 Merge "Issue #2235 Added Caching version of TopoQuery. Change-Id: I0e17028921faa40e85134c79074655900bd8358c" into development
Former-commit-id: 216b2a5c86 [formerly 216b2a5c86 [formerly 4e9a02fcd4931d2a26b10b3e695a7fa99d1ef972]]
Former-commit-id: 0a9068e6d3
Former-commit-id: fcb78e78d3
2013-08-07 14:05:36 -05:00
Greg Armendariz
f06ee47260 13.5.1-11 baseline
Former-commit-id: ea7b22500e [formerly ea7b22500e [formerly 7142e607157f6d6ac1ba5cb24f3b3dbf9ab75f7f]]
Former-commit-id: 4ec04083bd
Former-commit-id: 26e58d8cdb
2013-08-07 14:34:27 -04:00
Greg Armendariz
f37ef8c24e 13.5.1-10 baseline
Former-commit-id: 852455843f [formerly 852455843f [formerly c2c6882c462c34ce9cb9ea3399071c2a121ba0f7]]
Former-commit-id: acf7ced37b
Former-commit-id: 05282eac88
2013-08-07 14:14:46 -04:00
Nate Jensen
f8bd55d407 Issue #1561 more efficient query of GFE files
Change-Id: Ib1715d76749bbe75bd8c1ad03263303c14500eb9

Former-commit-id: cdfea29b16 [formerly cdfea29b16 [formerly 41ae249c3b75684c44d7b0b0624ebdecdbf656ee]]
Former-commit-id: 5c7dc36583
Former-commit-id: d520081243
2013-08-07 13:12:48 -05:00
Ben Steffensmeier
7e3835fd0a Issue #2242 Optimize FFMP NavigableMap memory.
Former-commit-id: f0ceddacf1 [formerly f0ceddacf1 [formerly 5208c63e9c6eab03bc42736ffe2254fb802d566b]]
Former-commit-id: b06171b4f2
Former-commit-id: 3eb869c65e
2013-08-07 12:08:13 -05:00
Ben Steffensmeier
16c0832b4f Issue #2235 Added Caching version of TopoQuery.
Change-Id: I0e17028921faa40e85134c79074655900bd8358c

Former-commit-id: 2ecba23bb9 [formerly 2ecba23bb9 [formerly 2c989747b8c9d1b7529c09c75c76bcb0ad90dbe7]]
Former-commit-id: 2a51ddd697
Former-commit-id: 15ddd45995
2013-08-06 18:27:21 -05:00
Nate Jensen
22861240c8 Issue #2210 moved base cave_static colormaps to common_static and updated code
deleted duplicate edex_static colormaps
            wrote delta script for site/user cave_static colormaps to move to common_static

Change-Id: I53c86d0974706023608e1ec5e10f34619aafb8de

Former-commit-id: a1a9a4751a [formerly a1a9a4751a [formerly 4383d88a37c9ae9298f7ea9081d87d6ded34de66]]
Former-commit-id: 27dd27a73f
Former-commit-id: 15006517a2
2013-08-06 17:17:53 -05:00
Richard Peter
d8ef36a6f3 Merge "Issue #2142 fix logback ingest config" into development
Former-commit-id: a229fd3abb [formerly a229fd3abb [formerly 3deb3b03c2ab71ce00b1bf465bae6139e462c39e]]
Former-commit-id: 883f450f28
Former-commit-id: d75818c241
2013-08-06 14:23:41 -05:00
Nate Jensen
97cf1bb5bb Issue #2142 fix logback ingest config
Change-Id: I7b50e76bea11eff68cc29930faa1cd1443558a70

Former-commit-id: f756c0039a [formerly f756c0039a [formerly f191176549581689ac20b62a2033c19264aaa8df]]
Former-commit-id: ac3071cc0a
Former-commit-id: b50304a16f
2013-08-06 14:22:15 -05:00
Richard Peter
a082f83204 Merge "Issue #1693 Modified Submit objects to conform to 4.0 spec. Added remote object references and some cleanup" into development
Former-commit-id: 6eb59502f8 [formerly 6eb59502f8 [formerly 14e07542613348b91e60baa914cdffe1b936d9d7]]
Former-commit-id: a91d535a99
Former-commit-id: 6fb0e514f5
2013-08-06 14:21:53 -05:00
Nate Jensen
5c3310851b Merge "Issue #2211 Reverted changes for SS DR 16070 and fixed satellite sampling as percentage" into development
Former-commit-id: 0bf9eed643 [formerly 0bf9eed643 [formerly 311a4e792edd9c1a83fe2debfee1a00e43f12807]]
Former-commit-id: e7949c04ad
Former-commit-id: 2bd358ff19
2013-08-06 14:14:27 -05:00
Richard Peter
cb58571e5f Merge "Issue #2221 - Changes to have select configuration files for retention and case creation." into development
Former-commit-id: d6041529db [formerly d6041529db [formerly 99422acbda91c8f499af9c4ae57b136a1469fdfa]]
Former-commit-id: 301556213a
Former-commit-id: 5349f48a34
2013-08-06 12:46:32 -05:00
Max Schenkelberg
3d5f35d792 Issue #2211 Reverted changes for SS DR 16070 and fixed satellite sampling as percentage
Amend: Added jgerth comment history back in

Change-Id: I08733fcf46f9bdcded1f609bcdd26459652edaef

Former-commit-id: dda69d36b7 [formerly dda69d36b7 [formerly 2e52921b21ecaeaa11be8277e264446686d65338]]
Former-commit-id: a18686135c
Former-commit-id: 75ae62fd9a
2013-08-06 12:37:52 -05:00
Nate Jensen
bcb21350cf Issue #2142 fix logback config
Change-Id: I6e708cb251f6e4564ede0ba90f2cd906eb16a998

Former-commit-id: 05eba98d50 [formerly 05eba98d50 [formerly a200e86f382e532c1b60c907b4a0b00d80688917]]
Former-commit-id: 148153eddf
Former-commit-id: b04d075d18
2013-08-06 11:39:34 -05:00
Benjamin Phillippe
ce5cb744d8 Issue #1693 Modified Submit objects to conform to 4.0 spec. Added remote object references and some cleanup
Change-Id: I0f4eafb3fa68f2d1eeade4f047c95d714502cf56

Former-commit-id: 73fd5ac852 [formerly 73fd5ac852 [formerly 2aa7bdc1a8a942eaa0589527e8987b6fc518479f]]
Former-commit-id: 5bd0d92363
Former-commit-id: 33f601b72e
2013-08-06 11:13:01 -05:00
Richard Peter
6cf41de9f8 Merge "Issue #2228 use TMemoryInputTransport for slight efficiency improvement" into development
Former-commit-id: 7a1c02eac8 [formerly 7a1c02eac8 [formerly 1fe04ca5037355f11d0deab7ebcc27b84e0a337b]]
Former-commit-id: a6cccde03f
Former-commit-id: fdcb9d2070
2013-08-06 10:09:50 -05:00
Nate Jensen
884506cd70 Merge "Issue #1726 change how swt is imported to tests" into development
Former-commit-id: 35ec9bb413 [formerly 35ec9bb413 [formerly 47f5fbe957aedbf7edbc9b45fd9774fb73fa1c9f]]
Former-commit-id: 730f0d7f78
Former-commit-id: 6f61e57845
2013-08-06 09:57:44 -05:00
Nate Jensen
0abec57d0d Issue #2228 use TMemoryInputTransport for slight efficiency improvement
Change-Id: I280dacdd48f5e092b312a80916db6202a1138ebf

Former-commit-id: d4590cbf5e [formerly d4590cbf5e [formerly 3f3afa1fe36da04ce47b9af1e8bd34746b75e68f]]
Former-commit-id: 842f15ae12
Former-commit-id: 7d17d965a3
2013-08-06 09:52:02 -05:00
Matt Nash
773393483a Issue #1726 change how swt is imported to tests
Change-Id: I72ad8b22c0f55eded1548dc664a6c8fe05ff11cc

Former-commit-id: 0e0504f9fe [formerly 0e0504f9fe [formerly 78606bdbbde14383b3b12e4d72772dc6a8d1a21b]]
Former-commit-id: 1e42d0b7a6
Former-commit-id: 80064a389f
2013-08-06 09:44:47 -05:00
Lee Venable
f1b42ae10e Merge "Issue #2143. Changes for non-blocking SCAN dialogs." into development
Former-commit-id: a2ae8fe5de [formerly a2ae8fe5de [formerly 8a893db2a506ade83e6cd22355893138c32cdfea]]
Former-commit-id: 2a74881571
Former-commit-id: 8f0fa192bb
2013-08-06 09:32:21 -05:00
Nate Jensen
7a045f1d12 Merge "Issue #2190 Refactored Popup SkewT and cloud height sampling to create clearer separation of functionality and implemented NUCAPS sounding source." into development
Former-commit-id: fcb6f59a3f [formerly fcb6f59a3f [formerly 48e80dd9732e0b20f211fa456c8bec81b4495555]]
Former-commit-id: 28ffe0f3f1
Former-commit-id: 51ce39012d
2013-08-06 08:35:50 -05:00
Max Schenkelberg
71ee818ed0 Issue #2190 Refactored Popup SkewT and cloud height sampling to create clearer separation of functionality and implemented NUCAPS sounding source.
Amend: Fixed println, added uncustomization of displays to interface, fixed font issue
Amend: Fixed comments and switched to TimeUtil for common constants for time

Change-Id: I92b49a59848ee4a8f61205ab21f5de2e0c260525

Former-commit-id: 474429aaee [formerly 474429aaee [formerly 00aaabcbe2b7a66c63de3196cc68f57ccb4664a5]]
Former-commit-id: f08e2d5edc
Former-commit-id: fc60d55637
2013-08-05 16:46:02 -05:00
Roger Ferrel
4a8ece9a15 Issue #2221 - Changes to have select configuration files for retention and case creation.
Change-Id: Ia24898f04c3a2a626ea0aeb04c2c302e406afa1f

Former-commit-id: 19d23ae929 [formerly 19d23ae929 [formerly 30f55459d26e3d1118610959e98e475ede0e9f47]]
Former-commit-id: b3f9ea79af
Former-commit-id: 2be8799f51
2013-08-05 16:20:46 -05:00
Richard Peter
8eada4e873 Merge "Issue #2220 Removed synchronized from most methods." into development
Former-commit-id: d79c7c1b84 [formerly d79c7c1b84 [formerly 5d93f17fc5fcb0cd98e5b4bf3681fc9bc244b993]]
Former-commit-id: 084d39c6f3
Former-commit-id: b23a59a114
2013-08-05 14:27:33 -05:00
Nate Jensen
1fd6ef2d86 Merge "Issue #1726 change how swt is imported to tests, uncomment some tests that now work again" into development
Former-commit-id: e1ef074936 [formerly e1ef074936 [formerly c1b8ad9acaa8a5f5397c833a9edb5db23eaa5981]]
Former-commit-id: d74a7639ba
Former-commit-id: eb0ccfe92f
2013-08-05 12:45:29 -05:00
Matt Nash
bcb76fba53 Issue #1726 change how swt is imported to tests, uncomment some tests that now work again
Change-Id: Ib671f3240660368631483713e9619c836599fec4

Former-commit-id: ca8fcf84e5 [formerly ca8fcf84e5 [formerly a69fe2bc71ea77e941c9e20bfbc01d9c74ba94c7]]
Former-commit-id: ba5cacb5e5
Former-commit-id: 09b2a2a8a6
2013-08-05 12:13:15 -05:00
Nate Jensen
790a50ec95 Merge "Issue #2202 Add edex specific connectivity checking. Change-Id: I003957001ed608d1054ab2a87019b018f8996d36" into development
Former-commit-id: b7e69cfcd5 [formerly b7e69cfcd5 [formerly 1c314409369402473812c954821e0d47a4e05183]]
Former-commit-id: 21b0a2b103
Former-commit-id: 159e35d87e
2013-08-05 11:38:02 -05:00
Ben Steffensmeier
977e135e17 Issue #2202 Add edex specific connectivity checking.
Change-Id: I003957001ed608d1054ab2a87019b018f8996d36

Former-commit-id: cfd9cb0b7d [formerly cfd9cb0b7d [formerly b8e5323b70db03817c6c750746f29cc550cbc815]]
Former-commit-id: fac4cdc131
Former-commit-id: 66ce1a9c68
2013-08-05 11:17:23 -05:00
Richard Peter
c3fd34895c Merge "Issue #2057 Added support for marking obsolete databases for later removal." into development
Former-commit-id: af826f283b [formerly af826f283b [formerly 5e67c228fea2f719bfb0561132701097bf785a80]]
Former-commit-id: f964cc3e65
Former-commit-id: 9a6015efcb
2013-08-05 09:51:14 -05:00
Greg Armendariz
178d42db2e Issue #2191 - Fix build
Former-commit-id: 0033adf062 [formerly 0033adf062 [formerly c7b8b6aaf43fd3ed1d73be7ceed8b002a0325205]]
Former-commit-id: f5a2245c51
Former-commit-id: a7d1d0ae75
2013-08-04 08:35:51 -05:00
Richard Peter
7659b6b6e4 Merge "Issue #2191 Registry federation synchronization and garbage collection" into development
Former-commit-id: e692cc245b [formerly e692cc245b [formerly 4e3f429e5aebec59e5c15c8bea062cc62e599cc6]]
Former-commit-id: 137bb556ee
Former-commit-id: 549ffd000c
2013-08-02 14:44:16 -05:00
Slav Korolev
2c1a27a76c Issue #2143. Changes for non-blocking SCAN dialogs.
Change-Id: I0afcaced20e0cc76cbcb2d64a24fcfc3022dc1d1

Former-commit-id: 0c0941ad5d [formerly 0c0941ad5d [formerly 5539da3d19fa0c174eba1a8733e946ca10e5f4bb]]
Former-commit-id: 4afde7addb
Former-commit-id: 5d180b2e58
2013-08-02 09:53:56 -04:00
Dave Hladky
2e72f11d8f Issue #2236 Fixed P2 build
Former-commit-id: 2c33f301df [formerly 2c33f301df [formerly 8f2fa18da2ee547882773075be229c223b2a48ec]]
Former-commit-id: 08f1021c6d
Former-commit-id: dd3e466992
2013-08-01 14:40:06 -05:00