mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
libreoffice/external/java_websocket/patches/ant-build.patch

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

28 lines
820 B
Diff
Raw Normal View History

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/+/151171 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-08-18 13:30:35 +00:00
--- /dev/null 1970-01-01 01:00:00.000000000 +0100
+++ b/build.xml 2023-08-30 11:43:05.152647141 +0100
cid#1545413 drop PerMessageDeflateExtension Change-Id: Iac5133ebddf026037af22e0f22fead658348b108 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157696 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-10-09 08:58:09 +01:00
@@ -0,0 +1,24 @@
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/+/151171 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-08-18 13:30:35 +00:00
+<project default="all">
+ <target name="all" depends="jar" />
+
+ <target name="compile">
+ <mkdir dir="build/classes" />
+ <javac includeantruntime="false" srcdir="src/main/java"
set java_websocket source as UTF-8 to avoid [javac] core/workdir/UnpackedTarball/java_websocket/src/main/java/org/java_websocket/util/Charsetfunctions.java:88: error: unmappable character (0xC3) for encoding US-ASCII [javac] * Implementation of the "Flexible and Economical UTF-8 Decoder" algorithm by Bj??rn H??hrmann with LANG=C Change-Id: Idc7296101f18ef4d0cbedb232834b1cc674444c9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156552 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-09-05 08:38:00 +01:00
+ destdir="build/classes" encoding="UTF-8">
cid#1545413 drop PerMessageDeflateExtension Change-Id: Iac5133ebddf026037af22e0f22fead658348b108 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157696 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-10-09 08:58:09 +01:00
+ <exclude name="**/PerMessageDeflateExtension.java"/>
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/+/151171 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-08-18 13:30:35 +00:00
+ </javac>
+ </target>
+
+ <target name="jar" depends="compile">
+ <mkdir dir="dist"/>
+ <jar destfile="dist/java_websocket.jar">
+ <fileset dir="build/classes" includes="**/*.class" />
+ </jar>
+ </target>
+
+ <target name="clean">
+ <delete dir="build" />
+ <delete dir="dist" />
+ </target>
+
+</project>
Reference in New Issue Copy Permalink