Lee Venable
f890984a8a
Merge "Issue #1790 Changes for non-blocking StationListDlg." into development
...
Former-commit-id: b1006937867389bf5b292875600910b1006937867389bf5b2928756009100bfc05ce6128756009100bfc05ce61ec82403afaebfa8ea79c3d683e98a9034e16baa70a5a8d108a
2013-04-01 09:40:59 -05:00
Steve Harris
ca4153d5f5
13.2.1-19 baseline
...
Former-commit-id: 127cd2681288a4bb0924bebd9ad1f4127cd2681288a4bb0924bebd9ad1f4fc859547f8bebd9ad1f4fc859547f88a561e4b844525c281f3a83eddfe7b999eb26cec0ff4cc2cc4
2013-04-01 10:11:24 -04:00
Roger Ferrel
2c4327e525
Issue #1790 Changes for non-blocking StationProfileDlg.
...
Change-Id: I669c9115dd1bb506acd025a451163aaf664593ef
Former-commit-id: 7551b03bfee1b40f9f2f0d269691e27551b03bfee1b40f9f2f0d269691e2d21cb5e2e80d269691e2d21cb5e2e8b78126a76486e21acae2944d03615e9e3bee6562c95d8692ff
2013-03-29 17:11:02 -05:00
Ben Steffensmeier
b2dae45d7b
Issue #1799 fix modal tools again.
...
Former-commit-id: 0802c4cd3dcffac354e8eeeede72880802c4cd3dcffac354e8eeeede728866af8daa11eeeede728866af8daa11d2fa8b7c0c11e6afa5fa7082466303b3245f7a5dfacdfdc501
2013-03-29 14:30:54 -05:00
Roger Ferrel
1d91e60e60
Issue #1790 Changes for non-blocking StationListDlg.
...
Change-Id: Ib0cbfd64fca2d4dcbea68b5e0db8b34a5a7af6be
Former-commit-id: 6d83f23cc2281e7f53cbc5a95dcb446d83f23cc2281e7f53cbc5a95dcb446ad80607bcc5a95dcb446ad80607bce536a10191ba0060522fde02460b1199ebeac6fd3a3e3674a8
2013-03-29 13:46:51 -05:00
Roger Ferrel
55fa68c464
Issue #1790 Last of the bug fixes. Reviewer changes
...
Change-Id: I451799e34e9621723c9d652f339c880da3aa7caa
Former-commit-id: 9c498726af20f6baba0e8f4492c63c9c498726af20f6baba0e8f4492c63c463407a40e8f4492c63c463407a40eecdb29cc1d8c1116eaaeec5f32aec6c1ffc82920791fbba888
2013-03-29 11:35:08 -05:00
Ron Anderson
6323fb90b1
Issue #1838 Fixed selected time range when Select Grids When Stepping is enabled.
...
Change-Id: I30417042d568e6471f8a684fab8bcc2387618089
Former-commit-id: d7f0cfe92d4ac9a4d9a80f4fb125b0d7f0cfe92d4ac9a4d9a80f4fb125b0c7cfcf02500f4fb125b0c7cfcf0250ba064a146acd0f319ec59cfa87f7e541b07580848502dee456
2013-03-29 10:48:26 -05:00
Ron Anderson
92a156fe0f
Issue #1774 Fix invalid unit strings in parameterInfo files.
...
Change-Id: I681f323b91f213dad5d2ad725bfb77f304e769de
Former-commit-id: ef06834e54cfb324f380aeb451a37cef06834e54cfb324f380aeb451a37c679bb01764aeb451a37c679bb017646cd8d1e8eed5e3976dc496e8f6367922f633b2a11eede44aac
2013-03-29 10:07:37 -05:00
Greg Armendariz
4b042a145d
Fix merge issue
...
Former-commit-id: 466fa3fd41611661ccc9cd5da3a6c5466fa3fd41611661ccc9cd5da3a6c55da06cadd7cd5da3a6c55da06cadd77382b92b41dcd36e64a6f0e1b80cd257eff9d7bf9a8ce1af9e
2013-03-29 09:52:46 -05:00
Greg Armendariz
54fef6c68f
Change package location of import
...
Former-commit-id: 56f51657fdf778112c20d533c5c08d56f51657fdf778112c20d533c5c08d27345f6edfd533c5c08d27345f6edf54231d5bcc05af592718089dfc87e687e37c990e63d746dd77
2013-03-29 09:09:32 -05:00
David Gillingham
7fdc3419ec
Issue #1837 : Provide better error logging when a map referenced in localMaps.py cannot be found in the database.
...
Change-Id: I2400f46f8010ff312c0943b3d08c89d6ce34c5e0
Former-commit-id: 2ee53d54f5170f252bdd8a7c965eaa2ee53d54f5170f252bdd8a7c965eaac9ed59b0e08a7c965eaac9ed59b0e0acc3ac1c03fddd42615ddbec0fa00f0b155a57884c1c4e665e
2013-03-28 17:18:43 -05:00
Nate Jensen
a000719325
Merge "Issue #1774 Fix D2D accumulative parameter time ranges" into omaha_13.3.1
...
Former-commit-id: 9d74722ce03ad797690b214b2ed4ba9d74722ce03ad797690b214b2ed4ba1bf37125c4214b2ed4ba1bf37125c48092e699e6946323416c711fbe98d2a6a81a17d61b1d1a48d2
2013-03-28 17:02:14 -05:00
Richard Peter
d18439e5e8
Merge "Issue #1750 - qpid updates for compatibility with operational servers" into development
...
Former-commit-id: b548239f0b1228c8cbbcb4fea10724b548239f0b1228c8cbbcb4fea10724209d53ee67b4fea10724209d53ee6716fcad80cdaffe383cf38b0347001da087e63bcbc22b37600a
2013-03-28 16:59:18 -05:00
Steve Harris
20ece0647e
Issue #1782 - restore FFPMGenerator.java
...
Former-commit-id: 545ab48027f01b5fb849e67dbb206e545ab48027f01b5fb849e67dbb206e3953f8368be67dbb206e3953f8368bcf60c00cb2bec6e9099fa74d22efc592aa705ebcef1e593ebd
2013-03-28 16:06:54 -05:00
Bryan Kowal
3ad26d1b99
Issue #1750 - qpid updates for compatibility with operational servers
...
- ensure that AWIPS II Java is used
- installation will create the required qpid logs directory
- do not include the qpid-deps jar due to conflicting FOSS classes
Change-Id: I52f6f939fa1600e69b14966ac6eff998e35bc82f
Former-commit-id: a9cdcfeb64d124f7a37f2819e8fe48a9cdcfeb64d124f7a37f2819e8fe48e3c39b9be62819e8fe48e3c39b9be60e463b7bc9fa5825b0c507a52630a7df6d81dfd98cd870d757
2013-03-28 16:00:27 -05:00
Ben Steffensmeier
f8747920e5
Issue #1799 fix activation of tools for new perspectives.
...
Former-commit-id: 6bf1ec8543dcbed6568150a276a7e26bf1ec8543dcbed6568150a276a7e24efa92ff4950a276a7e24efa92ff49d7d0ea726433de9bfc87a415fb17aea5e1593213788df8fc68
2013-03-28 15:47:36 -05:00
Max Schenkelberg
e6e93dbc2a
Issue #1638 Added persistIndex route that only persists and indexes
...
Change-Id: I2d53bae64dca80e20777407c62ce7cc7546e3fae
Former-commit-id: 040a09b8abd55e7a0edae91406ab10040a09b8abd55e7a0edae91406ab10a308b27c2fe91406ab10a308b27c2f232655183c623c49c3ccd9a481f54258a5bebb80b30b72252b
2013-03-28 15:45:31 -05:00
Ron Anderson
80ce55bd3a
Issue #1774 Fix D2D accumulative parameter time ranges
...
Change-Id: I57b32881a30e89c999dae6db7753da83f9e949c1
Former-commit-id: 80bd994f2027e07ce4a95bb47b793180bd994f2027e07ce4a95bb47b7931b65ecfc1515bb47b7931b65ecfc15165dd07508933bcf5fee83f2fa771d95eb1885dbdbef17d4f03
2013-03-28 13:37:29 -05:00
Steve Harris
0528a1c5d2
Revert "Replaced with formatted version"
...
This reverts commit 911496b33920c9d653c8054d8d263f4887191329e074710e0acf9b26728318019c07a4410e8bcbf1ff977fc882b741680965410e8bcbf1ff977fc882b74168096518019c07a4b7416809658706337f67c51c9ea5df29c59184288706337f67c51c9ea5df29c59184288400028e1129c59184288400028e11c9dd6529737bd478fc41b614bf53f60074c522bb938243eb0b
2013-03-28 13:08:16 -05:00
Dustin Johnson
e275e220bb
Merge "Issue #1839 Change build.edex build.xml to support building work assignment features after main build" into development
...
Former-commit-id: c06f0ed7f49bc6dd47b6c618169639c06f0ed7f49bc6dd47b6c6181696393991df64ffc6181696393991df64ffd37764f7223896cf42f1d900459ab49c4030ea37be22a59736
2013-03-28 13:07:20 -05:00
Greg Armendariz
911496b339
Replaced with formatted version
...
Former-commit-id: 410e8bcbf1ff977fc882b741680965410e8bcbf1ff977fc882b74168096518019c07a4b74168096518019c07a44887191329e074710e0acf9b267283054d8d263f20c9d653c8
2013-03-28 12:59:43 -05:00
Dustin Johnson
1b7986e692
Merge "Issue #1802 : Eliminated a call to new on StatsDao in AggregateManager" into development
...
Former-commit-id: 2ec3e76c1c59393b633a8583a5f7852ec3e76c1c59393b633a8583a5f78551bf00bf1c8583a5f78551bf00bf1ca5bb46da22ee26b669e3db5a8b98651cf371cd41520b9f2a69
2013-03-28 12:25:12 -05:00
Dustin Johnson
847503d736
Issue #1840 Fix merge error that removed .classpath
...
Change-Id: I976e69d04ce47fe31cf47c9aff7de1bed786ad17
Former-commit-id: 6f36d70eadc2edf1dd89ab426738486f36d70eadc2edf1dd89ab42673848a4e4df02b0ab42673848a4e4df02b0ce4b93027c85d6a19a5e902986256df135c0d948a5009cb271
2013-03-28 12:14:47 -05:00
Dustin Johnson
8f7c7adf90
Issue #1840 Fix merge error that removed .classpath
...
Change-Id: Ic199fa594ceecaa5c14a28d0ccb58e49ac728f6e
Former-commit-id: e28ea4d3ef5e0073f1f9680d2984e1e28ea4d3ef5e0073f1f9680d2984e1695c83669e680d2984e1695c83669e65f6842341d0056996cd25b6eb0eb9fddc41bb6e3850e46c2c
2013-03-28 12:13:23 -05:00
Benjamin Phillippe
7b0b82d34a
Issue #1802 : Eliminated a call to new on StatsDao in AggregateManager
...
Change-Id: I2c52a222746df7e7a0c8f91682268e25e97ae0ce
Former-commit-id: c63337ac35ec880b7923ed9cb5f8f6c63337ac35ec880b7923ed9cb5f8f66640a65a51ed9cb5f8f66640a65a518bfd5868caaf5827f1dec4496475a65ec3ffed77cca60522c4
2013-03-28 12:08:57 -05:00
Greg Armendariz
1900dd4925
Merge "Issue #1832 - re-compile Linux 32-bit and 64-bit versions of jep; recompile MSFT Windows 32-bit version of jep" into omaha_13.3.1
...
Former-commit-id: cea8e5309eb543b515d9a48365165bcea8e5309eb543b515d9a48365165b943426fd00a48365165b943426fd0035041aac3010823802da05d1d16500cccd9a73ca817f9ec79c
2013-03-28 12:05:07 -05:00
Dustin Johnson
22a62fea55
Issue #1839 Change build.edex build.xml to support building work assignment features after main build
...
Change-Id: If757b326fe851a976e5cd545f48e339cceacb4f9
Former-commit-id: 2e1cc96d01ce37e32e613be6669f1b2e1cc96d01ce37e32e613be6669f1b1365d5c9af3be6669f1b1365d5c9af6ad3355dad1960bcbf1183f6fb720cf817dbe4959d04ba83a5
2013-03-28 11:43:24 -05:00
Bryan Kowal
458a79ba89
Issue #1832 - re-compile Linux 32-bit and 64-bit versions of jep; recompile MSFT Windows 32-bit version of jep
...
- add Eclipse CDT configuration for 32-bit and 64-bit Linux compiles
Former-commit-id: d8b19842835fe808757fc592e8a877d8b19842835fe808757fc592e8a877955b5c84d3c592e8a877955b5c84d3b3e4b32a201a11fef5327a6f32796b087e7b2468cb965ceb79
2013-03-28 10:42:51 -05:00
Max Schenkelberg
e5b74d9295
Issue #1638 Fix merge error
...
Change-Id: Id75f4d6372cd77132bad82029cfb176ec4f19712
Former-commit-id: 33352d0e5325202d8534573b44166233352d0e5325202d8534573b4416622b58e3ce3f573b4416622b58e3ce3f0bd1554e20abcf4bf569c9301b75ea223f946b904253d92576
2013-03-28 10:20:54 -05:00
Ben Steffensmeier
7446339aff
Issue #1821 recalculate 6 hours to be longer.
...
Former-commit-id: c61b608e1b61e0ca3b75a9cec71222c61b608e1b61e0ca3b75a9cec71222efbdd3aa8ca9cec71222efbdd3aa8c7b4a3d369ae1a619e030403da9bfb994dcd159d467b3b92712
2013-03-28 10:16:11 -05:00
Lee Venable
63cbc67322
Merge "Issue #1790 Bug fixes for SCAN." into development
...
Former-commit-id: 87e166d88da891171c43e7805ded9287e166d88da891171c43e7805ded92167fa6eadfe7805ded92167fa6eadf9b754cf557655f06cb65772bbe23a7adbaebd45703fd0004ec
2013-03-28 10:04:34 -05:00
Bryan Kowal
7b230a9f04
Issue #1821 - re-compile grib2.so 32-bit and 64-bit
...
Former-commit-id: d3a2525705203a3d5200da99727625d3a2525705203a3d5200da997276252da2b370dbda997276252da2b370dbcf87439189131e260337998fbe87699343dee116c29e1e5374
2013-03-28 09:48:27 -05:00
Roger Ferrel
38ff70f9cb
Issue #1790 Bug fixes for SCAN.
...
Change-Id: I5743cd94be6c06808acb0add38d63ea381d13c65
Former-commit-id: 895ac9a39b009cd032cb9c560ab626895ac9a39b009cd032cb9c560ab626e204276c179c560ab626e204276c1757b5bf2d45380846374f216fa1b23b3bb55722f518b74a6aa7
2013-03-28 09:16:24 -05:00
Roger Ferrel
f12907e546
Issue #1790 bug fix for GFE dialogs in ticket 1353.
...
Change-Id: Ibe3361dfcf0361f66eb6d1da3893c309e8fcc612
Former-commit-id: bb33366fc957fe6b5ca698d056c3a1bb33366fc957fe6b5ca698d056c3a14db9e20fbf98d056c3a14db9e20fbf1c3089a826a8872882aeb95a38db32c354469c78a6337e82dd
2013-03-28 09:04:10 -05:00
Greg Armendariz
6a115c344f
Add source variable
...
Former-commit-id: 5d9bb2f71eae09ebb11f8800080d2a5d9bb2f71eae09ebb11f8800080d2ad0d889f11d8800080d2ad0d889f11d8d335839e644fcd1a8db24fea6f45d344c5b41b30ab3b9d7f9
2013-03-28 08:56:50 -05:00
Steve Harris
f2a81e18e9
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml
Former-commit-id: 02f49bc2e4069ee8a7489a321b6ac802f49bc2e4069ee8a7489a321b6ac83073951b3d9a321b6ac83073951b3db7beed13a56e48567370a4bf236cc790ec2d3fbf53ee0151ca
2013-03-27 22:16:15 -05:00
Steve Harris
e487576093
Merge branch 'master_13.3.1' (13.3.1-14 cleaned up) into omaha_13.3.1
...
Former-commit-id: 16a781b20ec284261dc23cb15755a816a781b20ec284261dc23cb15755a86351d8f6d33cb15755a86351d8f6d312c22ed8ac3138de0e06e56bd830ac5102880f6e550305a7b6
2013-03-27 22:13:11 -05:00
Steve Harris
4514374145
13.3.1-14 baseline
...
Former-commit-id: bf64a0dc2f6a4bbd9f1ac29076949ebf64a0dc2f6a4bbd9f1ac29076949e4d4234d5c9c29076949e4d4234d5c97e379468f5e89cef72a4c0737a6022efadc571cac1c5990b25
2013-03-27 22:10:03 -05:00
Roger Ferrel
057f05e937
Issue #1790 Bug fix for dialogs in ticket 1578
...
Change-Id: I472e20ca729d0c4f3510bdd98e5456be47bd2c90
Former-commit-id: 63ab75fec65bd60ce50ca8410499bc63ab75fec65bd60ce50ca8410499bc1129728e03a8410499bc1129728e03e920ac0aaebe143656eb56ca20476436219d5090cee3cd01e6
2013-03-27 21:54:26 -05:00
Richard Peter
6e9eee551c
Merge "Issue #1821 Reduce db and pypies requests in grid assembler." into omaha_13.3.1
...
Former-commit-id: 52174ddb57642ff5e3203ba331e9f552174ddb57642ff5e3203ba331e9f52b207fc6ec3ba331e9f52b207fc6ec52459fd3ccb061ba5595d8cbd1ff39c2896a01d26bca38d68c
2013-03-27 18:32:38 -05:00
Richard Peter
d5aab5c91d
Merge "Issue #1821 make GridInfoCache more elaborate. Change-Id: Ib64a68ab4e898eba5fe186ac5ac01407964e37d9" into omaha_13.3.1
...
Former-commit-id: b03b4b8f752a71b9de1b7992b43a7ab03b4b8f752a71b9de1b7992b43a7a6c4f2796237992b43a7a6c4f27962328c463775bce746d6228e68173e14717a9c008d097a4cd9e1a
2013-03-27 18:28:01 -05:00
Steve Harris
cdad316568
Issue #1782 - Merge branch 'master_13.3.1' (13.3.1-14) into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
edexOsgi/com.raytheon.uf.edex.datadelivery.request/.classpath
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE
Change-Id: I6b2513155d566aa09571c280b46cf309028a9861
Former-commit-id: bb88c2133a979d6a5d8c2a0e399dc8bb88c2133a979d6a5d8c2a0e399dc8d997aeaee42a0e399dc8d997aeaee43f99eed860428ec8a472e67b16bb03f3a84e952e21332cb0b5
2013-03-27 18:21:05 -05:00
Ben Steffensmeier
f24c14372e
Issue #1821 Reduce db and pypies requests in grid assembler.
...
Former-commit-id: 66d3c4c2376171d60f4460d13f228266d3c4c2376171d60f4460d13f22825add905ea760d13f22825add905ea7f3fdbf45bf1312e2ba3437fc71a726459e00df311f507138d3
2013-03-27 17:59:58 -05:00
Steve Harris
43942dad11
13.3.1-14 baseline
...
Former-commit-id: f9b343048591a5e4578e9022c500cef9b343048591a5e4578e9022c500ce9fba973fd09022c500ce9fba973fd03cbf22bd96936e4adda22ca160caf08237fdadaaf59f1f02b0
2013-03-27 17:59:34 -05:00
Ben Steffensmeier
046233d3d6
Issue #1821 make GridInfoCache more elaborate.
...
Change-Id: Ib64a68ab4e898eba5fe186ac5ac01407964e37d9
Former-commit-id: bedc1bce0aa31dc1874bbc8729d631bedc1bce0aa31dc1874bbc8729d6314b6d2fd8d1bc8729d6314b6d2fd8d1c46190259b60b2259343e4462ee41a03eade5b9807438ab40a
2013-03-27 17:28:45 -05:00
Benjamin Phillippe
977a96e419
Issue #1802 Fixes related to DD transaction refactor
...
Change-Id: Ia2a7a4ce990d424ed1e365bd7003fd2ab8630fd1
Former-commit-id: 1e30861a2130be5ce6f9115dc127901e30861a2130be5ce6f9115dc127902a14245dce115dc127902a14245dce0d769d03c03cc6978718b0010de8ff5f8b73fadd781b70a8cc
2013-03-27 17:12:52 -05:00
Richard Peter
0d9bf66096
Merge "Issue #1827 Create registry/datadelivery client features" into omaha_13.3.1
...
Former-commit-id: 5063faa546c11b070571c8ae09ab1d5063faa546c11b070571c8ae09ab1d70a7c3c556c8ae09ab1d70a7c3c5562ae52dbaeebe2a8e1b16de88cceb8c09801abaf40522d43c7f
2013-03-27 17:08:00 -05:00
Roger Ferrel
2f6183f158
Issue #1790 Bug fixes for ticket 1353.
...
Change-Id: I36b74546b7f73c669d65a5588e813173ccbd18fc
Former-commit-id: 7a4d48d4899b527de11a04b57a85827a4d48d4899b527de11a04b57a8582391ce5687b04b57a8582391ce5687b9e1fd195e3c9d9b3b277726b5de0c51b74b2d4a49b7ba22770
2013-03-27 16:56:17 -05:00
Dustin Johnson
e01c368285
Issue #1827 Create registry/datadelivery client features
...
Amend: Add event plugins and their dependencies to client features
Change-Id: Ib80522161740857d4332b84bbedad10e19683602
Former-commit-id: 5dbff646aafbcfdd0ca152c27ec57f5dbff646aafbcfdd0ca152c27ec57f1684507bdb52c27ec57f1684507bdb49c53e54432591041c9df27ebfbc1bc5685dbe9f198fb2b6ae
2013-03-27 15:38:36 -05:00
Roger Ferrel
7cde992568
Issue #1790 Fix dialog in current phase.
...
Change-Id: I7289fbef264d68b70b606d120cde8daf5fc41e7b
Former-commit-id: bdfca9ce6ba0a86f9b13d69674d595bdfca9ce6ba0a86f9b13d69674d5951093c020e6d69674d5951093c020e6021fab7569f66a80a2ae68ba7cab75d504643687d61226e023
2013-03-27 14:11:36 -05:00
