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>

5 files changed, 8 insertions, 13 deletions

diff --git a/desktop/Jar_active_java.mk b/desktop/Jar_active_java.mk
index 6e1be1adaed3..48fb7425efb7 100644
--- a/desktop/Jar_active_java.mk
+++ b/desktop/Jar_active_java.mk
@@ -20,8 +20,7 @@ $(eval $(call gb_Jar_set_manifest,active_java,$(SRCDIR)/desktop/test/deployment/
 $(eval $(call gb_Jar_set_packageroot,active_java,com))
 
 $(eval $(call gb_Jar_use_jars,active_java, \
-    juh \
-    ridl \
+    libreoffice \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/desktop/Jar_passive_java.mk b/desktop/Jar_passive_java.mk
index 007a37e8e6d6..e2408ae5a09f 100644
--- a/desktop/Jar_passive_java.mk
+++ b/desktop/Jar_passive_java.mk
@@ -22,8 +22,7 @@ $(eval $(call gb_Jar_set_manifest,passive_java,$(SRCDIR)/desktop/test/deployment
 $(eval $(call gb_Jar_set_packageroot,passive_java,com))
 
 $(eval $(call gb_Jar_use_jars,passive_java, \
-    juh \
-    ridl \
+    libreoffice \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/desktop/scripts/unoinfo-mac.sh b/desktop/scripts/unoinfo-mac.sh
index c8728a0e5e30..b67882db0015 100755
--- a/desktop/scripts/unoinfo-mac.sh
+++ b/desktop/scripts/unoinfo-mac.sh
@@ -36,9 +36,8 @@ c++)
     printf '%s' "$sd_prog/../Frameworks"
     ;;
 java)
-    printf '0%s\0%s\0%s' \
-        "$sd_prog/../Resources/java/ridl.jar" \
-        "$sd_prog/../Resources/java/juh.jar" \
+    printf '0%s\0%s' \
+        "$sd_prog/../Resources/java/libreoffice.jar" \
         "$sd_prog"
     ;;
 *)
diff --git a/desktop/scripts/unoinfo.sh b/desktop/scripts/unoinfo.sh
index 297acf3169d8..14cba806447b 100755
--- a/desktop/scripts/unoinfo.sh
+++ b/desktop/scripts/unoinfo.sh
@@ -36,9 +36,9 @@ c++)
     printf '%s' "$sd_prog"
     ;;
 java)
-    printf '0%s\0%s\0%s' \
-        "$sd_prog/classes/ridl.jar" \
-        "$sd_prog/classes/juh.jar" "$sd_prog"
+    printf '0%s\0%s' \
+        "$sd_prog/classes/libreoffice.jar" \
+        "$sd_prog"
     ;;
 *)
     exit 1
diff --git a/desktop/win32/source/unoinfo.cxx b/desktop/win32/source/unoinfo.cxx
index f86232feb64f..14cee8819dde 100644
--- a/desktop/win32/source/unoinfo.cxx
+++ b/desktop/win32/source/unoinfo.cxx
@@ -75,9 +75,7 @@ int wmain(int argc, wchar_t ** argv, wchar_t **) {
         }
         wchar_t path[MAX_PATH];
         wchar_t * pathEnd = getBrandPath(path);
-        writePath(path, pathEnd, MY_STRING(L"classes\\ridl.jar"));
-        writeNull();
-        writePath(path, pathEnd, MY_STRING(L"classes\\juh.jar"));
+        writePath(path, pathEnd, MY_STRING(L"classes\\libreoffice.jar"));
         writeNull();
         writePath(path, pathEnd, MY_STRING(L""));
     } else {