Commit graph

69 commits

Author SHA1 Message Date
Brian Clements
a7e397d999 Omaha #4117 fix 14.3/14.4 shared display interoperability bug
14.4 now defaults to sending directly to user id (if known)

Change-Id: Id0d78a6f6287cebe7b6f110143b1b6a735078e5d

Former-commit-id: 62a0f31c60 [formerly 2d98b0616a [formerly 424c3630897847a6b2362418618d0806093223ce]]
Former-commit-id: 2d98b0616a
Former-commit-id: 9485b0354e
2015-02-12 09:34:38 -06:00
Brian Clements
38aa18a7e0 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: 8cc1aa9f33 [formerly 1c2d8e01d0 [formerly c0cd560fb1b6e8c04047c0d7b7d407e9072f0cec]]
Former-commit-id: 1c2d8e01d0
Former-commit-id: 17ccb3ab66
2015-01-14 13:00:25 -06:00
Brian Clements
63041f1980 Omaha #3709 reworked custom user color configuration
Change-Id: I8b69dc378976684e989cae883e99ade9553c04d3

Former-commit-id: 46c0d7d42c [formerly 3d33ce1341 [formerly 18825c076fe273c9ae2e8040ccea2de0698b2877]]
Former-commit-id: 3d33ce1341
Former-commit-id: 911b007d95
2015-01-12 11:06:57 -06:00
Brian Clements
7d4dbd204e Omaha #3708 collaboration feed room supports blacklists
refactored SiteConfigurationManager

Change-Id: I74282074862674cac6b9190adafe38ed6d607dc5

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

Former-commit-id: f0921db20c [formerly 87964cb500 [formerly 919c816ba7af2082b9dcb0308128fa1b228475d2]]
Former-commit-id: 87964cb500
Former-commit-id: 1a6624d5d7
2014-10-09 08:38:45 -05:00
Nate Jensen
8b55dfa980 Omaha #3356 remove OBE register buddies from collaboration
Change-Id: I49099386a48b650c9e6ea1a96b519fbc178f769f

Former-commit-id: 40d4abe4cd [formerly 8e74892cd6 [formerly 89de611bd1abdd016ae8a96db4c820004c52b406]]
Former-commit-id: 8e74892cd6
Former-commit-id: b690c360ac
2014-09-03 10:00:11 -05:00
Brian Clements
a3f91f92cc Omaha #3373 jaxb manager refactor
api changes
reworked ogc jaxb manager to use parent class

Change-Id: I92b4cd6a48faf80462b9ca483a4f5d6cba78de48

Former-commit-id: e428f257cb [formerly e4c85f7cd5 [formerly 125c31f035057676d8c97a9b6c7a1d7b1b7f5bcb]]
Former-commit-id: e4c85f7cd5
Former-commit-id: 33684f3c97
2014-07-16 09:00:59 -05:00
Brian Clements
c2ac40caec 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: 93a1ee71c4 [formerly 9d626a97e5 [formerly a31b7f213081f384bd23d53a431ce53593254c25]]
Former-commit-id: 9d626a97e5
Former-commit-id: f053e9b084
2014-06-20 09:04:15 -05:00
Steve Harris
3e2eeedc29 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: 676948e239 [formerly cc7e6bc52a [formerly da50f581c90ea0cca5f43c45c44cb8ac045a6c8c]]
Former-commit-id: cc7e6bc52a
Former-commit-id: 9de49b59ea
2014-06-18 08:52:25 -05:00
Brian Clements
bb4ff41368 Omaha #3078 collaboration shared display data over private chat
Change-Id: I0ede9310eb109adc1b08673027e9e36a68a09fbf

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

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

Former-commit-id: 84e3f967d9 [formerly b6a2bf0ae4 [formerly baab2ea12e1117446295ae60bc06228eb6139895]]
Former-commit-id: b6a2bf0ae4
Former-commit-id: 8205f7cd56
2014-06-17 09:26:24 -05:00
Brian Clements
89a5679714 Issue #2903 changed collaboration jaxb xml to be base64 encoded
Change-Id: I0de0db3bf455a14d747520f34ef66d986815e42c

Former-commit-id: ef0ecfd1d4 [formerly 5424eb0258 [formerly afcfdf1ed08cd64deb085b909f0965e4ab68d92d]]
Former-commit-id: 5424eb0258
Former-commit-id: 909561d871
2014-06-12 13:40:33 -05:00
Brian Clements
5bf4c253f6 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: 573ffcb0bf [formerly 0e18d45bdf [formerly 2509bb6d8c28cb78adc8fd4380d16a0f8f0d8acb]]
Former-commit-id: 0e18d45bdf
Former-commit-id: b5e961d6b4
2014-05-19 15:54:36 -05:00
Brian Clements
88b8061039 Omaha #3061 added better checks for when to send invite/session payloads
Former-commit-id: 01269cd989 [formerly a698d81571 [formerly 073d3c10ac7c5e9cd6f5e34864ec0261219cbfd5]]
Former-commit-id: a698d81571
Former-commit-id: ee51a84f50
2014-05-14 17:00:09 -05:00
Brian Clements
7db361813c Omaha #3107 added timeout handling logic for leader transfer verification
Former-commit-id: 7b7bc5be97 [formerly 08a406ff18 [formerly 294a489ba547bf90df9d6b6a5107c8993c5b8333]]
Former-commit-id: 08a406ff18
Former-commit-id: 26d206f780
2014-05-09 15:43:46 -05:00
Brian Clements
46b526473d Omaha #3061 only shared display capable clients get payload in invite
Former-commit-id: c61e30a422 [formerly 1502354f87 [formerly 6595f5be37941f35c33b46231deef7d41e967380]]
Former-commit-id: 1502354f87
Former-commit-id: dec5159216
2014-05-05 15:29:06 -05:00
Brian Clements
1dc13cc151 Issue #3070 fixed contact request logic when adding to group
Former-commit-id: f1213c1bda [formerly 17ab4f6184 [formerly 57120491452b36bf15227bd4b6d0236221c71124]]
Former-commit-id: 17ab4f6184
Former-commit-id: 5f746c9c56
2014-04-25 13:41:17 -05:00
Brian Clements
345fe6f866 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: 94aa761e19 [formerly 02f08d75c6 [formerly 01e773fb9d4ec8b0ab75ddf714b79debb9ad4096]]
Former-commit-id: 02f08d75c6
Former-commit-id: 334ad3ca81
2014-04-24 16:10:27 -05:00
Brian Clements
148d158380 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: 6969321db0 [formerly f3ee7b453a [formerly 796e4dcd2d81d8b34ae835dbe8443fd56ba873e3]]
Former-commit-id: f3ee7b453a
Former-commit-id: 117eeca83a
2014-04-23 14:16:42 -05:00
Nate Jensen
a24262b3a9 Merge "Issue #2903 added connection tests to session close methods" into development
Former-commit-id: 4a04662972 [formerly 9ec6169646 [formerly 81b95799744bd155cc0df1147bb8a5372ea2fee4]]
Former-commit-id: 9ec6169646
Former-commit-id: c88597b6c2
2014-04-22 12:53:08 -05:00
Brian Clements
053136ccbb Issue #2903 added connection tests to session close methods
fixes illegal state exception problem when booted from xmpp server


Former-commit-id: 49f86e4153 [formerly 50f3f420eb [formerly d570c81caed35576e867df15c2a8d900135fef5f]]
Former-commit-id: 50f3f420eb
Former-commit-id: f9ab4f9cfe
2014-04-22 12:36:40 -05:00
Brian Clements
a5730ca7bd 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: 2a9d341910 [formerly 1adbf6253a [formerly 7a2423f4a90597706e52ce0f89bacb1a0e10f067]]
Former-commit-id: 1adbf6253a
Former-commit-id: bfd88f3e14
2014-04-22 11:55:36 -05:00
Brian Clements
833d693098 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: aed25eeb61 [formerly 6c47c78038 [formerly 09d7a1113a6254d8f01cf42d863e9365aac23cc7]]
Former-commit-id: 6c47c78038
Former-commit-id: c4a38d1f68
2014-04-21 13:07:14 -05:00
Brian Clements
0c203cfd07 Issue #3020 fixed error message when attempting to create already accessible room
Former-commit-id: 4a8ee65cca [formerly bfafb0d055 [formerly 738e4cb06a549e6067274af033cc7ba725b1a8e2]]
Former-commit-id: bfafb0d055
Former-commit-id: 57d2f28d54
2014-04-16 14:26:17 -05:00
Brian Clements
9473f1f799 Issue #2981 fixed NPE when cached shared group deleted on server
Former-commit-id: 7fd7817af4 [formerly 7afb1e66f5 [formerly 8ee453e3f5256d3ffed255aaebc792155001bc8e]]
Former-commit-id: 7afb1e66f5
Former-commit-id: 8a4f212fdb
2014-04-16 09:23:26 -05:00
Brian Clements
dc1d2d39f8 Issue #2822 only allow transfer leader if participant is using shared display
Former-commit-id: 6ccedc1182 [formerly 5250f7a442 [formerly af9577548e40397c67f72eb60485ee8de48f169b]]
Former-commit-id: 5250f7a442
Former-commit-id: db67c03382
2014-04-15 15:15:11 -05:00
Brian Clements
3d8bcb8701 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: 6b22374046 [formerly 8ab1bab974 [formerly 762e7d3a1ff47f794aa843d2b159ac78b4ab12a3]]
Former-commit-id: 8ab1bab974
Former-commit-id: 6f7851d8c4
2014-04-15 15:12:33 -05:00
Mike Duff
981306d474 Issue #2785 - Throw error when CollaborationConnection needs connection and it doesn't exist
Change-Id: I2f2234da42e9210b574f7489fc37da0a63bf2133

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

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

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

Former-commit-id: 98b5fd762e [formerly d803986440 [formerly a50bd58e95a929fe569f5df68dd4d4a8b6625807]]
Former-commit-id: d803986440
Former-commit-id: d2eed9891a
2014-03-27 16:31:30 -05:00
Brian Clements
9b6c283fc9 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: aee98ecfb0 [formerly dc55cd5b5c [formerly e832f6420b6363a3c951725e0d23f460b2efb42e]]
Former-commit-id: dc55cd5b5c
Former-commit-id: 2456c2308f
2014-03-10 14:06:45 -05:00
Brian Clements
8aff9ee95c 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: dc94769c14 [formerly 44d161729f [formerly b3bf76b676b7e75559236d67c687cd5011859a8b]]
Former-commit-id: 44d161729f
Former-commit-id: 2afc1a9319
2014-03-07 15:37:29 -06:00
Mike Duff
ec892bb7a7 Issue #2798 - Fix user presence messages and settings
Peer review comments

Change-Id: I615edc12a7fe93540b5e62cf673b92829cac3dfa

Former-commit-id: 9c873e6dd9 [formerly e97e745b61 [formerly b087558dce4e19596c93d47e986af50fae806a74]]
Former-commit-id: e97e745b61
Former-commit-id: 25425a4268
2014-03-05 14:39:55 -06:00
Brian Clements
fd18963221 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: d8e283e1b4 [formerly ce24bd1018 [formerly e0e4dfdedff283c809060257fbf04e777faf318d]]
Former-commit-id: ce24bd1018
Former-commit-id: 9d0b02e0a4
2014-02-28 16:15:17 -06:00
Mike Duff
512e634a97 Issue #2632 - Implement buddy pounce (Contact Notifiers)
Review comments

Change-Id: I7492b84b59406cf2ddbc65d9e6fc7c0c41c30ce7

Former-commit-id: 5f433b4f6b [formerly 5440ff64d1 [formerly 8ece6e53095ee80d7d4baa249125b3fe7a03add7]]
Former-commit-id: 5440ff64d1
Former-commit-id: 377c1f9998
2014-02-28 13:23:34 -06:00
Brian Clements
a173972437 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: 386e9cc96a [formerly 3f362519aa [formerly 58c826ec371f10295fa6f4e236ff85a52698719d]]
Former-commit-id: 3f362519aa
Former-commit-id: 9217ba24c5
2014-02-24 13:19:07 -06:00
Brian Clements
4e165aba58 Issue #2751 implemented room/topic ownership transfer
Former-commit-id: ab72938246 [formerly c3cadff705 [formerly cf5041f2d052c4900e2871e0fc8dc1a2b71794de]]
Former-commit-id: c3cadff705
Former-commit-id: a8ff1effc1
2014-02-20 11:10:14 -06:00
Brian Clements
abc01f5475 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: 3a135b8eac [formerly dc074a9650 [formerly 453604eca5fca9e5d14ba1842dc7f76f1e0180ca]]
Former-commit-id: dc074a9650
Former-commit-id: 06c16118e1
2014-02-19 08:32:26 -06:00
Nate Jensen
961239e181 Merge "Issue #2756 new collaboration openfire plugin and http service" into development
Former-commit-id: b08d96b1e8 [formerly 020d54c48a [formerly e483f4311d00726f023d30e6d3f4e813c559390e]]
Former-commit-id: 020d54c48a
Former-commit-id: ac0a10678b
2014-02-18 14:51:13 -06:00
Nate Jensen
d4cc8b1827 Merge "Issue #2793 improved collaboration disconnect handling" into development
Former-commit-id: b3c45b303c [formerly c63289fa14 [formerly bf0a607b05ffb042e998d2c9940091137da21dc0]]
Former-commit-id: c63289fa14
Former-commit-id: 1738248fac
2014-02-18 11:22:19 -06:00
Brian Clements
1c8f5dd579 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: 7028f7fd4d [formerly a28fcf0dc5 [formerly 231c3cd84e3c86caba81708581be911e771aa774]]
Former-commit-id: a28fcf0dc5
Former-commit-id: 9095a1584f
2014-02-18 11:11:33 -06:00
Brian Clements
68fac79fe7 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: 5b4f1e8288 [formerly f6b2827434 [formerly ff23569984eee43927c10ca041ca7e0ca4d40a3b]]
Former-commit-id: f6b2827434
Former-commit-id: f0c89ef6c6
2014-02-18 10:03:12 -06:00
Brian Clements
ca8869b8ef 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: 3dfd8fbafb [formerly 3b5648c055 [formerly 9a4b091f7e2655f48fd061021d161c4eb2e63dd8]]
Former-commit-id: 3b5648c055
Former-commit-id: 6d71686332
2014-02-17 16:39:43 -06:00
Nate Jensen
47b27c602f Issue #2751 first cut of transfer leadership
Change-Id: Ia0495d8d5acfe28801ceb416090d47c250ecf0f9

Former-commit-id: a85575a763 [formerly e05f1eae96 [formerly cd0a838d34c9d7533bf59a477a17f4cb1af75a00]]
Former-commit-id: e05f1eae96
Former-commit-id: 63d5f94cbb
2014-02-13 15:35:53 -06:00
Nate Jensen
ec6d8585e1 Merge "Issue #2700 fixed subscribe request group input" into development
Former-commit-id: d8e2d2837e [formerly 2643d01b74 [formerly af0e70e20c2a5ca276e9b819285d34c0113cafe7]]
Former-commit-id: 2643d01b74
Former-commit-id: f2b32fa1ae
2014-02-13 14:02:55 -06:00
Brian Clements
01653c76de 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: 0ac7ff81cf [formerly ef52908906 [formerly e91ae6eacf4af9e25afc213c3cd0c269c8d465f4]]
Former-commit-id: ef52908906
Former-commit-id: 16ed18e0c6
2014-02-13 13:51:39 -06:00
Brian Clements
a0eb8342bf 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: caa8360ac7 [formerly 579f7c826d [formerly 0c4a7915870f374cb4e728303939335cb0691c84]]
Former-commit-id: 579f7c826d
Former-commit-id: 2d72c0f475
2014-02-13 09:47:02 -06:00
Brian Clements
b8a1c8f56d Issue #2797 fixed presence bug
a defensive copy was needed when sending presence to rooms


Former-commit-id: 23e2039028 [formerly 81ddf87b04 [formerly d0dab4bce76b45b71f4238d5a04c440cee936eaf]]
Former-commit-id: 81ddf87b04
Former-commit-id: 22031aa87d
2014-02-12 16:54:46 -06:00