Commit graph

36 commits

Author SHA1 Message Date
Brian Clements
0f521bee60 Omaha #3709 unify collaboration color management
group chat session colors controlled by session color manager
color config persistence moved to utility
shared display uses same action to change colors as other sessions

Change-Id: I8ba4a3fb4842e3f96f05ee6d16b7e81e9567f6d7

Former-commit-id: 17ccb3ab66 [formerly 1c2d8e01d0] [formerly 17ccb3ab66 [formerly 1c2d8e01d0] [formerly 8cc1aa9f33 [formerly c0cd560fb1b6e8c04047c0d7b7d407e9072f0cec]]]
Former-commit-id: 8cc1aa9f33
Former-commit-id: ba13ccb6f0 [formerly 9a87cf77c5]
Former-commit-id: 61b3b6389e
2015-01-14 13:00:25 -06:00
Nate Jensen
22fa9cc6d9 Omaha #3356 remove OBE register buddies from collaboration
Change-Id: I49099386a48b650c9e6ea1a96b519fbc178f769f

Former-commit-id: b690c360ac [formerly 8e74892cd6] [formerly b690c360ac [formerly 8e74892cd6] [formerly 40d4abe4cd [formerly 89de611bd1abdd016ae8a96db4c820004c52b406]]]
Former-commit-id: 40d4abe4cd
Former-commit-id: f78e7fe79c [formerly 5b2e410c6c]
Former-commit-id: 54e9b04c3d
2014-09-03 10:00:11 -05:00
Nate Jensen
7336692b85 Omaha #3356 cleanup of unnecessary register buddies and buddy policies
Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0

Former-commit-id: 253198b5bc [formerly b3083a663e] [formerly 253198b5bc [formerly b3083a663e] [formerly 9b72a1399d [formerly 48536dd79d933508ac54b3b6e9bbd166fd218330]]]
Former-commit-id: 9b72a1399d
Former-commit-id: 58a4cb95c1 [formerly d67083655a]
Former-commit-id: 951feab33d
2014-08-14 10:22:37 -05:00
Mark Peters
019a89bcaf Omaha #3492 Replace Raytheon plugin calls to deprecated IGraphicsTarget.createWireframeShape()
Change-Id: Ie521a2041586825b9fb995a675e5caa550fa5313

Former-commit-id: 1d0983cd4a [formerly 58dd0873e3] [formerly 1d0983cd4a [formerly 58dd0873e3] [formerly 8e7d6964c6 [formerly 0df04ef8a5b4eee4398a411fc02baba22f719eaf]]]
Former-commit-id: 8e7d6964c6
Former-commit-id: 4ca6e07182 [formerly c823ff5bc3]
Former-commit-id: 824ebff454
2014-08-13 12:22:47 -05:00
Mark Peters
c3b25c2d78 Omaha #3492 Replace Raytheon plugin calls to deprecated IGraphicsTarget.createWireframeShape()
Change-Id: I68c4757365ad1bcb6254f78fe26b98b333cf7b5a

Former-commit-id: f7205e8a31 [formerly dd85085986] [formerly f7205e8a31 [formerly dd85085986] [formerly 3ef2459491 [formerly fbebe6213718025ecf2288c0d57627df53e4bc5e]]]
Former-commit-id: 3ef2459491
Former-commit-id: 09c8f1f35e [formerly 5ad8c291e7]
Former-commit-id: 4f714fd6aa
2014-08-07 10:00:34 -05:00
Brian Clements
2bebd393d8 Omaha #1255 fixed collaboration colors
config.xml was not in build.properties
provided a fallback default if config is missing

Change-Id: I9e531b210d6bbe48ce5daf8a760b0bbcf2daa3c6

Former-commit-id: aeb093ad95 [formerly 0d4cd4bab8] [formerly aeb093ad95 [formerly 0d4cd4bab8] [formerly da53d9ccc7 [formerly 5ee2e28b8eb94174c7fce660cccc4a77345617a4]]]
Former-commit-id: da53d9ccc7
Former-commit-id: 2cea766aed [formerly e6e84d2c71]
Former-commit-id: 9a1bc8c521
2014-07-07 12:29:12 -05:00
Brian Clements
2cd0d94e5d Omaha #1255 added collaboration specific color presets
Change-Id: I57bb20d0de10fdc256f6177489760e12c297662f

Former-commit-id: 08724fefd7 [formerly 8b5ad1ec33] [formerly 08724fefd7 [formerly 8b5ad1ec33] [formerly eac871eed7 [formerly 87ed36851c390058ab4c92977ecc552cab869d26]]]
Former-commit-id: eac871eed7
Former-commit-id: ea1ac8ee8f [formerly cd282ef018]
Former-commit-id: d066846c3f
2014-07-02 10:02:52 -05:00
Brian Clements
be0185379b Omaha #1798 fixed collaboration drawing issues when leader shares new map
fixed cursor icon not updating properly
fixed attempting to draw to inactive layer

Change-Id: Ic0f29feddbd611d918ba9d7e5a515a7624bf72aa

Former-commit-id: 0125117d9c [formerly 88ba6b47ad] [formerly 0125117d9c [formerly 88ba6b47ad] [formerly fc70dbc86e [formerly 4df0a485d285a920a53e812bec204683f5ff29f6]]]
Former-commit-id: fc70dbc86e
Former-commit-id: b186894f32 [formerly 44f8b3dce1]
Former-commit-id: 0be4260b4c
2014-06-30 15:57:58 -05:00
Ben Steffensmeier
c347188e0a Omaha #3163 Remove references to deprecated grpahics API from collaboration so it does not break if old API is removed from ufcore.
Former-commit-id: 01379cd329 [formerly 748ecc5fac] [formerly 01379cd329 [formerly 748ecc5fac] [formerly 8446ace149 [formerly bb8c1130a9da5cdb06590b20d7f5bde9e1d7c812]]]
Former-commit-id: 8446ace149
Former-commit-id: 2e88a0b800 [formerly 82d9c403d2]
Former-commit-id: 353b7c4090
2014-05-16 13:36:31 -05:00
Ben Steffensmeier
1ac0aeacc5 Omaha #2697 Collaboration will no longer use local maps.
Former-commit-id: 270e8805cc [formerly 3e23857dcc] [formerly 270e8805cc [formerly 3e23857dcc] [formerly 1db137a21e [formerly 7e10b6d308a3bb17692abaefd9a8e84cc5016621]]]
Former-commit-id: 1db137a21e
Former-commit-id: fc54a7f697 [formerly 759b1460d4]
Former-commit-id: e8813c2f24
2014-05-14 13:53:29 -05:00
Brian Clements
89f3a0a1d2 Issue #3076 added clear all to shared display sessions
Former-commit-id: 729e717be1 [formerly f545c548cc] [formerly 729e717be1 [formerly f545c548cc] [formerly 1432aa1302 [formerly 9e4a518f2ecbe86fed87fbb6dac7fad08ffb33eb]]]
Former-commit-id: 1432aa1302
Former-commit-id: 8674841154 [formerly 5583c3903b]
Former-commit-id: 3a60b0db05
2014-05-06 09:30:07 -05:00
Brian Clements
86081dda91 Issue #2903 made xmpp reconnect an explicit action by user
moved non-session classes out of session package
connection classes moved to connection package
made separate classes for connection listeners
removed password from heap
login dialog remembers last server used
added reconnect handler to prompt user to re-login after disconnect


Former-commit-id: 6f7851d8c4 [formerly 8ab1bab974] [formerly 6f7851d8c4 [formerly 8ab1bab974] [formerly 6b22374046 [formerly 762e7d3a1ff47f794aa843d2b159ac78b4ab12a3]]]
Former-commit-id: 6b22374046
Former-commit-id: ca5909e222 [formerly 7cf5f06f2a]
Former-commit-id: 054b47951d
2014-04-15 15:12:33 -05:00
Nate Jensen
65e26b4418 Issue #2968 improve efficiency by only compressing/serializing persisted
objects once

Change-Id: Iba90717d049571b801254852a7fd5a73202701f2

Former-commit-id: 579584c346 [formerly e3df98635a] [formerly 579584c346 [formerly e3df98635a] [formerly aaf2d3c8a4 [formerly a35a103be0818ec80c7e2d98a74782b8278b4383]]]
Former-commit-id: aaf2d3c8a4
Former-commit-id: 45ccb7d7fe [formerly 8cb284d2c2]
Former-commit-id: 773dad337d
2014-04-08 12:59:16 -05:00
Nate Jensen
1125203c93 Issue #2895 fixed telestration when leadership returns to a previous
leader

Change-Id: Ie61adbe281b6920db994e1e30a3cbe621a1d5033

Former-commit-id: 68b60eba47 [formerly e75d3dfb7c] [formerly 68b60eba47 [formerly e75d3dfb7c] [formerly 2fc1030fad [formerly 8a0f86ebb2f659e55afc39cb6cf4bb4bdfb857b0]]]
Former-commit-id: 2fc1030fad
Former-commit-id: 8589374171 [formerly ca1ec93450]
Former-commit-id: 5cb38bd511
2014-03-18 12:52:01 -05:00
Brian Clements
c4e9aff9fc Issue #2848 fixed session create, listen, join ordering
clients were missing events and messages because listeners weren't up before joining
collaboration connection needed to add to session map before joining the session
display containers needed to register with session event bus before joining the session
clients no longer send events to empty sessions


Former-commit-id: 2456c2308f [formerly dc55cd5b5c] [formerly 2456c2308f [formerly dc55cd5b5c] [formerly aee98ecfb0 [formerly e832f6420b6363a3c951725e0d23f460b2efb42e]]]
Former-commit-id: aee98ecfb0
Former-commit-id: 3486f1f241 [formerly 4f9a2577f2]
Former-commit-id: 6245b550aa
2014-03-10 14:06:45 -05:00
Nate Jensen
45ff104294 Issue #2826 fix collaboration mosaic image disposed issue
Change-Id: I0f54a95b710c6c4e092052be08771500fbb4f614

Former-commit-id: d9af17287d [formerly 7fa8bf636f] [formerly d9af17287d [formerly 7fa8bf636f] [formerly 7bfad8ce17 [formerly 50b3e6bb7fcee54f1199b78354d404f325b32773]]]
Former-commit-id: 7bfad8ce17
Former-commit-id: cb81644412 [formerly 04d7ef0e7a]
Former-commit-id: 69bdf2bd60
2014-03-06 18:07:40 -06:00
Ben Steffensmeier
4b966138f6 Issue #2843 Harden recycle.
Former-commit-id: 22adc336df [formerly 26c1a8e494] [formerly 22adc336df [formerly 26c1a8e494] [formerly 3cd6b29e75 [formerly 364b818dbd055b13fd8d5bb9f40c16f730f30b53]]]
Former-commit-id: 3cd6b29e75
Former-commit-id: ed0ec90407 [formerly af1bdf1b53]
Former-commit-id: 2c687a4064
2014-03-05 11:16:12 -06:00
Brian Clements
f00f8eb1d9 Issue #2756 implemented HTTP public key auth scheme
collaboration HTTP server now requires auth header (configured via openfire)
added auth to cave client


Former-commit-id: 9d0b02e0a4 [formerly ce24bd1018] [formerly 9d0b02e0a4 [formerly ce24bd1018] [formerly d8e283e1b4 [formerly e0e4dfdedff283c809060257fbf04e777faf318d]]]
Former-commit-id: d8e283e1b4
Former-commit-id: f56cbac9fb [formerly edd72cbde4]
Former-commit-id: 6d4abdc37c
2014-02-28 16:15:17 -06:00
Brian Clements
1001ef1ec2 Issue #2751 fixed webDAV path issue
webDAV needs every part of the path created individually
made the userid portion of the url use the entire id URL encoded


Former-commit-id: 3f0e9d7a77 [formerly eef242194a] [formerly 3f0e9d7a77 [formerly eef242194a] [formerly 3d365a4cd2 [formerly 6211a9622c944171b78d04ef9263d26e6eed7687]]]
Former-commit-id: 3d365a4cd2
Former-commit-id: 1f5d296314 [formerly 473fcda0cf]
Former-commit-id: a102e927b1
2014-02-25 09:17:36 -06:00
Brian Clements
48cfc3c933 Issue #2751 fixed leader transfer infinite loop, added event validation
added username to paths in http urls to prevent old events from being picked up with new leader
added simple check to prevent invalid leader change events from being processed


Former-commit-id: 9217ba24c5 [formerly 3f362519aa] [formerly 9217ba24c5 [formerly 3f362519aa] [formerly 386e9cc96a [formerly 58c826ec371f10295fa6f4e236ff85a52698719d]]]
Former-commit-id: 386e9cc96a
Former-commit-id: 73cb7b7313 [formerly b9c9be4c4f]
Former-commit-id: 4abf737852
2014-02-24 13:19:07 -06:00
Ben Steffensmeier
07ffe9f711 Issue #2817 Fix image reproject. Remove deprecated mesh reproject.
Former-commit-id: 780dc19fac [formerly 70ae372303] [formerly 780dc19fac [formerly 70ae372303] [formerly e08d4f77c3 [formerly 5e5c09b701d44e8cedcad273f301bcf92f5606ec]]]
Former-commit-id: e08d4f77c3
Former-commit-id: 7aca322faa [formerly a6bf896593]
Former-commit-id: 7e29aa25a9
2014-02-21 17:37:19 -06:00
Brian Clements
9b0fd74f5b Issue #2751 implemented room/topic ownership transfer
Former-commit-id: a8ff1effc1 [formerly c3cadff705] [formerly a8ff1effc1 [formerly c3cadff705] [formerly ab72938246 [formerly cf5041f2d052c4900e2871e0fc8dc1a2b71794de]]]
Former-commit-id: ab72938246
Former-commit-id: 9d00fe2bab [formerly d9ac2c0037]
Former-commit-id: d218686d1f
2014-02-20 11:10:14 -06:00
Brian Clements
b47b194564 Issue #2751 fixed chat room bugs
fixed history messages having incorrect 'from' type
added ignore to dispose messages after room is closed
renamed tool tip for userid to match how JIDs are labled in client


Former-commit-id: 06c16118e1 [formerly dc074a9650] [formerly 06c16118e1 [formerly dc074a9650] [formerly 3a135b8eac [formerly 453604eca5fca9e5d14ba1842dc7f76f1e0180ca]]]
Former-commit-id: 3a135b8eac
Former-commit-id: 77bb396c9a [formerly bee7cdb71a]
Former-commit-id: ddc0945e40
2014-02-19 08:32:26 -06:00
Brian Clements
f866ac4365 Issue #2756 new collaboration openfire plugin and http service
new servlet http service that communicates with openfire for configuration
new openfire plugin to reflect new http service
openfire and http service no longer need to be on same machine
moved http header parsing code from ogc to common util
updated collaboration http code to prefer XML instead of HTML


Former-commit-id: f0c89ef6c6 [formerly f6b2827434] [formerly f0c89ef6c6 [formerly f6b2827434] [formerly 5b4f1e8288 [formerly ff23569984eee43927c10ca041ca7e0ca4d40a3b]]]
Former-commit-id: 5b4f1e8288
Former-commit-id: 02319f36e4 [formerly a1d9e40bd4]
Former-commit-id: 5889341612
2014-02-18 10:03:12 -06:00
Nate Jensen
65068869e1 Issue #2751 first cut of transfer leadership
Change-Id: Ia0495d8d5acfe28801ceb416090d47c250ecf0f9

Former-commit-id: 63d5f94cbb [formerly e05f1eae96] [formerly 63d5f94cbb [formerly e05f1eae96] [formerly a85575a763 [formerly cd0a838d34c9d7533bf59a477a17f4cb1af75a00]]]
Former-commit-id: a85575a763
Former-commit-id: 139479b4e1 [formerly 11fb06810f]
Former-commit-id: 70285796ac
2014-02-13 15:35:53 -06:00
Brian Clements
aa06f65038 Issue #2751 user identity refactor
VenueParticipant no longer a subtype of UserId
New interface for both
refactored base classes to be generic for user types


Former-commit-id: 16ed18e0c6 [formerly ef52908906] [formerly 16ed18e0c6 [formerly ef52908906] [formerly 0ac7ff81cf [formerly e91ae6eacf4af9e25afc213c3cd0c269c8d465f4]]]
Former-commit-id: 0ac7ff81cf
Former-commit-id: e6de3a118d [formerly 3ec3ad0543]
Former-commit-id: 1cc21dc160
2014-02-13 13:51:39 -06:00
Brian Clements
cf8b85f3d2 Issue #2698 added handles to venues
venues now handle identity differently with VenueParticipant instead of UserId
fixed alias bug due to roster entry change


Former-commit-id: 4e2cb3f7ae [formerly 3e585945d6] [formerly 4e2cb3f7ae [formerly 3e585945d6] [formerly 3250eb34f5 [formerly 9a8b011683ffe7194c48b1827d3a4f0ddf4f9627]]]
Former-commit-id: 3250eb34f5
Former-commit-id: 4190b13ae2 [formerly 4f4d5c5d69]
Former-commit-id: e04cb11154
2014-01-31 09:44:31 -06:00
Brian Clements
96e89d9f83 Issue #2698 made sessions private and invite only
removed venue info because you can't get it for private rooms
improved error handling for existing room when attempting to create
fixed default compression config


Former-commit-id: 1f1be20d41 [formerly c498307b30] [formerly 1f1be20d41 [formerly c498307b30] [formerly 5b9f694930 [formerly 850cbc03ebea6f26ac7095abffe7729985c426c4]]]
Former-commit-id: 5b9f694930
Former-commit-id: 07452b7778 [formerly 4a0682a9e8]
Former-commit-id: 76ec4d56c8
2014-01-29 10:16:15 -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
Brian Clements
d7ddaa295d Issue #2561 removed ECF from collaboration
added smack 3.3.1 to cots
collaboration now uses smack directly for XMPP
moderate code cleanup on collaboration.comm
added double click to start chat in participant list


Former-commit-id: 5d1d44b60d [formerly 8ece30944a] [formerly 5d1d44b60d [formerly 8ece30944a] [formerly e6c4b39aca [formerly 6fc85f79c126283eb4dbddfa94943523d9ff0a6d]]]
Former-commit-id: e6c4b39aca
Former-commit-id: 5a7fca6352 [formerly b8df043202]
Former-commit-id: 0cf7b822ce
2013-12-06 17:07:16 -06:00
Ben Steffensmeier
a92af46f59 Issue #2491 Fix collaboration Xml.
Former-commit-id: a5f970e238 [formerly 3d36cec7be] [formerly a5f970e238 [formerly 3d36cec7be] [formerly fdeff81da2 [formerly 64517ab3139be3cc21d5df7ff9d36709435bd7cd]]]
Former-commit-id: fdeff81da2
Former-commit-id: 89c999410e [formerly 49ffb7e92c]
Former-commit-id: a0e805ded6
2013-10-31 14:06:37 -05:00
Ben Steffensmeier
02b9133d50 Issue #2491 Bug fixes and clean up all remaining resource datas.
Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6

Former-commit-id: e15fecc459 [formerly 5b395f7417] [formerly e15fecc459 [formerly 5b395f7417] [formerly 27a392f90e [formerly 2412d6f094f98a8c24491ab43a2a88cf696758af]]]
Former-commit-id: 27a392f90e
Former-commit-id: 78efdb7572 [formerly 418c259567]
Former-commit-id: 9d87eb50e2
2013-10-29 17:35:55 -05:00
Ben Steffensmeier
47d3fb8249 Issue #2491 Fix alertviz and java 6 compatibility.
Former-commit-id: 0c66089721 [formerly 27165cea30] [formerly 0c66089721 [formerly 27165cea30] [formerly 44a6f05986 [formerly 2baf2fdd778b55b76be37503935510b057c5eb0e]]]
Former-commit-id: 44a6f05986
Former-commit-id: 0e3cf8b47f [formerly 1f33a1997e]
Former-commit-id: 0c3bb6ef3e
2013-10-28 10:14:08 -05:00
Ben Steffensmeier
866c873f71 Issue #1532 Delete uf.common.image and clean up the mess it left behind.
Former-commit-id: d27d30c2db [formerly f46686a6e2] [formerly d27d30c2db [formerly f46686a6e2] [formerly 2ca86633d6 [formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]]]
Former-commit-id: 2ca86633d6
Former-commit-id: 334af0001b [formerly 5068b18c6a]
Former-commit-id: 0778375180
2013-02-28 17:00:56 -06:00
Steve Harris
b7f180d9d3 13.1.2-6 baseline
Former-commit-id: efd3392abe [formerly 8e5f9e0e6c] [formerly efd3392abe [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]
Former-commit-id: 59969775ad
Former-commit-id: 82a1ed77a4 [formerly dbcae57f57]
Former-commit-id: 05bdc0ecd2
2013-01-06 14:55:11 -06:00
Steve Harris
35e34308c5 12.11.1-4 baseline
Former-commit-id: 98171b5de9 [formerly d3497e47eb] [formerly 98171b5de9 [formerly d3497e47eb] [formerly 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]
Former-commit-id: 6958b861f0
Former-commit-id: 2c82d9cb07 [formerly cbbdb231ce]
Former-commit-id: 560f0d9cc3
2012-10-16 13:27:07 -05:00