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>

8 files changed, 30 insertions, 93 deletions

diff --git a/jurt/Jar_jurt.mk b/jurt/Jar_jurt.mk
index 70dae3bced4e..77b0657ab57f 100644
--- a/jurt/Jar_jurt.mk
+++ b/jurt/Jar_jurt.mk
@@ -9,76 +9,8 @@
 
 $(eval $(call gb_Jar_Jar,jurt))
 
-$(eval $(call gb_Jar_use_jars,jurt,\
-    ridl \
-    unoloader \
-))
-
-$(eval $(call gb_Jar_set_packageroot,jurt,com))
-
-$(eval $(call gb_Jar_set_manifest,jurt,$(SRCDIR)/jurt/util/manifest))
-
 $(eval $(call gb_Jar_add_manifest_classpath,jurt, \
     ridl.jar \
-    unoloader.jar \
-	$(if $(filter MACOSX,$(OS)),../../Frameworks/,../) \
-))
-
-$(eval $(call gb_Jar_add_sourcefiles,jurt,\
-    jurt/com/sun/star/comp/bridgefactory/BridgeFactory \
-    jurt/com/sun/star/comp/connections/Acceptor \
-    jurt/com/sun/star/comp/connections/Connector \
-    jurt/com/sun/star/comp/connections/ConstantInstanceProvider \
-    jurt/com/sun/star/comp/connections/Implementation \
-    jurt/com/sun/star/comp/connections/PipedConnection \
-    jurt/com/sun/star/comp/loader/FactoryHelper \
-    jurt/com/sun/star/comp/loader/JavaLoader \
-    jurt/com/sun/star/comp/loader/JavaLoaderFactory \
-    jurt/com/sun/star/comp/loader/RegistrationClassFinder \
-    jurt/com/sun/star/comp/servicemanager/ServiceManager \
-    jurt/com/sun/star/comp/urlresolver/UrlResolver \
-    jurt/com/sun/star/lib/connections/pipe/PipeConnection \
-    jurt/com/sun/star/lib/connections/pipe/pipeAcceptor \
-    jurt/com/sun/star/lib/connections/pipe/pipeConnector \
-    jurt/com/sun/star/lib/connections/socket/ConnectionDescriptor \
-    jurt/com/sun/star/lib/connections/socket/SocketConnection \
-    jurt/com/sun/star/lib/connections/socket/socketAcceptor \
-    jurt/com/sun/star/lib/connections/socket/socketConnector \
-    jurt/com/sun/star/lib/uno/Proxy \
-    jurt/com/sun/star/lib/uno/bridges/java_remote/BridgedObject \
-    jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory \
-    jurt/com/sun/star/lib/uno/bridges/java_remote/RequestHandler \
-    jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter \
-    jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter \
-    jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge \
-    jurt/com/sun/star/lib/uno/environments/java/java_environment \
-    jurt/com/sun/star/lib/uno/environments/remote/IProtocol \
-    jurt/com/sun/star/lib/uno/environments/remote/IReceiver \
-    jurt/com/sun/star/lib/uno/environments/remote/IThreadPool \
-    jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPool \
-    jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory \
-    jurt/com/sun/star/lib/uno/environments/remote/Job \
-    jurt/com/sun/star/lib/uno/environments/remote/JobQueue \
-    jurt/com/sun/star/lib/uno/environments/remote/Message \
-    jurt/com/sun/star/lib/uno/environments/remote/NativeThreadPool \
-    jurt/com/sun/star/lib/uno/environments/remote/ThreadId \
-    jurt/com/sun/star/lib/uno/environments/remote/ThreadPoolManager \
-    jurt/com/sun/star/lib/uno/environments/remote/remote_environment \
-    jurt/com/sun/star/lib/uno/protocols/urp/Cache \
-    jurt/com/sun/star/lib/uno/protocols/urp/Marshal \
-    jurt/com/sun/star/lib/uno/protocols/urp/PendingRequests \
-    jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal \
-    jurt/com/sun/star/lib/uno/protocols/urp/UrpMessage \
-    jurt/com/sun/star/lib/uno/protocols/urp/urp \
-    jurt/com/sun/star/lib/util/AsynchronousFinalizer \
-    jurt/com/sun/star/lib/util/NativeLibraryLoader \
-    jurt/com/sun/star/lib/util/StringHelper \
-    jurt/com/sun/star/lib/util/UrlToFileMapper \
-    jurt/com/sun/star/uno/AnyConverter \
-    jurt/com/sun/star/uno/Ascii \
-    jurt/com/sun/star/uno/AsciiString \
-    jurt/com/sun/star/uno/MappingException \
-    jurt/com/sun/star/uno/WeakReference \
 ))
 
 # vim:set noet sw=4 ts=4:
diff --git a/jurt/JunitTest_bridgefactory.mk b/jurt/JunitTest_bridgefactory.mk
index 887711831de0..67ad789bb26e 100644
--- a/jurt/JunitTest_bridgefactory.mk
+++ b/jurt/JunitTest_bridgefactory.mk
@@ -9,11 +9,13 @@
 
 $(eval $(call gb_JunitTest_JunitTest,jurt_bridgefactory))
 
-$(eval $(call gb_JunitTest_use_jars,jurt_bridgefactory,\
-    ridl \
+$(eval $(call gb_Jar_use_customtargets,jurt_bridgefactory, \
+    ridljar/javamaker \
 ))
 
-$(eval $(call gb_JunitTest_use_jar_classset,jurt_bridgefactory,jurt))
+$(eval $(call gb_JunitTest_use_jar_classset,jurt_bridgefactory,ridl))
+
+$(eval $(call gb_JunitTest_add_classpath,jurt_bridgefactory,$(call gb_CustomTarget_get_workdir,ridljar/javamaker)))
 
 $(eval $(call gb_JunitTest_add_sourcefiles,jurt_bridgefactory,\
     jurt/test/com/sun/star/comp/bridgefactory/BridgeFactory_Test \
diff --git a/jurt/JunitTest_connections.mk b/jurt/JunitTest_connections.mk
index 5887c2570644..b5528121fab4 100644
--- a/jurt/JunitTest_connections.mk
+++ b/jurt/JunitTest_connections.mk
@@ -9,11 +9,13 @@
 
 $(eval $(call gb_JunitTest_JunitTest,jurt_connections))
 
-$(eval $(call gb_JunitTest_use_jars,jurt_connections,\
-    ridl \
+$(eval $(call gb_Jar_use_customtargets,jurt_connections, \
+    ridljar/javamaker \
 ))
 
-$(eval $(call gb_JunitTest_use_jar_classset,jurt_connections,jurt))
+$(eval $(call gb_JunitTest_use_jar_classset,jurt_connections,ridl))
+
+$(eval $(call gb_JunitTest_add_classpath,jurt_connections,$(call gb_CustomTarget_get_workdir,ridljar/javamaker)))
 
 $(eval $(call gb_JunitTest_add_sourcefiles,jurt_connections,\
     jurt/test/com/sun/star/comp/connections/PipedConnection_Test \
diff --git a/jurt/JunitTest_java.mk b/jurt/JunitTest_java.mk
index 8609272c358a..715bc1b5fdab 100644
--- a/jurt/JunitTest_java.mk
+++ b/jurt/JunitTest_java.mk
@@ -9,11 +9,13 @@
 
 $(eval $(call gb_JunitTest_JunitTest,jurt_java))
 
-$(eval $(call gb_JunitTest_use_jars,jurt_java,\
-    ridl \
+$(eval $(call gb_Jar_use_customtargets,jurt_java, \
+    ridljar/javamaker \
 ))
 
-$(eval $(call gb_JunitTest_use_jar_classset,jurt_java,jurt))
+$(eval $(call gb_JunitTest_use_jar_classset,jurt_java,ridl))
+
+$(eval $(call gb_JunitTest_add_classpath,jurt_java,$(call gb_CustomTarget_get_workdir,ridljar/javamaker)))
 
 $(eval $(call gb_JunitTest_add_sourcefiles,jurt_java,\
     jurt/test/com/sun/star/lib/uno/environments/java/java_environment_Test \
diff --git a/jurt/JunitTest_java_remote.mk b/jurt/JunitTest_java_remote.mk
index f5d6aab0f63b..d96a6306fa88 100644
--- a/jurt/JunitTest_java_remote.mk
+++ b/jurt/JunitTest_java_remote.mk
@@ -11,10 +11,15 @@ $(eval $(call gb_JunitTest_JunitTest,jurt_java_remote))
 
 $(eval $(call gb_JunitTest_use_jars,jurt_java_remote,\
     OOoRunner \
-    ridl \
 ))
 
-$(eval $(call gb_JunitTest_use_jar_classset,jurt_java_remote,jurt))
+$(eval $(call gb_Jar_use_customtargets,jurt_java_remote, \
+    ridljar/javamaker \
+))
+
+$(eval $(call gb_JunitTest_use_jar_classset,jurt_java_remote,ridl))
+
+$(eval $(call gb_JunitTest_add_classpath,jurt_java_remote,$(call gb_CustomTarget_get_workdir,ridljar/javamaker)))
 
 $(eval $(call gb_JunitTest_add_sourcefiles,jurt_java_remote,\
     jurt/test/com/sun/star/lib/uno/bridges/java_remote/BridgedObject_Test \
diff --git a/jurt/JunitTest_remote.mk b/jurt/JunitTest_remote.mk
index dcedb73ab33a..1333076a1cbc 100644
--- a/jurt/JunitTest_remote.mk
+++ b/jurt/JunitTest_remote.mk
@@ -9,11 +9,13 @@
 
 $(eval $(call gb_JunitTest_JunitTest,jurt_remote))
 
-$(eval $(call gb_JunitTest_use_jars,jurt_remote,\
-    ridl \
+$(eval $(call gb_Jar_use_customtargets,jurt_remote, \
+    ridljar/javamaker \
 ))
 
-$(eval $(call gb_JunitTest_use_jar_classset,jurt_remote,jurt))
+$(eval $(call gb_JunitTest_use_jar_classset,jurt_remote,ridl))
+
+$(eval $(call gb_JunitTest_add_classpath,jurt_remote,$(call gb_CustomTarget_get_workdir,ridljar/javamaker)))
 
 $(eval $(call gb_JunitTest_add_sourcefiles,jurt_remote,\
     jurt/test/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory_Test \
diff --git a/jurt/JunitTest_urp.mk b/jurt/JunitTest_urp.mk
index 691322f248e5..fff2bc54230c 100644
--- a/jurt/JunitTest_urp.mk
+++ b/jurt/JunitTest_urp.mk
@@ -11,13 +11,12 @@ $(eval $(call gb_JunitTest_JunitTest,jurt_urp))
 
 $(eval $(call gb_JunitTest_use_customtargets,jurt_urp,\
     jurt/test/com/sun/star/lib/uno/protocols/urp \
+    ridljar/javamaker \
 ))
 
-$(eval $(call gb_JunitTest_use_jars,jurt_urp,\
-    ridl \
-))
+$(eval $(call gb_JunitTest_use_jar_classset,jurt_urp,ridl))
 
-$(eval $(call gb_JunitTest_use_jar_classset,jurt_urp,jurt))
+$(eval $(call gb_JunitTest_add_classpath,jurt_urp,$(call gb_CustomTarget_get_workdir,ridljar/javamaker)))
 
 $(eval $(call gb_JunitTest_add_sourcefiles,jurt_urp,\
     jurt/test/com/sun/star/lib/uno/protocols/urp/Cache_Test \
diff --git a/jurt/util/manifest b/jurt/util/manifest
deleted file mode 100644
index 1cb880553436..000000000000
--- a/jurt/util/manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-Sealed: true
-
-Name: com/sun/star/lib/util/
-Sealed: false
-
-Name: com/sun/star/uno/
-Sealed: false