Support Azul Zulu JRE (at least on Windows)
(<http://www.azulsystems.com/products/zulu/downloads> also offers it for Linux
and Mac OS X, so it could be added to more javavendors_*.xml if need be; I only
checked it actually works with a Windows 64-bit LO build)
Change-Id: If549a0d5bf1459eba2f6ba2bd545cfd55a20cea6
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
index 4f76089..b1ad4e4 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
@@ -32,6 +32,9 @@
<vendor name="IBM Corporation">
<minVersion>1.5.0</minVersion>
</vendor>
<vendor name="Azul Systems, Inc.">
<minVersion>1.6.0</minVersion>
</vendor>
</vendorInfos>
</javaSelection>
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
index 07f9c0c..c84525e 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
@@ -55,7 +55,8 @@ char const* const* OtherInfo::getRuntimePaths(int * size)
"/bin/client/jvm.dll",
"/bin/hotspot/jvm.dll",
"/bin/classic/jvm.dll",
"/bin/jrockit/jvm.dll"
"/bin/jrockit/jvm.dll",
"/bin/server/jvm.dll" // needed by Azul
#elif defined UNX
#ifdef MACOSX
"/../../../../../Frameworks/JavaVM.framework/JavaVM" //as of 1.6.0_22
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
index ef81466..b2e3aca 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
@@ -50,6 +50,7 @@ BEGIN_VENDOR_MAP()
VENDOR_MAP_ENTRY("Free Software Foundation, Inc.", GnuInfo)
VENDOR_MAP_ENTRY("The FreeBSD Foundation", OtherInfo)
#endif
VENDOR_MAP_ENTRY("Azul Systems, Inc.", OtherInfo)
END_VENDOR_MAP()
