Commit graph

2319 commits

Author SHA1 Message Date
Dustin Johnson
3896cf42f1 Merge "Issue #1839 Change build.edex build.xml to support building work assignment features after main build" into development
Former-commit-id: 9bc6dd47b6 [formerly c618169639] [formerly 3991df64ff [formerly 88779a4fbd8078d81139b7555525142940999558]]
Former-commit-id: 3991df64ff
Former-commit-id: d900459ab4
2013-03-28 13:07:20 -05:00
Dustin Johnson
ee26b669e3 Merge "Issue #1802: Eliminated a call to new on StatsDao in AggregateManager" into development
Former-commit-id: 59393b633a [formerly 8583a5f785] [formerly 51bf00bf1c [formerly bf39f3c73e4de589855abda284c6d2d46543d283]]
Former-commit-id: 51bf00bf1c
Former-commit-id: db5a8b9865
2013-03-28 12:25:12 -05:00
Dustin Johnson
d0056996cd Issue #1840 Fix merge error that removed .classpath
Change-Id: Ic199fa594ceecaa5c14a28d0ccb58e49ac728f6e

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

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

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

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

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

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

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

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

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

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

Change-Id: Ib80522161740857d4332b84bbedad10e19683602

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

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

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

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

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

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

Former-commit-id: 6a4bd66abc [formerly 19074d3053] [formerly 74389834de [formerly 84448e12d2f09637bc4f79e42f21c11e561b8c37]]
Former-commit-id: 74389834de
Former-commit-id: 4c5aa32169
2013-03-26 14:47:48 -05:00
Ben Steffensmeier
6d17d01f8c Issue #1791 Fix problems in SmartScript when there is no data.
Former-commit-id: 9d9443644c [formerly 6870045005] [formerly 18311b0d18 [formerly 39d0a9f0cc71f3dbbde69e6d1dac14ef93a78984]]
Former-commit-id: 18311b0d18
Former-commit-id: 69879c51df
2013-03-26 14:46:11 -05:00
Lee Venable
013748405d Merge "Issue #1819 Added precision fields for point source configuration." into omaha_13.3.1
Former-commit-id: 68e767daaa [formerly c86daf885b] [formerly c1adce3a11 [formerly 8753aa9e648778c2eabbf959c1b270ebe5add67c]]
Former-commit-id: c1adce3a11
Former-commit-id: 393e6d9ca1
2013-03-26 14:33:24 -05:00
Richard Peter
9c5ce8e741 Merge "Issue #1783: Update DatabaseArchiver to stream deserialization of previous records" into omaha_13.3.1
Former-commit-id: ce83569845 [formerly b947a52604] [formerly 7ee513dfed [formerly b1acf59c03ab308b86843a314d4795f6392de844]]
Former-commit-id: 7ee513dfed
Former-commit-id: 45a2f3f3dd
2013-03-26 12:59:47 -05:00
Steve Harris
5bb29627dc 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: 4e54025fcd [formerly 5fcfaf4360] [formerly 65df96a419 [formerly 99cd1f52511023794d9dcb21c68720c4e47faec5]]
Former-commit-id: 65df96a419
Former-commit-id: 346b97a39a
2013-03-26 12:47:40 -05:00
Steve Harris
02147470db Merge branch 'master_13.3.1' into omaha_13.3.1
Former-commit-id: 85104939ac [formerly e71c69c383] [formerly 9ff8a94193 [formerly 741a32d9209897e84da068626d28c7d7af47f9c1]]
Former-commit-id: 9ff8a94193
Former-commit-id: b926ff60b3
2013-03-26 12:44:24 -05:00
Steve Harris
4f2e9aec0d 13.3.1-13 baseline
Former-commit-id: 792171756f [formerly c77a452f5a] [formerly c65f3e68e5 [formerly 9c263e3ffc35677d7015158e06b64f376e7f801d]]
Former-commit-id: c65f3e68e5
Former-commit-id: 822d05a709
2013-03-26 12:43:07 -05:00
Jonathan Sanchez
a579da7646 Issue #1819 Added precision fields for point source configuration.
Former-commit-id: a0a0199266 [formerly 79d87a96e7] [formerly b0f61cf86c [formerly b250ff50f8a2ac6ad8ec91e14735edcd6f053343]]
Former-commit-id: b0f61cf86c
Former-commit-id: eb13af2f50
2013-03-26 12:29:18 -05:00
Steve Harris
ee009dc2d8 Merge "Issue #1782: Fix com.raytheon.edex.plugin.gfe build break from 13.3.1-12 merge." into development
Former-commit-id: 9ed8f85b79 [formerly 1f28f6b807] [formerly 305994e220 [formerly b59167da8d42b23fadd19eb8f186d992a5c68bdd]]
Former-commit-id: 305994e220
Former-commit-id: b1071636a7
2013-03-26 12:27:54 -05:00
David Gillingham
040dc9075c Issue #1782: Fix com.raytheon.edex.plugin.gfe build break from 13.3.1-12 merge.
Change-Id: I0833377d1501122200ede42b5ec30ec7bf9b2dfb

Former-commit-id: 6fe3d5dc28 [formerly c5c7e31983] [formerly 54511a95db [formerly 497aa460d6119f13bf6870b78454237252b68752]]
Former-commit-id: 54511a95db
Former-commit-id: 6188c8bd40
2013-03-26 12:14:22 -05:00
Ben Steffensmeier
f983e5d705 Issue #1782 fix merge problems related to graphics API.
Former-commit-id: 0aad550439 [formerly 2b898e58c7] [formerly 6edee13cdd [formerly 9689a020a25ffdbf8a13abb02506d6e3e4dcdbb8]]
Former-commit-id: 6edee13cdd
Former-commit-id: 76a6213807
2013-03-26 12:06:45 -05:00
Ben Steffensmeier
e79778366c Issue #1799 Fix pan/zoom when in views.
Former-commit-id: d06f011de0 [formerly 643c1c77d0] [formerly 78fdea2ba1 [formerly 2061956526bdc3da43280e6c829de1deb0a098ba]]
Former-commit-id: 78fdea2ba1
Former-commit-id: 5a1171f111
2013-03-26 11:44:23 -05:00
Richard Peter
b4965ae08d Issue #1783: Update DatabaseArchiver to stream deserialization of previous records
Change-Id: Icb1e2721bcddeb93c7c06983bba117c75b0edd44

Former-commit-id: 9773208ff5 [formerly f3844dd2fb] [formerly 69ffe80046 [formerly f4e67b7b1b41af66436cae5e6f7f61bbf02fb534]]
Former-commit-id: 69ffe80046
Former-commit-id: 643ac75965
2013-03-26 11:40:24 -05:00
Ron Anderson
758b81f9a2 Merge "Issue #1823: Trigger SAT smart inits based only on sector id and physical element." into omaha_13.3.1
Former-commit-id: f272034fde [formerly 57c919bc7b] [formerly f65989454a [formerly 735c64e77a704ceae7f1a025c9cfc442f48f207e]]
Former-commit-id: f65989454a
Former-commit-id: 510b090090
2013-03-26 11:33:15 -05:00
Richard Peter
88b147cb1b Merge "Issue #1750 - include the qpidd service script in the rpm installations" into development
Former-commit-id: 260b159f1b [formerly 0f15b13b86] [formerly f062e43f8c [formerly 6c2e1cc597e14997f59c52c344ca7558139f2333]]
Former-commit-id: f062e43f8c
Former-commit-id: 02ecf31edb
2013-03-26 10:53:50 -05:00