[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - android/source bean/Jar_officebean.mk bean/JunitTest_bean_complex.mk bean/test connectivity/Jar_ConnectivityTools.mk desktop/Jar_active_java.mk desktop/Jar_passive_java.mk desktop/scripts desktop/win32 extensions/test include/jvmfwk instsetoo_native/CustomTarget_setup.mk javaunohelper/Jar_juh.mk javaunohelper/JunitTest_juh.mk jurt/Jar_jurt.mk jurt/JunitTest_bridgefactory.mk jurt/JunitTest_connections.mk jurt/JunitTest_java.mk jurt/JunitTest_java_remote.mk jurt/JunitTest_remote.mk jurt/JunitTest_urp.mk jurt/util linguistic/JunitTest_linguistic_complex.mk nlpsolver/Jar_nlpsolver.mk odk/config odk/docs odk/examples qadevOOo/.classpath qadevOOo/Jar_OOoRunner.mk reportbuilder/Jar_reportbuilder.mk ridljar/Jar_ridl.mk ridljar/source ridljar/util scp2/source scripting/Jar_HelloWorld.mk scripting/Jar_Highlight.mk scripting/Jar_MemoryUsage.mk scripting/Jar_ScriptFramework.mk scripting/Jar_ScriptProviderForBeanShell.mk scripting /Jar_ScriptProviderForJava.mk scripting/Jar_ScriptProviderForJavaScript.mk smoketest/Jar_smoketest.mk smoketest/Jar_TestExtension.mk solenv/gbuild swext/Jar_mediawiki.mk testtools/CustomTarget_bridgetest.mk testtools/Jar_testComponent.mk toolkit/JunitTest_toolkit_complex.mk toolkit/test unoil/Jar_unoil.mk unotest/Jar_test.mk unotest/Jar_test-tools.mk ure/source wizards/Jar_commonwizards.mk wizards/Jar_form.mk wizards/Jar_query.mk wizards/Jar_reportbuilder.mk wizards/Jar_report.mk wizards/Jar_table.mk xmerge/Jar_XMergeBridge.mk xmerge/Jar_xmerge.mk
Samuel Mehrbrodt (via logerrit)
logerrit at kemper.freedesktop.org
Wed Feb 5 16:30:05 UTC 2020
android/source/build.gradle | 2
bean/Jar_officebean.mk | 2
bean/JunitTest_bean_complex.mk | 1
bean/test/applet/oooapplet/OOoViewer.java | 2
connectivity/Jar_ConnectivityTools.mk | 2
desktop/Jar_active_java.mk | 1
desktop/Jar_passive_java.mk | 1
desktop/scripts/unoinfo-mac.sh | 5
desktop/scripts/unoinfo.sh | 6
desktop/win32/source/unoinfo.cxx | 4
extensions/test/pgp/readme.txt | 4
include/jvmfwk/framework.hxx | 6
instsetoo_native/CustomTarget_setup.mk | 2
javaunohelper/Jar_juh.mk | 2
javaunohelper/JunitTest_juh.mk | 1
jurt/Jar_jurt.mk | 68 ----------
jurt/JunitTest_bridgefactory.mk | 8 -
jurt/JunitTest_connections.mk | 8 -
jurt/JunitTest_java.mk | 8 -
jurt/JunitTest_java_remote.mk | 9 +
jurt/JunitTest_remote.mk | 8 -
jurt/JunitTest_urp.mk | 7 -
jurt/util/manifest | 7 -
linguistic/JunitTest_linguistic_complex.mk | 2
nlpsolver/Jar_nlpsolver.mk | 2
odk/config/cfgWin.js | 5
odk/config/setsdkenv_unix.sh.in | 2
odk/docs/install.html | 2
odk/examples/DevelopersGuide/FirstSteps/build_FirstUnoContact.xml | 2
odk/examples/DevelopersGuide/OfficeBean/Makefile | 9 -
odk/examples/DevelopersGuide/ScriptingFramework/SayHello/build.xml | 2
odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/build.xml | 2
qadevOOo/.classpath | 2
qadevOOo/Jar_OOoRunner.mk | 3
reportbuilder/Jar_reportbuilder.mk | 2
ridljar/Jar_ridl.mk | 67 +++++++++
ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoClassLoader.java | 7 -
ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoLoader.java | 2
ridljar/util/manifest | 37 +++++
scp2/source/ooo/common_brand.scp | 2
scripting/Jar_HelloWorld.mk | 2
scripting/Jar_Highlight.mk | 2
scripting/Jar_MemoryUsage.mk | 2
scripting/Jar_ScriptFramework.mk | 2
scripting/Jar_ScriptProviderForBeanShell.mk | 2
scripting/Jar_ScriptProviderForJava.mk | 2
scripting/Jar_ScriptProviderForJavaScript.mk | 2
smoketest/Jar_TestExtension.mk | 4
smoketest/Jar_smoketest.mk | 1
solenv/gbuild/CppunitTest.mk | 2
solenv/gbuild/Jar.mk | 4
solenv/gbuild/JunitTest.mk | 8 -
swext/Jar_mediawiki.mk | 2
testtools/CustomTarget_bridgetest.mk | 2
testtools/Jar_testComponent.mk | 1
toolkit/JunitTest_toolkit_complex.mk | 1
toolkit/test/accessibility/jawb.mf | 2
unoil/Jar_unoil.mk | 8 -
unotest/Jar_test-tools.mk | 2
unotest/Jar_test.mk | 2
ure/source/README | 6
ure/source/uretest/Makefile.pln | 4
wizards/Jar_commonwizards.mk | 2
wizards/Jar_form.mk | 2
wizards/Jar_query.mk | 2
wizards/Jar_report.mk | 2
wizards/Jar_reportbuilder.mk | 2
wizards/Jar_table.mk | 2
xmerge/Jar_XMergeBridge.mk | 2
xmerge/Jar_xmerge.mk | 2
70 files changed, 176 insertions(+), 217 deletions(-)
New commits:
commit d791e16771700cf8d43300d0a8ed234cab37c747
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Wed Dec 11 13:23:43 2019 +0100
Commit: Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Wed Feb 5 17:29:30 2020 +0100
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 at redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/84946
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
(cherry picked from commit ae855bf48163ff64d94cfc34aff8e37abdb5518d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88005
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
diff --git a/android/source/build.gradle b/android/source/build.gradle
index fe7ac2d30afe..06251c4f5a6c 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -28,11 +28,9 @@ dependencies {
implementation fileTree(dir: "${liboInstdir}/${liboUREJavaFolder}", include: [
"java_uno.jar",
"juh.jar",
- "jurt.jar",
"ridl.jar",
"unoloader.jar"
])
- implementation files("${liboInstdir}/${liboShareJavaFolder}/unoil.jar")
implementation(name:'owncloud_android_lib', ext:'aar')
implementation 'com.android.support:design:27.1.1' // also pulls-in corresponding support libraries
implementation 'com.android.support.constraint:constraint-layout:1.1.2'
diff --git a/bean/Jar_officebean.mk b/bean/Jar_officebean.mk
index 12b895aa191b..424b4ab2a559 100644
--- a/bean/Jar_officebean.mk
+++ b/bean/Jar_officebean.mk
@@ -12,8 +12,6 @@ $(eval $(call gb_Jar_Jar,officebean))
$(eval $(call gb_Jar_use_jars,officebean,\
ridl \
- unoil \
- jurt \
juh \
))
diff --git a/bean/JunitTest_bean_complex.mk b/bean/JunitTest_bean_complex.mk
index 1d22dcd31f8f..091fe544c6b7 100644
--- a/bean/JunitTest_bean_complex.mk
+++ b/bean/JunitTest_bean_complex.mk
@@ -14,7 +14,6 @@ $(eval $(call gb_JunitTest_use_jars,bean_complex,\
OOoRunner \
ridl \
test \
- unoil \
officebean \
))
diff --git a/bean/test/applet/oooapplet/OOoViewer.java b/bean/test/applet/oooapplet/OOoViewer.java
index d437611187f9..d958032df221 100644
--- a/bean/test/applet/oooapplet/OOoViewer.java
+++ b/bean/test/applet/oooapplet/OOoViewer.java
@@ -45,9 +45,7 @@ public class OOoViewer extends Applet {
String officeURL = url.toString();
URL[] arURL = new URL[] {
new URL(officeURL + "/program/classes/officebean.jar"),
- new URL(officeURL + "/program/classes/jurt.jar"),
new URL(officeURL + "/program/classes/ridl.jar"),
- new URL(officeURL + "/program/classes/unoil.jar"),
new URL(officeURL + "/program/classes/java_uno.jar"),
new URL(officeURL + "/program/classes/juh.jar")
};
diff --git a/connectivity/Jar_ConnectivityTools.mk b/connectivity/Jar_ConnectivityTools.mk
index fc8a861f2b8a..250b2ff3ae17 100644
--- a/connectivity/Jar_ConnectivityTools.mk
+++ b/connectivity/Jar_ConnectivityTools.mk
@@ -12,8 +12,6 @@ $(eval $(call gb_Jar_Jar,ConnectivityTools))
$(eval $(call gb_Jar_use_jars,ConnectivityTools,\
ridl \
- unoil \
- jurt \
juh \
java_uno \
OOoRunner \
diff --git a/desktop/Jar_active_java.mk b/desktop/Jar_active_java.mk
index 5fa49e840297..6e1be1adaed3 100644
--- a/desktop/Jar_active_java.mk
+++ b/desktop/Jar_active_java.mk
@@ -22,7 +22,6 @@ $(eval $(call gb_Jar_set_packageroot,active_java,com))
$(eval $(call gb_Jar_use_jars,active_java, \
juh \
ridl \
- unoil \
))
# vim: set noet sw=4 ts=4:
diff --git a/desktop/Jar_passive_java.mk b/desktop/Jar_passive_java.mk
index e1023a5d5230..007a37e8e6d6 100644
--- a/desktop/Jar_passive_java.mk
+++ b/desktop/Jar_passive_java.mk
@@ -24,7 +24,6 @@ $(eval $(call gb_Jar_set_packageroot,passive_java,com))
$(eval $(call gb_Jar_use_jars,passive_java, \
juh \
ridl \
- unoil \
))
# vim: set noet sw=4 ts=4:
diff --git a/desktop/scripts/unoinfo-mac.sh b/desktop/scripts/unoinfo-mac.sh
index ba9dcf7f6281..c8728a0e5e30 100755
--- a/desktop/scripts/unoinfo-mac.sh
+++ b/desktop/scripts/unoinfo-mac.sh
@@ -36,11 +36,10 @@ c++)
printf '%s' "$sd_prog/../Frameworks"
;;
java)
- printf '0%s\0%s\0%s\0%s\0%s' \
+ printf '0%s\0%s\0%s' \
"$sd_prog/../Resources/java/ridl.jar" \
- "$sd_prog/../Resources/java/jurt.jar" \
"$sd_prog/../Resources/java/juh.jar" \
- "$sd_prog/../Resources/java/unoil.jar" "$sd_prog"
+ "$sd_prog"
;;
*)
exit 1
diff --git a/desktop/scripts/unoinfo.sh b/desktop/scripts/unoinfo.sh
index 4e660624bfb7..297acf3169d8 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\0%s\0%s' \
- "$sd_prog/classes/ridl.jar" "$sd_prog/classes/jurt.jar" \
- "$sd_prog/classes/juh.jar" "$sd_prog/classes/unoil.jar" "$sd_prog"
+ printf '0%s\0%s\0%s' \
+ "$sd_prog/classes/ridl.jar" \
+ "$sd_prog/classes/juh.jar" "$sd_prog"
;;
*)
exit 1
diff --git a/desktop/win32/source/unoinfo.cxx b/desktop/win32/source/unoinfo.cxx
index 3a41b6e0985e..f86232feb64f 100644
--- a/desktop/win32/source/unoinfo.cxx
+++ b/desktop/win32/source/unoinfo.cxx
@@ -77,12 +77,8 @@ int wmain(int argc, wchar_t ** argv, wchar_t **) {
wchar_t * pathEnd = getBrandPath(path);
writePath(path, pathEnd, MY_STRING(L"classes\\ridl.jar"));
writeNull();
- writePath(path, pathEnd, MY_STRING(L"classes\\jurt.jar"));
- writeNull();
writePath(path, pathEnd, MY_STRING(L"classes\\juh.jar"));
writeNull();
- writePath(path, pathEnd, MY_STRING(L"classes\\unoil.jar"));
- writeNull();
writePath(path, pathEnd, MY_STRING(L""));
} else {
exit(EXIT_FAILURE);
diff --git a/extensions/test/pgp/readme.txt b/extensions/test/pgp/readme.txt
index ccb26d365b48..d1a63f6771ca 100644
--- a/extensions/test/pgp/readme.txt
+++ b/extensions/test/pgp/readme.txt
@@ -17,7 +17,7 @@ Please note the semicolons!
For the program to run make sure that the office has access
- to classes.zip, unoil.jar, jurt.jar, pgp.jar and swingall.jar.
+ to classes.zip, ridl.jar, pgp.jar and swingall.jar.
Therefore do the necessary entries in
Office/user/config/javarc
@@ -30,4 +30,4 @@ The TestPGP is called without ;iiop; :
java TestPGP "socket,host=localhost,port=1111"
-
+
diff --git a/include/jvmfwk/framework.hxx b/include/jvmfwk/framework.hxx
index 3c7fe2981436..469e4b872b22 100644
--- a/include/jvmfwk/framework.hxx
+++ b/include/jvmfwk/framework.hxx
@@ -98,13 +98,13 @@
</p>
<p>
regcomp -env:UNO_JAVA_JFW_JREHOME=file:///d:/j2re1.4.2
- -env:"UNO_JAVA_JFW_CLASSPATH=d:\\solver\\bin\\classes.jar;d:\\solver\\bin\\jurt.jar"
+ -env:"UNO_JAVA_JFW_CLASSPATH=d:\\solver\\bin\\classes.jar;d:\\solver\\bin\\ridl.jar"
-register...
</p>
<p>If UNO_JAVA_JFW_VENDOR_SETTINGS is not set then a plugin library must be specified. For example:</p>
<p>
regcomp -env:UNO_JAVA_JFW_JREHOME=file:///d:/j2re1.4.2
- -env:"UNO_JAVA_JFW_CLASSPATH=d:\\solver\\bin\\classes.jar;d:\\solver\\bin\\jurt.jar"
+ -env:"UNO_JAVA_JFW_CLASSPATH=d:\\solver\\bin\\classes.jar;d:\\solver\\bin\\ridl.jar"
-register...
</p>
<p>Additional parameters for the Java VM can be provided. For every parameter
@@ -114,7 +114,7 @@
regcomp -env:UNO_JAVA_JFW_PARAMETER_1=-Xdebug
-env:UNO_JAVA_JFW_PARAMETER_2=-Xrunjdwp:transport=dt_socket,server=y,address=8100
-env:UNO_JAVA_JFW_JREHOME=file:///d:/j2re1.4.2
- -env:"UNO_JAVA_JFW_CLASSPATH=d:\\solver\\bin\\classes.jar;d:\\solver\\bin\\jurt.jar"
+ -env:"UNO_JAVA_JFW_CLASSPATH=d:\\solver\\bin\\classes.jar;d:\\solver\\bin\\ridl.jar"
-register...</p>
<p>
Here is a complete list of the bootstrap parameter for the direct mode:
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
index b30f78052f9c..2c22c9a3445a 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -66,7 +66,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'URE_MORE_JAVA_CLASSPATH_URLS=$(if $(SYSTEM_HSQLDB),$(HSQLDB_JAR))' \
&& echo 'URE_OVERRIDE_JAVA_JFW_SHARED_DATA=$${BRAND_BASE_DIR}/$(LIBO_SHARE_FOLDER)/config/javasettings_$${_OS}_$${_ARCH}.xml' \
&& echo 'URE_OVERRIDE_JAVA_JFW_USER_DATA=$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/config/javasettings_$${_OS}_$${_ARCH}.xml' \
- && echo 'URE_MORE_JAVA_TYPES=$${BRAND_BASE_DIR}/$(LIBO_SHARE_JAVA_FOLDER)/unoil.jar $${BRAND_BASE_DIR}/$(LIBO_SHARE_JAVA_FOLDER)/ScriptFramework.jar $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):PKG_BundledUnoFile}:UNO_JAVA_CLASSPATH}' \
+ && echo 'URE_MORE_JAVA_TYPES=$${BRAND_BASE_DIR}/$(LIBO_SHARE_JAVA_FOLDER)/ridl.jar $${BRAND_BASE_DIR}/$(LIBO_SHARE_JAVA_FOLDER)/ScriptFramework.jar $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):PKG_BundledUnoFile}:UNO_JAVA_CLASSPATH}' \
&& echo 'URE_MORE_SERVICES=$${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):PKG_UserUnoFile}:UNO_SERVICES} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):PKG_SharedUnoFile}:UNO_SERVICES} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):PKG_BundledUnoFile}:UNO_SERVICES} <$$ORIGIN/services>*' \
&& echo 'URE_MORE_TYPES=<$$ORIGIN/types>* $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):PKG_UserUnoFile}:UNO_TYPES} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):PKG_SharedUnoFile}:UNO_TYPES} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):PKG_BundledUnoFile}:UNO_TYPES}' \
) > $@
diff --git a/javaunohelper/Jar_juh.mk b/javaunohelper/Jar_juh.mk
index 633a2d8c60f4..7f90852eb6df 100644
--- a/javaunohelper/Jar_juh.mk
+++ b/javaunohelper/Jar_juh.mk
@@ -10,14 +10,12 @@
$(eval $(call gb_Jar_Jar,juh))
$(eval $(call gb_Jar_use_jars,juh,\
- jurt \
ridl \
))
$(eval $(call gb_Jar_set_packageroot,juh,com))
$(eval $(call gb_Jar_add_manifest_classpath,juh, \
- jurt.jar \
ridl.jar \
$(if $(filter MACOSX,$(OS)),../../Frameworks/,../) \
))
diff --git a/javaunohelper/JunitTest_juh.mk b/javaunohelper/JunitTest_juh.mk
index 22aff54608d6..d819cb237fc7 100644
--- a/javaunohelper/JunitTest_juh.mk
+++ b/javaunohelper/JunitTest_juh.mk
@@ -17,7 +17,6 @@ $(eval $(call gb_JunitTest_set_defs,juh,\
$(eval $(call gb_JunitTest_use_jars,juh,\
OOoRunner \
ridl \
- jurt \
))
$(eval $(call gb_JunitTest_use_jar_classset,juh,ridljar))
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
diff --git a/linguistic/JunitTest_linguistic_complex.mk b/linguistic/JunitTest_linguistic_complex.mk
index 26c425c53ab6..9d6c82962341 100644
--- a/linguistic/JunitTest_linguistic_complex.mk
+++ b/linguistic/JunitTest_linguistic_complex.mk
@@ -29,8 +29,6 @@ $(eval $(call gb_JunitTest_use_jars,linguistic_complex,\
ridl \
test \
test-tools \
- unoil \
- jurt \
))
$(eval $(call gb_JunitTest_add_sourcefiles,linguistic_complex,\
diff --git a/nlpsolver/Jar_nlpsolver.mk b/nlpsolver/Jar_nlpsolver.mk
index b7749e2d4189..47119cb59bf2 100644
--- a/nlpsolver/Jar_nlpsolver.mk
+++ b/nlpsolver/Jar_nlpsolver.mk
@@ -21,8 +21,6 @@ $(eval $(call gb_Jar_Jar,nlpsolver))
$(eval $(call gb_Jar_use_jars,nlpsolver,\
ridl \
- unoil \
- jurt \
juh \
java_uno \
EvolutionarySolver \
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>
diff --git a/qadevOOo/.classpath b/qadevOOo/.classpath
index f140b6a85347..d8828a72c283 100644
--- a/qadevOOo/.classpath
+++ b/qadevOOo/.classpath
@@ -10,9 +10,7 @@
<classpathentry kind="lib" path="testdocs/qadevlibs/MyPersistObjectImpl.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="../instdir/program/classes/juh.jar"/>
- <classpathentry kind="lib" path="../instdir/program/classes/jurt.jar"/>
<classpathentry kind="lib" path="../instdir/program/classes/ridl.jar"/>
- <classpathentry kind="lib" path="../instdir/program/classes/unoil.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="output" path="../workdir/qadevooo-bin"/>
</classpath>
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 679035d206e3..201b83e1b942 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -15,15 +15,12 @@ $(eval $(call gb_Jar_Jar,OOoRunner))
$(eval $(call gb_Jar_add_manifest_classpath,OOoRunner,\
ridl.jar \
- unoil.jar \
))
$(eval $(call gb_Jar_set_manifest,OOoRunner,$(SRCDIR)/qadevOOo/runner/manifest))
$(eval $(call gb_Jar_use_jars,OOoRunner,\
ridl \
- unoil \
- jurt \
juh \
java_uno \
))
diff --git a/reportbuilder/Jar_reportbuilder.mk b/reportbuilder/Jar_reportbuilder.mk
index bc73037bf616..83778dd0fbf4 100644
--- a/reportbuilder/Jar_reportbuilder.mk
+++ b/reportbuilder/Jar_reportbuilder.mk
@@ -12,9 +12,7 @@ $(eval $(call gb_Jar_Jar,reportbuilder))
$(eval $(call gb_Jar_use_jars,reportbuilder,\
java_uno \
juh \
- jurt \
ridl \
- unoil \
))
$(eval $(call gb_Jar_use_externals,reportbuilder,\
diff --git a/ridljar/Jar_ridl.mk b/ridljar/Jar_ridl.mk
index 90bdc9449b41..9cb3bbd2aaa3 100644
--- a/ridljar/Jar_ridl.mk
+++ b/ridljar/Jar_ridl.mk
@@ -11,12 +11,25 @@ $(eval $(call gb_Jar_Jar,ridl))
$(eval $(call gb_Jar_use_customtargets,ridl,\
ridljar/javamaker \
+ unoil/javamaker \
+))
+
+$(eval $(call gb_Jar_use_jars,ridl, \
+ unoloader \
))
$(eval $(call gb_Jar_set_packageroot,ridl,com))
+$(eval $(call gb_Jar_set_manifest,ridl,$(SRCDIR)/ridljar/util/manifest))
+
+$(eval $(call gb_Jar_add_manifest_classpath,ridl, \
+ unoloader.jar \
+ $(if $(filter MACOSX,$(OS)),../../Frameworks/,../) \
+))
+
$(eval $(call gb_Jar_add_packagedirs,ridl,\
$(call gb_CustomTarget_get_workdir,ridljar/javamaker)/com \
+ $(call gb_CustomTarget_get_workdir,unoil/javamaker)/com \
))
$(eval $(call gb_Jar_add_sourcefiles,ridl,\
@@ -41,6 +54,60 @@ $(eval $(call gb_Jar_add_sourcefiles,ridl,\
ridljar/com/sun/star/uno/IQueryInterface \
ridljar/com/sun/star/uno/Type \
ridljar/com/sun/star/uno/UnoRuntime \
+ 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/ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoClassLoader.java b/ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoClassLoader.java
index 7adb33b9269e..c52165abfeb7 100644
--- a/ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoClassLoader.java
+++ b/ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoClassLoader.java
@@ -49,7 +49,7 @@ 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>jurt.jar</code>,
+ * (<code>java_uno.jar</code>, <code>juh.jar</code>,
* <code>ridl.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
@@ -191,12 +191,11 @@ public final class UnoClassLoader extends URLClassLoader {
private static URL[] createUrls(URL base, URL[] classPath)
throws MalformedURLException
{
- final int JARS = 4;
+ final int JARS = 3;
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, "jurt.jar");
- urls[3] = new URL(base, "ridl.jar");
+ urls[2] = new URL(base, "ridl.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 76f392cefd13..1ed16fcca94c 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>jurt.jar</code>, <code>ridl.jar</code>, etc.) can be found; must
+ * (<code>ridl.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
diff --git a/ridljar/util/manifest b/ridljar/util/manifest
new file mode 100644
index 000000000000..ab777d6fe7ba
--- /dev/null
+++ b/ridljar/util/manifest
@@ -0,0 +1,37 @@
+Sealed: false
+
+Name: com/sun/star/comp/bridgefactory/
+Sealed: true
+
+Name: com/sun/star/comp/connections/
+Sealed: true
+
+Name: com/sun/star/comp/loader/
+Sealed: true
+
+Name: com/sun/star/comp/servicemanager/
+Sealed: true
+
+Name: com/sun/star/comp/urlresolver/
+Sealed: true
+
+Name: com/sun/star/lib/connections/pipe/
+Sealed: true
+
+Name: com/sun/star/lib/connections/socket/
+Sealed: true
+
+Name: com/sun/star/lib/uno/
+Sealed: true
+
+Name: com/sun/star/lib/uno/bridges/java_remote/
+Sealed: true
+
+Name: com/sun/star/lib/uno/environments/java/
+Sealed: true
+
+Name: com/sun/star/lib/uno/environments/remote/
+Sealed: true
+
+Name: com/sun/star/lib/uno/protocols/urp/
+Sealed: true
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index e46bd98acd60..5f989c65cdf2 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -754,7 +754,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Java_Types
ProfileID = gid_Brand_Profile_Fundamental_Ini;
Section = "Bootstrap";
Key = "URE_MORE_JAVA_TYPES";
- Value = "${BRAND_BASE_DIR}/" LIBO_SHARE_JAVA_FOLDER "/unoil.jar ${BRAND_BASE_DIR}/" LIBO_SHARE_JAVA_FOLDER "/ScriptFramework.jar ${${$ORIGIN/" PROFILENAME(louno) ":PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(louno) ":PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(louno) ":PKG_BundledUnoFile}:UNO_JAVA_CLASSPATH}";
+ Value = "${BRAND_BASE_DIR}/" LIBO_SHARE_JAVA_FOLDER "/ridl.jar ${BRAND_BASE_DIR}/" LIBO_SHARE_JAVA_FOLDER "/ScriptFramework.jar ${${$ORIGIN/" PROFILENAME(louno) ":PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(louno) ":PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(louno) ":PKG_BundledUnoFile}:UNO_JAVA_CLASSPATH}";
End
ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Jfw_Shared_Data
diff --git a/scripting/Jar_HelloWorld.mk b/scripting/Jar_HelloWorld.mk
index 9966e90914d0..c80f628eb765 100644
--- a/scripting/Jar_HelloWorld.mk
+++ b/scripting/Jar_HelloWorld.mk
@@ -11,9 +11,7 @@ $(eval $(call gb_Jar_Jar,HelloWorld))
$(eval $(call gb_Jar_use_jars,HelloWorld,\
juh \
- jurt \
ridl \
- unoil \
))
$(eval $(call gb_Jar_add_sourcefiles,HelloWorld,\
diff --git a/scripting/Jar_Highlight.mk b/scripting/Jar_Highlight.mk
index 0b643cdae10c..18e3bf916a76 100644
--- a/scripting/Jar_Highlight.mk
+++ b/scripting/Jar_Highlight.mk
@@ -11,9 +11,7 @@ $(eval $(call gb_Jar_Jar,Highlight))
$(eval $(call gb_Jar_use_jars,Highlight,\
juh \
- jurt \
ridl \
- unoil \
))
$(eval $(call gb_Jar_add_sourcefiles,Highlight,\
diff --git a/scripting/Jar_MemoryUsage.mk b/scripting/Jar_MemoryUsage.mk
index 6d34dbe8e2ff..e1c0f9f8c11a 100644
--- a/scripting/Jar_MemoryUsage.mk
+++ b/scripting/Jar_MemoryUsage.mk
@@ -11,9 +11,7 @@ $(eval $(call gb_Jar_Jar,MemoryUsage))
$(eval $(call gb_Jar_use_jars,MemoryUsage,\
juh \
- jurt \
ridl \
- unoil \
))
$(eval $(call gb_Jar_add_sourcefiles,MemoryUsage,\
diff --git a/scripting/Jar_ScriptFramework.mk b/scripting/Jar_ScriptFramework.mk
index 9bf31b62cb64..8f0cd9a9062a 100644
--- a/scripting/Jar_ScriptFramework.mk
+++ b/scripting/Jar_ScriptFramework.mk
@@ -11,9 +11,7 @@ $(eval $(call gb_Jar_Jar,ScriptFramework))
$(eval $(call gb_Jar_use_jars,ScriptFramework,\
juh \
- jurt \
ridl \
- unoil \
))
$(eval $(call gb_Jar_set_componentfile,ScriptFramework,scripting/java/ScriptFramework,OOO))
diff --git a/scripting/Jar_ScriptProviderForBeanShell.mk b/scripting/Jar_ScriptProviderForBeanShell.mk
index e0b4c3ab5776..fdbbec8ab201 100644
--- a/scripting/Jar_ScriptProviderForBeanShell.mk
+++ b/scripting/Jar_ScriptProviderForBeanShell.mk
@@ -11,9 +11,7 @@ $(eval $(call gb_Jar_Jar,ScriptProviderForBeanShell))
$(eval $(call gb_Jar_use_jars,ScriptProviderForBeanShell,\
juh \
- jurt \
ridl \
- unoil \
ScriptFramework \
))
diff --git a/scripting/Jar_ScriptProviderForJava.mk b/scripting/Jar_ScriptProviderForJava.mk
index 64014f4f1a44..e0d4bee3756e 100644
--- a/scripting/Jar_ScriptProviderForJava.mk
+++ b/scripting/Jar_ScriptProviderForJava.mk
@@ -11,9 +11,7 @@ $(eval $(call gb_Jar_Jar,ScriptProviderForJava))
$(eval $(call gb_Jar_use_jars,ScriptProviderForJava,\
juh \
- jurt \
ridl \
- unoil \
ScriptFramework \
))
diff --git a/scripting/Jar_ScriptProviderForJavaScript.mk b/scripting/Jar_ScriptProviderForJavaScript.mk
index f89551cec429..976c6ee7b809 100644
--- a/scripting/Jar_ScriptProviderForJavaScript.mk
+++ b/scripting/Jar_ScriptProviderForJavaScript.mk
@@ -11,9 +11,7 @@ $(eval $(call gb_Jar_Jar,ScriptProviderForJavaScript))
$(eval $(call gb_Jar_use_jars,ScriptProviderForJavaScript,\
juh \
- jurt \
ridl \
- unoil \
ScriptFramework \
))
diff --git a/smoketest/Jar_TestExtension.mk b/smoketest/Jar_TestExtension.mk
index 00b9ab5a5bd0..22a3a5cdb5fd 100644
--- a/smoketest/Jar_TestExtension.mk
+++ b/smoketest/Jar_TestExtension.mk
@@ -14,16 +14,12 @@ $(eval $(call gb_Jar_set_manifest,TestExtension,$(SRCDIR)/smoketest/com/sun/star
$(eval $(call gb_Jar_add_manifest_classpath,TestExtension,\
juh.jar \
- jurt.jar \
ridl.jar \
- unoil.jar \
))
$(eval $(call gb_Jar_use_jars,TestExtension,\
juh \
- jurt \
ridl \
- unoil \
))
$(eval $(call gb_Jar_set_packageroot,TestExtension,com))
diff --git a/smoketest/Jar_smoketest.mk b/smoketest/Jar_smoketest.mk
index 2f0bca193901..86210c8eba70 100644
--- a/smoketest/Jar_smoketest.mk
+++ b/smoketest/Jar_smoketest.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_Jar_set_packageroot,smoketest,org))
$(eval $(call gb_Jar_use_jars,smoketest, \
juh \
ridl \
- unoil \
))
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index f2a267e3e04b..6d23e32d918e 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -372,7 +372,7 @@ gb_CppunitTest_use_more_fonts = $(call gb_TestHelpers_use_more_fonts,$(call gb_C
define gb_CppunitTest_use_java_ure
$(call gb_CppunitTest_get_target,$(1)) : JAVA_URE := $(true)
$(call gb_CppunitTest_get_target,$(1)) : \
- $(foreach jar,java_uno juh jurt unoil unoloader,$(call gb_Jar_get_target,$(jar))) \
+ $(foreach jar,java_uno juh ridl unoloader,$(call gb_Jar_get_target,$(jar))) \
$(call gb_Library_get_target,affine_uno_uno) \
$(call gb_Library_get_target,java_uno) \
$(call gb_Library_get_target,jpipe) \
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 86dcb45cc9d4..c647ffd59d95 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -89,7 +89,7 @@ $(call gb_Jar_get_target,$(1)) :
endef
# resets scoped variables (see explanations where they are set)
-# creates a class set and a dependency to it
+# creates a class set and a dependency to it
# registers target and clean target
# adds jar files to DeliverLogTarget
define gb_Jar_Jar
@@ -250,7 +250,7 @@ define gb_Jar_use_external_project
$(call gb_JavaClassSet_use_external_project,$(call gb_Jar_get_classsetname,$(1)),$(2))
endef
-# possible directories for jar files containing UNO services
+# possible directories for jar files containing UNO services
gb_Jar_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dLO_JAVA_DIR/ \
URE:vnd.sun.star.expand:\dURE_INTERNAL_JAVA_DIR/ \
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 2102d196d58c..4861e3bf5b2b 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -117,6 +117,12 @@ $(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$$(gb_CLASSPATHSEP)$(call
endef
+define gb_JunitTest_add_classpath
+$(call gb_JavaClassSet_add_classpath,$(call gb_JunitTest_get_classsetname,$(1)),$(2))
+$(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$$(gb_CLASSPATHSEP)$(2)
+
+endef
+
define gb_JunitTest_use_system_jar
$(call gb_JavaClassSet_use_system_jar,$(call gb_JunitTest_get_classsetname,$(1)),$(2))
@@ -155,10 +161,8 @@ endef
define gb_JunitTest_use_unoapi_jars
$(eval $(call gb_JunitTest_use_jars,$(1),\
OOoRunner \
- jurt \
ridl \
test \
- unoil \
))
endef
diff --git a/swext/Jar_mediawiki.mk b/swext/Jar_mediawiki.mk
index 234158013de8..31d621561f7c 100644
--- a/swext/Jar_mediawiki.mk
+++ b/swext/Jar_mediawiki.mk
@@ -16,9 +16,7 @@ $(eval $(call gb_Jar_set_manifest,mediawiki,$(SRCDIR)/swext/mediawiki/src/com/su
$(eval $(call gb_Jar_use_jars,mediawiki,\
juh \
- jurt \
ridl \
- unoil \
))
$(eval $(call gb_Jar_add_sourcefiles,mediawiki,\
diff --git a/testtools/CustomTarget_bridgetest.mk b/testtools/CustomTarget_bridgetest.mk
index d090146ec411..bbba541612e2 100644
--- a/testtools/CustomTarget_bridgetest.mk
+++ b/testtools/CustomTarget_bridgetest.mk
@@ -39,7 +39,7 @@ $(testtools_BRIDGEDIR)/bridgetest_server$(testtools_BATCHSUFFIX) :| $(testtools_
$(if $(filter-out WNT,$(OS)),chmod +x $@)
-testtools_MY_CLASSPATH := $(call gb_Jar_get_target,ridl)$(gb_CLASSPATHSEP)$(call gb_Jar_get_target,java_uno)$(gb_CLASSPATHSEP)$(call gb_Jar_get_target,jurt)$(gb_CLASSPATHSEP)$(call gb_Jar_get_target,juh)
+testtools_MY_CLASSPATH := $(call gb_Jar_get_target,ridl)$(gb_CLASSPATHSEP)$(call gb_Jar_get_target,java_uno)$(gb_CLASSPATHSEP)$(call gb_Jar_get_target,juh)
$(testtools_BRIDGEDIR)/bridgetest_javaserver$(testtools_BATCHSUFFIX) :| $(testtools_BRIDGEDIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
diff --git a/testtools/Jar_testComponent.mk b/testtools/Jar_testComponent.mk
index b2df55100afb..d173a853627f 100644
--- a/testtools/Jar_testComponent.mk
+++ b/testtools/Jar_testComponent.mk
@@ -10,7 +10,6 @@
$(eval $(call gb_Jar_Jar,testComponent))
$(eval $(call gb_Jar_use_jars,testComponent,\
- jurt \
ridl \
juh \
))
diff --git a/toolkit/JunitTest_toolkit_complex.mk b/toolkit/JunitTest_toolkit_complex.mk
index 6f9b069902ec..87c4e5e02994 100644
--- a/toolkit/JunitTest_toolkit_complex.mk
+++ b/toolkit/JunitTest_toolkit_complex.mk
@@ -22,7 +22,6 @@ $(eval $(call gb_JunitTest_use_jars,toolkit_complex,\
OOoRunner \
ridl \
test \
- unoil \
))
$(eval $(call gb_JunitTest_add_sourcefiles,toolkit_complex,\
diff --git a/toolkit/test/accessibility/jawb.mf b/toolkit/test/accessibility/jawb.mf
index 939cbdad22ab..4ff1a259f892 100644
--- a/toolkit/test/accessibility/jawb.mf
+++ b/toolkit/test/accessibility/jawb.mf
@@ -1,3 +1,3 @@
Manifest-Version: 1.0
Main-Class: AccessibilityWorkBench
-Class-Path: classes.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar xt.jar xml-apis.jar
+Class-Path: classes.jar ridl.jar juh.jar java_uno.jar xt.jar xml-apis.jar
diff --git a/unoil/Jar_unoil.mk b/unoil/Jar_unoil.mk
index 9dc1ffc1012c..a88615ddd9c2 100644
--- a/unoil/Jar_unoil.mk
+++ b/unoil/Jar_unoil.mk
@@ -9,12 +9,8 @@
$(eval $(call gb_Jar_Jar,unoil))
-$(eval $(call gb_Jar_use_customtargets,unoil,\
- unoil/javamaker \
-))
-
-$(eval $(call gb_Jar_add_packagedirs,unoil,\
- $(call gb_CustomTarget_get_workdir,unoil/javamaker)/com \
+$(eval $(call gb_Jar_add_manifest_classpath,unoil, \
+ ridl.jar \
))
# vim:set noet sw=4 ts=4:
diff --git a/unotest/Jar_test-tools.mk b/unotest/Jar_test-tools.mk
index 0e7ad9e73a68..939571a3947a 100644
--- a/unotest/Jar_test-tools.mk
+++ b/unotest/Jar_test-tools.mk
@@ -13,13 +13,11 @@ $(eval $(call gb_Jar_Jar,test-tools))
$(eval $(call gb_Jar_add_manifest_classpath,test-tools,\
juh.jar \
ridl.jar \
- unoil.jar \
))
$(eval $(call gb_Jar_use_jars,test-tools,\
juh \
ridl \
- unoil \
))
$(eval $(call gb_Jar_set_packageroot,test-tools,org))
diff --git a/unotest/Jar_test.mk b/unotest/Jar_test.mk
index cc5fde435c7b..0619b91fbf11 100644
--- a/unotest/Jar_test.mk
+++ b/unotest/Jar_test.mk
@@ -13,13 +13,11 @@ $(eval $(call gb_Jar_Jar,test))
$(eval $(call gb_Jar_add_manifest_classpath,test,\
$(call gb_Helper_make_url,$(call gb_Jar_get_target,juh)) \
$(call gb_Helper_make_url,$(call gb_Jar_get_target,ridl)) \
- $(call gb_Helper_make_url,$(call gb_Jar_get_target,unoil)) \
))
$(eval $(call gb_Jar_use_jars,test,\
juh \
ridl \
- unoil \
OOoRunner \
))
diff --git a/ure/source/README b/ure/source/README
index 8a8a8f0890f6..27a2b6b994ce 100644
--- a/ure/source/README
+++ b/ure/source/README
@@ -186,8 +186,10 @@ functionality that these libraries offer, see the "C++ Reference" section of the
SDK HTML documentation. The corresponding C++ header files are not in the URE,
but rather in the SDK.
-- unoloader.jar, juh.jar, jurt.jar, and ridl.jar are the public Java UNO runtime
-Java[tm] Archives (JARs) that client code can call. For details on the
+- unoloader.jar, juh.jar, and ridl.jar are the public Java UNO runtime
+Java[tm] Archives (JARs) that client code can call (jurt.jar is still provided
+for backwards compatibility, but is basically empty and has been merged into
+ridl.jar). For details on the
functionality that these files offer, see the "Java UNO Runtime Reference"
section of the SDK HTML documentation.
diff --git a/ure/source/uretest/Makefile.pln b/ure/source/uretest/Makefile.pln
index 7c4bcdd8f616..3b44382675bc 100644
--- a/ure/source/uretest/Makefile.pln
+++ b/ure/source/uretest/Makefile.pln
@@ -143,7 +143,7 @@ out.pln/class/javamain/test/java/javamain/JavaMain.class: JavaMain.java \
rm -rf out.pln/class/javamain
mkdir out.pln/class/javamain
javac -classpath \
- $(URE_HOME)/program/classes/jurt.jar:$(URE_HOME)/program/classes/ridl.jar:out.pln/tester.jar \
+ $(URE_HOME)/program/classes/ridl.jar:out.pln/tester.jar \
-sourcepath . -d out.pln/class/javamain $<
@@ -194,7 +194,7 @@ out.pln/class/javatest/test/java/javatest/JavaTest.class: JavaTest.java \
rm -rf out.pln/class/javatest
mkdir out.pln/class/javatest
javac -classpath \
- $(URE_HOME)/program/classes/jurt.jar:$(URE_HOME)/program/classes/ridl.jar:out.pln/types.jar \
+ $(URE_HOME)/program/classes/ridl.jar:out.pln/types.jar \
-sourcepath . -d out.pln/class/javatest $<
diff --git a/wizards/Jar_commonwizards.mk b/wizards/Jar_commonwizards.mk
index a9b15619b022..ca432ea37fb0 100644
--- a/wizards/Jar_commonwizards.mk
+++ b/wizards/Jar_commonwizards.mk
@@ -21,8 +21,6 @@ $(eval $(call gb_Jar_Jar,commonwizards))
$(eval $(call gb_Jar_use_jars,commonwizards,\
ridl \
- unoil \
- jurt \
juh \
java_uno \
))
diff --git a/wizards/Jar_form.mk b/wizards/Jar_form.mk
index 665e93b46de6..626e5386b1e2 100644
--- a/wizards/Jar_form.mk
+++ b/wizards/Jar_form.mk
@@ -21,8 +21,6 @@ $(eval $(call gb_Jar_Jar,form))
$(eval $(call gb_Jar_use_jars,form,\
ridl \
- unoil \
- jurt \
juh \
java_uno \
commonwizards \
diff --git a/wizards/Jar_query.mk b/wizards/Jar_query.mk
index b03d6de03d7b..5d58df01812b 100644
--- a/wizards/Jar_query.mk
+++ b/wizards/Jar_query.mk
@@ -21,8 +21,6 @@ $(eval $(call gb_Jar_Jar,query))
$(eval $(call gb_Jar_use_jars,query,\
ridl \
- unoil \
- jurt \
juh \
java_uno \
commonwizards \
diff --git a/wizards/Jar_report.mk b/wizards/Jar_report.mk
index 50e9615634b3..8f791383b70e 100644
--- a/wizards/Jar_report.mk
+++ b/wizards/Jar_report.mk
@@ -21,8 +21,6 @@ $(eval $(call gb_Jar_Jar,report))
$(eval $(call gb_Jar_use_jars,report,\
ridl \
- unoil \
- jurt \
juh \
java_uno \
commonwizards \
diff --git a/wizards/Jar_reportbuilder.mk b/wizards/Jar_reportbuilder.mk
index 52ecb59fb1f0..f97ee8a40934 100644
--- a/wizards/Jar_reportbuilder.mk
+++ b/wizards/Jar_reportbuilder.mk
@@ -21,8 +21,6 @@ $(eval $(call gb_Jar_Jar,reportbuilderwizard))
$(eval $(call gb_Jar_use_jars,reportbuilderwizard,\
ridl \
- unoil \
- jurt \
juh \
java_uno \
commonwizards \
diff --git a/wizards/Jar_table.mk b/wizards/Jar_table.mk
index 48a963fdc997..6924c878c32d 100644
--- a/wizards/Jar_table.mk
+++ b/wizards/Jar_table.mk
@@ -21,8 +21,6 @@ $(eval $(call gb_Jar_Jar,table))
$(eval $(call gb_Jar_use_jars,table,\
ridl \
- unoil \
- jurt \
juh \
java_uno \
commonwizards \
diff --git a/xmerge/Jar_XMergeBridge.mk b/xmerge/Jar_XMergeBridge.mk
index c07d84b56dcb..96ce1556edab 100644
--- a/xmerge/Jar_XMergeBridge.mk
+++ b/xmerge/Jar_XMergeBridge.mk
@@ -18,9 +18,7 @@ $(eval $(call gb_Jar_set_packageroot,XMergeBridge,*.class))
$(eval $(call gb_Jar_use_jars,XMergeBridge,\
xmerge \
- unoil \
ridl \
- jurt \
juh \
))
diff --git a/xmerge/Jar_xmerge.mk b/xmerge/Jar_xmerge.mk
index 8d0e7ff96791..022f8fefe8cd 100644
--- a/xmerge/Jar_xmerge.mk
+++ b/xmerge/Jar_xmerge.mk
@@ -13,9 +13,7 @@ $(eval $(call gb_Jar_Jar,xmerge))
$(eval $(call gb_Jar_set_manifest,xmerge,$(SRCDIR)/xmerge/source/xmerge/xmerge.mf))
$(eval $(call gb_Jar_use_jars,xmerge,\
- unoil \
ridl \
- jurt \
juh \
))
More information about the Libreoffice-commits
mailing list