Commit graph

2718 commits

Author SHA1 Message Date
Ben Steffensmeier
711472433f Issue #2646 Fix Drawing layer NPE.
Former-commit-id: f31f7dc53a [formerly 068a9c6efb] [formerly f31f7dc53a [formerly 068a9c6efb] [formerly 5cbe38aade [formerly 1e5f3e1375ec3d9485863b38e6926e95e7b3921e]]]
Former-commit-id: 5cbe38aade
Former-commit-id: d43a97c51e [formerly e1fe6136ee]
Former-commit-id: 8a1de3a0bd
2014-01-17 10:41:53 -06:00
Ben Steffensmeier
38024fb662 Issue #2313 Image canvas rendering.
Change-Id: I121b61c954a27249c29f3d34c8674193af8c2417

Former-commit-id: 76414243ba [formerly 625aac3ed3] [formerly 76414243ba [formerly 625aac3ed3] [formerly 16c350f0c6 [formerly 0f8d0c52093a14d16a36ce353c2587633474007d]]]
Former-commit-id: 16c350f0c6
Former-commit-id: 19930b7c8b [formerly 1973e5e015]
Former-commit-id: af39398ac3
2014-01-16 17:05:16 -06:00
gerritcm
6bf3189db9 14.1.1-16 baseline
Former-commit-id: 9e935404d8 [formerly 6be938e6eb] [formerly 9e935404d8 [formerly 6be938e6eb] [formerly b84f7d4203 [formerly dee925ccd6738c3ca6727a7c65f4471170bc698c]]]
Former-commit-id: b84f7d4203
Former-commit-id: b72cd19055 [formerly 644da23327]
Former-commit-id: 5f79da2501
2014-01-16 16:43:05 -05:00
Lee Venable
39c7b5dffb Issue #2691 - Fixed null pointer exception when closing MPE perspective.
Former-commit-id: 24a4cafd0c [formerly 8405e235e6] [formerly 24a4cafd0c [formerly 8405e235e6] [formerly b435fd3050 [formerly fa5315a2874b91acaac4f5eb58142804a6a09ef8]]]
Former-commit-id: b435fd3050
Former-commit-id: a859b50881 [formerly bc07967e3b]
Former-commit-id: a49baddf98
2014-01-16 10:35:12 -06:00
Nate Jensen
5ec7ca620c Merge "Issue #2661 Use only u,v to represent vector grids in derived parameters and D2D. Change-Id: I7ea007f0f919017e8212716cc15712c7ed611e69" into development
Former-commit-id: 65306a503e [formerly a71ef7b581] [formerly 65306a503e [formerly a71ef7b581] [formerly 518a3165e4 [formerly 56fd57c3e00926c95ab05297772161e960586e8f]]]
Former-commit-id: 518a3165e4
Former-commit-id: d4db973df1 [formerly 104a0a2de2]
Former-commit-id: 58c1ba12e5
2014-01-16 09:06:10 -06:00
Ben Steffensmeier
6d8adaccb2 Issue #2661 Use only u,v to represent vector grids in derived parameters and D2D.
Change-Id: I7ea007f0f919017e8212716cc15712c7ed611e69

Former-commit-id: 8b23f32311 [formerly ee11e5d13c] [formerly 8b23f32311 [formerly ee11e5d13c] [formerly ac33fb9463 [formerly a8bcec4a2fa9ddd49dc300ebd63aebfdfb41723e]]]
Former-commit-id: ac33fb9463
Former-commit-id: b2b2136868 [formerly be163ebf2a]
Former-commit-id: 182a717b00
2014-01-16 09:03:50 -06:00
Nate Jensen
86b9311ed4 Merge "Issue #2459 - Refactor the subscription status" into omaha_14.2.1
Former-commit-id: 9028260386 [formerly ae10129713] [formerly 9028260386 [formerly ae10129713] [formerly 9d529b3b21 [formerly 61b073cef0bfe65634096221d8ee8aef37f9e1ed]]]
Former-commit-id: 9d529b3b21
Former-commit-id: 98e1bf9194 [formerly 1be41d69c6]
Former-commit-id: 3d6d9118ea
2014-01-15 17:36:30 -06:00
Nate Jensen
51df7b69cc Merge "Issue #2630 added away timeout for collaboration inactivity" into development
Former-commit-id: 8420f87348 [formerly bdb4d8bdeb] [formerly 8420f87348 [formerly bdb4d8bdeb] [formerly eafe61cd37 [formerly 14d419fdd187e4e1e537590e626ec33d3f5b071f]]]
Former-commit-id: eafe61cd37
Former-commit-id: 5504ec1efd [formerly 46dfbe9334]
Former-commit-id: b7a74dcb74
2014-01-15 13:48:13 -06:00
Nate Jensen
2ff7910650 Issue #2359 printout connection exceptions to aid in diagnosing
connectivity problems

Change-Id: I957abb82cd3a736485f289a266b00cdbd89a578c

Former-commit-id: ccaa9dbde1 [formerly fc6b31c1c0] [formerly ccaa9dbde1 [formerly fc6b31c1c0] [formerly 5f39322d59 [formerly 8d7445a4ba4b76335166569de32c00bac1a2a84b]]]
Former-commit-id: 5f39322d59
Former-commit-id: 4533642f26 [formerly deb57e3b35]
Former-commit-id: fd32fb6c6e
2014-01-15 13:39:28 -06:00
Brian Clements
72b75a821d Issue #2630 added away timeout for collaboration inactivity
eclipse job in connection subscriber
preferences added to collaboration prefs page


Former-commit-id: 7e952c5ba8 [formerly 24190efb75] [formerly 7e952c5ba8 [formerly 24190efb75] [formerly 57fb953b8d [formerly c6fded1429e44033bb989c1d9caaac87c72eb440]]]
Former-commit-id: 57fb953b8d
Former-commit-id: 7410c36783 [formerly 53273c4e5a]
Former-commit-id: 07b9ab8b7b
2014-01-15 13:20:25 -06:00
Brian Clements
67e65db850 Issue #2630 fixed status parsing bug
status from preference store wasn't being parsed correctly
changed connection data to store as Mode object instead of string
added parse method to collaboration utils


Former-commit-id: 45b5df24d4 [formerly 79446d983b] [formerly 45b5df24d4 [formerly 79446d983b] [formerly bf6cf2f2ee [formerly 0176ba7963a5ff5bbd37b2e0867cbf97f4a3ef66]]]
Former-commit-id: bf6cf2f2ee
Former-commit-id: bfbcbf382a [formerly 1219713128]
Former-commit-id: 7afcf37c11
2014-01-15 10:24:09 -06:00
Mike Duff
c8f7edbcad Issue #2459 - Refactor the subscription status
Former-commit-id: d03c012a54 [formerly f94593867e] [formerly d03c012a54 [formerly f94593867e] [formerly 245d76358e [formerly 3ab5b072627d0a8b0eabe12fb700f6a74319b5f9]]]
Former-commit-id: 245d76358e
Former-commit-id: 9a45b95db6 [formerly d96a9d2937]
Former-commit-id: 3c0634b1e8
2014-01-15 09:21:30 -06:00
Brian Clements
db92ac5b84 Issue #2594 added low memory warning job
UiPlugin starts and stops job
job notifies perspective manager of low memory
Viz perspective manager has default alert implementation
D2D and GFE override alert message
added memory threshold property to product files


Former-commit-id: c63c8e2fc6 [formerly f9a8b68da5] [formerly c63c8e2fc6 [formerly f9a8b68da5] [formerly 0076ec9aaf [formerly 4af42d405d3bf24b00c027f5dab8faf500a9e5b7]]]
Former-commit-id: 0076ec9aaf
Former-commit-id: 496d15d77f [formerly e420ae009d]
Former-commit-id: dd0c5d9b57
2014-01-14 17:05:28 -06:00
Ron Anderson
77c132f706 Merge branch 'master_14.1.1' into solutions
Conflicts:
	cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
	cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java

Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5

Former-commit-id: 0bde38cef3 [formerly ba7a25a88f] [formerly 0bde38cef3 [formerly ba7a25a88f] [formerly 62c445d872 [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]]
Former-commit-id: 62c445d872
Former-commit-id: dca7f21f7b [formerly 624375267e]
Former-commit-id: 5076217d8f
2014-01-13 17:45:20 -06:00
Nate Jensen
8c3f85a6b1 Merge "Issue #2594 made heap status monitor default on launch" into development
Former-commit-id: 8d4d024617 [formerly 542bbd88bc] [formerly 8d4d024617 [formerly 542bbd88bc] [formerly 09082cc89e [formerly 0907626a01c547a49d89d6cf15f479271dd0e0fe]]]
Former-commit-id: 09082cc89e
Former-commit-id: 86d6e78d17 [formerly 4d6bb9a75d]
Former-commit-id: 9c0c12ed9a
2014-01-13 13:01:29 -06:00
Nate Jensen
54be083160 Merge "Issue #2620 Reordered developer feature.xml to match p2-build.xml" into development
Former-commit-id: 02f7b23f72 [formerly aba4acf355] [formerly 02f7b23f72 [formerly aba4acf355] [formerly bd44fec4eb [formerly 2c9ce82cec838ac27153cfa1227b7bf787c1964b]]]
Former-commit-id: bd44fec4eb
Former-commit-id: 4b9411854e [formerly 708c77878f]
Former-commit-id: 58a14c506b
2014-01-13 09:33:26 -06:00
Richard Peter
d047e8210a Merge "Issue #2452 - Add label stating all lat/lons will be converted to easting." into omaha_14.2.1
Former-commit-id: bc4ad18fe9 [formerly 7bbefddcc1] [formerly bc4ad18fe9 [formerly 7bbefddcc1] [formerly e6d7acb609 [formerly 1855c0e2d601fd3c5b20d8ba58d157e9fb993b8b]]]
Former-commit-id: e6d7acb609
Former-commit-id: 5b687c7bd5 [formerly 527408ddd4]
Former-commit-id: b14835bae6
2014-01-10 15:42:48 -06:00
Brian Clements
c3e6c9501d Issue #2594 made heap status monitor default on launch
Former-commit-id: 4f37164fc5 [formerly 6ba1eb0edb] [formerly 4f37164fc5 [formerly 6ba1eb0edb] [formerly 4a62eb90dc [formerly 1ba7ebb59e28ba93bb752c32ffce937a4455d478]]]
Former-commit-id: 4a62eb90dc
Former-commit-id: cde78c4006 [formerly 3d196a00dd]
Former-commit-id: 5ab028fbe4
2014-01-10 14:54:14 -06:00
Mike Duff
0823eab3bf Issue #2452 - Add label stating all lat/lons will be converted to easting.
Former-commit-id: 67f6311354 [formerly 69ca0dd0d2] [formerly 67f6311354 [formerly 69ca0dd0d2] [formerly 7081c26823 [formerly 84bff804bc089aefcf126a586539eab590e1d04a]]]
Former-commit-id: 7081c26823
Former-commit-id: b616f34af2 [formerly 17d19cc0bb]
Former-commit-id: c1e3dd57b6
2014-01-10 12:05:30 -06:00
Mike Duff
ca2667855c Issue #2642 - Update header comment
Former-commit-id: 5d669a97af [formerly 101d9939d6] [formerly 5d669a97af [formerly 101d9939d6] [formerly 28114764a5 [formerly 389426adddf3a78d9859f704ecc2241e453b5dc2]]]
Former-commit-id: 28114764a5
Former-commit-id: 12c47ea375 [formerly 7d25b33cb6]
Former-commit-id: 2906b0bed2
2014-01-10 10:57:18 -06:00
Max Schenkelberg
38d14b6ad6 Issue #2620 Reordered developer feature.xml to match p2-build.xml
Change-Id: I15a073d17b1e6df21c9c34245b373bc091cc5e67

Former-commit-id: 13172879fd [formerly ae7eb39380] [formerly 13172879fd [formerly ae7eb39380] [formerly 73c022da20 [formerly ea87ef4868b35b4fa89d519478ade9fb9468cca8]]]
Former-commit-id: 73c022da20
Former-commit-id: 59586b673b [formerly 8abc1ec611]
Former-commit-id: 20ba02a238
2014-01-10 10:39:07 -06:00
Richard Peter
e60037e842 Merge "Issue #2642 - Make shared sub deletions remove the site from the list" into omaha_14.2.1
Former-commit-id: b37d6e9c91 [formerly 8ca1217f03] [formerly b37d6e9c91 [formerly 8ca1217f03] [formerly 52850fe95a [formerly f5e5e1e66bf7264408e31b95ebf73d083b3cff0f]]]
Former-commit-id: 52850fe95a
Former-commit-id: b833c4333c [formerly 690f1b15dd]
Former-commit-id: fd7fde3cdf
2014-01-09 16:58:39 -06:00
Richard Peter
255358f37a Merge "Issue #2633 - Keep graph data visible while resizing. Keep bottom of graph visible." into omaha_14.2.1
Former-commit-id: 0bd52b65e7 [formerly b711c35c68] [formerly 0bd52b65e7 [formerly b711c35c68] [formerly f45a281935 [formerly 8f3f97302417e256cd110feb4ed56ca366cb1db8]]]
Former-commit-id: f45a281935
Former-commit-id: f4108b8be2 [formerly 0459cd237e]
Former-commit-id: 5bb2869ca4
2014-01-09 16:53:52 -06:00
Ben Steffensmeier
4bc9ead269 Issue #2647 Fix window focus problems.
Former-commit-id: 13da8899de [formerly 2b9e9a41db] [formerly 13da8899de [formerly 2b9e9a41db] [formerly 488d5e45b1 [formerly 4b0053b20060ead87b34895ee7d03a4b6317c8fc]]]
Former-commit-id: 488d5e45b1
Former-commit-id: 1aa018e5b7 [formerly 0ada0c6d3f]
Former-commit-id: 403ba78a15
2014-01-09 15:14:38 -06:00
Nate Jensen
0b507a19c9 Merge "Issue #2563 added user server add/remove functionality" into development
Former-commit-id: f7adb31fc5 [formerly 7d0fc33055] [formerly f7adb31fc5 [formerly 7d0fc33055] [formerly 6fdf4361f8 [formerly f343c7bc294f4c89c4ac75630910f153e61d24a3]]]
Former-commit-id: 6fdf4361f8
Former-commit-id: aeffb73883 [formerly 0351c26443]
Former-commit-id: 9103dabf43
2014-01-09 13:44:24 -06:00
Brian Clements
542e01f322 Issue #2563 added user server add/remove functionality
now persists user entered servers to localization


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

Former-commit-id: 5d488d27b9 [formerly 83c600ada9] [formerly 5d488d27b9 [formerly 83c600ada9] [formerly f4765d1577 [formerly 59d4c2b9965a7c208863af8f5a3ba4145ea2bbf4]]]
Former-commit-id: f4765d1577
Former-commit-id: f10dcc6de3 [formerly e4de3defec]
Former-commit-id: 645bb6981e
2014-01-09 11:26:19 -06:00
Mike Duff
901838b7d3 Issue #2643 - Fixed the mouse checking on DD maps
Former-commit-id: 7b8964d9b2 [formerly 4fe2dc76af] [formerly 7b8964d9b2 [formerly 4fe2dc76af] [formerly 56499a77c3 [formerly 775e99924e098387e4ca5042823ef20d1a0d2afe]]]
Former-commit-id: 56499a77c3
Former-commit-id: 1c3b700563 [formerly 09c5f29395]
Former-commit-id: 94848592d1
2014-01-09 10:18:34 -06:00
Mike Duff
194a348ce2 Issue #2642 - Make shared sub deletions remove the site from the list
Former-commit-id: 0cb61d4d50 [formerly 6cff7aaf0c] [formerly 0cb61d4d50 [formerly 6cff7aaf0c] [formerly 4e6b4eaa4c [formerly a8f57c338a8a06c6d40842f56c329fd9f215bc5b]]]
Former-commit-id: 4e6b4eaa4c
Former-commit-id: 0e081e8ee2 [formerly fdef5e97e2]
Former-commit-id: 49dc635963
2014-01-09 10:15:48 -06:00
Nate Jensen
cf5ca32b8a Merge "Issue #2563 fixed room id creation" into development
Former-commit-id: 537dc6c8cc [formerly cbad156c05] [formerly 537dc6c8cc [formerly cbad156c05] [formerly a8e9db0dde [formerly a5d7f0a46a5304defe6ebde0b73418c0da168437]]]
Former-commit-id: a8e9db0dde
Former-commit-id: 432a89c0fc [formerly 5beb950218]
Former-commit-id: 93e15999b3
2014-01-07 13:50:41 -06:00
Brian Clements
7da97f676f 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: a78b1d96af [formerly 82716fa147] [formerly a78b1d96af [formerly 82716fa147] [formerly 66df912a4e [formerly 99fb102b270baa5c45f1c9963f47344ede93a34a]]]
Former-commit-id: 66df912a4e
Former-commit-id: 12c7371565 [formerly 649483d3fd]
Former-commit-id: 33b9ecb2ab
2014-01-07 13:04:24 -06:00
Nate Jensen
be8247e7ae Merge "Issue #2563 fixed default xmpp port" into development
Former-commit-id: 26f37a2fd4 [formerly 92e1df8856] [formerly 26f37a2fd4 [formerly 92e1df8856] [formerly 87876790f8 [formerly 4aa2f1689442ce630c94b73ad6747acd93a9c1ff]]]
Former-commit-id: 87876790f8
Former-commit-id: 527e0197be [formerly 365c11c9db]
Former-commit-id: 3606a4fdcf
2014-01-07 12:39:46 -06:00
Brian Clements
426bb7b944 Issue #2563 fixed default xmpp port
The default port for postgres was there by mistake


Former-commit-id: e08c5ea04c [formerly e263cdb63a] [formerly e08c5ea04c [formerly e263cdb63a] [formerly dfcf6e9ade [formerly c6e76f765aa6cbb50b238bb3d01de7fe365d150d]]]
Former-commit-id: dfcf6e9ade
Former-commit-id: 373feec7f5 [formerly 27b4ec6df6]
Former-commit-id: 22f322d887
2014-01-07 10:52:50 -06:00
Slav Korolev
4c3ce254b6 Issue #2653. Corrected decoding of SNOW monitor data.
Former-commit-id: 5bbb774073 [formerly 714fd018ef] [formerly 5bbb774073 [formerly 714fd018ef] [formerly ab7fc816b4 [formerly 050f002ff7af3e68c31f5c1949ff5f82fa2e7a9b]]]
Former-commit-id: ab7fc816b4
Former-commit-id: eb5ec35275 [formerly 0fb9810e91]
Former-commit-id: 4fd070dd46
2014-01-07 11:48:13 -05:00
Nate Jensen
0f7a533d73 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: 6969518530 [formerly 6c5b954cf1] [formerly 6969518530 [formerly 6c5b954cf1] [formerly 23b4da6615 [formerly 8b4fb3f49556903dba6e0459adddd8850a373960]]]
Former-commit-id: 23b4da6615
Former-commit-id: 1568132e22 [formerly 72e77fc4b1]
Former-commit-id: 9e7c5fc54a
2014-01-07 08:46:02 -06:00
Max Schenkelberg
783391423f 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: b3aed99142 [formerly 16046a4dde] [formerly b3aed99142 [formerly 16046a4dde] [formerly cc2080449c [formerly b65366dcdfa48e431b5c8bf10a72879b111cfd8d]]]
Former-commit-id: cc2080449c
Former-commit-id: 0ceaa43902 [formerly f58795f460]
Former-commit-id: 789a279475
2014-01-06 17:03:45 -06:00
Ben Steffensmeier
7303bd3b62 Issue #2537 Split modelsounding into common/edex plugins.
Change-Id: I34aa58bc13736109bd71f0b0085df6548c4623a8

Former-commit-id: f516a684d4 [formerly f520a26fbd] [formerly f516a684d4 [formerly f520a26fbd] [formerly d79f804d4e [formerly e80e4aa972c394d699feba553d8d13e4f9dd3a03]]]
Former-commit-id: d79f804d4e
Former-commit-id: 9913e51429 [formerly fac9fd296f]
Former-commit-id: 4fef47c0a8
2014-01-06 16:02:59 -06:00
Brian Clements
dd6fd2532c 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: 4f2aa49807 [formerly cea12a1a1d] [formerly 4f2aa49807 [formerly cea12a1a1d] [formerly b01e6f0c98 [formerly b995fe2036d4c0e26e25edd7f4bffd956d82921f]]]
Former-commit-id: b01e6f0c98
Former-commit-id: 74c6fdc613 [formerly d64d95d0c6]
Former-commit-id: 37be43af82
2014-01-06 14:14:38 -06:00
Steve Harris
1ca553385c 14.1.1-15 baseline
Former-commit-id: f88ff2bde9 [formerly 8bbd803ace] [formerly f88ff2bde9 [formerly 8bbd803ace] [formerly d8e5799328 [formerly cb8eca2a0dfc0e2348301e8d9932db824ecaf34c]]]
Former-commit-id: d8e5799328
Former-commit-id: 282d10fe6d [formerly 35d8f5a281]
Former-commit-id: cd4a09623c
2014-01-06 14:08:08 -05:00
Steve Harris
5862555160 14.1.1-14 baseline
Former-commit-id: 6df7c67f95 [formerly f2ad9da4eb] [formerly 6df7c67f95 [formerly f2ad9da4eb] [formerly 9ef1c841b9 [formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]]]
Former-commit-id: 9ef1c841b9
Former-commit-id: 0989c17710 [formerly 43cc501e0d]
Former-commit-id: a2bdee5cc1
2014-01-06 14:02:30 -05:00
Brian Clements
73a3213cd1 Issue #2563 fixed label issue for non-grouped roster entry
the old code assumed that the username was populated in the roster object
new code uses the userId which is always populated


Former-commit-id: 0ce560149e [formerly 73347283b6] [formerly 0ce560149e [formerly 73347283b6] [formerly d07bc465d4 [formerly 5fe0f88b3465ba65efabe2a41d1df392c85e041f]]]
Former-commit-id: d07bc465d4
Former-commit-id: 5dcaa98110 [formerly 0f4be44a23]
Former-commit-id: 70d4484473
2013-12-20 14:40:00 -06:00
Brian Clements
41f6c010af Issue #2563 roster updates for stock servers
added functionality that makes the contact list compatible with server rosters that could be modified with other clients
added support for roster entries that aren't in a local or server group


Former-commit-id: b120d74099 [formerly 2b8668a4eb] [formerly b120d74099 [formerly 2b8668a4eb] [formerly e4bd8a3e2c [formerly 23d898308fb3aa673d85fdf00495d43e4c02a08f]]]
Former-commit-id: e4bd8a3e2c
Former-commit-id: 0882672686 [formerly 4b4c7ba50c]
Former-commit-id: 98fd3e6a4c
2013-12-20 12:03:04 -06:00
Brian Clements
b9977a1357 Issue #2563 compatibility features for stock xmpp servers
added more listener handling for venue events and server disconnection
added capability to connect to a different server from UI
added better error messages for failed connection/login to server
fixed assumptions that server always sends HTTP url and has feed chatroom


Former-commit-id: 621a8536e6 [formerly 09c0267237] [formerly 621a8536e6 [formerly 09c0267237] [formerly af83c0cf87 [formerly b3173727f3f685119be3668779eb5da7e075df50]]]
Former-commit-id: af83c0cf87
Former-commit-id: 917d8dffee [formerly 43021ae281]
Former-commit-id: e5430b4510
2013-12-20 10:41:13 -06:00
Nate Jensen
7d40d1cacb Merge "Issue #2562 moved session data from chat to packet extension" into development
Former-commit-id: ab5de71978 [formerly 54a986613a] [formerly ab5de71978 [formerly 54a986613a] [formerly 67ba8bb713 [formerly 2bfedeebc2051fa8f1be5277224cafa598796bdf]]]
Former-commit-id: 67ba8bb713
Former-commit-id: 2ceb8c2051 [formerly c61ac618ea]
Former-commit-id: 8cfa9e9e15
2013-12-19 12:41:32 -06:00
Brian Clements
5ede797e27 Issue #2562 moved session data from chat to packet extension
delegated compression to smack
added timeout for http config
fixed getting all joined venues
fixed room invitation from non-cave client
create session checks for session name already used


Former-commit-id: 2c20a87634 [formerly 80650337ce] [formerly 2c20a87634 [formerly 80650337ce] [formerly ce0a34b53c [formerly 3781483ef6dd1889aa0ecd6ccc83bfb2461713b5]]]
Former-commit-id: ce0a34b53c
Former-commit-id: d58f8d7134 [formerly 4015dc23ee]
Former-commit-id: aa8d869635
2013-12-19 12:08:21 -06:00
David Gillingham
203e25ab3c Issue #2641: Fix ETN assignment issues introduced by baseline merge.
Former-commit-id: c48c0523ff [formerly 136265183d] [formerly c48c0523ff [formerly 136265183d] [formerly 09bfdc49e3 [formerly 7ae8efacb3c886ec18af64dca7784f4aa1512bf4]]]
Former-commit-id: 09bfdc49e3
Former-commit-id: 6e642b81fe [formerly 8f3802eecf]
Former-commit-id: 24c8fc930e
2013-12-18 16:18:47 -06:00
Steve Harris
afb79e8384 Merge branch 'omaha_14.2.1' into development
Former-commit-id: 8aac57e096 [formerly 0950a8a1ba] [formerly 8aac57e096 [formerly 0950a8a1ba] [formerly 64f8564cd8 [formerly 71a8fd9b0659b06e366e734c06fa74232787238b]]]
Former-commit-id: 64f8564cd8
Former-commit-id: 21aaafbd52 [formerly 5d6bae317d]
Former-commit-id: bb449e689e
2013-12-18 13:14:27 -06:00
Richard Peter
1c743d4d44 Merge branch 'master_14.2.1' (14.1.1-13) into omaha_14.2.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
	cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java

Change-Id: Ic1f763baa305eb65f7f5373dea34e01a6373fec7

Former-commit-id: e4f59ea119 [formerly 1de516964b] [formerly e4f59ea119 [formerly 1de516964b] [formerly 2e7fd9ddba [formerly 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9]]]
Former-commit-id: 2e7fd9ddba
Former-commit-id: 5c0cf804f1 [formerly 62fa535744]
Former-commit-id: 4059813742
2013-12-17 21:04:53 -06:00
Mike Duff
707ac59a98 Issue #2633 - Fix refresh issues with Bandwidth Utilization Graph
Former-commit-id: e26bea423e [formerly 66f5585774] [formerly e26bea423e [formerly 66f5585774] [formerly 6406bcdd05 [formerly 9b73b9db1ff2e7aeab888118348c66090ef7e2ae]]]
Former-commit-id: 6406bcdd05
Former-commit-id: 0232f16e7a [formerly 54f7feef03]
Former-commit-id: b54ab4df6a
2013-12-17 09:41:30 -06:00