|author||Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>||2019-12-11 13:23:43 +0100|
|committer||Stephan Bergmann <email@example.com>||2020-02-04 22:03:54 +0100|
tdf#117331 Merge jurt and unoil into ridl
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 <firstname.lastname@example.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/84946 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <email@example.com>
Diffstat (limited to 'extensions')
1 files changed, 2 insertions, 2 deletions
diff --git a/extensions/test/pgp/readme.txt b/extensions/test/pgp/readme.txt
index ccb26d365b48..d1a63f6771ca 100644
@@ -17,7 +17,7 @@ Please note the semicolons!
For the program to run make sure that the office has access
- to classes.zip, unoil.jar, jurt.jar, pgp.jar and swingall.jar.
+ to classes.zip, ridl.jar, pgp.jar and swingall.jar.
Therefore do the necessary entries in
@@ -30,4 +30,4 @@ The TestPGP is called without ;iiop; :
java TestPGP "socket,host=localhost,port=1111"