merge feature/gbuild_java

28 files changed, 582 insertions, 431 deletions

diff --git a/jvmfwk/Executable_javaldx.mk b/jvmfwk/Executable_javaldx.mk
new file mode 100644
index 000000000000..49252f62f42e
--- /dev/null
+++ b/jvmfwk/Executable_javaldx.mk
@@ -0,0 +1,40 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Executable_Executable,javaldx))
+
+$(eval $(call gb_Executable_add_linked_libs,javaldx,\
+    jvmfwk \
+    sal \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,javaldx,\
+    jvmfwk/plugins/sunmajor/javaenvsetup/javaldx \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk
new file mode 100644
index 000000000000..e58dade8b138
--- /dev/null
+++ b/jvmfwk/Library_jvmfwk.mk
@@ -0,0 +1,67 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,jvmfwk))
+
+$(eval $(call gb_Library_set_soversion_script,jvmfwk,3,$(SRCDIR)/jvmfwk/source/framework.map))
+
+$(eval $(call gb_Library_add_package_headers,jvmfwk,\
+    jvmfwk_inc \
+))
+
+$(eval $(call gb_Library_add_defs,jvmfwk,\
+    -DJVMFWK_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_api,jvmfwk,\
+    udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,jvmfwk,\
+    cppuhelper \
+    sal \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,jvmfwk,\
+    advapi32 \
+))
+endif
+
+$(eval $(call gb_Library_use_externals,jvmfwk,\
+    libxml2 \
+))
+
+$(eval $(call gb_Library_add_exception_objects,jvmfwk,\
+    jvmfwk/source/elements \
+    jvmfwk/source/framework \
+    jvmfwk/source/fwkbase \
+    jvmfwk/source/fwkutil \
+    jvmfwk/source/libxmlutil \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk
new file mode 100644
index 000000000000..734e5647655f
--- /dev/null
+++ b/jvmfwk/Library_sunjavaplugin.mk
@@ -0,0 +1,79 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,sunjavaplugin))
+
+$(eval $(call gb_Library_add_defs,sunjavaplugin,\
+    -DJVMFWK_PLUGIN_DLLIMPLEMENTATION \
+))
+
+ifneq ($(JVM_ONE_PATH_CHECK),)
+$(eval $(call gb_Library_add_defs,sunjavaplugin,\
+    -DJVM_ONE_PATH_CHECK=\"$(JVM_ONE_PATH_CHECK)\" \
+))
+endif
+
+$(eval $(call gb_Library_add_api,sunjavaplugin,\
+    udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,sunjavaplugin,\
+    cppu \
+    cppuhelper \
+    sal \
+    salhelper \
+))
+
+ifeq ($(OS),ANDROID)
+$(eval $(call gb_Library_add_linked_libs,sunjavaplugin,\
+    lo-bootstrap \
+))
+endif
+
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Library_add_linked_libs,sunjavaplugin,\
+    advapi32 \
+    uwinapi \
+))
+endif
+
+$(eval $(call gb_Library_use_externals,sunjavaplugin,\
+    valgrind \
+))
+
+$(eval $(call gb_Library_add_exception_objects,sunjavaplugin,\
+    jvmfwk/plugins/sunmajor/pluginlib/gnujre \
+    jvmfwk/plugins/sunmajor/pluginlib/otherjre \
+    jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin \
+    jvmfwk/plugins/sunmajor/pluginlib/sunjre \
+    jvmfwk/plugins/sunmajor/pluginlib/sunversion \
+    jvmfwk/plugins/sunmajor/pluginlib/util \
+    jvmfwk/plugins/sunmajor/pluginlib/vendorbase \
+    jvmfwk/plugins/sunmajor/pluginlib/vendorlist \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/jvmfwk/inc/makefile.mk b/jvmfwk/Makefile
index 3aec902c90e9..7bbbe6c703e6 100644
--- a/jvmfwk/inc/makefile.mk
+++ b/jvmfwk/Makefile
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -24,16 +25,16 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..
 
-PRJNAME=jvmfwk
-TARGET=inc
+gb_PARTIALBUILD := T
+ifeq ($(strip $(SOLARENV)),)
+include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
+else
 
-# --- Settings -----------------------------------------------------
+gb_SourceEnvAndRecurse_STAGE=gbuild
+include $(SOLARENV)/gbuild/gbuild.mk
 
-.INCLUDE :  settings.mk
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
 
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/jvmfwk/Module_jvmfwk.mk b/jvmfwk/Module_jvmfwk.mk
new file mode 100644
index 000000000000..a6131da1f1ca
--- /dev/null
+++ b/jvmfwk/Module_jvmfwk.mk
@@ -0,0 +1,49 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Module_Module,jvmfwk))
+
+ifneq ($(SOLAR_JAVA),)
+
+$(eval $(call gb_Module_add_targets,jvmfwk,\
+    Library_jvmfwk \
+    Library_sunjavaplugin \
+    Package_inc \
+    Package_javavendors \
+    Package_jreproperties \
+    Package_rcfiles \
+))
+
+ifneq ($(OS),MACOSX)
+$(eval $(call gb_Module_add_targets,jvmfwk,\
+    Executable_javaldx \
+))
+endif
+
+endif
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/jvmfwk/Package_inc.mk b/jvmfwk/Package_inc.mk
new file mode 100644
index 000000000000..fd8a616bdf8e
--- /dev/null
+++ b/jvmfwk/Package_inc.mk
@@ -0,0 +1,35 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,jvmfwk_inc,$(SRCDIR)/jvmfwk/inc/jvmfwk))
+
+$(eval $(call gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/framework.h,framework.h))
+$(eval $(call gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/jvmfwkdllapi.h,jvmfwkdllapi.h))
+$(eval $(call gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/jvmfwkplugindllapi.h,jvmfwkplugindllapi.h))
+$(eval $(call gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/vendorplugin.h,vendorplugin.h))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/jvmfwk/Package_javavendors.mk b/jvmfwk/Package_javavendors.mk
new file mode 100644
index 000000000000..63457765511c
--- /dev/null
+++ b/jvmfwk/Package_javavendors.mk
@@ -0,0 +1,56 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,jvmfwk_javavendors,$(SRCDIR)/jvmfwk/distributions/OpenOfficeorg))
+
+# TODO: why are we delivering this stuff to two places?
+ifeq ($(GUI),UNX)
+ifeq ($(OS),FREEBSD)
+$(eval $(call gb_Package_add_file,jvmfwk_javavendors,bin/javavendors.xml,javavendors_freebsd.xml))
+$(eval $(call gb_Package_add_file,jvmfwk_javavendors,lib/javavendors.xml,javavendors_freebsd.xml))
+else ifeq ($(OS),MACOSX)
+$(eval $(call gb_Package_add_file,jvmfwk_javavendors,bin/javavendors.xml,javavendors_macosx.xml))
+$(eval $(call gb_Package_add_file,jvmfwk_javavendors,lib/javavendors.xml,javavendors_macosx.xml))
+else ifeq ($(OS),LINUX)
+$(eval $(call gb_Package_add_file,jvmfwk_javavendors,bin/javavendors.xml,javavendors_linux.xml))
+$(eval $(call gb_Package_add_file,jvmfwk_javavendors,lib/javavendors.xml,javavendors_linux.xml))
+else ifeq ($(OS),AIX)
+$(eval $(call gb_Package_add_file,jvmfwk_javavendors,bin/javavendors.xml,javavendors_linux.xml))
+$(eval $(call gb_Package_add_file,jvmfwk_javavendors,lib/javavendors.xml,javavendors_linux.xml))
+else
+$(eval $(call gb_Package_add_file,jvmfwk_javavendors,bin/javavendors.xml,javavendors_unx.xml))
+$(eval $(call gb_Package_add_file,jvmfwk_javavendors,lib/javavendors.xml,javavendors_unx.xml))
+endif
+else ifeq ($(GUI),WNT)
+$(eval $(call gb_Package_add_file,jvmfwk_javavendors,bin/javavendors.xml,javavendors_wnt.xml))
+$(eval $(call gb_Package_add_file,jvmfwk_javavendors,lib/javavendors.xml,javavendors_wnt.xml))
+else
+$(call gb_Output_error,Unsupported platform)
+endif
+
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/jvmfwk/Package_jreproperties.mk b/jvmfwk/Package_jreproperties.mk
new file mode 100644
index 000000000000..4e35e7ea6c92
--- /dev/null
+++ b/jvmfwk/Package_jreproperties.mk
@@ -0,0 +1,39 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,jvmfwk_jreproperties,$(WORKDIR)/CustomTarget/jvmfwk/plugins/sunmajor/pluginlib))
+
+$(eval $(call gb_Package_add_customtarget,jvmfwk_jreproperties,jvmfwk/plugins/sunmajor/pluginlib))
+
+$(eval $(call gb_CustomTarget_add_dependencies,jvmfwk/plugins/sunmajor/pluginlib,\
+    jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java \
+))
+
+$(eval $(call gb_Package_add_file,jvmfwk_jreproperties,bin/JREProperties.class,JREProperties.class))
+$(eval $(call gb_Package_add_file,jvmfwk_jreproperties,lib/JREProperties.class,JREProperties.class))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/jvmfwk/Package_rcfiles.mk b/jvmfwk/Package_rcfiles.mk
new file mode 100644
index 000000000000..68dad6fe5e5d
--- /dev/null
+++ b/jvmfwk/Package_rcfiles.mk
@@ -0,0 +1,34 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,jvmfwk_rcfiles,$(SRCDIR)/jvmfwk))
+
+$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(call gb_Helper_get_rcfile,bin/sunjavaplugin),plugins/sunmajor/pluginlib/sunjavapluginrc))
+$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(call gb_Helper_get_rcfile,bin/jvmfwk3),source/jvmfwk3rc))
+$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,bin/javasettingsunopkginstall.xml,source/javasettingsunopkginstall.xml))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
index 2dd5fe35f555..4cb6c8b7e991 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
@@ -18,8 +18,8 @@
  </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>
+  <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library>
+  <library vendor="The FreeBSD Foundation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library>
+  <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library>
  </plugins>
 </javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
index 489511f5aff6..e5d99145a0d9 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
@@ -27,11 +27,11 @@
  </vendorInfos>
 
  <plugins>
-  <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
-  <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
-  <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
-  <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="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library>
+  <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library>
+  <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library>
+  <library vendor="Blackdown Java-Linux Team">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library>
+  <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library>
+  <library vendor="BEA Systems, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library>
  </plugins>
 </javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
index 215d26c0ea2a..48b6246f72c5 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
@@ -14,7 +14,7 @@
  </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="Apple Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.dylib</library>
+  <library vendor="Apple Computer, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.dylib</library>
  </plugins>
 </javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml
deleted file mode 100644
index 2de585472b86..000000000000
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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>2004-01-30</updated>
-
- <vendorInfos>
-  <vendor name="Sun Microsystems Inc.">
-    <minVersion>1.4.2</minVersion>
-  </vendor>
-  <vendor name="IBM Corporation">
-    <minVersion>1.4.2</minVersion>
-  </vendor>
- </vendorInfos>
-
- <plugins>
-  <library vendor="Sun Microsystems Inc.">sunjavap.dll</library>
-  <library vendor="IBM Corporation">sunjavap.dll</library>
- </plugins>
-</javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml
index d18dc66585a5..508c93ec0cf1 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml
@@ -29,7 +29,7 @@ look like.
  </vendorInfos>
 
  <plugins>
-  <library vendor="Sun Microsystems Inc.">sunjavaplugin.dll</library>
+  <library vendor="Sun Microsystems Inc.">libsunjavaplugin.dll</library>
   <library vendor="VendorX">./pluginDir/vendorx.dll</library>
  </plugins>
-</javaSelection>
\ No newline at end of file
+</javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
index 3b1f53fc4fce..261c77d102a8 100755
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
@@ -12,6 +12,6 @@
  </vendorInfos>
 
  <plugins>
-  <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+  <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library>
  </plugins>
 </javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
index 5c92b7ae61b4..a7d4d8958124 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
@@ -18,8 +18,8 @@
  </vendorInfos>
 
  <plugins>
-  <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll</library>
-  <library vendor="Oracle Corporation">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="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.dll</library>
+  <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.dll</library>
+  <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.dll</library>
  </plugins>
 </javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/makefile.mk b/jvmfwk/distributions/OpenOfficeorg/makefile.mk
deleted file mode 100755
index 88afdb33f81c..000000000000
--- a/jvmfwk/distributions/OpenOfficeorg/makefile.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..$/..
-PRJNAME = jvmfwk
-TARGET = vendors_ooo
-
-.INCLUDE: settings.mk
-
-.IF "$(SOLAR_JAVA)"==""
-nojava:
-    @echo "Not building jvmfwk  because Java is disabled"
-.ENDIF
-
-.IF "$(SOLAR_JAVA)"!=""
-$(BIN)$/javavendors.xml: javavendors_unx.xml javavendors_wnt.xml javavendors_macosx.xml javavendors_linux.xml
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="FREEBSD"
-    -$(COPY) javavendors_freebsd.xml $(BIN)$/javavendors.xml
-.ELIF "$(OS)"=="MACOSX"
-    -$(COPY) javavendors_macosx.xml $(BIN)$/javavendors.xml
-.ELIF "$(OS)"=="LINUX" || "$(OS)"=="AIX"
-    -$(COPY) javavendors_linux.xml $(BIN)$/javavendors.xml
-.ELSE
-    -$(COPY) javavendors_unx.xml $(BIN)$/javavendors.xml
-.ENDIF
-.ELIF "$(GUI)"=="WNT"
-    -$(COPY) javavendors_wnt.xml $(BIN)$/javavendors.xml	
-.ELSE
-    @echo Unsupported platform.
-.ENDIF
-
-.ENDIF          # "$(SOLAR_JAVA)"!=""
-
-
-
-
-.INCLUDE: target.mk
-
diff --git a/jvmfwk/inc/jvmfwk/framework.h b/jvmfwk/inc/jvmfwk/framework.h
index 11cca539cb05..032630961911 100644
--- a/jvmfwk/inc/jvmfwk/framework.h
+++ b/jvmfwk/inc/jvmfwk/framework.h
@@ -31,6 +31,7 @@
 #if !defined INCLUDED_JVMFWK_FRAMEWORK_H
 #define INCLUDED_JVMFWK_FRAMEWORK_H
 
+#include "jvmfwkdllapi.h"
 #include "rtl/ustring.h"
 #include "osl/mutex.h"
 #ifdef SOLAR_JAVA
@@ -142,7 +143,7 @@ extern "C" {
     <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\\jurt.jar&quot;
-    -env:UNO_JAVA_JFW_PLUGIN=file:\\solver\\bin\\sunjavaplugin.dll -register ....
+    -env:UNO_JAVA_JFW_PLUGIN=file:\\solver\\bin\\libsunjavaplugin.dll -register ....
     </p>
     <p>Additionall parameters for the Java VM can be provided. For every parameter
     a seperate bootstrap parameter must be specified. The names are
@@ -305,7 +306,7 @@ typedef struct _JavaInfo JavaInfo;
     @param pInfo
     The object which is to be freed. It can be NULL;
  */
-void SAL_CALL jfw_freeJavaInfo(JavaInfo *pInfo);
+JVMFWK_DLLPUBLIC void SAL_CALL jfw_freeJavaInfo(JavaInfo *pInfo);
 
 
 /** compares two <code>JavaInfo</code> objects for equality.
@@ -329,7 +330,7 @@ void SAL_CALL jfw_freeJavaInfo(JavaInfo *pInfo);
    sal_True - both object represent the same JRE.</br>
    sal_False - the objects represend different JREs
  */
-sal_Bool SAL_CALL jfw_areEqualJavaInfo(
+JVMFWK_DLLPUBLIC sal_Bool SAL_CALL jfw_areEqualJavaInfo(
     JavaInfo const * pInfoA,JavaInfo const * pInfoB);
 
 /** determines if a Java Virtual Machine is already running.
@@ -352,7 +353,7 @@ sal_Bool SAL_CALL jfw_areEqualJavaInfo(
     JFW_E_NONE function ran successfully.<br/>
     JFW_E_INVALID_ARG the parameter <code>bRunning</code> was NULL.
 */
-javaFrameworkError SAL_CALL jfw_isVMRunning(sal_Bool *bRunning);
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_isVMRunning(sal_Bool *bRunning);
 
 /** detects a suitable JRE and configures the framework to use it.
 
@@ -418,7 +419,7 @@ javaFrameworkError SAL_CALL jfw_isVMRunning(sal_Bool *bRunning);
     JFW_E_CONFIGURATION mode was not properly set or their prerequisites
     were not met.
  */
-javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo);
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo);
 
 /** provides information about all availabe JRE installations.
 
@@ -447,7 +448,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo);
     JFW_E_CONFIGURATION mode was not properly set or their prerequisites
     were not met.
 */
-javaFrameworkError SAL_CALL jfw_findAllJREs(
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_findAllJREs(
     JavaInfo ***parInfo, sal_Int32 *pSize);
 
 /** determines if a path points to a Java installation.
@@ -480,7 +481,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(
    JFW_E_FAILED_VERSION a JRE was detected but if failed the version
    requirements as determined by the javavendors.xml
  */
-javaFrameworkError SAL_CALL jfw_getJavaInfoByPath(
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_getJavaInfoByPath(
     rtl_uString *pPath, JavaInfo **ppInfo);
 
 
@@ -548,7 +549,7 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath(
     JFW_E_FAILED_VERSION the &quot;Default Mode&quot; is active. The JRE determined by
     <code>JAVA_HOME</code>does not meet the version requirements.
  */
-javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions,
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions,
                                  sal_Int32 nSize, JavaVM **ppVM,
                                  JNIEnv **ppEnv);
 
@@ -578,7 +579,7 @@ javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions,
     were not met.<br/>
     JFW_E_DIRECT_MODE the function cannot be used in this mode.
  */
-javaFrameworkError SAL_CALL jfw_setSelectedJRE(JavaInfo const *pInfo);
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_setSelectedJRE(JavaInfo const *pInfo);
 
 
 /** provides information about the JRE that is to be used.
@@ -608,7 +609,7 @@ javaFrameworkError SAL_CALL jfw_setSelectedJRE(JavaInfo const *pInfo);
     JFW_E_INVALID_SETTINGS the javavendors.xml has been changed and no
     JRE has been selected afterwards. <br/>
  */
-javaFrameworkError SAL_CALL jfw_getSelectedJRE(JavaInfo **ppInfo);
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_getSelectedJRE(JavaInfo **ppInfo);
 
 
 /** determines if Java can be used.
@@ -627,7 +628,7 @@ javaFrameworkError SAL_CALL jfw_getSelectedJRE(JavaInfo **ppInfo);
     were not met.<br/>
    JFW_E_DIRECT_MODE the function cannot be used in this mode.
  */
-javaFrameworkError SAL_CALL jfw_setEnabled(sal_Bool bEnabled);
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_setEnabled(sal_Bool bEnabled);
 
 /** provides the information if Java can be used.
 
@@ -642,7 +643,7 @@ javaFrameworkError SAL_CALL jfw_setEnabled(sal_Bool bEnabled);
     were not met.<br/>
     JFW_E_DIRECT_MODE the function cannot be used in this mode.
  */
-javaFrameworkError SAL_CALL jfw_getEnabled(sal_Bool *pbEnabled);
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_getEnabled(sal_Bool *pbEnabled);
 
 /** determines parameters which are passed to VM during its creation.
 
@@ -666,7 +667,7 @@ javaFrameworkError SAL_CALL jfw_getEnabled(sal_Bool *pbEnabled);
     were not met.<br/>
     JFW_E_DIRECT_MODE the function cannot be used in this mode.
  */
-javaFrameworkError SAL_CALL jfw_setVMParameters(
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_setVMParameters(
     rtl_uString **  arArgs, sal_Int32 nSize);
 
 /** obtains the currently used start parameters.
@@ -691,7 +692,7 @@ javaFrameworkError SAL_CALL jfw_setVMParameters(
     were not met.<br/>
     JFW_E_DIRECT_MODE the function cannot be used in this mode.
  */
-javaFrameworkError SAL_CALL jfw_getVMParameters(
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_getVMParameters(
     rtl_uString *** parParameters,
     sal_Int32 * pSize);
 
@@ -713,7 +714,7 @@ javaFrameworkError SAL_CALL jfw_getVMParameters(
     were not met.<br/>
    JFW_E_DIRECT_MODE the function cannot be used in this mode.
  */
-javaFrameworkError SAL_CALL jfw_setUserClassPath(rtl_uString * pCP);
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_setUserClassPath(rtl_uString * pCP);
 /** provides the value of the current user class path.
 
    <p>The function returns an empty string if no user class path is set.
@@ -732,7 +733,7 @@ javaFrameworkError SAL_CALL jfw_setUserClassPath(rtl_uString * pCP);
     were not met.<br/>
    JFW_E_DIRECT_MODE the function cannot be used in this mode.
  */
-javaFrameworkError SAL_CALL jfw_getUserClassPath(rtl_uString ** ppCP);
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_getUserClassPath(rtl_uString ** ppCP);
 
 /** saves the location of a JRE.
 
@@ -761,7 +762,7 @@ javaFrameworkError SAL_CALL jfw_getUserClassPath(rtl_uString ** ppCP);
     JFW_E_DIRECT_MODE the function cannot be used in this mode.
     @see jfw_setJRELocations
  */
-javaFrameworkError SAL_CALL jfw_addJRELocation(rtl_uString * sLocation);
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_addJRELocation(rtl_uString * sLocation);
 
 /** saves the locations of a number of JREs.
 
@@ -789,7 +790,7 @@ javaFrameworkError SAL_CALL jfw_addJRELocation(rtl_uString * sLocation);
     JFW_E_DIRECT_MODE the function cannot be used in this mode.
     @see jfw_addJRELocations
  */
-javaFrameworkError SAL_CALL jfw_setJRELocations(
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_setJRELocations(
     rtl_uString ** arLocations, sal_Int32 nSize);
 /** obtains an array containing paths to JRE installations.
 
@@ -811,7 +812,7 @@ javaFrameworkError SAL_CALL jfw_setJRELocations(
     were not met.<br/>
     JFW_E_DIRECT_MODE the function cannot be used in this mode.
  */
-javaFrameworkError SAL_CALL jfw_getJRELocations(
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_getJRELocations(
     rtl_uString *** parLocations, sal_Int32 * pSize);
 
 
@@ -833,7 +834,7 @@ javaFrameworkError SAL_CALL jfw_getJRELocations(
     JFW_E_INVALID_ARG pInfo contains invalid data</br>
     JFW_E_NO_PLUGIN a plug-in library could not be found.<br/>
  */
-javaFrameworkError SAL_CALL jfw_existJRE(const JavaInfo *pInfo, sal_Bool *exist);
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_existJRE(const JavaInfo *pInfo, sal_Bool *exist);
 
 
 /** locks this API so that it cannot be used by other threads.
@@ -851,14 +852,14 @@ javaFrameworkError SAL_CALL jfw_existJRE(const JavaInfo *pInfo, sal_Bool *exist)
     The only functions which are not effected by <code>jfw_lock</code> are
     <code>jfw_freeJavaInfo</code> and <code>jfw_areEqualJavaInfo</code>.
  */
-void SAL_CALL jfw_lock();
+JVMFWK_DLLPUBLIC void SAL_CALL jfw_lock();
 
 /** unlocks this API.
 
     <p>This function is called after <code>jfw_lock</code>. It allows other
     threads to use this API concurrently.</p>
 */
-void SAL_CALL jfw_unlock();
+JVMFWK_DLLPUBLIC void SAL_CALL jfw_unlock();
 
 
 #ifdef __cplusplus
diff --git a/jvmfwk/inc/jvmfwk/jvmfwkdllapi.h b/jvmfwk/inc/jvmfwk/jvmfwkdllapi.h
new file mode 100644
index 000000000000..6a34397d2a91
--- /dev/null
+++ b/jvmfwk/inc/jvmfwk/jvmfwkdllapi.h
@@ -0,0 +1,44 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+ *  (initial developer)
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#ifndef INCLUDED_JVMFWK_JVMFWKDLLAPI_H
+#define INCLUDED_JVMFWK_JVMFWKDLLAPI_H
+
+#include <sal/types.h>
+
+#if defined JVMFWK_DLLIMPLEMENTATION
+#   define JVMFWK_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#   define JVMFWK_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define JVMFWK_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/inc/jvmfwk/jvmfwkplugindllapi.h b/jvmfwk/inc/jvmfwk/jvmfwkplugindllapi.h
new file mode 100644
index 000000000000..c7a29903be52
--- /dev/null
+++ b/jvmfwk/inc/jvmfwk/jvmfwkplugindllapi.h
@@ -0,0 +1,44 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+ *  (initial developer)
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#ifndef INCLUDED_JVMFWK_JVMFWKPLUGINDLLAPI_H
+#define INCLUDED_JVMFWK_JVMFWKPLUGINDLLAPI_H
+
+#include <sal/types.h>
+
+#if defined JVMFWK_PLUGIN_DLLIMPLEMENTATION
+#   define JVMFWK_PLUGIN_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#   define JVMFWK_PLUGIN_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define JVMFWK_PLUGIN_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/inc/jvmfwk/vendorplugin.h b/jvmfwk/inc/jvmfwk/vendorplugin.h
index 3ccbb0e487f4..302037cecbfc 100644
--- a/jvmfwk/inc/jvmfwk/vendorplugin.h
+++ b/jvmfwk/inc/jvmfwk/vendorplugin.h
@@ -30,6 +30,7 @@
 #if !defined INCLUDED_JVMFWK_VENDORPLUGIN_H
 #define INCLUDED_JVMFWK_VENDORPLUGIN_H
 
+#include "jvmfwkplugindllapi.h"
 #include "jvmfwk/framework.h"
 #include "rtl/ustring.h"
 #ifdef SOLAR_JAVA
@@ -126,7 +127,7 @@ typedef enum
     <code>sMinVersion,sMaxVersion,arExcludeList</code> are not recognized as valid
     version strings.
  */
-javaPluginError jfw_plugin_getAllJavaInfos(
+JVMFWK_PLUGIN_DLLPUBLIC javaPluginError jfw_plugin_getAllJavaInfos(
     rtl_uString *sVendor,
     rtl_uString *sMinVersion,
     rtl_uString *sMaxVersion,
@@ -177,7 +178,7 @@ javaPluginError jfw_plugin_getAllJavaInfos(
    does not mean necessarily that there is no JRE. There could be a JRE but it has
    a vendor which is not supported by this API implementation.
  */
-javaPluginError jfw_plugin_getJavaInfoByPath(
+JVMFWK_PLUGIN_DLLPUBLIC javaPluginError jfw_plugin_getJavaInfoByPath(
     rtl_uString *sLocation,
     rtl_uString *sVendor,
     rtl_uString *sMinVersion,
@@ -230,7 +231,7 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
     JFW_PLUGIN_E_VM_CREATION_FAILED a VM could not be created. The error was caused
     by the JRE.
  */
-javaPluginError jfw_plugin_startJavaVirtualMachine(
+JVMFWK_PLUGIN_DLLPUBLIC javaPluginError jfw_plugin_startJavaVirtualMachine(
     const JavaInfo *pInfo,
     const JavaVMOption *arOptions,
     sal_Int32 nSizeOptions,
@@ -256,7 +257,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
     JFW_PLUGIN_E_ERROR an error occurred during execution.</br>
     JFW_PLUGIN_E_INVALID_ARG pInfo contains invalid data</br>
  */
-javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist);
+JVMFWK_PLUGIN_DLLPUBLIC javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist);
 
 #ifdef __cplusplus
 }
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk b/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk
deleted file mode 100755
index 8e4a79581327..000000000000
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=javaldx
-TARGET=javaldx
-TARGETTYPE=CUI
-NO_DEFAULT_STL=TRUE
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(OS)" != "MACOSX" && "$(SOLAR_JAVA)" != ""
-
-OBJFILES=$(OBJ)$/javaldx.obj
-
-APP1TARGET=javaldx
-APP1OBJS=$(OBJFILES)
-APP1STDLIBS=$(SALLIB) $(JVMFWKLIB)
-APP1RPATH=UREBIN
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/Makefile b/jvmfwk/plugins/sunmajor/pluginlib/Makefile
new file mode 100644
index 000000000000..b190038ef79c
--- /dev/null
+++ b/jvmfwk/plugins/sunmajor/pluginlib/Makefile
@@ -0,0 +1,38 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+include $(GBUILDDIR)/gbuild.mk
+
+JREProperties.class : $(SRCDIR)/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java
+	$(call gb_Helper_abbreviate_dirs_native, \
+	$(gb_JavaClassSet_JAVACCOMMAND) $(gb_JavaClassSet_JAVACDEBUG) -d $(dir $@) $^)
+
+.DEFAULT_GOAL := all
+.PHONY : all
+all : JREProperties.class
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk b/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
deleted file mode 100644
index 03c4f58e37d8..000000000000
--- a/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
+++ /dev/null
@@ -1,120 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..$/..
-
-PRJNAME= jvmfwk
-TARGET = plugin
-ENABLE_EXCEPTIONS=TRUE
-LIBTARGET=NO
-UNOCOMPONENT1=sunjavaplugin
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-DLLPRE =
-
-.IF "$(VALGRIND_CFLAGS)" != ""
-CDEFS  += -DHAVE_VALGRIND_H
-CFLAGS += $(VALGRIND_CFLAGS)
-.END
-
-# ------------------------------------------------------------------
-
-.IF "$(SOLAR_JAVA)"!=""
-
-SLOFILES= \
-    $(SLO)$/sunversion.obj \
-    $(SLO)$/sunjavaplugin.obj \
-    $(SLO)$/vendorbase.obj \
-    $(SLO)$/util.obj \
-    $(SLO)$/sunjre.obj \
-    $(SLO)$/gnujre.obj \
-    $(SLO)$/vendorlist.obj \
-    $(SLO)$/otherjre.obj 
-
-LIB1OBJFILES= $(SLOFILES)
-
-LIB1TARGET=$(SLB)$/$(UNOCOMPONENT1).lib
-
-SHL1TARGET=$(ENFORCEDSHLPREFIX)$(UNOCOMPONENT1)  
-
-
-SHL1STDLIBS= \
-        $(CPPUHELPER) \
-        $(CPPULIB) \
-        $(SALHELPERLIB) \
-        $(SALLIB)
-        
-.IF "$(OS)" == "ANDROID"
-SHL1STDLIBS+=-llo-bootstrap
-.ENDIF
-
-.IF "$(GUI)" == "WNT"
-.IF "$(COM)"!="GCC"
-SHL1STDLIBS += uwinapi.lib advapi32.lib
-.ELSE
-SHL1STDLIBS += -luwinapi -ladvapi32 
-.ENDIF # GCC
-.ENDIF #WNT
-
-.IF "$(JVM_ONE_PATH_CHECK)" != ""
-CFLAGS += -DJVM_ONE_PATH_CHECK=\"$(JVM_ONE_PATH_CHECK)\"
-.ENDIF
-
-SHL1VERSIONMAP = sunjavaplugin.map
-SHL1DEPN=
-SHL1IMPLIB=	i$(UNOCOMPONENT1)
-SHL1LIBS=	$(LIB1TARGET) 
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=	$(SHL1TARGET)
-SHL1RPATH=  URELIB
-
-JAVACLASSFILES= \
-    $(CLASSDIR)$/JREProperties.class					
-
-JAVAFILES = $(subst,$(CLASSDIR)$/, $(subst,.class,.java $(JAVACLASSFILES))) 
-
-.ENDIF # SOLAR_JAVA
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-.IF "$(GUI)"=="WNT"
-BOOTSTRAPFILE=$(BIN)$/sunjavaplugin.ini
-.ELSE
-BOOTSTRAPFILE=$(BIN)$/sunjavapluginrc
-.ENDIF
-
-
-$(BOOTSTRAPFILE): sunjavapluginrc
-    -$(COPY) $< $@
-
-
-ALLTAR: \
-    $(BOOTSTRAPFILE)
-
diff --git a/jvmfwk/prj/build.lst b/jvmfwk/prj/build.lst
index 1a8d67401648..5352c4fa2002 100644
--- a/jvmfwk/prj/build.lst
+++ b/jvmfwk/prj/build.lst
@@ -1,6 +1,2 @@
 jvmf jvmfwk : cppu cppuhelper sal comphelper LIBXML2:libxml2 NULL
-jvmf jvmfwk\inc nmake - all jvmf_inc NULL
-jvmf jvmfwk\source nmake - all jvmf_framework jvmf_inc NULL
-jvmf jvmfwk\plugins\sunmajor\pluginlib nmake - all jvmf_sunmajorlib jvmf_inc NULL
-jvmf jvmfwk\plugins\sunmajor\javaenvsetup nmake - u jvmf_sunjavaldx jvmf_framework jvmf_inc NULL
-jvmf jvmfwk\distributions\OpenOfficeorg nmake - all jvmf_openoffice jvmf_framework jvmf_inc NULL
+jvmf jvmfwk\prj nmake - all jvmf_prj NULL
diff --git a/jvmfwk/prj/d.lst b/jvmfwk/prj/d.lst
index e8753d14d95c..e69de29bb2d1 100644
--- a/jvmfwk/prj/d.lst
+++ b/jvmfwk/prj/d.lst
@@ -1,23 +0,0 @@
-mkdir: %_DEST%\inc\jvmfwk
-..\inc\jvmfwk\framework.h %_DEST%\inc\jvmfwk\framework.h
-..\inc\jvmfwk\vendorplugin.h %_DEST%\inc\jvmfwk\vendorplugin.h
-..\%__SRC%\lib\ijvmfwk.lib %_DEST%\lib\ijvmfwk.lib
-..\%__SRC%\lib\libjvmfwk.* %_DEST%\lib\*
-..\%__SRC%\bin\jvmfwk*.dll %_DEST%\bin\*
-..\%__SRC%\bin\sunjavap*.dll %_DEST%\bin\*
-..\%__SRC%\lib\sunjavaplugin*.so %_DEST%\lib\*
-..\%__SRC%\lib\libsunjavaplugin*.so %_DEST%\lib\*
-..\%__SRC%\lib\sunjavaplugin*.dylib %_DEST%\lib\*
-..\%__SRC%\class\JREProperties.class  %_DEST%\bin\JREProperties.class
-..\%__SRC%\class\JREProperties.class  %_DEST%\lib\JREProperties.class
-..\%__SRC%\bin\javaldx %_DEST%\bin\javaldx
-..\source\javasettingsunopkginstall.xml %_DEST%\bin\javasettingsunopkginstall.xml
-..\%__SRC%\bin\javavendors.xml %_DEST%\bin\javavendors.xml
-..\%__SRC%\bin\javavendors.xml %_DEST%\lib\javavendors.xml
-..\%__SRC%\bin\jvmfwk3rc %_DEST%\lib\jvmfwk3rc
-..\%__SRC%\bin\jvmfwk3.ini %_DEST%\bin\jvmfwk3.ini
-..\%__SRC%\bin\sunjavapluginrc %_DEST%\lib\sunjavapluginrc
-..\%__SRC%\bin\sunjavaplugin.ini %_DEST%\bin\sunjavaplugin.ini
-
-linklib: libjvmfwk.*.*
-linklib: libjvmfwk*.dylib.*.*.*
diff --git a/jvmfwk/prj/makefile.mk b/jvmfwk/prj/makefile.mk
new file mode 100644
index 000000000000..0997622e00f6
--- /dev/null
+++ b/jvmfwk/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
diff --git a/jvmfwk/source/makefile.mk b/jvmfwk/source/makefile.mk
deleted file mode 100644
index 76ae22de6a44..000000000000
--- a/jvmfwk/source/makefile.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..
-PRJNAME = jvmfwk
-FRAMEWORKLIB=jvmfwk
-TARGET = $(FRAMEWORKLIB)
-ENABLE_EXCEPTIONS = TRUE
-
-.IF "$(OS)" != "WNT"
-UNIXVERSIONNAMES = UDK
-.ENDIF # WNT
-
-.INCLUDE: settings.mk
-
-.IF "$(SYSTEM_LIBXML)" == "YES"
-CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
-.ENDIF
-
-UNOUCROUT = $(OUT)$/inc
-
-SLOFILES = \
-    $(SLO)$/framework.obj \
-    $(SLO)$/libxmlutil.obj \
-    $(SLO)$/fwkutil.obj \
-    $(SLO)$/elements.obj \
-    $(SLO)$/fwkbase.obj
-
-
-.IF "$(UNIXVERSIONNAMES)" == ""
-SHL1TARGET = $(FRAMEWORKLIB)$(UDK_MAJOR)
-.ELSE # UNIXVERSIONNAMES
-SHL1TARGET = $(FRAMEWORKLIB)
-.ENDIF # UNIXVERSIONNAMES
-
-SHL1DEPN=
-.IF "$(COM)" == "MSC"
-SHL1IMPLIB = i$(FRAMEWORKLIB)
-.ELSE
-SHL1IMPLIB = $(FRAMEWORKLIB)
-.ENDIF
-SHL1LIBS = $(SLB)$/$(TARGET).lib
-SHL1STDLIBS = $(CPPUHELPERLIB) $(SALLIB) $(LIBXML2LIB)
-SHL1RPATH = URELIB
-
-.IF "$(OS)" == "WNT"
-SHL1STDLIBS += $(ADVAPI32LIB)
-.ENDIF # WNT
-
-SHL1VERSIONMAP = framework.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME = $(SHL1TARGET)
-
-.IF "$(GUI)"=="UNX"
-RCFILE=$(BIN)$/jvmfwk3rc
-.ELIF "$(GUI)"=="WNT"
-RCFILE=$(BIN)$/jvmfwk3.ini
-.END
-
-
-.INCLUDE: target.mk
-$(RCFILE): jvmfwk3rc
-    -$(COPY) $< $@
-
-ALLTAR: \
-    $(RCFILE)
-