Dustin Johnson
5b7fcb1ce2
Issue #1841 Split up Subscription hierarchy in support of shared subscriptions.
...
Amend:
Use TimeUtil.newGmtCalendar() and remove whitespace only change
Add TODO for point data types.
Change-Id: If232ef50a63066e85b122d4247fa767fc31313d3
Former-commit-id: 6129d86be4
[formerly c981b7250f
[formerly b91593c0a50114e4766ecf83d92e7f25b58bbbf8]]
Former-commit-id: c981b7250f
Former-commit-id: 48a2002e68
2013-04-01 15:35:51 -05:00
Lee Venable
6109daf744
Merge "Issue #1830 - Don't allow base level config files for FFMP" into development
...
Former-commit-id: f1e8faf9ff
[formerly 4a8c4b64df
[formerly 9c117d43e77ffa074c8464771918116f8835b382]]
Former-commit-id: 4a8c4b64df
Former-commit-id: e994040887
2013-04-01 12:26:23 -05:00
Steve Harris
5ec1c01d3a
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: 437a04011a
[formerly 140765a43e
[formerly 4a7059ac9b104116fef4d0dab9a0108fb61b5a5c]]
Former-commit-id: 140765a43e
Former-commit-id: 736bb45741
2013-04-01 12:19:04 -05:00
Steve Harris
d2d9195925
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: 14c9de2259
[formerly 74a47b9bd9
[formerly 98ddc22749f0e5cdb0f4f8f0084ee742486461d5]]
Former-commit-id: 74a47b9bd9
Former-commit-id: 3b722f1076
2013-04-01 12:15:04 -05:00
Lee Venable
35413b2833
Merge "Issue #1790 Changes for non-blocking StationProfileDlg." into development
...
Former-commit-id: d3390596f4
[formerly fe89cb7fe4
[formerly fe244abd3f625d7334284d4657bd8f35737e86a5]]
Former-commit-id: fe89cb7fe4
Former-commit-id: 7d73b8dacf
2013-04-01 12:06:16 -05:00
Steve Harris
1b8e623c9b
13.3.1-17 baseline
...
Former-commit-id: a3fe998f8f
[formerly 7bf9966dcb
[formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]
Former-commit-id: 7bf9966dcb
Former-commit-id: f28b85d42f
2013-04-01 12:04:56 -05:00
Steve Harris
712c13a655
13.3.1-16 baseline
...
Former-commit-id: 3066dd33e5
[formerly 51380726d4
[formerly 18321f88c2efedf141b84e7de18c200e1037f740]]
Former-commit-id: 51380726d4
Former-commit-id: a262f22cee
2013-04-01 11:39:08 -05:00
Mike Duff
eb0a77c8ac
Issue #1830 - Don't allow base level config files for FFMP
...
Change-Id: Ib408e51eda5367a1d66684685935b6163acbbb77
Former-commit-id: 9c2ac87482
[formerly 261a39122d
[formerly 9ecafb5aacbdb2928902435f342aa4547c2f5903]]
Former-commit-id: 261a39122d
Former-commit-id: fa8ca827d1
2013-04-01 11:36:53 -05:00
Richard Peter
b921a25faf
Merge "Issue #1638 Added Auto updating localization file object and added more methods to RecordFactory to make more versatile" into development
...
Former-commit-id: 255617199c
[formerly e221223f8a
[formerly 6b3523df82d62d75db483baad329cc6d9a2ade13]]
Former-commit-id: e221223f8a
Former-commit-id: 2fa88522ff
2013-04-01 11:33:59 -05:00
Steve Harris
70fece2da1
13.3.1-15 baseline
...
Former-commit-id: 3d8ed484be
[formerly eb1dab3864
[formerly 369cf4feaee63c96725cb6efc5774b8f6b8cbf08]]
Former-commit-id: eb1dab3864
Former-commit-id: 4cf3ad6abb
2013-04-01 11:33:20 -05:00
Max Schenkelberg
6c1c9f25d5
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: 51d976e5e2
[formerly 321a29ffa4
[formerly 9eaa57677f77ff919f1a55ee7ad4b44a0613b97a]]
Former-commit-id: 321a29ffa4
Former-commit-id: a508e9c8cb
2013-04-01 10:19:36 -05:00
Lee Venable
b100693786
Merge "Issue #1790 Changes for non-blocking StationListDlg." into development
...
Former-commit-id: 0bfc05ce61
[formerly 2875600910
[formerly 4dad96cbc70936f43a65519eff70ac72c904c9e5]]
Former-commit-id: 2875600910
Former-commit-id: 7389bf5b29
2013-04-01 09:40:59 -05:00
Roger Ferrel
7551b03bfe
Issue #1790 Changes for non-blocking StationProfileDlg.
...
Change-Id: I669c9115dd1bb506acd025a451163aaf664593ef
Former-commit-id: d21cb5e2e8
[formerly 0d269691e2
[formerly 57eb492610a3cc2974badc6072c2a026f5640b79]]
Former-commit-id: 0d269691e2
Former-commit-id: e1b40f9f2f
2013-03-29 17:11:02 -05:00
Ben Steffensmeier
0802c4cd3d
Issue #1799 fix modal tools again.
...
Former-commit-id: 66af8daa11
[formerly eeeede7288
[formerly c1a69f88df85478571394c0e125617c93100168d]]
Former-commit-id: eeeede7288
Former-commit-id: cffac354e8
2013-03-29 14:30:54 -05:00
Roger Ferrel
6d83f23cc2
Issue #1790 Changes for non-blocking StationListDlg.
...
Change-Id: Ib0cbfd64fca2d4dcbea68b5e0db8b34a5a7af6be
Former-commit-id: 6ad80607bc
[formerly c5a95dcb44
[formerly 5d68d67451c45d38a962f58c246b2effcd0cc253]]
Former-commit-id: c5a95dcb44
Former-commit-id: 281e7f53cb
2013-03-29 13:46:51 -05:00
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
Ron Anderson
d7f0cfe92d
Issue #1838 Fixed selected time range when Select Grids When Stepping is enabled.
...
Change-Id: I30417042d568e6471f8a684fab8bcc2387618089
Former-commit-id: c7cfcf0250
[formerly 0f4fb125b0
[formerly 3a3f0a47ac33d19259cfc447b0abedd9930e2c64]]
Former-commit-id: 0f4fb125b0
Former-commit-id: 4ac9a4d9a8
2013-03-29 10:48:26 -05:00
Ron Anderson
ef06834e54
Issue #1774 Fix invalid unit strings in parameterInfo files.
...
Change-Id: I681f323b91f213dad5d2ad725bfb77f304e769de
Former-commit-id: 679bb01764
[formerly aeb451a37c
[formerly 961526d5a895922b07b8358d5b284f7fc9b02566]]
Former-commit-id: aeb451a37c
Former-commit-id: cfb324f380
2013-03-29 10:07:37 -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
David Gillingham
2ee53d54f5
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: c9ed59b0e0
[formerly 8a7c965eaa
[formerly 8b98836e103e082ccf266e1030b5fd3351095618]]
Former-commit-id: 8a7c965eaa
Former-commit-id: 170f252bdd
2013-03-28 17:18:43 -05:00
Nate Jensen
9d74722ce0
Merge "Issue #1774 Fix D2D accumulative parameter time ranges" into omaha_13.3.1
...
Former-commit-id: 1bf37125c4
[formerly 214b2ed4ba
[formerly d14cbd8b4a99316bbbf015e1392a34f63a1082d6]]
Former-commit-id: 214b2ed4ba
Former-commit-id: 3ad797690b
2013-03-28 17:02:14 -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
Ben Steffensmeier
6bf1ec8543
Issue #1799 fix activation of tools for new perspectives.
...
Former-commit-id: 4efa92ff49
[formerly 50a276a7e2
[formerly a4c1e2f9526efa227b246b8dc4df9cb00566def1]]
Former-commit-id: 50a276a7e2
Former-commit-id: dcbed65681
2013-03-28 15:47:36 -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
Ron Anderson
80bd994f20
Issue #1774 Fix D2D accumulative parameter time ranges
...
Change-Id: I57b32881a30e89c999dae6db7753da83f9e949c1
Former-commit-id: b65ecfc151
[formerly 5bb47b7931
[formerly aee839a85ec68c7eb80ef1e7236af6cb4666372b]]
Former-commit-id: 5bb47b7931
Former-commit-id: 27e07ce4a9
2013-03-28 13:37:29 -05:00
Steve Harris
8706337f67
Revert "Replaced with formatted version"
...
This reverts commit 410e8bcbf1
[formerly ff977fc882
] [formerly b741680965
] [formerly 18019c07a4
[formerly b741680965
[formerly d9726bc27ae5387dc5042628b79a9b4239120d08]]].
Former-commit-id: 8400028e11
[formerly 29c5918428
[formerly 1c0d9e2058ce98c5de8e046a35bf2a6954b2e3f3]]
Former-commit-id: 29c5918428
Former-commit-id: c51c9ea5df
2013-03-28 13:08:16 -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
Greg Armendariz
410e8bcbf1
Replaced with formatted version
...
Former-commit-id: 18019c07a4
[formerly b741680965
[formerly d9726bc27ae5387dc5042628b79a9b4239120d08]]
Former-commit-id: b741680965
Former-commit-id: ff977fc882
2013-03-28 12:59:43 -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
6f36d70ead
Issue #1840 Fix merge error that removed .classpath
...
Change-Id: I976e69d04ce47fe31cf47c9aff7de1bed786ad17
Former-commit-id: a4e4df02b0
[formerly ab42673848
[formerly 59977a0a652352a9128caaaf7d8f041b82941490]]
Former-commit-id: ab42673848
Former-commit-id: c2edf1dd89
2013-03-28 12:14:47 -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
Greg Armendariz
cea8e5309e
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: 943426fd00
[formerly a48365165b
[formerly 6eee456e38bcc5d4a7097868a50e6928cc99bf16]]
Former-commit-id: a48365165b
Former-commit-id: b543b515d9
2013-03-28 12:05:07 -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
Bryan Kowal
d8b1984283
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: 955b5c84d3
[formerly c592e8a877
[formerly 6f51d7079a786534edfa4f60d365284611fb8c3e]]
Former-commit-id: c592e8a877
Former-commit-id: 5fe808757f
2013-03-28 10:42:51 -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
Ben Steffensmeier
c61b608e1b
Issue #1821 recalculate 6 hours to be longer.
...
Former-commit-id: efbdd3aa8c
[formerly a9cec71222
[formerly 9ffb12e004e0268f6e9f662a10a6b8d7a1b916ed]]
Former-commit-id: a9cec71222
Former-commit-id: 61e0ca3b75
2013-03-28 10:16:11 -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
Bryan Kowal
d3a2525705
Issue #1821 - re-compile grib2.so 32-bit and 64-bit
...
Former-commit-id: 2da2b370db
[formerly da99727625
[formerly f7f382d880134acb2f84bef990302aa91784c2d2]]
Former-commit-id: da99727625
Former-commit-id: 203a3d5200
2013-03-28 09:48:27 -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
Greg Armendariz
5d9bb2f71e
Add source variable
...
Former-commit-id: d0d889f11d
[formerly 8800080d2a
[formerly fbd7e7f86b3568a0b04f2b34a072b45a301d8d2d]]
Former-commit-id: 8800080d2a
Former-commit-id: ae09ebb11f
2013-03-28 08:56:50 -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