convert bean to gbuild and add to tail_build

19 files changed, 242 insertions, 375 deletions

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index d43bd090b2f4..9e35fc89e255 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
     animations \
     automation \
     basctl \
+    bean \
     chart2 \
     cui \
     dbaccess \
diff --git a/Repository.mk b/Repository.mk
index dde5f11db285..afdd5ca3f21e 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -103,6 +103,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 	forui \
 	odbc \
 	odbcbase \
+	officebean \
 	oox \
 	ooxml \
 	sdbc \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 6cd1505ab55d..8e1b817aab96 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     basebmp \
     basegfx \
     basic \
+    bean \
     canvas \
     chart2 \
     comphelper \
diff --git a/bean/Jar_officebean.mk b/bean/Jar_officebean.mk
new file mode 100644
index 000000000000..ab38fd2d90d2
--- /dev/null
+++ b/bean/Jar_officebean.mk
@@ -0,0 +1,69 @@
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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_Jar_Jar,officebean,SRCDIR))
+
+$(eval $(call gb_Jar_add_jars,officebean,\
+	$(OUTDIR)/bin/ridl.jar \
+	$(OUTDIR)/bin/unoil.jar \
+	$(OUTDIR)/bin/jurt.jar \
+	$(OUTDIR)/bin/juh.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,officebean,com))
+
+$(eval $(call gb_Jar_add_sourcefiles,officebean,\
+	bean/com/sun/star/beans/ContainerFactory \
+	bean/com/sun/star/beans/JavaWindowPeerFake \
+	bean/com/sun/star/beans/LocalOfficeConnection \
+	bean/com/sun/star/beans/LocalOfficeWindow \
+	bean/com/sun/star/beans/NativeConnection \
+	bean/com/sun/star/beans/NativeService \
+	bean/com/sun/star/beans/OfficeConnection \
+	bean/com/sun/star/beans/OfficeWindow \
+	bean/com/sun/star/comp/beans/ContainerFactory \
+	bean/com/sun/star/comp/beans/Controller \
+	bean/com/sun/star/comp/beans/Frame \
+	bean/com/sun/star/comp/beans/HasConnectionException \
+	bean/com/sun/star/comp/beans/InvalidArgumentException \
+	bean/com/sun/star/comp/beans/JavaWindowPeerFake \
+	bean/com/sun/star/comp/beans/LocalOfficeConnection \
+	bean/com/sun/star/comp/beans/LocalOfficeWindow \
+	bean/com/sun/star/comp/beans/NativeConnection \
+	bean/com/sun/star/comp/beans/NativeService \
+	bean/com/sun/star/comp/beans/NoConnectionException \
+	bean/com/sun/star/comp/beans/NoDocumentException \
+	bean/com/sun/star/comp/beans/OfficeConnection \
+	bean/com/sun/star/comp/beans/OfficeDocument \
+	bean/com/sun/star/comp/beans/OfficeWindow \
+	bean/com/sun/star/comp/beans/OOoBean \
+	bean/com/sun/star/comp/beans/SystemWindowException \
+	bean/com/sun/star/comp/beans/Wrapper \
+	bean/com/sun/star/comp/beans/CallWatchThread \
+))
diff --git a/bean/JunitTest_bean_complex.mk b/bean/JunitTest_bean_complex.mk
new file mode 100644
index 000000000000..837b99968ce8
--- /dev/null
+++ b/bean/JunitTest_bean_complex.mk
@@ -0,0 +1,48 @@
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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_JunitTest_JunitTest,bean_complex,SRCDIR))
+
+$(eval $(call gb_JunitTest_add_jars,bean_complex,\
+	$(OUTDIR)/bin/OOoRunner.jar \
+	$(OUTDIR)/bin/ridl.jar \
+	$(OUTDIR)/bin/test.jar \
+	$(OUTDIR)/bin/unoil.jar \
+	$(OUTDIR)/bin/officebean.jar \
+))
+
+$(eval $(call gb_JunitTest_add_sourcefiles,bean_complex,\
+	bean/qa/complex/bean/OOoBeanTest \
+	bean/qa/complex/bean/ScreenComparer \
+	bean/qa/complex/bean/WriterFrame \
+))
+
+$(eval $(call gb_JunitTest_add_classes,bean_complex,\
+	complex.bean.OOoBeanTest \
+))
diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk
new file mode 100644
index 000000000000..2aa91fef9f5c
--- /dev/null
+++ b/bean/Library_officebean.mk
@@ -0,0 +1,52 @@
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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,officebean))
+
+ifeq ($(GUI),UNX)
+$(eval $(call gb_Library_add_cobjects,officebean,\
+	bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow \
+	bean/native/unix/com_sun_star_beans_LocalOfficeWindow \
+))
+endif
+
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Library_add_cobjects,officebean,\
+	bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow \
+	bean/native/win32/com_sun_star_beans_LocalOfficeWindow \
+))
+endif
+
+$(eval $(call gb_Library_add_libs,officebean,\
+	$(AWTLIB) \
+))
+
+$(eval $(call gb_Library_add_ldflags,officebean,\
+	$(JAVALIB) \
+))
diff --git a/bean/com/sun/star/beans/makefile.mk b/bean/Makefile
index 9fd82df5117d..5bedaf0b9dcf 100644
--- a/bean/com/sun/star/beans/makefile.mk
+++ b/bean/Makefile
@@ -1,8 +1,8 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -25,40 +25,14 @@
 #
 #*************************************************************************
 
-PRJ	= ..$/..$/..$/..
-PRJNAME = beans
-TARGET  = com_sun_star_beans
-PACKAGE = com$/sun$/star$/beans
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-.IF "$(L10N_framework)"==""
-.IF "$(OS)"=="MACOSX"
-
-dummy:
-    @echo "Nothing to build for OS $(OS)"
-
-.ELSE		# "$(OS)"=="MACOSX"
-
-JARFILES 		= ridl.jar unoil.jar jurt.jar juh.jar
-
-# --- Sources --------------------------------------------------------
-
-JAVAFILES=  \
-    ContainerFactory.java \
-    JavaWindowPeerFake.java \
-    LocalOfficeConnection.java \
-    LocalOfficeWindow.java \
-    NativeConnection.java \
-    NativeService.java \
-    OfficeConnection.java \
-    OfficeWindow.java 
-
-JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
 
-.ENDIF
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
 
-# --- Targets ------------------------------------------------------
-.ENDIF # L10N_framework
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
 
-.INCLUDE :  target.mk
+# vim: set noet sw=4 ts=4:
diff --git a/bean/Module_bean.mk b/bean/Module_bean.mk
new file mode 100644
index 000000000000..f8c1b6ed0b16
--- /dev/null
+++ b/bean/Module_bean.mk
@@ -0,0 +1,46 @@
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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,bean))
+
+ifneq ($(SOLAR_JAVA),)
+
+ifneq ($(OS),MACOSX)
+$(eval $(call gb_Module_add_targets,bean,\
+	Jar_officebean \
+	Library_officebean \
+))
+
+# complex tests compileable but fail at runtime
+#$(eval $(call gb_Module_add_subsequentcheck_targets,bean,\
+#	JunitTest_bean_complex \
+#))
+endif
+
+endif
diff --git a/bean/com/sun/star/comp/beans/makefile.mk b/bean/com/sun/star/comp/beans/makefile.mk
deleted file mode 100644
index 31781d6f0cb3..000000000000
--- a/bean/com/sun/star/comp/beans/makefile.mk
+++ /dev/null
@@ -1,75 +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 = beans
-TARGET  = com_sun_star_comp_beans
-PACKAGE = com$/sun$/star$/comp$/beans
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-.IF "$(L10N_framework)"==""
-.IF "$(OS)"=="MACOSX"
-
-dummy:
-    @echo "Nothing to build for OS $(OS)"
-
-.ELSE		# "$(OS)"=="MACOSX"
-
-JARFILES 		= ridl.jar unoil.jar jurt.jar juh.jar
-
-# --- Sources --------------------------------------------------------
-
-JAVAFILES=  \
-    ContainerFactory.java \
-    Controller.java \
-    Frame.java \
-    HasConnectionException.java \
-    InvalidArgumentException.java \
-    JavaWindowPeerFake.java \
-    LocalOfficeConnection.java \
-    LocalOfficeWindow.java \
-    NativeConnection.java \
-    NativeService.java \
-    NoConnectionException.java \
-    NoDocumentException.java \
-    OfficeConnection.java \
-    OfficeDocument.java \
-    OfficeWindow.java \
-    OOoBean.java \
-    SystemWindowException.java \
-    Wrapper.java \
-    CallWatchThread.java
-
-JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-.ENDIF # L10N_framework
-
-.INCLUDE :  target.mk
diff --git a/bean/native/unix/makefile.mk b/bean/native/unix/makefile.mk
deleted file mode 100644
index e3ff996a60ae..000000000000
--- a/bean/native/unix/makefile.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-PRJ=..$/..
-
-PRJNAME=beans
-TARGET=officebean
-ENABLE_EXCEPTIONS=TRUE
-NO_DEFAULT_STL=TRUE
-NO_BSYMBOLIC=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(SOLAR_JAVA)"=="" || "$(OS)"=="MACOSX"
-nojava:
-    @echo "Not building odk/source/OOSupport because Java has been disabled"
-.ENDIF
-.IF "$(OS)"=="MACOSX"
-dummy:
-    @echo "Nothing to build for OS $(OS)"
-.ENDIF
-
-SLOFILES = \
-    $(SLO)$/com_sun_star_comp_beans_LocalOfficeWindow.obj \
-    $(SLO)$/com_sun_star_beans_LocalOfficeWindow.obj
-
-SHL1TARGET=$(TARGET)
-SHL1LIBS=	$(SLB)$/$(TARGET).lib
-SOLARLIB+=$(JAVALIB)
-SHL1STDLIBS=$(AWTLIB)
-SHL1NOCHECK=TRUE
-
-.IF "$(OS)" == "LINUX"
-SHL1STDLIBS+=-lstdc++
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/bean/native/win32/makefile.mk b/bean/native/win32/makefile.mk
deleted file mode 100644
index e29cffa49c00..000000000000
--- a/bean/native/win32/makefile.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-PRJ=..$/..
-
-PRJNAME=odk
-TARGET=officebean
-ENABLE_EXCEPTIONS=TRUE
-NO_DEFAULT_STL=TRUE
-NO_BSYMBOLIC=TRUE
-USE_DEFFILE=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-.IF "$(SOLAR_JAVA)" != ""
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
-    $(SLO)$/com_sun_star_comp_beans_LocalOfficeWindow.obj \
-    $(SLO)$/com_sun_star_beans_LocalOfficeWindow.obj
-
-SHL1TARGET=$(TARGET)
-SHL1LIBS=	$(SLB)$/$(TARGET).lib
-SOLARLIB+=$(JAVALIB)
-SHL1STDLIBS=$(AWTLIB) $(SALLIB)
-
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=		$(SHL1TARGET)
-DEF1EXPORTFILE=	$(TARGET).dxp
-DEF1DES=officebean
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/bean/prj/build.lst b/bean/prj/build.lst
index 91d443344555..94ee4aae60ac 100644
--- a/bean/prj/build.lst
+++ b/bean/prj/build.lst
@@ -1,10 +1,2 @@
 ob	bean	:	javaunohelper jurt ridljar unoil offapi udkapi NULL
-ob	bean\com\sun\star\comp\beans	nmake	-	all	ob_beanjava NULL
-ob	bean\com\sun\star\beans			nmake	-	all	ob_legacybeanjava ob_beanjava NULL
-ob	bean\native\win32				nmake	-	n	ob_beanwin32 NULL
-ob	bean\native\unix				nmake	-	u	ob_beanunix NULL
-ob  bean\util              			nmake   -   all	ob_util ob_beanjava ob_legacybeanjava ob_beanwin32.n ob_beanunix.u NULL
-
-# complex tests compileable but fail at runtime
-# ob      bean\qa\complex\bean                    nmake   -   all ob_qa_complex ob_util NULL
-
+ob	bean\prj	nmake	-	all	ob_prj	NULL
diff --git a/bean/prj/d.lst b/bean/prj/d.lst
index f3154b68b17c..e69de29bb2d1 100644
--- a/bean/prj/d.lst
+++ b/bean/prj/d.lst
@@ -1,5 +0,0 @@
-..\%__SRC%\class\officebean.jar %_DEST%\bin\officebean.jar
-
-..\%__SRC%\bin\officebean.dll %_DEST%\bin\officebean.dll
-..\%__SRC%\lib\libofficebean.so %_DEST%\lib\libofficebean.so
-..\%__SRC%\lib\*officebean.dylib %_DEST%\lib\*officebean.dylib
diff --git a/bean/util/makefile.mk b/bean/prj/makefile.mk
index b463b3461819..85b25665cc83 100644
--- a/bean/util/makefile.mk
+++ b/bean/prj/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # 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
@@ -25,32 +25,16 @@
 #
 #*************************************************************************
 
-PRJ     = ..
-PRJNAME = bean
-TARGET  = officebean
-
-# --- Settings -----------------------------------------------------
+PRJ=..
+TARGET=prj
 
 .INCLUDE : settings.mk
-.IF "$(L10N_framework)"==""
-JARCLASSDIRS    = \
-    com$/sun$/star$/comp$/beans \
-    com$/sun$/star$/beans
-
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS     = TRUE
-
-# Special work necessary for building java reference with javadoc.
-# The source of puplic APIs must be delivered and used later in the
-# odk module.
-ZIP1TARGET=$(TARGET)_src
-ZIP1FLAGS=-u -r
-ZIP1DIR=$(PRJ)
-ZIP1LIST=com -x "*makefile.mk"
-
-# --- Targets ------------------------------------------------------
-.ENDIF # L10N_framework
-
-.INCLUDE : target.mk
 
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
 
+all:
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/bean/qa/complex/bean/makefile.mk b/bean/qa/complex/bean/makefile.mk
deleted file mode 100644
index 9a21e52ac916..000000000000
--- a/bean/qa/complex/bean/makefile.mk
+++ /dev/null
@@ -1,134 +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.
-#
-#*************************************************************************
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../..
-PRJNAME = bean
-TARGET = qa_complex_bean
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/bean
-
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    OOoBeanTest.java
-
-# put here all other files
-JAVAFILES = $(JAVATESTFILES) \
-     ScreenComparer.java \
-     WriterFrame.java
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar officebean.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
-
-# 
-# 
-# 
-# 
-# PRJ := ..$/..
-# PRJNAME := bean
-# TARGET := test_bean
-# PACKAGE = complex
-# 
-# .INCLUDE: settings.mk
-# 
-# #----- compile .java files -----------------------------------------
-# 
-# JARFILES = officebean.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-# JAVAFILES       = OOoBeanTest.java ScreenComparer.java WriterFrame.java
-# JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-# 
-# #----- make a jar from compiled files ------------------------------
-# 
-# MAXLINELENGTH = 100000
-# 
-# JARCLASSDIRS    = $(PACKAGE)
-# JARTARGET       = $(TARGET).jar
-# JARCOMPRESS 	= TRUE
-# 
-# # --- Parameters for the test --------------------------------------
-# 
-# # test base is java complex
-# CT_TESTBASE = -TestBase java_complex
-# 
-# # test looks something like the.full.package.TestName
-# CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
-# 
-# # start the runner application
-# CT_APP      = org.openoffice.Runner
-# 
-# CT_NOOFFICE = -NoOffice
-# 
-# 
-# OFFICE_CLASSPATH_TMP:=$(foreach,i,$(JARFILES) $(office)$/program$/classes$/$(i)$(PATH_SEPERATOR))
-# 
-# OFFICE_CLASSPATH=$(OFFICE_CLASSPATH_TMP:t"")$(SOLARBINDIR)$/OOoRunner.jar$(PATH_SEPERATOR)$(CLASSDIR)
-# 
-# OOOBEAN_OPTIONS=-Dcom.sun.star.officebean.Options=-norestore -DOOoBean.Images=$(MISC)
-# 
-# 
-# .INCLUDE: target.mk
-# 
-# ALLTAR : RUNINSTRUCTIONS
-# 
-# # --- Targets ------------------------------------------------------
-# 
-# #The OOoBean uses the classpath to find the office installation.
-# #Therefore we must use the jar files from the office.
-# RUN:
-#     java -cp $(OFFICE_CLASSPATH) $(OOOBEAN_OPTIONS) $(CT_APP) $(CT_NOOFFICE) $(CT_TESTBASE) $(CT_TEST)
-# run: RUN
-# 
-# rund:
-#     java -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=8100 -cp $(OFFICE_CLASSPATH) $(OOOBEAN_OPTIONS) $(CT_APP) $(CT_NOOFFICE) $(CT_TESTBASE) $(CT_TEST)
-# 
-# 
-# 
-# RUNINSTRUCTIONS : 
-#     @echo .
-#     @echo ###########################   N O T E  ######################################
-#     @echo . 
-#     @echo "To run the test you have to provide the office location."
-#     @echo Example:
-#     @echo dmake run office="d:/myOffice"
-#     @echo .
-#   
diff --git a/bean/util/delzip b/bean/util/delzip
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/bean/util/delzip
+++ /dev/null
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 9e056a879f1b..739cd06a0a82 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po      postprocess     ::      accessibility bean BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm eventattacher DESKTOP:extensions extras filter fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent ODK:odk officecfg package psprint_config remotebridges scaddins scp2 scripting DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL
+po      postprocess     ::      accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm eventattacher DESKTOP:extensions extras filter fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent ODK:odk officecfg package psprint_config remotebridges scaddins scp2 scripting DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL
 po	postprocess			    	usr1	-	all	po_mkout NULL
 po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
 po	postprocess\checkdeliver	nmake	-	all	po_checkdlv NULL
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index fba6b097f125..6849d2d53cfb 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -939,16 +939,7 @@ STD_LIB_FILE( gid_File_Lib_Offacc, offacc)
 #ifdef SOLAR_JAVA
 #ifndef MACOSX
 
-File gid_File_Lib_Officebean
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libofficebean,UNXSUFFIX));
-  #else
-    Name = "officebean.dll";
-  #endif
-End
+STD_LIB_FILE(gid_File_Lib_Officebean, officebean)
 
 #endif
 #endif
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 962803668148..f2d40199b9e9 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : BERKELEYDB:berkeleydb BOOST:boost LIBXML2:libxml2 LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds OPENSSL:openssl REDLAND:redland TRANSLATIONS:translations avmedia basegfx basic canvas comphelper connectivity cppcanvas cppu cppuhelper filter fpicker offapi officecfg oovbaapi package qadevOOo DESKTOP:rdbmaker sal sax sfx2 soltools sot stoc svtools svx sysui test toolkit tools ucbhelper unoil unotools ure vbahelper vcl xmlhelp xmloff xmlscript solenv NULL
+tb      tail_build : BERKELEYDB:berkeleydb BOOST:boost LIBXML2:libxml2 LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds OPENSSL:openssl REDLAND:redland TRANSLATIONS:translations avmedia basegfx basic canvas comphelper connectivity cppcanvas cppu cppuhelper filter fpicker javaunohelper jurt offapi officecfg oovbaapi package qadevOOo DESKTOP:rdbmaker ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vbahelper vcl xmlhelp xmloff xmlscript NULL
 tb tail_build\prj nmake - all tb_prj   NULL