8 files changed, 2 insertions, 397 deletions
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index fd649cabe5a8..00981afa6121 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -60,6 +60,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     idl \
     javaunohelper \
     jvmaccess \
+    jvmfwk \
     jurt \
     lingucomponent \
     linguistic \
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/makefile.mk b/jvmfwk/inc/makefile.mk
deleted file mode 100644
index 3aec902c90e9..000000000000
--- a/jvmfwk/inc/makefile.mk
+++ /dev/null
@@ -1,39 +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=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
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.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/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)
-