Commit graph

2326 commits

Author SHA1 Message Date
Roger Ferrel
9c498726af Issue #1790 Last of the bug fixes. Reviewer changes
Change-Id: I451799e34e9621723c9d652f339c880da3aa7caa

Former-commit-id: 463407a40e [formerly 8f4492c63c [formerly 336427570fba81616b8d02f3ed2948042d7dbf41]]
Former-commit-id: 8f4492c63c
Former-commit-id: 20f6baba0e
2013-03-29 11:35:08 -05:00
Greg Armendariz
466fa3fd41 Fix merge issue
Former-commit-id: 5da06cadd7 [formerly cd5da3a6c5 [formerly c9c8fc9c7ece8ab909b13b63964369b36fb20bc0]]
Former-commit-id: cd5da3a6c5
Former-commit-id: 611661ccc9
2013-03-29 09:52:46 -05:00
Greg Armendariz
56f51657fd Change package location of import
Former-commit-id: 27345f6edf [formerly d533c5c08d [formerly c158a7540d23451b864a1464ab64882c3d45386d]]
Former-commit-id: d533c5c08d
Former-commit-id: f778112c20
2013-03-29 09:09:32 -05:00
Richard Peter
b548239f0b Merge "Issue #1750 - qpid updates for compatibility with operational servers" into development
Former-commit-id: 209d53ee67 [formerly b4fea10724 [formerly 461708424eea856dacbd2bd2af506f8f905f19c7]]
Former-commit-id: b4fea10724
Former-commit-id: 1228c8cbbc
2013-03-28 16:59:18 -05:00
Steve Harris
545ab48027 Issue #1782 - restore FFPMGenerator.java
Former-commit-id: 3953f8368b [formerly e67dbb206e [formerly 813033f4a2b30a669646b288eb00959922f0e804]]
Former-commit-id: e67dbb206e
Former-commit-id: f01b5fb849
2013-03-28 16:06:54 -05:00
Bryan Kowal
a9cdcfeb64 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: e3c39b9be6 [formerly 2819e8fe48 [formerly 4ebdeac7ee92855f9f21ae0eb0478e69e93514e4]]
Former-commit-id: 2819e8fe48
Former-commit-id: d124f7a37f
2013-03-28 16:00:27 -05:00
Max Schenkelberg
040a09b8ab Issue #1638 Added persistIndex route that only persists and indexes
Change-Id: I2d53bae64dca80e20777407c62ce7cc7546e3fae

Former-commit-id: a308b27c2f [formerly e91406ab10 [formerly 3d386df8a1def460f81468154964603e7c1edbe8]]
Former-commit-id: e91406ab10
Former-commit-id: d55e7a0eda
2013-03-28 15:45:31 -05:00
Dustin Johnson
c06f0ed7f4 Merge "Issue #1839 Change build.edex build.xml to support building work assignment features after main build" into development
Former-commit-id: 3991df64ff [formerly c618169639 [formerly 88779a4fbd8078d81139b7555525142940999558]]
Former-commit-id: c618169639
Former-commit-id: 9bc6dd47b6
2013-03-28 13:07:20 -05:00
Dustin Johnson
2ec3e76c1c Merge "Issue #1802: Eliminated a call to new on StatsDao in AggregateManager" into development
Former-commit-id: 51bf00bf1c [formerly 8583a5f785 [formerly bf39f3c73e4de589855abda284c6d2d46543d283]]
Former-commit-id: 8583a5f785
Former-commit-id: 59393b633a
2013-03-28 12:25:12 -05:00
Dustin Johnson
e28ea4d3ef Issue #1840 Fix merge error that removed .classpath
Change-Id: Ic199fa594ceecaa5c14a28d0ccb58e49ac728f6e

Former-commit-id: 695c83669e [formerly 680d2984e1 [formerly f6b91884ba72412a8fad2608eca1490757df2c60]]
Former-commit-id: 680d2984e1
Former-commit-id: 5e0073f1f9
2013-03-28 12:13:23 -05:00
Benjamin Phillippe
c63337ac35 Issue #1802: Eliminated a call to new on StatsDao in AggregateManager
Change-Id: I2c52a222746df7e7a0c8f91682268e25e97ae0ce

Former-commit-id: 6640a65a51 [formerly ed9cb5f8f6 [formerly e9e7f34e87f18120232ed5cc8e00da6cb8bda5d5]]
Former-commit-id: ed9cb5f8f6
Former-commit-id: ec880b7923
2013-03-28 12:08:57 -05:00
Dustin Johnson
2e1cc96d01 Issue #1839 Change build.edex build.xml to support building work assignment features after main build
Change-Id: If757b326fe851a976e5cd545f48e339cceacb4f9

Former-commit-id: 1365d5c9af [formerly 3be6669f1b [formerly 1f4c7ce21abf2853a424cb4a7c478847dcdd8065]]
Former-commit-id: 3be6669f1b
Former-commit-id: ce37e32e61
2013-03-28 11:43:24 -05:00
Max Schenkelberg
33352d0e53 Issue #1638 Fix merge error
Change-Id: Id75f4d6372cd77132bad82029cfb176ec4f19712

Former-commit-id: 2b58e3ce3f [formerly 573b441662 [formerly 9c7c89f148adba714839f9ff4fa9bdda10f0edc0]]
Former-commit-id: 573b441662
Former-commit-id: 25202d8534
2013-03-28 10:20:54 -05:00
Lee Venable
87e166d88d Merge "Issue #1790 Bug fixes for SCAN." into development
Former-commit-id: 167fa6eadf [formerly e7805ded92 [formerly 657dace6ad43e57bfcb99deb14717ce893bd9710]]
Former-commit-id: e7805ded92
Former-commit-id: a891171c43
2013-03-28 10:04:34 -05:00
Roger Ferrel
895ac9a39b Issue #1790 Bug fixes for SCAN.
Change-Id: I5743cd94be6c06808acb0add38d63ea381d13c65

Former-commit-id: e204276c17 [formerly 9c560ab626 [formerly 2bb23a6015638266ed17034777489c9ec6dc1307]]
Former-commit-id: 9c560ab626
Former-commit-id: 009cd032cb
2013-03-28 09:16:24 -05:00
Roger Ferrel
bb33366fc9 Issue #1790 bug fix for GFE dialogs in ticket 1353.
Change-Id: Ibe3361dfcf0361f66eb6d1da3893c309e8fcc612

Former-commit-id: 4db9e20fbf [formerly 98d056c3a1 [formerly ee4a6d815bc85f861bb7d77719c5787343625741]]
Former-commit-id: 98d056c3a1
Former-commit-id: 57fe6b5ca6
2013-03-28 09:04:10 -05:00
Steve Harris
02f49bc2e4 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: 3073951b3d [formerly 9a321b6ac8 [formerly d05c9f3a6a4b080b0da71c856f1ba6cd0d6d264e]]
Former-commit-id: 9a321b6ac8
Former-commit-id: 069ee8a748
2013-03-27 22:16:15 -05:00
Steve Harris
16a781b20e Merge branch 'master_13.3.1' (13.3.1-14 cleaned up) into omaha_13.3.1
Former-commit-id: 6351d8f6d3 [formerly 3cb15755a8 [formerly 0f0b0a0c0f2f0d334ccd56f8265e2b6fd9a12902]]
Former-commit-id: 3cb15755a8
Former-commit-id: c284261dc2
2013-03-27 22:13:11 -05:00
Steve Harris
bf64a0dc2f 13.3.1-14 baseline
Former-commit-id: 4d4234d5c9 [formerly c29076949e [formerly e05ab5dbc442d410ae53400f087c02197ba5068b]]
Former-commit-id: c29076949e
Former-commit-id: 6a4bbd9f1a
2013-03-27 22:10:03 -05:00
Roger Ferrel
63ab75fec6 Issue #1790 Bug fix for dialogs in ticket 1578
Change-Id: I472e20ca729d0c4f3510bdd98e5456be47bd2c90

Former-commit-id: 1129728e03 [formerly a8410499bc [formerly 9bc7fe4c771e534148b446d33de969ef53be3b0d]]
Former-commit-id: a8410499bc
Former-commit-id: 5bd60ce50c
2013-03-27 21:54:26 -05:00
Richard Peter
52174ddb57 Merge "Issue #1821 Reduce db and pypies requests in grid assembler." into omaha_13.3.1
Former-commit-id: 2b207fc6ec [formerly 3ba331e9f5 [formerly db45bf80d754e49429e4d6a7fd6a28f50d7fb140]]
Former-commit-id: 3ba331e9f5
Former-commit-id: 642ff5e320
2013-03-27 18:32:38 -05:00
Richard Peter
b03b4b8f75 Merge "Issue #1821 make GridInfoCache more elaborate. Change-Id: Ib64a68ab4e898eba5fe186ac5ac01407964e37d9" into omaha_13.3.1
Former-commit-id: 6c4f279623 [formerly 7992b43a7a [formerly b0753a969f27d0f7903a42a535066e3ac5b354fd]]
Former-commit-id: 7992b43a7a
Former-commit-id: 2a71b9de1b
2013-03-27 18:28:01 -05:00
Steve Harris
bb88c2133a 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: d997aeaee4 [formerly 2a0e399dc8 [formerly 6f42195bd8f6087fb8bb55232082c0ec5f867e12]]
Former-commit-id: 2a0e399dc8
Former-commit-id: 979d6a5d8c
2013-03-27 18:21:05 -05:00
Ben Steffensmeier
66d3c4c237 Issue #1821 Reduce db and pypies requests in grid assembler.
Former-commit-id: 5add905ea7 [formerly 60d13f2282 [formerly 68febf5d9bff68e752d039fddc853a0e5793b05d]]
Former-commit-id: 60d13f2282
Former-commit-id: 6171d60f44
2013-03-27 17:59:58 -05:00
Steve Harris
f9b3430485 13.3.1-14 baseline
Former-commit-id: 9fba973fd0 [formerly 9022c500ce [formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]]
Former-commit-id: 9022c500ce
Former-commit-id: 91a5e4578e
2013-03-27 17:59:34 -05:00
Ben Steffensmeier
bedc1bce0a Issue #1821 make GridInfoCache more elaborate.
Change-Id: Ib64a68ab4e898eba5fe186ac5ac01407964e37d9

Former-commit-id: 4b6d2fd8d1 [formerly bc8729d631 [formerly c7b4e7c982fb682779b729d1a8a8fb5ff6f5e1d2]]
Former-commit-id: bc8729d631
Former-commit-id: a31dc1874b
2013-03-27 17:28:45 -05:00
Benjamin Phillippe
1e30861a21 Issue #1802 Fixes related to DD transaction refactor
Change-Id: Ia2a7a4ce990d424ed1e365bd7003fd2ab8630fd1

Former-commit-id: 2a14245dce [formerly 115dc12790 [formerly 393a469e2f65894a6dd5b58c1431c3d727951eda]]
Former-commit-id: 115dc12790
Former-commit-id: 30be5ce6f9
2013-03-27 17:12:52 -05:00
Richard Peter
5063faa546 Merge "Issue #1827 Create registry/datadelivery client features" into omaha_13.3.1
Former-commit-id: 70a7c3c556 [formerly c8ae09ab1d [formerly a104b57c33655022bc142b71e909e8fb1b1c022b]]
Former-commit-id: c8ae09ab1d
Former-commit-id: c11b070571
2013-03-27 17:08:00 -05:00
Roger Ferrel
7a4d48d489 Issue #1790 Bug fixes for ticket 1353.
Change-Id: I36b74546b7f73c669d65a5588e813173ccbd18fc

Former-commit-id: 391ce5687b [formerly 04b57a8582 [formerly e0c3e3b81f679985a048047b3e5aa69992577d78]]
Former-commit-id: 04b57a8582
Former-commit-id: 9b527de11a
2013-03-27 16:56:17 -05:00
Dustin Johnson
5dbff646aa Issue #1827 Create registry/datadelivery client features
Amend: Add event plugins and their dependencies to client features

Change-Id: Ib80522161740857d4332b84bbedad10e19683602

Former-commit-id: 1684507bdb [formerly 52c27ec57f [formerly 0011ef9ba9d014decf30acc2913fa535562d0de2]]
Former-commit-id: 52c27ec57f
Former-commit-id: fbcfdd0ca1
2013-03-27 15:38:36 -05:00
Roger Ferrel
bdfca9ce6b Issue #1790 Fix dialog in current phase.
Change-Id: I7289fbef264d68b70b606d120cde8daf5fc41e7b

Former-commit-id: 1093c020e6 [formerly d69674d595 [formerly 0c1b97f64455c8fcbe2c12848c3a4f58d1d13b54]]
Former-commit-id: d69674d595
Former-commit-id: a0a86f9b13
2013-03-27 14:11:36 -05:00
Ben Steffensmeier
a19226c906 Issue #1821 Speed up GridInfoCache.
Change-Id: I14a92d85994c25dc7f80828efd12d2d4e2e70e40

Former-commit-id: 6f525a81b4 [formerly 2a13abd32c [formerly fde9f936e53a998f8cde174935d00287e6aaf70c]]
Former-commit-id: 2a13abd32c
Former-commit-id: bd35a06d51
2013-03-27 13:21:33 -05:00
Nate Jensen
2516680caf Merge "Issue #1638 Made Map scales more generalized for use outside of D2D" into development
Former-commit-id: f8e5534417 [formerly faf937d3b0 [formerly 5ebb2a9670ef28c759b434ed25e68465b5a2d8ac]]
Former-commit-id: faf937d3b0
Former-commit-id: 7f5b3d6f84
2013-03-27 11:32:19 -05:00
Ron Anderson
7ce946600d Merge "Issue #1833: Add performance log file to ingest and ingestGrib" into omaha_13.3.1
Former-commit-id: 33d78bc7ee [formerly 841a69ed59 [formerly 9b35437ccfecaf70470a9a96fbc3acacd7cf1405]]
Former-commit-id: 841a69ed59
Former-commit-id: 60735ddd83
2013-03-27 11:22:48 -05:00
Nate Jensen
2d5ec59d57 Merge "Issue #1832 fix getNumPy() error handling" into omaha_13.3.1
Former-commit-id: aaf2d7bc2a [formerly dd3601a873 [formerly f1cabae64e37120f27235ec44b4bd7a1921fe621]]
Former-commit-id: dd3601a873
Former-commit-id: caeb823043
2013-03-27 11:16:56 -05:00
Mike Duff
0e1b566dd1 Issue #1834 - Filter config file reads for xml only, wrap unmarshalling and log errors
Change-Id: I23829b764e1f52e9dee1a1d9701d219e949eb9fa

Former-commit-id: 302dbf2cfb [formerly 1958700112 [formerly 5304de6fff49f3db7a3b46427077c7d2d9c0b3f9]]
Former-commit-id: 1958700112
Former-commit-id: 1beb6e4fa5
2013-03-27 10:38:59 -05:00
Richard Peter
485a15cc15 Issue #1833: Add performance log file to ingest and ingestGrib
Change-Id: I650fa5893a31bee6c4f0e96af87754518df6d25d

Former-commit-id: b75ceeeeb3 [formerly 5287a3296b [formerly 53cb92842c43349968b70bb5fec5beb100773b63]]
Former-commit-id: 5287a3296b
Former-commit-id: 25d4905570
2013-03-26 20:55:42 -05:00
Nate Jensen
49fdcf9e55 Issue #1832 fix getNumPy() error handling
Change-Id: If2a0d3747c38cf716c3fa431c4135f2dee7c5405

Former-commit-id: 74b21dc1b4 [formerly e4cdfe0ca9 [formerly ce7e89b8300580a57a5c133a78e8c84e2cb7449e]]
Former-commit-id: e4cdfe0ca9
Former-commit-id: dc53db5181
2013-03-26 18:30:19 -05:00
Nate Jensen
74901e9999 Merge "Issue #1735 Performance improvments for LLWSData." into development
Former-commit-id: b44db0bc2c [formerly ff7631d847 [formerly 5ee7c58ea1f95b89bf252edbee02d0560eaa98aa]]
Former-commit-id: ff7631d847
Former-commit-id: 5624e303a8
2013-03-26 16:28:38 -05:00
Nate Jensen
d612495967 Merge "Issue #1791 Fix problems in SmartScript when there is no data." into omaha_13.3.1
Former-commit-id: c895ee60fa [formerly f3fd91c311 [formerly a12ccd946a59dae45a4b5b754655d8eef7a56a29]]
Former-commit-id: f3fd91c311
Former-commit-id: 807d8773ad
2013-03-26 16:15:27 -05:00
Richard Peter
c26a9bb1cf Merge "Issue #1828 Fix intlsigmets and text pattern." into omaha_13.3.1
Former-commit-id: cbf915093f [formerly fa7fb4765f [formerly e9a9cbc4b3c20dce7dc39837c9aab4ae5ef6e01a]]
Former-commit-id: fa7fb4765f
Former-commit-id: ac3619cc77
2013-03-26 15:33:33 -05:00
Lee Venable
48ad5b71b7 Merge "Issue #1799 Fix pan/zoom when in views." into omaha_13.3.1
Former-commit-id: 049e955db9 [formerly 1a59204892 [formerly 69ec257d3a90ffcaa81d92f34ff545d4c49bb1d3]]
Former-commit-id: 1a59204892
Former-commit-id: ad1983ff8d
2013-03-26 15:01:51 -05:00
Roger Ferrel
df2a9d8f96 Issue #1828 Fix intlsigmets and text pattern.
Change-Id: Id5bc5d5738a00ae1607c772bfe1bf675c48db2b0

Former-commit-id: 74389834de [formerly 19074d3053 [formerly 84448e12d2f09637bc4f79e42f21c11e561b8c37]]
Former-commit-id: 19074d3053
Former-commit-id: 6a4bd66abc
2013-03-26 14:47:48 -05:00
Ben Steffensmeier
92f0268a14 Issue #1791 Fix problems in SmartScript when there is no data.
Former-commit-id: 18311b0d18 [formerly 6870045005 [formerly 39d0a9f0cc71f3dbbde69e6d1dac14ef93a78984]]
Former-commit-id: 6870045005
Former-commit-id: 9d9443644c
2013-03-26 14:46:11 -05:00
Lee Venable
954db8db28 Merge "Issue #1819 Added precision fields for point source configuration." into omaha_13.3.1
Former-commit-id: c1adce3a11 [formerly c86daf885b [formerly 8753aa9e648778c2eabbf959c1b270ebe5add67c]]
Former-commit-id: c86daf885b
Former-commit-id: 68e767daaa
2013-03-26 14:33:24 -05:00
Richard Peter
469f7c60fb Merge "Issue #1783: Update DatabaseArchiver to stream deserialization of previous records" into omaha_13.3.1
Former-commit-id: 7ee513dfed [formerly b947a52604 [formerly b1acf59c03ab308b86843a314d4795f6392de844]]
Former-commit-id: b947a52604
Former-commit-id: ce83569845
2013-03-26 12:59:47 -05:00
Steve Harris
690f451746 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: 65df96a419 [formerly 5fcfaf4360 [formerly 99cd1f52511023794d9dcb21c68720c4e47faec5]]
Former-commit-id: 5fcfaf4360
Former-commit-id: 4e54025fcd
2013-03-26 12:47:40 -05:00
Steve Harris
8d1903034b Merge branch 'master_13.3.1' into omaha_13.3.1
Former-commit-id: 9ff8a94193 [formerly e71c69c383 [formerly 741a32d9209897e84da068626d28c7d7af47f9c1]]
Former-commit-id: e71c69c383
Former-commit-id: 85104939ac
2013-03-26 12:44:24 -05:00
Steve Harris
0f2ebb8f10 13.3.1-13 baseline
Former-commit-id: c65f3e68e5 [formerly c77a452f5a [formerly 9c263e3ffc35677d7015158e06b64f376e7f801d]]
Former-commit-id: c77a452f5a
Former-commit-id: 792171756f
2013-03-26 12:43:07 -05:00
Jonathan Sanchez
6b85338835 Issue #1819 Added precision fields for point source configuration.
Former-commit-id: b0f61cf86c [formerly 79d87a96e7 [formerly b250ff50f8a2ac6ad8ec91e14735edcd6f053343]]
Former-commit-id: 79d87a96e7
Former-commit-id: a0a0199266
2013-03-26 12:29:18 -05:00