Commit graph

21 commits

Author SHA1 Message Date
Nate Jensen
488451e9aa Issue #2826 fix collaboration mosaic image disposed issue
Change-Id: I0f54a95b710c6c4e092052be08771500fbb4f614

Former-commit-id: 95bc80c8d0 [formerly d9af17287d] [formerly 7fa8bf636f] [formerly 7bfad8ce17 [formerly 7fa8bf636f [formerly 50b3e6bb7fcee54f1199b78354d404f325b32773]]]
Former-commit-id: 7bfad8ce17
Former-commit-id: 41f274281fde4fea1d15e1e1d46e9ffa39d95f5d [formerly 04d7ef0e7a]
Former-commit-id: cb81644412
2014-03-06 18:07:40 -06:00
Ben Steffensmeier
be60a9564d Issue #2843 Harden recycle.
Former-commit-id: 291d5f55df [formerly 22adc336df] [formerly 26c1a8e494] [formerly 3cd6b29e75 [formerly 26c1a8e494 [formerly 364b818dbd055b13fd8d5bb9f40c16f730f30b53]]]
Former-commit-id: 3cd6b29e75
Former-commit-id: 202049adf2dd36c8c9f4cee72fdf77a6f408f169 [formerly af1bdf1b53]
Former-commit-id: ed0ec90407
2014-03-05 11:16:12 -06:00
Brian Clements
43c19f09ba 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: fd18963221 [formerly 9d0b02e0a4] [formerly ce24bd1018] [formerly d8e283e1b4 [formerly ce24bd1018 [formerly e0e4dfdedff283c809060257fbf04e777faf318d]]]
Former-commit-id: d8e283e1b4
Former-commit-id: effe9ab4a85983edf2b983ee5e4b964df8a78343 [formerly edd72cbde4]
Former-commit-id: f56cbac9fb
2014-02-28 16:15:17 -06:00
Brian Clements
408b834fc6 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: 9597ce5cd9 [formerly 3f0e9d7a77] [formerly eef242194a] [formerly 3d365a4cd2 [formerly eef242194a [formerly 6211a9622c944171b78d04ef9263d26e6eed7687]]]
Former-commit-id: 3d365a4cd2
Former-commit-id: afda13c403f6099ee52fb2149ecc71798cd4f1b6 [formerly 473fcda0cf]
Former-commit-id: 1f5d296314
2014-02-25 09:17:36 -06:00
Brian Clements
743c6cd74b 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: a173972437 [formerly 9217ba24c5] [formerly 3f362519aa] [formerly 386e9cc96a [formerly 3f362519aa [formerly 58c826ec371f10295fa6f4e236ff85a52698719d]]]
Former-commit-id: 386e9cc96a
Former-commit-id: 83e8dc39015b780c38746e7cdc688605acdb3a6e [formerly b9c9be4c4f]
Former-commit-id: 73cb7b7313
2014-02-24 13:19:07 -06:00
Ben Steffensmeier
d27c21b9f6 Issue #2817 Fix image reproject. Remove deprecated mesh reproject.
Former-commit-id: 152980350c [formerly 780dc19fac] [formerly 70ae372303] [formerly e08d4f77c3 [formerly 70ae372303 [formerly 5e5c09b701d44e8cedcad273f301bcf92f5606ec]]]
Former-commit-id: e08d4f77c3
Former-commit-id: c293b1124e59af7c01e948de86093eee22fbb5d9 [formerly a6bf896593]
Former-commit-id: 7aca322faa
2014-02-21 17:37:19 -06:00
Brian Clements
08a0e5baf2 Issue #2751 implemented room/topic ownership transfer
Former-commit-id: 4e165aba58 [formerly a8ff1effc1] [formerly c3cadff705] [formerly ab72938246 [formerly c3cadff705 [formerly cf5041f2d052c4900e2871e0fc8dc1a2b71794de]]]
Former-commit-id: ab72938246
Former-commit-id: d96f62f0208dbdcb69677a9d6b014fc0a7761a39 [formerly d9ac2c0037]
Former-commit-id: 9d00fe2bab
2014-02-20 11:10:14 -06:00
Brian Clements
30027665ac 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: abc01f5475 [formerly 06c16118e1] [formerly 73ae2145ee1dd7c24b67f28a479521c8624012a8 [formerly dc074a9650]] [formerly 3a135b8eac [formerly dc074a9650 [formerly 453604eca5fca9e5d14ba1842dc7f76f1e0180ca]]]
Former-commit-id: 3a135b8eac
Former-commit-id: 7c130f893c124249133b51cb750375f7ea62663d [formerly bee7cdb71a]
Former-commit-id: 77bb396c9a
2014-02-19 08:32:26 -06:00
Brian Clements
74d08f1d19 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: 68fac79fe7 [formerly f0c89ef6c6] [formerly f6b2827434] [formerly 5b4f1e8288 [formerly f6b2827434 [formerly ff23569984eee43927c10ca041ca7e0ca4d40a3b]]]
Former-commit-id: 5b4f1e8288
Former-commit-id: 9b1edc285732dbc80b9bea2223564bca70eef005 [formerly a1d9e40bd4]
Former-commit-id: 02319f36e4
2014-02-18 10:03:12 -06:00
Nate Jensen
740e71adba Issue #2751 first cut of transfer leadership
Change-Id: Ia0495d8d5acfe28801ceb416090d47c250ecf0f9

Former-commit-id: 47b27c602f [formerly 63d5f94cbb] [formerly e05f1eae96] [formerly a85575a763 [formerly e05f1eae96 [formerly cd0a838d34c9d7533bf59a477a17f4cb1af75a00]]]
Former-commit-id: a85575a763
Former-commit-id: 759372ba16bb02e06f0e8472c362cf3299be0ff5 [formerly 11fb06810f]
Former-commit-id: 139479b4e1
2014-02-13 15:35:53 -06:00
Brian Clements
21b1a6844a 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: 01653c76de [formerly 16ed18e0c6] [formerly ef52908906] [formerly 0ac7ff81cf [formerly ef52908906 [formerly e91ae6eacf4af9e25afc213c3cd0c269c8d465f4]]]
Former-commit-id: 0ac7ff81cf
Former-commit-id: 01dac7e88270bd83aeb03bd3e6b701e82c5f1b0b [formerly 3ec3ad0543]
Former-commit-id: e6de3a118d
2014-02-13 13:51:39 -06:00
Brian Clements
35b53a61cd 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: bd410b2529 [formerly 4e2cb3f7ae] [formerly 3e585945d6] [formerly 3250eb34f5 [formerly 3e585945d6 [formerly 9a8b011683ffe7194c48b1827d3a4f0ddf4f9627]]]
Former-commit-id: 3250eb34f5
Former-commit-id: 15ea8433323667869df6df396f6377d11f2a7079 [formerly 4f4d5c5d69]
Former-commit-id: 4190b13ae2
2014-01-31 09:44:31 -06:00
Brian Clements
a225d12692 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: 190400fc34 [formerly 1f1be20d41] [formerly c498307b30] [formerly 5b9f694930 [formerly c498307b30 [formerly 850cbc03ebea6f26ac7095abffe7729985c426c4]]]
Former-commit-id: 5b9f694930
Former-commit-id: ceb8a89c7f4c8cc41774e50c75969cbdacc6d919 [formerly 4a0682a9e8]
Former-commit-id: 07452b7778
2014-01-29 10:16:15 -06:00
Brian Clements
64dda165db 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: c2b759b38e [formerly 2c20a87634] [formerly 80650337ce] [formerly ce0a34b53c [formerly 80650337ce [formerly 3781483ef6dd1889aa0ecd6ccc83bfb2461713b5]]]
Former-commit-id: ce0a34b53c
Former-commit-id: 698a51437531736c124a805026ea7ca5cd199699 [formerly 4015dc23ee]
Former-commit-id: d58f8d7134
2013-12-19 12:08:21 -06:00
Brian Clements
4d04f6edbf 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: d0d14ec091 [formerly 5d1d44b60d] [formerly 8ece30944a] [formerly e6c4b39aca [formerly 8ece30944a [formerly 6fc85f79c126283eb4dbddfa94943523d9ff0a6d]]]
Former-commit-id: e6c4b39aca
Former-commit-id: ea97705eee929964d9b775519d5de735e490a0d4 [formerly b8df043202]
Former-commit-id: 5a7fca6352
2013-12-06 17:07:16 -06:00
Ben Steffensmeier
d27369f59b Issue #2491 Fix collaboration Xml.
Former-commit-id: 0bcf7f77c0 [formerly a5f970e238] [formerly 76b03c41b24dd6bcae696afd2a7ee339f6c0f727 [formerly 3d36cec7be]] [formerly fdeff81da2 [formerly 3d36cec7be [formerly 64517ab3139be3cc21d5df7ff9d36709435bd7cd]]]
Former-commit-id: fdeff81da2
Former-commit-id: 6d36de8b83b8bd6d75e28507dfdb4314d2a89f81 [formerly 49ffb7e92c]
Former-commit-id: 89c999410e
2013-10-31 14:06:37 -05:00
Ben Steffensmeier
8ec09e8f61 Issue #2491 Bug fixes and clean up all remaining resource datas.
Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6

Former-commit-id: a4cbc8020a [formerly e15fecc459] [formerly 5b395f7417] [formerly 27a392f90e [formerly 5b395f7417 [formerly 2412d6f094f98a8c24491ab43a2a88cf696758af]]]
Former-commit-id: 27a392f90e
Former-commit-id: 08cc956d9a9abcf58a33328430ea1253b6f6e00d [formerly 418c259567]
Former-commit-id: 78efdb7572
2013-10-29 17:35:55 -05:00
Ben Steffensmeier
2400380daf Issue #2491 Fix alertviz and java 6 compatibility.
Former-commit-id: ef2a281d45 [formerly 0c66089721] [formerly 27165cea30] [formerly 44a6f05986 [formerly 27165cea30 [formerly 2baf2fdd778b55b76be37503935510b057c5eb0e]]]
Former-commit-id: 44a6f05986
Former-commit-id: 82a83e55a2fa0b6a003492ed127ecae2ee7df8d2 [formerly 1f33a1997e]
Former-commit-id: 0e3cf8b47f
2013-10-28 10:14:08 -05:00
Ben Steffensmeier
4936191404 Issue #1532 Delete uf.common.image and clean up the mess it left behind.
Former-commit-id: 8e2333d0d7 [formerly d27d30c2db] [formerly f46686a6e2] [formerly 2ca86633d6 [formerly f46686a6e2 [formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]]]
Former-commit-id: 2ca86633d6
Former-commit-id: fa7abe8431fbbdea60e6504cd61a867956d20856 [formerly 5068b18c6a]
Former-commit-id: 334af0001b
2013-02-28 17:00:56 -06:00
Steve Harris
fe763963e9 13.1.2-6 baseline
Former-commit-id: 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]
Former-commit-id: 59969775ad
Former-commit-id: fa884fbcd584330564fea44a1538e11036e753a8 [formerly dbcae57f57]
Former-commit-id: 82a1ed77a4
2013-01-06 14:55:11 -06:00
Steve Harris
c9b563338a 12.11.1-4 baseline
Former-commit-id: 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]
Former-commit-id: 6958b861f0
Former-commit-id: d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce]
Former-commit-id: 2c82d9cb07
2012-10-16 13:27:07 -05:00