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
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
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
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
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
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
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
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
Max Schenkelberg
e5b74d9295
Issue #1638 Fix merge error
...
Change-Id: Id75f4d6372cd77132bad82029cfb176ec4f19712
Former-commit-id: 33352d0e5325202d8534573b44166233352d0e5325202d8534573b4416622b58e3ce3f573b4416622b58e3ce3f0bd1554e20abcf4bf569c9301b75ea223f946b904253d92576
2013-03-28 10:20:54 -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
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
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
Ben Steffensmeier
52709e081c
Issue #1821 Speed up GridInfoCache.
...
Change-Id: I14a92d85994c25dc7f80828efd12d2d4e2e70e40
Former-commit-id: a19226c906bd35a06d512a13abd32ca19226c906bd35a06d512a13abd32c6f525a81b42a13abd32c6f525a81b417a32dc6f1bc0153dbba72724108b7b621850bc606030b77b4
2013-03-27 13:21:33 -05:00
Nate Jensen
bdcaff0e24
Merge "Issue #1638 Made Map scales more generalized for use outside of D2D" into development
...
Former-commit-id: 2516680caf7f5b3d6f84faf937d3b02516680caf7f5b3d6f84faf937d3b0f8e5534417faf937d3b0f8e553441787e6c58adaccf6175c43a7548df6959c7466b8e9614a1f7738
2013-03-27 11:32:19 -05:00
Ron Anderson
b55ddcee24
Merge "Issue #1833 : Add performance log file to ingest and ingestGrib" into omaha_13.3.1
...
Former-commit-id: 7ce946600d60735ddd83841a69ed597ce946600d60735ddd83841a69ed5933d78bc7ee841a69ed5933d78bc7ee95001bf982dc74b366e96a393ee4f93fbeeadef3583d14ad21
2013-03-27 11:22:48 -05:00
Nate Jensen
b54bc5364f
Merge "Issue #1832 fix getNumPy() error handling" into omaha_13.3.1
...
Former-commit-id: 2d5ec59d57caeb823043dd3601a8732d5ec59d57caeb823043dd3601a873aaf2d7bc2add3601a873aaf2d7bc2aad691d7debadeeccc9c7da024a1044329a106ef3185b0ebbc2
2013-03-27 11:16:56 -05:00
Mike Duff
4f6720a362
Issue #1834 - Filter config file reads for xml only, wrap unmarshalling and log errors
...
Change-Id: I23829b764e1f52e9dee1a1d9701d219e949eb9fa
Former-commit-id: 0e1b566dd11beb6e4fa519587001120e1b566dd11beb6e4fa51958700112302dbf2cfb1958700112302dbf2cfbbe438c6fecc143b356ef3d1c1b146c16f03eb52ce8d921f415
2013-03-27 10:38:59 -05:00
Richard Peter
e962480999
Issue #1833 : Add performance log file to ingest and ingestGrib
...
Change-Id: I650fa5893a31bee6c4f0e96af87754518df6d25d
Former-commit-id: 485a15cc1525d49055705287a3296b485a15cc1525d49055705287a3296bb75ceeeeb35287a3296bb75ceeeeb3b2a73c8d446923e10550f99242f53933c602b13e786b68279d
2013-03-26 20:55:42 -05:00
Nate Jensen
91981ee9da
Issue #1832 fix getNumPy() error handling
...
Change-Id: If2a0d3747c38cf716c3fa431c4135f2dee7c5405
Former-commit-id: 49fdcf9e55dc53db5181e4cdfe0ca949fdcf9e55dc53db5181e4cdfe0ca974b21dc1b4e4cdfe0ca974b21dc1b4d3bd10f1f20cf9a03133494a673c37d1d647a778d7a7b66b1d
2013-03-26 18:30:19 -05:00
Nate Jensen
343b22daaa
Merge "Issue #1735 Performance improvments for LLWSData." into development
...
Former-commit-id: 74901e99995624e303a8ff7631d84774901e99995624e303a8ff7631d847b44db0bc2cff7631d847b44db0bc2cd7c57134e96d32957638314c5dcb2e9353bd7d8b782c4b63dd
2013-03-26 16:28:38 -05:00
Nate Jensen
1be547bd18
Merge "Issue #1791 Fix problems in SmartScript when there is no data." into omaha_13.3.1
...
Former-commit-id: d612495967807d8773adf3fd91c311d612495967807d8773adf3fd91c311c895ee60faf3fd91c311c895ee60fa55572918b330bd797879570103075079fddbcbf52fe6904a03
2013-03-26 16:15:27 -05:00
Richard Peter
6f0d340f2a
Merge "Issue #1828 Fix intlsigmets and text pattern." into omaha_13.3.1
...
Former-commit-id: c26a9bb1cfac3619cc77fa7fb4765fc26a9bb1cfac3619cc77fa7fb4765fcbf915093ffa7fb4765fcbf915093fec2de612de4f326d5c39f941b97c06047c3d0e377c40d051f5
2013-03-26 15:33:33 -05:00
Lee Venable
1a7a72fdc7
Merge "Issue #1799 Fix pan/zoom when in views." into omaha_13.3.1
...
Former-commit-id: 48ad5b71b7ad1983ff8d1a5920489248ad5b71b7ad1983ff8d1a59204892049e955db91a59204892049e955db984c0e0646fcb683bec2af8d2fdaceaf0ed70f9fb8e1fc66f03
2013-03-26 15:01:51 -05:00
Roger Ferrel
396cc261b2
Issue #1828 Fix intlsigmets and text pattern.
...
Change-Id: Id5bc5d5738a00ae1607c772bfe1bf675c48db2b0
Former-commit-id: df2a9d8f966a4bd66abc19074d3053df2a9d8f966a4bd66abc19074d305374389834de19074d305374389834dedea028c7fc7244b4d23c4c5aa321698cdcee0ec5d76cbc6e80
2013-03-26 14:47:48 -05:00
Ben Steffensmeier
2c423f245f
Issue #1791 Fix problems in SmartScript when there is no data.
...
Former-commit-id: 92f0268a149d9443644c687004500592f0268a149d9443644c687004500518311b0d18687004500518311b0d182429a1bfe66d17d01f8c69879c51dfb76bdc602d8d88fa1ba9
2013-03-26 14:46:11 -05:00
Lee Venable
6a0520bd0c
Merge "Issue #1819 Added precision fields for point source configuration." into omaha_13.3.1
...
Former-commit-id: 954db8db2868e767daaac86daf885b954db8db2868e767daaac86daf885bc1adce3a11c86daf885bc1adce3a11caf01174bb013748405d393e6d9ca1ea68209a19125517e2d2
2013-03-26 14:33:24 -05:00
Richard Peter
110ec4b47a
Merge "Issue #1783 : Update DatabaseArchiver to stream deserialization of previous records" into omaha_13.3.1
...
Former-commit-id: 469f7c60fbce83569845b947a52604469f7c60fbce83569845b947a526047ee513dfedb947a526047ee513dfede4656678c99c5ce8e74145a2f3f3dd109b5783822e5fdfc82c
2013-03-26 12:59:47 -05:00
Steve Harris
56522d8cf5
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: 690f4517464e54025fcd5fcfaf4360690f4517464e54025fcd5fcfaf436065df96a4195fcfaf436065df96a4196e4b9a6f015bb29627dc346b97a39afdd07bd72c0bd1d5bdef
2013-03-26 12:47:40 -05:00
Steve Harris
d8a9db1e5c
Merge branch 'master_13.3.1' into omaha_13.3.1
...
Former-commit-id: 8d1903034b85104939ace71c69c3838d1903034b85104939ace71c69c3839ff8a94193e71c69c3839ff8a94193072b1bf35e02147470dbb926ff60b3779adedea90d88cd619b
2013-03-26 12:44:24 -05:00
Steve Harris
a33631faa5
13.3.1-13 baseline
...
Former-commit-id: 0f2ebb8f10792171756fc77a452f5a0f2ebb8f10792171756fc77a452f5ac65f3e68e5c77a452f5ac65f3e68e5b49c1b0fa84f2e9aec0d822d05a7097aa4f7b26525a851cccf
2013-03-26 12:43:07 -05:00
Jonathan Sanchez
16ad8874b9
Issue #1819 Added precision fields for point source configuration.
...
Former-commit-id: 6b85338835a0a019926679d87a96e76b85338835a0a019926679d87a96e7b0f61cf86c79d87a96e7b0f61cf86c4236ca46f5a579da7646eb13af2f50cc64195d47d31efead69
2013-03-26 12:29:18 -05:00
