Commit graph

804 commits

Author SHA1 Message Date
Matt Nash
d54f9d9ca7 Issue #429 change name of editor sharing
Former-commit-id: 6e59bde3d7 [formerly dfba9a1d0d] [formerly 9b7a839cdd] [formerly ac3b674bf3 [formerly 9b7a839cdd [formerly 199c8c6af547dc66e8cb068e2617a96f3b68d515]]]
Former-commit-id: ac3b674bf3
Former-commit-id: 3d0b7cd83ba6a112cf97ba910f244ff7a2204533 [formerly 87a5511a7c]
Former-commit-id: b71d725791
2012-04-16 15:40:37 -05:00
Roger Ferrel
3f7f7666b8 Issue #437 Check for null session in ParticipantsLabelProvider.
Change-Id: Ie327860fdf1feac700e646885a641a283fe54291

Former-commit-id: 69675cf20b [formerly e326edf566] [formerly 8dd86fc331] [formerly 208f84da4d [formerly 8dd86fc331 [formerly 7e73af55a678595cb39f58e109235f9a0310d14c]]]
Former-commit-id: 208f84da4d
Former-commit-id: cbd2235651f41b2540abd22793276b3487ecf1f5 [formerly 11d59449ca]
Former-commit-id: 05399a980f
2012-04-16 13:36:27 -05:00
Roger Ferrel
4290f8477e Issue #432 In Collaboration Session View roles now properly update the icon.
Change-Id: I970cd006464359acae17dc71705d76e0083c016e

Former-commit-id: 6a1ae6a396 [formerly c47521f4b9] [formerly 4266d74fb4] [formerly cca947d3ec [formerly 4266d74fb4 [formerly 7ad908ac8ef6d276c3294e4c7590e07972b0fd79]]]
Former-commit-id: cca947d3ec
Former-commit-id: 4958d366641efd2c4a81fd15cce49d296e6154d1 [formerly b290f3beb6]
Former-commit-id: d13d6c63d0
2012-04-16 13:07:03 -05:00
Nate Jensen
3aa29dcd35 Issue #427 attempt to fix collaboration build
Change-Id: I30297eebe969601b5a803ccd58e9e69f5ac0e515

Former-commit-id: 5fd1dfbe50 [formerly a876c29a8f] [formerly 6b84101223] [formerly a823db85be [formerly 6b84101223 [formerly d011c6f975cae23d5f6dc47ff8faa03f973f28e8]]]
Former-commit-id: a823db85be
Former-commit-id: 1961fdb86854a9301e4380d20b476561b8415277 [formerly c278bcd9fe]
Former-commit-id: c6f42b4a70
2012-04-16 12:58:56 -05:00
Nate Jensen
8385590d1e Issue #427 fix drawing icons
Change-Id: Ib7b04baf7f8ab528070c455c1e3e081be56124e0

Former-commit-id: af67b7fec0 [formerly 25b8851589] [formerly 446052111f] [formerly 1d3666a10e [formerly 446052111f [formerly 50f3e0babfb5c38b814be13802bb61f04e73e56f]]]
Former-commit-id: 1d3666a10e
Former-commit-id: 28d502fab55e6c56f49074fa0610d25997957e9c [formerly 6c381ceb01]
Former-commit-id: 58fec0767d
2012-04-16 12:54:29 -05:00
Nate Jensen
c234f0cfdb Issue #427 cleanup and refactoring for ease of use
Change-Id: I93f75663ace61b454b52d1e451677a0e42c2d481

Former-commit-id: cfd65777dd [formerly 02b0f1bd5f] [formerly fc1c1d5f16] [formerly d9c24599ea [formerly fc1c1d5f16 [formerly 23ba31dc2479e9e1e2b45e9237c92a7adf12a6c5]]]
Former-commit-id: d9c24599ea
Former-commit-id: b8e63e2dfe8e14521c85c28d063596d80554ff95 [formerly e3c7b4d2e2]
Former-commit-id: 69061ada62
2012-04-16 12:37:40 -05:00
Matt Nash
2038e8123a Issue #429 minor tooltip fix, and double click fixes for unavailable users
Former-commit-id: 4d5368e8b9 [formerly 79088f4129] [formerly 967b8ed671] [formerly 30d5ccc641 [formerly 967b8ed671 [formerly 408c7cfaa970e6b460fda819fba0f02810c2dc19]]]
Former-commit-id: 30d5ccc641
Former-commit-id: ddfa020b2016c31a30ed3dfc39848250fa8bb228 [formerly ed644a9031]
Former-commit-id: 477c842174
2012-04-16 11:16:50 -05:00
Matt Nash
6bea493d6e Issue #429 set editor and view title the same, add separator to menu above collaboration
Former-commit-id: 1607b7cdb6 [formerly dd88bf775c] [formerly 780fd03203] [formerly d20fe3cfff [formerly 780fd03203 [formerly c045890c6da56c258dfa44610e7225a3f914e0ef]]]
Former-commit-id: d20fe3cfff
Former-commit-id: 0ed3cb12f6d64edaca807a2d18444a39537c371d [formerly ef0e2814ef]
Former-commit-id: d2f183205a
2012-04-16 10:03:31 -05:00
James Korman
715d8e9a4c Issue #437 - removed Leader presence/modified subscribed handling.
Former-commit-id: f9513ac55e [formerly d87e47a5f3] [formerly dab86c62fc] [formerly defb083771 [formerly dab86c62fc [formerly 57673abac66b21596c71737d0aa1537c13982ac0]]]
Former-commit-id: defb083771
Former-commit-id: 87675161148de44dbb7992da425501196d792a37 [formerly 8e84ed72f7]
Former-commit-id: 0822fc6ae6
2012-04-16 09:46:12 -05:00
Bryan Kowal
95a9247268 Merge "Issue #450 - add the cave viz collaboration rpm to the yum groups." into 11-Collaboration
Former-commit-id: d4fee27e69 [formerly 66f48c3586] [formerly ffe22bdedc] [formerly adb56099a5 [formerly ffe22bdedc [formerly 170d1e2a92debece0efd0a1b30a281e70c7a8b77]]]
Former-commit-id: adb56099a5
Former-commit-id: a6e48c5a2f681f86288839b9ded221e1fd7f5a19 [formerly a0225560cc]
Former-commit-id: ba54e9da49
2012-04-16 09:40:36 -05:00
Roger Ferrel
2919410fd5 Issue #437 Fixed typo that cause multiple grops siteings in Collaboration View.
Change-Id: I2fc329b101532f3da99a58c320ceb7fa109c7e5b

Former-commit-id: 1a4d155b5a [formerly 866472438f] [formerly 3f12223532] [formerly 020f77195a [formerly 3f12223532 [formerly 599563055eb1373601d5623752272130142c3659]]]
Former-commit-id: 020f77195a
Former-commit-id: 9b4265955f484ba8ebd8029d67e77049aea3ecd8 [formerly 588302da22]
Former-commit-id: 1d5d56dcc7
2012-04-16 07:52:28 -05:00
Roger Ferrel
57f6674cab Issue #437 But fix in group View enent handler, improved tooltip
Change-Id: Ibb6fc5f312f09d72df988c591408fc41e39ad674

Former-commit-id: 1907f26a0d [formerly 41e4666d55] [formerly 55ab473fd6] [formerly 8ab764e56c [formerly 55ab473fd6 [formerly 47c81c08d9a90c271873cfa50525fb40c26db508]]]
Former-commit-id: 8ab764e56c
Former-commit-id: 170a988a7b3d93afc45aa969302851bbbcc2f1c2 [formerly 1a96e80459]
Former-commit-id: 7e30ab3c0f
2012-04-13 15:51:41 -05:00
Nate Jensen
79082074af Issue #427 cleanup
Change-Id: Ifa48910d765a40d5443b237b6805fe3f71fb1c73

Former-commit-id: b79ae6a022 [formerly 6a572eafde] [formerly fd36f7d987] [formerly 982e2dae13 [formerly fd36f7d987 [formerly 330813db6cf4a1163091116cda4d41f074409d57]]]
Former-commit-id: 982e2dae13
Former-commit-id: a0625f32bfba2c3ee647caa29d2389f69e21d888 [formerly 71292f844e]
Former-commit-id: 8380c175a3
2012-04-13 13:56:38 -05:00
Nate Jensen
dfad8b8615 Issue #427 comment for future reference
Change-Id: Ie8ffaef6e14b97bf4284efec67db8c0067cfccd3

Former-commit-id: 5f61fc206c [formerly 5cef808609] [formerly 6a387ca1ce] [formerly 28c95001b9 [formerly 6a387ca1ce [formerly fec3497a585e5b260432307b2bcc9c0317b6f2c7]]]
Former-commit-id: 28c95001b9
Former-commit-id: b3685579e6ff9c34c557a2488ffc436092260cd0 [formerly 38c95b7f21]
Former-commit-id: 8abede0150
2012-04-13 13:45:13 -05:00
Nate Jensen
120789f05f Issue #427 legend for shared editor
Change-Id: I98832ade44f7019f108e125d4bfefe6e37e4e9f7

Former-commit-id: a1b258a4b4 [formerly 392818bb51] [formerly 71ff27c001] [formerly a1d56fae3f [formerly 71ff27c001 [formerly c0fc780c73d16055b022af269628dfa0b3e5591e]]]
Former-commit-id: a1d56fae3f
Former-commit-id: 8f913eed335e49036d31b2ba6325ad72f49218ff [formerly 2ae78729f3]
Former-commit-id: da3856aba4
2012-04-13 13:43:23 -05:00
Max Schenkelberg
c962a31404 Issue #239 Got plots working
Former-commit-id: 559bae6041 [formerly 682576fe84] [formerly 859262ea98] [formerly 04ab27895d [formerly 859262ea98 [formerly 9c93f3670bd8c3a7a5e5330b160d5f2206b979b3]]]
Former-commit-id: 04ab27895d
Former-commit-id: 195e125fc2adc09e79e5bdc22b02fc35aa7211e0 [formerly adba2b8aeb]
Former-commit-id: aedf159c8a
2012-04-13 12:56:43 -05:00
Matt Nash
9864ba342c Issue #429 remove bold from LoginUser
Former-commit-id: 4b794adbd7 [formerly 9bec72d07b] [formerly 88d6e4ccbd] [formerly 0ed8e97ee1 [formerly 88d6e4ccbd [formerly 56ad67d94ad7a3c8ebfd43f94b7f40012fe8bbb4]]]
Former-commit-id: 0ed8e97ee1
Former-commit-id: dd7907c8c10f14b0072e072811d2de14ecb2a2d9 [formerly 064367fe8a]
Former-commit-id: 4c96b11db0
2012-04-13 10:59:55 -05:00
Matt Nash
7c3dfe2ee0 Issue #429 fix null pointers and make erase first pass possible
Former-commit-id: e1172dbcaa [formerly bdec7aff90] [formerly 82c11c4224] [formerly b133b57c6d [formerly 82c11c4224 [formerly 67a87efe19292a279d42a0104d902afc59e3dd84]]]
Former-commit-id: b133b57c6d
Former-commit-id: e208b807b3531c3f662e86557063b2fcbaa7bc98 [formerly ed75909d5b]
Former-commit-id: d1ef8025be
2012-04-13 10:46:53 -05:00
Matt Nash
ba8bdee906 Issue #429 telestrator fixes and view changes
Former-commit-id: da2e195b01 [formerly 244e02a318] [formerly 19e37ff05a] [formerly c6c0483cee [formerly 19e37ff05a [formerly 51969dfc82d750571115d179911333cec55f677f]]]
Former-commit-id: c6c0483cee
Former-commit-id: 6ef06d2d9a8ba0edc9fe7bacf9128b79bf8f8ec0 [formerly 1c2df7d912]
Former-commit-id: 49a6d10c18
2012-04-13 09:50:48 -05:00
Roger Ferrel
90b58d7453 Issue #437 Implemented Roster event handlers.
Change-Id: Ibc6cf9a077eca6893efa048aa780e16ec4f2190d

Former-commit-id: 353230a7c3 [formerly 11f3edb4f2] [formerly 711becf60b] [formerly c5fb910ea0 [formerly 711becf60b [formerly 2cf4fbe9225b9442c8368e7fa3d7109976e557b0]]]
Former-commit-id: c5fb910ea0
Former-commit-id: 174f920dd3137e958c892925e0d9a3f9f2448317 [formerly 775d70567c]
Former-commit-id: 95765e4579
2012-04-13 09:02:44 -05:00
Max Schenkelberg
9e6267a7d4 Issue #239 Added creating of fonts and use in wireframe shapes
Former-commit-id: ea082a4c2b [formerly d0bdc5d6f0] [formerly f2fe88790d] [formerly 99209a054f [formerly f2fe88790d [formerly ab047d007f8835554d2ec08e2e11594f7d88a6cb]]]
Former-commit-id: 99209a054f
Former-commit-id: 9f0875b8b1183882c7391b33681c8df047a269e8 [formerly 41d3652701]
Former-commit-id: 43a4688404
2012-04-12 16:22:12 -05:00
Max Schenkelberg
6120d53cc0 Issue #239 Added wireframe shape capability
Former-commit-id: 9b8f9de1fa [formerly 7900e78944] [formerly 12dcb4b044] [formerly 5be2b4e745 [formerly 12dcb4b044 [formerly f56dd661225103b08b1d51a9f0cb174bd73340eb]]]
Former-commit-id: 5be2b4e745
Former-commit-id: ea1488b7dd2da24d9175bcf1e6e1bc795640ef82 [formerly f6a2f5e55c]
Former-commit-id: 3e781ede4f
2012-04-12 14:46:08 -05:00
Nate Jensen
b26b41d503 Issue #444 cleanup and fix numerous small errors
Change-Id: Idc7862a20a3d3a95103bd58ab9417e002ffaced9

Former-commit-id: 180a3f76de [formerly fec2d463b0] [formerly 447b8b461b] [formerly ff6cd0bd75 [formerly 447b8b461b [formerly efcfbbc302ede49acffcf85a792a80dc9862a0b8]]]
Former-commit-id: ff6cd0bd75
Former-commit-id: 8cd1922e37354f379eb49be4e5640287ab09c56c [formerly 04fbec7d3b]
Former-commit-id: d61604db1d
2012-04-12 13:43:24 -05:00
Brad Gonzales
45bd347c04 Issue #443 added more compression configuration to Tools.java.
Former-commit-id: 961c6517a2 [formerly 2b77db0851] [formerly 135b560fb6] [formerly 217ee506e1 [formerly 135b560fb6 [formerly 6d430d5d4f14829ab2b1280c691aadbb966fb48c]]]
Former-commit-id: 217ee506e1
Former-commit-id: 92f689f92fccebb893f8eae33111c42d778991f9 [formerly 99d168d629]
Former-commit-id: 761238d582
2012-04-12 12:08:37 -05:00
Matt Nash
1934d80646 Issue #429 add not yet implemented to a few buttons
Former-commit-id: a87f6f7337 [formerly d2a0bb20f6] [formerly 31d2720a5c] [formerly 8083ddf51e [formerly 31d2720a5c [formerly 2e263d7fe77e1451af775f0c55eb82c5d092e45c]]]
Former-commit-id: 8083ddf51e
Former-commit-id: 3883efb66b72a7cc3840d5ffd7648a4bf2b6a3e1 [formerly dde8229516]
Former-commit-id: 29668ee637
2012-04-12 10:50:07 -05:00
Max Schenkelberg
995f129817 Merge branch '11-Collaboration' of ssh://lightning.omaha.us.ray.com:29418/thunder into 11-Collaboration
Former-commit-id: 73c1e75dba [formerly d53a9faa9a] [formerly 8b514dc862] [formerly c376abf87a [formerly 8b514dc862 [formerly df62b7a1fece621ad2c46112e0029da6fc3a230c]]]
Former-commit-id: c376abf87a
Former-commit-id: 3d00530d0c4aeb5b4a56428790dcd20703c5511f [formerly d3c4f6bf7b]
Former-commit-id: 9f2e23f26b
2012-04-12 10:47:08 -05:00
Max Schenkelberg
36938dc222 Issue #239 got offscreen rendering working for clients
Former-commit-id: da48c4f6ac [formerly b1687af0ac] [formerly 060330edeae7466dfddea42f793be62e75c7a224 [formerly 5ae0ed10d5]] [formerly 2de39bb487 [formerly 5ae0ed10d5 [formerly f41733465eb0ee048fb76a0d5467ce456d1cf7c9]]]
Former-commit-id: 2de39bb487
Former-commit-id: 0c28e5b5dcdc3b47b56f77d8ab45a6f1e98aba12 [formerly 1a340bb6e5]
Former-commit-id: 0f62e40dda
2012-04-12 10:45:50 -05:00
Nate Jensen
86714a9fb8 Issue #444 filter right click menu and tooltips based on role
Change-Id: Iab6942a6b58066df6e816e3425e717868aa36337

Former-commit-id: ed02fbb8d5 [formerly 4390eed955] [formerly 3d9bfcdb12] [formerly e7e5a34655 [formerly 3d9bfcdb12 [formerly f99b871ce5556840f8b90eead59f8a2659d6bc9a]]]
Former-commit-id: e7e5a34655
Former-commit-id: e9e4bbcce1fd98220a4d2e3cb5b3d04d4a1d6c7a [formerly 78d5b1dad6]
Former-commit-id: 8787f9e44c
2012-04-12 10:23:39 -05:00
Matt Nash
a60d683af3 Issue #429 fix error as well as add checks
Former-commit-id: f629464521 [formerly 9eb69d57f9] [formerly cf24a2cee9] [formerly a6c6695e5b [formerly cf24a2cee9 [formerly 317bf0f2ebdc76ee55f2db9eb81b80731f504847]]]
Former-commit-id: a6c6695e5b
Former-commit-id: 3f712e89b70262ce6bf878dd17a4275ce02c3b61 [formerly 0f604dd351]
Former-commit-id: 721621f785
2012-04-12 09:45:37 -05:00
Brad Gonzales
edbb1e0979 Issue #443 added optional jaxb and thrift compression to collaboration, Tools.java.
Former-commit-id: 225881d7f8 [formerly e039330b0d] [formerly 137b337f4b] [formerly 2a405eb253 [formerly 137b337f4b [formerly b07cd0c2157e72d679d76ec54987b2de41c10aae]]]
Former-commit-id: 2a405eb253
Former-commit-id: 83338eae8bf405661d2823894ce7c25c073f0908 [formerly e2f7f16a11]
Former-commit-id: ef047927f9
2012-04-11 18:34:58 -05:00
Matt Nash
31e9ad5572 Issue #429 drawing additions, code cleanup, toolbar fixes
Former-commit-id: ed088cca79 [formerly df7ddc0fa2] [formerly 8e83184569] [formerly b707408a0a [formerly 8e83184569 [formerly fa78aa2f7f4738770b37beb6b02fe5adbb074fae]]]
Former-commit-id: b707408a0a
Former-commit-id: ef6d30a7738eb6cb76773ec46f212263d3d1b13c [formerly c6d7a5a69b]
Former-commit-id: 8a04973191
2012-04-11 16:45:28 -05:00
James Korman
75bbebd2fa Issue #437 - Add debug output to support roster development
Former-commit-id: 3e7b1a14f3 [formerly 4a22bdb915] [formerly 826105c621] [formerly 14b193ad6f [formerly 826105c621 [formerly b502e55a4b95dc0483e5502154ba61f04e9132cc]]]
Former-commit-id: 14b193ad6f
Former-commit-id: 99e34ab0e7b92840a551a88b16fd8555d21a6228 [formerly 9f05fd9905]
Former-commit-id: ba45c3b8c8
2012-04-11 16:23:04 -05:00
James Korman
d66cea837c Issue #437 - Added event notification for roster/roster status updates
Former-commit-id: 60f690d126 [formerly b23bd53519] [formerly d664e77844] [formerly f25744ed0f [formerly d664e77844 [formerly 90f4901c8b7f86a8a0da3be7801d3a5b48b284a8]]]
Former-commit-id: f25744ed0f
Former-commit-id: dc44fb0a4c858381846c3d838d1753d761d66f98 [formerly 14c1af5d72]
Former-commit-id: 555679afc0
2012-04-11 15:37:16 -05:00
Roger Ferrel
1da4339131 Issue #437 Bug fixes to user status
Change-Id: Idd46418cc6f40a1f8a4f247942f5b730b851444f

Former-commit-id: 2e61538905 [formerly 3421463f53] [formerly 74c98303d5] [formerly d45396d9f0 [formerly 74c98303d5 [formerly 140fa8efdba2cd5c6cf8b2a1c9696e08d1dc931a]]]
Former-commit-id: d45396d9f0
Former-commit-id: 1cec54e406153589e76b7d319454697721cb75e5 [formerly eec9b69d47]
Former-commit-id: b63954e4de
2012-04-11 12:26:46 -05:00
Bryan Kowal
fec3d21677 Issue #450 - add the cave viz collaboration rpm to the yum groups.
Former-commit-id: 77dcca12a8 [formerly b561cc5c85] [formerly 58b10dd9ae] [formerly 25c3f269bf [formerly 58b10dd9ae [formerly 56612b7cd64e16aa7af358ca251679a76781e36a]]]
Former-commit-id: 25c3f269bf
Former-commit-id: cd67d08ad844aecd4dce4ee5b42ed767d75185ed [formerly 4dec6ced9f]
Former-commit-id: 30c2ed6fed
2012-04-11 10:28:30 -05:00
Max Schenkelberg
2d6e1728e9 Issue #239 Got maps resources syncing across users
Former-commit-id: a94f6388f3 [formerly 60879f83bd] [formerly 8865c35e69] [formerly ea6b58c226 [formerly 8865c35e69 [formerly d3864aaf812ed78137a7c4124515a1f4300cd2b1]]]
Former-commit-id: ea6b58c226
Former-commit-id: 4695edc590a19b6ea96ba978a4a38e0f613e64c5 [formerly e90693f7d9]
Former-commit-id: 7d84449d7c
2012-04-11 09:46:53 -05:00
Nate Jensen
5fed054bee Issue #444 some cleanup
Change-Id: Ic790969f95e59fbf16a18d05bcc11cfe09a94916

Former-commit-id: 3b0f399ac7 [formerly da1163d487] [formerly 4405320bc8] [formerly f32611df47 [formerly 4405320bc8 [formerly 7731d22c58ee05a1c663a1d0da8f047ce49aa09c]]]
Former-commit-id: f32611df47
Former-commit-id: 87fe8cf1b441c0e889ae9fdc70325fbb10687574 [formerly 0286ff10ad]
Former-commit-id: e4ea4333eb
2012-04-11 09:33:56 -05:00
Nate Jensen
1159e2db0e Issue #444 fix peer to peer send, remove redundancy of ID classes, send session leader and data provider with invite
Change-Id: If381a0dab94e39da4e78e59e33e637f10a4057d7

Former-commit-id: 93bfd726cf [formerly ff36181458] [formerly 0f20bba406] [formerly 9b4b691ca9 [formerly 0f20bba406 [formerly 4aa478bd573ad7d9a801658c37a1d229d7bf5862]]]
Former-commit-id: 9b4b691ca9
Former-commit-id: d7d801ad3d55a7ba9400082d7d305bd51397d18e [formerly ae769c490b]
Former-commit-id: 929365719e
2012-04-10 18:15:36 -05:00
Bryan Kowal
bcd015b390 Merge "Issue #450 - the pde build will now build a p2 repository for collaboration. Removed org.jivesoftware.smack from the collaboration feature because it is already in the cots feature which is included in the collaboration feature. Had to remove and re-add log4j to the alertviz and cots features." into 11-Collaboration
Former-commit-id: 354b3907fb [formerly 5d1892242a] [formerly 82783e27fd] [formerly 3baf9d03c2 [formerly 82783e27fd [formerly b1420977f92e3b5b206f33ce2e1275aee53cc2ae]]]
Former-commit-id: 3baf9d03c2
Former-commit-id: d378932ad42a50abccb7f393f0d20a538b2651f3 [formerly 61d0a876dd]
Former-commit-id: 929a056e1b
2012-04-10 17:40:58 -05:00
Brad Gonzales
a4a8ae8e18 Issue #440 keep login window up when a username or password is incorrect.
Former-commit-id: 3a9a646cf7 [formerly 7229f9b92a] [formerly ac35f8f2fb] [formerly 107c8ba7b9 [formerly ac35f8f2fb [formerly dc4bf6dfbb2f0c58f9986b524ad49f18656cebc7]]]
Former-commit-id: 107c8ba7b9
Former-commit-id: 06526a885a69fd5ed7b056fb56c936e7962d2a84 [formerly 1b7e35f876]
Former-commit-id: 7d7e792ed8
2012-04-10 17:20:38 -05:00
Roger Ferrel
57e9f8fc75 Issue #437 Added change status menu option.
Change-Id: Ie4b1d453aa3e75b77e360c26dcc838c13b7b6223

Former-commit-id: d6cd8ffdc1 [formerly ced485f863] [formerly 69ea7c724e] [formerly 020be00301 [formerly 69ea7c724e [formerly 82ae4e9433e71e9027566aed4595046ce0ef6dfa]]]
Former-commit-id: 020be00301
Former-commit-id: d420514e04ad2359f559a25fb096aa020b45f47a [formerly 8fa193bcbe]
Former-commit-id: 40b73d902c
2012-04-10 16:50:26 -05:00
Bryan Kowal
8b08c8308e Issue #450 - the pde build will now build a p2 repository for collaboration. Removed org.jivesoftware.smack from the collaboration feature because it is already in the cots feature which is included in the collaboration feature. Had to remove and re-add log4j to the alertviz and cots features.
Former-commit-id: db3f60b23a [formerly b1a5abc6b3] [formerly 6ddeef48fa] [formerly ce99417a2a [formerly 6ddeef48fa [formerly b6c8b811ad911f13503859f7af09b916eb16a1d4]]]
Former-commit-id: ce99417a2a
Former-commit-id: 2de12493f2b8810fd8a4d81ec071b4416735a9af [formerly 10a291afa1]
Former-commit-id: 541fe8fbbb
2012-04-10 16:42:36 -05:00
James Korman
b573c1162c Issue #437 - Updates to status handling - Added SessionManager user presence.
Former-commit-id: 64313163fb [formerly 44eae46180] [formerly 7bf01ecbc9] [formerly 07bc1bf83e [formerly 7bf01ecbc9 [formerly 77520e5b98de679a1f08b523fb85464a31bd4c02]]]
Former-commit-id: 07bc1bf83e
Former-commit-id: 0784456ab907baca539b6cb36890c1b39ca8354b [formerly 7272ede3c4]
Former-commit-id: 8afc2bc1a8
2012-04-10 15:55:12 -05:00
Max Schenkelberg
2c47c3a99d Issue #239 Got zoom/pan events working for remote users
Former-commit-id: 7416bd9839 [formerly 65f6c07530] [formerly 6e0c5c3cdf] [formerly 18e9f2c6ad [formerly 6e0c5c3cdf [formerly a817a720868fe887deca6ce6589014f0cd439c2d]]]
Former-commit-id: 18e9f2c6ad
Former-commit-id: 651085c3a24f9ed2b19ae0a5cf80b31fa2d7e0be [formerly 0d21a9a35e]
Former-commit-id: 9853d46099
2012-04-10 14:40:51 -05:00
Matt Nash
e3b73bea8c Issue #429 comment out ability to start in debug mode for the connection
Former-commit-id: 286b51b936 [formerly 62564ebb0c] [formerly 202fe2bb5e] [formerly f05b486e33 [formerly 202fe2bb5e [formerly 8293c897e3b11c026b2f07eb45e72f48897f8d9f]]]
Former-commit-id: f05b486e33
Former-commit-id: f32eb9eed5a4c3676fc28b4bce1e17de2b7ef30d [formerly 52e27b63f7]
Former-commit-id: 96f45cdb58
2012-04-10 13:22:42 -05:00
Steve Harris
a4eb467a34 Merge branch 'ss_sync' (OB12.3.1) into 9-Wes2Bridge
Conflicts:
	edexOsgi/build.edex/esb/data/utility/edex_static/base/python/ObsRequest.py
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java

Former-commit-id: 6a1f2160bd [formerly c90ce9d54e] [formerly ed26e06df2] [formerly fee53dea94 [formerly ed26e06df2 [formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]]]
Former-commit-id: fee53dea94
Former-commit-id: 530c02831155693cd7d1ae3b27691f3302b2bbe3 [formerly dcdd7f0648]
Former-commit-id: 51bb9ebb46
2012-04-10 12:50:03 -05:00
Roger Ferrel
1b246c91c0 Issue #437 User status now properly displayed and updated in sessions.
Change-Id: I7b0e077cb87f97388fddff27b846ce856cb6a999

Former-commit-id: 9e4ea5bef6 [formerly 7ebea1d964] [formerly d2e2fd8da3] [formerly 3fd25ff1cf [formerly d2e2fd8da3 [formerly 8ee6d7cf1a8b7e0bd2fa0abfe016cb221c60f2b3]]]
Former-commit-id: 3fd25ff1cf
Former-commit-id: a7ca24388156c67420d24fca9338db23ba6ad944 [formerly 57e809d913]
Former-commit-id: 16857ccb3a
2012-04-10 11:11:26 -05:00
Nate Jensen
8a67c1211c Issue #427 cleanup
Change-Id: I3ae5c84feead4bccf49007ddb16a9ed61fa49024

Former-commit-id: 914012521e [formerly 68a3867d06] [formerly 2e5272cff9] [formerly ec92c842c4 [formerly 2e5272cff9 [formerly 93a7d3b6f52331034efe1e02fdd073959eee56ee]]]
Former-commit-id: ec92c842c4
Former-commit-id: f71fb863c9e4b9653e1c9491189ec17650d52a26 [formerly a924bd6489]
Former-commit-id: a16929c9bc
2012-04-10 10:35:03 -05:00
Brad Gonzales
e1329c566e Issue #440 Changed login icon to green.
Former-commit-id: 694c8d99ff [formerly 0eefb140ac] [formerly a378fea5d1] [formerly ca2a35d77c [formerly a378fea5d1 [formerly 69549e0e64ff8d14892db9e908692c47aeb3043c]]]
Former-commit-id: ca2a35d77c
Former-commit-id: 52517a936fc772f6cc69d253e33a050e945853cc [formerly 8d170cd14b]
Former-commit-id: d7421465f7
2012-04-10 10:01:11 -05:00
Roger Ferrel
a043e15035 Issue #437 Presence status sent out when logged on to the server.
Change-Id: I44d0cfd8e37aeda4d0eadaf80b9c014494258164

Former-commit-id: 05d20a70ea [formerly 57abf56e09] [formerly b4c8d3a0d9] [formerly 521127b589 [formerly b4c8d3a0d9 [formerly 9391b95b6a26b34675370b3f7347fab4f08444e5]]]
Former-commit-id: 521127b589
Former-commit-id: ffe3bb947109a3d0dd60988e238123c19981b959 [formerly 946f7963c4]
Former-commit-id: 35c753c07f
2012-04-09 16:00:25 -05:00