diff options
| author | Skyler Grey <skyler.grey@collabora.com> | 2023-08-18 13:30:35 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-09-01 21:34:10 +0200 |
| commit | fe2a3980b4749ca6b60f17eed53afb14ef9f8ce9 (patch) | |
| tree | 0781ab517df1e749bba30465d4f6bb4c9a7c9449 /readlicense_oo | |
| parent | 2d9e0a7ffa29a0882b92c55e90189e509124e2de (diff) | |
Add a FunctionBasedURPConnection and a websocket URP connector
- FunctionBasedURPConnection is used to enable a client to open a URP
connection to a fresh Kit instance in COOL.
- This URP connector can be used with that and
https://github.com/CollaboraOnline/online/pull/6992 to use a Java Uno
Remote Protocol client over websockets
- For interoperability with existing Collabora Online websockets a
prefix (urp ) is added to each message sent and a similar prefix
(urp: ) is expected on each message recieved. This allows sending over
the same websocket as other data is being transmitted through. If you
are writing a bridge to work with this, you will need to add/strip the
prefixes accordingly
- This commit uses Java WebSocket
(https://github.com/TooTallNate/Java-WebSocket) to send data over
websockets.
Change-Id: I2bda3d0b988bef7883f9b6829eeb5b7ae8075f27
Signed-off-by: Skyler Grey <skyler.grey@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155100
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'readlicense_oo')
| -rw-r--r-- | readlicense_oo/license/license.xml | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml index 84df51ef8715..80bb15b64fbc 100644 --- a/readlicense_oo/license/license.xml +++ b/readlicense_oo/license/license.xml @@ -253,6 +253,24 @@ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p> </div> + <div class="JAVA_WEBSOCKET"> + <h2>Java WebSocket</h2> + <p>The following software may be included in this product: Java WebSocket. Use of any of this software is governed + by the terms of the license below:</p> + <h3>The MIT License</h3> + <p>Copyright (c) 2010-2020 Nathan Rajlich</p> + <p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated + documentation files (the "Software"), to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, + and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p> + <p>The above copyright notice and this permission notice shall be included in all copies or substantial + portions of the Software.</p> + <p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT + LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT + SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE.</p> + </div> <div class="JFREEREPORT"> <h2>Flute</h2> <p>The following software may be included in this product: Flute. Use of any of this software is governed by the |