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>

8 files changed, 9 insertions, 13 deletions

diff --git a/odk/CustomTarget_javadoc.mk b/odk/CustomTarget_javadoc.mk
index eefc26fd58ec..acb205610d5c 100644
--- a/odk/CustomTarget_javadoc.mk
+++ b/odk/CustomTarget_javadoc.mk
@@ -29,7 +29,7 @@ $(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/%.html : \
 	touch $@
 
 $(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/javadoc_log.txt : \
-		$(call gb_Jar_get_target,ridl)
+		$(call gb_Jar_get_target,libreoffice)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JDC,1)
 	$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),JDC)
 	$(call gb_Helper_abbreviate_dirs,\
@@ -39,7 +39,7 @@ $(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/javadoc_log.txt : \
 		-tag attention:a:"Attention:" \
 		-d $(dir $@) \
 		-sourcepath "$(SRCDIR)/ridljar/source/unoloader$(gb_CLASSPATHSEP)$(SRCDIR)/ridljar$(gb_CLASSPATHSEP)$(SRCDIR)/jurt$(gb_CLASSPATHSEP)$(SRCDIR)/javaunohelper" \
-		-classpath $(call gb_Jar_get_target,ridl) \
+		-classpath $(call gb_Jar_get_target,libreoffice) \
 		-linkoffline ../../common/reg $(SRCDIR)/odk/docs/java-uno \
 		-linkoffline http://java.sun.com/j2se/1.5/docs/api $(SRCDIR)/odk/docs/java \
 		$(odk_JAVAPACKAGES) \
diff --git a/odk/config/cfgWin.js b/odk/config/cfgWin.js
index 9ca5888f33ef..128f3e2eafd5 100644
--- a/odk/config/cfgWin.js
+++ b/odk/config/cfgWin.js
@@ -953,7 +953,7 @@ function writeBatFile(fdir, file)
         "set OO_SDK_OFFICE_JAVA_DIR=%OFFICE_PROGRAM_PATH%\\classes\n" +
         "\n" +
         "REM Set classpath\n" +
-        "set CLASSPATH=%OO_SDK_URE_JAVA_DIR%\\juh.jar;%OO_SDK_URE_JAVA_DIR%\\ridl.jar;%OO_SDK_URE_JAVA_DIR%\\unoloader.jar\n" +
+        "set CLASSPATH=%OO_SDK_URE_JAVA_DIR%\\libreoffice.jar;%OO_SDK_URE_JAVA_DIR%\\unoloader.jar\n" +
         "\n" +
         "REM Add directory of the SDK tools to the path.\n" +
         "set PATH=%OO_SDK_HOME%\\bin;%OO_SDK_URE_BIN_DIR%;%OO_SDK_OFFICE_BIN_DIR%;%OO_SDK_HOME%\\WINexample.out\\bin;%PATH%\n" +
diff --git a/odk/config/setsdkenv_unix.sh.in b/odk/config/setsdkenv_unix.sh.in
index f9f3a7c2a773..7feda4159e01 100644
--- a/odk/config/setsdkenv_unix.sh.in
+++ b/odk/config/setsdkenv_unix.sh.in
@@ -200,7 +200,7 @@ esac
 PATH=${OO_SDK_HOME}/bin:${OO_SDK_OUT}/${exampleout}/bin:${OO_SDK_URE_BIN_DIR}:${OFFICE_PROGRAM_PATH}:${PATH}
 
 # Set the classpath
-CLASSPATH=${OO_SDK_URE_JAVA_DIR}/juh.jar:${OO_SDK_URE_JAVA_DIR}/ridl.jar:${OO_SDK_URE_JAVA_DIR}/unoloader.jar:${CLASSPATH}
+CLASSPATH=${OO_SDK_URE_JAVA_DIR}/libreoffice.jar:${OO_SDK_URE_JAVA_DIR}/unoloader.jar:${CLASSPATH}
 export CLASSPATH
 
 
diff --git a/odk/docs/install.html b/odk/docs/install.html
index 3a5782a9b050..59c8fbf2758e 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -387,8 +387,7 @@
                               </tr>
                               <tr valign="top">
                                 <td class="cell20">CLASSPATH</td>
-                                <td class="cell80">=<i>$OO_SDK_URE_JAVA_DIR/juh.jar;
-                                    $OO_SDK_URE_JAVA_DIR/ridl.jar;
+                                <td class="cell80">=<i>$OO_SDK_URE_JAVA_DIR/libreoffice.jar;
                                     $OO_SDK_URE_JAVA_DIR/unoloader.jar;
                                     $CLASSPATH</i><br/>
                                   <p>The classpath will be set or extended to
diff --git a/odk/examples/DevelopersGuide/FirstSteps/build_FirstUnoContact.xml b/odk/examples/DevelopersGuide/FirstSteps/build_FirstUnoContact.xml
index 6d17348ed479..4dec9aa7ee7c 100644
--- a/odk/examples/DevelopersGuide/FirstSteps/build_FirstUnoContact.xml
+++ b/odk/examples/DevelopersGuide/FirstSteps/build_FirstUnoContact.xml
@@ -28,7 +28,7 @@
 
     <path id="office.class.path">
         <filelist dir="${OFFICE_HOME}/program/classes"
-            files="ridl.jar,juh.jar"/>
+            files="libreoffice.jar"/>
     </path>
 
     <fileset id="bootstrap.glue.code" dir="${OO_SDK_HOME}/classes">
diff --git a/odk/examples/DevelopersGuide/OfficeBean/Makefile b/odk/examples/DevelopersGuide/OfficeBean/Makefile
index ea5baadc1636..09c10d05d722 100644
--- a/odk/examples/DevelopersGuide/OfficeBean/Makefile
+++ b/odk/examples/DevelopersGuide/OfficeBean/Makefile
@@ -51,8 +51,7 @@ JAVAFILES  = \
 CLASSFILES = $(patsubst %.java,$(OUT_COMP_CLASS)/$(PACKAGE)/%.class,$(JAVAFILES))
 
 SDK_CLASSPATH = $(subst $(EMPTYSTRING) $(PATH_SEPARATOR),$(PATH_SEPARATOR),\
-		$(PATH_SEPARATOR)$(URE_CLASSES_DIR)/ridl.jar\
-		$(PATH_SEPARATOR)$(URE_CLASSES_DIR)/juh.jar\
+		$(PATH_SEPARATOR)$(URE_CLASSES_DIR)/libreoffice.jar\
 		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/officebean.jar\
 		$(PATH_SEPARATOR)$(OUT_COMP_CLASS))
 
diff --git a/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/build.xml b/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/build.xml
index a3bf61fc7345..b79ac64ae483 100644
--- a/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/build.xml
+++ b/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/build.xml
@@ -41,8 +41,7 @@
   <!-- ==================== classpath setting ============================ -->
   <target name="init" depends="checksdk,initsdk,initnosdk">
     <path id="scriptclasspath">
-      <pathelement location="${opp}/classes/ridl.jar"/>
-      <pathelement location="${opp}/classes/juh.jar"/>
+      <pathelement location="${opp}/classes/libreoffice.jar"/>
       <pathelement location="${opp}/classes/ScriptFramework.jar"/>
     </path>
   </target>
diff --git a/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/build.xml b/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/build.xml
index b3fc997e695a..c290030465ba 100644
--- a/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/build.xml
+++ b/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/build.xml
@@ -41,8 +41,7 @@
   <!-- ==================== classpath setting ============================ -->
   <target name="init" depends="checksdk,initsdk,initnosdk">
     <path id="scriptclasspath">
-      <pathelement location="${opp}/classes/ridl.jar"/>
-      <pathelement location="${opp}/classes/juh.jar"/>
+      <pathelement location="${opp}/classes/libreoffice.jar"/>
       <pathelement location="${opp}/classes/ScriptFramework.jar"/>
     </path>
   </target>