regcomp -env:UNO_JAVA_JFW_JREHOME=file:///d:/j2re1.4.2 - -env:"UNO_JAVA_JFW_CLASSPATH=d:\\solver\\bin\\classes.jar;d:\\solver\\bin\\ridl.jar" + -env:"UNO_JAVA_JFW_CLASSPATH=d:\\solver\\bin\\classes.jar;d:\\solver\\bin\\libreoffice.jar" -register...
If UNO_JAVA_JFW_VENDOR_SETTINGS is not set then a plugin library must be specified. For example:
regcomp -env:UNO_JAVA_JFW_JREHOME=file:///d:/j2re1.4.2 - -env:"UNO_JAVA_JFW_CLASSPATH=d:\\solver\\bin\\classes.jar;d:\\solver\\bin\\ridl.jar" + -env:"UNO_JAVA_JFW_CLASSPATH=d:\\solver\\bin\\classes.jar;d:\\solver\\bin\\libreoffice.jar" -register...
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\\ridl.jar" + -env:"UNO_JAVA_JFW_CLASSPATH=d:\\solver\\bin\\classes.jar;d:\\solver\\bin\\libreoffice.jar" -register...
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 0f0f6158abc8..4d845441c6a6 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -69,7 +69,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)/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_JAVA_TYPES=$${BRAND_BASE_DIR}/$(LIBO_SHARE_JAVA_FOLDER)/libreoffice.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 7f90852eb6df..cf469200cd49 100644 --- a/javaunohelper/Jar_juh.mk +++ b/javaunohelper/Jar_juh.mk @@ -9,40 +9,10 @@ $(eval $(call gb_Jar_Jar,juh)) -$(eval $(call gb_Jar_use_jars,juh,\ - ridl \ -)) - -$(eval $(call gb_Jar_set_packageroot,juh,com)) - $(eval $(call gb_Jar_add_manifest_classpath,juh, \ - ridl.jar \ - $(if $(filter MACOSX,$(OS)),../../Frameworks/,../) \ + libreoffice.jar \ )) $(eval $(call gb_Jar_set_manifest,juh,$(SRCDIR)/javaunohelper/util/manifest)) -$(eval $(call gb_Jar_add_sourcefiles,juh,\ - javaunohelper/com/sun/star/comp/helper/Bootstrap \ - javaunohelper/com/sun/star/comp/helper/BootstrapException \ - javaunohelper/com/sun/star/comp/helper/ComponentContext \ - javaunohelper/com/sun/star/comp/helper/ComponentContextEntry \ - javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader \ - javaunohelper/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter \ - javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter \ - javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter \ - javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter \ - javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter \ - javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter \ - javaunohelper/com/sun/star/lib/uno/helper/ComponentBase \ - javaunohelper/com/sun/star/lib/uno/helper/Factory \ - javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer \ - javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer \ - javaunohelper/com/sun/star/lib/uno/helper/PropertySet \ - javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin \ - javaunohelper/com/sun/star/lib/uno/helper/UnoUrl \ - javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter \ - javaunohelper/com/sun/star/lib/uno/helper/WeakBase \ -)) - # vim:set noet sw=4 ts=4: diff --git a/javaunohelper/JunitTest_juh.mk b/javaunohelper/JunitTest_juh.mk index d819cb237fc7..e5ccfa1c4716 100644 --- a/javaunohelper/JunitTest_juh.mk +++ b/javaunohelper/JunitTest_juh.mk @@ -16,22 +16,12 @@ $(eval $(call gb_JunitTest_set_defs,juh,\ $(eval $(call gb_JunitTest_use_jars,juh,\ OOoRunner \ - ridl \ + libreoffice \ )) -$(eval $(call gb_JunitTest_use_jar_classset,juh,ridljar)) +$(eval $(call gb_JunitTest_use_jar_classset,juh,libreoffice)) $(eval $(call gb_JunitTest_add_sourcefiles,juh,\ - javaunohelper/com/sun/star/comp/helper/Bootstrap \ - javaunohelper/com/sun/star/comp/helper/BootstrapException \ - javaunohelper/com/sun/star/comp/helper/ComponentContext \ - javaunohelper/com/sun/star/comp/helper/ComponentContextEntry \ - javaunohelper/com/sun/star/lib/uno/helper/ComponentBase \ - javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer \ - javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer \ - javaunohelper/com/sun/star/lib/uno/helper/PropertySet \ - javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter \ - javaunohelper/com/sun/star/lib/uno/helper/WeakBase \ javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test \ javaunohelper/test/com/sun/star/lib/uno/helper/AWeakBase \ javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test \ diff --git a/javaunohelper/util/manifest b/javaunohelper/util/manifest index f89dc5414f0c..5c77968cd97c 100644 --- a/javaunohelper/util/manifest +++ b/javaunohelper/util/manifest @@ -1,2 +1 @@ -Sealed: true UNO-Type-Path: diff --git a/jurt/Jar_jurt.mk b/jurt/Jar_jurt.mk index 77b0657ab57f..faf917fc3ae2 100644 --- a/jurt/Jar_jurt.mk +++ b/jurt/Jar_jurt.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Jar_Jar,jurt)) $(eval $(call gb_Jar_add_manifest_classpath,jurt, \ - ridl.jar \ + libreoffice.jar \ )) # vim:set noet sw=4 ts=4: diff --git a/nlpsolver/Jar_nlpsolver.mk b/nlpsolver/Jar_nlpsolver.mk index 47119cb59bf2..3203b012d80f 100644 --- a/nlpsolver/Jar_nlpsolver.mk +++ b/nlpsolver/Jar_nlpsolver.mk @@ -20,8 +20,7 @@ $(eval $(call gb_Jar_Jar,nlpsolver)) $(eval $(call gb_Jar_use_jars,nlpsolver,\ - ridl \ - juh \ + libreoffice \ java_uno \ EvolutionarySolver \ )) 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 @@
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 @@
java_uno.jar, juh.jar,
- * ridl.jar) can be found; must not be null.
+ * (java_uno.jar and libreoffice.jar)
+ * can be found; must not be null.
*
* @param classPath an array of URLs that form the class path of this class
* loader; may be null, 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
- * (ridl.jar, etc.) can be found; must
+ * (libreoffice.jar, etc.) can be found; must
* not be null.
*
* @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
index ab777d6fe7ba..bb1209f90a22 100644
--- a/ridljar/util/manifest
+++ b/ridljar/util/manifest
@@ -6,6 +6,9 @@ Sealed: true
Name: com/sun/star/comp/connections/
Sealed: true
+Name: com/sun/star/comp/helper
+Sealed: true
+
Name: com/sun/star/comp/loader/
Sealed: true
@@ -24,6 +27,9 @@ Sealed: true
Name: com/sun/star/lib/uno/
Sealed: true
+Name: com/sun/star/lib/uno/adapter
+Sealed: true
+
Name: com/sun/star/lib/uno/bridges/java_remote/
Sealed: true
@@ -33,5 +39,8 @@ Sealed: true
Name: com/sun/star/lib/uno/environments/remote/
Sealed: true
+Name: com/sun/star/lib/uno/helper
+Sealed: true
+
Name: com/sun/star/lib/uno/protocols/urp/
Sealed: true
diff --git a/scripting/Jar_HelloWorld.mk b/scripting/Jar_HelloWorld.mk
index c80f628eb765..1a44592e115c 100644
--- a/scripting/Jar_HelloWorld.mk
+++ b/scripting/Jar_HelloWorld.mk
@@ -10,8 +10,7 @@
$(eval $(call gb_Jar_Jar,HelloWorld))
$(eval $(call gb_Jar_use_jars,HelloWorld,\
- juh \
- ridl \
+ libreoffice \
))
$(eval $(call gb_Jar_add_sourcefiles,HelloWorld,\
diff --git a/scripting/Jar_Highlight.mk b/scripting/Jar_Highlight.mk
index 18e3bf916a76..fb756cc8b1ff 100644
--- a/scripting/Jar_Highlight.mk
+++ b/scripting/Jar_Highlight.mk
@@ -10,8 +10,7 @@
$(eval $(call gb_Jar_Jar,Highlight))
$(eval $(call gb_Jar_use_jars,Highlight,\
- juh \
- ridl \
+ libreoffice \
))
$(eval $(call gb_Jar_add_sourcefiles,Highlight,\
diff --git a/scripting/Jar_MemoryUsage.mk b/scripting/Jar_MemoryUsage.mk
index e1c0f9f8c11a..8f917d360c45 100644
--- a/scripting/Jar_MemoryUsage.mk
+++ b/scripting/Jar_MemoryUsage.mk
@@ -10,8 +10,7 @@
$(eval $(call gb_Jar_Jar,MemoryUsage))
$(eval $(call gb_Jar_use_jars,MemoryUsage,\
- juh \
- ridl \
+ libreoffice \
))
$(eval $(call gb_Jar_add_sourcefiles,MemoryUsage,\
diff --git a/scripting/Jar_ScriptFramework.mk b/scripting/Jar_ScriptFramework.mk
index 8f0cd9a9062a..397de3ccbc72 100644
--- a/scripting/Jar_ScriptFramework.mk
+++ b/scripting/Jar_ScriptFramework.mk
@@ -10,8 +10,7 @@
$(eval $(call gb_Jar_Jar,ScriptFramework))
$(eval $(call gb_Jar_use_jars,ScriptFramework,\
- juh \
- ridl \
+ libreoffice \
))
$(eval $(call gb_Jar_set_componentfile,ScriptFramework,scripting/java/ScriptFramework,OOO))
diff --git a/scripting/Jar_ScriptProviderForBeanShell.mk b/scripting/Jar_ScriptProviderForBeanShell.mk
index fdbbec8ab201..6f362818d7b3 100644
--- a/scripting/Jar_ScriptProviderForBeanShell.mk
+++ b/scripting/Jar_ScriptProviderForBeanShell.mk
@@ -10,8 +10,7 @@
$(eval $(call gb_Jar_Jar,ScriptProviderForBeanShell))
$(eval $(call gb_Jar_use_jars,ScriptProviderForBeanShell,\
- juh \
- ridl \
+ libreoffice \
ScriptFramework \
))
diff --git a/scripting/Jar_ScriptProviderForJava.mk b/scripting/Jar_ScriptProviderForJava.mk
index e0d4bee3756e..8e7d3e2d17a9 100644
--- a/scripting/Jar_ScriptProviderForJava.mk
+++ b/scripting/Jar_ScriptProviderForJava.mk
@@ -10,8 +10,7 @@
$(eval $(call gb_Jar_Jar,ScriptProviderForJava))
$(eval $(call gb_Jar_use_jars,ScriptProviderForJava,\
- juh \
- ridl \
+ libreoffice \
ScriptFramework \
))
diff --git a/scripting/Jar_ScriptProviderForJavaScript.mk b/scripting/Jar_ScriptProviderForJavaScript.mk
index 976c6ee7b809..c777cbcab302 100644
--- a/scripting/Jar_ScriptProviderForJavaScript.mk
+++ b/scripting/Jar_ScriptProviderForJavaScript.mk
@@ -10,8 +10,7 @@
$(eval $(call gb_Jar_Jar,ScriptProviderForJavaScript))
$(eval $(call gb_Jar_use_jars,ScriptProviderForJavaScript,\
- juh \
- ridl \
+ libreoffice \
ScriptFramework \
))
diff --git a/smoketest/Jar_TestExtension.mk b/smoketest/Jar_TestExtension.mk
index 22a3a5cdb5fd..c0621d94db5f 100644
--- a/smoketest/Jar_TestExtension.mk
+++ b/smoketest/Jar_TestExtension.mk
@@ -13,13 +13,11 @@ $(eval $(call gb_Jar_Jar,TestExtension))
$(eval $(call gb_Jar_set_manifest,TestExtension,$(SRCDIR)/smoketest/com/sun/star/comp/smoketest/MANIFEST.MF))
$(eval $(call gb_Jar_add_manifest_classpath,TestExtension,\
- juh.jar \
- ridl.jar \
+ libreoffice.jar \
))
$(eval $(call gb_Jar_use_jars,TestExtension,\
- juh \
- ridl \
+ libreoffice \
))
$(eval $(call gb_Jar_set_packageroot,TestExtension,com))
diff --git a/smoketest/Jar_smoketest.mk b/smoketest/Jar_smoketest.mk
index 86210c8eba70..19259910f03c 100644
--- a/smoketest/Jar_smoketest.mk
+++ b/smoketest/Jar_smoketest.mk
@@ -21,8 +21,7 @@ $(eval $(call gb_Jar_set_manifest,smoketest,$(SRCDIR)/smoketest/org/libreoffice/
$(eval $(call gb_Jar_set_packageroot,smoketest,org))
$(eval $(call gb_Jar_use_jars,smoketest, \
- juh \
- ridl \
+ libreoffice \
))
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index d90a2c89311c..efe39ed45a8d 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -376,7 +376,7 @@ endef
define gb_CppunitTest__use_java_ure
$(call gb_CppunitTest_get_target,$(1)) : \
- $(foreach jar,java_uno juh ridl unoloader,$(call gb_Jar_get_target,$(jar))) \
+ $(foreach jar,java_uno libreoffice 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/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 290fab3af4c8..401c8ff5cd97 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -163,7 +163,7 @@ endef
define gb_JunitTest_use_unoapi_jars
$(eval $(call gb_JunitTest_use_jars,$(1),\
OOoRunner \
- ridl \
+ libreoffice \
test \
))
diff --git a/swext/Jar_mediawiki.mk b/swext/Jar_mediawiki.mk
index 31d621561f7c..25a2ce91b453 100644
--- a/swext/Jar_mediawiki.mk
+++ b/swext/Jar_mediawiki.mk
@@ -15,8 +15,7 @@ $(eval $(call gb_Jar_set_packageroot,mediawiki,com))
$(eval $(call gb_Jar_set_manifest,mediawiki,$(SRCDIR)/swext/mediawiki/src/com/sun/star/wiki/MANIFEST.MF))
$(eval $(call gb_Jar_use_jars,mediawiki,\
- juh \
- ridl \
+ libreoffice \
))
$(eval $(call gb_Jar_add_sourcefiles,mediawiki,\
diff --git a/testtools/Jar_testComponent.mk b/testtools/Jar_testComponent.mk
index d173a853627f..f3969a42277d 100644
--- a/testtools/Jar_testComponent.mk
+++ b/testtools/Jar_testComponent.mk
@@ -10,8 +10,11 @@
$(eval $(call gb_Jar_Jar,testComponent))
$(eval $(call gb_Jar_use_jars,testComponent,\
- ridl \
- juh \
+ libreoffice \
+))
+
+$(eval $(call gb_Jar_use_api,testComponent,\
+ udkapi \
))
$(eval $(call gb_Jar_use_customtargets,testComponent,\
diff --git a/toolkit/JunitTest_toolkit_complex.mk b/toolkit/JunitTest_toolkit_complex.mk
index 87c4e5e02994..4a06582a0083 100644
--- a/toolkit/JunitTest_toolkit_complex.mk
+++ b/toolkit/JunitTest_toolkit_complex.mk
@@ -20,7 +20,7 @@ $(eval $(call gb_JunitTest_JunitTest,toolkit_complex))
$(eval $(call gb_JunitTest_use_jars,toolkit_complex,\
OOoRunner \
- ridl \
+ libreoffice \
test \
))
diff --git a/toolkit/test/accessibility/jawb.mf b/toolkit/test/accessibility/jawb.mf
index 4ff1a259f892..88aa2cc765c6 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 juh.jar java_uno.jar xt.jar xml-apis.jar
+Class-Path: classes.jar libreoffice.jar java_uno.jar xt.jar xml-apis.jar
diff --git a/unoil/Jar_unoil.mk b/unoil/Jar_unoil.mk
index a88615ddd9c2..b0265c93f364 100644
--- a/unoil/Jar_unoil.mk
+++ b/unoil/Jar_unoil.mk
@@ -10,7 +10,7 @@
$(eval $(call gb_Jar_Jar,unoil))
$(eval $(call gb_Jar_add_manifest_classpath,unoil, \
- ridl.jar \
+ libreoffice.jar \
))
# vim:set noet sw=4 ts=4:
diff --git a/unotest/Jar_test-tools.mk b/unotest/Jar_test-tools.mk
index 939571a3947a..2f8034813712 100644
--- a/unotest/Jar_test-tools.mk
+++ b/unotest/Jar_test-tools.mk
@@ -11,13 +11,11 @@
$(eval $(call gb_Jar_Jar,test-tools))
$(eval $(call gb_Jar_add_manifest_classpath,test-tools,\
- juh.jar \
- ridl.jar \
+ libreoffice.jar \
))
$(eval $(call gb_Jar_use_jars,test-tools,\
- juh \
- ridl \
+ libreoffice \
))
$(eval $(call gb_Jar_set_packageroot,test-tools,org))
diff --git a/unotest/Jar_test.mk b/unotest/Jar_test.mk
index 0619b91fbf11..45063ff1ccd9 100644
--- a/unotest/Jar_test.mk
+++ b/unotest/Jar_test.mk
@@ -11,13 +11,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,libreoffice)) \
))
$(eval $(call gb_Jar_use_jars,test,\
- juh \
- ridl \
+ libreoffice \
OOoRunner \
))
diff --git a/ure/source/README b/ure/source/README
index 27a2b6b994ce..aad11505e971 100644
--- a/ure/source/README
+++ b/ure/source/README
@@ -36,6 +36,7 @@ ELF platforms (Linux, Solaris, *BSD):
/opt/libreoffice/ure/share/java/unoloader.jar
/opt/libreoffice/ure/share/java/juh.jar
/opt/libreoffice/ure/share/java/jurt.jar
+/opt/libreoffice/ure/share/java/libreoffice.jar
/opt/libreoffice/ure/share/java/ridl.jar
/opt/libreoffice/ure/share/misc/types.rdb
/opt/libreoffice/ure/share/misc/services.rdb
@@ -93,6 +94,7 @@ Program Files\URE\bin\purpenvhelper3MSC.dll
Program Files\URE\bin\sal3.dll
Program Files\URE\bin\salhelper3MSC.dll
Program Files\URE\java\unoloader.jar
+Program Files\URE\java\libreoffice.jar
Program Files\URE\java\juh.jar
Program Files\URE\java\jurt.jar
Program Files\URE\java\ridl.jar
@@ -159,8 +161,8 @@ Files marked as [private] are private to the URE installation. To avoid
stability issues, applications that use the URE should not access the
functionality of these files.
-Files marked as [GAC] are installed in the Global Assembly Cache on Windows. The
-file path reflects the path as seen in the Explorer with the Assembly
+Files marked as [GAC] are installed in the Global Assembly Cache on Windows. The
+file path reflects the path as seen in the Explorer with the Assembly
Cache Viewer Tool (Shfusion.dll) installed. The actual paths are different.
@@ -186,12 +188,12 @@ 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, 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.
+- libreoffice.jar and unoloader.jar are the public Java UNO runtime
+Java[tm] Archives (JARs) that client code can call.
+juh.jar, jurt.jar, ridl.jar, unoil.jar are still provided for backwards compatibility,
+but are basically empty and have been merged into libreoffice.jar.
+For details on the functionality that these files offer, see the
+"Java UNO Runtime Reference" section of the SDK HTML documentation.
- types.rdb and services.rdb are preconfigured UNO type and service registries.
For more details, see the "Deploying a URE" section of this README.
diff --git a/ure/source/uretest/Makefile.pln b/ure/source/uretest/Makefile.pln
index 3b44382675bc..3ea8c34827cc 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/ridl.jar:out.pln/tester.jar \
+ $(URE_HOME)/program/classes/libreoffice.jar:out.pln/tester.jar \
-sourcepath . -d out.pln/class/javamain $<
@@ -176,7 +176,7 @@ out.pln/class/tester/test/java/tester/Tester.class: Tester.java \
rm -rf out.pln/class/tester
mkdir out.pln/class/tester
javac -classpath \
- $(URE_HOME)/program/classes/ridl.jar:out.pln/types.jar \
+ $(URE_HOME)/program/classes/libreoffice.jar:out.pln/types.jar \
-sourcepath . -d out.pln/class/tester $<
@@ -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/ridl.jar:out.pln/types.jar \
+ $(URE_HOME)/program/classes/libreoffice.jar:out.pln/types.jar \
-sourcepath . -d out.pln/class/javatest $<
@@ -212,7 +212,7 @@ out.pln/class/javanative/test/java/javanative/JavaNative.class: \
rm -rf out.pln/class/javanative
mkdir out.pln/class/javanative
javac -classpath \
- $(URE_HOME)/program/classes/juh.jar:$(URE_HOME)/program/classes/ridl.jar:out.pln/tester.jar \
+ $(URE_HOME)/program/classes/libreoffice.jar:out.pln/tester.jar \
-sourcepath . -d out.pln/class/javanative $<
@@ -230,7 +230,7 @@ out.pln/class/javaclient/test/java/javaclient/JavaClient.class: \
rm -rf out.pln/class/javaclient
mkdir out.pln/class/javaclient
javac -classpath \
- $(URE_HOME)/program/classes/juh.jar:$(URE_HOME)/program/classes/ridl.jar:out.pln/types.jar \
+ $(URE_HOME)/program/classes/libreoffice.jar:out.pln/types.jar \
-sourcepath . -d out.pln/class/javaclient $<
diff --git a/wizards/Jar_commonwizards.mk b/wizards/Jar_commonwizards.mk
index ca432ea37fb0..e2f92031d880 100644
--- a/wizards/Jar_commonwizards.mk
+++ b/wizards/Jar_commonwizards.mk
@@ -20,8 +20,7 @@
$(eval $(call gb_Jar_Jar,commonwizards))
$(eval $(call gb_Jar_use_jars,commonwizards,\
- ridl \
- juh \
+ libreoffice \
java_uno \
))
diff --git a/wizards/Jar_form.mk b/wizards/Jar_form.mk
index 626e5386b1e2..caad29b16702 100644
--- a/wizards/Jar_form.mk
+++ b/wizards/Jar_form.mk
@@ -20,8 +20,7 @@
$(eval $(call gb_Jar_Jar,form))
$(eval $(call gb_Jar_use_jars,form,\
- ridl \
- juh \
+ libreoffice \
java_uno \
commonwizards \
))
diff --git a/wizards/Jar_query.mk b/wizards/Jar_query.mk
index 5d58df01812b..16c27e991435 100644
--- a/wizards/Jar_query.mk
+++ b/wizards/Jar_query.mk
@@ -20,8 +20,7 @@
$(eval $(call gb_Jar_Jar,query))
$(eval $(call gb_Jar_use_jars,query,\
- ridl \
- juh \
+ libreoffice \
java_uno \
commonwizards \
))
diff --git a/wizards/Jar_report.mk b/wizards/Jar_report.mk
index 8f791383b70e..db16bc65716a 100644
--- a/wizards/Jar_report.mk
+++ b/wizards/Jar_report.mk
@@ -20,8 +20,7 @@
$(eval $(call gb_Jar_Jar,report))
$(eval $(call gb_Jar_use_jars,report,\
- ridl \
- juh \
+ libreoffice \
java_uno \
commonwizards \
))
diff --git a/wizards/Jar_reportbuilder.mk b/wizards/Jar_reportbuilder.mk
index f97ee8a40934..c6662faaf944 100644
--- a/wizards/Jar_reportbuilder.mk
+++ b/wizards/Jar_reportbuilder.mk
@@ -20,8 +20,7 @@
$(eval $(call gb_Jar_Jar,reportbuilderwizard))
$(eval $(call gb_Jar_use_jars,reportbuilderwizard,\
- ridl \
- juh \
+ libreoffice \
java_uno \
commonwizards \
report \
diff --git a/wizards/Jar_table.mk b/wizards/Jar_table.mk
index 6924c878c32d..cd1568ed6107 100644
--- a/wizards/Jar_table.mk
+++ b/wizards/Jar_table.mk
@@ -20,8 +20,7 @@
$(eval $(call gb_Jar_Jar,table))
$(eval $(call gb_Jar_use_jars,table,\
- ridl \
- juh \
+ libreoffice \
java_uno \
commonwizards \
))
diff --git a/xmerge/Jar_XMergeBridge.mk b/xmerge/Jar_XMergeBridge.mk
index 96ce1556edab..6cefaf433591 100644
--- a/xmerge/Jar_XMergeBridge.mk
+++ b/xmerge/Jar_XMergeBridge.mk
@@ -18,8 +18,7 @@ $(eval $(call gb_Jar_set_packageroot,XMergeBridge,*.class))
$(eval $(call gb_Jar_use_jars,XMergeBridge,\
xmerge \
- ridl \
- juh \
+ libreoffice \
))
$(eval $(call gb_Jar_add_sourcefiles,XMergeBridge,\
diff --git a/xmerge/Jar_xmerge.mk b/xmerge/Jar_xmerge.mk
index 022f8fefe8cd..f90139ca32be 100644
--- a/xmerge/Jar_xmerge.mk
+++ b/xmerge/Jar_xmerge.mk
@@ -13,8 +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,\
- ridl \
- juh \
+ libreoffice \
))
$(eval $(call gb_Jar_set_packageroot,xmerge,org))