Lee Venable
ca38aca6df
Merge "Issue #1830 - Don't allow base level config files for FFMP" into development
...
Former-commit-id: e9940408874a8c4b64dfe9940408874a8c4b64dff1e8faf9fff1e8faf9ff58c83b966235d27f89f1e66a72fbed
2013-04-01 12:26:23 -05:00
Steve Harris
ac6704c7e9
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
Former-commit-id: 736bb45741140765a43e736bb45741140765a43e437a04011a437a04011a7b27767d7e0b48e96314d0e61c59e8
2013-04-01 12:19:04 -05:00
Steve Harris
e74f4ae39e
Merge branch 'master_13.3.1' (13.3.1-17) into omaha_13.3.1
...
Conflicts:
rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE
Former-commit-id: 3b722f107674a47b9bd93b722f107674a47b9bd914c9de225914c9de2259f85a1ab9aba6dd28cc820fee31b1a8
2013-04-01 12:15:04 -05:00
Lee Venable
631444f8fa
Merge "Issue #1790 Changes for non-blocking StationProfileDlg." into development
...
Former-commit-id: 7d73b8dacffe89cb7fe47d73b8dacffe89cb7fe4d3390596f4d3390596f44e95ffe2ae89da26a266e0d1017c14
2013-04-01 12:06:16 -05:00
Steve Harris
a112803c98
13.3.1-17 baseline
...
Former-commit-id: f28b85d42f7bf9966dcbf28b85d42f7bf9966dcba3fe998f8fa3fe998f8fef413da5f74afa41d4e750becef97f
2013-04-01 12:04:56 -05:00
Steve Harris
e61c718b49
13.3.1-16 baseline
...
Former-commit-id: a262f22cee51380726d4a262f22cee51380726d43066dd33e53066dd33e56b75202d0736a4b3eb51c53a305b1e
2013-04-01 11:39:08 -05:00
Mike Duff
e07f3971c0
Issue #1830 - Don't allow base level config files for FFMP
...
Change-Id: Ib408e51eda5367a1d66684685935b6163acbbb77
Former-commit-id: fa8ca827d1261a39122dfa8ca827d1261a39122d9c2ac874829c2ac87482e627279d7c11ca7c2c2063489a0873
2013-04-01 11:36:53 -05:00
Richard Peter
1b229e3d61
Merge "Issue #1638 Added Auto updating localization file object and added more methods to RecordFactory to make more versatile" into development
...
Former-commit-id: 2fa88522ffe221223f8a2fa88522ffe221223f8a255617199c255617199c65f317e56bea4a599a5a58a8049b64
2013-04-01 11:33:59 -05:00
Steve Harris
cc1ef45545
13.3.1-15 baseline
...
Former-commit-id: 4cf3ad6abbeb1dab38644cf3ad6abbeb1dab38643d8ed484be3d8ed484be2bf790aae3d3cec5d3cb4204273f21
2013-04-01 11:33:20 -05:00
Max Schenkelberg
a29eff544b
Issue #1638 Added Auto updating localization file object and added more methods to RecordFactory to make more versatile
...
Amend: Fixed setting of nested field properties
Amend: Moved populating and creating map into PluginDataObject, fixed listener leak in AbstractVizResource
Amend: Added comments
Change-Id: I699ab6a669a11656044c1d55f0bca9d258528835
Former-commit-id: a508e9c8cb321a29ffa4a508e9c8cb321a29ffa451d976e5e251d976e5e28de3a709621c35a54a9f01c2d29c1b
2013-04-01 10:19:36 -05:00
Lee Venable
0a5a8d108a
Merge "Issue #1790 Changes for non-blocking StationListDlg." into development
...
Former-commit-id: 7389bf5b2928756009107389bf5b2928756009100bfc05ce610bfc05ce61ebfa8ea79c3d683e98a9034e16baa7
2013-04-01 09:40:59 -05:00
Roger Ferrel
c95d8692ff
Issue #1790 Changes for non-blocking StationProfileDlg.
...
Change-Id: I669c9115dd1bb506acd025a451163aaf664593ef
Former-commit-id: e1b40f9f2f0d269691e2e1b40f9f2f0d269691e2d21cb5e2e8d21cb5e2e886e21acae2944d03615e9e3bee6562
2013-03-29 17:11:02 -05:00
Ben Steffensmeier
facdfdc501
Issue #1799 fix modal tools again.
...
Former-commit-id: cffac354e8eeeede7288cffac354e8eeeede728866af8daa1166af8daa1111e6afa5fa7082466303b3245f7a5d
2013-03-29 14:30:54 -05:00
Roger Ferrel
3a3e3674a8
Issue #1790 Changes for non-blocking StationListDlg.
...
Change-Id: Ib0cbfd64fca2d4dcbea68b5e0db8b34a5a7af6be
Former-commit-id: 281e7f53cbc5a95dcb44281e7f53cbc5a95dcb446ad80607bc6ad80607bcba0060522fde02460b1199ebeac6fd
2013-03-29 13:46:51 -05:00
Roger Ferrel
791fbba888
Issue #1790 Last of the bug fixes. Reviewer changes
...
Change-Id: I451799e34e9621723c9d652f339c880da3aa7caa
Former-commit-id: 20f6baba0e8f4492c63c20f6baba0e8f4492c63c463407a40e463407a40e8c1116eaaeec5f32aec6c1ffc82920
2013-03-29 11:35:08 -05:00
Ron Anderson
8502dee456
Issue #1838 Fixed selected time range when Select Grids When Stepping is enabled.
...
Change-Id: I30417042d568e6471f8a684fab8bcc2387618089
Former-commit-id: 4ac9a4d9a80f4fb125b04ac9a4d9a80f4fb125b0c7cfcf0250c7cfcf0250cd0f319ec59cfa87f7e541b0758084
2013-03-29 10:48:26 -05:00
Ron Anderson
1eede44aac
Issue #1774 Fix invalid unit strings in parameterInfo files.
...
Change-Id: I681f323b91f213dad5d2ad725bfb77f304e769de
Former-commit-id: cfb324f380aeb451a37ccfb324f380aeb451a37c679bb01764679bb01764d5e3976dc496e8f6367922f633b2a1
2013-03-29 10:07:37 -05:00
Greg Armendariz
9a8ce1af9e
Fix merge issue
...
Former-commit-id: 611661ccc9cd5da3a6c5611661ccc9cd5da3a6c55da06cadd75da06cadd7dcd36e64a6f0e1b80cd257eff9d7bf
2013-03-29 09:52:46 -05:00
Greg Armendariz
63d746dd77
Change package location of import
...
Former-commit-id: f778112c20d533c5c08df778112c20d533c5c08d27345f6edf27345f6edf05af592718089dfc87e687e37c990e
2013-03-29 09:09:32 -05:00
David Gillingham
4c1c4e665e
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: 170f252bdd8a7c965eaa170f252bdd8a7c965eaac9ed59b0e0c9ed59b0e0fddd42615ddbec0fa00f0b155a5788
2013-03-28 17:18:43 -05:00
Nate Jensen
1b1d1a48d2
Merge "Issue #1774 Fix D2D accumulative parameter time ranges" into omaha_13.3.1
...
Former-commit-id: 3ad797690b214b2ed4ba3ad797690b214b2ed4ba1bf37125c41bf37125c4946323416c711fbe98d2a6a81a17d6
2013-03-28 17:02:14 -05:00
Richard Peter
c22b37600a
Merge "Issue #1750 - qpid updates for compatibility with operational servers" into development
...
Former-commit-id: 1228c8cbbcb4fea107241228c8cbbcb4fea10724209d53ee67209d53ee67affe383cf38b0347001da087e63bcb
2013-03-28 16:59:18 -05:00
Steve Harris
ef1e593ebd
Issue #1782 - restore FFPMGenerator.java
...
Former-commit-id: f01b5fb849e67dbb206ef01b5fb849e67dbb206e3953f8368b3953f8368bbec6e9099fa74d22efc592aa705ebc
2013-03-28 16:06:54 -05:00
Bryan Kowal
8cd870d757
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: d124f7a37f2819e8fe48d124f7a37f2819e8fe48e3c39b9be6e3c39b9be6fa5825b0c507a52630a7df6d81dfd9
2013-03-28 16:00:27 -05:00
Ben Steffensmeier
788df8fc68
Issue #1799 fix activation of tools for new perspectives.
...
Former-commit-id: dcbed6568150a276a7e2dcbed6568150a276a7e24efa92ff494efa92ff4933de9bfc87a415fb17aea5e1593213
2013-03-28 15:47:36 -05:00
Max Schenkelberg
b30b72252b
Issue #1638 Added persistIndex route that only persists and indexes
...
Change-Id: I2d53bae64dca80e20777407c62ce7cc7546e3fae
Former-commit-id: d55e7a0edae91406ab10d55e7a0edae91406ab10a308b27c2fa308b27c2f623c49c3ccd9a481f54258a5bebb80
2013-03-28 15:45:31 -05:00
Ron Anderson
bef17d4f03
Issue #1774 Fix D2D accumulative parameter time ranges
...
Change-Id: I57b32881a30e89c999dae6db7753da83f9e949c1
Former-commit-id: 27e07ce4a95bb47b793127e07ce4a95bb47b7931b65ecfc151b65ecfc15133bcf5fee83f2fa771d95eb1885dbd
2013-03-28 13:37:29 -05:00
Steve Harris
938243eb0b
Revert "Replaced with formatted version"
...
This reverts commit 20c9d653c8054d8d263fe074710e0acf9b26728318019c07a4ff977fc882b741680965ff977fc882b74168096518019c07a4c51c9ea5df29c5918428c51c9ea5df29c59184288400028e118400028e117bd478fc41b614bf53f60074c522bb
2013-03-28 13:08:16 -05:00
Dustin Johnson
be22a59736
Merge "Issue #1839 Change build.edex build.xml to support building work assignment features after main build" into development
...
Former-commit-id: 9bc6dd47b6c6181696399bc6dd47b6c6181696393991df64ff3991df64ff3896cf42f1d900459ab49c4030ea37
2013-03-28 13:07:20 -05:00
Greg Armendariz
20c9d653c8
Replaced with formatted version
...
Former-commit-id: ff977fc882b741680965ff977fc882b74168096518019c07a418019c07a4e074710e0acf9b267283054d8d263f
2013-03-28 12:59:43 -05:00
Dustin Johnson
520b9f2a69
Merge "Issue #1802 : Eliminated a call to new on StatsDao in AggregateManager" into development
...
Former-commit-id: 59393b633a8583a5f78559393b633a8583a5f78551bf00bf1c51bf00bf1cee26b669e3db5a8b98651cf371cd41
2013-03-28 12:25:12 -05:00
Dustin Johnson
a5009cb271
Issue #1840 Fix merge error that removed .classpath
...
Change-Id: I976e69d04ce47fe31cf47c9aff7de1bed786ad17
Former-commit-id: c2edf1dd89ab42673848c2edf1dd89ab42673848a4e4df02b0a4e4df02b085d6a19a5e902986256df135c0d948
2013-03-28 12:14:47 -05:00
Dustin Johnson
3850e46c2c
Issue #1840 Fix merge error that removed .classpath
...
Change-Id: Ic199fa594ceecaa5c14a28d0ccb58e49ac728f6e
Former-commit-id: 5e0073f1f9680d2984e15e0073f1f9680d2984e1695c83669e695c83669ed0056996cd25b6eb0eb9fddc41bb6e
2013-03-28 12:13:23 -05:00
Benjamin Phillippe
cca60522c4
Issue #1802 : Eliminated a call to new on StatsDao in AggregateManager
...
Change-Id: I2c52a222746df7e7a0c8f91682268e25e97ae0ce
Former-commit-id: ec880b7923ed9cb5f8f6ec880b7923ed9cb5f8f66640a65a516640a65a51af5827f1dec4496475a65ec3ffed77
2013-03-28 12:08:57 -05:00
Greg Armendariz
817f9ec79c
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: b543b515d9a48365165bb543b515d9a48365165b943426fd00943426fd0010823802da05d1d16500cccd9a73ca
2013-03-28 12:05:07 -05:00
Dustin Johnson
9d04ba83a5
Issue #1839 Change build.edex build.xml to support building work assignment features after main build
...
Change-Id: If757b326fe851a976e5cd545f48e339cceacb4f9
Former-commit-id: ce37e32e613be6669f1bce37e32e613be6669f1b1365d5c9af1365d5c9af1960bcbf1183f6fb720cf817dbe495
2013-03-28 11:43:24 -05:00
Bryan Kowal
cb965ceb79
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: 5fe808757fc592e8a8775fe808757fc592e8a877955b5c84d3955b5c84d31a11fef5327a6f32796b087e7b2468
2013-03-28 10:42:51 -05:00
Max Schenkelberg
4253d92576
Issue #1638 Fix merge error
...
Change-Id: Id75f4d6372cd77132bad82029cfb176ec4f19712
Former-commit-id: 25202d8534573b44166225202d8534573b4416622b58e3ce3f2b58e3ce3fabcf4bf569c9301b75ea223f946b90
2013-03-28 10:20:54 -05:00
Ben Steffensmeier
67b3b92712
Issue #1821 recalculate 6 hours to be longer.
...
Former-commit-id: 61e0ca3b75a9cec7122261e0ca3b75a9cec71222efbdd3aa8cefbdd3aa8ce1a619e030403da9bfb994dcd159d4
2013-03-28 10:16:11 -05:00
Lee Venable
03fd0004ec
Merge "Issue #1790 Bug fixes for SCAN." into development
...
Former-commit-id: a891171c43e7805ded92a891171c43e7805ded92167fa6eadf167fa6eadf655f06cb65772bbe23a7adbaebd457
2013-03-28 10:04:34 -05:00
Bryan Kowal
c29e1e5374
Issue #1821 - re-compile grib2.so 32-bit and 64-bit
...
Former-commit-id: 203a3d5200da99727625203a3d5200da997276252da2b370db2da2b370db131e260337998fbe87699343dee116
2013-03-28 09:48:27 -05:00
Roger Ferrel
18b74a6aa7
Issue #1790 Bug fixes for SCAN.
...
Change-Id: I5743cd94be6c06808acb0add38d63ea381d13c65
Former-commit-id: 009cd032cb9c560ab626009cd032cb9c560ab626e204276c17e204276c17380846374f216fa1b23b3bb55722f5
2013-03-28 09:16:24 -05:00
Roger Ferrel
a6337e82dd
Issue #1790 bug fix for GFE dialogs in ticket 1353.
...
Change-Id: Ibe3361dfcf0361f66eb6d1da3893c309e8fcc612
Former-commit-id: 57fe6b5ca698d056c3a157fe6b5ca698d056c3a14db9e20fbf4db9e20fbfa8872882aeb95a38db32c354469c78
2013-03-28 09:04:10 -05:00
Greg Armendariz
0ab3b9d7f9
Add source variable
...
Former-commit-id: ae09ebb11f8800080d2aae09ebb11f8800080d2ad0d889f11dd0d889f11d44fcd1a8db24fea6f45d344c5b41b3
2013-03-28 08:56:50 -05:00
Steve Harris
53ee0151ca
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: 069ee8a7489a321b6ac8069ee8a7489a321b6ac83073951b3d3073951b3d6e48567370a4bf236cc790ec2d3fbf
2013-03-27 22:16:15 -05:00
Steve Harris
550305a7b6
Merge branch 'master_13.3.1' (13.3.1-14 cleaned up) into omaha_13.3.1
...
Former-commit-id: c284261dc23cb15755a8c284261dc23cb15755a86351d8f6d36351d8f6d33138de0e06e56bd830ac5102880f6e
2013-03-27 22:13:11 -05:00
Steve Harris
c1c5990b25
13.3.1-14 baseline
...
Former-commit-id: 6a4bbd9f1ac29076949e6a4bbd9f1ac29076949e4d4234d5c94d4234d5c9e89cef72a4c0737a6022efadc571ca
2013-03-27 22:10:03 -05:00
Roger Ferrel
cee3cd01e6
Issue #1790 Bug fix for dialogs in ticket 1578
...
Change-Id: I472e20ca729d0c4f3510bdd98e5456be47bd2c90
Former-commit-id: 5bd60ce50ca8410499bc5bd60ce50ca8410499bc1129728e031129728e03be143656eb56ca20476436219d5090
2013-03-27 21:54:26 -05:00
Richard Peter
6bca38d68c
Merge "Issue #1821 Reduce db and pypies requests in grid assembler." into omaha_13.3.1
...
Former-commit-id: 642ff5e3203ba331e9f5642ff5e3203ba331e9f52b207fc6ec2b207fc6ecb061ba5595d8cbd1ff39c2896a01d2
2013-03-27 18:32:38 -05:00
Richard Peter
97a4cd9e1a
Merge "Issue #1821 make GridInfoCache more elaborate. Change-Id: Ib64a68ab4e898eba5fe186ac5ac01407964e37d9" into omaha_13.3.1
...
Former-commit-id: 2a71b9de1b7992b43a7a2a71b9de1b7992b43a7a6c4f2796236c4f279623ce746d6228e68173e14717a9c008d0
2013-03-27 18:28:01 -05:00
