Skip to content

Commit

Permalink
Add support for the AdoptOpenJDK Java distribution
Browse files Browse the repository at this point in the history 
(https://adoptopenjdk.net/).

Closes #i128157# Add support for AdoptOpenJDK JVM's.

Patch by: me

git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1863875 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 2bf1cfb)
  • Loading branch information
@Pilot-Pirx
Damjan Jovanovic authored and Pilot-Pirx committed Aug 5, 2019
1 parent 7ea948e commit 76c3a0c
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 5 deletions.
6 changes: 5 additions & 1 deletion main/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
View file
Expand Up @@ -23,7 +23,7 @@
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

<updated>2012-10-06</updated>
<updated>2019-07-27</updated>

<vendorInfos>
<vendor name="Oracle Corporation">
Expand All @@ -44,6 +44,9 @@
<vendor name="BEA Systems, Inc.">
<minVersion>1.5.0</minVersion>
</vendor>
<vendor name="AdoptOpenJDK">
<minVersion>1.8.0</minVersion>
</vendor>
</vendorInfos>

<plugins>
Expand All @@ -53,5 +56,6 @@
<library vendor="Blackdown Java-Linux Team">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>
<library vendor="BEA Systems, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
<library vendor="AdoptOpenJDK">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
</plugins>
</javaSelection>
7 changes: 6 additions & 1 deletion main/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
View file
Expand Up @@ -23,7 +23,7 @@
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

<updated>2013-01-01</updated>
<updated>2019-07-27</updated>

<vendorInfos>
<vendor name="Apple Computer, Inc.">
Expand All @@ -35,10 +35,15 @@
<vendor name="Oracle Corporation">
<minVersion>1.7.0</minVersion>
</vendor>
<vendor name="AdoptOpenJDK">
<minVersion>1.8.0</minVersion>
</vendor>
</vendorInfos>

<plugins>
<library vendor="Apple Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib</library>
<library vendor="Apple Computer, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib</library>
<library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib</library>
<library vendor="AdoptOpenJDK">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib</library>
</plugins>
</javaSelection>
6 changes: 5 additions & 1 deletion main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
View file
Expand Up @@ -23,7 +23,7 @@
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

<updated>2011-01-07</updated>
<updated>2019-07-27</updated>

<vendorInfos>
<vendor name="Oracle Corporation">
Expand All @@ -32,10 +32,14 @@
<vendor name="Sun Microsystems Inc.">
<minVersion>1.5.0</minVersion>
</vendor>
<vendor name="AdoptOpenJDK">
<minVersion>1.8.0</minVersion>
</vendor>
</vendorInfos>

<plugins>
<library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
<library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
<library vendor="AdoptOpenJDK">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
</plugins>
</javaSelection>
6 changes: 5 additions & 1 deletion main/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
View file
Expand Up @@ -23,7 +23,7 @@
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

<updated>2012-10-06</updated>
<updated>2019-07-27</updated>

<vendorInfos>
<vendor name="Oracle Corporation">
Expand All @@ -35,11 +35,15 @@
<vendor name="IBM Corporation">
<minVersion>1.5.0</minVersion>
</vendor>
<vendor name="AdoptOpenJDK">
<minVersion>1.8.0</minVersion>
</vendor>
</vendorInfos>

<plugins>
<library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll</library>
<library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll</library>
<library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll</library>
<library vendor="AdoptOpenJDK">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll</library>
</plugins>
</javaSelection>
4 changes: 3 additions & 1 deletion main/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
View file
Expand Up @@ -120,6 +120,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
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"));
rtl::OUString sVendor9(RTL_CONSTASCII_USTRINGPARAM("AdoptOpenJDK"));
if ( ! (sVendor0.equals(pInfo->sVendor) == sal_True
|| sVendor1.equals(pInfo->sVendor) == sal_True
|| sVendor2.equals(pInfo->sVendor) == sal_True
Expand All @@ -128,7 +129,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
|| sVendor5.equals(pInfo->sVendor) == sal_True
|| sVendor6.equals(pInfo->sVendor) == sal_True
|| sVendor7.equals(pInfo->sVendor) == sal_True
|| sVendor8.equals(pInfo->sVendor) == sal_True))
|| sVendor8.equals(pInfo->sVendor) == sal_True
|| sVendor9.equals(pInfo->sVendor) == sal_True))
return 0;

rtl::OString sPaths = getLD_LIBRARY_PATH(pInfo->arVendorData);
Expand Down
1 change: 1 addition & 0 deletions main/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
View file
Expand Up @@ -51,6 +51,7 @@ BEGIN_VENDOR_MAP()
VENDOR_MAP_ENTRY("BEA Systems, Inc.", OtherInfo)
VENDOR_MAP_ENTRY("Free Software Foundation, Inc.", GnuInfo)
VENDOR_MAP_ENTRY("The FreeBSD Foundation", OtherInfo)
VENDOR_MAP_ENTRY("AdoptOpenJDK", OtherInfo)
END_VENDOR_MAP()


Expand Down

0 comments on commit 76c3a0c

Please sign in to comment.