Commit graph

4618 commits

Author SHA1 Message Date
Ron Anderson
c8b6ebe6b7 Merge "Issue #2508 Restore DiscreteGridSlice.setKey method used by iscMosaic." into omaha_14.2.1
Former-commit-id: dacdddf403 [formerly 90a2c83c8e] [formerly a0bf6fca16358f2235321a92e632ecb22c4e2a7d [formerly b8a33ecdf8]] [formerly dacdddf403 [formerly 90a2c83c8e] [formerly a0bf6fca16358f2235321a92e632ecb22c4e2a7d [formerly b8a33ecdf8]] [formerly 41b081307c [formerly b8a33ecdf8 [formerly dded4c12d27baede94b789d288d6bcb39e777f9f]]]]
Former-commit-id: 41b081307c
Former-commit-id: ab5ab0ebe3 [formerly 76965c12dd] [formerly 093ac09bf206a0017a0e5d3a730bba837dde43a2 [formerly a35a46de1b]]
Former-commit-id: 16a2e7222e29e0178338f5cb73fe6601bca6611a [formerly 680d3eeac7]
Former-commit-id: 6202a41148
2014-01-10 13:29:59 -06:00
Ron Anderson
20ca294505 Issue #2508 Restore DiscreteGridSlice.setKey method used by iscMosaic.
Change-Id: I503cf82ce896e8cdf39c238eda0f31453d8510a5

Former-commit-id: 4e479cf9bd [formerly 17ed8a6e75] [formerly 3017260991] [formerly 4e479cf9bd [formerly 17ed8a6e75] [formerly 3017260991] [formerly d80ce4a19e [formerly 3017260991 [formerly 142f68c426c4e2fbeb1e0b97cbb7b47c38e3b90d]]]]
Former-commit-id: d80ce4a19e
Former-commit-id: 7b369af525 [formerly d70701cc6e] [formerly aa04179c7e3f5387a4ead15786aaad0bb4f86872 [formerly 57d3503ed6]]
Former-commit-id: a2375dc72af403acc329b020bfe7940ad5ac4fe3 [formerly 4d9a0da7d6]
Former-commit-id: 42da1cc555
2014-01-10 13:17:44 -06:00
Mike Duff
ad46fbe905 Issue #2684 - BandwidthUtil bean now depends on registerDataDeliveryHandlers bean
Change-Id: I6f491e7e14e445b59e93f5896eedde3062246034

Former-commit-id: 696003d463 [formerly 26e34bb4d1] [formerly b50ea7b162] [formerly 696003d463 [formerly 26e34bb4d1] [formerly b50ea7b162] [formerly 744d7367dc [formerly b50ea7b162 [formerly 12500574ade0eced65454ff981b83f8f729cd125]]]]
Former-commit-id: 744d7367dc
Former-commit-id: 6440aa8375 [formerly 3274c591bf] [formerly bbcc98303dcc89e98466e092b86268e5c8a053c9 [formerly 0e5332e8cd]]
Former-commit-id: 33bf17f1fd1ffd937bbb693a2081cf16c68bcf78 [formerly d3557c33d0]
Former-commit-id: b471106692
2014-01-10 12:14:27 -06:00
Mike Duff
6467415631 Issue #2452 - Add label stating all lat/lons will be converted to easting.
Former-commit-id: 2e6173b619 [formerly 67f6311354] [formerly 69ca0dd0d2] [formerly 2e6173b619 [formerly 67f6311354] [formerly 69ca0dd0d2] [formerly 7081c26823 [formerly 69ca0dd0d2 [formerly 84bff804bc089aefcf126a586539eab590e1d04a]]]]
Former-commit-id: 7081c26823
Former-commit-id: c8885b34f1 [formerly b616f34af2] [formerly e5367b16239e543229d0aace6c8f70b5970faf5e [formerly 17d19cc0bb]]
Former-commit-id: 27bd74b3d39111665cada21d7ce2034177a0ed3b [formerly c1e3dd57b6]
Former-commit-id: 0823eab3bf
2014-01-10 12:05:30 -06:00
Nate Jensen
41ed85a88d Merge "Issue #2647 Fix window focus problems." into development
Former-commit-id: ad445b75d8 [formerly 95181d092e] [formerly 5e1dfbf0f8] [formerly ad445b75d8 [formerly 95181d092e] [formerly 5e1dfbf0f8] [formerly 2a06693b3e [formerly 5e1dfbf0f8 [formerly 3d586d2e95877c79bdaa88080d920ce12c1dd5c4]]]]
Former-commit-id: 2a06693b3e
Former-commit-id: fa5ed0fd00 [formerly d41877f6fe] [formerly 03520500b72bdf17a7494ab141345e3c52581f59 [formerly 7ad41f6958]]
Former-commit-id: 9f06f69a257f24e8fcdb2d74191400520bc8cb07 [formerly 38c95850f0]
Former-commit-id: 900f5a8b3b
2014-01-10 11:14:53 -06:00
Mike Duff
fa2d6a608f Issue #2642 - Update header comment
Former-commit-id: b70c96297f [formerly 5d669a97af] [formerly 101d9939d6] [formerly b70c96297f [formerly 5d669a97af] [formerly 101d9939d6] [formerly 28114764a5 [formerly 101d9939d6 [formerly 389426adddf3a78d9859f704ecc2241e453b5dc2]]]]
Former-commit-id: 28114764a5
Former-commit-id: 5f19ccc46e [formerly 12c47ea375] [formerly 32bb19308f502de6a22ca9009876c463c872be8c [formerly 7d25b33cb6]]
Former-commit-id: a84c6000a796403c7b1ca87aa3d889b74de0ab97 [formerly 2906b0bed2]
Former-commit-id: ca2667855c
2014-01-10 10:57:18 -06:00
Mike Duff
a35c24280c Issue #2636 - change log statements, add missing copyright headers
Former-commit-id: 8fe7d83f6f [formerly 8993103c45] [formerly 12a8618c42] [formerly 8fe7d83f6f [formerly 8993103c45] [formerly 12a8618c42] [formerly 3be3a8ac0d [formerly 12a8618c42 [formerly 8bf5a8185c09e9d368afc8e8e7409222164159aa]]]]
Former-commit-id: 3be3a8ac0d
Former-commit-id: ae88e49e26 [formerly ea07460e3e] [formerly 7b4e8fc0dd59dffc07172aea3397179483206f25 [formerly e121eb5dbd]]
Former-commit-id: 510296653b6e3a1f298a2c560e342f6652c2854b [formerly 9c4eaabf29]
Former-commit-id: cdd2e23eb6
2014-01-10 10:55:17 -06:00
Max Schenkelberg
5a32d83d62 Issue #2620 Reordered developer feature.xml to match p2-build.xml
Change-Id: I15a073d17b1e6df21c9c34245b373bc091cc5e67

Former-commit-id: a3495d01dc [formerly 13172879fd] [formerly ae7eb39380] [formerly a3495d01dc [formerly 13172879fd] [formerly ae7eb39380] [formerly 73c022da20 [formerly ae7eb39380 [formerly ea87ef4868b35b4fa89d519478ade9fb9468cca8]]]]
Former-commit-id: 73c022da20
Former-commit-id: 6fa1f6cc12 [formerly 59586b673b] [formerly 5235d6c097888869951204c434aba9265b112a4a [formerly 8abc1ec611]]
Former-commit-id: 5724d8b4dac3d86c43f19041a75769997c3ccfee [formerly 20ba02a238]
Former-commit-id: 38d14b6ad6
2014-01-10 10:39:07 -06:00
Nate Jensen
bc47adab47 Merge "Issue #1998 fixed NPE in PointDataPluginDao" into development
Former-commit-id: 94c3370833 [formerly 41a20fbd00] [formerly 21114964fa] [formerly 94c3370833 [formerly 41a20fbd00] [formerly 21114964fa] [formerly 32909203d0 [formerly 21114964fa [formerly a04a5427256f18725d85da15497d9637419c885c]]]]
Former-commit-id: 32909203d0
Former-commit-id: 1139a316ae [formerly 9e696b1257] [formerly eaaa27b717eeb61eb62f9c1341817fd9cb2b495e [formerly 30d01ec8ba]]
Former-commit-id: accb603209a04cece6091434f28e6b8a4d491dd7 [formerly 4ea65f0904]
Former-commit-id: aa413ac32b
2014-01-10 08:58:03 -06:00
Nate Jensen
4666b3e47d Issue #2359 log exceptions in FFTI processing
Change-Id: Iec1c743352187de071f4b9840f1672bff531ba94

Former-commit-id: 8a469f686a [formerly 1d9229a4a6] [formerly d289eb1b55] [formerly 8a469f686a [formerly 1d9229a4a6] [formerly d289eb1b55] [formerly 43b75928e4 [formerly d289eb1b55 [formerly 2abd0cc65b6fe98dc95e11b5b8d53a325c0f2074]]]]
Former-commit-id: 43b75928e4
Former-commit-id: e63bac199d [formerly 8b5ce7c07f] [formerly 46539e0877f8c37fe79c6bcc26836d7cf6855c9f [formerly daba59930d]]
Former-commit-id: 7e71d36c0c30ea5c1a3013d9a50a772ab4b10afb [formerly a7695279fa]
Former-commit-id: 2b0c48b808
2014-01-10 08:57:18 -06:00
Richard Peter
b96f5d0716 Merge "Issue #2642 - Make shared sub deletions remove the site from the list" into omaha_14.2.1
Former-commit-id: 102bbe3e15 [formerly b37d6e9c91] [formerly 8ca1217f03] [formerly 102bbe3e15 [formerly b37d6e9c91] [formerly 8ca1217f03] [formerly 52850fe95a [formerly 8ca1217f03 [formerly f5e5e1e66bf7264408e31b95ebf73d083b3cff0f]]]]
Former-commit-id: 52850fe95a
Former-commit-id: a25ad86347 [formerly b833c4333c] [formerly 766dc3d39c99f73f010de1c29095aef2b852645e [formerly 690f1b15dd]]
Former-commit-id: eb0676b7f5eb5f662c1df67b863f2502f758d1d2 [formerly fd7fde3cdf]
Former-commit-id: e60037e842
2014-01-09 16:58:39 -06:00
Richard Peter
879b03289c Merge "Issue #2636 - Fix data set availability offset. Now uses average offset of last 10 data set matches" into omaha_14.2.1
Former-commit-id: 6227cb9e3c [formerly c32d55f3fc] [formerly 36ed029f0a] [formerly 6227cb9e3c [formerly c32d55f3fc] [formerly 36ed029f0a] [formerly 0f3175bd77 [formerly 36ed029f0a [formerly b53137d1af67ff95a91b4bf4d2aa78ef4c43b80a]]]]
Former-commit-id: 0f3175bd77
Former-commit-id: 5cf3d3349c [formerly 78313bec85] [formerly 3d87934664370f4c41ebd107b46989b9bcbb1cff [formerly c95d310568]]
Former-commit-id: dce4c8cb77cfb15fd2b8139647ed9eef8a15fe1b [formerly d0986773fc]
Former-commit-id: 2f7e16023f
2014-01-09 16:58:31 -06:00
Richard Peter
8d42e74a87 Merge "Issue #2633 - Keep graph data visible while resizing. Keep bottom of graph visible." into omaha_14.2.1
Former-commit-id: a39f2bff20 [formerly 0bd52b65e7] [formerly b711c35c68] [formerly a39f2bff20 [formerly 0bd52b65e7] [formerly b711c35c68] [formerly f45a281935 [formerly b711c35c68 [formerly 8f3f97302417e256cd110feb4ed56ca366cb1db8]]]]
Former-commit-id: f45a281935
Former-commit-id: a2eef48cfb [formerly f4108b8be2] [formerly 8e88f0da68170bd6d7f37b03b43ebe72c7b0e3e4 [formerly 0459cd237e]]
Former-commit-id: 98a72493ef8349f29fdc28306a758f45155b90c1 [formerly 5bb2869ca4]
Former-commit-id: 255358f37a
2014-01-09 16:53:52 -06:00
Ben Steffensmeier
6ecac17224 Issue #2647 Fix window focus problems.
Former-commit-id: eebab1d33f [formerly 13da8899de] [formerly 2b9e9a41db] [formerly eebab1d33f [formerly 13da8899de] [formerly 2b9e9a41db] [formerly 488d5e45b1 [formerly 2b9e9a41db [formerly 4b0053b20060ead87b34895ee7d03a4b6317c8fc]]]]
Former-commit-id: 488d5e45b1
Former-commit-id: 05ebc3eece [formerly 1aa018e5b7] [formerly 7b56714a7309f567fe16d1c7a70ee9741297c5dc [formerly 0ada0c6d3f]]
Former-commit-id: 42bc099c9fb87b30553f56de2a8b6d43a953df1f [formerly 403ba78a15]
Former-commit-id: 4bc9ead269
2014-01-09 15:14:38 -06:00
Brian Clements
a9b355cfa8 Issue #1998 fixed NPE in PointDataPluginDao
StorageStatus was not being checked after operation


Former-commit-id: 9686c8fab1 [formerly f0c1b109f8] [formerly 401cd813f1] [formerly 9686c8fab1 [formerly f0c1b109f8] [formerly 401cd813f1] [formerly 1e6ae5a98e [formerly 401cd813f1 [formerly 82736d581767831f426a17b0ee9d264fdda7dd64]]]]
Former-commit-id: 1e6ae5a98e
Former-commit-id: 7d7ce21036 [formerly 6baf80fc5c] [formerly 94475c71324a05087908449a3190bdfa39879b6a [formerly 25765f2fb6]]
Former-commit-id: 0ee84fa81037d604d46cfc60d0b1e8e51ec86628 [formerly 7d4cfb14a5]
Former-commit-id: ea9296958c
2014-01-09 14:02:52 -06:00
Nate Jensen
77d35fafea Merge "Issue #2563 added user server add/remove functionality" into development
Former-commit-id: c2a2a657bf [formerly f7adb31fc5] [formerly 7d0fc33055] [formerly c2a2a657bf [formerly f7adb31fc5] [formerly 7d0fc33055] [formerly 6fdf4361f8 [formerly 7d0fc33055 [formerly f343c7bc294f4c89c4ac75630910f153e61d24a3]]]]
Former-commit-id: 6fdf4361f8
Former-commit-id: 7b17f4eabf [formerly aeffb73883] [formerly 9b4895ed93f0a2ae2e0b94f8d502c98a45ed7a60 [formerly 0351c26443]]
Former-commit-id: a66d0ecb457188c762d5af08b34e4e49fd876923 [formerly 9103dabf43]
Former-commit-id: 0b507a19c9
2014-01-09 13:44:24 -06:00
Brian Clements
1b96c01c0c Issue #2563 added user server add/remove functionality
now persists user entered servers to localization


Former-commit-id: 7279fbf6b3 [formerly af9292ea71] [formerly 487aa58778] [formerly 7279fbf6b3 [formerly af9292ea71] [formerly 487aa58778] [formerly c8cfc788f3 [formerly 487aa58778 [formerly 43fc94e9cc2a7f518971d509478f3b9a65588d19]]]]
Former-commit-id: c8cfc788f3
Former-commit-id: 9a28a4e067 [formerly a8f746f794] [formerly a779f96749690d34c737ced63e146304783cc395 [formerly 0c5b0eaf69]]
Former-commit-id: 1c604ef7f5b72be730f7448d407a893d4435dfd3 [formerly 30521ee989]
Former-commit-id: 542e01f322
2014-01-09 13:19:59 -06:00
Mike Duff
feea2738ac Issue #2633 - Keep graph data visible while resizing. Keep bottom of graph visible.
Former-commit-id: 41ac6a70dd [formerly e4f56affd3] [formerly 16a8f16ee4] [formerly 41ac6a70dd [formerly e4f56affd3] [formerly 16a8f16ee4] [formerly 9b5adfaba2 [formerly 16a8f16ee4 [formerly 87dd0df07a9ef0e7881ed0cf7b8aa1d41f0c9d4d]]]]
Former-commit-id: 9b5adfaba2
Former-commit-id: 2a94a50ec8 [formerly d2f74b6238] [formerly c5a413c1f93f4b03121d44e01630e558a6904c48 [formerly 7a1712acd6]]
Former-commit-id: 7a3ca1247d56bf009f61686163125965713717c9 [formerly 698a84e1f3]
Former-commit-id: 04646a9a21
2014-01-09 13:02:08 -06:00
Max Schenkelberg
e918a53546 Issue #2680 Fixed various OpenGL errors
Change-Id: I7ed70adcb1591a9feb66a4fe80c3249f2e6b339b

Former-commit-id: 037cd48c62 [formerly 5d488d27b9] [formerly 83c600ada9] [formerly 037cd48c62 [formerly 5d488d27b9] [formerly 83c600ada9] [formerly f4765d1577 [formerly 83c600ada9 [formerly 59d4c2b9965a7c208863af8f5a3ba4145ea2bbf4]]]]
Former-commit-id: f4765d1577
Former-commit-id: 4085a38f94 [formerly f10dcc6de3] [formerly 078c53e38b0dfbb2d2f1efc3df9341d3b037960b [formerly e4de3defec]]
Former-commit-id: a7b635dbc584f3014ee3ba8b11f21732cdc1de6b [formerly 645bb6981e]
Former-commit-id: 2e9ff4982a
2014-01-09 11:26:19 -06:00
Mike Duff
f5d13adc34 Issue #2636 - Fix data set availability offset. Now uses average offset of last 10 data set matches
Former-commit-id: 99d7e51456 [formerly 30b65a4fe7] [formerly 183ca614df] [formerly 99d7e51456 [formerly 30b65a4fe7] [formerly 183ca614df] [formerly a264cb06a1 [formerly 183ca614df [formerly b841e795f2a18bf902ec373c9f79b191db177fde]]]]
Former-commit-id: a264cb06a1
Former-commit-id: f6d58f7615 [formerly 05b6508299] [formerly 1723170c25ee5bf976e58a1096d080a768d79925 [formerly 4620b69f08]]
Former-commit-id: eda2ee87762a8696e1f7816588a6c03614038065 [formerly 4bd12c488b]
Former-commit-id: 621bbe5ce6
2014-01-09 10:29:21 -06:00
Mike Duff
8325995f25 Issue #2643 - Fixed the mouse checking on DD maps
Former-commit-id: 3d962a5425 [formerly 7b8964d9b2] [formerly 4fe2dc76af] [formerly 3d962a5425 [formerly 7b8964d9b2] [formerly 4fe2dc76af] [formerly 56499a77c3 [formerly 4fe2dc76af [formerly 775e99924e098387e4ca5042823ef20d1a0d2afe]]]]
Former-commit-id: 56499a77c3
Former-commit-id: ff76fa081c [formerly 1c3b700563] [formerly 276825c6d8c7a85fe6b1be0854404a47fc47b5c8 [formerly 09c5f29395]]
Former-commit-id: 00712e3b935d928b948d234a7ffef8fa226648bf [formerly 94848592d1]
Former-commit-id: 901838b7d3
2014-01-09 10:18:34 -06:00
Mike Duff
f0a3521e6f Issue #2642 - Make shared sub deletions remove the site from the list
Former-commit-id: 7720852347 [formerly 0cb61d4d50] [formerly 6cff7aaf0c] [formerly 7720852347 [formerly 0cb61d4d50] [formerly 6cff7aaf0c] [formerly 4e6b4eaa4c [formerly 6cff7aaf0c [formerly a8f57c338a8a06c6d40842f56c329fd9f215bc5b]]]]
Former-commit-id: 4e6b4eaa4c
Former-commit-id: 1c60e6e7cc [formerly 0e081e8ee2] [formerly 87757eade8f87fee23058c260317eed10f66609c [formerly fdef5e97e2]]
Former-commit-id: c4188f5b4fa1a7fc6a8f16891654de02ee97ed09 [formerly 49dc635963]
Former-commit-id: 194a348ce2
2014-01-09 10:15:48 -06:00
Ben Steffensmeier
d45cad301f Issue #2648 Hprof analysis utility.
Change-Id: Ib450c48a88e8a485a2461e1f4a5c81e1be4fee68

Former-commit-id: b64ac87d9c [formerly 51a7dfb438] [formerly de58f318cb] [formerly b64ac87d9c [formerly 51a7dfb438] [formerly de58f318cb] [formerly 30ac7d37a5 [formerly de58f318cb [formerly 1bfc1a31ed9052795e1ab0e83cd4bede3eb8e17c]]]]
Former-commit-id: 30ac7d37a5
Former-commit-id: ecaea29201 [formerly 76561f48b8] [formerly 4a73f7b07a78c95dd7db67c94ba1568ce519628c [formerly 3f7a5c135f]]
Former-commit-id: 2bcc199e67893e47e8ed4a8cd5de59e326b93bf2 [formerly 00ed5a277c]
Former-commit-id: 909594029e
2014-01-08 16:47:03 -06:00
Ron Anderson
a757289909 Merge "Issue #2657: Update convertCDL2XML for unified grid." into omaha_14.2.1
Former-commit-id: 5d56dfe4f5 [formerly be370fe7d6] [formerly 6febe84651] [formerly 5d56dfe4f5 [formerly be370fe7d6] [formerly 6febe84651] [formerly ad824dcf9f [formerly 6febe84651 [formerly 7fcc9e660049074c4c1e6a918d371182b40278ba]]]]
Former-commit-id: ad824dcf9f
Former-commit-id: b37209e9f5 [formerly dd2e82a135] [formerly d21b6ac36f41e5c6e6bfcb3175698aad829f2392 [formerly 7163de49e5]]
Former-commit-id: acdb2ea79d519637bf1aa5d77e3ed224de6417e8 [formerly 1051e2c319]
Former-commit-id: 21b1bde826
2014-01-08 15:02:26 -06:00
Richard Peter
390956ea32 Merge "Issue #2645 Prevent the recurring time in SubscriptionNotifyTask from being killed by an exception thrown from run. Fix issue where the InMemoryBandwidthBucketAllocationAssociator was not updating the in memory allocation when the db value status was updated. Added RegistryBandwidthRecord to the list of classes to init by HibernateBandwidthDbInit. Updates to hibernate.cfg.xml for Richard." into omaha_14.2.1
Former-commit-id: e0388d76cf [formerly b0479dfdc6] [formerly 5f65479ba1] [formerly e0388d76cf [formerly b0479dfdc6] [formerly 5f65479ba1] [formerly 5fa03e7352 [formerly 5f65479ba1 [formerly 3cd86c518839710768c9a0552749fa96f936f2c4]]]]
Former-commit-id: 5fa03e7352
Former-commit-id: a1121ab34b [formerly f06b4aba13] [formerly c7dcc03215c8979da68de0120dfaad26214e39c3 [formerly 029bbb8fc2]]
Former-commit-id: f2fc6eb2a1651ddb8bc8f9d7b0f2ef50b213fce6 [formerly fd686e509f]
Former-commit-id: ca7c3e1c72
2014-01-08 14:30:38 -06:00
Nate Jensen
4e1482da48 Merge "Issue #2359 change some log statements to debug" into omaha_14.2.1
Former-commit-id: fc3a61518d [formerly 6585b79144] [formerly 415c5f224a] [formerly fc3a61518d [formerly 6585b79144] [formerly 415c5f224a] [formerly 9a5630f5bb [formerly 415c5f224a [formerly b226f3ebfd3932d51d38982ae5c13364aaec2f5b]]]]
Former-commit-id: 9a5630f5bb
Former-commit-id: a8b46a337f [formerly 7dcae0a1be] [formerly 496fb0eb9e6f5c0a409f8534dd512391066ea75f [formerly 56d932ee56]]
Former-commit-id: 158aaac673650fd441a81550c984cb0165dc4290 [formerly 9b23de6c3e]
Former-commit-id: f620f0ca02
2014-01-08 13:56:54 -06:00
Brad Gonzales
8fd73a5cd9 Issue #2645 Prevent the recurring time in SubscriptionNotifyTask from being killed by an exception
thrown from run.  Fix issue where the InMemoryBandwidthBucketAllocationAssociator was not updating the in memory allocation
when the db value status was updated.  Added RegistryBandwidthRecord to the list of classes to init by HibernateBandwidthDbInit.
Updates to hibernate.cfg.xml for Richard.

Change-Id: I0eb7b0a34e48f6b8db8065dee45966c48ef38617

Former-commit-id: c05358aac5 [formerly 02910c2a8c] [formerly 07a4420596] [formerly c05358aac5 [formerly 02910c2a8c] [formerly 07a4420596] [formerly 12860c79f9 [formerly 07a4420596 [formerly e0dbe59a7dc418e3b8ed62396b6ef2047b5990fd]]]]
Former-commit-id: 12860c79f9
Former-commit-id: ad3da98af6 [formerly 5c85734e02] [formerly 53dd09e9f01677738d8bb7bceaf559f45f59115c [formerly be6f12e9c2]]
Former-commit-id: d63be2574bfe21dc4708216b7f896c519c9d925a [formerly a1ee60d16d]
Former-commit-id: 44cff7514d
2014-01-08 13:37:17 -06:00
Nate Jensen
ee1dd66aa2 Merge "Issue #2581 fix yet another LSR decoding error" into omaha_14.2.1
Former-commit-id: 136cfae0a5 [formerly 5bd0aa68d9] [formerly ee3c118cb0] [formerly 136cfae0a5 [formerly 5bd0aa68d9] [formerly ee3c118cb0] [formerly ce24723a68 [formerly ee3c118cb0 [formerly b025f9ff3b1ecbe485418b3d19312777f5af8775]]]]
Former-commit-id: ce24723a68
Former-commit-id: 5168eefb50 [formerly b273eb58a6] [formerly 85e94dd1992438356a7a3f1afa2711bb313caf35 [formerly f47773c451]]
Former-commit-id: a770dc0e208418ed0bd6d24b9def793bbde3476a [formerly 56c4a7db11]
Former-commit-id: ddcd8662b3
2014-01-08 11:30:05 -06:00
David Gillingham
b6a9cb9f11 Issue #2657: Update convertCDL2XML for unified grid.
Former-commit-id: 4925478a0b [formerly 476fcb7980] [formerly ed22a86d9f] [formerly 4925478a0b [formerly 476fcb7980] [formerly ed22a86d9f] [formerly d6397522c4 [formerly ed22a86d9f [formerly 247536f4d83c7f7de449707916d2950ae74be551]]]]
Former-commit-id: d6397522c4
Former-commit-id: 0012cf9134 [formerly 3e0ef451a1] [formerly cf78b85e4b8682c0ad54f461f0024241114e38bb [formerly 777c1fba86]]
Former-commit-id: 3b4330ae142c0e8e18d2b013d5349ee7feaa4bb1 [formerly c7085fe52b]
Former-commit-id: cab591d385
2014-01-08 11:02:30 -06:00
Nate Jensen
aedd8494aa Issue #2581 fix yet another LSR decoding error
Change-Id: I74e6d8c3d5c6bf71ebbc3fe32ea93ea688c6bcb5

Former-commit-id: df3778f7c6 [formerly 79c9792148] [formerly 3ac67a743f] [formerly df3778f7c6 [formerly 79c9792148] [formerly 3ac67a743f] [formerly 968e51040d [formerly 3ac67a743f [formerly 3f2c97439a1dbbbc94285343b3b558dead63a0f6]]]]
Former-commit-id: 968e51040d
Former-commit-id: 945671fdc4 [formerly 59fc27dafb] [formerly 171f2bf5c41ccd55e091d92fc423bb389db59ba0 [formerly 79836008d7]]
Former-commit-id: 3ecc4b1d72122cacc54f96165238d4c07cad507d [formerly 1a5e8b9307]
Former-commit-id: 158cc6f460
2014-01-08 08:56:02 -06:00
Ron Anderson
a26c79995f Issue #2509 Fix merge error in iscMosaic (fix indentation)
Change-Id: I1745af1a51d6fffe221168cc8dca217d2f309007

Former-commit-id: 167ef0a302 [formerly b0fa3c6514] [formerly 4da9799eaf] [formerly 167ef0a302 [formerly b0fa3c6514] [formerly 4da9799eaf] [formerly 82d3277785 [formerly 4da9799eaf [formerly 94c97fee9c6925ac9e73530bd18ec03d8cab4a40]]]]
Former-commit-id: 82d3277785
Former-commit-id: 9aae54c713 [formerly 89c27cc683] [formerly 400aac7d966ddfd5fb28ad35617d4abd86685c39 [formerly 4fe580f47b]]
Former-commit-id: afde3205f025f1a1bc084329669b6e1b977e033a [formerly 93c933e2c7]
Former-commit-id: 6305678357
2014-01-08 08:49:32 -06:00
Nate Jensen
7edae2f8de Issue #2359 change some log statements to debug
Change-Id: Ie549917b36268d3f5983f3946701418e7e3b5163

Former-commit-id: 77a8e7f321 [formerly b3d6ba3bc9] [formerly bfa6c60c66] [formerly 77a8e7f321 [formerly b3d6ba3bc9] [formerly bfa6c60c66] [formerly cb52747de2 [formerly bfa6c60c66 [formerly 146a9cca0ffa68f44068c620a3fa693c46db9031]]]]
Former-commit-id: cb52747de2
Former-commit-id: 8356b85925 [formerly d477169f0d] [formerly 66c48114fb9f6bf3d321abdbd200ebd96ea88c1c [formerly ded9b32ea1]]
Former-commit-id: 8e63f903e176e86dc8ff558619b44224fabd36eb [formerly cd925bd18e]
Former-commit-id: 4a41349f77
2014-01-07 17:53:43 -06:00
Richard Peter
78da87452a Merge "Issue #2658 Changes to ACARSPersistObs to ignore cutoff time when allowing archive." into omaha_14.2.1
Former-commit-id: 1172e81e6b [formerly 0a16411de4] [formerly 9c0d63d841] [formerly 1172e81e6b [formerly 0a16411de4] [formerly 9c0d63d841] [formerly 97bde8138d [formerly 9c0d63d841 [formerly e6b1f12dd3a36b76e60d0e90941f94948022813a]]]]
Former-commit-id: 97bde8138d
Former-commit-id: 58f8909add [formerly 4bebf53fda] [formerly a00e1d1aa39cae3b5045f2790d4e5adb9b27eb8c [formerly b899a0591f]]
Former-commit-id: a8cb716d79784793a984747b36ec08ecc2db3db8 [formerly 37c70671aa]
Former-commit-id: c65e803be9
2014-01-07 15:40:04 -06:00
Roger Ferrel
2b9bcfed5d Issue #2658 Changes to ACARSPersistObs to ignore cutoff time when allowing archive.
Change-Id: I63d6f21ca9fe35b806b321677382460c762c4907

Former-commit-id: 009dfef718 [formerly b49329067a] [formerly 4102c38bc6] [formerly 009dfef718 [formerly b49329067a] [formerly 4102c38bc6] [formerly 3528dc0eb0 [formerly 4102c38bc6 [formerly fb4e61235f1bf65a4b3337514277dcbca2d82f8d]]]]
Former-commit-id: 3528dc0eb0
Former-commit-id: fa58e987d3 [formerly 0e559a5a66] [formerly 61073c6a17a58ea7802e97eaf58765a320412205 [formerly 44af3ecf0a]]
Former-commit-id: de517672a2f64b2f06707f556e543883378fcfea [formerly 82e28cc2e9]
Former-commit-id: fd2a277cb0
2014-01-07 14:54:41 -06:00
Nate Jensen
bf9e58c6ea Merge "Issue #2563 fixed room id creation" into development
Former-commit-id: 701efd5de9 [formerly 537dc6c8cc] [formerly cbad156c05] [formerly 701efd5de9 [formerly 537dc6c8cc] [formerly cbad156c05] [formerly a8e9db0dde [formerly cbad156c05 [formerly a5d7f0a46a5304defe6ebde0b73418c0da168437]]]]
Former-commit-id: a8e9db0dde
Former-commit-id: 02a60c86ff [formerly 432a89c0fc] [formerly 1b9b5174b8f31578073feb91a2f11b6ec67ff985 [formerly 5beb950218]]
Former-commit-id: 1a26549f50f0eeaa529e2a9fcd041f74f6fdaecc [formerly 93e15999b3]
Former-commit-id: cf5ca32b8a
2014-01-07 13:50:41 -06:00
Nate Jensen
a0384c5858 Issue #2359 minor request JVM startup safety
Change-Id: I17a5f3217ac5a2f2d53660bdb45a6009c8f27004

Former-commit-id: 13ec91c615 [formerly 459771f66d] [formerly 24560cf307] [formerly 13ec91c615 [formerly 459771f66d] [formerly 24560cf307] [formerly f83a473653 [formerly 24560cf307 [formerly 3916523cd702e367a6d66743b0517872475a0c36]]]]
Former-commit-id: f83a473653
Former-commit-id: 60cad7b8c0 [formerly f1e731e857] [formerly e65449cb58c98692037c345dad76b1e4316ed7ad [formerly ccfb2504cb]]
Former-commit-id: 90fde4d40450347fcd89fb076d2c608db8869d83 [formerly b9fe056ddf]
Former-commit-id: 3d4becc5c7
2014-01-07 13:25:45 -06:00
Brian Clements
cefb2d3aff Issue #2563 fixed room id creation
room ids were being generated with the hostname used to connect to the server
they needed to be generated with what the server calls itself


Former-commit-id: 40763433f0 [formerly a78b1d96af] [formerly 82716fa147] [formerly 40763433f0 [formerly a78b1d96af] [formerly 82716fa147] [formerly 66df912a4e [formerly 82716fa147 [formerly 99fb102b270baa5c45f1c9963f47344ede93a34a]]]]
Former-commit-id: 66df912a4e
Former-commit-id: e7602389b6 [formerly 12c7371565] [formerly ce480f2f3d00e3ac778f4d35236875333682e387 [formerly 649483d3fd]]
Former-commit-id: 34bfd3ac6166cb7be785f4335c44e90419201b9a [formerly 33b9ecb2ab]
Former-commit-id: 7da97f676f
2014-01-07 13:04:24 -06:00
Nate Jensen
ce391a5ad2 Merge "Issue #2563 fixed default xmpp port" into development
Former-commit-id: 2de703f6e8 [formerly 26f37a2fd4] [formerly 92e1df8856] [formerly 2de703f6e8 [formerly 26f37a2fd4] [formerly 92e1df8856] [formerly 87876790f8 [formerly 92e1df8856 [formerly 4aa2f1689442ce630c94b73ad6747acd93a9c1ff]]]]
Former-commit-id: 87876790f8
Former-commit-id: 15c555bd0e [formerly 527e0197be] [formerly 7d4ac4c2b24db7918d4a19a0abd00db4ed4b6787 [formerly 365c11c9db]]
Former-commit-id: e9a8f911ffba5de1c641bac4d38f9972e6268733 [formerly 3606a4fdcf]
Former-commit-id: be8247e7ae
2014-01-07 12:39:46 -06:00
Nate Jensen
a9961219b3 Issue #2359 prevent obnoxious ncep decoder null pointer exceptions
Change-Id: I731614a8a6c9ec38bb6c1b29c4d9f6ca5a7c03d7

Former-commit-id: 79e387fc94 [formerly 52293fd154] [formerly 2c0e3f05ca] [formerly 79e387fc94 [formerly 52293fd154] [formerly 2c0e3f05ca] [formerly e509a2883f [formerly 2c0e3f05ca [formerly 514d0cfecd3eb8c81a6d2120406225856d964c9e]]]]
Former-commit-id: e509a2883f
Former-commit-id: 7371990c29 [formerly de5d7565e2] [formerly d150fe75866671138e7bd888dc3ce56b60f9a3c4 [formerly 488956a259]]
Former-commit-id: 3d18784348fe8d2b3d591b1ee3f7582cd7f8177d [formerly bdf8ff8ad4]
Former-commit-id: d9427f900f
2014-01-07 12:38:49 -06:00
Nate Jensen
ba87b96b40 Merge "Issue #2563 added packet extension to openfire plugin" into development
Former-commit-id: b51f9e1463 [formerly a60bbdc647] [formerly 5846b324f3] [formerly b51f9e1463 [formerly a60bbdc647] [formerly 5846b324f3] [formerly dae995730e [formerly 5846b324f3 [formerly 343de55a9a845657304d72779ee1d4aec46ed678]]]]
Former-commit-id: dae995730e
Former-commit-id: 4b0667223f [formerly 2ae6fdba34] [formerly b30c0c15075b76b5f0ab9708182cf858788d2926 [formerly ff62284a75]]
Former-commit-id: 771dca4e34e2aa260a96adf350f971c157d084d1 [formerly 100b29fc76]
Former-commit-id: 9dbab11fae
2014-01-07 11:17:04 -06:00
Brian Clements
5e09af067a Issue #2563 fixed default xmpp port
The default port for postgres was there by mistake


Former-commit-id: ea63496cc3 [formerly e08c5ea04c] [formerly e263cdb63a] [formerly ea63496cc3 [formerly e08c5ea04c] [formerly e263cdb63a] [formerly dfcf6e9ade [formerly e263cdb63a [formerly c6e76f765aa6cbb50b238bb3d01de7fe365d150d]]]]
Former-commit-id: dfcf6e9ade
Former-commit-id: 0193a9db0f [formerly 373feec7f5] [formerly 44850ca1b4681434bdd6bef977c019dc3e5fc792 [formerly 27b4ec6df6]]
Former-commit-id: 1e7281dd25d0e4462914a8f28e264032b5f0222a [formerly 22f322d887]
Former-commit-id: 426bb7b944
2014-01-07 10:52:50 -06:00
Slav Korolev
ac5540213e Issue #2653. Corrected decoding of SNOW monitor data.
Former-commit-id: 696728bafd [formerly 5bbb774073] [formerly 714fd018ef] [formerly 696728bafd [formerly 5bbb774073] [formerly 714fd018ef] [formerly ab7fc816b4 [formerly 714fd018ef [formerly 050f002ff7af3e68c31f5c1949ff5f82fa2e7a9b]]]]
Former-commit-id: ab7fc816b4
Former-commit-id: 679b61deea [formerly eb5ec35275] [formerly 5aa04e4abf5d9d29b644d2a212f6393c065cce96 [formerly 0fb9810e91]]
Former-commit-id: 9c64be7095aadcd4adef7f3b53b64c6684b3b86d [formerly 4fd070dd46]
Former-commit-id: 4c3ce254b6
2014-01-07 11:48:13 -05:00
Brian Clements
72f7b68456 Issue #2563 added packet extension to openfire plugin
openfire plugin now sends configuration in packet extension
legacy method of putting config in chat message still supported by default
added configuration to web gui to toggle legacy message method


Former-commit-id: 023e384ae4 [formerly 04e7c2f749] [formerly 2e53fcbccb] [formerly 023e384ae4 [formerly 04e7c2f749] [formerly 2e53fcbccb] [formerly a2c709fb34 [formerly 2e53fcbccb [formerly a26eeaae28de6e41fdc49a2b75ad6814ece478cd]]]]
Former-commit-id: a2c709fb34
Former-commit-id: eef311027b [formerly b366f38199] [formerly c779fb82246f5c8083bb1cff8aef500a5b9d57bb [formerly b42d2f5528]]
Former-commit-id: 9a282267169c3a1f12184104c174bf56b4923bc3 [formerly d028af1800]
Former-commit-id: 55467fe96e
2014-01-07 10:33:37 -06:00
Nate Jensen
2b2342a812 Merge "Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins." into development
Former-commit-id: 49a892b402 [formerly 6969518530] [formerly 6c5b954cf1] [formerly 49a892b402 [formerly 6969518530] [formerly 6c5b954cf1] [formerly 23b4da6615 [formerly 6c5b954cf1 [formerly 8b4fb3f49556903dba6e0459adddd8850a373960]]]]
Former-commit-id: 23b4da6615
Former-commit-id: 8cb9853117 [formerly 1568132e22] [formerly 0919175dd8e25d11fa16d9abfc144bbb47e10bf3 [formerly 72e77fc4b1]]
Former-commit-id: 744667c346dcb6ad84149455d2e66806521bc603 [formerly 9e7c5fc54a]
Former-commit-id: 0f7a533d73
2014-01-07 08:46:02 -06:00
Max Schenkelberg
e0b7ba7058 Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins.
Amend: Changed version numbers per discussion
Amend: Actually added changed files to the index

Change-Id: Ife7063ed538efe48a264b69c441e6f2dc3746dd5

Former-commit-id: 30059d255c [formerly b3aed99142] [formerly 16046a4dde] [formerly 30059d255c [formerly b3aed99142] [formerly 16046a4dde] [formerly cc2080449c [formerly 16046a4dde [formerly b65366dcdfa48e431b5c8bf10a72879b111cfd8d]]]]
Former-commit-id: cc2080449c
Former-commit-id: 257553461b [formerly 0ceaa43902] [formerly d612c358920d902e7385e86659fc1d050de57dd4 [formerly f58795f460]]
Former-commit-id: e6116ab5b34627162fc751f613c0b7f4743d9668 [formerly 789a279475]
Former-commit-id: 783391423f
2014-01-06 17:03:45 -06:00
Nate Jensen
663164cccb Merge "Issue #2537 Increase efficiency of DAF geometry requests when geometries are reused. Change-Id: Idf0822745cdf3d52668223038f83c76e3de1c55c" into omaha_14.2.1
Former-commit-id: d2dd7437da [formerly 45d19cf37d] [formerly f0169367be] [formerly d2dd7437da [formerly 45d19cf37d] [formerly f0169367be] [formerly 6234d3f493 [formerly f0169367be [formerly cb58431f4a4d45a1e7ad32a0db6c30238de361cf]]]]
Former-commit-id: 6234d3f493
Former-commit-id: 49089bec72 [formerly 203247b8d7] [formerly 0b12d206bd37eee2fd80d2eff0c17d9f53e66cc6 [formerly 4546e5e881]]
Former-commit-id: be272ff8b810d86a2c497e505234105912c6f210 [formerly 84ed8a0957]
Former-commit-id: b28d7c3d42
2014-01-06 16:28:38 -06:00
Ben Steffensmeier
0be4f6aa10 Issue #2537 Split modelsounding into common/edex plugins.
Change-Id: I34aa58bc13736109bd71f0b0085df6548c4623a8

Former-commit-id: 08c9b54e49 [formerly f516a684d4] [formerly f520a26fbd] [formerly 08c9b54e49 [formerly f516a684d4] [formerly f520a26fbd] [formerly d79f804d4e [formerly f520a26fbd [formerly e80e4aa972c394d699feba553d8d13e4f9dd3a03]]]]
Former-commit-id: d79f804d4e
Former-commit-id: 4b43971a78 [formerly 9913e51429] [formerly b2807282541cba1b6dadcac12cda1996f7292656 [formerly fac9fd296f]]
Former-commit-id: 7d14b369cda7d14c9c1a9fb5e2be6d7759dd73e3 [formerly 4fef47c0a8]
Former-commit-id: 7303bd3b62
2014-01-06 16:02:59 -06:00
Ben Steffensmeier
eec4568791 Issue #2537 Increase efficiency of DAF geometry requests when geometries are reused.
Change-Id: Idf0822745cdf3d52668223038f83c76e3de1c55c

Former-commit-id: 9b3bde3b49 [formerly 3f3f74087a] [formerly fa46a08fec] [formerly 9b3bde3b49 [formerly 3f3f74087a] [formerly fa46a08fec] [formerly ed2e34e5aa [formerly fa46a08fec [formerly 05c62ceb516807719a1649e0559a395ce604aee9]]]]
Former-commit-id: ed2e34e5aa
Former-commit-id: 2f46b15ae6 [formerly cf385ac2c3] [formerly b410e6c352a9425f7237b9429b1f965279aadfe7 [formerly 7dd641f5cc]]
Former-commit-id: 0b64d1a7d1adafc380adb58c26fbd03070d79de3 [formerly 0956094fd1]
Former-commit-id: 48243f1fdd
2014-01-06 15:41:49 -06:00
Brian Clements
4d02d8e6e7 Issue #2563 modified server config parsing to allow for custom port
Replaced parsing code that assumed no colon in the server name, which prevented connecting to servers that didn't use the default XMPP port.


Former-commit-id: 9102b08053 [formerly 4f2aa49807] [formerly cea12a1a1d] [formerly 9102b08053 [formerly 4f2aa49807] [formerly cea12a1a1d] [formerly b01e6f0c98 [formerly cea12a1a1d [formerly b995fe2036d4c0e26e25edd7f4bffd956d82921f]]]]
Former-commit-id: b01e6f0c98
Former-commit-id: bed3b77948 [formerly 74c6fdc613] [formerly 4ae9dcc3fd65cda97138587d88156c3cc3a8281c [formerly d64d95d0c6]]
Former-commit-id: b1724173d1c849579e5b1f5b75eabd48144df579 [formerly 37be43af82]
Former-commit-id: dd6fd2532c
2014-01-06 14:14:38 -06:00
Steve Harris
e44faa7943 14.1.1-15 baseline
Former-commit-id: c6cb11a5f4 [formerly f88ff2bde9] [formerly 8bbd803ace] [formerly c6cb11a5f4 [formerly f88ff2bde9] [formerly 8bbd803ace] [formerly d8e5799328 [formerly 8bbd803ace [formerly cb8eca2a0dfc0e2348301e8d9932db824ecaf34c]]]]
Former-commit-id: d8e5799328
Former-commit-id: 188b12a1b0 [formerly 282d10fe6d] [formerly 390c383ede3823f4b855f6230e3fad20d31e0e07 [formerly 35d8f5a281]]
Former-commit-id: 86d049732a94fe967ea42eb6fadaec484ef0117f [formerly cd4a09623c]
Former-commit-id: 1ca553385c
2014-01-06 14:08:08 -05:00