diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2020-03-26 15:04:47 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-05-06 14:48:21 +0200 |
| commit | 35518c92365cc183ba6cce2a4d284a130c0ca13f (patch) | |
| tree | f3de8bdec6331ce933126336cf701dcaffe9b662 /bean | |
| parent | 6bf3517d60272bdec878bb6dde92a47b45a3f866 (diff) | |
Move all public Java classes to libreoffice.jar
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>
Diffstat (limited to 'bean')
| -rw-r--r-- | bean/Jar_officebean.mk | 3 | ||||
| -rw-r--r-- | bean/JunitTest_bean_complex.mk | 2 | ||||
| -rw-r--r-- | bean/test/applet/oooapplet/OOoViewer.java | 5 |
3 files changed, 4 insertions, 6 deletions
diff --git a/bean/Jar_officebean.mk b/bean/Jar_officebean.mk index 424b4ab2a559..7bc8561ab033 100644 --- a/bean/Jar_officebean.mk +++ b/bean/Jar_officebean.mk @@ -11,8 +11,7 @@ $(eval $(call gb_Jar_Jar,officebean)) $(eval $(call gb_Jar_use_jars,officebean,\ - ridl \ - juh \ + libreoffice \ )) $(eval $(call gb_Jar_set_packageroot,officebean,com)) diff --git a/bean/JunitTest_bean_complex.mk b/bean/JunitTest_bean_complex.mk index 091fe544c6b7..42baf49cdce5 100644 --- a/bean/JunitTest_bean_complex.mk +++ b/bean/JunitTest_bean_complex.mk @@ -12,7 +12,7 @@ $(eval $(call gb_JunitTest_JunitTest,bean_complex)) $(eval $(call gb_JunitTest_use_jars,bean_complex,\ OOoRunner \ - ridl \ + libreoffice \ test \ officebean \ )) diff --git a/bean/test/applet/oooapplet/OOoViewer.java b/bean/test/applet/oooapplet/OOoViewer.java index d958032df221..14851e0eceee 100644 --- a/bean/test/applet/oooapplet/OOoViewer.java +++ b/bean/test/applet/oooapplet/OOoViewer.java @@ -45,9 +45,8 @@ public class OOoViewer extends Applet { String officeURL = url.toString(); URL[] arURL = new URL[] { new URL(officeURL + "/program/classes/officebean.jar"), - new URL(officeURL + "/program/classes/ridl.jar"), - new URL(officeURL + "/program/classes/java_uno.jar"), - new URL(officeURL + "/program/classes/juh.jar") + new URL(officeURL + "/program/classes/libreoffice.jar"), + new URL(officeURL + "/program/classes/java_uno.jar") }; m_loader = new CustomURLClassLoader(arURL); File fileProg = new File(s + "/program"); |