Commit graph

1564 commits

Author SHA1 Message Date
Dustin Johnson
e7301e95c9 Issue #1841 Split up PendingSubscription hierarchy in support of shared subscriptions.
Add ability to store/approve shared subscriptions.
Back out generics on subscription/pending subscriptions until guis are updated.

Change-Id: I84e1651ebcad0d398396752529981f28dbc341bf

Former-commit-id: 3a6d9209df [formerly cef805e79a] [formerly 61346b1388] [formerly 3a6d9209df [formerly cef805e79a] [formerly 61346b1388] [formerly f3bdede2c8 [formerly 61346b1388 [formerly 5a8249a78daaeed19079e78f6c4f07b08e817ff0]]]]
Former-commit-id: f3bdede2c8
Former-commit-id: 73a8bb7a02 [formerly 4b4eb8e406] [formerly da2f137f6b51f8ac36c0d76f597f0c82e1dfd829 [formerly 8c52cd190f]]
Former-commit-id: 58e02dc2dcf3d6a21fbf5672b90de97e43258d5e [formerly fefc0dca3b]
Former-commit-id: 5958178516
2013-04-05 12:41:02 -05:00
Greg Armendariz
db25658b91 Merge "Issue #1859 - the Xss JVM parameter will now be included in the ini files for the 32-bit CAVE" into development
Former-commit-id: 88a6a8abb3 [formerly 6e0ced27dc] [formerly d6d0e0131f] [formerly 88a6a8abb3 [formerly 6e0ced27dc] [formerly d6d0e0131f] [formerly 71d400e09f [formerly d6d0e0131f [formerly fa1c24a0aa4004b9403e39ce94a99a88f423466e]]]]
Former-commit-id: 71d400e09f
Former-commit-id: f0957645ad [formerly f452a4582a] [formerly db325a9270fe94f678cb6b219d0d78c03ac26ba9 [formerly d463555ca3]]
Former-commit-id: b0131e66fc88dcb445eae8dd32ed7994f087f4ff [formerly d176c441e7]
Former-commit-id: df0146764b
2013-04-04 13:00:39 -05:00
Bryan Kowal
a800e56338 Issue #1864 - datadelivery and kml are now dependent on the core viz feature.
Former-commit-id: c5afa1883b [formerly 70c8ed6bc0] [formerly 3fac666de5] [formerly c5afa1883b [formerly 70c8ed6bc0] [formerly 3fac666de5] [formerly 64c54f2110 [formerly 3fac666de5 [formerly c5b6f20402cfa47cbc421596b81139f24db2c552]]]]
Former-commit-id: 64c54f2110
Former-commit-id: b4e684ad08 [formerly 6a66158097] [formerly 7caf86fef7ce3f92cf05af51e41bb90a5b3fbdaa [formerly 49ee55327d]]
Former-commit-id: 6265c9153ffe44beeb85c5aaa0594d99ddd97281 [formerly dda6a904ed]
Former-commit-id: cc94b29199
2013-04-04 12:48:59 -05:00
Steve Harris
084125dd3c Merge branch 'omaha_13.3.1' into development
Former-commit-id: 4dfea33cdd [formerly 9879b94de9] [formerly 8b607f8228] [formerly 4dfea33cdd [formerly 9879b94de9] [formerly 8b607f8228] [formerly 5c9a6b83cc [formerly 8b607f8228 [formerly ef87d76141000e00dc04ab0cc4db4ad80006b636]]]]
Former-commit-id: 5c9a6b83cc
Former-commit-id: bbfc0f76ef [formerly 0f53c46d7a] [formerly 0738423fc8a58844573f709645061e99d15cff90 [formerly ed8c0487fe]]
Former-commit-id: 55bdcb43db4e6090118e9aec0586c1a76860abe3 [formerly 7eda24c3b0]
Former-commit-id: a7b174bfaf
2013-04-04 11:58:50 -05:00
Bryan Kowal
d60c0c39e1 Issue #1859 - the Xss JVM parameter will now be included in the ini files for the 32-bit CAVE
Change-Id: I4d5a152dd44cd0a80405e04ce18d40e820bd06e6

Former-commit-id: a8fe170b53 [formerly c448651065] [formerly 03a2e82b77] [formerly a8fe170b53 [formerly c448651065] [formerly 03a2e82b77] [formerly 8d3c98eb5d [formerly 03a2e82b77 [formerly 54f97bfeaecf8fc99d8572a94977d863c547fe17]]]]
Former-commit-id: 8d3c98eb5d
Former-commit-id: 64dbc18c8e [formerly 12e9b9d75b] [formerly fab6d44468dbf0db3894a28e8b00ea49184bb43e [formerly 5816ddaf77]]
Former-commit-id: e7f0a63952036826712c60267aeae594c52d3e3f [formerly bd47c62789]
Former-commit-id: 6032a8dd0c
2013-04-03 18:27:10 -05:00
Nate Jensen
0a621e8228 Merge "Issue #1735 ForecastPointDataRetrieve now uses DbQueryRequest to obtain forecast times in asscending order and option to limit times returned. Change reviewer comments." into development
Former-commit-id: 59f084426c [formerly f43ac8bbc3] [formerly 79a9d76915] [formerly 59f084426c [formerly f43ac8bbc3] [formerly 79a9d76915] [formerly 73d86e8926 [formerly 79a9d76915 [formerly eaabe1a4935051d003ed302de193cfb183118845]]]]
Former-commit-id: 73d86e8926
Former-commit-id: 91c6521d10 [formerly e74f83d83a] [formerly 641d60c190b7ce188d34ee3d8a2f74fb6d1a5e54 [formerly c87d157cbd]]
Former-commit-id: be0db364e2a34349e3d14bb371f5ee4450866b7c [formerly 5be8ef079e]
Former-commit-id: b151421989
2013-04-03 17:28:49 -05:00
Steve Harris
114eec390d Merge branch 'master_13.3.1' (13.3.1-18) into omaha_13.3.1
Former-commit-id: 77c0dd0b55 [formerly 2bc12f7a23] [formerly 0f000f4485] [formerly 77c0dd0b55 [formerly 2bc12f7a23] [formerly 0f000f4485] [formerly 327d05f3b5 [formerly 0f000f4485 [formerly 131cf22b16b3109fdc13a8346524fc8d2e230b7f]]]]
Former-commit-id: 327d05f3b5
Former-commit-id: b2de6fd4c1 [formerly 0342b648b6] [formerly 17693382994fce6acddb70eda705f85cda502c1d [formerly c7b9690456]]
Former-commit-id: cbf659d2aeb98a7a61aa0b89fa053b8445f63a9f [formerly f22108c973]
Former-commit-id: dc0baf57ba
2013-04-03 15:52:19 -05:00
Ron Anderson
6ed11bbc88 Merge "Issue #1855 fix python threading in GFE procedures and smart tools" into omaha_13.3.1
Former-commit-id: 492587b91c [formerly b880af3c48] [formerly de856db77a] [formerly 492587b91c [formerly b880af3c48] [formerly de856db77a] [formerly c82968c1e6 [formerly de856db77a [formerly 53ace4843058424627c3b670caa77972ddbe01be]]]]
Former-commit-id: c82968c1e6
Former-commit-id: 0acc778948 [formerly a633b96fdf] [formerly d6c6f95496edc22dcabb64db1fe0138d9b9dfabb [formerly 237e414b5d]]
Former-commit-id: 6cff15f012d66863326f0d8789adfac29026769c [formerly fb76bf6d49]
Former-commit-id: e5252cf3a4
2013-04-03 15:25:52 -05:00
Steve Harris
0cd73a41a1 13.3.1-18 baseline
Former-commit-id: e621424fcb [formerly f3e79bcc9d] [formerly a2b098d86d] [formerly e621424fcb [formerly f3e79bcc9d] [formerly a2b098d86d] [formerly ce6a06a7e3 [formerly a2b098d86d [formerly 245ab5d951a10e74aba53b036001316e1c7653fe]]]]
Former-commit-id: ce6a06a7e3
Former-commit-id: a196ebc11b [formerly 0edd049e3b] [formerly 6155a83f5aa46637b96708a2e4492a382c4e5e79 [formerly bf6c3b6762]]
Former-commit-id: 88c12203c6853385a029c2fa9c3bdc8048aff152 [formerly 044912d48b]
Former-commit-id: fc009792e3
2013-04-03 14:58:29 -05:00
Nate Jensen
cf069478fe Issue #1855 fix python threading in GFE procedures and smart tools
Change-Id: I6420338991c1961ce63ff944b516925f83a12994

Former-commit-id: 52e83d902b [formerly 5c830c3c9c] [formerly e3462292ab] [formerly 52e83d902b [formerly 5c830c3c9c] [formerly e3462292ab] [formerly fe24e34163 [formerly e3462292ab [formerly c4549e0279a3026adc2f7b40bb272fc4f59acf59]]]]
Former-commit-id: fe24e34163
Former-commit-id: 62eb52e295 [formerly 1c6643e7de] [formerly 27fc586eb36f76446b7be74d68ec2819f9554038 [formerly e18e798a94]]
Former-commit-id: a757d160b2e5635526d0c3f28efa98d91764c0cf [formerly 01b25904ad]
Former-commit-id: f0abb60a1b
2013-04-03 14:33:24 -05:00
Lee Venable
13754c533c Merge "Issue #1858 Handled creating a follow up when initial was created before 0z but issued after." into omaha_13.3.1
Former-commit-id: bd785bf5a4 [formerly c8549e67d6] [formerly 40b8ecf27d] [formerly bd785bf5a4 [formerly c8549e67d6] [formerly 40b8ecf27d] [formerly ff910d99fc [formerly 40b8ecf27d [formerly ad96c48345c8b6f89ea337bd663cb7585981e941]]]]
Former-commit-id: ff910d99fc
Former-commit-id: 49fc55ce03 [formerly 3d129d4526] [formerly dc127c10f9c848a58411f7df06f86982131e3a2d [formerly 36a15b3be1]]
Former-commit-id: cd7a6b03494efcd71e21fc5a0f3ae6206fdcaa20 [formerly 5b0fb8eeaf]
Former-commit-id: 542dfcaf9b
2013-04-03 14:14:41 -05:00
Nate Jensen
5a88c9820b Merge "Issue #1562 max's fix for topo with custom colormaps" into omaha_13.3.1
Former-commit-id: 3334d9b065 [formerly a109ec4601] [formerly dbbad421db] [formerly 3334d9b065 [formerly a109ec4601] [formerly dbbad421db] [formerly 1bc148b468 [formerly dbbad421db [formerly 0b617c32afd67c5f64efa89e18abfef0de51a00f]]]]
Former-commit-id: 1bc148b468
Former-commit-id: 0a783718a9 [formerly 2d4dc636ce] [formerly 61a33575090f1b95703ee5ebf2af09b0f2f1fa1c [formerly ec8cdfd8f0]]
Former-commit-id: 2c852a36d92e9ace1a3bf68a94b1ecc96bc27b30 [formerly ab51de7da5]
Former-commit-id: 2c6e995faf
2013-04-03 14:13:14 -05:00
Nate Jensen
fc40cab9bc Issue #1562 max's fix for topo with custom colormaps
Change-Id: I7ede37a61d39cdc091c95a7d888af9347ca7621e

Former-commit-id: 869f5498f6 [formerly d64e0a2a39] [formerly 057a929903] [formerly 869f5498f6 [formerly d64e0a2a39] [formerly 057a929903] [formerly 6c711f037c [formerly 057a929903 [formerly 88e676506f6dec74514c25260edcc44d9e0564d5]]]]
Former-commit-id: 6c711f037c
Former-commit-id: 10b70e4222 [formerly 6ca17c5a2a] [formerly a8d505a73fefb71d965eb0d0a4c7619632647528 [formerly 616612e550]]
Former-commit-id: 084203f5ffb0d6a7d8de687bcc1a6caa6ffeaf43 [formerly fb5bce6afe]
Former-commit-id: 0e25d15232
2013-04-03 14:10:53 -05:00
Ron Anderson
8a2c181df6 Issue #1774 Moved wind component checking to GfeIngestNotificaionFilter
Change-Id: Ia34d564e6cfc8aaee4d254fbeca6f8e939acdc59

Former-commit-id: 3e61a80508 [formerly 34c8aad559] [formerly 3a3cdcbf46] [formerly 3e61a80508 [formerly 34c8aad559] [formerly 3a3cdcbf46] [formerly b703b4779e [formerly 3a3cdcbf46 [formerly d8b7834dbdbe6479745cf9a56ff36283c21d3bd0]]]]
Former-commit-id: b703b4779e
Former-commit-id: a0c34f1750 [formerly 0d57a752dc] [formerly 2ed70c94d4f1788d709469642bb3b7a34fdeef14 [formerly 065ba61389]]
Former-commit-id: f6906d6c665fe19cb44286fdb8ff6ebb5d58db5c [formerly 2222201f43]
Former-commit-id: 3be7ce8bab
2013-04-03 14:01:18 -05:00
Roger Ferrel
89be749f8d Issue #1735 ForecastPointDataRetrieve now uses DbQueryRequest to obtain forecast times in asscending order and option to limit times returned.
Change reviewer comments.

Change-Id: Ida69b63198ffa5c229eedd3abb42c4f5f9e1d00d

Former-commit-id: e87e4c869d [formerly f8d1a13c38] [formerly 54cbf656e9] [formerly e87e4c869d [formerly f8d1a13c38] [formerly 54cbf656e9] [formerly d2aae617b2 [formerly 54cbf656e9 [formerly b836dcb6d55dfbdf8e825fb194903d45a83382c8]]]]
Former-commit-id: d2aae617b2
Former-commit-id: 3248f4bcf2 [formerly 2b4b10d643] [formerly 116b58dfaee7c620e2aea5a1b9ca83d6a22be2db [formerly 7b829a2fec]]
Former-commit-id: 718544292ebcdbe6476ea274620a8961444112e5 [formerly ad658b46bf]
Former-commit-id: 2cad51c18f
2013-04-03 12:48:18 -05:00
Jonathan Sanchez
7a7a1b7ea0 Issue #1858 Handled creating a follow up when initial was created before
0z but issued after.

Former-commit-id: 262f280821 [formerly 9b547cab98] [formerly 9c322bf4b7] [formerly 262f280821 [formerly 9b547cab98] [formerly 9c322bf4b7] [formerly 799b8c57ef [formerly 9c322bf4b7 [formerly b123df8e9dea005c35865f4a71ef28b1d9c8cba8]]]]
Former-commit-id: 799b8c57ef
Former-commit-id: 689334d2e1 [formerly 7ca110890a] [formerly a8114ff352a146cacee317eae56977b042f8cda5 [formerly bd25782b7a]]
Former-commit-id: 3b57f5d0ff98ca49da8472e1ed3b12ed2f12464a [formerly 30a728e641]
Former-commit-id: 6f25295c90
2013-04-03 11:43:59 -05:00
Ben Steffensmeier
9239e64c15 Issue #1824 Fix Tile Geometry creation.
Former-commit-id: f8db56c0af [formerly fe561d7af0] [formerly fedbc28588] [formerly f8db56c0af [formerly fe561d7af0] [formerly fedbc28588] [formerly cfcc33cd7b [formerly fedbc28588 [formerly 9c77d1a4d12dd8fd0c684bd48a7fc1a02a34dbac]]]]
Former-commit-id: cfcc33cd7b
Former-commit-id: f2915807a0 [formerly e0bbe368be] [formerly a47a6ce1413348a47ef24247df2a0ba67f2fd485 [formerly 58d81f6556]]
Former-commit-id: 1173cfa28f3150dd6e87469f3aeb1b25a52af127 [formerly 15be152be1]
Former-commit-id: eb98e23be1
2013-04-03 10:59:11 -05:00
Mike Duff
0f8a831c01 Issue #1731 - fix problem with dmd updating.
Change-Id: I1f3eb576cf26a42195ca9c4cadfbeaeb77394af6

Former-commit-id: 335b85ea48 [formerly c3ab8259d5] [formerly 64cdb3c7fd] [formerly 335b85ea48 [formerly c3ab8259d5] [formerly 64cdb3c7fd] [formerly 23c8085402 [formerly 64cdb3c7fd [formerly a8c25cfced44c7e3edfd1b37af73b2af8753212b]]]]
Former-commit-id: 23c8085402
Former-commit-id: a932186e2f [formerly bb14757eed] [formerly ca721abdd76f0ab8bfb9d6237b043b5674132b84 [formerly 3f2f0937ce]]
Former-commit-id: dbd807a7829dd50e060600aa69920cc72d69167b [formerly 5298fb6633]
Former-commit-id: aef1bc779f
2013-04-02 16:22:23 -05:00
Nate Jensen
b65824a812 Merge "Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development." into development
Former-commit-id: cb6cd91f06 [formerly ab28523a09] [formerly f57358cff8] [formerly cb6cd91f06 [formerly ab28523a09] [formerly f57358cff8] [formerly 8f9ec8dd2c [formerly f57358cff8 [formerly 4f965dfb6a15e853eb64c9ebf4a646ba4ad156a8]]]]
Former-commit-id: 8f9ec8dd2c
Former-commit-id: c82a67f378 [formerly 1ad5bb1a52] [formerly 98771bb0bfd73fcc71ef677f5788874166df11aa [formerly 374eed35b3]]
Former-commit-id: da64965f81585567559fad5d0cd0833628607d59 [formerly d1f53fb57e]
Former-commit-id: e0cb68cc06
2013-04-02 14:29:15 -05:00
Dustin Johnson
b6c2c0194c 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: 5b7fcb1ce2 [formerly 48a2002e68] [formerly c981b7250f] [formerly 5b7fcb1ce2 [formerly 48a2002e68] [formerly c981b7250f] [formerly 6129d86be4 [formerly c981b7250f [formerly b91593c0a50114e4766ecf83d92e7f25b58bbbf8]]]]
Former-commit-id: 6129d86be4
Former-commit-id: c42ca22867 [formerly 644ed2396d] [formerly e2262bcbcadbf80beb178caf980ef3cfba79d608 [formerly dd8f4d8454]]
Former-commit-id: 4466a4fe3eec25da0716798d2d3f9beb6bb0d4f0 [formerly 15ed8a6f58]
Former-commit-id: e57b8314d8
2013-04-01 15:35:51 -05:00
Max Schenkelberg
bb8e2cf3e1 Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development.
Change-Id: I37c3135794c991e2405d556823a22768dd491f00

Former-commit-id: a59484e232 [formerly 9d032f3e84] [formerly b32fbad9c8] [formerly a59484e232 [formerly 9d032f3e84] [formerly b32fbad9c8] [formerly 547190329b [formerly b32fbad9c8 [formerly 7b37bda291882ff345d466f4338b6707ed84d4d5]]]]
Former-commit-id: 547190329b
Former-commit-id: 984e67acda [formerly ba262e2bc5] [formerly a0a981e01aeb782ac1535e091405ef4a6146176b [formerly 635388a7ad]]
Former-commit-id: 27d68b81294fdcff628db2407a3b0b00c4165e1d [formerly 80b0f7c159]
Former-commit-id: ee60a2a80c
2013-04-01 12:41:50 -05:00
Lee Venable
e77b20af5d Merge "Issue #1830 - Don't allow base level config files for FFMP" into development
Former-commit-id: 6109daf744 [formerly e994040887] [formerly 4a8c4b64df] [formerly 6109daf744 [formerly e994040887] [formerly 4a8c4b64df] [formerly f1e8faf9ff [formerly 4a8c4b64df [formerly 9c117d43e77ffa074c8464771918116f8835b382]]]]
Former-commit-id: f1e8faf9ff
Former-commit-id: 7e4696f582 [formerly 58c83b9662] [formerly 80217d8bb653fed512ec88e601b9cf14286e1708 [formerly 35d27f89f1]]
Former-commit-id: 6cebcfee43829f43dceb8e066a3d5bfe306d66e1 [formerly e66a72fbed]
Former-commit-id: ca38aca6df
2013-04-01 12:26:23 -05:00
Steve Harris
6a3f6359d6 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: 5ec1c01d3a [formerly 736bb45741] [formerly 140765a43e] [formerly 5ec1c01d3a [formerly 736bb45741] [formerly 140765a43e] [formerly 437a04011a [formerly 140765a43e [formerly 4a7059ac9b104116fef4d0dab9a0108fb61b5a5c]]]]
Former-commit-id: 437a04011a
Former-commit-id: 47c7f66f2b [formerly 7b27767d7e] [formerly 0f6adbe76d6a5926e99d6caab1841fd3e7bd7349 [formerly 0b48e96314]]
Former-commit-id: c1b945c05c86c82b34cd95220cf0b30459a58dc4 [formerly d0e61c59e8]
Former-commit-id: ac6704c7e9
2013-04-01 12:19:04 -05:00
Steve Harris
4dc4b40b9f 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: d2d9195925 [formerly 3b722f1076] [formerly 74a47b9bd9] [formerly d2d9195925 [formerly 3b722f1076] [formerly 74a47b9bd9] [formerly 14c9de2259 [formerly 74a47b9bd9 [formerly 98ddc22749f0e5cdb0f4f8f0084ee742486461d5]]]]
Former-commit-id: 14c9de2259
Former-commit-id: 12055591ea [formerly f85a1ab9ab] [formerly a4cc33aa9085686f63b90ec8d97f993debdfb35b [formerly a6dd28cc82]]
Former-commit-id: 700a93f7091a2759b6631f6d92c36ed5def40795 [formerly 0fee31b1a8]
Former-commit-id: e74f4ae39e
2013-04-01 12:15:04 -05:00
Lee Venable
ad603c0971 Merge "Issue #1790 Changes for non-blocking StationProfileDlg." into development
Former-commit-id: 35413b2833 [formerly 7d73b8dacf] [formerly fe89cb7fe4] [formerly 35413b2833 [formerly 7d73b8dacf] [formerly fe89cb7fe4] [formerly d3390596f4 [formerly fe89cb7fe4 [formerly fe244abd3f625d7334284d4657bd8f35737e86a5]]]]
Former-commit-id: d3390596f4
Former-commit-id: 1c1b083dbf [formerly 4e95ffe2ae] [formerly 68ab799532cdacaca9c02a6f89555b70848b70ca [formerly 89da26a266]]
Former-commit-id: e0fe5a0651fea3911879ccab45390dea686a6a64 [formerly e0d1017c14]
Former-commit-id: 631444f8fa
2013-04-01 12:06:16 -05:00
Steve Harris
fd3b082c54 13.3.1-17 baseline
Former-commit-id: 1b8e623c9b [formerly f28b85d42f] [formerly 7bf9966dcb] [formerly 1b8e623c9b [formerly f28b85d42f] [formerly 7bf9966dcb] [formerly a3fe998f8f [formerly 7bf9966dcb [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]]]
Former-commit-id: a3fe998f8f
Former-commit-id: a6ff543f88 [formerly ef413da5f7] [formerly 4f7db3036276e18944f4e769d33a7d819e6ace34 [formerly 4afa41d4e7]]
Former-commit-id: aceedb117eb5695a6155a52973b981de9bb6252a [formerly 50becef97f]
Former-commit-id: a112803c98
2013-04-01 12:04:56 -05:00
Steve Harris
b739c58290 13.3.1-16 baseline
Former-commit-id: 712c13a655 [formerly a262f22cee] [formerly 51380726d4] [formerly 712c13a655 [formerly a262f22cee] [formerly 51380726d4] [formerly 3066dd33e5 [formerly 51380726d4 [formerly 18321f88c2efedf141b84e7de18c200e1037f740]]]]
Former-commit-id: 3066dd33e5
Former-commit-id: 994aab5c6a [formerly 6b75202d07] [formerly 4ee75d69123e11d9ab2091fbd33d33a09b414210 [formerly 36a4b3eb51]]
Former-commit-id: 19e2f3972eced86532b7883214738f39cc0c8612 [formerly c53a305b1e]
Former-commit-id: e61c718b49
2013-04-01 11:39:08 -05:00
Mike Duff
d73a468059 Issue #1830 - Don't allow base level config files for FFMP
Change-Id: Ib408e51eda5367a1d66684685935b6163acbbb77

Former-commit-id: eb0a77c8ac [formerly fa8ca827d1] [formerly 261a39122d] [formerly eb0a77c8ac [formerly fa8ca827d1] [formerly 261a39122d] [formerly 9c2ac87482 [formerly 261a39122d [formerly 9ecafb5aacbdb2928902435f342aa4547c2f5903]]]]
Former-commit-id: 9c2ac87482
Former-commit-id: 0f3223b8b9 [formerly e627279d7c] [formerly 40f4ad0f38b194a5fd5090487f0a7c14332e060c [formerly 11ca7c2c20]]
Former-commit-id: 4837b6fc816588eadba7e1dc8793471d71a914aa [formerly 63489a0873]
Former-commit-id: e07f3971c0
2013-04-01 11:36:53 -05:00
Richard Peter
7132200d1c Merge "Issue #1638 Added Auto updating localization file object and added more methods to RecordFactory to make more versatile" into development
Former-commit-id: b921a25faf [formerly 2fa88522ff] [formerly e221223f8a] [formerly b921a25faf [formerly 2fa88522ff] [formerly e221223f8a] [formerly 255617199c [formerly e221223f8a [formerly 6b3523df82d62d75db483baad329cc6d9a2ade13]]]]
Former-commit-id: 255617199c
Former-commit-id: fcbac13167 [formerly 65f317e56b] [formerly 278bd2cb7526a3ad41f96620998122ab2e04cbef [formerly ea4a599a5a]]
Former-commit-id: 2945b0291f595207661a7b4d2aae5bfd1b61f8ec [formerly 58a8049b64]
Former-commit-id: 1b229e3d61
2013-04-01 11:33:59 -05:00
Steve Harris
622caf8d93 13.3.1-15 baseline
Former-commit-id: 70fece2da1 [formerly 4cf3ad6abb] [formerly eb1dab3864] [formerly 70fece2da1 [formerly 4cf3ad6abb] [formerly eb1dab3864] [formerly 3d8ed484be [formerly eb1dab3864 [formerly 369cf4feaee63c96725cb6efc5774b8f6b8cbf08]]]]
Former-commit-id: 3d8ed484be
Former-commit-id: 4df1b4aeae [formerly 2bf790aae3] [formerly 2a3aaa1bdc7787d9eb37d0e30bdab63d5e6f4495 [formerly d3cec5d3cb]]
Former-commit-id: 2638b93048c278492c5ba927b77742ee53322508 [formerly 4204273f21]
Former-commit-id: cc1ef45545
2013-04-01 11:33:20 -05:00
Max Schenkelberg
aeb8a97b02 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: 6c1c9f25d5 [formerly a508e9c8cb] [formerly 321a29ffa4] [formerly 6c1c9f25d5 [formerly a508e9c8cb] [formerly 321a29ffa4] [formerly 51d976e5e2 [formerly 321a29ffa4 [formerly 9eaa57677f77ff919f1a55ee7ad4b44a0613b97a]]]]
Former-commit-id: 51d976e5e2
Former-commit-id: af56d47973 [formerly 8de3a70962] [formerly e3dd868a83e249e4b426fe0bcf89cd02cc3f3360 [formerly 1c35a54a9f]]
Former-commit-id: 62b962b1d377e7f942551913bb5a435bea8c88c7 [formerly 01c2d29c1b]
Former-commit-id: a29eff544b
2013-04-01 10:19:36 -05:00
Lee Venable
f890984a8a Merge "Issue #1790 Changes for non-blocking StationListDlg." into development
Former-commit-id: b100693786 [formerly 7389bf5b29] [formerly 2875600910] [formerly b100693786 [formerly 7389bf5b29] [formerly 2875600910] [formerly 0bfc05ce61 [formerly 2875600910 [formerly 4dad96cbc70936f43a65519eff70ac72c904c9e5]]]]
Former-commit-id: 0bfc05ce61
Former-commit-id: ec82403afa [formerly ebfa8ea79c] [formerly 4e6a76ba3f476fd4e5523e043921ad6ad3166ef7 [formerly 3d683e98a9]]
Former-commit-id: 53437b54152c1d6ef462f859d385b814fbb1d91c [formerly 034e16baa7]
Former-commit-id: 0a5a8d108a
2013-04-01 09:40:59 -05:00
Roger Ferrel
2c4327e525 Issue #1790 Changes for non-blocking StationProfileDlg.
Change-Id: I669c9115dd1bb506acd025a451163aaf664593ef

Former-commit-id: 7551b03bfe [formerly e1b40f9f2f] [formerly 0d269691e2] [formerly 7551b03bfe [formerly e1b40f9f2f] [formerly 0d269691e2] [formerly d21cb5e2e8 [formerly 0d269691e2 [formerly 57eb492610a3cc2974badc6072c2a026f5640b79]]]]
Former-commit-id: d21cb5e2e8
Former-commit-id: b78126a764 [formerly 86e21acae2] [formerly 9aeb83700b132f9f7b7a467ee07c274704d24266 [formerly 944d03615e]]
Former-commit-id: 2077ff02b813a3c47d1b8228805639c942dc10f9 [formerly 9e3bee6562]
Former-commit-id: c95d8692ff
2013-03-29 17:11:02 -05:00
Ben Steffensmeier
b2dae45d7b Issue #1799 fix modal tools again.
Former-commit-id: 0802c4cd3d [formerly cffac354e8] [formerly eeeede7288] [formerly 0802c4cd3d [formerly cffac354e8] [formerly eeeede7288] [formerly 66af8daa11 [formerly eeeede7288 [formerly c1a69f88df85478571394c0e125617c93100168d]]]]
Former-commit-id: 66af8daa11
Former-commit-id: d2fa8b7c0c [formerly 11e6afa5fa] [formerly 788f9b6d4dfdc20ad93f496e50d5d0160cd0daa5 [formerly 7082466303]]
Former-commit-id: 13c2701a9357486bc4d24dc6616b4bbc322bb246 [formerly b3245f7a5d]
Former-commit-id: facdfdc501
2013-03-29 14:30:54 -05:00
Roger Ferrel
1d91e60e60 Issue #1790 Changes for non-blocking StationListDlg.
Change-Id: Ib0cbfd64fca2d4dcbea68b5e0db8b34a5a7af6be

Former-commit-id: 6d83f23cc2 [formerly 281e7f53cb] [formerly c5a95dcb44] [formerly 6d83f23cc2 [formerly 281e7f53cb] [formerly c5a95dcb44] [formerly 6ad80607bc [formerly c5a95dcb44 [formerly 5d68d67451c45d38a962f58c246b2effcd0cc253]]]]
Former-commit-id: 6ad80607bc
Former-commit-id: e536a10191 [formerly ba0060522f] [formerly b9523cc26b55358eb9448f57d15ea5437f8eccc1 [formerly de02460b11]]
Former-commit-id: 72c5c798d9fd121c512349ee0adfe5dc6cfa9bbb [formerly 99ebeac6fd]
Former-commit-id: 3a3e3674a8
2013-03-29 13:46:51 -05:00
Roger Ferrel
55fa68c464 Issue #1790 Last of the bug fixes. Reviewer changes
Change-Id: I451799e34e9621723c9d652f339c880da3aa7caa

Former-commit-id: 9c498726af [formerly 20f6baba0e] [formerly 8f4492c63c] [formerly 9c498726af [formerly 20f6baba0e] [formerly 8f4492c63c] [formerly 463407a40e [formerly 8f4492c63c [formerly 336427570fba81616b8d02f3ed2948042d7dbf41]]]]
Former-commit-id: 463407a40e
Former-commit-id: ecdb29cc1d [formerly 8c1116eaae] [formerly b5cf324e1831cdc6b8016baf3b449a6934efcbe0 [formerly ec5f32aec6]]
Former-commit-id: f9e5b103cc66b19c490c084b0f65e71e9a2704bd [formerly c1ffc82920]
Former-commit-id: 791fbba888
2013-03-29 11:35:08 -05:00
Ron Anderson
6323fb90b1 Issue #1838 Fixed selected time range when Select Grids When Stepping is enabled.
Change-Id: I30417042d568e6471f8a684fab8bcc2387618089

Former-commit-id: d7f0cfe92d [formerly 4ac9a4d9a8] [formerly 0f4fb125b0] [formerly d7f0cfe92d [formerly 4ac9a4d9a8] [formerly 0f4fb125b0] [formerly c7cfcf0250 [formerly 0f4fb125b0 [formerly 3a3f0a47ac33d19259cfc447b0abedd9930e2c64]]]]
Former-commit-id: c7cfcf0250
Former-commit-id: ba064a146a [formerly cd0f319ec5] [formerly b7666888685e677f58fc852f5e79b4f07dcfe700 [formerly 9cfa87f7e5]]
Former-commit-id: 4797511c3c164c1892ecfbe58632bbae5c051a8a [formerly 41b0758084]
Former-commit-id: 8502dee456
2013-03-29 10:48:26 -05:00
Nate Jensen
a000719325 Merge "Issue #1774 Fix D2D accumulative parameter time ranges" into omaha_13.3.1
Former-commit-id: 9d74722ce0 [formerly 3ad797690b] [formerly 214b2ed4ba] [formerly 9d74722ce0 [formerly 3ad797690b] [formerly 214b2ed4ba] [formerly 1bf37125c4 [formerly 214b2ed4ba [formerly d14cbd8b4a99316bbbf015e1392a34f63a1082d6]]]]
Former-commit-id: 1bf37125c4
Former-commit-id: 8092e699e6 [formerly 946323416c] [formerly 30f54582860a05d8d3bdb9a1608610e277dc1958 [formerly 711fbe98d2]]
Former-commit-id: a360b60383d40ac29a22e5ea872d7601bf70222f [formerly a6a81a17d6]
Former-commit-id: 1b1d1a48d2
2013-03-28 17:02:14 -05:00
Ben Steffensmeier
f8747920e5 Issue #1799 fix activation of tools for new perspectives.
Former-commit-id: 6bf1ec8543 [formerly dcbed65681] [formerly 50a276a7e2] [formerly 6bf1ec8543 [formerly dcbed65681] [formerly 50a276a7e2] [formerly 4efa92ff49 [formerly 50a276a7e2 [formerly a4c1e2f9526efa227b246b8dc4df9cb00566def1]]]]
Former-commit-id: 4efa92ff49
Former-commit-id: d7d0ea7264 [formerly 33de9bfc87] [formerly 2aaf804695afe25cc1d0feb84ab77be8addda34b [formerly a415fb17ae]]
Former-commit-id: 006fd150c7d61038086ffa25715d53db4c52c407 [formerly a5e1593213]
Former-commit-id: 788df8fc68
2013-03-28 15:47:36 -05:00
Ron Anderson
80ce55bd3a Issue #1774 Fix D2D accumulative parameter time ranges
Change-Id: I57b32881a30e89c999dae6db7753da83f9e949c1

Former-commit-id: 80bd994f20 [formerly 27e07ce4a9] [formerly 5bb47b7931] [formerly 80bd994f20 [formerly 27e07ce4a9] [formerly 5bb47b7931] [formerly b65ecfc151 [formerly 5bb47b7931 [formerly aee839a85ec68c7eb80ef1e7236af6cb4666372b]]]]
Former-commit-id: b65ecfc151
Former-commit-id: 65dd075089 [formerly 33bcf5fee8] [formerly 8becee59e148ef01f28560b8511322fa50267284 [formerly 3f2fa771d9]]
Former-commit-id: 378adfc06dd24afcb2243ae4d39d879540f2cf23 [formerly 5eb1885dbd]
Former-commit-id: bef17d4f03
2013-03-28 13:37:29 -05:00
Max Schenkelberg
e5b74d9295 Issue #1638 Fix merge error
Change-Id: Id75f4d6372cd77132bad82029cfb176ec4f19712

Former-commit-id: 33352d0e53 [formerly 25202d8534] [formerly 573b441662] [formerly 33352d0e53 [formerly 25202d8534] [formerly 573b441662] [formerly 2b58e3ce3f [formerly 573b441662 [formerly 9c7c89f148adba714839f9ff4fa9bdda10f0edc0]]]]
Former-commit-id: 2b58e3ce3f
Former-commit-id: 0bd1554e20 [formerly abcf4bf569] [formerly 6e4fa7c7c493c3578c067bb8eeff65574ac1665b [formerly c9301b75ea]]
Former-commit-id: cf288f0ac84e55f21c607cccb1dced2766398f21 [formerly 223f946b90]
Former-commit-id: 4253d92576
2013-03-28 10:20:54 -05:00
Lee Venable
63cbc67322 Merge "Issue #1790 Bug fixes for SCAN." into development
Former-commit-id: 87e166d88d [formerly a891171c43] [formerly e7805ded92] [formerly 87e166d88d [formerly a891171c43] [formerly e7805ded92] [formerly 167fa6eadf [formerly e7805ded92 [formerly 657dace6ad43e57bfcb99deb14717ce893bd9710]]]]
Former-commit-id: 167fa6eadf
Former-commit-id: 9b754cf557 [formerly 655f06cb65] [formerly bafa15f4cfb79c82ba6e59d41e92b5a7d5efc1f8 [formerly 772bbe23a7]]
Former-commit-id: e07831e527fb08840c49295685f74234b4b7c302 [formerly adbaebd457]
Former-commit-id: 03fd0004ec
2013-03-28 10:04:34 -05:00
Roger Ferrel
38ff70f9cb Issue #1790 Bug fixes for SCAN.
Change-Id: I5743cd94be6c06808acb0add38d63ea381d13c65

Former-commit-id: 895ac9a39b [formerly 009cd032cb] [formerly 9c560ab626] [formerly 895ac9a39b [formerly 009cd032cb] [formerly 9c560ab626] [formerly e204276c17 [formerly 9c560ab626 [formerly 2bb23a6015638266ed17034777489c9ec6dc1307]]]]
Former-commit-id: e204276c17
Former-commit-id: 57b5bf2d45 [formerly 380846374f] [formerly 14207e5f65d2b40c1876b607562886d07b1c2186 [formerly 216fa1b23b]]
Former-commit-id: 0a4e64e987d64d9c494fbaf73ff76eb4aa2f610d [formerly 3bb55722f5]
Former-commit-id: 18b74a6aa7
2013-03-28 09:16:24 -05:00
Roger Ferrel
f12907e546 Issue #1790 bug fix for GFE dialogs in ticket 1353.
Change-Id: Ibe3361dfcf0361f66eb6d1da3893c309e8fcc612

Former-commit-id: bb33366fc9 [formerly 57fe6b5ca6] [formerly 98d056c3a1] [formerly bb33366fc9 [formerly 57fe6b5ca6] [formerly 98d056c3a1] [formerly 4db9e20fbf [formerly 98d056c3a1 [formerly ee4a6d815bc85f861bb7d77719c5787343625741]]]]
Former-commit-id: 4db9e20fbf
Former-commit-id: 1c3089a826 [formerly a8872882ae] [formerly a281f6a3b00ef8635f1bebf4a15f140bf56982a7 [formerly b95a38db32]]
Former-commit-id: 3653fa1d65c254e87b01eb0cd9f78a703f950e0d [formerly c354469c78]
Former-commit-id: a6337e82dd
2013-03-28 09:04:10 -05:00
Steve Harris
f2a81e18e9 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: 02f49bc2e4 [formerly 069ee8a748] [formerly 9a321b6ac8] [formerly 02f49bc2e4 [formerly 069ee8a748] [formerly 9a321b6ac8] [formerly 3073951b3d [formerly 9a321b6ac8 [formerly d05c9f3a6a4b080b0da71c856f1ba6cd0d6d264e]]]]
Former-commit-id: 3073951b3d
Former-commit-id: b7beed13a5 [formerly 6e48567370] [formerly e4a57946b3b4e9eac62e9d834189b893fff56fad [formerly a4bf236cc7]]
Former-commit-id: 0d9762105b7449280eb42aff17e841196ee5e518 [formerly 90ec2d3fbf]
Former-commit-id: 53ee0151ca
2013-03-27 22:16:15 -05:00
Roger Ferrel
057f05e937 Issue #1790 Bug fix for dialogs in ticket 1578
Change-Id: I472e20ca729d0c4f3510bdd98e5456be47bd2c90

Former-commit-id: 63ab75fec6 [formerly 5bd60ce50c] [formerly a8410499bc] [formerly 63ab75fec6 [formerly 5bd60ce50c] [formerly a8410499bc] [formerly 1129728e03 [formerly a8410499bc [formerly 9bc7fe4c771e534148b446d33de969ef53be3b0d]]]]
Former-commit-id: 1129728e03
Former-commit-id: e920ac0aae [formerly be143656eb] [formerly 9d226e7317e1867a47554f09161c1a8772d04079 [formerly 56ca204764]]
Former-commit-id: 4d5bbeb2cc38cbd8c09412564c65ce84ca101629 [formerly 36219d5090]
Former-commit-id: cee3cd01e6
2013-03-27 21:54:26 -05:00
Steve Harris
cdad316568 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: bb88c2133a [formerly 979d6a5d8c] [formerly 2a0e399dc8] [formerly bb88c2133a [formerly 979d6a5d8c] [formerly 2a0e399dc8] [formerly d997aeaee4 [formerly 2a0e399dc8 [formerly 6f42195bd8f6087fb8bb55232082c0ec5f867e12]]]]
Former-commit-id: d997aeaee4
Former-commit-id: 3f99eed860 [formerly 428ec8a472] [formerly d995dd5e3b86e69398a1b22b4ea692658d3dcec9 [formerly e67b16bb03]]
Former-commit-id: 81096335a88ae0f8d272c7ae379aa77289f918fa [formerly f3a84e952e]
Former-commit-id: 21332cb0b5
2013-03-27 18:21:05 -05:00
Steve Harris
43942dad11 13.3.1-14 baseline
Former-commit-id: f9b3430485 [formerly 91a5e4578e] [formerly 9022c500ce] [formerly f9b3430485 [formerly 91a5e4578e] [formerly 9022c500ce] [formerly 9fba973fd0 [formerly 9022c500ce [formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]]]]
Former-commit-id: 9fba973fd0
Former-commit-id: 3cbf22bd96 [formerly 936e4adda2] [formerly 38d1148d2eae21bb316bf579672305ceffd84c1c [formerly 2ca160caf0]]
Former-commit-id: 8c6b23e522a402fa4cd1e6df150e646e4689e3b0 [formerly 8237fdadaa]
Former-commit-id: f59f1f02b0
2013-03-27 17:59:34 -05:00
Roger Ferrel
2f6183f158 Issue #1790 Bug fixes for ticket 1353.
Change-Id: I36b74546b7f73c669d65a5588e813173ccbd18fc

Former-commit-id: 7a4d48d489 [formerly 9b527de11a] [formerly 04b57a8582] [formerly 7a4d48d489 [formerly 9b527de11a] [formerly 04b57a8582] [formerly 391ce5687b [formerly 04b57a8582 [formerly e0c3e3b81f679985a048047b3e5aa69992577d78]]]]
Former-commit-id: 391ce5687b
Former-commit-id: 9e1fd195e3 [formerly c9d9b3b277] [formerly d61178e812fe7ec24f484b7229ff2ecd243afc21 [formerly 726b5de0c5]]
Former-commit-id: ec38ab4571cb3089197719610f8106f99ca7f2f9 [formerly 1b74b2d4a4]
Former-commit-id: 9b7ba22770
2013-03-27 16:56:17 -05:00
Dustin Johnson
e01c368285 Issue #1827 Create registry/datadelivery client features
Amend: Add event plugins and their dependencies to client features

Change-Id: Ib80522161740857d4332b84bbedad10e19683602

Former-commit-id: 5dbff646aa [formerly fbcfdd0ca1] [formerly 52c27ec57f] [formerly 5dbff646aa [formerly fbcfdd0ca1] [formerly 52c27ec57f] [formerly 1684507bdb [formerly 52c27ec57f [formerly 0011ef9ba9d014decf30acc2913fa535562d0de2]]]]
Former-commit-id: 1684507bdb
Former-commit-id: 49c53e5443 [formerly 2591041c9d] [formerly 9858dbcf0e7632be9b6d9beae6fc5e2f1573062d [formerly f27ebfbc1b]]
Former-commit-id: 9f863145bc53a4b320485d6a4c216ac1f5122e9a [formerly c5685dbe9f]
Former-commit-id: 198fb2b6ae
2013-03-27 15:38:36 -05:00