Commit graph

2452 commits

Author SHA1 Message Date
Ben Steffensmeier
11e6afa5fa Issue #1799 fix modal tools again.
Former-commit-id: cffac354e8 [formerly eeeede7288] [formerly 66af8daa11 [formerly c1a69f88df85478571394c0e125617c93100168d]]
Former-commit-id: 66af8daa11
Former-commit-id: 7082466303
2013-03-29 14:30:54 -05:00
Roger Ferrel
ba0060522f Issue #1790 Changes for non-blocking StationListDlg.
Change-Id: Ib0cbfd64fca2d4dcbea68b5e0db8b34a5a7af6be

Former-commit-id: 281e7f53cb [formerly c5a95dcb44] [formerly 6ad80607bc [formerly 5d68d67451c45d38a962f58c246b2effcd0cc253]]
Former-commit-id: 6ad80607bc
Former-commit-id: de02460b11
2013-03-29 13:46:51 -05:00
Roger Ferrel
8c1116eaae Issue #1790 Last of the bug fixes. Reviewer changes
Change-Id: I451799e34e9621723c9d652f339c880da3aa7caa

Former-commit-id: 20f6baba0e [formerly 8f4492c63c] [formerly 463407a40e [formerly 336427570fba81616b8d02f3ed2948042d7dbf41]]
Former-commit-id: 463407a40e
Former-commit-id: ec5f32aec6
2013-03-29 11:35:08 -05:00
Ron Anderson
cd0f319ec5 Issue #1838 Fixed selected time range when Select Grids When Stepping is enabled.
Change-Id: I30417042d568e6471f8a684fab8bcc2387618089

Former-commit-id: 4ac9a4d9a8 [formerly 0f4fb125b0] [formerly c7cfcf0250 [formerly 3a3f0a47ac33d19259cfc447b0abedd9930e2c64]]
Former-commit-id: c7cfcf0250
Former-commit-id: 9cfa87f7e5
2013-03-29 10:48:26 -05:00
Ron Anderson
d5e3976dc4 Issue #1774 Fix invalid unit strings in parameterInfo files.
Change-Id: I681f323b91f213dad5d2ad725bfb77f304e769de

Former-commit-id: cfb324f380 [formerly aeb451a37c] [formerly 679bb01764 [formerly 961526d5a895922b07b8358d5b284f7fc9b02566]]
Former-commit-id: 679bb01764
Former-commit-id: 96e8f63679
2013-03-29 10:07:37 -05:00
Greg Armendariz
dcd36e64a6 Fix merge issue
Former-commit-id: 611661ccc9 [formerly cd5da3a6c5] [formerly 5da06cadd7 [formerly c9c8fc9c7ece8ab909b13b63964369b36fb20bc0]]
Former-commit-id: 5da06cadd7
Former-commit-id: f0e1b80cd2
2013-03-29 09:52:46 -05:00
Greg Armendariz
05af592718 Change package location of import
Former-commit-id: f778112c20 [formerly d533c5c08d] [formerly 27345f6edf [formerly c158a7540d23451b864a1464ab64882c3d45386d]]
Former-commit-id: 27345f6edf
Former-commit-id: 089dfc87e6
2013-03-29 09:09:32 -05:00
David Gillingham
fddd42615d 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: 170f252bdd [formerly 8a7c965eaa] [formerly c9ed59b0e0 [formerly 8b98836e103e082ccf266e1030b5fd3351095618]]
Former-commit-id: c9ed59b0e0
Former-commit-id: dbec0fa00f
2013-03-28 17:18:43 -05:00
Nate Jensen
946323416c Merge "Issue #1774 Fix D2D accumulative parameter time ranges" into omaha_13.3.1
Former-commit-id: 3ad797690b [formerly 214b2ed4ba] [formerly 1bf37125c4 [formerly d14cbd8b4a99316bbbf015e1392a34f63a1082d6]]
Former-commit-id: 1bf37125c4
Former-commit-id: 711fbe98d2
2013-03-28 17:02:14 -05:00
Richard Peter
affe383cf3 Merge "Issue #1750 - qpid updates for compatibility with operational servers" into development
Former-commit-id: 1228c8cbbc [formerly b4fea10724] [formerly 209d53ee67 [formerly 461708424eea856dacbd2bd2af506f8f905f19c7]]
Former-commit-id: 209d53ee67
Former-commit-id: 8b0347001d
2013-03-28 16:59:18 -05:00
Steve Harris
bec6e9099f Issue #1782 - restore FFPMGenerator.java
Former-commit-id: f01b5fb849 [formerly e67dbb206e] [formerly 3953f8368b [formerly 813033f4a2b30a669646b288eb00959922f0e804]]
Former-commit-id: 3953f8368b
Former-commit-id: a74d22efc5
2013-03-28 16:06:54 -05:00
Bryan Kowal
fa5825b0c5 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: d124f7a37f [formerly 2819e8fe48] [formerly e3c39b9be6 [formerly 4ebdeac7ee92855f9f21ae0eb0478e69e93514e4]]
Former-commit-id: e3c39b9be6
Former-commit-id: 07a52630a7
2013-03-28 16:00:27 -05:00
Ben Steffensmeier
33de9bfc87 Issue #1799 fix activation of tools for new perspectives.
Former-commit-id: dcbed65681 [formerly 50a276a7e2] [formerly 4efa92ff49 [formerly a4c1e2f9526efa227b246b8dc4df9cb00566def1]]
Former-commit-id: 4efa92ff49
Former-commit-id: a415fb17ae
2013-03-28 15:47:36 -05:00
Max Schenkelberg
623c49c3cc Issue #1638 Added persistIndex route that only persists and indexes
Change-Id: I2d53bae64dca80e20777407c62ce7cc7546e3fae

Former-commit-id: d55e7a0eda [formerly e91406ab10] [formerly a308b27c2f [formerly 3d386df8a1def460f81468154964603e7c1edbe8]]
Former-commit-id: a308b27c2f
Former-commit-id: d9a481f542
2013-03-28 15:45:31 -05:00
Ron Anderson
33bcf5fee8 Issue #1774 Fix D2D accumulative parameter time ranges
Change-Id: I57b32881a30e89c999dae6db7753da83f9e949c1

Former-commit-id: 27e07ce4a9 [formerly 5bb47b7931] [formerly b65ecfc151 [formerly aee839a85ec68c7eb80ef1e7236af6cb4666372b]]
Former-commit-id: b65ecfc151
Former-commit-id: 3f2fa771d9
2013-03-28 13:37:29 -05:00
Steve Harris
7bd478fc41 Revert "Replaced with formatted version"
This reverts commit e074710e0a [formerly cf9b267283] [formerly 18019c07a4] [formerly ff977fc882 [formerly b741680965] [formerly 18019c07a4 [formerly d9726bc27ae5387dc5042628b79a9b4239120d08]]].


Former-commit-id: c51c9ea5df [formerly 29c5918428] [formerly 8400028e11 [formerly 1c0d9e2058ce98c5de8e046a35bf2a6954b2e3f3]]
Former-commit-id: 8400028e11
Former-commit-id: b614bf53f6
2013-03-28 13:08:16 -05:00
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
Greg Armendariz
e074710e0a Replaced with formatted version
Former-commit-id: ff977fc882 [formerly b741680965] [formerly 18019c07a4 [formerly d9726bc27ae5387dc5042628b79a9b4239120d08]]
Former-commit-id: 18019c07a4
Former-commit-id: cf9b267283
2013-03-28 12:59:43 -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
85d6a19a5e Issue #1840 Fix merge error that removed .classpath
Change-Id: I976e69d04ce47fe31cf47c9aff7de1bed786ad17

Former-commit-id: c2edf1dd89 [formerly ab42673848] [formerly a4e4df02b0 [formerly 59977a0a652352a9128caaaf7d8f041b82941490]]
Former-commit-id: a4e4df02b0
Former-commit-id: 902986256d
2013-03-28 12:14:47 -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
Greg Armendariz
10823802da 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: b543b515d9 [formerly a48365165b] [formerly 943426fd00 [formerly 6eee456e38bcc5d4a7097868a50e6928cc99bf16]]
Former-commit-id: 943426fd00
Former-commit-id: 05d1d16500
2013-03-28 12:05:07 -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
Bryan Kowal
1a11fef532 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: 5fe808757f [formerly c592e8a877] [formerly 955b5c84d3 [formerly 6f51d7079a786534edfa4f60d365284611fb8c3e]]
Former-commit-id: 955b5c84d3
Former-commit-id: 7a6f32796b
2013-03-28 10:42:51 -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
Ben Steffensmeier
e1a619e030 Issue #1821 recalculate 6 hours to be longer.
Former-commit-id: 61e0ca3b75 [formerly a9cec71222] [formerly efbdd3aa8c [formerly 9ffb12e004e0268f6e9f662a10a6b8d7a1b916ed]]
Former-commit-id: efbdd3aa8c
Former-commit-id: 403da9bfb9
2013-03-28 10:16:11 -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
Bryan Kowal
131e260337 Issue #1821 - re-compile grib2.so 32-bit and 64-bit
Former-commit-id: 203a3d5200 [formerly da99727625] [formerly 2da2b370db [formerly f7f382d880134acb2f84bef990302aa91784c2d2]]
Former-commit-id: 2da2b370db
Former-commit-id: 998fbe8769
2013-03-28 09:48:27 -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
Greg Armendariz
44fcd1a8db Add source variable
Former-commit-id: ae09ebb11f [formerly 8800080d2a] [formerly d0d889f11d [formerly fbd7e7f86b3568a0b04f2b34a072b45a301d8d2d]]
Former-commit-id: d0d889f11d
Former-commit-id: 24fea6f45d
2013-03-28 08:56:50 -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