strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move all public Java classes to libreoffice.jar

Browse source 
This moves the classes from juh.jar and ridl.jar to libreoffice.jar

The goal is to have one single jar (and Java module, will be added later)
which developers can include to work with LO.

juh.jar and ridl.jar are kept as basically empty jars with libreoffice.jar
on its classpath to keep backwards compatibility.

This is a continuation of ae855bf481
and a preparation to have Java 9 module support.

Change-Id: Ifbbfb97f60373d14256e62ae3122913bd17d5bbb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91930
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Samuel Mehrbrodt 2020-03-26 15:04:47 +01:00 committed by Stephan Bergmann
parent 6bf3517d60
commit 35518c9236
95 changed files with 248 additions and 277 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Repository.mk
View file

@ -728,6 +728,7 @@ $(eval $(call gb_Helper_register_jars_for_install,URE,ure, \
java_uno \
juh \
jurt \
libreoffice \
ridl \
unoloader \
))

3
android/source/build.gradle
View file

@ -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')

3
bean/Jar_officebean.mk
View file

@ -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))

2
bean/JunitTest_bean_complex.mk
View file

@ -12,7 +12,7 @@ $(eval $(call gb_JunitTest_JunitTest,bean_complex))
$(eval $(call gb_JunitTest_use_jars,bean_complex,\
OOoRunner \
ridl \
libreoffice \
test \
officebean \
))

5
bean/test/applet/oooapplet/OOoViewer.java
View file

@ -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");

6
bridges/Jar_java_uno.mk
View file

@ -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/,../) \
))

3
desktop/Jar_active_java.mk
View file

@ -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:

3
desktop/Jar_passive_java.mk
View file

@ -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:

5
desktop/scripts/unoinfo-mac.sh
View file

@ -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"
;;
*)

6
desktop/scripts/unoinfo.sh
View file

@ -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

4
desktop/win32/source/unoinfo.cxx
View file

@ -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 {

2
extensions/test/pgp/readme.txt
View file

@ -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

3
external/languagetool/ExternalProject_languagetool.mk vendored
View file

@ -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) \

6
include/jvmfwk/framework.hxx
View file

@ -98,13 +98,13 @@
</p>
<p>
regcomp -env:UNO_JAVA_JFW_JREHOME=file:///d:/j2re1.4.2
-env:&quot;UNO_JAVA_JFW_CLASSPATH=d:\\solver\\bin\\classes.jar;d:\\solver\\bin\\ridl.jar&quot;
-env:&quot;UNO_JAVA_JFW_CLASSPATH=d:\\solver\\bin\\classes.jar;d:\\solver\\bin\\libreoffice.jar&quot;
-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:&quot;UNO_JAVA_JFW_CLASSPATH=d:\\solver\\bin\\classes.jar;d:\\solver\\bin\\ridl.jar&quot;
-env:&quot;UNO_JAVA_JFW_CLASSPATH=d:\\solver\\bin\\classes.jar;d:\\solver\\bin\\libreoffice.jar&quot;
-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:&quot;UNO_JAVA_JFW_CLASSPATH=d:\\solver\\bin\\classes.jar;d:\\solver\\bin\\ridl.jar&quot;
-env:&quot;UNO_JAVA_JFW_CLASSPATH=d:\\solver\\bin\\classes.jar;d:\\solver\\bin\\libreoffice.jar&quot;
-register...</p>
<p>
Here is a complete list of the bootstrap parameter for the direct mode:

2
instsetoo_native/CustomTarget_setup.mk
View file

@ -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}' \
) > $@

32
javaunohelper/Jar_juh.mk
View file

@ -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:

14
javaunohelper/JunitTest_juh.mk
View file

@ -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 \

1
javaunohelper/util/manifest
View file

@ -1,2 +1 @@
Sealed: true
UNO-Type-Path:

2
jurt/Jar_jurt.mk
View file

@ -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:

3
nlpsolver/Jar_nlpsolver.mk
View file

@ -20,8 +20,7 @@
$(eval $(call gb_Jar_Jar,nlpsolver))
$(eval $(call gb_Jar_use_jars,nlpsolver,\
ridl \
juh \
libreoffice \
java_uno \
EvolutionarySolver \
))

4
odk/CustomTarget_javadoc.mk
View file

@ -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) \

2
odk/config/cfgWin.js
View file

@ -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" +

2
odk/config/setsdkenv_unix.sh.in
View file

@ -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

3
odk/docs/install.html
View file

@ -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

2
odk/examples/DevelopersGuide/FirstSteps/build_FirstUnoContact.xml
View file

@ -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">

3
odk/examples/DevelopersGuide/OfficeBean/Makefile
View file

@ -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))

3
odk/examples/DevelopersGuide/ScriptingFramework/SayHello/build.xml
View file

@ -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>

3
odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/build.xml
View file

@ -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>

3
qadevOOo/.classpath
View file

@ -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>

5
qadevOOo/Jar_OOoRunner.mk
View file

@ -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 \
))

3
reportbuilder/Jar_reportbuilder.mk
View file

@ -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,\

133
ridljar/Jar_libreoffice.mk Normal file
View file

@ -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:

99
ridljar/Jar_ridl.mk
View file

@ -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:

2
ridljar/JunitTest_bridgefactory.mk
View file

@ -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)))

2
ridljar/JunitTest_connections.mk
View file

@ -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)))

2
ridljar/JunitTest_java.mk
View file

@ -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)))

2
ridljar/JunitTest_java_remote.mk
View file

@ -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)))

2
ridljar/JunitTest_remote.mk
View file

@ -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)))

2
ridljar/JunitTest_typedesc.mk
View file

@ -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,\

2
ridljar/JunitTest_uno.mk
View file

@ -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,\

2
ridljar/JunitTest_urp.mk
View file

@ -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)))

2
ridljar/JunitTest_util.mk
View file

@ -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,\

2
ridljar/Module_ridljar.mk
View file

@ -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 \
))

0
javaunohelper/com/sun/star/comp/helper/Bootstrap.java → ridljar/com/sun/star/comp/helper/Bootstrap.java
View file

0
javaunohelper/com/sun/star/comp/helper/BootstrapException.java → ridljar/com/sun/star/comp/helper/BootstrapException.java
View file

0
javaunohelper/com/sun/star/comp/helper/ComponentContext.java → ridljar/com/sun/star/comp/helper/ComponentContext.java
View file

0
javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java → ridljar/com/sun/star/comp/helper/ComponentContextEntry.java
View file

0
javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java → ridljar/com/sun/star/comp/helper/SharedLibraryLoader.java
View file

0
javaunohelper/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java → ridljar/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java
View file

0
javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java → ridljar/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
View file

0
javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java → ridljar/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java
View file

0
javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java → ridljar/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
View file

0
javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java → ridljar/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
View file

0
javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java → ridljar/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java
View file

0
javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java → ridljar/com/sun/star/lib/uno/helper/ComponentBase.java
View file

0
javaunohelper/com/sun/star/lib/uno/helper/Factory.java → ridljar/com/sun/star/lib/uno/helper/Factory.java
View file

0
javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java → ridljar/com/sun/star/lib/uno/helper/InterfaceContainer.java
View file

0
javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java → ridljar/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java
View file

0
javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java → ridljar/com/sun/star/lib/uno/helper/PropertySet.java
View file

0
javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java → ridljar/com/sun/star/lib/uno/helper/PropertySetMixin.java
View file

0
javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java → ridljar/com/sun/star/lib/uno/helper/UnoUrl.java
View file

0
javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter.java → ridljar/com/sun/star/lib/uno/helper/WeakAdapter.java
View file

0
javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java → ridljar/com/sun/star/lib/uno/helper/WeakBase.java
View file

0
ridljar/source/libreoffice/manifest Normal file
View file

9
ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoClassLoader.java
View file

@ -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);
}

2
ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoLoader.java
View file

@ -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

9
ridljar/util/manifest
View file

@ -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

3
scripting/Jar_HelloWorld.mk
View file

@ -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,\

3
scripting/Jar_Highlight.mk
View file

@ -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,\

3
scripting/Jar_MemoryUsage.mk
View file

@ -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,\

3
scripting/Jar_ScriptFramework.mk
View file

@ -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))

3
scripting/Jar_ScriptProviderForBeanShell.mk
View file

@ -10,8 +10,7 @@
$(eval $(call gb_Jar_Jar,ScriptProviderForBeanShell))
$(eval $(call gb_Jar_use_jars,ScriptProviderForBeanShell,\
juh \
ridl \
libreoffice \
ScriptFramework \
))

3
scripting/Jar_ScriptProviderForJava.mk
View file

@ -10,8 +10,7 @@
$(eval $(call gb_Jar_Jar,ScriptProviderForJava))
$(eval $(call gb_Jar_use_jars,ScriptProviderForJava,\
juh \
ridl \
libreoffice \
ScriptFramework \
))

3
scripting/Jar_ScriptProviderForJavaScript.mk
View file

@ -10,8 +10,7 @@
$(eval $(call gb_Jar_Jar,ScriptProviderForJavaScript))
$(eval $(call gb_Jar_use_jars,ScriptProviderForJavaScript,\
juh \
ridl \
libreoffice \
ScriptFramework \
))

6
smoketest/Jar_TestExtension.mk
View file

@ -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))

3
smoketest/Jar_smoketest.mk
View file

@ -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:

2
solenv/gbuild/CppunitTest.mk
View file

@ -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) \

2
solenv/gbuild/JunitTest.mk
View file

@ -163,7 +163,7 @@ endef
define gb_JunitTest_use_unoapi_jars
$(eval $(call gb_JunitTest_use_jars,$(1),\
OOoRunner \
ridl \
libreoffice \
test \
))

3
swext/Jar_mediawiki.mk
View file

@ -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,\

7
testtools/Jar_testComponent.mk
View file

@ -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,\

2
toolkit/JunitTest_toolkit_complex.mk
View file

@ -20,7 +20,7 @@ $(eval $(call gb_JunitTest_JunitTest,toolkit_complex))
$(eval $(call gb_JunitTest_use_jars,toolkit_complex,\
OOoRunner \
ridl \
libreoffice \
test \
))

2
toolkit/test/accessibility/jawb.mf
View file

@ -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

2
unoil/Jar_unoil.mk
View file

@ -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:

6
unotest/Jar_test-tools.mk
View file

@ -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))

6
unotest/Jar_test.mk
View file

@ -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 \
))

18
ure/source/README
View file

@ -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.

10
ure/source/uretest/Makefile.pln
View file

@ -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 $<

3
wizards/Jar_commonwizards.mk
View file

@ -20,8 +20,7 @@
$(eval $(call gb_Jar_Jar,commonwizards))
$(eval $(call gb_Jar_use_jars,commonwizards,\
ridl \
juh \
libreoffice \
java_uno \
))

3
wizards/Jar_form.mk
View file

@ -20,8 +20,7 @@
$(eval $(call gb_Jar_Jar,form))
$(eval $(call gb_Jar_use_jars,form,\
ridl \
juh \
libreoffice \
java_uno \
commonwizards \
))

3
wizards/Jar_query.mk
View file

@ -20,8 +20,7 @@
$(eval $(call gb_Jar_Jar,query))
$(eval $(call gb_Jar_use_jars,query,\
ridl \
juh \
libreoffice \
java_uno \
commonwizards \
))

3
wizards/Jar_report.mk
View file

@ -20,8 +20,7 @@
$(eval $(call gb_Jar_Jar,report))
$(eval $(call gb_Jar_use_jars,report,\
ridl \
juh \
libreoffice \
java_uno \
commonwizards \
))

3
wizards/Jar_reportbuilder.mk
View file

@ -20,8 +20,7 @@
$(eval $(call gb_Jar_Jar,reportbuilderwizard))
$(eval $(call gb_Jar_use_jars,reportbuilderwizard,\
ridl \
juh \
libreoffice \
java_uno \
commonwizards \
report \

3
wizards/Jar_table.mk
View file

@ -20,8 +20,7 @@
$(eval $(call gb_Jar_Jar,table))
$(eval $(call gb_Jar_use_jars,table,\
ridl \
juh \
libreoffice \
java_uno \
commonwizards \
))

3
xmerge/Jar_XMergeBridge.mk
View file

@ -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,\

3
xmerge/Jar_xmerge.mk
View file

@ -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))