diff options
95 files changed, 248 insertions, 277 deletions
diff --git a/Repository.mk b/Repository.mk index 66581f40b1c1..c02196c545d2 100644 --- a/Repository.mk +++ b/Repository.mk @@ -728,6 +728,7 @@ $(eval $(call gb_Helper_register_jars_for_install,URE,ure, \ java_uno \ juh \ jurt \ + libreoffice \ ridl \ unoloader \ )) diff --git a/android/source/build.gradle b/android/source/build.gradle index a672d0945c73..371d39d547f2 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -27,8 +27,7 @@ buildscript { dependencies { implementation fileTree(dir: "${liboInstdir}/${liboUREJavaFolder}", include: [ "java_uno.jar", - "juh.jar", - "ridl.jar", + "libreoffice.jar", "unoloader.jar" ]) implementation(name:'owncloud_android_lib', ext:'aar') diff --git a/bean/Jar_officebean.mk b/bean/Jar_officebean.mk index 424b4ab2a559..7bc8561ab033 100644 --- a/bean/Jar_officebean.mk +++ b/bean/Jar_officebean.mk @@ -11,8 +11,7 @@ $(eval $(call gb_Jar_Jar,officebean)) $(eval $(call gb_Jar_use_jars,officebean,\ - ridl \ - juh \ + libreoffice \ )) $(eval $(call gb_Jar_set_packageroot,officebean,com)) diff --git a/bean/JunitTest_bean_complex.mk b/bean/JunitTest_bean_complex.mk index 091fe544c6b7..42baf49cdce5 100644 --- a/bean/JunitTest_bean_complex.mk +++ b/bean/JunitTest_bean_complex.mk @@ -12,7 +12,7 @@ $(eval $(call gb_JunitTest_JunitTest,bean_complex)) $(eval $(call gb_JunitTest_use_jars,bean_complex,\ OOoRunner \ - ridl \ + libreoffice \ test \ officebean \ )) diff --git a/bean/test/applet/oooapplet/OOoViewer.java b/bean/test/applet/oooapplet/OOoViewer.java index d958032df221..14851e0eceee 100644 --- a/bean/test/applet/oooapplet/OOoViewer.java +++ b/bean/test/applet/oooapplet/OOoViewer.java @@ -45,9 +45,8 @@ 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/ridl.jar"), - new URL(officeURL + "/program/classes/java_uno.jar"), - new URL(officeURL + "/program/classes/juh.jar") + new URL(officeURL + "/program/classes/libreoffice.jar"), + new URL(officeURL + "/program/classes/java_uno.jar") }; m_loader = new CustomURLClassLoader(arURL); File fileProg = new File(s + "/program"); diff --git a/bridges/Jar_java_uno.mk b/bridges/Jar_java_uno.mk index ecaad3c4daa9..14be1adcc650 100644 --- a/bridges/Jar_java_uno.mk +++ b/bridges/Jar_java_uno.mk @@ -10,8 +10,7 @@ $(eval $(call gb_Jar_Jar,java_uno)) $(eval $(call gb_Jar_use_jars,java_uno,\ - jurt \ - ridl \ + libreoffice \ )) $(eval $(call gb_Jar_set_manifest,java_uno,$(SRCDIR)/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/manifest)) @@ -19,8 +18,7 @@ $(eval $(call gb_Jar_set_manifest,java_uno,$(SRCDIR)/bridges/source/jni_uno/java $(eval $(call gb_Jar_set_packageroot,java_uno,com)) $(eval $(call gb_Jar_add_manifest_classpath,java_uno,\ - ridl.jar \ - jurt.jar \ + libreoffice.jar \ $(if $(filter MACOSX,$(OS)),../../Frameworks/,../) \ )) diff --git a/desktop/Jar_active_java.mk b/desktop/Jar_active_java.mk index 6e1be1adaed3..48fb7425efb7 100644 --- a/desktop/Jar_active_java.mk +++ b/desktop/Jar_active_java.mk @@ -20,8 +20,7 @@ $(eval $(call gb_Jar_set_manifest,active_java,$(SRCDIR)/desktop/test/deployment/ $(eval $(call gb_Jar_set_packageroot,active_java,com)) $(eval $(call gb_Jar_use_jars,active_java, \ - juh \ - ridl \ + libreoffice \ )) # vim: set noet sw=4 ts=4: diff --git a/desktop/Jar_passive_java.mk b/desktop/Jar_passive_java.mk index 007a37e8e6d6..e2408ae5a09f 100644 --- a/desktop/Jar_passive_java.mk +++ b/desktop/Jar_passive_java.mk @@ -22,8 +22,7 @@ $(eval $(call gb_Jar_set_manifest,passive_java,$(SRCDIR)/desktop/test/deployment $(eval $(call gb_Jar_set_packageroot,passive_java,com)) $(eval $(call gb_Jar_use_jars,passive_java, \ - juh \ - ridl \ + libreoffice \ )) # vim: set noet sw=4 ts=4: diff --git a/desktop/scripts/unoinfo-mac.sh b/desktop/scripts/unoinfo-mac.sh index c8728a0e5e30..b67882db0015 100755 --- a/desktop/scripts/unoinfo-mac.sh +++ b/desktop/scripts/unoinfo-mac.sh @@ -36,9 +36,8 @@ c++) printf '%s' "$sd_prog/../Frameworks" ;; java) - printf '0%s\0%s\0%s' \ - "$sd_prog/../Resources/java/ridl.jar" \ - "$sd_prog/../Resources/java/juh.jar" \ + printf '0%s\0%s' \ + "$sd_prog/../Resources/java/libreoffice.jar" \ "$sd_prog" ;; *) diff --git a/desktop/scripts/unoinfo.sh b/desktop/scripts/unoinfo.sh index 297acf3169d8..14cba806447b 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' \ - "$sd_prog/classes/ridl.jar" \ - "$sd_prog/classes/juh.jar" "$sd_prog" + printf '0%s\0%s' \ + "$sd_prog/classes/libreoffice.jar" \ + "$sd_prog" ;; *) exit 1 diff --git a/desktop/win32/source/unoinfo.cxx b/desktop/win32/source/unoinfo.cxx index f86232feb64f..14cee8819dde 100644 --- a/desktop/win32/source/unoinfo.cxx +++ b/desktop/win32/source/unoinfo.cxx @@ -75,9 +75,7 @@ int wmain(int argc, wchar_t ** argv, wchar_t **) { } wchar_t path[MAX_PATH]; wchar_t * pathEnd = getBrandPath(path); - writePath(path, pathEnd, MY_STRING(L"classes\\ridl.jar")); - writeNull(); - writePath(path, pathEnd, MY_STRING(L"classes\\juh.jar")); + writePath(path, pathEnd, MY_STRING(L"classes\\libreoffice.jar")); writeNull(); writePath(path, pathEnd, MY_STRING(L"")); } else { diff --git a/extensions/test/pgp/readme.txt b/extensions/test/pgp/readme.txt index d1a63f6771ca..8d486877071f 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, ridl.jar, pgp.jar and swingall.jar. + to classes.zip, libreoffice.jar, pgp.jar and swingall.jar. Therefore do the necessary entries in Office/user/config/javarc diff --git a/external/languagetool/ExternalProject_languagetool.mk b/external/languagetool/ExternalProject_languagetool.mk index 0d96f4963acf..70b22a6aa10f 100644 --- a/external/languagetool/ExternalProject_languagetool.mk +++ b/external/languagetool/ExternalProject_languagetool.mk @@ -20,7 +20,8 @@ $(eval $(call gb_ExternalProject_use_jars,languagetool,\ unoil \ )) -$(call gb_ExternalProject_get_state_target,languagetool,build) : +$(call gb_ExternalProject_get_state_target,languagetool,build) : \ + $(call gb_Jar_get_target,libreoffice) cd "$(call gb_UnpackedTarball_get_dir,languagetool)" && \ $(ICECREAM_RUN) "$(ANT)" \ $(if $(verbose),-v,-q) \ diff --git a/include/jvmfwk/framework.hxx b/include/jvmfwk/framework.hxx index 3a4b3139045d..0b02a9e04447 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\\ridl.jar" + -env:"UNO_JAVA_JFW_CLASSPATH=d:\\solver\\bin\\classes.jar;d:\\solver\\bin\\libreoffice.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\\ridl.jar" + -env:"UNO_JAVA_JFW_CLASSPATH=d:\\solver\\bin\\classes.jar;d:\\solver\\bin\\libreoffice.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\\ridl.jar" + -env:"UNO_JAVA_JFW_CLASSPATH=d:\\solver\\bin\\classes.jar;d:\\solver\\bin\\libreoffice.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 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 @@ </tr> <tr valign="top"> <td class="cell20">CLASSPATH</td> - <td class="cell80">=<i>$OO_SDK_URE_JAVA_DIR/juh.jar; - $OO_SDK_URE_JAVA_DIR/ridl.jar; + <td class="cell80">=<i>$OO_SDK_URE_JAVA_DIR/libreoffice.jar; $OO_SDK_URE_JAVA_DIR/unoloader.jar; $CLASSPATH</i><br/> <p>The classpath will be set or extended to diff --git a/odk/examples/DevelopersGuide/FirstSteps/build_FirstUnoContact.xml b/odk/examples/DevelopersGuide/FirstSteps/build_FirstUnoContact.xml index 6d17348ed479..4dec9aa7ee7c 100644 --- a/odk/examples/DevelopersGuide/FirstSteps/build_FirstUnoContact.xml +++ b/odk/examples/DevelopersGuide/FirstSteps/build_FirstUnoContact.xml @@ -28,7 +28,7 @@ <path id="office.class.path"> <filelist dir="${OFFICE_HOME}/program/classes" - files="ridl.jar,juh.jar"/> + files="libreoffice.jar"/> </path> <fileset id="bootstrap.glue.code" dir="${OO_SDK_HOME}/classes"> diff --git a/odk/examples/DevelopersGuide/OfficeBean/Makefile b/odk/examples/DevelopersGuide/OfficeBean/Makefile index ea5baadc1636..09c10d05d722 100644 --- a/odk/examples/DevelopersGuide/OfficeBean/Makefile +++ b/odk/examples/DevelopersGuide/OfficeBean/Makefile @@ -51,8 +51,7 @@ JAVAFILES = \ CLASSFILES = $(patsubst %.java,$(OUT_COMP_CLASS)/$(PACKAGE)/%.class,$(JAVAFILES)) SDK_CLASSPATH = $(subst $(EMPTYSTRING) $(PATH_SEPARATOR),$(PATH_SEPARATOR),\ - $(PATH_SEPARATOR)$(URE_CLASSES_DIR)/ridl.jar\ - $(PATH_SEPARATOR)$(URE_CLASSES_DIR)/juh.jar\ + $(PATH_SEPARATOR)$(URE_CLASSES_DIR)/libreoffice.jar\ $(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/officebean.jar\ $(PATH_SEPARATOR)$(OUT_COMP_CLASS)) diff --git a/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/build.xml b/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/build.xml index a3bf61fc7345..b79ac64ae483 100644 --- a/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/build.xml +++ b/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/build.xml @@ -41,8 +41,7 @@ <!-- ==================== classpath setting ============================ --> <target name="init" depends="checksdk,initsdk,initnosdk"> <path id="scriptclasspath"> - <pathelement location="${opp}/classes/ridl.jar"/> - <pathelement location="${opp}/classes/juh.jar"/> + <pathelement location="${opp}/classes/libreoffice.jar"/> <pathelement location="${opp}/classes/ScriptFramework.jar"/> </path> </target> diff --git a/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/build.xml b/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/build.xml index b3fc997e695a..c290030465ba 100644 --- a/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/build.xml +++ b/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/build.xml @@ -41,8 +41,7 @@ <!-- ==================== classpath setting ============================ --> <target name="init" depends="checksdk,initsdk,initnosdk"> <path id="scriptclasspath"> - <pathelement location="${opp}/classes/ridl.jar"/> - <pathelement location="${opp}/classes/juh.jar"/> + <pathelement location="${opp}/classes/libreoffice.jar"/> <pathelement location="${opp}/classes/ScriptFramework.jar"/> </path> </target> diff --git a/qadevOOo/.classpath b/qadevOOo/.classpath index d8828a72c283..81adde6656f5 100644 --- a/qadevOOo/.classpath +++ b/qadevOOo/.classpath @@ -9,8 +9,7 @@ <classpathentry kind="lib" path="testdocs/qadevlibs/JobExecutor.jar"/> <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/ridl.jar"/> + <classpathentry kind="lib" path="../instdir/program/classes/libreoffice.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 b3f7f3333258..a526ad0ca163 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -14,14 +14,13 @@ gb_JavaClassSet_JAVACDEBUG:= -g $(eval $(call gb_Jar_Jar,OOoRunner)) $(eval $(call gb_Jar_add_manifest_classpath,OOoRunner,\ - ridl.jar \ + libreoffice.jar \ )) $(eval $(call gb_Jar_set_manifest,OOoRunner,$(SRCDIR)/qadevOOo/runner/manifest)) $(eval $(call gb_Jar_use_jars,OOoRunner,\ - ridl \ - juh \ + libreoffice \ java_uno \ )) diff --git a/reportbuilder/Jar_reportbuilder.mk b/reportbuilder/Jar_reportbuilder.mk index 83778dd0fbf4..101ebc9330b7 100644 --- a/reportbuilder/Jar_reportbuilder.mk +++ b/reportbuilder/Jar_reportbuilder.mk @@ -11,8 +11,7 @@ $(eval $(call gb_Jar_Jar,reportbuilder)) $(eval $(call gb_Jar_use_jars,reportbuilder,\ java_uno \ - juh \ - ridl \ + libreoffice \ )) $(eval $(call gb_Jar_use_externals,reportbuilder,\ diff --git a/ridljar/Jar_libreoffice.mk b/ridljar/Jar_libreoffice.mk new file mode 100644 index 000000000000..4d0f5ef2545f --- /dev/null +++ b/ridljar/Jar_libreoffice.mk @@ -0,0 +1,133 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Jar_Jar,libreoffice)) + +$(eval $(call gb_Jar_use_customtargets,libreoffice,\ + ridljar/javamaker \ + unoil/javamaker \ +)) + +$(eval $(call gb_Jar_use_jars,libreoffice, \ + unoloader \ +)) + +$(eval $(call gb_Jar_set_packageroot,libreoffice,com)) + +$(eval $(call gb_Jar_set_manifest,libreoffice,$(SRCDIR)/ridljar/util/manifest)) + +$(eval $(call gb_Jar_add_manifest_classpath,libreoffice, \ + unoloader.jar \ + $(if $(filter MACOSX,$(OS)),../../Frameworks/,../) \ +)) + +$(eval $(call gb_Jar_add_packagedirs,libreoffice,\ + $(call gb_CustomTarget_get_workdir,ridljar/javamaker)/com \ + $(call gb_CustomTarget_get_workdir,unoil/javamaker)/com \ +)) + +$(eval $(call gb_Jar_add_sourcefiles,libreoffice,\ + ridljar/com/sun/star/comp/bridgefactory/BridgeFactory \ + ridljar/com/sun/star/comp/connections/Acceptor \ + ridljar/com/sun/star/comp/connections/Connector \ + ridljar/com/sun/star/comp/connections/ConstantInstanceProvider \ + ridljar/com/sun/star/comp/connections/Implementation \ + ridljar/com/sun/star/comp/connections/PipedConnection \ + ridljar/com/sun/star/comp/helper/Bootstrap \ + ridljar/com/sun/star/comp/helper/BootstrapException \ + ridljar/com/sun/star/comp/helper/ComponentContext \ + ridljar/com/sun/star/comp/helper/ComponentContextEntry \ + ridljar/com/sun/star/comp/helper/SharedLibraryLoader \ + ridljar/com/sun/star/comp/loader/FactoryHelper \ + ridljar/com/sun/star/comp/loader/JavaLoader \ + ridljar/com/sun/star/comp/loader/JavaLoaderFactory \ + ridljar/com/sun/star/comp/loader/RegistrationClassFinder \ + ridljar/com/sun/star/comp/servicemanager/ServiceManager \ + ridljar/com/sun/star/comp/urlresolver/UrlResolver \ + ridljar/com/sun/star/lib/connections/pipe/PipeConnection \ + ridljar/com/sun/star/lib/connections/pipe/pipeAcceptor \ + ridljar/com/sun/star/lib/connections/pipe/pipeConnector \ + ridljar/com/sun/star/lib/connections/socket/ConnectionDescriptor \ + ridljar/com/sun/star/lib/connections/socket/SocketConnection \ + ridljar/com/sun/star/lib/connections/socket/socketAcceptor \ + ridljar/com/sun/star/lib/connections/socket/socketConnector \ + ridljar/com/sun/star/lib/uno/Proxy \ + ridljar/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter \ + ridljar/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter \ + ridljar/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter \ + ridljar/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter \ + ridljar/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter \ + ridljar/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter \ + ridljar/com/sun/star/lib/uno/bridges/java_remote/BridgedObject \ + ridljar/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory \ + ridljar/com/sun/star/lib/uno/bridges/java_remote/RequestHandler \ + ridljar/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter \ + ridljar/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter \ + ridljar/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge \ + ridljar/com/sun/star/lib/uno/environments/java/java_environment \ + ridljar/com/sun/star/lib/uno/environments/remote/IProtocol \ + ridljar/com/sun/star/lib/uno/environments/remote/IReceiver \ + ridljar/com/sun/star/lib/uno/environments/remote/IThreadPool \ + ridljar/com/sun/star/lib/uno/environments/remote/JavaThreadPool \ + ridljar/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory \ + ridljar/com/sun/star/lib/uno/environments/remote/Job \ + ridljar/com/sun/star/lib/uno/environments/remote/JobQueue \ + ridljar/com/sun/star/lib/uno/environments/remote/Message \ + ridljar/com/sun/star/lib/uno/environments/remote/NativeThreadPool \ + ridljar/com/sun/star/lib/uno/environments/remote/ThreadId \ + ridljar/com/sun/star/lib/uno/environments/remote/ThreadPoolManager \ + ridljar/com/sun/star/lib/uno/environments/remote/remote_environment \ + ridljar/com/sun/star/lib/uno/helper/ComponentBase \ + ridljar/com/sun/star/lib/uno/helper/Factory \ + ridljar/com/sun/star/lib/uno/helper/InterfaceContainer \ + ridljar/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer \ + ridljar/com/sun/star/lib/uno/helper/PropertySet \ + ridljar/com/sun/star/lib/uno/helper/PropertySetMixin \ + ridljar/com/sun/star/lib/uno/helper/UnoUrl \ + ridljar/com/sun/star/lib/uno/helper/WeakAdapter \ + ridljar/com/sun/star/lib/uno/helper/WeakBase \ + ridljar/com/sun/star/lib/uno/protocols/urp/Cache \ + ridljar/com/sun/star/lib/uno/protocols/urp/Marshal \ + ridljar/com/sun/star/lib/uno/protocols/urp/PendingRequests \ + ridljar/com/sun/star/lib/uno/protocols/urp/Unmarshal \ + ridljar/com/sun/star/lib/uno/protocols/urp/UrpMessage \ + ridljar/com/sun/star/lib/uno/protocols/urp/urp \ + ridljar/com/sun/star/lib/uno/typedesc/FieldDescription \ + ridljar/com/sun/star/lib/uno/typedesc/MemberDescriptionHelper \ + ridljar/com/sun/star/lib/uno/typedesc/MethodDescription \ + ridljar/com/sun/star/lib/uno/typedesc/TypeDescription \ + ridljar/com/sun/star/lib/uno/typeinfo/AttributeTypeInfo \ + ridljar/com/sun/star/lib/uno/typeinfo/ConstantTypeInfo \ + ridljar/com/sun/star/lib/uno/typeinfo/MemberTypeInfo \ + ridljar/com/sun/star/lib/uno/typeinfo/MethodTypeInfo \ + ridljar/com/sun/star/lib/uno/typeinfo/ParameterTypeInfo \ + ridljar/com/sun/star/lib/uno/typeinfo/TypeInfo \ + ridljar/com/sun/star/lib/util/AsynchronousFinalizer \ + ridljar/com/sun/star/lib/util/DisposeListener \ + ridljar/com/sun/star/lib/util/DisposeNotifier \ + ridljar/com/sun/star/lib/util/NativeLibraryLoader \ + ridljar/com/sun/star/lib/util/StringHelper \ + ridljar/com/sun/star/lib/util/UrlToFileMapper \ + ridljar/com/sun/star/lib/util/WeakMap \ + ridljar/com/sun/star/uno/Any \ + ridljar/com/sun/star/uno/AnyConverter \ + ridljar/com/sun/star/uno/Ascii \ + ridljar/com/sun/star/uno/AsciiString \ + ridljar/com/sun/star/uno/Enum \ + ridljar/com/sun/star/uno/IBridge \ + ridljar/com/sun/star/uno/IEnvironment \ + ridljar/com/sun/star/uno/IMapping \ + ridljar/com/sun/star/uno/IQueryInterface \ + ridljar/com/sun/star/uno/MappingException \ + ridljar/com/sun/star/uno/Type \ + ridljar/com/sun/star/uno/UnoRuntime \ + ridljar/com/sun/star/uno/WeakReference \ +)) + +# vim:set noet sw=4 ts=4: diff --git a/ridljar/Jar_ridl.mk b/ridljar/Jar_ridl.mk index 6fc4688f0eab..5ebd4589b093 100644 --- a/ridljar/Jar_ridl.mk +++ b/ridljar/Jar_ridl.mk @@ -9,105 +9,8 @@ $(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,\ - ridljar/com/sun/star/comp/bridgefactory/BridgeFactory \ - ridljar/com/sun/star/comp/connections/Acceptor \ - ridljar/com/sun/star/comp/connections/Connector \ - ridljar/com/sun/star/comp/connections/ConstantInstanceProvider \ - ridljar/com/sun/star/comp/connections/Implementation \ - ridljar/com/sun/star/comp/connections/PipedConnection \ - ridljar/com/sun/star/comp/loader/FactoryHelper \ - ridljar/com/sun/star/comp/loader/JavaLoader \ - ridljar/com/sun/star/comp/loader/JavaLoaderFactory \ - ridljar/com/sun/star/comp/loader/RegistrationClassFinder \ - ridljar/com/sun/star/comp/servicemanager/ServiceManager \ - ridljar/com/sun/star/comp/urlresolver/UrlResolver \ - ridljar/com/sun/star/lib/connections/pipe/PipeConnection \ - ridljar/com/sun/star/lib/connections/pipe/pipeAcceptor \ - ridljar/com/sun/star/lib/connections/pipe/pipeConnector \ - ridljar/com/sun/star/lib/connections/socket/ConnectionDescriptor \ - ridljar/com/sun/star/lib/connections/socket/SocketConnection \ - ridljar/com/sun/star/lib/connections/socket/socketAcceptor \ - ridljar/com/sun/star/lib/connections/socket/socketConnector \ - ridljar/com/sun/star/lib/uno/Proxy \ - ridljar/com/sun/star/lib/uno/bridges/java_remote/BridgedObject \ - ridljar/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory \ - ridljar/com/sun/star/lib/uno/bridges/java_remote/RequestHandler \ - ridljar/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter \ - ridljar/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter \ - ridljar/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge \ - ridljar/com/sun/star/lib/uno/environments/java/java_environment \ - ridljar/com/sun/star/lib/uno/environments/remote/IProtocol \ - ridljar/com/sun/star/lib/uno/environments/remote/IReceiver \ - ridljar/com/sun/star/lib/uno/environments/remote/IThreadPool \ - ridljar/com/sun/star/lib/uno/environments/remote/JavaThreadPool \ - ridljar/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory \ - ridljar/com/sun/star/lib/uno/environments/remote/Job \ - ridljar/com/sun/star/lib/uno/environments/remote/JobQueue \ - ridljar/com/sun/star/lib/uno/environments/remote/Message \ - ridljar/com/sun/star/lib/uno/environments/remote/NativeThreadPool \ - ridljar/com/sun/star/lib/uno/environments/remote/ThreadId \ - ridljar/com/sun/star/lib/uno/environments/remote/ThreadPoolManager \ - ridljar/com/sun/star/lib/uno/environments/remote/remote_environment \ - ridljar/com/sun/star/lib/uno/protocols/urp/Cache \ - ridljar/com/sun/star/lib/uno/protocols/urp/Marshal \ - ridljar/com/sun/star/lib/uno/protocols/urp/PendingRequests \ - ridljar/com/sun/star/lib/uno/protocols/urp/Unmarshal \ - ridljar/com/sun/star/lib/uno/protocols/urp/UrpMessage \ - ridljar/com/sun/star/lib/uno/protocols/urp/urp \ - ridljar/com/sun/star/lib/uno/typedesc/FieldDescription \ - ridljar/com/sun/star/lib/uno/typedesc/MemberDescriptionHelper \ - ridljar/com/sun/star/lib/uno/typedesc/MethodDescription \ - ridljar/com/sun/star/lib/uno/typedesc/TypeDescription \ - ridljar/com/sun/star/lib/uno/typeinfo/AttributeTypeInfo \ - ridljar/com/sun/star/lib/uno/typeinfo/ConstantTypeInfo \ - ridljar/com/sun/star/lib/uno/typeinfo/MemberTypeInfo \ - ridljar/com/sun/star/lib/uno/typeinfo/MethodTypeInfo \ - ridljar/com/sun/star/lib/uno/typeinfo/ParameterTypeInfo \ - ridljar/com/sun/star/lib/uno/typeinfo/TypeInfo \ - ridljar/com/sun/star/lib/util/AsynchronousFinalizer \ - ridljar/com/sun/star/lib/util/DisposeListener \ - ridljar/com/sun/star/lib/util/DisposeNotifier \ - ridljar/com/sun/star/lib/util/NativeLibraryLoader \ - ridljar/com/sun/star/lib/util/StringHelper \ - ridljar/com/sun/star/lib/util/UrlToFileMapper \ - ridljar/com/sun/star/lib/util/WeakMap \ - ridljar/com/sun/star/uno/Any \ - ridljar/com/sun/star/uno/AnyConverter \ - ridljar/com/sun/star/uno/Ascii \ - ridljar/com/sun/star/uno/AsciiString \ - ridljar/com/sun/star/uno/Enum \ - ridljar/com/sun/star/uno/IBridge \ - ridljar/com/sun/star/uno/IEnvironment \ - ridljar/com/sun/star/uno/IMapping \ - ridljar/com/sun/star/uno/IQueryInterface \ - ridljar/com/sun/star/uno/MappingException \ - ridljar/com/sun/star/uno/Type \ - ridljar/com/sun/star/uno/UnoRuntime \ - ridljar/com/sun/star/uno/WeakReference \ + libreoffice.jar \ )) # vim:set noet sw=4 ts=4: diff --git a/ridljar/JunitTest_bridgefactory.mk b/ridljar/JunitTest_bridgefactory.mk index bbf846152c44..c50dbcf6d37d 100644 --- a/ridljar/JunitTest_bridgefactory.mk +++ b/ridljar/JunitTest_bridgefactory.mk @@ -13,7 +13,7 @@ $(eval $(call gb_Jar_use_customtargets,ridl_bridgefactory, \ ridljar/javamaker \ )) -$(eval $(call gb_JunitTest_use_jar_classset,ridl_bridgefactory,ridl)) +$(eval $(call gb_JunitTest_use_jar_classset,ridl_bridgefactory,libreoffice)) $(eval $(call gb_JunitTest_add_classpath,ridl_bridgefactory,$(call gb_CustomTarget_get_workdir,ridljar/javamaker))) diff --git a/ridljar/JunitTest_connections.mk b/ridljar/JunitTest_connections.mk index 54cfc27e000c..8c8496e35707 100644 --- a/ridljar/JunitTest_connections.mk +++ b/ridljar/JunitTest_connections.mk @@ -13,7 +13,7 @@ $(eval $(call gb_Jar_use_customtargets,ridl_connections, \ ridljar/javamaker \ )) -$(eval $(call gb_JunitTest_use_jar_classset,ridl_connections,ridl)) +$(eval $(call gb_JunitTest_use_jar_classset,ridl_connections,libreoffice)) $(eval $(call gb_JunitTest_add_classpath,ridl_connections,$(call gb_CustomTarget_get_workdir,ridljar/javamaker))) diff --git a/ridljar/JunitTest_java.mk b/ridljar/JunitTest_java.mk index e1a53dba8a3a..be174cfe2805 100644 --- a/ridljar/JunitTest_java.mk +++ b/ridljar/JunitTest_java.mk @@ -13,7 +13,7 @@ $(eval $(call gb_Jar_use_customtargets,ridl_java, \ ridljar/javamaker \ )) -$(eval $(call gb_JunitTest_use_jar_classset,ridl_java,ridl)) +$(eval $(call gb_JunitTest_use_jar_classset,ridl_java,libreoffice)) $(eval $(call gb_JunitTest_add_classpath,ridl_java,$(call gb_CustomTarget_get_workdir,ridljar/javamaker))) diff --git a/ridljar/JunitTest_java_remote.mk b/ridljar/JunitTest_java_remote.mk index 38482d2b1e50..2039e1282885 100644 --- a/ridljar/JunitTest_java_remote.mk +++ b/ridljar/JunitTest_java_remote.mk @@ -17,7 +17,7 @@ $(eval $(call gb_Jar_use_customtargets,ridl_java_remote, \ ridljar/javamaker \ )) -$(eval $(call gb_JunitTest_use_jar_classset,ridl_java_remote,ridl)) +$(eval $(call gb_JunitTest_use_jar_classset,ridl_java_remote,libreoffice)) $(eval $(call gb_JunitTest_add_classpath,ridl_java_remote,$(call gb_CustomTarget_get_workdir,ridljar/javamaker))) diff --git a/ridljar/JunitTest_remote.mk b/ridljar/JunitTest_remote.mk index a0c94d5caa92..340618676163 100644 --- a/ridljar/JunitTest_remote.mk +++ b/ridljar/JunitTest_remote.mk @@ -13,7 +13,7 @@ $(eval $(call gb_Jar_use_customtargets,ridl_remote, \ ridljar/javamaker \ )) -$(eval $(call gb_JunitTest_use_jar_classset,ridl_remote,ridl)) +$(eval $(call gb_JunitTest_use_jar_classset,ridl_remote,libreoffice)) $(eval $(call gb_JunitTest_add_classpath,ridl_remote,$(call gb_CustomTarget_get_workdir,ridljar/javamaker))) diff --git a/ridljar/JunitTest_typedesc.mk b/ridljar/JunitTest_typedesc.mk index 6a2bf779471a..4497731aafa8 100644 --- a/ridljar/JunitTest_typedesc.mk +++ b/ridljar/JunitTest_typedesc.mk @@ -10,7 +10,7 @@ $(eval $(call gb_JunitTest_JunitTest,ridljar_typedesc)) $(eval $(call gb_JunitTest_use_jars,ridljar_typedesc,\ - ridl \ + libreoffice \ )) $(eval $(call gb_JunitTest_add_sourcefiles,ridljar_typedesc,\ diff --git a/ridljar/JunitTest_uno.mk b/ridljar/JunitTest_uno.mk index e0a7ff4574a4..885c5fc437ce 100644 --- a/ridljar/JunitTest_uno.mk +++ b/ridljar/JunitTest_uno.mk @@ -11,7 +11,7 @@ $(eval $(call gb_JunitTest_JunitTest,ridljar_uno)) $(eval $(call gb_JunitTest_use_jars,ridljar_uno,\ OOoRunner \ - ridl \ + libreoffice \ )) $(eval $(call gb_JunitTest_add_sourcefiles,ridljar_uno,\ diff --git a/ridljar/JunitTest_urp.mk b/ridljar/JunitTest_urp.mk index 760f81992060..3f5f76eae339 100644 --- a/ridljar/JunitTest_urp.mk +++ b/ridljar/JunitTest_urp.mk @@ -14,7 +14,7 @@ $(eval $(call gb_JunitTest_use_customtargets,ridl_urp,\ ridljar/javamaker \ )) -$(eval $(call gb_JunitTest_use_jar_classset,ridl_urp,ridl)) +$(eval $(call gb_JunitTest_use_jar_classset,ridl_urp,libreoffice)) $(eval $(call gb_JunitTest_add_classpath,ridl_urp,$(call gb_CustomTarget_get_workdir,ridljar/javamaker))) diff --git a/ridljar/JunitTest_util.mk b/ridljar/JunitTest_util.mk index 2be75f61f2e9..2896e5760476 100644 --- a/ridljar/JunitTest_util.mk +++ b/ridljar/JunitTest_util.mk @@ -11,7 +11,7 @@ $(eval $(call gb_JunitTest_JunitTest,ridljar_util)) $(eval $(call gb_JunitTest_use_jars,ridljar_util,\ OOoRunner \ - ridl \ + libreoffice \ )) $(eval $(call gb_JunitTest_add_sourcefiles,ridljar_util,\ diff --git a/ridljar/Module_ridljar.mk b/ridljar/Module_ridljar.mk index daa0f1835be7..3d286c546151 100644 --- a/ridljar/Module_ridljar.mk +++ b/ridljar/Module_ridljar.mk @@ -10,8 +10,10 @@ $(eval $(call gb_Module_Module,ridljar)) ifneq ($(ENABLE_JAVA),) + $(eval $(call gb_Module_add_targets,ridljar,\ CustomTarget_javamaker \ + Jar_libreoffice \ Jar_ridl \ Jar_unoloader \ )) diff --git a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java b/ridljar/com/sun/star/comp/helper/Bootstrap.java index edf21d7d2adf..edf21d7d2adf 100644 --- a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java +++ b/ridljar/com/sun/star/comp/helper/Bootstrap.java diff --git a/javaunohelper/com/sun/star/comp/helper/BootstrapException.java b/ridljar/com/sun/star/comp/helper/BootstrapException.java index 11911bbc07e0..11911bbc07e0 100644 --- a/javaunohelper/com/sun/star/comp/helper/BootstrapException.java +++ b/ridljar/com/sun/star/comp/helper/BootstrapException.java diff --git a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java b/ridljar/com/sun/star/comp/helper/ComponentContext.java index 34649d563395..34649d563395 100644 --- a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java +++ b/ridljar/com/sun/star/comp/helper/ComponentContext.java diff --git a/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java b/ridljar/com/sun/star/comp/helper/ComponentContextEntry.java index aa402d29c6d1..aa402d29c6d1 100644 --- a/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java +++ b/ridljar/com/sun/star/comp/helper/ComponentContextEntry.java diff --git a/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java b/ridljar/com/sun/star/comp/helper/SharedLibraryLoader.java index 035644efa0b8..035644efa0b8 100644 --- a/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java +++ b/ridljar/com/sun/star/comp/helper/SharedLibraryLoader.java diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java b/ridljar/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java index 2d3e9a8480b7..2d3e9a8480b7 100644 --- a/javaunohelper/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java +++ b/ridljar/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java b/ridljar/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java index 3d60e5a1181a..3d60e5a1181a 100644 --- a/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java +++ b/ridljar/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java b/ridljar/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java index 2842e3df05ce..2842e3df05ce 100644 --- a/javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java +++ b/ridljar/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java b/ridljar/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java index 25f1798fbada..25f1798fbada 100644 --- a/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java +++ b/ridljar/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java b/ridljar/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java index 48871277a75f..48871277a75f 100644 --- a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java +++ b/ridljar/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java b/ridljar/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java index 8104cf42fa3c..8104cf42fa3c 100644 --- a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java +++ b/ridljar/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java diff --git a/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java b/ridljar/com/sun/star/lib/uno/helper/ComponentBase.java index d886ef7020d5..d886ef7020d5 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java +++ b/ridljar/com/sun/star/lib/uno/helper/ComponentBase.java diff --git a/javaunohelper/com/sun/star/lib/uno/helper/Factory.java b/ridljar/com/sun/star/lib/uno/helper/Factory.java index 056d9549d552..056d9549d552 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/Factory.java +++ b/ridljar/com/sun/star/lib/uno/helper/Factory.java diff --git a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java b/ridljar/com/sun/star/lib/uno/helper/InterfaceContainer.java index e858ced81fd8..e858ced81fd8 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java +++ b/ridljar/com/sun/star/lib/uno/helper/InterfaceContainer.java diff --git a/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java b/ridljar/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java index 9b061f81c217..9b061f81c217 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java +++ b/ridljar/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java b/ridljar/com/sun/star/lib/uno/helper/PropertySet.java index 67a4f0c98062..67a4f0c98062 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java +++ b/ridljar/com/sun/star/lib/uno/helper/PropertySet.java diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java b/ridljar/com/sun/star/lib/uno/helper/PropertySetMixin.java index 0c050d676928..0c050d676928 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java +++ b/ridljar/com/sun/star/lib/uno/helper/PropertySetMixin.java diff --git a/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java b/ridljar/com/sun/star/lib/uno/helper/UnoUrl.java index 8bb4d26432d9..8bb4d26432d9 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java +++ b/ridljar/com/sun/star/lib/uno/helper/UnoUrl.java diff --git a/javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter.java b/ridljar/com/sun/star/lib/uno/helper/WeakAdapter.java index 67e01ac3276d..67e01ac3276d 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter.java +++ b/ridljar/com/sun/star/lib/uno/helper/WeakAdapter.java diff --git a/javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java b/ridljar/com/sun/star/lib/uno/helper/WeakBase.java index ac175d3a6d5d..ac175d3a6d5d 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java +++ b/ridljar/com/sun/star/lib/uno/helper/WeakBase.java diff --git a/ridljar/source/libreoffice/manifest b/ridljar/source/libreoffice/manifest new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/ridljar/source/libreoffice/manifest 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 c52165abfeb7..822d1609cd3b 100644 --- a/ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoClassLoader.java +++ b/ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoClassLoader.java @@ -49,8 +49,8 @@ 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>ridl.jar</code>) can be found; must not be <code>null</code>. + * (<code>java_uno.jar</code> and <code>libreoffice.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 * loader; may be <code>null</code>, 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 - * (<code>ridl.jar</code>, etc.) can be found; must + * (<code>libreoffice.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 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)) |