bsh-2.0b5 is under the APL, adjust readlicense_oo and include notice

edit fodt first with writer, and export to xhtml for the html

(adjusted the .txt file manually)

Change-Id: I94c7e42df2c4de3f511c3ca293c3ae934807e06f
Reviewed-on: https://gerrit.libreoffice.org/15854
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

readlicense_oo/license/LICENSE

@@ -79,36 +79,7 @@ beanshell
    The following software may be included in this product: beanshell. Use
    of any of this software is governed by the terms of the license below:
 
-   This file is part of the BeanShell Java Scripting distribution.
-   Documentation and updates may be found at http://www.beanshell.org/
-
-   Sun Public License Notice:
-
-   The contents of this file are subject to the Sun Public License Version
-   1.0 (the "License"); you may not use this file except in compliance
-   with the License. A copy of the License is available at
-   http://www.sun.com
-
-   The Original Code is BeanShell. The Initial Developer of the Original
-   Code is Pat Niemeyer. Portions created by Pat Niemeyer are Copyright
-   (C) 2000. All Rights Reserved.
-
-   GNU Public License Notice:
-
-   Alternatively, the contents of this file may be used under the terms of
-   the GNU Lesser General Public License (the "LGPL"), in which case the
-   provisions of LGPL are applicable instead of those above. If you wish
-   to allow use of your version of this file only under the terms of the
-   LGPL and not to allow others to use your version of this file under the
-   SPL, indicate your decision by deleting the provisions above and
-   replace them with the notice and other provisions required by the LGPL.
-   If you do not delete the provisions above, a recipient may use your
-   version of this file under either the SPL or the LGPL.
-
-   Patrick Niemeyer (pat@pat.net) Author of Learning Java, O'Reilly &
-   Associates http://www.pat.net/~pat/
-
-   See LGPL Version 3 below
+   See Apache License Version 2.0 below
 
 C++ Boost Library
 

readlicense_oo/license/NOTICE

@@ -137,10 +137,11 @@ http://www.eclipse.org/.
 
 ____
 
-As part of the base system this product also includes code from the following
+As part of the base system this product may also includes code from the following
 projects which are licensed under the Apache license:
 - serf
 - redland
+- Apache BeanShell Scripting for Java
 
 The notices from these projects are following:
 
@@ -148,12 +149,15 @@ serf
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
-
 redland
 This product includes Redland software (http://librdf.org/)
 developed at the Institute for Learning and Research Technology,
 University of Bristol, UK (http://www.bristol.ac.uk/).
 
+Apache BeanShell Scripting for Java
+Copyright 1997-2012 Patrick Niemeyer
+Granted to the Apache Software Foundation 2012
+Licensed under the Apache License, Version 2.0.
 ____
 
 This product includes software developed by the OpenSSL Project