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>

3 files changed, 5 insertions, 6 deletions

diff --git a/ridljar/source/libreoffice/manifest b/ridljar/source/libreoffice/manifest
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/ridljar/source/libreoffice/manifest
diff --git a/ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoClassLoader.java b/ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoClassLoader.java
index c52165abfeb7..822d1609cd3b 100644
--- a/ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoClassLoader.java
+++ b/ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoClassLoader.java
@@ -49,8 +49,8 @@ public final class UnoClassLoader extends URLClassLoader {
      * Instantiates the root UNO class loader.
      *
      * @param base a base URL relative to which the URE JARs
-     * (<code>java_uno.jar</code>, <code>juh.jar</code>,
-     * <code>ridl.jar</code>) can be found; must not be <code>null</code>.
+     * (<code>java_uno.jar</code> and <code>libreoffice.jar</code>)
+     * can be found; must not be <code>null</code>.
      *
      * @param classPath an array of URLs that form the class path of this class
      * loader; may be <code>null</code>, which is the same as an empty array.
@@ -191,11 +191,10 @@ public final class UnoClassLoader extends URLClassLoader {
     private static URL[] createUrls(URL base, URL[] classPath)
         throws MalformedURLException
     {
-        final int JARS = 3;
+        final int JARS = 2;
         URL[] urls = new URL[JARS + (classPath == null ? 0 : classPath.length)];
         urls[0] = new URL(base, "java_uno.jar"); //TODO get rid of it here
-        urls[1] = new URL(base, "juh.jar");
-        urls[2] = new URL(base, "ridl.jar");
+        urls[1] = new URL(base, "libreoffice.jar");
         if (classPath != null) {
             System.arraycopy(classPath, 0, urls, JARS, classPath.length);
         }
diff --git a/ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoLoader.java b/ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoLoader.java
index 1ed16fcca94c..23059b7b4cb5 100644
--- a/ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoLoader.java
+++ b/ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoLoader.java
@@ -38,7 +38,7 @@ public final class UnoLoader {
      * Executes a UNO JAR.
      *
      * @param base a base URL relative to which the URE JARs
-     * (<code>ridl.jar</code>, etc.) can be found; must
+     * (<code>libreoffice.jar</code>, etc.) can be found; must
      * not be <code>null</code>.
      *
      * @param jar the URL of a UNO JAR that specifies a Main-Class; must not be