Brian Clements
129df50eee
Omaha #3708 collaboration feed room supports blacklists
...
refactored SiteConfigurationManager
Change-Id: I74282074862674cac6b9190adafe38ed6d607dc5
Former-commit-id: 7d4dbd204ec33a5ad562dfb43fda317d4dbd204ec33a5ad562dfb43fda312a7feaebfedfb43fda312a7feaebfe844cd86c284429a04d2c38b4d2683c53a61c3230258be9acb0
2014-10-13 11:11:32 -05:00
Brian Clements
dc45bb7100
Omaha #3705 added collaboration public room search, bookmarking
...
Change-Id: I298254111d1eb305820c313ebe176f091fe7a818
Former-commit-id: abb6b1f2581a6624d5d787964cb500abb6b1f2581a6624d5d787964cb500f0921db20c87964cb500f0921db20c49e6579115d7c864113ceac32a0fa072c5dd03d251084e6548
2014-10-09 08:38:45 -05:00
Nate Jensen
b21f03757a
Omaha #3356 remove OBE register buddies from collaboration
...
Change-Id: I49099386a48b650c9e6ea1a96b519fbc178f769f
Former-commit-id: 8b55dfa980b690c360ac8e74892cd68b55dfa980b690c360ac8e74892cd640d4abe4cd8e74892cd640d4abe4cdb4b5642b58f78e7fe79c5b2e410c6c54e9b04c3d22fa9cc6d9
2014-09-03 10:00:11 -05:00
Brian Clements
c675a2e63f
Omaha #3373 jaxb manager refactor
...
api changes
reworked ogc jaxb manager to use parent class
Change-Id: I92b4cd6a48faf80462b9ca483a4f5d6cba78de48
Former-commit-id: a3f91f92cc33684f3c97e4c85f7cd5a3f91f92cc33684f3c97e4c85f7cd5e428f257cbe4c85f7cd5e428f257cbd927196b9fcf3bc3e4f458a441076380ae53ed0f5adc1da0ac
2014-07-16 09:00:59 -05:00
Brian Clements
3ef4cf722a
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: c2ac40caecf053e9b0849d626a97e5c2ac40caecf053e9b0849d626a97e593a1ee71c49d626a97e593a1ee71c4a5f70b0e923eb4cd513ca9827ef8e87060fe3fbabb58783ca4
2014-06-20 09:04:15 -05:00
Steve Harris
fca46f9f01
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: 3e2eeedc299de49b59eacc7e6bc52a3e2eeedc299de49b59eacc7e6bc52a676948e239cc7e6bc52a676948e23927d4a11026586f56383918b2a1df08545d6da097a6d5652425
2014-06-18 08:52:25 -05:00
Brian Clements
42bfd823b5
Omaha #3078 collaboration shared display data over private chat
...
Change-Id: I0ede9310eb109adc1b08673027e9e36a68a09fbf
Former-commit-id: bb4ff41368b518cb24189a427606aebb4ff41368b518cb24189a427606aeadd8286d529a427606aeadd8286d5214f305584c13bf7e079306b7415ceca993d1f90a3702533a45
2014-06-17 14:32:17 -05:00
Brian Clements
9a00d07136
Omaha #3078 added private chat to collaboration
...
Change-Id: Ifcc4a33c1551e4209721fcc181b0becb49bdb5ae
Former-commit-id: 8fee2a762c86e89665bf37699395ef8fee2a762c86e89665bf37699395ef97a6f5bfe837699395ef97a6f5bfe88487f6388c51e260627760508bf6744433482d56cdcf7d8143
2014-06-17 11:52:58 -05:00
Brian Clements
ca995b0147
Omaha #3288 collaboration feed venue config comes from server
...
Change-Id: I5bc747507e44cc31093d7a7f470a263d0cf116c0
Former-commit-id: f38f9fae518205f7cd56b6a2bf0ae4f38f9fae518205f7cd56b6a2bf0ae484e3f967d9b6a2bf0ae484e3f967d92ffe3033244dc81aabfa5436efb886616315d8300dcfac1a44
2014-06-17 09:26:24 -05:00
Brian Clements
6a9f323dc0
Issue #2903 changed collaboration jaxb xml to be base64 encoded
...
Change-Id: I0de0db3bf455a14d747520f34ef66d986815e42c
Former-commit-id: 89a5679714909561d8715424eb025889a5679714909561d8715424eb0258ef0ecfd1d45424eb0258ef0ecfd1d4b6232bbe1f077976c9129e39c19a7d649d0cf43f88bc3a948e
2014-06-12 13:40:33 -05:00
Brian Clements
738a2c4513
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: 5bf4c253f6b5e961d6b40e18d45bdf5bf4c253f6b5e961d6b40e18d45bdf573ffcb0bf0e18d45bdf573ffcb0bfbb827663c36769aff618e4433c5e103c6a10e154008c911f03
2014-05-19 15:54:36 -05:00
Brian Clements
ab11c46c68
Omaha #3061 added better checks for when to send invite/session payloads
...
Former-commit-id: 88b8061039ee51a84f50a698d8157188b8061039ee51a84f50a698d8157101269cd989a698d8157101269cd989087c307d26c71459d36e6bf803303e2da28330cbcac498a5d4
2014-05-14 17:00:09 -05:00
Brian Clements
693be79b38
Omaha #3107 added timeout handling logic for leader transfer verification
...
Former-commit-id: 7db361813c26d206f78008a406ff187db361813c26d206f78008a406ff187b7bc5be9708a406ff187b7bc5be9787d24b248b98e74677fd3d3d7f04bb5e739b598c415ff47d51
2014-05-09 15:43:46 -05:00
Brian Clements
eae39a09dd
Omaha #3061 only shared display capable clients get payload in invite
...
Former-commit-id: 46b526473ddec51592161502354f8746b526473ddec51592161502354f87c61e30a4221502354f87c61e30a42289fbf5f2bc9d25e9dcb858f45fa7d01e3d29a3f39c7f4cd887
2014-05-05 15:29:06 -05:00
Brian Clements
52e575f833
Issue #3070 fixed contact request logic when adding to group
...
Former-commit-id: 1dc13cc1515f746c9c5617ab4f61841dc13cc1515f746c9c5617ab4f6184f1213c1bda17ab4f6184f1213c1bda922d56617fed2d66a6fafe6af8c315edaaa9a426eb318a9a0d
2014-04-25 13:41:17 -05:00
Brian Clements
d3813b0f96
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: 345fe6f866334ad3ca8102f08d75c6345fe6f866334ad3ca8102f08d75c694aa761e1902f08d75c694aa761e1932b8ddd64c84f75ca30a12304655e8c27f2d9e53670c4e1611
2014-04-24 16:10:27 -05:00
Brian Clements
9c6a004507
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: 148d158380117eeca83af3ee7b453a148d158380117eeca83af3ee7b453a6969321db0f3ee7b453a6969321db000ebd60fad50acaac1495d2ec9b909d9a1bba4c88cdeb571f3
2014-04-23 14:16:42 -05:00
Nate Jensen
96a50b7460
Merge "Issue #2903 added connection tests to session close methods" into development
...
Former-commit-id: a24262b3a9c88597b6c29ec6169646a24262b3a9c88597b6c29ec61696464a046629729ec61696464a04662972439e345f98d60701a264e9456b4ab7455f4385aaf4cefbc459
2014-04-22 12:53:08 -05:00
Brian Clements
797a972930
Issue #2903 added connection tests to session close methods
...
fixes illegal state exception problem when booted from xmpp server
Former-commit-id: 053136ccbbf9ab4f9cfe50f3f420eb053136ccbbf9ab4f9cfe50f3f420eb49f86e415350f3f420eb49f86e415315279b35c99ef018dbe8c9453a24409ea5430774d2b2106f4c
2014-04-22 12:36:40 -05:00
Brian Clements
e750a1e5a5
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: a5730ca7bdbfd88f3e141adbf6253aa5730ca7bdbfd88f3e141adbf6253a2a9d3419101adbf6253a2a9d34191038fbf8048e19c2695dca8677a9f35997c5fe6d4ad74f192819
2014-04-22 11:55:36 -05:00
Brian Clements
d63adaa204
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: 833d693098c4a38d1f686c47c78038833d693098c4a38d1f686c47c78038aed25eeb616c47c78038aed25eeb6179c5884e4556e0dad5ff474255ed29a0871fad9a24b594529a
2014-04-21 13:07:14 -05:00
Brian Clements
40f77bde75
Issue #3020 fixed error message when attempting to create already accessible room
...
Former-commit-id: 0c203cfd0757d2f28d54bfafb0d0550c203cfd0757d2f28d54bfafb0d0554a8ee65ccabfafb0d0554a8ee65cca89741a1e624829ef25bc886148981063b93498430b7e067d96
2014-04-16 14:26:17 -05:00
Brian Clements
572b7c221a
Issue #2981 fixed NPE when cached shared group deleted on server
...
Former-commit-id: 9473f1f7998a4f212fdb7afb1e66f59473f1f7998a4f212fdb7afb1e66f57fd7817af47afb1e66f57fd7817af43a6bb9f43c1daf03844c007ba2ae4d14084ee1284979fe13df
2014-04-16 09:23:26 -05:00
Brian Clements
2a8d66a9f7
Issue #2822 only allow transfer leader if participant is using shared display
...
Former-commit-id: dc1d2d39f8db67c033825250f7a442dc1d2d39f8db67c033825250f7a4426ccedc11825250f7a4426ccedc1182602794b56d6f9ef9a515e8907aa7299acb5a4a5b8945b26e9b
2014-04-15 15:15:11 -05:00
Brian Clements
19d7cef419
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: 3d8bcb87016f7851d8c48ab1bab9743d8bcb87016f7851d8c48ab1bab9746b223740468ab1bab9746b223740465b5669e1e1ca5909e2227cf5f06f2a054b47951d86081dda91
2014-04-15 15:12:33 -05:00
Mike Duff
5c337b904a
Issue #2785 - Throw error when CollaborationConnection needs connection and it doesn't exist
...
Change-Id: I2f2234da42e9210b574f7489fc37da0a63bf2133
Former-commit-id: 981306d4745e39f5a61c23474c5ead981306d4745e39f5a61c23474c5eadeafa177f4b23474c5eadeafa177f4b612ee41f8d1363155c34ee80debc366e6ac425af494c577a1b
2014-04-09 10:17:22 -05:00
Mike Duff
dc7d97752f
Issue #2785 - Change connection order of events
...
Fixed classpath
Change-Id: I15296306ee105a54379a370da7d53c7e46dc34bb
Former-commit-id: 7c9a7d609ebdde561f8aefefe62e0f7c9a7d609ebdde561f8aefefe62e0f7da1547c22efefe62e0f7da1547c226fd58b37782b67272b607145820d623c6c0824ce2b520fe31e
2014-04-08 14:14:20 -05:00
Mike Duff
7d72dbb7b7
Issue #2899 - Improve error messages.
...
Change-Id: Iba298e66d1b889fce8cde9103674c86558bd222c
Former-commit-id: b1aae9256cdc81b79ecabcdfd5a0c9b1aae9256cdc81b79ecabcdfd5a0c9d6ce901a3abcdfd5a0c9d6ce901a3a2b67428bb8be5eeafeb76453a46d963c5c496b81d664eb9199
2014-03-31 16:01:44 -05:00
Mike Duff
db4d8b76f0
Issue #2632 - Fixed notifier preference OK, Apply, Cancel actions
...
Change-Id: I9af93c4935c5d9dc6777be0e0435bb71be5f613b
Former-commit-id: 5476afd095d2eed9891ad8039864405476afd095d2eed9891ad80398644098b5fd762ed80398644098b5fd762ecd626d0555f92754f752b1d74f855e531e66cbb65e0e640336
2014-03-27 16:31:30 -05:00
Brian Clements
ac70455dc6
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: 9b6c283fc92456c2308fdc55cd5b5c9b6c283fc92456c2308fdc55cd5b5caee98ecfb0dc55cd5b5caee98ecfb067db5cb4f83486f1f2414f9a2577f26245b550aac4e9aff9fc
2014-03-10 14:06:45 -05:00
Brian Clements
e81c8368dd
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: 8aff9ee95c2afc1a931944d161729f8aff9ee95c2afc1a931944d161729fdc94769c1444d161729fdc94769c14cfe64d833aacb20cfbbeac63129ad16590587d9e975bfca460
2014-03-07 15:37:29 -06:00
Mike Duff
f061ae43a1
Issue #2798 - Fix user presence messages and settings
...
Peer review comments
Change-Id: I615edc12a7fe93540b5e62cf673b92829cac3dfa
Former-commit-id: ec892bb7a725425a4268e97e745b61ec892bb7a725425a4268e97e745b619c873e6dd9e97e745b619c873e6dd9b88162e5040251ad5bcac0bf150e1515c32a15138a798710c5
2014-03-05 14:39:55 -06:00
Brian Clements
e9604a9700
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: fd189632219d0b02e0a4ce24bd1018fd189632219d0b02e0a4ce24bd1018d8e283e1b4ce24bd1018d8e283e1b443c19f09baf56cbac9fbedd72cbde46d4abdc37cf00f8eb1d9
2014-02-28 16:15:17 -06:00
Mike Duff
60c471f48e
Issue #2632 - Implement buddy pounce (Contact Notifiers)
...
Review comments
Change-Id: I7492b84b59406cf2ddbc65d9e6fc7c0c41c30ce7
Former-commit-id: 512e634a97377c1f99985440ff64d1512e634a97377c1f99985440ff64d15f433b4f6b5440ff64d15f433b4f6b6c5c943a5e63fc5f8c66ee06fc58b502fa0d3c596c60255b75
2014-02-28 13:23:34 -06:00
Brian Clements
fcc6c7f221
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: a1739724379217ba24c53f362519aaa1739724379217ba24c53f362519aa386e9cc96a3f362519aa386e9cc96a743c6cd74b73cb7b7313b9c9be4c4f4abf73785248cfc3c933
2014-02-24 13:19:07 -06:00
Brian Clements
cbef95a1bb
Issue #2751 implemented room/topic ownership transfer
...
Former-commit-id: 4e165aba58a8ff1effc1c3cadff7054e165aba58a8ff1effc1c3cadff705ab72938246c3cadff705ab7293824608a0e5baf29d00fe2babd9ac2c0037d218686d1f9b0fd74f5b
2014-02-20 11:10:14 -06:00
Brian Clements
c420979556
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: abc01f547506c16118e1dc074a9650abc01f547506c16118e1dc074a96503a135b8eacdc074a96503a135b8eac30027665ac77bb396c9abee7cdb71addc0945e40b47b194564
2014-02-19 08:32:26 -06:00
Nate Jensen
776486ec44
Merge "Issue #2756 new collaboration openfire plugin and http service" into development
...
Former-commit-id: 961239e181ac0a10678b020d54c48a961239e181ac0a10678b020d54c48ab08d96b1e8020d54c48ab08d96b1e82f1c0109b14bb0997749a6bb05f2e33c9ebe52d3337aa2f312
2014-02-18 14:51:13 -06:00
Nate Jensen
c70fc017b8
Merge "Issue #2793 improved collaboration disconnect handling" into development
...
Former-commit-id: d4cc8b18271738248facc63289fa14d4cc8b18271738248facc63289fa14b3c45b303cc63289fa14b3c45b303c61ec0df1c92e468e9ec1173c646576b1dc1e88491e6b1343b0
2014-02-18 11:22:19 -06:00
Brian Clements
db121a4efb
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: 1c8f5dd5799095a1584fa28fcf0dc51c8f5dd5799095a1584fa28fcf0dc57028f7fd4da28fcf0dc57028f7fd4d0d7ae9a2ff9d9c4c7c27510c39713f3bf2a08c57c38397e00b
2014-02-18 11:11:33 -06:00
Brian Clements
c0da4f94d4
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: 68fac79fe7f0c89ef6c6f6b282743468fac79fe7f0c89ef6c6f6b28274345b4f1e8288f6b28274345b4f1e828874d08f1d1902319f36e4a1d9e40bd45889341612f866ac4365
2014-02-18 10:03:12 -06:00
Brian Clements
bc8a458ec1
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: ca8869b8ef6d716863323b5648c055ca8869b8ef6d716863323b5648c0553dfd8fbafb3b5648c0553dfd8fbafb430832e3e50d07e417fc9dc2967e3fcd7abc37fcfab5759a01
2014-02-17 16:39:43 -06:00
Nate Jensen
4c3bdc0dfb
Issue #2751 first cut of transfer leadership
...
Change-Id: Ia0495d8d5acfe28801ceb416090d47c250ecf0f9
Former-commit-id: 47b27c602f63d5f94cbbe05f1eae9647b27c602f63d5f94cbbe05f1eae96a85575a763e05f1eae96a85575a763740e71adba139479b4e111fb06810f70285796ac65068869e1
2014-02-13 15:35:53 -06:00
Nate Jensen
484e8d1625
Merge "Issue #2700 fixed subscribe request group input" into development
...
Former-commit-id: ec6d8585e1f2b32fa1ae2643d01b74ec6d8585e1f2b32fa1ae2643d01b74d8e2d2837e2643d01b74d8e2d2837e2772ad3c9c1f3c4090a0b31470f7e33fb847a74c1aeeeffb0d
2014-02-13 14:02:55 -06:00
Brian Clements
85c67054ae
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: 01653c76de16ed18e0c6ef5290890601653c76de16ed18e0c6ef529089060ac7ff81cfef529089060ac7ff81cf21b1a6844ae6de3a118d3ec3ad05431cc21dc160aa06f65038
2014-02-13 13:51:39 -06:00
Brian Clements
36881a8077
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: a0eb8342bf2d72c0f475579f7c826da0eb8342bf2d72c0f475579f7c826dcaa8360ac7579f7c826dcaa8360ac7d4afb01ecc46ea69990dbafe2972a48b618ea95ba3157035bc
2014-02-13 09:47:02 -06:00
Brian Clements
a6393ddba3
Issue #2797 fixed presence bug
...
a defensive copy was needed when sending presence to rooms
Former-commit-id: b8a1c8f56d22031aa87d81ddf87b04b8a1c8f56d22031aa87d81ddf87b0423e203902881ddf87b0423e2039028c322557870a1ba9c6b9d09859bdee957dd054176e286a68dc1
2014-02-12 16:54:46 -06:00
Brian Clements
1ed8ef5307
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: 87a7bf82e53034ac5994e381edcd6087a7bf82e53034ac5994e381edcd60b0714ba659e381edcd60b0714ba65985e92777e3b94bc84429440647787773241ebeb7f23e9fcea0
2014-02-12 14:22:33 -06:00
Brian Clements
1b7e747bad
Issue #2699 removed over cautious handle validation
...
xmpp does not limit the characters that can go in a handle
fixed id from room parsing to account for special characters
Former-commit-id: 6c6467d235639f7745677d6e116b9f6c6467d235639f7745677d6e116b9f6518b88fe57d6e116b9f6518b88fe50dd73fed5a6efb4f51d28742be3a13014b59e1a127f19f406a
2014-02-07 10:06:06 -06:00
Brian Clements
04f027986f
Issue #2699 fixed assumption that usersearch was exact
...
usersearch returns matches for any part of string
added method to restrict to exact matches only
Former-commit-id: ddbfe9a763bebd62c6b6cfa3c9e0e8ddbfe9a763bebd62c6b6cfa3c9e0e86ea009a2e1cfa3c9e0e86ea009a2e1876b60e15dbc75d43bc3aff354a3d79370df47fecd1b7dec1b
2014-02-03 15:34:58 -06:00
