summaryrefslogtreecommitdiff
path: root/ridljar
AgeCommit message (Collapse)AuthorFilesLines
2025-07-08Java URP: Reliably check whether a JobQueue got disposedStephan Bergmann4-54/+61
If there are multiple Java URP bridges that get disposed simultaneously, there was a race in that one JobQueue could receive first its own dispose(), save that disposeId as _doDispose, then receive an unrelated dispose() and overwrite its _doDispose with that other disposeId, and only then get to the check of _doDispose == _disposeId in removeJob(), which would thus never succeed and cause the thread to hang in that loop forever. So leverage the fact that the _disposeId, instead of being just an opaque token, actually is the JavaThreadPool that initiated the disposing, so can be used to check whether a JobQueue got disposed. (And rename some entities to make their meaning more obvious.) (Which then required reworking parts of the test code that checks the internals of the Java URP bridge.) Change-Id: If7f4f494b0f7e7f17e0a5c6a458582ad9bed3054 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187476 Reviewed-by: Stephan Bergmann <stephan.bergmann@collabora.com> Tested-by: Jenkins
2025-07-08Remove unused memberStephan Bergmann1-1/+0
Change-Id: I9269a9772a16574b6df78981c128ab44932dd1f1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187506 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@collabora.com>
2025-07-07Consistently synchronize access to JobQueue._disposeIdStephan Bergmann1-2/+5
Change-Id: I4a6700a519f65c825ca310caa100e3be2e0562ac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187477 Reviewed-by: Stephan Bergmann <stephan.bergmann@collabora.com> Tested-by: Jenkins
2025-06-09add Java-WebSocket to deps to the ridljar/libreoffice pomChristian Lohmaier1-0/+10
The dependency was introduced in 8e246331f6f71320cfcc8defdd04e756a75f71cf but never was added to the maven pom Change-Id: Id12036c82ecf803a817054a618316a95a4c738ae Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181240 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2025-06-09make buck/javadoc happy on JDK 17Christian Lohmaier1-0/+1
previous versions just did print a warning, just like for other javadoc issues, but current versions of javadoc cause a hard failure Change-Id: Ib880128f75f44fab5f7570eb68ae32639453504a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181239 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Jenkins
2025-02-19[API CHANGE] remove XTiledRenderableNoel Grandin1-1/+0
which is an abandoned experiment, the tiled rendering for LOK moved in a different direction Change-Id: Idccd22d5124cc7c7add55b76edc75ef27df59a9f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181862 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2025-01-07cid#1557414 Unguarded readCaolán McNamara1-6/+8
Change-Id: I4b0bd74d0841989905dd8034a9352b6d59b40dad Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177189 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2024-12-14cid#1556282 silence Unguarded readCaolán McNamara1-2/+4
Change-Id: If95e72b324378b334e106c9cb78e8e198f819573 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178451 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2024-05-03makefile simplification: replace $(call gb_CustomTarget_get_workdir,foo)Christian Lohmaier9-10/+10
…by a simple/static $(gb_CustomTarget_workdir)/foo The build system has a lot of overly complicated leftovers from when it was introduced and had not only deal with split repositories but also had to coexist with another buildsystem. Along with lots of copy'n'paste along the years the makefiles became hard to grasp for newcomers with all our calls and evals. As a first step to streamline that, the macros from TargetLocations that simply prefix a static path to the argument (and similar of the same kind) are a natural pick before simplifying the rules themselves/getting rid of a bunch of eval statements. Change-Id: Ia06dbbcd5d1994755a2ff05b84f72ccbc4e3cab5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167005 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2024-03-02Allow building with Java 8Fridrich Štrba2-7/+7
Change-Id: Ib1af1a98993aabb8a03f4ef19d8da4d9a71fdbc0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164226 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2024-02-22fix dodgy unit testNoel Grandin3-7/+11
Testing a field which is being modified inside a synchronized block, outside of such a block, is going to lead to weird ordering issues when running a highly parallel test like this, so test the flag inside a synchronized block. Failure manifested as: JUnit version 4.13.2 ........E........... Time: 17,27 There was 1 failure: 1) testStaticThreadExecutesAsyncs(com.sun.star.lib.uno.environments.remote.JobQueue_Test) java.lang.AssertionError: expected:<35> but was:<34> at org.junit.Assert.fail(Assert.java:89) at org.junit.Assert.failNotEquals(Assert.java:835) at org.junit.Assert.assertEquals(Assert.java:647) at org.junit.Assert.assertEquals(Assert.java:633) at com.sun.star.lib.uno.environments.remote.TestWorkAt.passedAsyncTest(TestWorkAt.java:75) at com.sun.star.lib.uno.environments.remote.JobQueue_Test.testAsyncJobQueue(JobQueue_Test.java:180) at com.sun.star.lib.uno.environments.remote.JobQueue_Test.testStaticThreadExecutesAsyncs(JobQueue_Test.java:121) FAILURES!!! Tests run: 19, Failures: 1 Change-Id: Iad980aea1245bfd8ee89887b175eb9dc17643778 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163727 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-11-09enable unchecked lint for our java codeNoel Grandin1-0/+4
and annotate where necessary, mostly just suppressing the warnings Change-Id: I8e39d797cde6c7c3f4e3e1bd93a128965ecec81d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159205 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-11-02'new Character' is deprecated in JavaNoel Grandin5-6/+6
replace with Character.valueOf Change-Id: I9938db0fce6490eba6f4900efc3c139a1b71d120 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158786 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-11-02'new Double' is deprecated in JavaNoel Grandin6-11/+11
replace with Double.valueOf Change-Id: If5be8e500e31ebf9d5fb20ea7dd474677d7c74ff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158785 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-11-02'new Float' is deprecated in JavaNoel Grandin6-8/+8
replace with Float.valueOf Change-Id: Ib6408b24dac2953789d0ec67e73b8be8aefca252 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158784 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-10-02drop use of urp: followed by newline of spaceCaolán McNamara1-2/+2
and just use space Change-Id: Ib2765855971691aa72643d3e3d5c06cdcbd634ba Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157435 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-09-30cid#1545655 Dm: Dubious method usedCaolán McNamara1-1/+2
Change-Id: I76b447d51429c867e24c1bcdd357689c849ea103 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157438 Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-09-30cid#1545766 silence Unguarded readCaolán McNamara1-5/+3
a bit zealous here, its all on the same thread as it turns out Change-Id: Ic2e8d8eba4fea672fa56c88abedb853fd886cecc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157437 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-09-29cid#1546393 SBSC: String concatenation in loop using + operatorCaolán McNamara1-2/+4
Change-Id: I697830e97b3168aab3e41e96b744ab80edbad31c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157401 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-09-05call WebSocketClient.close from XConnection.closeCaolán McNamara1-0/+1
to drop the connection, otherwise we stick around until we timeout after trying to exit Change-Id: Ia4ca95b022b9234219da4658512603ebf918ff35 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156577 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-09-05websocket URP flush hangs with large bufferCaolán McNamara1-24/+11
over 4k hits limit so flush waits until something reads, but the read is in the same thread after the flush. We are just using _outputStream to accumulate the bytes to be send so change this to use a ByteArrayOutputStream and take over its bytes and clear it when we flush. Change-Id: I17b90e1c7d4302f153b5832e60ac0e0f2b86ace9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156565 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-09-03each websocket URP message is taking a full secondCaolán McNamara1-0/+2
because the data written here doesn't appear to the reader on the other end until a full second expires. https: //bugs.openjdk.org/browse/JDK-8014239 Change-Id: I9b6f4d51562f4dd0866ff0fccd5951b1efe38f25 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156488 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-09-01prefix the UNO-Url example with recommended 'uno:'Caolán McNamara1-1/+1
as http://www.openoffice.org/udk/common/man/spec/uno-url.html suggests. Change-Id: Ifce9a9944f1a25bc0b6f89e5cec127a22bc6f990 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156399 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-09-01Fix typoAndrea Gelmini1-5/+5
Change-Id: I63b019aa12eb4898374162b0226728fd49bef93c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156427 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-09-01Add a FunctionBasedURPConnection and a websocket URP connectorSkyler Grey7-0/+607
- 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-09-01tdf#149069 Revert "ridljar: check UnoClassLoader used for NativeLibraryLoader"Hossein1-9/+0
This reverts commit 97b61ea3297e04e64aab1e1a4ec50202e9f86fff. It checked that the NativeLibraryLoader is an instance of the class com.sun.star.lib.unoloader.UnoClassLoader. If this is not the case, a warning was displayed. This was for java_uno bridge to work. On the other hand, as the comment in the code implies, "not a problem if this is using Java remote bridge or (in a) unit test". But, in the code there was no check for that. As a result, this warning is displayed in many places like the simple examples that want to connect to the LibreOffice process via Java API. Change-Id: I056ed372ad071573051024a63e51afd6b4425ce5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156302 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Tested-by: Jenkins Reviewed-by: Hossein <hossein@libreoffice.org>
2023-02-28InputStreamToXInputStreamAdapter.readBytes() should read...Damjan Jovanovic1-14/+9
until the buffer is full, or the file ends. It shouldn't care about available(). (cherry-picked from f04910427d25ede98b84b90df7cc5a12d1adc695) Change-Id: I4ad17c614ba336ff21883248715861f6af1fbc2b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147934 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Jenkins
2023-02-28Fix the java.lang.NullPointerException in readBytes() and readSomeBytes()...Damjan Jovanovic1-0/+18
methods in InputStreamToXInputStreamAdapter when called from the inter-process UNO bridge. XInputStream::readBytes() documents how the buffer is an "out" parameter, and isn't passed to the implementing end, which is why we get the buffer as a "byte[][] b" and b[0] == null. Its role is to box a byte[] array to be returned the client. Thus, allocate the buffer if it is missing or too small. Additionally, virtually all other readBytes() and readSomeBytes() implementations trim this sequence to the actual number of bytes read. This presumably reduces the inter-process traffic, but some callers even rely on the sequence to be trimmed, eg. main/sax/source/expatwrap/xml2utf.cxx. Thus trim our returned array too. (cherry-picked from 6cb06142790376a2c58e6392182eb071420a4221) Change-Id: I42eb209b68f7c13a34670d03c2ca61d76672385b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147933 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Jenkins
2023-02-28fix up misleading mismatching indent and add mode linesCaolán McNamara1-24/+23
Change-Id: Id0abfc6d2962223bd0f7f0864a53e94bb7ec5052 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147932 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-08-13warning: empty <p> tagCaolán McNamara1-1/+1
Change-Id: I6fb9dd331fe6ff9e35477a122a84ab0a6d3d8426 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138179 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-06-13Drop obsolete preprocessor directives from UNOIDL filesStephan Bergmann1-5/+0
...which were used by ildc, which is gone since a8485d558fab53291e2530fd9a1be581c1628deb "[API CHANGE] Remove deprecated idlc and regmerge from the SDK", and have always been ignored as legacy by its unoidl-write replacement. This change has been carried out (making use of GNU sed extensions) with > for i in $(git ls-files \*.idl); do sed -i -z -E -e 's/\n\n((#[^\n]*\n)+\n)*(#[^\n]*\n)+\n?/\n\n/g' -e 's/\n(#[^\n]*\n)+/\n/g' "$i"; done && git checkout extensions/source/activex/so_activex.idl odk/examples/OLE/activex/so_activex.idl which apparently happened to do the work. (The final two files are not UNOIDL source files.) Change-Id: Ic9369e05d46e8f7e8a304ab01740b171b92335cd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135683 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-08-19ridljar: check that UnoClassLoader is used for NativeLibraryLoaderMichael Stahl1-0/+9
The native libraries are local to class loaders, so System.load("java_uno.so") will fail with any other class loader. Change-Id: Ifa3b1b8dfef07b64828943654e28ff1f0fb5a494 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120527 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-04-07Updated README.md files to represent current code / use Markdown formatHossein1-1/+3
Previously, all of the README files have been renamed to README.md and now, the contents of these files were changed to use Markdown format. Other than format inconsistency, some README.md files lacked information about modules, or were out of date. By using LibreOffice / OpenOffice wiki and other documentation websites, these files were updated. Now every README.md file has a title, and some description. The top-level README.md file is changed to add links to the modules. The result of processing the Markdown format README.md files can be seen at: https://docs.libreoffice.org/ Change-Id: Ic3b0c3c064a2498d6a435253b041df010cd7797a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113424 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-03-24Using .md extension/Markdown syntax for modules READMEHossein1-0/+0
Renaming all README files for all top level modules to README.md, applying no content change at this stage to be able to track history of the files. These files should be edited to use correct Markdown syntax later. Change-Id: I542fa3f3d32072156f16eaad2211a397cc212665 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112977 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2020-11-30Adapt buck build to jars merged into libreoffice.jarRene Engelhard2-4/+31
Since ae855bf48163ff64d94cfc34aff8e37abdb5518d and 35518c92365cc183ba6cce2a4d284a130c0ca13f the ridl,jurt und unoil jars were merged into libreoffice.jar. Adapt the buck build correspondingly. Preserve the publishing of merged jars for now with dummy content and consider to remove them in future releases. Test Plan: 1. To replace version number with upcoming release version: $ solenv/bin/version.py 7.1.0 2. To install the API to local Maven repository: $ VERBOSE=1 buck build api_install 3. To deploy the API to Maven Central: $ VERBOSE=1 buck build api_deploy Change-Id: Id1b2135682ab962c901b944f3c26aeead9a4b19b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93724 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2020-09-25socket cannot be null at this pointNoel Grandin1-5/+3
Change-Id: I2027478d1dfa64a3841027d94d8eaa140fe319dd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103382 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-09-01Fix typo in codeAndrea Gelmini1-1/+1
It passed "make check" on Linux Change-Id: I4733e6609ee99bef49c2771c83b450ee89d955b5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101804 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-08-21Fix typosAndrea Gelmini1-1/+1
Change-Id: I8dc0cdcfe6bd90efc596df28e6c6d968b92618b5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101098 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Jenkins
2020-08-05add dependency to juh,jurt,ridl,unoil pomsRene Engelhard1-0/+10
They are dummies now and empty (except Class-Path:). Thus maven should pull in libreoffice.jar, too Change-Id: I63753deddceef6480fd4f5122b4892b707a9dd20 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98929 Tested-by: Jenkins Reviewed-by: David Ostrovsky <david@ostrovsky.org>
2020-05-27tdf#131572 Add java 9 module info for unoloader.jarSamuel Mehrbrodt3-1/+24
Add a java module named "org.libreoffice.unoloader" for this jar. Require this module from org.libreoffice.uno (libreoffice.jar has unoloader.jar in its classpath, so add the same dependency to the modules) Change-Id: I7471d65ac7a0d2c6a11c002027a21f0c441dd1f2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94419 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2020-05-27tdf#131572 Add java 9 module info for libreoffice.jarSamuel Mehrbrodt2-1/+147
Add a java module named "org.libreoffice.uno" for this jar. This needs to be compiled with Java 9. But since we want to keep b/c with Java 8, the rest of the jar has to be compiled with Java 8. This bumps the *build* requirement to Java 9 while keeping the *runtime* requirement at Java 8. The gbuild JavaClassSet class is changed to invoke javac twice, where the 2nd invocation compiles with --release 9 and a --patch-modules argument so that it finds the results of the first invocation and also the javamaker generated files in CustomTargets. Change-Id: I888f5dbe097cc37136e68db5919939877c981862 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91105 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2020-05-07add pom for libreoffice.jarRene Engelhard1-0/+44
was missed in 35518c92365cc183ba6cce2a4d284a130c0ca13f Change-Id: I574707f6a891109ff1a7db3c915dd652fa644972 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93606 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-05-06Move all public Java classes to libreoffice.jarSamuel Mehrbrodt36-113/+6244
This moves the classes from juh.jar and ridl.jar to libreoffice.jar The goal is to have one single jar (and Java module, will be added later) which developers can include to work with LO. juh.jar and ridl.jar are kept as basically empty jars with libreoffice.jar on its classpath to keep backwards compatibility. This is a continuation of ae855bf48163ff64d94cfc34aff8e37abdb5518d and a preparation to have Java 9 module support. Change-Id: Ifbbfb97f60373d14256e62ae3122913bd17d5bbb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91930 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-02-16GBUILD_TRACE, support for finding out where the build time is spentLuboš Luňák2-0/+4
See instructions in solenv/gbuild/Trace.mk . This generates a file than can be viewed e.g. in the Chromium tracing view. Change-Id: I5f90647c58ca729375525b6daed2d4918adc8188 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88754 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-02-10Cleanup: Move unit tests to ridljarSamuel Mehrbrodt34-0/+4132
Follow-up cleanup for ae855bf48163ff64d94cfc34aff8e37abdb5518d Change-Id: Ibec2fe89d70d6001af7d75c5eb4081b5b2af30e6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88073 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2020-02-10Cleanup: Move files to ridljarSamuel Mehrbrodt55-54/+10292
These files are now part of ridl.jar instead of jurt.jar, so move them accordingly. Follow-up cleanup for ae855bf48163ff64d94cfc34aff8e37abdb5518d Change-Id: I01df60d99f5296b6252b260f52160c3e62f4b8dc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88007 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2020-02-06These JunitTests can be plain check, not subsequentcheckStephan Bergmann1-3/+1
For one, JunitTest_typedesc and JunitTest_uno don't use qadevOOo at all. And for another, even for JunitTest_util (which does use qadevOOo), in gbuild it is OK (and frequently used) for a check target in one module to have dependencies on higher modules. Change-Id: I6f6339fa516eb8582d88ada50fabe56784d99dda Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88058 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-02-04tdf#117331 Merge jurt and unoil into ridlSamuel Mehrbrodt4-5/+108
jurt.jar and unoil.jar are kept as effectively empty jars, each with a Class-Path: ridl.jar in their meta-inf/manifest.mf, so that 3rd-party code loading them (with or without also loading ridl.jar) will still have access to their content. Conceptually, the UNOIDL entities in unoil.jar (corresponding to module offapi) are not part of the URE, but are now made available by URE's ridl.jar. This should probably not cause problems in practice. At least for now, we seal exactly those packages in ridl.jar that were originally sealed in jurt.jar. Ideally, all of ridl.jar could be sealed now, but that would be mildly incompatible, as it would prevent 3rd-party code from introducing additional UNOIDL entities in the relevant namespaces (even if that is something we do not want 3rd-party code to do anyway). However, some JunitTest_jurt_* define classes in those sealed packages. In the past they got away with that by using gb_JunitTest_use_jar_classset,*,jurt. Instead they now need to gb_JunitTest_use_jar_classset,*,ridl and drop the gb_JunitTest_use_jar,*,ridl. But the former only makes available the classes that are specified in ridljar/Jar_ridl.mk with gb_Jar_add_sourcefiles, not the UNOIDL entities specified via gb_Jar_add_packagedirs. But the tests need the udkapi UNOIDL entities, so introduce gb_JunitTest_add_classpath to let the tests get them explicitly. (Curiously, JunitTest_jurt_uno and JnitTest_jurt_util use gb_JunitTest_use_jar_classset,*,jurt but don't seem to acutally need it; lets leave that for a follow-up clean up.) As a follow-up clean up, relevant files could be moved from jurt/ to ridljar/. Change-Id: I836f4e7bb47fb41f1306e3f223da90dba988eb9a Co-authored-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/84946 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-08-12Fix typosAndrea Gelmini2-2/+2
Change-Id: Ia40e7a9031ae5a8385a84f177a9444f4d4f348b4 Reviewed-on: https://gerrit.libreoffice.org/77302 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2019-07-26Fix typosAndrea Gelmini1-1/+1
Change-Id: I60261b937215340d2eb6f439234e99a300b0e189 Reviewed-on: https://gerrit.libreoffice.org/76380 Tested-by: Jenkins Reviewed-by: Andrea Gelmini <andrea.gelmini@gelma.net>
generated by cgit v1.2.3 (git 2.39.1) at 2025-09-30 21:45:38 +0000