Remove jvmfwk plugin feature

...which was effectively unused; there only ever was a single sunjavaplugin that
is now folded directly into jvmfwk.  Leaves room for further clean up.

Change-Id: I14dd2a3a09bd1ce9a8c3f5c156628ec11d954a0b

3 files changed, 4 insertions, 36 deletions

diff --git a/include/jvmfwk/framework.h b/include/jvmfwk/framework.h
index dc9901500258..e791a1fea3eb 100644
--- a/include/jvmfwk/framework.h
+++ b/include/jvmfwk/framework.h
@@ -197,7 +197,6 @@ typedef enum _javaFrameworkError
     JFW_E_NEED_RESTART,
     JFW_E_RUNNING_JVM,
     JFW_E_JAVA_DISABLED,
-    JFW_E_NO_PLUGIN,
     JFW_E_NOT_RECOGNIZED,
     JFW_E_FAILED_VERSION,
     JFW_E_NO_JAVA_FOUND,
@@ -376,7 +375,6 @@ JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_isVMRunning(sal_Bool *bRunning)
     @return
     JFW_E_NONE function ran successfully.<br/>
     JFW_E_ERROR an error occurred. <br/>
-    JFW_E_NO_PLUGIN a plug-in library could not be found.<br/>
     JFW_E_NO_JAVA_FOUND no JRE was found that meets the requirements.</br>
     JFW_E_DIRECT_MODE the function cannot be used in this mode. </br>
     JFW_E_CONFIGURATION mode was not properly set or their prerequisites
@@ -407,7 +405,6 @@ JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pIn
     JFW_E_NONE function ran successfully.<br/>
     JFW_E_INVALID_ARG at least on of the parameters was NULL<br/>
     JFW_E_ERROR an error occurred. <br/>
-    JFW_E_NO_PLUGIN a plug-in library could not be found.<br/>
     JFW_E_CONFIGURATION mode was not properly set or their prerequisites
     were not met.
 */
@@ -439,7 +436,6 @@ JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_findAllJREs(
    JFW_E_ERROR an error occurred. <br/>
    JFW_E_CONFIGURATION mode was not properly set or their prerequisites
    were not met.</br>
-   JFW_E_NO_PLUGIN a plug-in library could not be found.<br/>
    JFW_E_NOT_RECOGNIZED neither plug-in library could detect a JRE. <br/>
    JFW_E_FAILED_VERSION a JRE was detected but if failed the version
    requirements as determined by the javavendors.xml
@@ -496,8 +492,6 @@ JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_getJavaInfoByPath(
     JFW_E_ERROR an error occurred. <br/>
     JFW_E_CONFIGURATION mode was not properly set or their prerequisites
     were not met.</br>
-    JFW_E_NO_PLUGIN the plug-in library responsible for creating the VM
-    could not be found.<br/>
     JFW_E_JAVA_DISABLED the use of Java is currently disabled. <br/>
     JFW_E_NO_SELECT there is no JRE selected yet. <br/>
     JFW_E_RUNNIN_JVM there is already a VM running.<br/>
@@ -768,7 +762,6 @@ JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_getJRELocations(
     JFW_E_NONE the function ran successfully.</br>
     JFW_E_ERROR an error occurred during execution.</br>
     JFW_E_INVALID_ARG pInfo contains invalid data</br>
-    JFW_E_NO_PLUGIN a plug-in library could not be found.<br/>
  */
 JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_existJRE(const JavaInfo *pInfo, sal_Bool *exist);
 
diff --git a/include/jvmfwk/jvmfwkplugindllapi.h b/include/jvmfwk/jvmfwkplugindllapi.h
deleted file mode 100644
index d96016e261bb..000000000000
--- a/include/jvmfwk/jvmfwkplugindllapi.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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/.
- */
-
-#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/include/jvmfwk/vendorplugin.h b/include/jvmfwk/vendorplugin.h
index 2855e33d0a70..d51943ea400a 100644
--- a/include/jvmfwk/vendorplugin.h
+++ b/include/jvmfwk/vendorplugin.h
@@ -21,7 +21,6 @@
 #ifndef INCLUDED_JVMFWK_VENDORPLUGIN_H
 #define INCLUDED_JVMFWK_VENDORPLUGIN_H
 
-#include <jvmfwk/jvmfwkplugindllapi.h>
 #include <jvmfwk/framework.h>
 #include <rtl/ustring.h>
 #include "jni.h"
@@ -116,7 +115,7 @@ typedef enum
     <code>sMinVersion,sMaxVersion,arExcludeList</code> are not recognized as valid
     version strings.
  */
-JVMFWK_PLUGIN_DLLPUBLIC javaPluginError jfw_plugin_getAllJavaInfos(
+javaPluginError jfw_plugin_getAllJavaInfos(
     rtl_uString *sVendor,
     rtl_uString *sMinVersion,
     rtl_uString *sMaxVersion,
@@ -167,7 +166,7 @@ JVMFWK_PLUGIN_DLLPUBLIC 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.
  */
-JVMFWK_PLUGIN_DLLPUBLIC javaPluginError jfw_plugin_getJavaInfoByPath(
+javaPluginError jfw_plugin_getJavaInfoByPath(
     rtl_uString *sLocation,
     rtl_uString *sVendor,
     rtl_uString *sMinVersion,
@@ -220,7 +219,7 @@ JVMFWK_PLUGIN_DLLPUBLIC javaPluginError jfw_plugin_getJavaInfoByPath(
     JFW_PLUGIN_E_VM_CREATION_FAILED a VM could not be created. The error was caused
     by the JRE.
  */
-JVMFWK_PLUGIN_DLLPUBLIC javaPluginError jfw_plugin_startJavaVirtualMachine(
+javaPluginError jfw_plugin_startJavaVirtualMachine(
     const JavaInfo *pInfo,
     const JavaVMOption *arOptions,
     sal_Int32 nSizeOptions,
@@ -246,7 +245,7 @@ JVMFWK_PLUGIN_DLLPUBLIC javaPluginError jfw_plugin_startJavaVirtualMachine(
     JFW_PLUGIN_E_ERROR an error occurred during execution.</br>
     JFW_PLUGIN_E_INVALID_ARG pInfo contains invalid data</br>
  */
-JVMFWK_PLUGIN_DLLPUBLIC javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist);
+javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist);
 
 #ifdef __cplusplus
 }