Dustin Johnson
|
63240a4ec5
|
Issue #1302 Restore jdom.jar, delete net.jcip/.project
Amend:
Also change the manifest and .classpath for ohd common
Change-Id: I26b4e88d36da6c38da393f2428b79735c881a23b
Former-commit-id: 19c2e301b8 [formerly db4d728eb7] [formerly 595c421e47] [formerly 19c2e301b8 [formerly db4d728eb7] [formerly 595c421e47] [formerly 2b6e98954e [formerly 595c421e47 [formerly 49b999039c470a5df095a202b5a67bf036a5b71c]]]]
Former-commit-id: 2b6e98954e
Former-commit-id: 272761ae41 [formerly eac5bc8197] [formerly 3fe0762a484ee2e5830878352f009474c977d9f7 [formerly 0806be04dd]]
Former-commit-id: 8e66108e274790c8749fcb207ab943f1083f8acf [formerly 1317e0b3ef]
Former-commit-id: f9c6566ba7
|
2012-11-08 14:47:17 -06:00 |
|
Ben Steffensmeier
|
062505e855
|
Issue #1108 initial implementation of mappings
Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF
Former-commit-id: a0f6c320cb [formerly 20e618eb4f] [formerly 535c73051d] [formerly a0f6c320cb [formerly 20e618eb4f] [formerly 535c73051d] [formerly 693090cb36 [formerly 535c73051d [formerly 8db340a796df354059f3d4142db92dfd5fa527f5]]]]
Former-commit-id: 693090cb36
Former-commit-id: 0f58b01a58 [formerly 7c93db759c] [formerly 0198876d17ad6ff76ff77ca6660a268c711628d2 [formerly 884c82c4fe]]
Former-commit-id: da5f64af6d14ef1d9c652871f9f0529b022242a9 [formerly 74d1381180]
Former-commit-id: 2223e6ff64
|
2012-11-08 14:45:36 -06:00 |
|
Richard Peter
|
1e69b1df57
|
Merge "Issue #189 add more comments to grib decoder." into development
Former-commit-id: cd8c43078b [formerly 7f49c5fe04] [formerly db28cc26aa] [formerly cd8c43078b [formerly 7f49c5fe04] [formerly db28cc26aa] [formerly 7077a82458 [formerly db28cc26aa [formerly 1ad439769c601fe61365f015bc56da0442553be5]]]]
Former-commit-id: 7077a82458
Former-commit-id: 9e1e81e840 [formerly fa6141c745] [formerly 6c3e03fe9fc18f974ee8a5be0a2bda96c5aff4f6 [formerly e1852956e2]]
Former-commit-id: acce3fbfc6b39ab02f986035802c76e0077fd4f6 [formerly 80862cd12e]
Former-commit-id: 19a98b3fad
|
2012-11-08 14:40:05 -06:00 |
|
Ben Steffensmeier
|
8399158199
|
Issue #189 merge ncep changes to unified grid.
Change-Id: I3dac0d3785f093c095f50799890744919edb1891
Former-commit-id: c17b92afc5 [formerly f62cf2713d] [formerly e6b0751f5c] [formerly c17b92afc5 [formerly f62cf2713d] [formerly e6b0751f5c] [formerly fbed67a208 [formerly e6b0751f5c [formerly 99cf68672dcfbf23c89531279cb4fcd1254b0703]]]]
Former-commit-id: fbed67a208
Former-commit-id: b664a9e649 [formerly d75b59622a] [formerly b5eb27fb49abd5ab7570ad430a356c40d5ae9848 [formerly 7c9341a3a6]]
Former-commit-id: fe88c86a07e948a680250c58c72bfa9ef94a60ca [formerly 40a07f8998]
Former-commit-id: 35b855635f
|
2012-11-08 14:34:55 -06:00 |
|
Richard Peter
|
8f2f705e20
|
Merge "Issue #189 fix another Unknown Model" into development
Former-commit-id: 50ddeed8e6 [formerly 10138f3ae8] [formerly 7d8dfb9c01] [formerly 50ddeed8e6 [formerly 10138f3ae8] [formerly 7d8dfb9c01] [formerly 675b1666fd [formerly 7d8dfb9c01 [formerly 1db05733b3a8c0d09dc4613d82dc74e55c0e110a]]]]
Former-commit-id: 675b1666fd
Former-commit-id: e4aad5fcad [formerly e7151070ee] [formerly be2444c1dd881e3611f5733295f49ae808e5d940 [formerly ed90d0aa23]]
Former-commit-id: 34593cc1e1167309e983c82d0d71f4f54c60ec8b [formerly 1ce242e9f0]
Former-commit-id: decf129e94
|
2012-11-08 13:43:37 -06:00 |
|
Richard Peter
|
95f360eadf
|
Merge "Issue #1317 - Update the stats config files Issue #1317 - Peer review comments." into development
Former-commit-id: fbe5195de2 [formerly 62e5aff255] [formerly 3450ca3cd3] [formerly fbe5195de2 [formerly 62e5aff255] [formerly 3450ca3cd3] [formerly 2e9cdbe43e [formerly 3450ca3cd3 [formerly 6fce68b90116d30cf090db64032322916276136b]]]]
Former-commit-id: 2e9cdbe43e
Former-commit-id: 4699630bee [formerly b8ea93cb95] [formerly a52da4e3f534d6b1c014b4090e04029d85686d2b [formerly 4e0c207306]]
Former-commit-id: f86b250fd3d09f2abe58e40dde9aedc0200a1b48 [formerly e72818025a]
Former-commit-id: 04bd114046
|
2012-11-08 13:30:27 -06:00 |
|
Dustin Johnson
|
2a67e36e56
|
Issue #1302 Fix spring/project errors pointed out by CAVE spring changes
Change-Id: I2b39071348bea5394c4f275051f19a2853f61f1c
Former-commit-id: 67e02347b5 [formerly 1220f5167e] [formerly ddaa681d8a] [formerly 67e02347b5 [formerly 1220f5167e] [formerly ddaa681d8a] [formerly 9784b563cf [formerly ddaa681d8a [formerly 217a17fe79d9156f03597d72e51ab47325b00991]]]]
Former-commit-id: 9784b563cf
Former-commit-id: 0eb86d565e [formerly d0867fedef] [formerly 4d6abc650d9441b7590743271c86e80abcff2657 [formerly 9bb53555a9]]
Former-commit-id: 4d8009edd28c60ab7a3978054089c3f8ebdd0b7f [formerly cd392c40bf]
Former-commit-id: 1ac34361b4
|
2012-11-08 12:00:15 -06:00 |
|
Roger Ferrel
|
4aeb7fd6d3
|
Issue #1298 Changes for non-blocking IssuanceSiteIdDlg.
Change-Id: I735b63606c3ca6f680f47bd61e55658b18c223ba
Former-commit-id: fb742c6dbf [formerly 709798659d] [formerly e26b14a84d] [formerly fb742c6dbf [formerly 709798659d] [formerly e26b14a84d] [formerly 89617dda68 [formerly e26b14a84d [formerly a2a52b7754d831406e591763930f419def7cb1eb]]]]
Former-commit-id: 89617dda68
Former-commit-id: ddeecc6e98 [formerly 553344fb3b] [formerly 905e3bb90604a5bd868eee7dd06299aedc0f819f [formerly 05825bd6f3]]
Former-commit-id: b5165931eb57a4fadceb017392a53e8e879158a7 [formerly f13bedab32]
Former-commit-id: e3b4a7d750
|
2012-11-08 11:19:51 -06:00 |
|
Lee Venable
|
b24d461c8d
|
Merge "Issue #1298 Changes for non-blocking SaveDeleteComboDlg." into development
Former-commit-id: 72972d37b7 [formerly 6c0bb76679] [formerly be460c956e] [formerly 72972d37b7 [formerly 6c0bb76679] [formerly be460c956e] [formerly e791e73a30 [formerly be460c956e [formerly ac3fa82789459f71be3ef8cea589606e10b6506f]]]]
Former-commit-id: e791e73a30
Former-commit-id: 40c27a2403 [formerly 1e61d4bd08] [formerly 7998fddf765b511c29eef50d418b778e580e742f [formerly 7b5f085643]]
Former-commit-id: b8dfecdcf985598d2b3b7bb6282c85fef8b7df6e [formerly b3991fa4c9]
Former-commit-id: 2f390bd372
|
2012-11-08 11:11:15 -06:00 |
|
Nate Jensen
|
c01ba565ff
|
Merge "Issue #1308 Fixed ScanUtils unneeded dependency on BinLightningDao by switching to PluginDao. Added comments to various classes and fixed bug in menu generation code that would cause menus that use checkCreation(String,String) to regenerate menus every time." into development
Former-commit-id: 00dcf33480 [formerly e3487942ac] [formerly 96cb1ecc7f] [formerly 00dcf33480 [formerly e3487942ac] [formerly 96cb1ecc7f] [formerly 01072652dc [formerly 96cb1ecc7f [formerly f6eeb7431fe55886a7958beeec7f8f67de7bf74a]]]]
Former-commit-id: 01072652dc
Former-commit-id: 650f477e09 [formerly bdbad943ef] [formerly aaf573b212c0441c984a07ad356d4eb57494bd79 [formerly 375c864d28]]
Former-commit-id: 37993b2f7b4b612fb5581e122656c2af79b9c13d [formerly 7430e8dbfe]
Former-commit-id: d70b6dd868
|
2012-11-08 11:08:48 -06:00 |
|
Lee Venable
|
8e85bbad3e
|
Merge "Issue #1298 Changes for non-blocking FuzzValueDialog." into development
Former-commit-id: fae33021a4 [formerly c4526c5ba0] [formerly ff5083715b] [formerly fae33021a4 [formerly c4526c5ba0] [formerly ff5083715b] [formerly c44f90f675 [formerly ff5083715b [formerly e8ed91fc876a3f7e6dd67e058c3117cb616c96d2]]]]
Former-commit-id: c44f90f675
Former-commit-id: b1b2512819 [formerly 9523ad6085] [formerly 0f61b7daa2e57b5bf03170e39269f6b4fa2377a4 [formerly 4a22ded443]]
Former-commit-id: be37ba43b25491e7af4571b70fb7f2031ae1ad99 [formerly 3bdfe02fe3]
Former-commit-id: 4329af5cea
|
2012-11-08 10:57:45 -06:00 |
|
Roger Ferrel
|
91cbd20ccc
|
Issue #1298 Changes for non-blocking SaveDeleteComboDlg.
Change-Id: Idd57cb86f9d91526de6e460fcd181a16f9d30e9f
Former-commit-id: 853a3e6593 [formerly 359ee69fa6] [formerly dfb55edb3d] [formerly 853a3e6593 [formerly 359ee69fa6] [formerly dfb55edb3d] [formerly eae8a68fd5 [formerly dfb55edb3d [formerly 1305c8a16f0a7adcedcfb3c1b43c206fcd1dfcec]]]]
Former-commit-id: eae8a68fd5
Former-commit-id: 3851d5161c [formerly e7aa940f52] [formerly 0211367abde3087618fb2170a6c9b3664254ca94 [formerly 24a2e79b28]]
Former-commit-id: 410107753569223f9d35b6fd82a686616658272c [formerly 062109f9a7]
Former-commit-id: b895611562
|
2012-11-08 10:54:41 -06:00 |
|
Nate Jensen
|
3708f9b773
|
Merge "Issue #1302 Address peer review comments for 5-Data_Delivery/development merge" into development
Former-commit-id: d701700a35 [formerly ca5db2ec43] [formerly 9038ff4e10] [formerly d701700a35 [formerly ca5db2ec43] [formerly 9038ff4e10] [formerly 48dae3a5e9 [formerly 9038ff4e10 [formerly 92480a9a89c2768e7af9d8d1bcb9afe141d76f55]]]]
Former-commit-id: 48dae3a5e9
Former-commit-id: 3c7d135bc5 [formerly fca1922f7b] [formerly a70bb91d05156498a7bfb00ef3a008ed19da7cae [formerly 7da4882cfb]]
Former-commit-id: 1c124a831176eac847bf92a91a34c3e157d4aaa7 [formerly 7d8c983f1e]
Former-commit-id: 42dc82c260
|
2012-11-08 10:34:56 -06:00 |
|
Mike Duff
|
1311448ee0
|
Issue #1317 - Update the stats config files
Issue #1317 - Peer review comments.
Change-Id: Ic4fa6574a0d71fbdf246483f0ea2553d4d058c9f
Former-commit-id: 7398e4fd68 [formerly e72c2822ad] [formerly 1372c08cdc] [formerly 7398e4fd68 [formerly e72c2822ad] [formerly 1372c08cdc] [formerly 50f0c4c226 [formerly 1372c08cdc [formerly 8cc9210d25324ab4b5cbd5af3687b371101d282b]]]]
Former-commit-id: 50f0c4c226
Former-commit-id: 26210e06ef [formerly 7bed38a373] [formerly f2b77e9dc771b60a8323ff83614ff068514ec645 [formerly 688b7cce30]]
Former-commit-id: 439fa8528bc980d4f66acf555660ffd2ad83b7b3 [formerly a4574d22b1]
Former-commit-id: d08fca46ef
|
2012-11-08 10:15:41 -06:00 |
|
Max Schenkelberg
|
23f933d9c3
|
Issue #1308 Fixed ScanUtils unneeded dependency on BinLightningDao by switching to PluginDao. Added comments to various classes and fixed bug in menu generation code that would cause menus that use checkCreation(String,String) to regenerate menus every time.
Change-Id: Icc7f89812936f97029e2a06adbc527ec658d8d9b
Former-commit-id: 001d0710e7 [formerly 5f0b4286ba] [formerly 9aa4221fdf] [formerly 001d0710e7 [formerly 5f0b4286ba] [formerly 9aa4221fdf] [formerly c80dbffad8 [formerly 9aa4221fdf [formerly 598e0268c95155536fb94798cc134d18b2566dbc]]]]
Former-commit-id: c80dbffad8
Former-commit-id: 577a6e3631 [formerly c219fcb112] [formerly 07b9c0188335e4ff522ce4e82831fe234a9fdd70 [formerly 0a410412db]]
Former-commit-id: 9e391025cbbca9821f11536724c5e64f2e425fde [formerly d7afa4376e]
Former-commit-id: f1a74fb0c5
|
2012-11-08 10:08:38 -06:00 |
|
Dustin Johnson
|
eb82c7672b
|
Issue #1302 Address peer review comments for 5-Data_Delivery/development merge
Amend:
More peer review comments
Restore PreferencesHandler
Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7
Former-commit-id: acd4cf94d8 [formerly efd3d3735a] [formerly 064ef82d1e] [formerly acd4cf94d8 [formerly efd3d3735a] [formerly 064ef82d1e] [formerly 1dbeb22893 [formerly 064ef82d1e [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]]]
Former-commit-id: 1dbeb22893
Former-commit-id: cd5faf58bf [formerly 2d1e886cf3] [formerly 6b7958c5dca22552e39ad9f77a0bdd977908f9dc [formerly 4222b24d09]]
Former-commit-id: 58274565203c021076e001f24f089a98cd2216f6 [formerly 6613c51d3b]
Former-commit-id: b4a13190ad
|
2012-11-08 09:57:16 -06:00 |
|
Roger Ferrel
|
f57f694b63
|
Issue #1298 Changes for non-blocking FuzzValueDialog.
Change-Id: I7f6c6349b2576a9e692570f2fc118d939ee8efef
Former-commit-id: c44dd45f87 [formerly 3ad0d7d516] [formerly 023252fb84] [formerly c44dd45f87 [formerly 3ad0d7d516] [formerly 023252fb84] [formerly c3f451f799 [formerly 023252fb84 [formerly 74c370aa04efb9493d995f8f62a07dcd43702465]]]]
Former-commit-id: c3f451f799
Former-commit-id: 7bd36bb2c7 [formerly 9a1283fb1e] [formerly 9bc5add0937b47a44fcc72985df13d60bf528a0c [formerly de534f5b43]]
Former-commit-id: b208c9f9303fd4a49e76687d5d29d7b62b00e4c8 [formerly bf4c19927c]
Former-commit-id: eea2a76c7f
|
2012-11-08 08:24:38 -06:00 |
|
Roger Ferrel
|
787f9b6278
|
Issue #1298 Chnages for non-blocking FindReplaceDlg.
Change-Id: I165d2eb45b2c768b7fca05c1f29d2460b25b18a7
Former-commit-id: 4aafcb8311 [formerly 94a4440625] [formerly 76f60240c5] [formerly 4aafcb8311 [formerly 94a4440625] [formerly 76f60240c5] [formerly 199475f671 [formerly 76f60240c5 [formerly 8b38c0ce8e1d5a4d6d7b345ec5e1ba975dde5900]]]]
Former-commit-id: 199475f671
Former-commit-id: 66a19a85b3 [formerly c1d0b744b2] [formerly 40d79f26c493b7dacab3299f8b6b97602b46386e [formerly e072532a77]]
Former-commit-id: f909632659ffcd3cb6769219079a19d901505943 [formerly 3aa144b2df]
Former-commit-id: 056dbf2fb3
|
2012-11-08 07:57:56 -06:00 |
|
Bryan Kowal
|
8e8c6cb350
|
Issue #1318 - fix first dat dependency issue.
Change-Id: If7e1668799a8523afebb0d4b7de76be6add5aa78
Former-commit-id: 872c104321 [formerly a4d6021e5f] [formerly 079fdb33a0] [formerly 872c104321 [formerly a4d6021e5f] [formerly 079fdb33a0] [formerly 88a5451ce1 [formerly 079fdb33a0 [formerly 0087827da79fedd354a227bad4e02aa76cebc684]]]]
Former-commit-id: 88a5451ce1
Former-commit-id: d68619f4a7 [formerly b45ba40abf] [formerly 8fa4f436be1875e2804bfffd7d8de4c33cfcbff3 [formerly 4f36912786]]
Former-commit-id: 57b98543bd4dbe98b81e2898652d512aac412692 [formerly 1b19c0f3c0]
Former-commit-id: c25250edd9
|
2012-11-08 07:27:39 -06:00 |
|
Nate Jensen
|
5d362c8a85
|
Merge "Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration." into development
Former-commit-id: b0bb920fde [formerly 20a63254e2] [formerly b32a9e839e] [formerly b0bb920fde [formerly 20a63254e2] [formerly b32a9e839e] [formerly 6b205399d4 [formerly b32a9e839e [formerly 1902ab64c3ab11c41af906e5d78368689833561f]]]]
Former-commit-id: 6b205399d4
Former-commit-id: 19b0afefc5 [formerly 2fe69a5871] [formerly 04ac668436ffe2114a4379e6e35db8978db0e543 [formerly e3208d48a0]]
Former-commit-id: 9da7f44423baa4bda5048fd140e50b9a387e9505 [formerly 01e11761d8]
Former-commit-id: 04c843cb1b
|
2012-11-07 18:18:06 -06:00 |
|
Lee Venable
|
263fa461c1
|
Merge "Issue #1298 Changes for non-blocking ClearZoneGroupsDialog." into development
Former-commit-id: dbeb600e58 [formerly c8955b5425] [formerly 36c44db46b] [formerly dbeb600e58 [formerly c8955b5425] [formerly 36c44db46b] [formerly 8956718961 [formerly 36c44db46b [formerly 9b634a3ba62f8c151e6adf85fac26b9174defc7e]]]]
Former-commit-id: 8956718961
Former-commit-id: ddd96f4552 [formerly 15842d7d22] [formerly b323e3bf5eafbd091abc62b049b1e38dec9c47bc [formerly eacc1ca32c]]
Former-commit-id: 053f6922c519820f3a8948f94169b5b5dfa99a64 [formerly 139ca20a3c]
Former-commit-id: 374a019df4
|
2012-11-07 17:38:21 -06:00 |
|
Lee Venable
|
364f4b9fe4
|
Merge "Issue #1298 Changes for non-blocking CallToActionsDlg." into development
Former-commit-id: d66bc87da4 [formerly b52b156faa] [formerly c2e8c3a50e] [formerly d66bc87da4 [formerly b52b156faa] [formerly c2e8c3a50e] [formerly 0dff0bf0b7 [formerly c2e8c3a50e [formerly 9efe5208b4383d844c32fb7d8207ce48a04d27d6]]]]
Former-commit-id: 0dff0bf0b7
Former-commit-id: 1961416ba0 [formerly d985b1c66e] [formerly afc3dbfffcd3b5a490f2fd2782d576edae187158 [formerly 7fdfbae106]]
Former-commit-id: 0c9e06ea594233d6aa615b11d730d37281bfeea7 [formerly f865c6c33d]
Former-commit-id: 1202366429
|
2012-11-07 17:38:03 -06:00 |
|
Brad Gonzales
|
b0faa6b4b3
|
Issue #1309 added units to Aggregate.java and AggregateRecord.java
Amend:
Changed ProcessEvent.processingTime and ProcessEvent.processingLatency to longs.
Removed Unit from AggregateRecord.java.
Change-Id: If4f6fccb65c584055d68129874a398d6391155e7
Former-commit-id: 04d7e36077 [formerly 2a0b6ad151] [formerly 577df6943e] [formerly 04d7e36077 [formerly 2a0b6ad151] [formerly 577df6943e] [formerly 4c49c9116d [formerly 577df6943e [formerly 3afbeecdaecfb9ab7cea7e59db688639dbdad972]]]]
Former-commit-id: 4c49c9116d
Former-commit-id: 39f635354a [formerly 69d7fe5cd0] [formerly c5ea7dd8201ef99851ee8be6489272c0127fe903 [formerly b17893d7e0]]
Former-commit-id: ba8ce43b0c907cff5e4697dc142aa31acfe21997 [formerly c25fc27e89]
Former-commit-id: edfed65902
|
2012-11-07 15:36:44 -06:00 |
|
Roger Ferrel
|
bb99fc1786
|
Issue #1298 Changes for non-blocking ClearZoneGroupsDialog.
Change-Id: I26b270ccea9cd31f2948180eff33df75fbd95ea0
Former-commit-id: d6d99f5e30 [formerly ee038e811c] [formerly a46535ee0c] [formerly d6d99f5e30 [formerly ee038e811c] [formerly a46535ee0c] [formerly 65d10be5d6 [formerly a46535ee0c [formerly a0531fd85403c43226f5c7ed60d4c8ecdf1fc6d4]]]]
Former-commit-id: 65d10be5d6
Former-commit-id: b42d50faed [formerly 42f453ffca] [formerly 2a9ce01552cb82c75c8d83ada1b390cf88194546 [formerly 35f3a3953c]]
Former-commit-id: b4cc1e5dfe5e0670423a5cce3ddd39aedbd7aa98 [formerly f2f0d2320f]
Former-commit-id: dda46f3046
|
2012-11-07 15:07:47 -06:00 |
|
Roger Ferrel
|
01e25a5e86
|
Issue #1298 Changes for non-blocking CallToActionsDlg.
Change-Id: I4a141c0a3d00cab36b792f4471aaf7482c2fa8dc
Former-commit-id: dd9e28d58a [formerly 4b0c701d69] [formerly 190922a233] [formerly dd9e28d58a [formerly 4b0c701d69] [formerly 190922a233] [formerly 81de6cd45b [formerly 190922a233 [formerly 7e987f7743a068b14e3eb7149f933cdf56e59f61]]]]
Former-commit-id: 81de6cd45b
Former-commit-id: 1358368fb1 [formerly d6e00b6c35] [formerly a7fc02e7168c2f8831b77da9c66722dbbf5aaca1 [formerly d6560d7730]]
Former-commit-id: 9465c83ddbf5a04d735808331efa69a3f68cc858 [formerly 1d7ee19deb]
Former-commit-id: 51b57e0dfa
|
2012-11-07 14:35:38 -06:00 |
|
Steve Harris
|
94cd5a1388
|
12.12.1-1 baseline
Former-commit-id: 8278cac143 [formerly c2839cc86d] [formerly e4bd20a515] [formerly 8278cac143 [formerly c2839cc86d] [formerly e4bd20a515] [formerly e1498006c7 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]]
Former-commit-id: e1498006c7
Former-commit-id: 3cb24c1d06 [formerly 4f243de928] [formerly cc5d9cd9866ef60af47606a02772dd35474145e9 [formerly 214fcd3b63]]
Former-commit-id: 5b863edab7014aa1117ea6831f473bf942ace0fe [formerly a5be98d6de]
Former-commit-id: af59663a99
|
2012-11-07 12:41:20 -06:00 |
|
Lee Venable
|
f31e55a025
|
Merge "Issue #1298 Changes to make EmptyEditAreaWarningDialog and TimeRangeWarningDialog modal and blocking." into development
Former-commit-id: f4a62abbda [formerly 074543d75e] [formerly f368b93484] [formerly f4a62abbda [formerly 074543d75e] [formerly f368b93484] [formerly 297d2bbc9c [formerly f368b93484 [formerly badb1ba2ed966e920a0dce9d1612dc07e4a21049]]]]
Former-commit-id: 297d2bbc9c
Former-commit-id: f40b79b1d5 [formerly 412c29f116] [formerly ee47c755e7e6236016ccc5e7a9e51cbd59b2ee9a [formerly 24dd8a1bc7]]
Former-commit-id: 26f532b8bd3410cb1cc9967687c66bc61f12acce [formerly c6f4c2e53b]
Former-commit-id: c65c92e4d5
|
2012-11-07 12:31:39 -06:00 |
|
Nate Jensen
|
b640b014ea
|
Merge "Issue #1273 product browser can now change order for grid" into development
Former-commit-id: 1261394035 [formerly ce706de2d8] [formerly 335939d5c1] [formerly 1261394035 [formerly ce706de2d8] [formerly 335939d5c1] [formerly edadd4d018 [formerly 335939d5c1 [formerly f8354c7abdcc3188d1b20ca6804550b7203c7f7f]]]]
Former-commit-id: edadd4d018
Former-commit-id: 8f35288a93 [formerly 531114d066] [formerly c9fb75d741ca1c84288985090c4ba10c996e9cf5 [formerly 3ab1b4ebb7]]
Former-commit-id: 777111bb1d8ced7fd4e71afed9ae4b70ed301221 [formerly 1a19901673]
Former-commit-id: 96016dbf97
|
2012-11-07 12:26:54 -06:00 |
|
Roger Ferrel
|
9ddd5df5e3
|
Issue #1298 Changes to make EmptyEditAreaWarningDialog and TimeRangeWarningDialog modal and blocking.
Change-Id: I6c5679269985eeb32d48afa44862632e00939a91
Former-commit-id: 977d7c5ead [formerly 8bf89ad495] [formerly 82abbbf0b7] [formerly 977d7c5ead [formerly 8bf89ad495] [formerly 82abbbf0b7] [formerly 974431a13a [formerly 82abbbf0b7 [formerly 8b12ea9f59036ccd47c55f90a86f7d6b589baa0e]]]]
Former-commit-id: 974431a13a
Former-commit-id: 865211fd4f [formerly 35b0dc2cef] [formerly 939bce1bf4a85e111dabaeba878bf42efeee1300 [formerly c6749e3740]]
Former-commit-id: 34a96e511cc74d414b5dd3105e007092aea93abe [formerly 9f6f6c9c16]
Former-commit-id: 9f91e9326e
|
2012-11-07 11:27:36 -06:00 |
|
Nate Jensen
|
465fbb8653
|
Merge "Issue #1276 - v1.0 of multiple WA deployment support" into development
Former-commit-id: 1f4489d2b0 [formerly 904120bb43] [formerly 2cf2e79f34] [formerly 1f4489d2b0 [formerly 904120bb43] [formerly 2cf2e79f34] [formerly 433a79e689 [formerly 2cf2e79f34 [formerly bab65855839a69e29d90582e021d13ae439242ce]]]]
Former-commit-id: 433a79e689
Former-commit-id: 4ee5577111 [formerly 87a1701dd1] [formerly 9c3cc271de1ac44980ed1712255104bfb1f2fbf2 [formerly b3ecd946ff]]
Former-commit-id: d5887ed5a9ee84d5fe88f4639ed6afb641139653 [formerly ed96e701d7]
Former-commit-id: 5783705d57
|
2012-11-07 11:04:45 -06:00 |
|
Ben Steffensmeier
|
0326af03cd
|
Issue #189 fix another Unknown Model
Former-commit-id: 690297bb4d [formerly 643212a0ad] [formerly eaa7e420df] [formerly 690297bb4d [formerly 643212a0ad] [formerly eaa7e420df] [formerly 64f59b94e4 [formerly eaa7e420df [formerly 7dfb29c93784505c0b3aad37c631afe6f5ecf14f]]]]
Former-commit-id: 64f59b94e4
Former-commit-id: f83085470d [formerly ac8cd2ef9a] [formerly 37ac8c0d9c2858369d80285a1cb913ef431ee252 [formerly 89efb7cf22]]
Former-commit-id: a32b5970a9a36c0800ea8bc2aebc4915ad9d051a [formerly babdbc9b38]
Former-commit-id: 69f07fd7f0
|
2012-11-07 10:56:26 -06:00 |
|
Max Schenkelberg
|
3a1cefc612
|
Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration.
Change-Id: If392126da6b7b27be20bbcb2423ab0e851307345
Former-commit-id: 94e64c9b0d [formerly f069f34a96] [formerly 2f90120248] [formerly 94e64c9b0d [formerly f069f34a96] [formerly 2f90120248] [formerly ca4177dd08 [formerly 2f90120248 [formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]]]
Former-commit-id: ca4177dd08
Former-commit-id: f9e6347863 [formerly 5a5bd522a1] [formerly 42f60026840ae4bf86371ebfd3e40ca565028c4b [formerly 747ab974e9]]
Former-commit-id: 0f95dc114844e36c224300902fd5c26ef83108c0 [formerly 50625b0453]
Former-commit-id: 2345861756
|
2012-11-07 10:44:42 -06:00 |
|
Richard Peter
|
2609c54a32
|
Merge "Issue #1305 updated ProcessEvent with quantitative statistics. removed duplicate processStats.properties." into development
Former-commit-id: aabb8e044f [formerly ec86e24f71] [formerly 51638344a8] [formerly aabb8e044f [formerly ec86e24f71] [formerly 51638344a8] [formerly 67471e4453 [formerly 51638344a8 [formerly 45cd4048eeda02b7eb8199e4514ad4ec9f3b7c03]]]]
Former-commit-id: 67471e4453
Former-commit-id: 958dbf764b [formerly ef5c835118] [formerly d3cbb46324df3cfba56fa79184278dbeae927e05 [formerly 9125602f3a]]
Former-commit-id: a769e240c518766bfac03649957d96f970b9d19a [formerly fc8324eb44]
Former-commit-id: dfa2c5f943
|
2012-11-07 09:32:25 -06:00 |
|
Ben Steffensmeier
|
fab50579f4
|
Issue #189 add more comments to grib decoder.
Former-commit-id: f5dede12c7 [formerly 397ebf02f6] [formerly 67db4ae4e4] [formerly f5dede12c7 [formerly 397ebf02f6] [formerly 67db4ae4e4] [formerly 237a7ea992 [formerly 67db4ae4e4 [formerly fdc27da79f1da6c2bda0f3061096227d95745c46]]]]
Former-commit-id: 237a7ea992
Former-commit-id: a807ad25e5 [formerly 929df097c0] [formerly 5dbb3fd5e45c0a277ff5a82bac79779a4bec375d [formerly d57e097e3d]]
Former-commit-id: 7cab1d83bfff996eef00a1b20a8586bb75e4fa80 [formerly bc633552fe]
Former-commit-id: 34be09b488
|
2012-11-06 18:30:03 -06:00 |
|
Bryan Kowal
|
aea2a6e1d0
|
Issue #1276 - v1.0 of multiple WA deployment support
Change-Id: I2468458fdf690f05841124300c166d217b81f6b5
Former-commit-id: 7ecbbdfdbb [formerly cae04523db] [formerly 9263a0ac57] [formerly 7ecbbdfdbb [formerly cae04523db] [formerly 9263a0ac57] [formerly 4fd43ee45c [formerly 9263a0ac57 [formerly 2d35b221dca2248da68ae1d11f20b40dfb11052c]]]]
Former-commit-id: 4fd43ee45c
Former-commit-id: 4f02bbc98e [formerly d928e2f257] [formerly 16e7831852267916f15c8ff6963b429fd72ee1c5 [formerly 2c14ea1bb7]]
Former-commit-id: 7c8688d9c7ce55813d21a7b1c007f541fa3341e5 [formerly 2cd64bd5cc]
Former-commit-id: cf7ae375b9
|
2012-11-06 16:13:26 -06:00 |
|
Matt Nash
|
f27bdf3801
|
Issue #1273 product browser can now change order for grid
Change-Id: I2e41596925ebd16c733d12b742ff60c0745963a2
Former-commit-id: 5b17b0f296 [formerly 76cdfc09bb] [formerly 9c9db6643a] [formerly 5b17b0f296 [formerly 76cdfc09bb] [formerly 9c9db6643a] [formerly 284aecc6f9 [formerly 9c9db6643a [formerly 9c7477357508794a00267991b825d169df5ae71a]]]]
Former-commit-id: 284aecc6f9
Former-commit-id: 78efa9ad73 [formerly e87cb88d60] [formerly e017c1c0cdba9bc46d18368aafbd7c3e53f1cc50 [formerly 46f695b72d]]
Former-commit-id: f746fbbb1cb2ec8b1e11699c14654852cc42c9a6 [formerly fc838f3de2]
Former-commit-id: 79d997ef52
|
2012-11-06 14:06:49 -06:00 |
|
Richard Peter
|
9eb6774757
|
Issue #1257: Fix Tropical Test Tool
Change-Id: I50c1d7e703d0d5e825ab9825f7fdbcd17ac0e49b
Former-commit-id: 76e97d7ab4 [formerly 449ad67f82] [formerly 45b25ead66] [formerly 76e97d7ab4 [formerly 449ad67f82] [formerly 45b25ead66] [formerly e3da5faf40 [formerly 45b25ead66 [formerly ffb46aa8beab26ce61aa27eaeb8da41a417a24c0]]]]
Former-commit-id: e3da5faf40
Former-commit-id: 977450cdfb [formerly 76102aa826] [formerly dd02dbc917361787e7d1e6779798e6d39049b7dd [formerly 415cc64c14]]
Former-commit-id: fb7117074b745314a6805b95e86e4d1c8189f425 [formerly d1b406ed52]
Former-commit-id: 6789b4d3af
|
2012-11-06 08:47:41 -06:00 |
|
Brad Gonzales
|
9e5526bb0f
|
Issue #1305 updated ProcessEvent with quantitative statistics. removed duplicate processStats.properties.
Amend:
removed groupBy attribute "fileName"
added LogLevel enum and attribute to Event.java. Default level is DEBUG.
Change-Id: I13c155b1fae19cf5a3c82fbb633bf6c7fb217c07
Former-commit-id: 7acf0f1874 [formerly cbce70fd0b] [formerly 6ddd1cbdb3] [formerly 7acf0f1874 [formerly cbce70fd0b] [formerly 6ddd1cbdb3] [formerly a4bc175653 [formerly 6ddd1cbdb3 [formerly 51802e671ac15d451fec19262dfa7a352f0e4c09]]]]
Former-commit-id: a4bc175653
Former-commit-id: fcfc68b5aa [formerly 5257f9a81a] [formerly d18adde3f073af91cd602064130a1c394a72bc1b [formerly ce47edb905]]
Former-commit-id: 745ce4007b06b68179c46700454bf8b93c78ff89 [formerly d226ca28c4]
Former-commit-id: 803ac115ff
|
2012-11-06 07:31:19 -06:00 |
|
Ron Anderson
|
4f1b150de1
|
Merge "Issue #1310: Tie D2DParmIdCache rebuilds to grid purge, not grib purge." into development
Former-commit-id: ddc1ac018c [formerly 5edafa6c86] [formerly 257213e491] [formerly ddc1ac018c [formerly 5edafa6c86] [formerly 257213e491] [formerly 52007a3a00 [formerly 257213e491 [formerly a13ecc678d2fb7bf0e58922e07e3b5df60a197f4]]]]
Former-commit-id: 52007a3a00
Former-commit-id: 03849b76b2 [formerly 80ef14539e] [formerly b18e2a8d7a9e4b4f08cfbf5f9499924acabf1aaa [formerly 1855cb195b]]
Former-commit-id: 7dbe66d0ca5a66327d71b36ae796b8c2f511212b [formerly 9614307971]
Former-commit-id: 3bf08b29e5
|
2012-11-05 17:33:06 -06:00 |
|
Nate Jensen
|
fd6aaed1b0
|
Merge "Issue #1304 Clear text field when point removed." into development
Former-commit-id: 0026e29a7e [formerly f21a65c7e8] [formerly 1d3c6bc0d7] [formerly 0026e29a7e [formerly f21a65c7e8] [formerly 1d3c6bc0d7] [formerly 8818bb44cd [formerly 1d3c6bc0d7 [formerly 85ab423d9116df80d8bab4f095439e52f1fa78d7]]]]
Former-commit-id: 8818bb44cd
Former-commit-id: 87c9ce66af [formerly e800054fb4] [formerly c93831871e2d267264b473036cb04afd12b6f3a1 [formerly 9bfd1c8e8c]]
Former-commit-id: 1c2d5c6bccc934ec94d8e758cc346750bbd9a182 [formerly 9ea29375ad]
Former-commit-id: 7a75a5e116
|
2012-11-05 16:33:38 -06:00 |
|
Nate Jensen
|
f55eb09bc4
|
Merge "Issue #1257: Fix hdf5 purge as well as obs defining multiple default rules. Clean up old purgeRules in deleted plugin. Fix concurrency on ProcessUtil"" into development
Former-commit-id: fe0e8aed85 [formerly 4ce1b0f752] [formerly 1c1da71b38] [formerly fe0e8aed85 [formerly 4ce1b0f752] [formerly 1c1da71b38] [formerly a6d062fb14 [formerly 1c1da71b38 [formerly cc63210970aecee47339eb1bb0d774ed1b5b7f2b]]]]
Former-commit-id: a6d062fb14
Former-commit-id: cdb0b274f5 [formerly 5a12f4c6df] [formerly 40319b78afb269ccdc3c204e67a3d706e811c557 [formerly 0c5589196e]]
Former-commit-id: 80cd98da28d5b685bf39a639511c33b91da9a8fc [formerly 93ef070578]
Former-commit-id: b88ef74cc5
|
2012-11-05 16:32:54 -06:00 |
|
Richard Peter
|
c628bba7ec
|
Issue #1257: Fix hdf5 purge as well as obs defining multiple default rules. Clean up old purgeRules in deleted plugin. Fix concurrency on ProcessUtil"
Change-Id: I984bb34f88ecda1e57ccac462acbced7240846a0
Former-commit-id: e04bb21d8f [formerly bb475bdbf3] [formerly 023bed9bcf] [formerly e04bb21d8f [formerly bb475bdbf3] [formerly 023bed9bcf] [formerly 170e205c88 [formerly 023bed9bcf [formerly 3d04fdb509db0a5d46e215bdc2595c07d15575b2]]]]
Former-commit-id: 170e205c88
Former-commit-id: f92d88ada5 [formerly c1003242ae] [formerly b1f1b7df73c76c3045a4cb2591ef3d94ed2a4b56 [formerly c91ee014f7]]
Former-commit-id: d04d4edee85c6ddeba9df350c409b10b4826af31 [formerly 74b9df6f68]
Former-commit-id: 03c9846293
|
2012-11-05 15:19:04 -06:00 |
|
Richard Peter
|
cd82d26370
|
Merge "Issue #189 fix several Unknown Models" into development
Former-commit-id: 80023b6c2e [formerly 04f3a7ee16] [formerly 9d917020b6] [formerly 80023b6c2e [formerly 04f3a7ee16] [formerly 9d917020b6] [formerly d2e47212c6 [formerly 9d917020b6 [formerly fce6826da3fc3b1848e890e552c566580b4e6f29]]]]
Former-commit-id: d2e47212c6
Former-commit-id: cb2deddbde [formerly 365cd1ad33] [formerly 294dda4a2dc90205c94be5617c195eae2d27e3b5 [formerly 199fbdac90]]
Former-commit-id: 61254ba454153f9845ee8d0a3fafbdcf435955d0 [formerly 092f0b47e5]
Former-commit-id: 5d008d4078
|
2012-11-05 14:03:14 -06:00 |
|
David Gillingham
|
83de696749
|
Issue #1310: Tie D2DParmIdCache rebuilds to grid purge, not grib purge.
Change-Id: I7953a3405c11656f4723b4840ff6e2d15c0a11d7
Former-commit-id: 6cd39983d5 [formerly 4237143dd0] [formerly 11f109976e] [formerly 6cd39983d5 [formerly 4237143dd0] [formerly 11f109976e] [formerly e0c7243c74 [formerly 11f109976e [formerly 358867e5631dab8fbfdf3158d07e3875f949205a]]]]
Former-commit-id: e0c7243c74
Former-commit-id: 5c300c8a66 [formerly d6bbcbe863] [formerly 5356d22a44516841823c50737da389c199e73bce [formerly 73c592ccdc]]
Former-commit-id: c7f6ef8a41396b8becbc83515041a176d0edd662 [formerly 80049b2214]
Former-commit-id: 7ee48aad3b
|
2012-11-05 14:00:15 -06:00 |
|
Richard Peter
|
0db5acd0e8
|
Merge "Issue #189 update readme with more install notes, remove common subgrid package that was moved to edex, mark several classes deprecated." into development
Former-commit-id: ba5ba3bbd8 [formerly 1b753fb500] [formerly 0f38205cb1] [formerly ba5ba3bbd8 [formerly 1b753fb500] [formerly 0f38205cb1] [formerly bfe5dbf75c [formerly 0f38205cb1 [formerly 33fea4ad289d7c8b11c01175f3ef2bc820cd26f7]]]]
Former-commit-id: bfe5dbf75c
Former-commit-id: 65514634f8 [formerly e8aa085ca8] [formerly 9e46111100d7faae184ff9fcfc4e6e3463be7c49 [formerly 7994b98f55]]
Former-commit-id: 82d1d6f27f299ac7b15e48e61b0e342f645b13eb [formerly a8e6d9e507]
Former-commit-id: a5d17d624f
|
2012-11-05 13:47:14 -06:00 |
|
Roger Ferrel
|
95090d5910
|
Issue #1304 Clear text field when point removed.
Change-Id: Ia2f56010e7d620023cbf01656c7be30b0dd742cc
Former-commit-id: 48141292fb [formerly a6b093c2ce] [formerly 921134848b] [formerly 48141292fb [formerly a6b093c2ce] [formerly 921134848b] [formerly 1f71a3bed7 [formerly 921134848b [formerly c927e2eb8a516cf555c0c83a86c51ad209f2a0ab]]]]
Former-commit-id: 1f71a3bed7
Former-commit-id: 9ea3aa1924 [formerly 5c241a7e5d] [formerly 24f35d1ccf7c15130335c1996c047c967a23fca2 [formerly a996839d2c]]
Former-commit-id: f61c6c9f6998c74007dd244c5d15f4ea50469860 [formerly 7dc93cee73]
Former-commit-id: 70627eb1f3
|
2012-11-05 12:56:07 -06:00 |
|
Roger Ferrel
|
73a216a461
|
Issue #1304 Added Point change listners to ChooseByIdDialog and RangeRingDialog.
Change-Id: Id2933ae7ccfb6ed260da619a822c2b5b706f64d3
Former-commit-id: d6916f4ec3 [formerly 120764c5ef] [formerly 986766487f] [formerly d6916f4ec3 [formerly 120764c5ef] [formerly 986766487f] [formerly 3045291a29 [formerly 986766487f [formerly d296028a9a0add9a81836030ff7b65be8883956b]]]]
Former-commit-id: 3045291a29
Former-commit-id: 1fa3cc48d1 [formerly 9fada57123] [formerly 7b06cfc12036025a71849a4056bc337506736aa7 [formerly 2b18983017]]
Former-commit-id: 09e115e76cce8d189a0e264d734bc4e8b9da1836 [formerly f360225043]
Former-commit-id: 13ef1ecd20
|
2012-11-05 11:22:28 -06:00 |
|
Ben Steffensmeier
|
bd38c91cef
|
Issue #189 fix several Unknown Models
Former-commit-id: 373f7b8d25 [formerly b04bca36d4] [formerly 579d2e5ba6] [formerly 373f7b8d25 [formerly b04bca36d4] [formerly 579d2e5ba6] [formerly 365a2274dd [formerly 579d2e5ba6 [formerly 56d97231ac950ad0db6a1063beb5f42483b7d137]]]]
Former-commit-id: 365a2274dd
Former-commit-id: 86b1161cbc [formerly 19caacc7b6] [formerly 46e9818a611bcd38c7e2a0dd747646b584e0dc14 [formerly fa29bdf8c0]]
Former-commit-id: 4051ba0d78ad12807285172318538e8c4800275a [formerly 2dd884765f]
Former-commit-id: 6f54171cfb
|
2012-11-02 16:19:46 -05:00 |
|
David Gillingham
|
bdaa7898bc
|
Issue #1310: Fix automated tropical testing support code after Data Delivery and Unified Grid
baseline merges.
Change-Id: Ia134ecd68c1468b281e7dca6e56f5cbc20047583
Former-commit-id: 31b6703e75 [formerly 251f41414a] [formerly 0f13b5d0b1] [formerly 31b6703e75 [formerly 251f41414a] [formerly 0f13b5d0b1] [formerly ec7a7c1373 [formerly 0f13b5d0b1 [formerly 0c3a35f339819afc5ed79202c95215ed90890df8]]]]
Former-commit-id: ec7a7c1373
Former-commit-id: adc7547288 [formerly a82f811659] [formerly a3f3f849afee00deb18c16ec326dbc64498f04d0 [formerly f998d419d9]]
Former-commit-id: 03c9b1ec4370d5fa4eeb8e3eef1b9f06ccc006f6 [formerly fc56b970ff]
Former-commit-id: f4259113fb
|
2012-11-02 15:21:30 -05:00 |
|
Ron Anderson
|
44d7f0bde4
|
Merge "Issue #1260 Added an extra grid cell around the slab to improve interpolation results." into development
Former-commit-id: 2d771e6b29 [formerly 2c6bbcafdd] [formerly 7a1dc6af0c] [formerly 2d771e6b29 [formerly 2c6bbcafdd] [formerly 7a1dc6af0c] [formerly aae03ce3f8 [formerly 7a1dc6af0c [formerly e65b1a378d8eff3df100953c800512b5f9c5c90f]]]]
Former-commit-id: aae03ce3f8
Former-commit-id: dfa2e5efa8 [formerly ed53a921a6] [formerly 4cbcbe06787424f2b026ec8864bf072b08498450 [formerly 8da303506f]]
Former-commit-id: 4d52e263a289a3e3f830c2507c465542e378408c [formerly 0085c66fb9]
Former-commit-id: fa5c379be9
|
2012-11-02 14:48:06 -05:00 |
|