pgsql-sdbc: licence all non-Sun & future contributions under LGPLv3+/MPL1.1

70 files changed, 3177 insertions, 1133 deletions

diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk
index 8b026892be1b..f0f184e27324 100644
--- a/connectivity/source/drivers/postgresql/makefile.mk
+++ b/connectivity/source/drivers/postgresql/makefile.mk
@@ -1,29 +1,57 @@
-#*************************************************************************
+##########################################################################
 #
-#   This library is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU Lesser General Public
-#   License version 2.1, as published by the Free Software Foundation.
+#  Effective License of whole file:
 #
-#   This library 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 for more details.
+#    This library is free software; you can redistribute it and/or
+#    modify it under the terms of the GNU Lesser General Public
+#    License version 2.1, as published by the Free Software Foundation.
 #
-#   You should have received a copy of the GNU Lesser General Public
-#   License along with this library; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-#   MA  02111-1307  USA
+#    This library 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 for more details.
 #
-#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+#    You should have received a copy of the GNU Lesser General Public
+#    License along with this library; if not, write to the Free Software
+#    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#    MA  02111-1307  USA
 #
-#   Copyright: 2000 by Sun Microsystems, Inc.
-#              2011 by Lionel Elie Mamane <lionel@mamane.lu>
+#  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
 #
-#   All Rights Reserved.
+#    The Contents of this file are made available subject to the terms of
+#    the GNU Lesser General Public License Version 2.1
 #
-#   Contributor(s): _______________________________________
+#    Copyright: 2000 by Sun Microsystems, Inc.
 #
-#*************************************************************************
+#  All parts contributed on or after August 2011:
+#
+#    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+#
+#    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+#
+#    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 2.1 or later (the "LGPLv2.1+"),
+#    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+#    instead of those above.
+#
+##########################################################################
+
 PRJ=..$/..$/..
 
 PRJNAME=postgresql
diff --git a/connectivity/source/drivers/postgresql/postgresql.xcu b/connectivity/source/drivers/postgresql/postgresql.xcu
index 4d455d5863a2..d9bcc7c17614 100644
--- a/connectivity/source/drivers/postgresql/postgresql.xcu
+++ b/connectivity/source/drivers/postgresql/postgresql.xcu
@@ -1,29 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************************
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *  Effective License of whole file:
  *
- * Copyright 2008 by Sun Microsystems, Inc.
- * Copyright 2011 by Lionel Elie Mamane <lionel@mamane.lu>
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 3, as published by the Free Software Foundation.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ *    This library 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 for more details.
  *
- * This file is part of OpenOffice.org.
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- * 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.
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- * 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).
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 3
  *
- * 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.
+ *    Copyright: 2008 by Sun Microsystems, Inc.
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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.
  *
  ************************************************************************ -->
 <oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
diff --git a/connectivity/source/drivers/postgresql/pq_allocator.hxx b/connectivity/source/drivers/postgresql/pq_allocator.hxx
index ffa2e02b4431..fad9b035c5a7 100644
--- a/connectivity/source/drivers/postgresql/pq_allocator.hxx
+++ b/connectivity/source/drivers/postgresql/pq_allocator.hxx
@@ -1,28 +1,55 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *  Copyright: 2002 by Sun Microsystems, Inc.
- *             2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *  All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *  Contributor(s): _______________________________________
+ *    Copyright: 2002 by Sun Microsystems, Inc.
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_array.cxx b/connectivity/source/drivers/postgresql/pq_array.cxx
index 9a88b62e5501..dcccd801f0d7 100644
--- a/connectivity/source/drivers/postgresql/pq_array.cxx
+++ b/connectivity/source/drivers/postgresql/pq_array.cxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *             2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *  All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *  Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_array.hxx b/connectivity/source/drivers/postgresql/pq_array.hxx
index e211b3184e9f..d19969afdbef 100644
--- a/connectivity/source/drivers/postgresql/pq_array.hxx
+++ b/connectivity/source/drivers/postgresql/pq_array.hxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
index f7a1eda40272..5c5bee561ff8 100644
--- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.hxx b/connectivity/source/drivers/postgresql/pq_baseresultset.hxx
index 8ccba31056d6..928b5be3a77d 100644
--- a/connectivity/source/drivers/postgresql/pq_baseresultset.hxx
+++ b/connectivity/source/drivers/postgresql/pq_baseresultset.hxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_common.hxx b/connectivity/source/drivers/postgresql/pq_common.hxx
index c712f2c9f05a..68a973a41a22 100644
--- a/connectivity/source/drivers/postgresql/pq_common.hxx
+++ b/connectivity/source/drivers/postgresql/pq_common.hxx
@@ -1,29 +1,30 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
  *
- * Copyright 2011 Lionel Elie Mamane <lionel@mamane.lu>
+ * 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/
  *
- * LibreOffice - a multi-platform office productivity suite
+ * 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.
  *
- * This file is part of LibreOffice.
+ * Major Contributor(s):
+ * [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> (initial developer) ]
  *
- * LibreOffice 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.
+ * All Rights Reserved.
  *
- * LibreOffice 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).
+ * For minor contributions see the git repository.
  *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with LibreOffice.  If not, see
- * <http://www.gnu.org/licenses/lgpl-3.0.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
+ * 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 _PQ_COMMON_
 #define _PQ_COMMON_
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 5b7c8ecfb21b..b4171d868047 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_connection.hxx b/connectivity/source/drivers/postgresql/pq_connection.hxx
index 21d18310fda7..2a34025668ac 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.hxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.hxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index 53d23cabb7d4..91eb3df346f5 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -1,59 +1,87 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
  *
+ *    Contributor(s): Joerg Budischewski
  *
- * Portions adapted from JDBC PostgreSQL driver:
+ *  All parts contributed on or after August 2011:
  *
- *  Copyright (c) 2004-2008, PostgreSQL Global Development Group
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
  *
- * Licence of original JDBC driver code:
+ *    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/
  *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
+ *    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.
  *
- *  1. Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *  2. Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *  3. Neither the name of the PostgreSQL Global Development Group nor the names
- *     of its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
+ *    Major Contributor(s):
+ *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
  *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- *  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- *  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- *  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- *  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- *  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- *  POSSIBILITY OF SUCH DAMAGE.
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
+ *
+ *   Some portions were adapted from JDBC PostgreSQL driver:
+ *
+ *    Copyright (c) 2004-2008, PostgreSQL Global Development Group
+ *
+ *   Licence of original JDBC driver code:
+ *
+ *    Redistribution and use in source and binary forms, with or without
+ *    modification, are permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ *    2. Redistributions in binary form must reproduce the above copyright notice,
+ *       this list of conditions and the following disclaimer in the documentation
+ *       and/or other materials provided with the distribution.
+ *    3. Neither the name of the PostgreSQL Global Development Group nor the names
+ *       of its contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
+ *
+ *    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ *    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ *    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ *    ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ *    LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ *    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ *    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *    POSSIBILITY OF SUCH DAMAGE.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx
index 37f363e34e3b..7c849482415d 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx
index 7aff3e310a6f..42612838d0bb 100644
--- a/connectivity/source/drivers/postgresql/pq_driver.cxx
+++ b/connectivity/source/drivers/postgresql/pq_driver.cxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_driver.hxx b/connectivity/source/drivers/postgresql/pq_driver.hxx
index 99ef233f37f1..0657867eb44c 100644
--- a/connectivity/source/drivers/postgresql/pq_driver.hxx
+++ b/connectivity/source/drivers/postgresql/pq_driver.hxx
@@ -1,30 +1,60 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
+
 #ifndef _PG_DRIVER_HXX_
 #define _PG_DRIVER_HXX_
 
diff --git a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx
index 3594cd97a69b..7dd781141787 100644
--- a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx
@@ -1,27 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx
index 0e0fe647d771..c5c37b67d632 100644
--- a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx
+++ b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx
@@ -1,29 +1,60 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
+
 #ifndef PG_UPDATEABLERESULTSET_HXX_
 #define PG_UPDATEABLERESULTSET_HXX_
 
diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
index bb0f685cad4b..118ca5e13ca0 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx
index 96c6b07845b3..d44bc753f8ad 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_resultset.cxx b/connectivity/source/drivers/postgresql/pq_resultset.cxx
index 5f0ca94a3e5a..3fbc6d47337d 100644
--- a/connectivity/source/drivers/postgresql/pq_resultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_resultset.cxx
@@ -1,30 +1,60 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *             2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *  All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *  Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
+
 #include "pq_resultset.hxx"
 #include "pq_resultsetmetadata.hxx"
 
diff --git a/connectivity/source/drivers/postgresql/pq_resultset.hxx b/connectivity/source/drivers/postgresql/pq_resultset.hxx
index aa49d903655d..f9df7d9fdec5 100644
--- a/connectivity/source/drivers/postgresql/pq_resultset.hxx
+++ b/connectivity/source/drivers/postgresql/pq_resultset.hxx
@@ -1,30 +1,60 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *             2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *  All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *  Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
+
 #ifndef _PG_RESULTSET_HXX_
 #define _PG_RESULTSET_HXX_
 
diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
index 75b1640914eb..2a83623d9890 100644
--- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
@@ -1,30 +1,60 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
+
 #include <rtl/ustrbuf.hxx>
 
 #include "pq_resultsetmetadata.hxx"
diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx
index 236608775dc5..2282d1a3073c 100644
--- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx
+++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx
@@ -1,30 +1,60 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
+
 #ifndef _PQ_RESULTSETMETADATA_HXX_
 #define _PQ_RESULTSETMETADATA_HXX_
 #include <vector>
diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx b/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx
index 720dfd9ba1b4..7f778258f4a7 100644
--- a/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx
@@ -1,31 +1,61 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 by Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
+
 #include "pq_sequenceresultset.hxx"
 #include "pq_sequenceresultsetmetadata.hxx"
 
diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx b/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx
index bbec8131f4c1..f906aac585c9 100644
--- a/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx
+++ b/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx
@@ -1,30 +1,60 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
+
 #ifndef _PG_SEQUENCERESULTSET_HXX_
 #define _PG_SEQUENCERESULTSET_HXX_
 
diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx
index ff53cccae903..b8d5e4aabd70 100644
--- a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx
@@ -1,22 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
- *
- *  This library 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 for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
- *
- *  Copyright: 200? by Sun Microsystems, Inc.
- *             2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Effective License of whole file:
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library 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 for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
+ *
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
+ *
+ *    Copyright: 200? by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx
index 1e6839aa3936..53d18d0a5d36 100644
--- a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx
+++ b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx
@@ -1,22 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
- *
- *  This library 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 for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
- *
- *  Copyright: 200? by Sun Microsystems, Inc.
- *             2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Effective License of whole file:
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library 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 for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
+ *
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
+ *
+ *    Copyright: 200? by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx
index 5201a4e4b56b..b7f7401410c9 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.cxx
@@ -1,30 +1,60 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
+
 #include "pq_statement.hxx"
 #include "pq_fakedupdateableresultset.hxx"
 #include "pq_updateableresultset.hxx"
diff --git a/connectivity/source/drivers/postgresql/pq_statement.hxx b/connectivity/source/drivers/postgresql/pq_statement.hxx
index 2727403d3347..473c4e73750a 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.hxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.hxx
@@ -1,30 +1,60 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
+
 #ifndef _PQ_STATEMENT_HXX_
 #define _PQ_STATEMENT_HXX_
 #include <cppuhelper/propshlp.hxx>
diff --git a/connectivity/source/drivers/postgresql/pq_statics.cxx b/connectivity/source/drivers/postgresql/pq_statics.cxx
index 98be813964fa..81ff74f0e124 100644
--- a/connectivity/source/drivers/postgresql/pq_statics.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statics.cxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_statics.hxx b/connectivity/source/drivers/postgresql/pq_statics.hxx
index d9f052b7a851..9404c27a19eb 100644
--- a/connectivity/source/drivers/postgresql/pq_statics.hxx
+++ b/connectivity/source/drivers/postgresql/pq_statics.hxx
@@ -1,30 +1,60 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
+
 #ifndef _PQ_STATICS_HXX_
 #define _PQ_STATICS_HXX_
 
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx
index 09ad66b847bc..ac9c66f45a11 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_tools.hxx b/connectivity/source/drivers/postgresql/pq_tools.hxx
index 109db3cf9e5d..a5b7128c45c0 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.hxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.hxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
index 4dddd3d13a5f..0da4805b27cb 100644
--- a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
@@ -1,22 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  Copyright: 200? by Sun Microsystems, Inc.
- *             2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
+ *
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
+ *
+ *    Copyright: 200? by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx
index bf5a0241623b..d9460f6868f7 100644
--- a/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx
+++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx
@@ -1,22 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
- *
- *  This library 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 for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
- *
- *  Copyright: 200? by Sun Microsystems, Inc.
- *             2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Effective License of whole file:
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library 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 for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
+ *
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
+ *
+ *    Copyright: 200? by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xbase.cxx b/connectivity/source/drivers/postgresql/pq_xbase.cxx
index f263278d3515..fad286c4f3eb 100644
--- a/connectivity/source/drivers/postgresql/pq_xbase.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xbase.cxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xbase.hxx b/connectivity/source/drivers/postgresql/pq_xbase.hxx
index bd70c4271fb2..47f900934511 100644
--- a/connectivity/source/drivers/postgresql/pq_xbase.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xbase.hxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xcolumn.cxx b/connectivity/source/drivers/postgresql/pq_xcolumn.cxx
index acf48b1877ee..f16e9252fb00 100644
--- a/connectivity/source/drivers/postgresql/pq_xcolumn.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcolumn.cxx
@@ -1,27 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xcolumn.hxx b/connectivity/source/drivers/postgresql/pq_xcolumn.hxx
index 51a3310aedb0..213759cdf2b5 100644
--- a/connectivity/source/drivers/postgresql/pq_xcolumn.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xcolumn.hxx
@@ -1,27 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
index 3ae5cc995b8e..1e1bfd315165 100644
--- a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 by Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.hxx b/connectivity/source/drivers/postgresql/pq_xcolumns.hxx
index a75e95f05ee5..5bd26c819afe 100644
--- a/connectivity/source/drivers/postgresql/pq_xcolumns.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xcolumns.hxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 by Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
index 1dfcd2e950f5..a1dc2109bf79 100644
--- a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 by Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx
index e59e70120695..c99a8e55ee4b 100644
--- a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xindex.cxx b/connectivity/source/drivers/postgresql/pq_xindex.cxx
index 06b6079616eb..5c529e4e2683 100644
--- a/connectivity/source/drivers/postgresql/pq_xindex.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xindex.cxx
@@ -1,27 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xindex.hxx b/connectivity/source/drivers/postgresql/pq_xindex.hxx
index 150c7744c27b..99de00860295 100644
--- a/connectivity/source/drivers/postgresql/pq_xindex.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xindex.hxx
@@ -1,27 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx b/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx
index c5c75b7864f6..b51a795c9e65 100644
--- a/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx
@@ -1,27 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx b/connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx
index 0c8e6a3c8749..95ed9c6bc2a0 100644
--- a/connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx
@@ -1,27 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx
index 7db8a35d2dd6..1f2fe2a5b5ca 100644
--- a/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx b/connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx
index 3e6050077c1f..7c2c92803d3c 100644
--- a/connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xindexes.cxx b/connectivity/source/drivers/postgresql/pq_xindexes.cxx
index 7dedfb8eeb66..8036a8112b10 100644
--- a/connectivity/source/drivers/postgresql/pq_xindexes.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xindexes.cxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xindexes.hxx b/connectivity/source/drivers/postgresql/pq_xindexes.hxx
index 2d005905668d..fc30c760ce75 100644
--- a/connectivity/source/drivers/postgresql/pq_xindexes.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xindexes.hxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xkey.cxx b/connectivity/source/drivers/postgresql/pq_xkey.cxx
index ef0cfcb86d8f..db9f2406f275 100644
--- a/connectivity/source/drivers/postgresql/pq_xkey.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xkey.cxx
@@ -1,27 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xkey.hxx b/connectivity/source/drivers/postgresql/pq_xkey.hxx
index 4d3e2c18281b..57d754b56c39 100644
--- a/connectivity/source/drivers/postgresql/pq_xkey.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xkey.hxx
@@ -1,27 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx b/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx
index 7fcbeec8149e..9ae9333e87bb 100644
--- a/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx
@@ -1,27 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx b/connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx
index 3b11df625917..789f83d9cbb3 100644
--- a/connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx
@@ -1,27 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx b/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx
index 68739bf84003..04023af6f856 100644
--- a/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx
@@ -1,27 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx b/connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx
index de5337187249..bf7a3f87f69f 100644
--- a/connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx
@@ -1,27 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xkeys.cxx b/connectivity/source/drivers/postgresql/pq_xkeys.cxx
index 73e655a7feed..4db692e7b5b5 100644
--- a/connectivity/source/drivers/postgresql/pq_xkeys.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xkeys.cxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xkeys.hxx b/connectivity/source/drivers/postgresql/pq_xkeys.hxx
index 486bbc9636c4..13affbd7a104 100644
--- a/connectivity/source/drivers/postgresql/pq_xkeys.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xkeys.hxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xtable.cxx b/connectivity/source/drivers/postgresql/pq_xtable.cxx
index 927361741510..e501056c2082 100644
--- a/connectivity/source/drivers/postgresql/pq_xtable.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xtable.cxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xtable.hxx b/connectivity/source/drivers/postgresql/pq_xtable.hxx
index 7faa2fccc219..d367bf864d8b 100644
--- a/connectivity/source/drivers/postgresql/pq_xtable.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xtable.hxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xtables.cxx b/connectivity/source/drivers/postgresql/pq_xtables.cxx
index c80197cb8299..8e7207d3fc9b 100644
--- a/connectivity/source/drivers/postgresql/pq_xtables.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xtables.cxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 by Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xtables.hxx b/connectivity/source/drivers/postgresql/pq_xtables.hxx
index d2ce6855e903..28069ff0170f 100644
--- a/connectivity/source/drivers/postgresql/pq_xtables.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xtables.hxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 by Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xuser.cxx b/connectivity/source/drivers/postgresql/pq_xuser.cxx
index 4b9ab9c9229d..0164c3b5d4de 100644
--- a/connectivity/source/drivers/postgresql/pq_xuser.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xuser.cxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 by Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xuser.hxx b/connectivity/source/drivers/postgresql/pq_xuser.hxx
index e8a3ca611246..1be25e2e87ad 100644
--- a/connectivity/source/drivers/postgresql/pq_xuser.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xuser.hxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 by Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xusers.cxx b/connectivity/source/drivers/postgresql/pq_xusers.cxx
index 096a572cc901..b41bd3af01e7 100644
--- a/connectivity/source/drivers/postgresql/pq_xusers.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xusers.cxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xusers.hxx b/connectivity/source/drivers/postgresql/pq_xusers.hxx
index 62d629046822..6d72e12f08a9 100644
--- a/connectivity/source/drivers/postgresql/pq_xusers.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xusers.hxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 by Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xview.cxx b/connectivity/source/drivers/postgresql/pq_xview.cxx
index 92ca11ffd02b..6f27f92eb92e 100644
--- a/connectivity/source/drivers/postgresql/pq_xview.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xview.cxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 by Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xview.hxx b/connectivity/source/drivers/postgresql/pq_xview.hxx
index 66f44b509160..4a1f3310debb 100644
--- a/connectivity/source/drivers/postgresql/pq_xview.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xview.hxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 by Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xviews.cxx b/connectivity/source/drivers/postgresql/pq_xviews.cxx
index 8adaf3f8382c..b39bb4284996 100644
--- a/connectivity/source/drivers/postgresql/pq_xviews.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xviews.cxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 by Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xviews.hxx b/connectivity/source/drivers/postgresql/pq_xviews.hxx
index 33fae5b173bf..ca2640b500a1 100644
--- a/connectivity/source/drivers/postgresql/pq_xviews.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xviews.hxx
@@ -1,28 +1,57 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  Effective License of whole file:
  *
- *  This library 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 for more details.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    This library 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 for more details.
  *
- *  The Initial Developer of the Original Code is: Joerg Budischewski
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
- *   Copyright: 2000 by Sun Microsystems, Inc.
- *              2011 by Lionel Elie Mamane <lionel@mamane.lu>
+ *  Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
  *
- *   All Rights Reserved.
+ *    The Contents of this file are made available subject to the terms of
+ *    the GNU Lesser General Public License Version 2.1
  *
- *   Contributor(s): Joerg Budischewski
+ *    Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *    Contributor(s): Joerg Budischewski
+ *
+ *  All parts contributed on or after August 2011:
+ *
+ *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
+ *
+ *    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) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
+ *
+ *    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 2.1 or later (the "LGPLv2.1+"),
+ *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
+ *    instead of those above.
  *
  ************************************************************************/