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: 6129d86be4c981b7250fc981b7250f48a2002e68
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: f1e8faf9ff4a8c4b64df4a8c4b64dfe994040887
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: 437a04011a140765a43e140765a43e736bb45741
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: 14c9de225974a47b9bd974a47b9bd93b722f1076
2013-04-01 12:15:04 -05:00
Lee Venable
35413b2833
Merge "Issue #1790 Changes for non-blocking StationProfileDlg." into development
...
Former-commit-id: d3390596f4fe89cb7fe4fe89cb7fe47d73b8dacf
2013-04-01 12:06:16 -05:00
Steve Harris
1b8e623c9b
13.3.1-17 baseline
...
Former-commit-id: a3fe998f8f7bf9966dcb7bf9966dcbf28b85d42f
2013-04-01 12:04:56 -05:00
Steve Harris
712c13a655
13.3.1-16 baseline
...
Former-commit-id: 3066dd33e551380726d451380726d4a262f22cee
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: 9c2ac87482261a39122d261a39122dfa8ca827d1
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: 255617199ce221223f8ae221223f8a2fa88522ff
2013-04-01 11:33:59 -05:00
Steve Harris
70fece2da1
13.3.1-15 baseline
...
Former-commit-id: 3d8ed484beeb1dab3864eb1dab38644cf3ad6abb
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: 51d976e5e2321a29ffa4321a29ffa4a508e9c8cb
2013-04-01 10:19:36 -05:00
Lee Venable
b100693786
Merge "Issue #1790 Changes for non-blocking StationListDlg." into development
...
Former-commit-id: 0bfc05ce61287560091028756009107389bf5b29
2013-04-01 09:40:59 -05:00
Roger Ferrel
7551b03bfe
Issue #1790 Changes for non-blocking StationProfileDlg.
...
Change-Id: I669c9115dd1bb506acd025a451163aaf664593ef
Former-commit-id: d21cb5e2e80d269691e20d269691e2e1b40f9f2f
2013-03-29 17:11:02 -05:00
Ben Steffensmeier
0802c4cd3d
Issue #1799 fix modal tools again.
...
Former-commit-id: 66af8daa11eeeede7288eeeede7288cffac354e8
2013-03-29 14:30:54 -05:00
Roger Ferrel
6d83f23cc2
Issue #1790 Changes for non-blocking StationListDlg.
...
Change-Id: Ib0cbfd64fca2d4dcbea68b5e0db8b34a5a7af6be
Former-commit-id: 6ad80607bcc5a95dcb44c5a95dcb44281e7f53cb
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: 463407a40e8f4492c63c8f4492c63c20f6baba0e
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: c7cfcf02500f4fb125b00f4fb125b04ac9a4d9a8
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: 679bb01764aeb451a37caeb451a37ccfb324f380
2013-03-29 10:07:37 -05:00
Greg Armendariz
466fa3fd41
Fix merge issue
...
Former-commit-id: 5da06cadd7cd5da3a6c5cd5da3a6c5611661ccc9
2013-03-29 09:52:46 -05:00
Greg Armendariz
56f51657fd
Change package location of import
...
Former-commit-id: 27345f6edfd533c5c08dd533c5c08df778112c20
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: c9ed59b0e08a7c965eaa8a7c965eaa170f252bdd
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: 1bf37125c4214b2ed4ba214b2ed4ba3ad797690b
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: 209d53ee67b4fea10724b4fea107241228c8cbbc
2013-03-28 16:59:18 -05:00
Steve Harris
545ab48027
Issue #1782 - restore FFPMGenerator.java
...
Former-commit-id: 3953f8368be67dbb206ee67dbb206ef01b5fb849
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: e3c39b9be62819e8fe482819e8fe48d124f7a37f
2013-03-28 16:00:27 -05:00
Ben Steffensmeier
6bf1ec8543
Issue #1799 fix activation of tools for new perspectives.
...
Former-commit-id: 4efa92ff4950a276a7e250a276a7e2dcbed65681
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: a308b27c2fe91406ab10e91406ab10d55e7a0eda
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: b65ecfc1515bb47b79315bb47b793127e07ce4a9
2013-03-28 13:37:29 -05:00
Steve Harris
8706337f67
Revert "Replaced with formatted version"
...
This reverts commit 410e8bcbf1ff977fc882b74168096518019c07a4b7416809658400028e1129c591842829c5918428c51c9ea5df
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: 3991df64ffc618169639c6181696399bc6dd47b6
2013-03-28 13:07:20 -05:00
Greg Armendariz
410e8bcbf1
Replaced with formatted version
...
Former-commit-id: 18019c07a4b741680965b741680965ff977fc882
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: 51bf00bf1c8583a5f7858583a5f78559393b633a
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: a4e4df02b0ab42673848ab42673848c2edf1dd89
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: 695c83669e680d2984e1680d2984e15e0073f1f9
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: 6640a65a51ed9cb5f8f6ed9cb5f8f6ec880b7923
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: 943426fd00a48365165ba48365165bb543b515d9
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: 1365d5c9af3be6669f1b3be6669f1bce37e32e61
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: 955b5c84d3c592e8a877c592e8a8775fe808757f
2013-03-28 10:42:51 -05:00
Max Schenkelberg
33352d0e53
Issue #1638 Fix merge error
...
Change-Id: Id75f4d6372cd77132bad82029cfb176ec4f19712
Former-commit-id: 2b58e3ce3f573b441662573b44166225202d8534
2013-03-28 10:20:54 -05:00
Ben Steffensmeier
c61b608e1b
Issue #1821 recalculate 6 hours to be longer.
...
Former-commit-id: efbdd3aa8ca9cec71222a9cec7122261e0ca3b75
2013-03-28 10:16:11 -05:00
Lee Venable
87e166d88d
Merge "Issue #1790 Bug fixes for SCAN." into development
...
Former-commit-id: 167fa6eadfe7805ded92e7805ded92a891171c43
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: 2da2b370dbda99727625da99727625203a3d5200
2013-03-28 09:48:27 -05:00
Roger Ferrel
895ac9a39b
Issue #1790 Bug fixes for SCAN.
...
Change-Id: I5743cd94be6c06808acb0add38d63ea381d13c65
Former-commit-id: e204276c179c560ab6269c560ab626009cd032cb
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: 4db9e20fbf98d056c3a198d056c3a157fe6b5ca6
2013-03-28 09:04:10 -05:00
Greg Armendariz
5d9bb2f71e
Add source variable
...
Former-commit-id: d0d889f11d8800080d2a8800080d2aae09ebb11f
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: 3073951b3d9a321b6ac89a321b6ac8069ee8a748
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: 6351d8f6d33cb15755a83cb15755a8c284261dc2
2013-03-27 22:13:11 -05:00
Steve Harris
bf64a0dc2f
13.3.1-14 baseline
...
Former-commit-id: 4d4234d5c9c29076949ec29076949e6a4bbd9f1a
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: 1129728e03a8410499bca8410499bc5bd60ce50c
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: 2b207fc6ec3ba331e9f53ba331e9f5642ff5e320
2013-03-27 18:32:38 -05:00
