Commit graph

68 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
Brian Clements
d577a1d181 Omaha #3709 reworked custom user color configuration
Change-Id: I8b69dc378976684e989cae883e99ade9553c04d3

Former-commit-id: 911b007d95 [formerly 3d33ce1341] [formerly 911b007d95 [formerly 3d33ce1341] [formerly 46c0d7d42c [formerly 18825c076fe273c9ae2e8040ccea2de0698b2877]]]
Former-commit-id: 46c0d7d42c
Former-commit-id: 42d54b3dac [formerly c354fa93db]
Former-commit-id: 29ec52418c
2015-01-12 11:06:57 -06:00
Brian Clements
258be9acb0 Omaha #3708 collaboration feed room supports blacklists
refactored SiteConfigurationManager

Change-Id: I74282074862674cac6b9190adafe38ed6d607dc5

Former-commit-id: c33a5ad562 [formerly dfb43fda31] [formerly c33a5ad562 [formerly dfb43fda31] [formerly 2a7feaebfe [formerly 9b2e76141b7cdd49c145d9d54f83e49ba3ea0d78]]]
Former-commit-id: 2a7feaebfe
Former-commit-id: 4429a04d2c [formerly 38b4d2683c]
Former-commit-id: 53a61c3230
2014-10-13 11:11:32 -05:00
Brian Clements
51084e6548 Omaha #3705 added collaboration public room search, bookmarking
Change-Id: I298254111d1eb305820c313ebe176f091fe7a818

Former-commit-id: 1a6624d5d7 [formerly 87964cb500] [formerly 1a6624d5d7 [formerly 87964cb500] [formerly f0921db20c [formerly 919c816ba7af2082b9dcb0308128fa1b228475d2]]]
Former-commit-id: f0921db20c
Former-commit-id: d7c864113c [formerly eac32a0fa0]
Former-commit-id: 72c5dd03d2
2014-10-09 08:38:45 -05: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
Brian Clements
5adc1da0ac Omaha #3373 jaxb manager refactor
api changes
reworked ogc jaxb manager to use parent class

Change-Id: I92b4cd6a48faf80462b9ca483a4f5d6cba78de48

Former-commit-id: 33684f3c97 [formerly e4c85f7cd5] [formerly 33684f3c97 [formerly e4c85f7cd5] [formerly e428f257cb [formerly 125c31f035057676d8c97a9b6c7a1d7b1b7f5bcb]]]
Former-commit-id: e428f257cb
Former-commit-id: cf3bc3e4f4 [formerly 58a4410763]
Former-commit-id: 80ae53ed0f
2014-07-16 09:00:59 -05:00
Brian Clements
bb58783ca4 Omaha #3281 peer2peer chat view improvements
bounced chat messages now result in error messages in window
fixed view secondary id bug with userids (removed resource from key)

Change-Id: I76a68bf290b0c5205361bc6c78fda99336d7c62d

Former-commit-id: f053e9b084 [formerly 9d626a97e5] [formerly f053e9b084 [formerly 9d626a97e5] [formerly 93a1ee71c4 [formerly a31b7f213081f384bd23d53a431ce53593254c25]]]
Former-commit-id: 93a1ee71c4
Former-commit-id: 3eb4cd513c [formerly a9827ef8e8]
Former-commit-id: 7060fe3fba
2014-06-20 09:04:15 -05:00
Steve Harris
a6d5652425 Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts (these go to ufcore):
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/AbstractGraphicsTarget.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/cmenu/ChangePointStyleAction.java


Former-commit-id: 9de49b59ea [formerly cc7e6bc52a] [formerly 9de49b59ea [formerly cc7e6bc52a] [formerly 676948e239 [formerly da50f581c90ea0cca5f43c45c44cb8ac045a6c8c]]]
Former-commit-id: 676948e239
Former-commit-id: 586f563839 [formerly 18b2a1df08]
Former-commit-id: 545d6da097
2014-06-18 08:52:25 -05:00
Brian Clements
3702533a45 Omaha #3078 collaboration shared display data over private chat
Change-Id: I0ede9310eb109adc1b08673027e9e36a68a09fbf

Former-commit-id: b518cb2418 [formerly 9a427606ae] [formerly b518cb2418 [formerly 9a427606ae] [formerly add8286d52 [formerly a51847aff197f805a4e48c9ecdb0c16f874e6a78]]]
Former-commit-id: add8286d52
Former-commit-id: 13bf7e0793 [formerly 06b7415cec]
Former-commit-id: a993d1f90a
2014-06-17 14:32:17 -05:00
Brian Clements
cdcf7d8143 Omaha #3078 added private chat to collaboration
Change-Id: Ifcc4a33c1551e4209721fcc181b0becb49bdb5ae

Former-commit-id: 86e89665bf [formerly 37699395ef] [formerly 86e89665bf [formerly 37699395ef] [formerly 97a6f5bfe8 [formerly 93f7d7088e7d7888a878558c6f2fcc368bf3ab05]]]
Former-commit-id: 97a6f5bfe8
Former-commit-id: 51e2606277 [formerly 60508bf674]
Former-commit-id: 4433482d56
2014-06-17 11:52:58 -05:00
Brian Clements
0dcfac1a44 Omaha #3288 collaboration feed venue config comes from server
Change-Id: I5bc747507e44cc31093d7a7f470a263d0cf116c0

Former-commit-id: 8205f7cd56 [formerly b6a2bf0ae4] [formerly 8205f7cd56 [formerly b6a2bf0ae4] [formerly 84e3f967d9 [formerly baab2ea12e1117446295ae60bc06228eb6139895]]]
Former-commit-id: 84e3f967d9
Former-commit-id: 4dc81aabfa [formerly 5436efb886]
Former-commit-id: 616315d830
2014-06-17 09:26:24 -05:00
Brian Clements
88bc3a948e Issue #2903 changed collaboration jaxb xml to be base64 encoded
Change-Id: I0de0db3bf455a14d747520f34ef66d986815e42c

Former-commit-id: 909561d871 [formerly 5424eb0258] [formerly 909561d871 [formerly 5424eb0258] [formerly ef0ecfd1d4 [formerly afcfdf1ed08cd64deb085b909f0965e4ab68d92d]]]
Former-commit-id: ef0ecfd1d4
Former-commit-id: 077976c912 [formerly 9e39c19a7d]
Former-commit-id: 649d0cf43f
2014-06-12 13:40:33 -05:00
Brian Clements
008c911f03 Omaha #3180 fixed inviting strangers and multiple users in collaboration
can now invite users to session from search dialog
fixed bug where only first person in selection would be invited


Former-commit-id: b5e961d6b4 [formerly 0e18d45bdf] [formerly b5e961d6b4 [formerly 0e18d45bdf] [formerly 573ffcb0bf [formerly 2509bb6d8c28cb78adc8fd4380d16a0f8f0d8acb]]]
Former-commit-id: 573ffcb0bf
Former-commit-id: 6769aff618 [formerly e4433c5e10]
Former-commit-id: 3c6a10e154
2014-05-19 15:54:36 -05:00
Brian Clements
cac498a5d4 Omaha #3061 added better checks for when to send invite/session payloads
Former-commit-id: ee51a84f50 [formerly a698d81571] [formerly ee51a84f50 [formerly a698d81571] [formerly 01269cd989 [formerly 073d3c10ac7c5e9cd6f5e34864ec0261219cbfd5]]]
Former-commit-id: 01269cd989
Former-commit-id: c71459d36e [formerly 6bf803303e]
Former-commit-id: 2da28330cb
2014-05-14 17:00:09 -05:00
Brian Clements
415ff47d51 Omaha #3107 added timeout handling logic for leader transfer verification
Former-commit-id: 26d206f780 [formerly 08a406ff18] [formerly 26d206f780 [formerly 08a406ff18] [formerly 7b7bc5be97 [formerly 294a489ba547bf90df9d6b6a5107c8993c5b8333]]]
Former-commit-id: 7b7bc5be97
Former-commit-id: 98e74677fd [formerly 3d3d7f04bb]
Former-commit-id: 5e739b598c
2014-05-09 15:43:46 -05:00
Brian Clements
9c7f4cd887 Omaha #3061 only shared display capable clients get payload in invite
Former-commit-id: dec5159216 [formerly 1502354f87] [formerly dec5159216 [formerly 1502354f87] [formerly c61e30a422 [formerly 6595f5be37941f35c33b46231deef7d41e967380]]]
Former-commit-id: c61e30a422
Former-commit-id: 9d25e9dcb8 [formerly 58f45fa7d0]
Former-commit-id: 1e3d29a3f3
2014-05-05 15:29:06 -05:00
Brian Clements
eb318a9a0d Issue #3070 fixed contact request logic when adding to group
Former-commit-id: 5f746c9c56 [formerly 17ab4f6184] [formerly 5f746c9c56 [formerly 17ab4f6184] [formerly f1213c1bda [formerly 57120491452b36bf15227bd4b6d0236221c71124]]]
Former-commit-id: f1213c1bda
Former-commit-id: ed2d66a6fa [formerly fe6af8c315]
Former-commit-id: edaaa9a426
2014-04-25 13:41:17 -05:00
Brian Clements
670c4e1611 Issue #3070 fixed contact request handling
no longer get empty group if user denies contact request
fixed UI update issue when server removes from your roster
added icon for pending contact request
fixed auto accept reply from users you initiated contact request with


Former-commit-id: 334ad3ca81 [formerly 02f08d75c6] [formerly 334ad3ca81 [formerly 02f08d75c6] [formerly 94aa761e19 [formerly 01e773fb9d4ec8b0ab75ddf714b79debb9ad4096]]]
Former-commit-id: 94aa761e19
Former-commit-id: 84f75ca30a [formerly 12304655e8]
Former-commit-id: c27f2d9e53
2014-04-24 16:10:27 -05:00
Brian Clements
8cdeb571f3 Issue #2822 shared display invitations always go to cave
if user is logged in to a client that supports shared displays, invites always go there
behaviour unchanged if not logged into a client that supports shared displays
added better resource name than 'Smack' for cave clients


Former-commit-id: 117eeca83a [formerly f3ee7b453a] [formerly 117eeca83a [formerly f3ee7b453a] [formerly 6969321db0 [formerly 796e4dcd2d81d8b34ae835dbe8443fd56ba873e3]]]
Former-commit-id: 6969321db0
Former-commit-id: 50acaac149 [formerly 5d2ec9b909]
Former-commit-id: d9a1bba4c8
2014-04-23 14:16:42 -05:00
Nate Jensen
f4cefbc459 Merge "Issue #2903 added connection tests to session close methods" into development
Former-commit-id: c88597b6c2 [formerly 9ec6169646] [formerly c88597b6c2 [formerly 9ec6169646] [formerly 4a04662972 [formerly 81b95799744bd155cc0df1147bb8a5372ea2fee4]]]
Former-commit-id: 4a04662972
Former-commit-id: d60701a264 [formerly e9456b4ab7]
Former-commit-id: 455f4385aa
2014-04-22 12:53:08 -05:00
Brian Clements
d2b2106f4c Issue #2903 added connection tests to session close methods
fixes illegal state exception problem when booted from xmpp server


Former-commit-id: f9ab4f9cfe [formerly 50f3f420eb] [formerly f9ab4f9cfe [formerly 50f3f420eb] [formerly 49f86e4153 [formerly d570c81caed35576e867df15c2a8d900135fef5f]]]
Former-commit-id: 49f86e4153
Former-commit-id: 9ef018dbe8 [formerly c9453a2440]
Former-commit-id: 9ea5430774
2014-04-22 12:36:40 -05:00
Brian Clements
d74f192819 Issue #3056 made venue participant equals method case insensitive
needed since collaboration server lower cases room names
lower cased on creation so in memory matches what is on the server


Former-commit-id: bfd88f3e14 [formerly 1adbf6253a] [formerly bfd88f3e14 [formerly 1adbf6253a] [formerly 2a9d341910 [formerly 7a2423f4a90597706e52ce0f89bacb1a0e10f067]]]
Former-commit-id: 2a9d341910
Former-commit-id: 19c2695dca [formerly 8677a9f359]
Former-commit-id: 97c5fe6d4a
2014-04-22 11:55:36 -05:00
Brian Clements
24b594529a Issue #2822 fixed check for topic subscription before leader transfer
now only checks if the bare ID (no resource) is subscribed to topic
added method to check for same ID using multiple handles


Former-commit-id: c4a38d1f68 [formerly 6c47c78038] [formerly c4a38d1f68 [formerly 6c47c78038] [formerly aed25eeb61 [formerly 09d7a1113a6254d8f01cf42d863e9365aac23cc7]]]
Former-commit-id: aed25eeb61
Former-commit-id: 56e0dad5ff [formerly 474255ed29]
Former-commit-id: a0871fad9a
2014-04-21 13:07:14 -05:00
Brian Clements
0b7e067d96 Issue #3020 fixed error message when attempting to create already accessible room
Former-commit-id: 57d2f28d54 [formerly bfafb0d055] [formerly 57d2f28d54 [formerly bfafb0d055] [formerly 4a8ee65cca [formerly 738e4cb06a549e6067274af033cc7ba725b1a8e2]]]
Former-commit-id: 4a8ee65cca
Former-commit-id: 4829ef25bc [formerly 8861489810]
Former-commit-id: 63b9349843
2014-04-16 14:26:17 -05:00
Brian Clements
4979fe13df Issue #2981 fixed NPE when cached shared group deleted on server
Former-commit-id: 8a4f212fdb [formerly 7afb1e66f5] [formerly 8a4f212fdb [formerly 7afb1e66f5] [formerly 7fd7817af4 [formerly 8ee453e3f5256d3ffed255aaebc792155001bc8e]]]
Former-commit-id: 7fd7817af4
Former-commit-id: 1daf03844c [formerly 007ba2ae4d]
Former-commit-id: 14084ee128
2014-04-16 09:23:26 -05:00
Brian Clements
8945b26e9b Issue #2822 only allow transfer leader if participant is using shared display
Former-commit-id: db67c03382 [formerly 5250f7a442] [formerly db67c03382 [formerly 5250f7a442] [formerly 6ccedc1182 [formerly af9577548e40397c67f72eb60485ee8de48f169b]]]
Former-commit-id: 6ccedc1182
Former-commit-id: 6f9ef9a515 [formerly e8907aa729]
Former-commit-id: 9acb5a4a5b
2014-04-15 15:15:11 -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
Mike Duff
494c577a1b Issue #2785 - Throw error when CollaborationConnection needs connection and it doesn't exist
Change-Id: I2f2234da42e9210b574f7489fc37da0a63bf2133

Former-commit-id: 5e39f5a61c [formerly 23474c5ead] [formerly 5e39f5a61c [formerly 23474c5ead] [formerly eafa177f4b [formerly a1f94a19ba7f0bff7bbf76fa24ff6ace9019d0f1]]]
Former-commit-id: eafa177f4b
Former-commit-id: 1363155c34 [formerly ee80debc36]
Former-commit-id: 6e6ac425af
2014-04-09 10:17:22 -05:00
Mike Duff
2b520fe31e Issue #2785 - Change connection order of events
Fixed classpath
Change-Id: I15296306ee105a54379a370da7d53c7e46dc34bb

Former-commit-id: bdde561f8a [formerly efefe62e0f] [formerly bdde561f8a [formerly efefe62e0f] [formerly 7da1547c22 [formerly a2d595f4232e86606f7e2338ece59961649080a3]]]
Former-commit-id: 7da1547c22
Former-commit-id: 2b67272b60 [formerly 7145820d62]
Former-commit-id: 3c6c0824ce
2014-04-08 14:14:20 -05:00
Mike Duff
d664eb9199 Issue #2899 - Improve error messages.
Change-Id: Iba298e66d1b889fce8cde9103674c86558bd222c

Former-commit-id: dc81b79eca [formerly bcdfd5a0c9] [formerly dc81b79eca [formerly bcdfd5a0c9] [formerly d6ce901a3a [formerly e83da0adee12900da03cb4b273a90d13fc5fc327]]]
Former-commit-id: d6ce901a3a
Former-commit-id: be5eeafeb7 [formerly 6453a46d96]
Former-commit-id: 3c5c496b81
2014-03-31 16:01:44 -05:00
Mike Duff
5e0e640336 Issue #2632 - Fixed notifier preference OK, Apply, Cancel actions
Change-Id: I9af93c4935c5d9dc6777be0e0435bb71be5f613b

Former-commit-id: d2eed9891a [formerly d803986440] [formerly d2eed9891a [formerly d803986440] [formerly 98b5fd762e [formerly a50bd58e95a929fe569f5df68dd4d4a8b6625807]]]
Former-commit-id: 98b5fd762e
Former-commit-id: f92754f752 [formerly b1d74f855e]
Former-commit-id: 531e66cbb6
2014-03-27 16:31:30 -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
Brian Clements
975bfca460 Issue #2751 ensured that room admins know real userids
the server can be queried for userids by room admins
this does not update the stored participant info in muc
added cached, on-demand check for userid for participants
needed for leadership transfer


Former-commit-id: 2afc1a9319 [formerly 44d161729f] [formerly 2afc1a9319 [formerly 44d161729f] [formerly dc94769c14 [formerly b3bf76b676b7e75559236d67c687cd5011859a8b]]]
Former-commit-id: dc94769c14
Former-commit-id: acb20cfbbe [formerly ac63129ad1]
Former-commit-id: 6590587d9e
2014-03-07 15:37:29 -06:00
Mike Duff
8a798710c5 Issue #2798 - Fix user presence messages and settings
Peer review comments

Change-Id: I615edc12a7fe93540b5e62cf673b92829cac3dfa

Former-commit-id: 25425a4268 [formerly e97e745b61] [formerly 25425a4268 [formerly e97e745b61] [formerly 9c873e6dd9 [formerly b087558dce4e19596c93d47e986af50fae806a74]]]
Former-commit-id: 9c873e6dd9
Former-commit-id: 0251ad5bca [formerly c0bf150e15]
Former-commit-id: 15c32a1513
2014-03-05 14:39:55 -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
Mike Duff
6c60255b75 Issue #2632 - Implement buddy pounce (Contact Notifiers)
Review comments

Change-Id: I7492b84b59406cf2ddbc65d9e6fc7c0c41c30ce7

Former-commit-id: 377c1f9998 [formerly 5440ff64d1] [formerly 377c1f9998 [formerly 5440ff64d1] [formerly 5f433b4f6b [formerly 8ece6e53095ee80d7d4baa249125b3fe7a03add7]]]
Former-commit-id: 5f433b4f6b
Former-commit-id: 63fc5f8c66 [formerly ee06fc58b5]
Former-commit-id: 02fa0d3c59
2014-02-28 13:23:34 -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
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
Nate Jensen
337aa2f312 Merge "Issue #2756 new collaboration openfire plugin and http service" into development
Former-commit-id: ac0a10678b [formerly 020d54c48a] [formerly ac0a10678b [formerly 020d54c48a] [formerly b08d96b1e8 [formerly e483f4311d00726f023d30e6d3f4e813c559390e]]]
Former-commit-id: b08d96b1e8
Former-commit-id: 4bb0997749 [formerly a6bb05f2e3]
Former-commit-id: 3c9ebe52d3
2014-02-18 14:51:13 -06:00
Nate Jensen
1e6b1343b0 Merge "Issue #2793 improved collaboration disconnect handling" into development
Former-commit-id: 1738248fac [formerly c63289fa14] [formerly 1738248fac [formerly c63289fa14] [formerly b3c45b303c [formerly bf0a607b05ffb042e998d2c9940091137da21dc0]]]
Former-commit-id: b3c45b303c
Former-commit-id: 2e468e9ec1 [formerly 173c646576]
Former-commit-id: b1dc1e8849
2014-02-18 11:22:19 -06:00
Brian Clements
c38397e00b Issue #2793 improved collaboration disconnect handling
collaboration was being shutdown even though smack was trying to reconnect
changed to notify of disconnect, but not shutdown until reconnect fails


Former-commit-id: 9095a1584f [formerly a28fcf0dc5] [formerly 9095a1584f [formerly a28fcf0dc5] [formerly 7028f7fd4d [formerly 231c3cd84e3c86caba81708581be911e771aa774]]]
Former-commit-id: 7028f7fd4d
Former-commit-id: 9d9c4c7c27 [formerly 510c39713f]
Former-commit-id: 3bf2a08c57
2014-02-18 11:11:33 -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
Brian Clements
fab5759a01 Issue #2800 added equals/hashcode to classes used in roster tree
tree view uses hashmap to decide if a node is new
tree was collapsing groups/sessions on refresh since it thought they were new nodes


Former-commit-id: 6d71686332 [formerly 3b5648c055] [formerly 6d71686332 [formerly 3b5648c055] [formerly 3dfd8fbafb [formerly 9a4b091f7e2655f48fd061021d161c4eb2e63dd8]]]
Former-commit-id: 3dfd8fbafb
Former-commit-id: 0d07e417fc [formerly 9dc2967e3f]
Former-commit-id: cd7abc37fc
2014-02-17 16:39:43 -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
Nate Jensen
1aeeeffb0d Merge "Issue #2700 fixed subscribe request group input" into development
Former-commit-id: f2b32fa1ae [formerly 2643d01b74] [formerly f2b32fa1ae [formerly 2643d01b74] [formerly d8e2d2837e [formerly af0e70e20c2a5ca276e9b819285d34c0113cafe7]]]
Former-commit-id: d8e2d2837e
Former-commit-id: 1f3c4090a0 [formerly b31470f7e3]
Former-commit-id: 3fb847a74c
2014-02-13 14:02:55 -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
a3157035bc Issue #2700 fixed subscribe request group input
user was being added to roster twice, the second time overwrote the group info
changed dialog to pass group info back so we only add once


Former-commit-id: 2d72c0f475 [formerly 579f7c826d] [formerly 2d72c0f475 [formerly 579f7c826d] [formerly caa8360ac7 [formerly 0c4a7915870f374cb4e728303939335cb0691c84]]]
Former-commit-id: caa8360ac7
Former-commit-id: 46ea69990d [formerly bafe2972a4]
Former-commit-id: 8b618ea95b
2014-02-13 09:47:02 -06:00
Brian Clements
e286a68dc1 Issue #2797 fixed presence bug
a defensive copy was needed when sending presence to rooms


Former-commit-id: 22031aa87d [formerly 81ddf87b04] [formerly 22031aa87d [formerly 81ddf87b04] [formerly 23e2039028 [formerly d0dab4bce76b45b71f4238d5a04c440cee936eaf]]]
Former-commit-id: 23e2039028
Former-commit-id: a1ba9c6b9d [formerly 09859bdee9]
Former-commit-id: 57dd054176
2014-02-12 16:54:46 -06:00
Brian Clements
f23e9fcea0 Issue #2793 improved error handling for packet extension
any exception thrown while parsing packets disconnects stream
changed to logging parsing problems and returning empty payload so we stay connected
added null check when sending to topic


Former-commit-id: 3034ac5994 [formerly e381edcd60] [formerly 3034ac5994 [formerly e381edcd60] [formerly b0714ba659 [formerly 808727ce287116be8c8e2a93ce0fc4b3a996c0ef]]]
Former-commit-id: b0714ba659
Former-commit-id: b94bc84429 [formerly 4406477877]
Former-commit-id: 73241ebeb7
2014-02-12 14:22:33 -06:00