convert xmlsecurity to gbuild

20 files changed, 531 insertions, 103 deletions

diff --git a/Repository.mk b/Repository.mk
index e74335153458..13f1528b39ae 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -149,9 +149,16 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
 ))
 
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+	fileacc \
 	mcnttype \
+	neon \
+	nspr4 \
+	nss3 \
+	plc4 \
 	test \
-    fileacc \
+	xmlsecurity \
+	xsec_fw \
+	xsec_xmlsec \
 ))
 
 ifeq ($(OS),WNT)
@@ -226,6 +233,9 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
     toolshelpers \
 	vclmain \
 	writerperfect \
+	xmlsec1 \
+	xmlsec1-nss \
+	xmlsec1-mscrypto \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index b2ec7cf033e4..bf6d4d085f96 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -114,6 +114,8 @@ gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(
 gb_Library_FILENAMES := $(patsubst crypto:icrypto%,crypto:libeay32%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst ssl:issl%,ssl:ssleay32%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst xmlsec1:ixmlsec1%,xmlsec1:libxmlsec%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst xmlsec1-mscrypto:ixmlsec1%,xmlsec1-mscrypto:libxmlsec%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf%,$(gb_Library_FILENAMES))
 gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 04aaa6b44f15..ebb508d48300 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -280,10 +280,14 @@ my_components += ldapbe2
 
 .IF "$(WITH_MOZILLA)" != "NO"
 my_components += \
-    xmlsecurity \
-    xsec_fw \
-    xsec_xmlsec \
+    component/xmlsecurity/util/xmlsecurity \
+    component/xmlsecurity/util/xsec_fw \
     pl
+.IF "$(OS)" == "WNT"
+my_components += component/xmlsecurity/util/xsec_xmlsec.windows
+.ELSE
+my_components += component/xmlsecurity/util/xsec_xmlsec
+.END
 .END
 
 .IF "$(OS)" == "MACOSX"
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 44e2fc13ee9a..7442b45264e7 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -399,6 +399,7 @@ gb_Library_win32_OLDNAMES := oldnames
 
 gb_Library_PLAINLIBS_NONE += \
 	advapi32 \
+	crypt32 \
 	d3d9 \
 	d3dx \
 	ddraw \
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index c4e3a1143f77..f58cf880360e 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -466,6 +466,7 @@ gb_Library_PLAINLIBS_NONE += \
 	$(gb_MINGW_LIBSTDCPP) \
 	$(gb_MINGW_LIBGCC) \
 	advapi32 \
+	crypt32 \
 	d3d9 \
 	d3dx \
 	ddraw \
diff --git a/xmlsecurity/AllLangResTarget.mk b/xmlsecurity/AllLangResTarget.mk
new file mode 100644
index 000000000000..499d38c271d2
--- /dev/null
+++ b/xmlsecurity/AllLangResTarget.mk
@@ -0,0 +1,45 @@
+# -*- Mode: makefile; 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.
+#
+# The Initial Developer of the Original Code is
+#       Matúš Kukan <matus.kukan@gmail.com>
+# 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_AllLangResTarget_AllLangResTarget,xmlsec))
+
+$(eval $(call gb_AllLangResTarget_add_srs,xmlsec,\
+	xmlsec/res
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,xmlsec/res))
+
+$(eval $(call gb_SrsTarget_add_files,xmlsec/res,\
+	xmlsecurity/source/dialogs/certificateviewer.src \
+	xmlsecurity/source/dialogs/macrosecurity.src \
+	xmlsecurity/source/dialogs/certificatechooser.src \
+	xmlsecurity/source/dialogs/digitalsignaturesdialog.src \
+	xmlsecurity/source/component/warnbox.src \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xmlsecurity/CppunitTest_qa_certext.mk b/xmlsecurity/CppunitTest_qa_certext.mk
new file mode 100644
index 000000000000..29aba404032d
--- /dev/null
+++ b/xmlsecurity/CppunitTest_qa_certext.mk
@@ -0,0 +1,55 @@
+# -*- Mode: makefile; 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.
+#
+# The Initial Developer of the Original Code is
+#       Matúš Kukan <matus.kukan@gmail.com>
+# 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_CppunitTest_CppunitTest,xmlsecurity_qa_certext))
+
+$(eval $(call gb_CppunitTest_set_include,xmlsecurity_qa_certext,\
+	$$(INCLUDE) \
+	-I$(realpath $(SRCDIR)/xmlsecurity/inc/pch) \
+))
+
+$(eval $(call gb_CppunitTest_add_api,xmlsecurity_qa_certext,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,xmlsecurity_qa_certext,\
+	cppu \
+	neon \
+	sal \
+	svl \
+	test \
+	tl \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,xmlsecurity_qa_certext,\
+	xmlsecurity/qa/certext/SanCertExt \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xmlsecurity/Library_xmlsecurity.mk b/xmlsecurity/Library_xmlsecurity.mk
new file mode 100644
index 000000000000..e40709f17a70
--- /dev/null
+++ b/xmlsecurity/Library_xmlsecurity.mk
@@ -0,0 +1,80 @@
+# -*- Mode: makefile; 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.
+#
+# The Initial Developer of the Original Code is
+#       Matúš Kukan <matus.kukan@gmail.com>
+# 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,xmlsecurity))
+
+$(eval $(call gb_Library_add_precompiled_header,xmlsecurity,$(SRCDIR)/xmlsecurity/inc/pch/precompiled_xmlsecurity))
+
+$(eval $(call gb_Library_set_componentfile,xmlsecurity,xmlsecurity/util/xmlsecurity))
+
+$(eval $(call gb_Library_set_include,xmlsecurity,\
+	$$(INCLUDE) \
+	-I$(realpath $(SRCDIR)/xmlsecurity/inc) \
+	-I$(realpath $(SRCDIR)/xmlsecurity/inc/pch) \
+))
+
+$(eval $(call gb_Library_add_api,xmlsecurity,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,xmlsecurity,\
+	comphelper \
+	cppu \
+	cppuhelper \
+	sal \
+	svl \
+	svt \
+	svxcore \
+	tl \
+	ucbhelper \
+	utl \
+	vcl \
+	xo \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,xmlsecurity,\
+	xmlsecurity/source/component/certificatecontainer \
+	xmlsecurity/source/component/documentdigitalsignatures \
+	xmlsecurity/source/component/registerservices \
+	xmlsecurity/source/dialogs/certificatechooser \
+	xmlsecurity/source/dialogs/certificateviewer \
+	xmlsecurity/source/dialogs/digitalsignaturesdialog \
+	xmlsecurity/source/dialogs/macrosecurity \
+	xmlsecurity/source/dialogs/resourcemanager \
+	xmlsecurity/source/helper/documentsignaturehelper \
+	xmlsecurity/source/helper/xmlsignaturehelper2 \
+	xmlsecurity/source/helper/xmlsignaturehelper \
+	xmlsecurity/source/helper/xsecctl \
+	xmlsecurity/source/helper/xsecparser \
+	xmlsecurity/source/helper/xsecsign \
+	xmlsecurity/source/helper/xsecverify \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xmlsecurity/Library_xsec_fw.mk b/xmlsecurity/Library_xsec_fw.mk
new file mode 100644
index 000000000000..78e23c4e5f29
--- /dev/null
+++ b/xmlsecurity/Library_xsec_fw.mk
@@ -0,0 +1,70 @@
+# -*- Mode: makefile; 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.
+#
+# The Initial Developer of the Original Code is
+#       Matúš Kukan <matus.kukan@gmail.com>
+# 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,xsec_fw))
+
+$(eval $(call gb_Library_add_precompiled_header,xsec_fw,$(SRCDIR)/xmlsecurity/inc/pch/precompiled_xmlsecurity))
+
+$(eval $(call gb_Library_set_componentfile,xsec_fw,xmlsecurity/util/xsec_fw))
+
+$(eval $(call gb_Library_set_include,xsec_fw,\
+	$$(INCLUDE) \
+	-I$(realpath $(SRCDIR)/xmlsecurity/inc) \
+	-I$(realpath $(SRCDIR)/xmlsecurity/inc/pch) \
+))
+
+$(eval $(call gb_Library_add_api,xsec_fw,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,xsec_fw,\
+	cppu \
+	cppuhelper \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,xsec_fw,\
+	xmlsecurity/source/framework/buffernode \
+	xmlsecurity/source/framework/decryptorimpl \
+	xmlsecurity/source/framework/elementcollector \
+	xmlsecurity/source/framework/elementmark \
+	xmlsecurity/source/framework/encryptionengine \
+	xmlsecurity/source/framework/encryptorimpl \
+	xmlsecurity/source/framework/saxeventkeeperimpl \
+	xmlsecurity/source/framework/securityengine \
+	xmlsecurity/source/framework/signaturecreatorimpl \
+	xmlsecurity/source/framework/signatureengine \
+	xmlsecurity/source/framework/signatureverifierimpl \
+	xmlsecurity/source/framework/xmlencryptiontemplateimpl \
+	xmlsecurity/source/framework/xmlsignaturetemplateimpl \
+	xmlsecurity/source/framework/xsec_framework \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk
new file mode 100644
index 000000000000..770122ec2586
--- /dev/null
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
@@ -0,0 +1,183 @@
+# -*- Mode: makefile; 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.
+#
+# The Initial Developer of the Original Code is
+#       Matúš Kukan <matus.kukan@gmail.com>
+# 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,xsec_xmlsec))
+
+$(eval $(call gb_Library_add_precompiled_header,xsec_xmlsec,$(SRCDIR)/xmlsecurity/inc/pch/precompiled_xmlsecurity))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_set_componentfile,xsec_xmlsec,xmlsecurity/util/xsec_xmlsec.windows))
+else
+$(eval $(call gb_Library_set_componentfile,xsec_xmlsec,xmlsecurity/util/xsec_xmlsec))
+endif
+
+$(eval $(call gb_Library_set_include,xsec_xmlsec,\
+	$$(INCLUDE) \
+	-I$(realpath $(SRCDIR)/xmlsecurity/inc) \
+	-I$(realpath $(SRCDIR)/xmlsecurity/inc/pch) \
+	-I$(realpath $(SRCDIR)/xmlsecurity/source/xmlsec) \
+))
+
+$(eval $(call gb_Library_add_api,xsec_xmlsec,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_add_defs,xsec_xmlsec,\
+	-DXMLSEC_NO_XSLT \
+))
+
+$(eval $(call gb_Library_add_linked_static_libs,xsec_xmlsec,\
+	xmlsec1 \
+))
+
+$(eval $(call gb_Library_add_linked_libs,xsec_xmlsec,\
+	comphelper \
+	cppu \
+	cppuhelper \
+	sal \
+	svl \
+	tl \
+	xo \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_use_externals,xsec_xmlsec,\
+	libxml2 \
+))
+
+$(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\
+	xmlsecurity/source/xmlsec/biginteger \
+	xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl \
+	xmlsecurity/source/xmlsec/certvalidity \
+	xmlsecurity/source/xmlsec/diagnose \
+	xmlsecurity/source/xmlsec/errorcallback \
+	xmlsecurity/source/xmlsec/saxhelper \
+	xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl \
+	xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl \
+	xmlsecurity/source/xmlsec/xmlstreamio \
+	xmlsecurity/source/xmlsec/xsec_xmlsec \
+	xmlsecurity/source/xmlsec/nss/ciphercontext \
+	xmlsecurity/source/xmlsec/nss/digestcontext \
+	xmlsecurity/source/xmlsec/nss/nssinitializer \
+	xmlsecurity/source/xmlsec/nss/xsec_nss \
+))
+
+ifeq ($(GUI),WNT)
+
+$(eval $(call gb_Library_add_defs,xsec_xmlsec,\
+	-DXMLSEC_CRYPTO_MSCRYPTO \
+))
+
+$(eval $(call gb_Library_add_linked_static_libs,xsec_xmlsec,\
+	xmlsec1-mscrypto \
+))
+
+$(eval $(call gb_Library_add_linked_libs,xsec_xmlsec,\
+	crypt \
+	advapi32 \
+))
+
+$(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\
+	xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl \
+	xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl \
+	xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl \
+	xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl \
+	xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl \
+	xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl \
+	xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl \
+	xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt \
+))
+
+else
+
+$(eval $(call gb_Library_add_defs,xsec_xmlsec,\
+	-DXMLSEC_CRYPTO_NSS \
+))
+
+$(eval $(call gb_Library_add_linked_static_libs,xsec_xmlsec,\
+	xmlsec1-nss \
+))
+
+$(eval $(call gb_Library_add_linked_libs,xsec_xmlsec,\
+	plc4 \
+))
+
+$(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\
+	xmlsecurity/source/xmlsec/nss/sanextension_nssimpl \
+	xmlsecurity/source/xmlsec/nss/secerror \
+	xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl \
+	xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl \
+	xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl \
+	xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl \
+	xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl \
+	xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl \
+))
+
+endif # ifeq ($(GUI),WNT)
+
+ifeq ($(SYSTEM_MOZILLA),YES)
+
+$(eval $(call gb_Library_set_include,xsec_xmlsec,\
+	$$(INCLUDE) \
+	$(MOZ_NSPR_CFLAGS) \
+	$(MOZ_NSS_CFLAGS) \
+))
+
+$(eval $(call gb_Library_add_defs,xsec_xmlsec,\
+	-DSYSTEM_MOZILLA \
+))
+
+$(eval $(call gb_Library_add_libs,xsec_xmlsec,\
+	$(NSPR_LIB) \
+	$(NSS_LIB) \
+	$(MOZ_NSS_LIBS) \
+))
+
+else
+
+$(eval $(call gb_Library_set_include,xsec_xmlsec,\
+	$$(INCLUDE) \
+	-I$(realpath $(OUTDIR)/inc/mozilla/nspr) \
+	-I$(realpath $(OUTDIR)/inc/mozilla/nss) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,xsec_xmlsec,\
+	nspr4 \
+	nss3 \
+))
+
+endif # ifeq ($(SYSTEM_MOZILLA),YES)
+
+ifeq ($(OS),SOLARIS)
+$(eval $(call gb_Library_add_linked_libs,xsec_xmlsec,\
+	dl \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/xmlsecurity/qa/certext/makefile.mk b/xmlsecurity/Makefile
index 8cf90b4b4750..a1b344d72564 100644
--- a/xmlsecurity/qa/certext/makefile.mk
+++ b/xmlsecurity/Makefile
@@ -1,8 +1,9 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #*************************************************************************
 #
 # 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
 #
@@ -23,49 +24,16 @@
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
-#***********************************************************************/
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE 
-
-PRJ = ../..
-PRJNAME = xmlsecurity
-TARGET = qa_certext
-
-ENABLE_EXCEPTIONS = TRUE
-
-.INCLUDE: settings.mk
-.INCLUDE :	$(PRJ)$/util$/target.pmk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-SHL1IMPLIB = i$(SHL1TARGET)
-SHL1OBJS = $(SLOFILES)
-SHL1RPATH = NONE
-SHL1STDLIBS = $(CPPUNITLIB)     \
-              $(SALLIB)         \
-              $(NEON3RDLIB)     \
-              $(CPPULIB)        \
-              $(XMLOFFLIB)      \
-              $(CPPUHELPERLIB)	\
-              $(SVLLIB)			\
-              $(TOOLSLIB)	    \
-              $(COMPHELPERLIB) \
-              $(TESTLIB)
-
-SHL1TARGET = qa_CertExt
-SHL1VERSIONMAP = $(PRJ)/qa/certext/export.map
-DEF1NAME = $(SHL1TARGET)
-
-SLOFILES = $(SLO)/SanCertExt.obj
-
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
+#*************************************************************************
 
-ALLTAR : cpptest
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
 
-cpptest : $(SHL1TARGETN)
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
 
-CPPTEST_LIBRARY = $(SHL1TARGETN)
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
 
-.END
\ No newline at end of file
+# vim: set noet sw=4 ts=4:
diff --git a/xmlsecurity/Module_xmlsecurity.mk b/xmlsecurity/Module_xmlsecurity.mk
new file mode 100644
index 000000000000..87b7848987af
--- /dev/null
+++ b/xmlsecurity/Module_xmlsecurity.mk
@@ -0,0 +1,51 @@
+# -*- Mode: makefile; 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.
+#
+# The Initial Developer of the Original Code is
+#       Matúš Kukan <matus.kukan@gmail.com>
+# 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,xmlsecurity))
+
+ifeq ($(WITH_MOZILLA),YES)
+
+$(eval $(call gb_Module_add_targets,xmlsecurity,\
+	Library_xmlsecurity \
+	Library_xsec_fw \
+))
+
+ifeq ($(or $(ENABLE_NSS_MODULE),$(SYSTEM_MOZILLA)),YES)
+$(eval $(call gb_Module_add_targets,xmlsecurity,\
+	Library_xsec_xmlsec \
+))
+endif
+
+# failing
+#$(eval $(call gb_Module_add_check_targets,xmlsecurity,\
+	CppunitTest_qa_certext \
+))
+
+endif # ifeq ($(WITH_MOZILLA),YES)
+
+# vim: set noet sw=4 ts=4:
diff --git a/xmlsecurity/prj/build.lst b/xmlsecurity/prj/build.lst
index 422f4a43b65d..e2776dfb4b59 100644
--- a/xmlsecurity/prj/build.lst
+++ b/xmlsecurity/prj/build.lst
@@ -1,12 +1,2 @@
 xs	xmlsecurity	:    TRANSLATIONS:translations xmloff unotools offapi unoil svx MOZ:moz LIBXMLSEC:libxmlsec NSS:nss LIBXSLT:libxslt NEON:neon NULL
-xs	xmlsecurity                                                        usr1	 -	all	xs_mkout	NULL
-xs	xmlsecurity\inc				                                       nmake -	all	xs_inc NULL
-xs	xmlsecurity\source\framework                                       nmake -	all	xs_fw xs_inc NULL
-xs	xmlsecurity\source\xmlsec\nss                                      nmake -	all	xs_nss xs_inc NULL
-xs	xmlsecurity\source\xmlsec\mscrypt                                  nmake -	all	xs_mscrypt xs_inc NULL
-xs	xmlsecurity\source\xmlsec                                          nmake -	all	xs_xmlsec xs_nss xs_mscrypt xs_inc NULL
-xs	xmlsecurity\source\helper                                          nmake -	all	xs_helper xs_inc NULL
-xs	xmlsecurity\source\dialogs                                         nmake -	all	xs_dialogs xs_inc NULL
-xs	xmlsecurity\source\component                                       nmake -	all	xs_component xs_inc NULL
-xs	xmlsecurity\util                                                   nmake -	all	xs_util xs_fw xs_xmlsec xs_nss xs_mscrypt xs_helper xs_dialogs xs_component NULL
-xs	xmlsecurity\qa\certext                                             nmake -	all	xs_certext xs_util NULL
+xs	xmlsecurity\prj				                                       nmake -	all	xs_prj NULL
diff --git a/xmlsecurity/prj/d.lst b/xmlsecurity/prj/d.lst
index 69da448e7281..e69de29bb2d1 100644
--- a/xmlsecurity/prj/d.lst
+++ b/xmlsecurity/prj/d.lst
@@ -1,13 +0,0 @@
-mkdir: %COMMON_DEST%\bin\hid
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin\hid\*.hid
-..\%__SRC%\bin\xsec_fw.dll %_DEST%\bin\xsec_fw.dll
-..\%__SRC%\bin\xsec_xmlsec.dll %_DEST%\bin\xsec_xmlsec.dll
-..\%__SRC%\bin\xmlsecurity.dll %_DEST%\bin\xmlsecurity.dll
-..\%__SRC%\lib\libxsec_fw.so %_DEST%\lib\libxsec_fw.so
-..\%__SRC%\lib\libxsec_xmlsec.so %_DEST%\lib\libxsec_xmlsec.so
-..\%__SRC%\lib\libxmlsecurity.so %_DEST%\lib\libxmlsecurity.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib\*
-..\%__SRC%\bin\xmlsec*.res %_DEST%\bin\xmlsec*.res
-..\%__SRC%\misc\xmlsecurity.component %_DEST%\xml\xmlsecurity.component
-..\%__SRC%\misc\xsec_fw.component %_DEST%\xml\xsec_fw.component
-..\%__SRC%\misc\xsec_xmlsec.component %_DEST%\xml\xsec_xmlsec.component
diff --git a/xmlsecurity/qa/certext/export.map b/xmlsecurity/prj/makefile.mk
index 3308588ef6f8..d30ff8a47e6b 100644
--- a/xmlsecurity/qa/certext/export.map
+++ b/xmlsecurity/prj/makefile.mk
@@ -25,10 +25,16 @@
 #
 #*************************************************************************
 
-UDK_3_0_0 {
-    global:
-        cppunitTestPlugIn;
+PRJ=..
+TARGET=prj
 
-    local:
-        *;
-};
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/xmlsecurity/qa/certext/SanCertExt.cxx b/xmlsecurity/qa/certext/SanCertExt.cxx
index 11d3fa62d5a5..ef4d0a72809a 100644
--- a/xmlsecurity/qa/certext/SanCertExt.cxx
+++ b/xmlsecurity/qa/certext/SanCertExt.cxx
@@ -41,10 +41,7 @@
 #include "com/sun/star/uno/Reference.hxx"
 
 #include "cppuhelper/bootstrap.hxx"
-#include "cppunit/TestAssert.h"
-#include "cppunit/TestFixture.h"
-#include "cppunit/extensions/HelperMacros.h"
-#include "cppunit/plugin/TestPlugIn.h"
+#include <sal/cppunit.h>
 #include "sal/types.h"
 #include "comphelper/sequence.hxx"
 #include <rtl/ustring.hxx>
diff --git a/xmlsecurity/util/exports_xsmscrypt.dxp b/xmlsecurity/util/exports_xsmscrypt.dxp
deleted file mode 100644
index 70033078921a..000000000000
--- a/xmlsecurity/util/exports_xsmscrypt.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/xmlsecurity/util/exports_xsnss.dxp b/xmlsecurity/util/exports_xsnss.dxp
deleted file mode 100644
index 70033078921a..000000000000
--- a/xmlsecurity/util/exports_xsnss.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/xmlsecurity/util/xsec_fw.dxp b/xmlsecurity/util/xsec_fw.dxp
deleted file mode 100644
index 70033078921a..000000000000
--- a/xmlsecurity/util/xsec_fw.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/xmlsecurity/util/xsecctl.flt b/xmlsecurity/util/xsecctl.flt
deleted file mode 100644
index 3e2aa3dba0b7..000000000000
--- a/xmlsecurity/util/xsecctl.flt
+++ /dev/null
@@ -1,19 +0,0 @@
-_CT?
-??_5
-??_7
-??_8
-??_9
-??_C
-??_E
-??_F
-??_G
-??_H
-??_I
-__CT
-_CTA
-sXML_
-lcl 
-_Impl
-WEP
-LIBMAIN
-LibMain