JENA-2236: Revise LICENSE and NOTICE files

LICENSE

@@ -174,8 +174,34 @@
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
 
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
 ----------------------------------------------------------------------------------
-The following files contain code contributed by Plugged In Software:
 
 jena-core/src/main/java/org/apache/jena/rdf/arp/ExtendedHandler.java
 jena-core/src/main/java/org/apache/jena/rdf/arp/impl/XMLHandler.java
@@ -206,17 +232,3 @@ jena-core/src/main/java/org/apache/jena/rdf/arp/ARP.java
  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.
-----------------------------------------------------------------------------------
-
-- - - - - - - - - - - - - - - - - - - - - - - 
-
- Copyright (c) 2004-2009 Mort Bay Consulting Pty. Ltd.
-
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-and Apache License v2.0 which accompanies this distribution.
-
-The Eclipse Public License is available at
-  http://www.eclipse.org/legal/epl-v10.html
-The Apache License v2.0 is available at
-  http://www.opensource.org/licenses/apache2.0.php

NOTICE

@@ -15,6 +15,7 @@ PluggedIn Software under a BSD license.
 
 This product includes software developed by Mort Bay Consulting Pty. Ltd.
    Copyright (c) 2004-2009 Mort Bay Consulting Pty. Ltd.
+   under an Apache License.
 
 Portions of this software are from Apache Xerces and were originally based on the following:
   - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.

jena-fuseki2/apache-jena-fuseki/assembly-dist.xml

@@ -56,7 +56,6 @@
   </dependencySets>
 
   <files>
-
     <file>
       <source>dist/LICENSE</source>
       <destName>LICENSE</destName>