diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-01-21 13:49:34 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-01-21 13:49:34 +0000 |
| commit | dde7a5a605a6f615bb05249e1be3d9d4c8c22e88 (patch) | |
| tree | 066d35d674b4c0a80e8e8a0bf9618eceedf457fc /jvmfwk | |
| parent | 314e33493a9f3ea455fc2aead0d1b0fd683db2be (diff) | |
CWS-TOOLING: integrate CWS jl111
2009-01-13 13:36:03 +0100 jl r266218 : #i91642# do not localize the error message, just print out the changed text in plain English
2009-01-09 12:54:03 +0100 jl r266075 : Committing changes which have been originally made on cws jl105 but which were not integrated on the master, due to a failed integration procedured. Then only three files were integrated. The files committed fix i80449, i83134, i86079, i91204, i92869
2009-01-07 15:10:52 +0100 jl r265970 : CWS-TOOLING: rebase CWS jl111 to trunk@265758 (milestone: DEV300:m38)
2009-01-06 10:38:21 +0100 jl r265900 : #i93235# #i93946# migrating to svn
Diffstat (limited to 'jvmfwk')
4 files changed, 35 insertions, 6 deletions
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml new file mode 100644 index 000000000000..020c11b4973e --- /dev/null +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + + <updated>2008-08-27</updated> + + <vendorInfos> + <vendor name="Sun Microsystems Inc."> + <minVersion>1.3.1</minVersion> + </vendor> + <vendor name="The FreeBSD Foundation"> + <minVersion>1.6.0</minVersion> + </vendor> + <vendor name="Free Software Foundation, Inc."> + <minVersion>1.4.2</minVersion> + </vendor> + </vendorInfos> + + <plugins> + <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> + <library vendor="The FreeBSD Foundation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> + <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> + </plugins> +</javaSelection> diff --git a/jvmfwk/distributions/OpenOfficeorg/makefile.mk b/jvmfwk/distributions/OpenOfficeorg/makefile.mk index 26e73285cd26..761363ddd213 100755 --- a/jvmfwk/distributions/OpenOfficeorg/makefile.mk +++ b/jvmfwk/distributions/OpenOfficeorg/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.9.28.1 $ # # This file is part of OpenOffice.org. # @@ -43,9 +43,11 @@ nojava: .IF "$(SOLAR_JAVA)"!="" $(BIN)$/javavendors.xml: javavendors_unx.xml javavendors_wnt.xml javavendors_macosx.xml javavendors_linux.xml .IF "$(GUI)"=="UNX" -.IF "$(OS)"=="MACOSX" +.IF "$(OS)"=="FREEBSD" + -$(COPY) javavendors_freebsd.xml $(BIN)$/javavendors.xml +.ELIF "$(OS)"=="MACOSX" -$(COPY) javavendors_macosx.xml $(BIN)$/javavendors.xml -.ELIF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" +.ELIF "$(OS)"=="LINUX" -$(COPY) javavendors_linux.xml $(BIN)$/javavendors.xml .ELSE -$(COPY) javavendors_unx.xml $(BIN)$/javavendors.xml diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx index 4d0d2d93bc5d..762497b8d8bc 100755 --- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx +++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx @@ -7,7 +7,6 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: javaldx.cxx,v $ - * $Revision: 1.15.26.1 $ * * This file is part of OpenOffice.org. * @@ -117,13 +116,15 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) rtl::OUString sVendor5(RTL_CONSTASCII_USTRINGPARAM("Apple Computer, Inc.")); rtl::OUString sVendor6(RTL_CONSTASCII_USTRINGPARAM("BEA Systems, Inc.")); rtl::OUString sVendor7(RTL_CONSTASCII_USTRINGPARAM("Free Software Foundation, Inc.")); + rtl::OUString sVendor8(RTL_CONSTASCII_USTRINGPARAM("The FreeBSD Foundation")); if ( ! (sVendor1.equals(pInfo->sVendor) == sal_True || sVendor2.equals(pInfo->sVendor) == sal_True || sVendor3.equals(pInfo->sVendor) == sal_True || sVendor4.equals(pInfo->sVendor) == sal_True || sVendor5.equals(pInfo->sVendor) == sal_True || sVendor6.equals(pInfo->sVendor) == sal_True - || sVendor7.equals(pInfo->sVendor) == sal_True)) + || sVendor7.equals(pInfo->sVendor) == sal_True + || sVendor8.equals(pInfo->sVendor) == sal_True)) return 0; rtl::OString sPaths = getLD_LIBRARY_PATH(pInfo->arVendorData); diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx index afe3d8be7826..83a8356f8fb3 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: vendorlist.cxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.10.28.1 $ * * This file is part of OpenOffice.org. * @@ -56,6 +56,7 @@ BEGIN_VENDOR_MAP() VENDOR_MAP_ENTRY("Apple Computer, Inc.", OtherInfo) VENDOR_MAP_ENTRY("BEA Systems, Inc.", OtherInfo) VENDOR_MAP_ENTRY("Free Software Foundation, Inc.", GnuInfo) + VENDOR_MAP_ENTRY("The FreeBSD Foundation", OtherInfo) END_VENDOR_MAP() |