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 <sbergman@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/84946
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit ae855bf48163ff64d94cfc34aff8e37abdb5518d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88005
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>

7 files changed, 7 insertions, 17 deletions

diff --git a/odk/config/cfgWin.js b/odk/config/cfgWin.js
index 1f001cc265e1..9ca5888f33ef 100644
--- a/odk/config/cfgWin.js
+++ b/odk/config/cfgWin.js
@@ -953,10 +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%\\jurt.jar;%OO_SDK_URE_JAVA_DIR%\\ridl.jar;%OO_SDK_URE_JAVA_DIR%\\unoloader.jar;%OO_SDK_OFFICE_JAVA_DIR%\\unoil.jar\n" +
-        "REM if defined OFFICE_HOME (\n" +
-        "REM     set CLASSPATH=%CLASSPATH%;%OO_SDK_OFFICE_JAVA_DIR%\\unoil.jar\n" +
-        "REM  )\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" +
         "\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 61f5c5a07651..f9f3a7c2a773 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}/jurt.jar:${OO_SDK_URE_JAVA_DIR}/ridl.jar:${OO_SDK_URE_JAVA_DIR}/unoloader.jar:${OFFICE_HOME}/$sdk_lo_java_dir/unoil.jar:${CLASSPATH}
+CLASSPATH=${OO_SDK_URE_JAVA_DIR}/juh.jar:${OO_SDK_URE_JAVA_DIR}/ridl.jar:${OO_SDK_URE_JAVA_DIR}/unoloader.jar:${CLASSPATH}
 export CLASSPATH
 
 
diff --git a/odk/docs/install.html b/odk/docs/install.html
index 682fd8c45b3b..aa917b9c41a6 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -378,10 +378,8 @@
                               <tr valign="top">
                                 <td class="cell20">CLASSPATH</td>
                                 <td class="cell80">=<i>$OO_SDK_URE_JAVA_DIR/juh.jar;
-                                    $OO_SDK_URE_JAVA_DIR/jurt.jar;
                                     $OO_SDK_URE_JAVA_DIR/ridl.jar;
                                     $OO_SDK_URE_JAVA_DIR/unoloader.jar;
-                                    $OO_SDK_URE_JAVA_DIR/unoil.jar;
                                     $CLASSPATH</i><br/>
                                   <p>The classpath will be set or extended to
                                     the necessary jar files of the specified
diff --git a/odk/examples/DevelopersGuide/FirstSteps/build_FirstUnoContact.xml b/odk/examples/DevelopersGuide/FirstSteps/build_FirstUnoContact.xml
index 0e2e55ce0525..6d17348ed479 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="jurt.jar,unoil.jar,ridl.jar,juh.jar"/>
+            files="ridl.jar,juh.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 4fce60578b58..ea5baadc1636 100644
--- a/odk/examples/DevelopersGuide/OfficeBean/Makefile
+++ b/odk/examples/DevelopersGuide/OfficeBean/Makefile
@@ -2,7 +2,7 @@
 #
 #  The Contents of this file are made available subject to the terms of
 #  the BSD license.
-#  
+#
 #  Copyright 2000, 2010 Oracle and/or its affiliates.
 #  All rights reserved.
 #
@@ -29,7 +29,7 @@
 #  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
 #  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 #  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#     
+#
 #**************************************************************************
 
 # Builds the OOoBean of the Developers Guide
@@ -50,10 +50,9 @@ JAVAFILES  = \
 
 CLASSFILES = $(patsubst %.java,$(OUT_COMP_CLASS)/$(PACKAGE)/%.class,$(JAVAFILES))
 
-SDK_CLASSPATH = $(subst $(EMPTYSTRING) $(PATH_SEPARATOR),$(PATH_SEPARATOR),$(URE_CLASSES_DIR)/jurt.jar\
+SDK_CLASSPATH = $(subst $(EMPTYSTRING) $(PATH_SEPARATOR),$(PATH_SEPARATOR),\
 		$(PATH_SEPARATOR)$(URE_CLASSES_DIR)/ridl.jar\
 		$(PATH_SEPARATOR)$(URE_CLASSES_DIR)/juh.jar\
-		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/unoil.jar\
 		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/officebean.jar\
 		$(PATH_SEPARATOR)$(OUT_COMP_CLASS))
 
@@ -69,7 +68,7 @@ endif
 
 include $(SETTINGS)/stdtarget.mk
 
-$(CLASSFILES) : $(JAVAFILES) 
+$(CLASSFILES) : $(JAVAFILES)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
 	javac $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMP_CLASS) $(JAVAFILES)
 
diff --git a/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/build.xml b/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/build.xml
index ae23fae58857..a3bf61fc7345 100644
--- a/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/build.xml
+++ b/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/build.xml
@@ -41,9 +41,7 @@
   <!-- ==================== classpath setting ============================ -->
   <target name="init" depends="checksdk,initsdk,initnosdk">
     <path id="scriptclasspath">
-      <pathelement location="${opp}/classes/unoil.jar"/>
       <pathelement location="${opp}/classes/ridl.jar"/>
-      <pathelement location="${opp}/classes/jurt.jar"/>
       <pathelement location="${opp}/classes/juh.jar"/>
       <pathelement location="${opp}/classes/ScriptFramework.jar"/>
     </path>
diff --git a/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/build.xml b/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/build.xml
index 88e0b8b60518..b3fc997e695a 100644
--- a/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/build.xml
+++ b/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/build.xml
@@ -41,9 +41,7 @@
   <!-- ==================== classpath setting ============================ -->
   <target name="init" depends="checksdk,initsdk,initnosdk">
     <path id="scriptclasspath">
-      <pathelement location="${opp}/classes/unoil.jar"/>
       <pathelement location="${opp}/classes/ridl.jar"/>
-      <pathelement location="${opp}/classes/jurt.jar"/>
       <pathelement location="${opp}/classes/juh.jar"/>
       <pathelement location="${opp}/classes/ScriptFramework.jar"/>
     </path>