You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2016/11/01 10:25:04 UTC

[1/3] jena git commit: Remove out of date file

Repository: jena
Updated Branches:
  refs/heads/master 8bee4d328 -> cb1fa93fc


Remove out of date file


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f6b09123
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f6b09123
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f6b09123

Branch: refs/heads/master
Commit: f6b09123d313bbe16d38ae68c2b7b0235bfec548
Parents: 488257b
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Oct 30 11:12:12 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Oct 30 11:12:12 2016 +0000

----------------------------------------------------------------------
 .../src/main/resources/META-INF/DEPENDENCIES    | 24 --------------------
 1 file changed, 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/f6b09123/jena-fuseki1/src/main/resources/META-INF/DEPENDENCIES
----------------------------------------------------------------------
diff --git a/jena-fuseki1/src/main/resources/META-INF/DEPENDENCIES b/jena-fuseki1/src/main/resources/META-INF/DEPENDENCIES
deleted file mode 100644
index 910b788..0000000
--- a/jena-fuseki1/src/main/resources/META-INF/DEPENDENCIES
+++ /dev/null
@@ -1,24 +0,0 @@
-This file lists the dependences for Apache Jena Fuseki.
-  Version numbers are given in the POM file for a particular distribution. 
-
-Apache Projects:   Apache Software License
-  Apache Jena, including the Jena IRI library
-  Apache Xerces-J
-  Apache log4j
-  Apache HttpComponents (HTTP Client)
-  Apache Commons Codec
-  Apache Common FileUpload
-
-ICU4J : http://icu-project.org/
-   IBM X License (to version ICU4J 3.4.4)
-
-SLF4J : http://www.slf4j.org/
-  Copyright (c) 2004-2008 QOS.ch
-  MIT License
-
-JUnit : http://junit.org/
-  Common Public License - v 1.0
-
-Jetty: http://www.eclipse.org/jetty/
-  Apache License 2.0 
-  (also avilable under Eclipse Public License 1.0)


[3/3] jena git commit: JENA-1169: Merge commit 'refs/pull/187/head' of github.com:apache/jena

Posted by an...@apache.org.
JENA-1169: Merge commit 'refs/pull/187/head' of github.com:apache/jena

This closes #189.
This closes #138.


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/cb1fa93f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/cb1fa93f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/cb1fa93f

Branch: refs/heads/master
Commit: cb1fa93fce2fd0907e8f0e3f60768e795e27c633
Parents: 8bee4d3 caa3c3d
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Nov 1 10:23:45 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Nov 1 10:23:45 2016 +0000

----------------------------------------------------------------------
 apache-jena/DEPENDENCIES                        |  21 --
 apache-jena/LICENSE                             | 274 -------------------
 apache-jena/NOTICE                              |  60 ----
 apache-jena/README                              |  92 -------
 apache-jena/assembly-jena-zip.xml               |  28 +-
 apache-jena/dist/LICENSE                        | 274 +++++++++++++++++++
 apache-jena/dist/NOTICE                         |  60 ++++
 apache-jena/dist/README                         | 127 +++++++++
 jena-fuseki1/assembly-dist.xml                  |  12 +-
 jena-fuseki1/dist/README                        |  48 ++++
 .../src/main/resources/META-INF/DEPENDENCIES    |  24 --
 .../apache-jena-fuseki/assembly-dist.xml        |   6 +-
 jena-fuseki2/apache-jena-fuseki/dist/README     |  61 +++++
 13 files changed, 597 insertions(+), 490 deletions(-)
----------------------------------------------------------------------



[2/3] jena git commit: Include crypto notice in distribution README files.

Posted by an...@apache.org.
Include crypto notice in distribution README files.


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/caa3c3d7
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/caa3c3d7
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/caa3c3d7

Branch: refs/heads/master
Commit: caa3c3d798f7fa7c108dc5fdded021dc330a2843
Parents: f6b0912
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Oct 30 11:29:39 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Oct 30 13:16:35 2016 +0000

----------------------------------------------------------------------
 apache-jena/DEPENDENCIES                        |  21 --
 apache-jena/LICENSE                             | 274 -------------------
 apache-jena/NOTICE                              |  60 ----
 apache-jena/README                              |  92 -------
 apache-jena/assembly-jena-zip.xml               |  28 +-
 apache-jena/dist/LICENSE                        | 274 +++++++++++++++++++
 apache-jena/dist/NOTICE                         |  60 ++++
 apache-jena/dist/README                         | 127 +++++++++
 jena-fuseki1/assembly-dist.xml                  |  12 +-
 jena-fuseki1/dist/README                        |  48 ++++
 .../apache-jena-fuseki/assembly-dist.xml        |   6 +-
 jena-fuseki2/apache-jena-fuseki/dist/README     |  61 +++++
 12 files changed, 597 insertions(+), 466 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/caa3c3d7/apache-jena/DEPENDENCIES
----------------------------------------------------------------------
diff --git a/apache-jena/DEPENDENCIES b/apache-jena/DEPENDENCIES
deleted file mode 100644
index 00499d1..0000000
--- a/apache-jena/DEPENDENCIES
+++ /dev/null
@@ -1,21 +0,0 @@
-This file lists the dependences for Apache Jena.
-  Version numbers are given in the POM file for a particular distribution. 
-
-Apache Projects:   Apache Software License
-  Apache Jena, including the Jena IRI library
-  Apache Xerces-J
-  Apache log4j
-  Apache HttpComponents (HTTP Client)
-  Apache Commons Codec
-
-SLF4J : http://www.slf4j.org/
-  Copyright (c) 2004-2008 QOS.ch
-  MIT License
-
-JUnit : http://junit.org/
-  Common Public License - v 1.0
-
-Dexx Collections
-https://github.com/andrewoma/dexx
-BSD-Style License
-  https://github.com/andrewoma/dexx/blob/master/LICENSE.txt

http://git-wip-us.apache.org/repos/asf/jena/blob/caa3c3d7/apache-jena/LICENSE
----------------------------------------------------------------------
diff --git a/apache-jena/LICENSE b/apache-jena/LICENSE
deleted file mode 100644
index 03cb600..0000000
--- a/apache-jena/LICENSE
+++ /dev/null
@@ -1,274 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
-The following files contain code contributed by Plugged In Software:
-
-src/main/java/org/apache/jena/rdf/arp/ExtendedHandler.java
-src/main/java/org/apache/jena/rdf/arp/impl/XMLHandler.java
-src/main/java/org/apache/jena/rdf/arp/ARP.java 
-
-  (c) Copyright 2003, Plugged In Software 
-
-  All rights reserved.
-
- 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. The name of the author may not be used to endorse or promote products
-    derived from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
-Simple Logging Facade for Java (SLF4J)
-http://slf4j.org/
-
-Copyright (c) 2004-2008 QOS.ch
-All rights reserved.
-
-Permission is hereby granted, free  of charge, to any person obtaining
-a  copy  of this  software  and  associated  documentation files  (the
-"Software"), to  deal in  the Software without  restriction, including
-without limitation  the rights to  use, copy, modify,  merge, publish,
-distribute,  sublicense, and/or sell  copies of  the Software,  and to
-permit persons to whom the Software  is furnished to do so, subject to
-the following conditions:
-
-The  above  copyright  notice  and  this permission  notice  shall  be
-included in all copies or substantial portions of the Software.
-
-THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
-EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
-MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
-From Apache HttpComponents Client
-
-This project contains annotations derived from JCIP-ANNOTATIONS
-Copyright (c) 2005 Brian Goetz and Tim Peierls.
-See http://www.jcip.net and the Creative Commons Attribution License 
-(http://creativecommons.org/licenses/by/2.5)
-
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
-Dexx Collections
-https://github.com/andrewoma/dexx
-BSD-Style License
-  https://github.com/andrewoma/dexx/blob/master/LICENSE.txt
-
-Copyright (c) 2014 Andrew O'Malley
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=

http://git-wip-us.apache.org/repos/asf/jena/blob/caa3c3d7/apache-jena/NOTICE
----------------------------------------------------------------------
diff --git a/apache-jena/NOTICE b/apache-jena/NOTICE
deleted file mode 100644
index 3348853..0000000
--- a/apache-jena/NOTICE
+++ /dev/null
@@ -1,60 +0,0 @@
-Apache Jena
-Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product includes software developed by
-PluggedIn Software and under a BSD license.
-
-Portions of this software were originally based on the following:
-  - Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Hewlett-Packard Development Company, LP
-  - Copyright 2010, 2011 Epimorphics Ltd.
-  - Copyright 2010, 2011 Talis Systems Ltd.
-These have been licensed to the Apache Software Foundation under a software grant.
-
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
-From Apache HttpComponents Client:
-
-This project contains annotations derived from JCIP-ANNOTATIONS
-Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
-
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
-  Apache Xerces Java
-   Copyright 1999-2013 The Apache Software Foundation
-
-   This product includes software developed at
-   The Apache Software Foundation (http://www.apache.org/).
-
-   Portions of this software were originally based on the following:
-     - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
-     - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
-     - voluntary contributions made by Paul Eng on behalf of the 
-       Apache Software Foundation that were originally developed at iClick, Inc.,
-       software copyright (c) 1999.
-
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
-Simple Logging Facade for Java (SLF4J)
-http://slf4j.org/
-
-Copyright (c) 2004-2008 QOS.
-
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-Dexx Collections
-Copyright (c) 2014 Andrew O'Malley
-https://github.com/andrewoma/dexx
-BSD-Style License
-  https://github.com/andrewoma/dexx/blob/master/LICENSE.txt
-  
-and includes the following NOTICE
-----------
-Portions based on code from the Scala standard library.
-Copyright (c) 2002-2014 EPFL
-Copyright (c) 2011-2014 Typesafe, Inc.
-Licensed under BSD-style license (see licenses/LICENSE_Scala.txt)
-----------
-
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=

http://git-wip-us.apache.org/repos/asf/jena/blob/caa3c3d7/apache-jena/README
----------------------------------------------------------------------
diff --git a/apache-jena/README b/apache-jena/README
deleted file mode 100644
index e283a8c..0000000
--- a/apache-jena/README
+++ /dev/null
@@ -1,92 +0,0 @@
-
-                                  Apache Jena
-                                  ===========
-
-  Jena is a Java framework for building semantic web applications. It provides 
-  tools and Java libraries to help you to develop semantic web and linked-data 
-  apps, tools and servers.
-
-  This distribution includes the following Apache Jena modules: 
-
-  - jena-core: provides the Jena RDF APIs, Ontology APIs and Inference APIs. 
-  - jena-arq: SPARQL 1.1, query and update.
-  - jena-tdb: scalable and performant storage subsystem for Jena
-  - jena-iri: provides an implementation of RFC 3987 (IRI) and RFC 3986 (URI)
-
-  Installing Jena
-  ---------------
-
-   To use Jena in your application, ensure all the .jar files in the lib/
-   directory are on the classpath or available to your web application. Jena
-   is built and test with these .jar files.
-
-  Scripts
-  -------
-
-  The directories bat/ and bin/ provide script wrappers to run Jena command
-  line tools.  The scripts can be copied to a convenient place on the
-  command path.
-
-  To use the Jena tools from the command line you need to set the JENA_HOME
-  environment variable to point to the location where you have 
-  unzipped the Jena distribution:
-
-  Windows:
-    set JENA_HOME=\path\to\apache-jena-x.y.z
-    bat\sparql.bat --version    
-
-  Linux:
-    The command scripts automatically set JENA_HOME but if you want
-    to switch to a different version fro the same scripts:
-
-    export JENA_HOME=/path/to/apache-jena-x.y.z
-    bin/sparql --version    
-
-  Where x.y.z is the version of the Jena command line tools you have 
-  downloaded
-    
-  If you receive a class not found exception when trying to run one of the 
-  scripts then you may have set JENA_HOME incorrectly. A quick and easy way
-  to validate that JENA_HOME is set correctly is to run the following:
-  
-  Windows:
-    cd %JENA_HOME%
-    
-  Linux:
-    cd $JENA_HOME
-    
-  If this command returns an error then JENA_HOME is not pointed to a valid directory
-
-
-  Website
-  -------
-
-  The Apache Jena website is available here:
-  http://jena.apache.org/
-
-
-  Documentation
-  -------------
-
-  Getting started: http://jena.apache.org/getting_started/
-  Tutorials: http://jena.apache.org/tutorials/
-  Documentation: http://jena.apache.org/documentation/
-
-  Support is provided via users@jena.apache.org mailing list.
-  See also: http://jena.apache.org/help_and_support/
-
-  Sources and Getting Involved
-  ----------------------------
-
-  The Apache Jena source code repository is here:
-  http://svn.apache.org/repos/asf/jena/
-
-  If you are interested in getting involved with Apache Jena development: 
-  http://jena.apache.org/getting_involved/
-
-
-  Licensing
-  ---------
-
-  Jena is provided under the Apache Software License v2.0
-  See LICENSE for the full text.

http://git-wip-us.apache.org/repos/asf/jena/blob/caa3c3d7/apache-jena/assembly-jena-zip.xml
----------------------------------------------------------------------
diff --git a/apache-jena/assembly-jena-zip.xml b/apache-jena/assembly-jena-zip.xml
index 8a68220..ac26470 100644
--- a/apache-jena/assembly-jena-zip.xml
+++ b/apache-jena/assembly-jena-zip.xml
@@ -94,17 +94,25 @@
 
   </dependencySets>
 
-  <fileSets>
-
-    <fileSet>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>NOTICE</include>
-        <include>LICENSE</include>
-        <include>README</include>
-      </includes>
+  <files>
+    <file>
+      <source>dist/README</source>
+      <destName>README</destName>
       <fileMode>0644</fileMode>
-    </fileSet>
+    </file>
+    <file>
+      <source>dist/LICENSE</source>
+      <destName>LICENSE</destName>
+      <fileMode>0644</fileMode>
+    </file>
+    <file>
+      <source>dist/NOTICE</source>
+      <destName>NOTICE</destName>
+      <fileMode>0644</fileMode>
+    </file>
+  </files>
+
+  <fileSets>
 
     <fileSet>
       <outputDirectory>/</outputDirectory>

http://git-wip-us.apache.org/repos/asf/jena/blob/caa3c3d7/apache-jena/dist/LICENSE
----------------------------------------------------------------------
diff --git a/apache-jena/dist/LICENSE b/apache-jena/dist/LICENSE
new file mode 100644
index 0000000..03cb600
--- /dev/null
+++ b/apache-jena/dist/LICENSE
@@ -0,0 +1,274 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
+The following files contain code contributed by Plugged In Software:
+
+src/main/java/org/apache/jena/rdf/arp/ExtendedHandler.java
+src/main/java/org/apache/jena/rdf/arp/impl/XMLHandler.java
+src/main/java/org/apache/jena/rdf/arp/ARP.java 
+
+  (c) Copyright 2003, Plugged In Software 
+
+  All rights reserved.
+
+ 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. The name of the author may not be used to endorse or promote products
+    derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
+Simple Logging Facade for Java (SLF4J)
+http://slf4j.org/
+
+Copyright (c) 2004-2008 QOS.ch
+All rights reserved.
+
+Permission is hereby granted, free  of charge, to any person obtaining
+a  copy  of this  software  and  associated  documentation files  (the
+"Software"), to  deal in  the Software without  restriction, including
+without limitation  the rights to  use, copy, modify,  merge, publish,
+distribute,  sublicense, and/or sell  copies of  the Software,  and to
+permit persons to whom the Software  is furnished to do so, subject to
+the following conditions:
+
+The  above  copyright  notice  and  this permission  notice  shall  be
+included in all copies or substantial portions of the Software.
+
+THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
+EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
+MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
+From Apache HttpComponents Client
+
+This project contains annotations derived from JCIP-ANNOTATIONS
+Copyright (c) 2005 Brian Goetz and Tim Peierls.
+See http://www.jcip.net and the Creative Commons Attribution License 
+(http://creativecommons.org/licenses/by/2.5)
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
+Dexx Collections
+https://github.com/andrewoma/dexx
+BSD-Style License
+  https://github.com/andrewoma/dexx/blob/master/LICENSE.txt
+
+Copyright (c) 2014 Andrew O'Malley
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=

http://git-wip-us.apache.org/repos/asf/jena/blob/caa3c3d7/apache-jena/dist/NOTICE
----------------------------------------------------------------------
diff --git a/apache-jena/dist/NOTICE b/apache-jena/dist/NOTICE
new file mode 100644
index 0000000..3348853
--- /dev/null
+++ b/apache-jena/dist/NOTICE
@@ -0,0 +1,60 @@
+Apache Jena
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+This product includes software developed by
+PluggedIn Software and under a BSD license.
+
+Portions of this software were originally based on the following:
+  - Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Hewlett-Packard Development Company, LP
+  - Copyright 2010, 2011 Epimorphics Ltd.
+  - Copyright 2010, 2011 Talis Systems Ltd.
+These have been licensed to the Apache Software Foundation under a software grant.
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
+From Apache HttpComponents Client:
+
+This project contains annotations derived from JCIP-ANNOTATIONS
+Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
+  Apache Xerces Java
+   Copyright 1999-2013 The Apache Software Foundation
+
+   This product includes software developed at
+   The Apache Software Foundation (http://www.apache.org/).
+
+   Portions of this software were originally based on the following:
+     - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
+     - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
+     - voluntary contributions made by Paul Eng on behalf of the 
+       Apache Software Foundation that were originally developed at iClick, Inc.,
+       software copyright (c) 1999.
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
+Simple Logging Facade for Java (SLF4J)
+http://slf4j.org/
+
+Copyright (c) 2004-2008 QOS.
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+Dexx Collections
+Copyright (c) 2014 Andrew O'Malley
+https://github.com/andrewoma/dexx
+BSD-Style License
+  https://github.com/andrewoma/dexx/blob/master/LICENSE.txt
+  
+and includes the following NOTICE
+----------
+Portions based on code from the Scala standard library.
+Copyright (c) 2002-2014 EPFL
+Copyright (c) 2011-2014 Typesafe, Inc.
+Licensed under BSD-style license (see licenses/LICENSE_Scala.txt)
+----------
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=

http://git-wip-us.apache.org/repos/asf/jena/blob/caa3c3d7/apache-jena/dist/README
----------------------------------------------------------------------
diff --git a/apache-jena/dist/README b/apache-jena/dist/README
new file mode 100644
index 0000000..fabef53
--- /dev/null
+++ b/apache-jena/dist/README
@@ -0,0 +1,127 @@
+
+                                  Apache Jena
+                                  ===========
+
+  Jena is a Java framework for building semantic web applications. It provides 
+  tools and Java libraries to help you to develop semantic web and linked-data 
+  apps, tools and servers.
+
+  This distribution includes the following Apache Jena modules: 
+
+  - jena-core: provides the Jena RDF APIs, Ontology APIs and Inference APIs. 
+  - jena-arq:  SPARQL 1.1, query and update.
+  - jena-cmds: Command line tools.
+  - jena-tdb:  scalable and performant storage subsystem for Jena
+  - jena-iri:  provides an implementation of RFC 3987 (IRI) and RFC 3986 (URI)
+
+  Installing Jena
+  ---------------
+
+   To use Jena in your application, ensure all the .jar files in the lib/
+   directory are on the classpath or available to your web application. Jena
+   is built and test with these .jar files.
+
+  Scripts
+  -------
+
+  The directories bat/ and bin/ provide script wrappers to run Jena command
+  line tools.  The scripts can be copied to a convenient place on the
+  command path.
+
+  To use the Jena tools from the command line you need to set the JENA_HOME
+  environment variable to point to the location where you have 
+  unzipped the Jena distribution:
+
+  Windows:
+    set JENA_HOME=\path\to\apache-jena-x.y.z
+    bat\sparql.bat --version    
+
+  Linux:
+    The command scripts automatically set JENA_HOME but if you want
+    to switch to a different version from the same scripts:
+
+    export JENA_HOME=/path/to/apache-jena-x.y.z
+    bin/sparql --version    
+
+  Where x.y.z is the version of the Jena command line tools you have 
+  downloaded
+    
+  If you receive a class not found exception when trying to run one of the 
+  scripts then you may have set JENA_HOME incorrectly. A quick and easy way
+  to validate that JENA_HOME is set correctly is to run the following:
+  
+  Windows:
+    cd %JENA_HOME%
+    
+  Linux:
+    cd $JENA_HOME
+    
+  If this command returns an error then JENA_HOME is not pointed to a valid directory
+
+
+  Website
+  -------
+
+  The Apache Jena website is available here:
+  http://jena.apache.org/
+
+
+  Documentation
+  -------------
+
+  Getting started: http://jena.apache.org/getting_started/
+  Tutorials: http://jena.apache.org/tutorials/
+  Documentation: http://jena.apache.org/documentation/
+
+  Support is provided via users@jena.apache.org mailing list.
+  See also: http://jena.apache.org/help_and_support/
+
+  Sources and Getting Involved
+  ----------------------------
+
+  The Apache Jena source code repository is here:
+  http://svn.apache.org/repos/asf/jena/
+
+  If you are interested in getting involved with Apache Jena development: 
+  http://jena.apache.org/getting_involved/
+
+  Licensing
+  ---------
+
+  Jena is provided under the Apache Software License v2.0
+  See LICENSE for the full text.
+
+ Cryptographic Software Notice
+ -----------------------------
+
+ This distribution includes cryptographic software. The country in which
+ you currently reside may have restrictions on the import, possession,
+ use, and/or re-export to another country, of encryption software. BEFORE
+ using any encryption software, please check your country's laws,
+ regulations and policies concerning the import, possession, or use, and
+ re-export of encryption software, to see if this is permitted. 
+ See <http://www.wassenaar.org/> for more information.
+
+ The U.S. Government Department of Commerce, Bureau of Industry and
+ Security (BIS), has classified this software as Export Commodity
+ Control Number (ECCN) 5D002.C.1, which includes information security
+ software using or performing cryptographic functions with asymmetric
+ algorithms. The form and manner of this Apache Software Foundation
+ distribution makes it eligible for export under the License Exception
+ ENC Technology Software Unrestricted (TSU) exception (see the BIS
+ Export Administration Regulations, Section 740.13) for both object
+ code and source code.
+
+ The following provides more details on the included software that
+ may be subject to export controls on cryptographic software:
+
+  Apache Jena (distribution) includes
+    Apache HttpComponents Client 
+    Apache HttpComponents Core
+  which interfaces with the Java Secure Socket Extension (JSSE) API
+  to provide
+
+     - HTTPS support
+
+   Apache Jena (distribution) does not include any
+   implementation of JSSE.

http://git-wip-us.apache.org/repos/asf/jena/blob/caa3c3d7/jena-fuseki1/assembly-dist.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki1/assembly-dist.xml b/jena-fuseki1/assembly-dist.xml
index b1ba86b..509d230 100644
--- a/jena-fuseki1/assembly-dist.xml
+++ b/jena-fuseki1/assembly-dist.xml
@@ -47,6 +47,10 @@ Assumes jar made and onejar has been assembled.
     </file>
     -->
     <file>
+      <source>dist/README</source>
+      <destName>README</destName>
+    </file>
+    <file>
       <source>dist/LICENSE</source>
       <destName>LICENSE</destName>
     </file>
@@ -60,14 +64,6 @@ Assumes jar made and onejar has been assembled.
     <fileSet>
       <outputDirectory></outputDirectory>
       <includes>
-        <include>README*</include>
-        <include>ReleaseNotes.txt</include>
-      </includes>
-    </fileSet>
-
-    <fileSet>
-      <outputDirectory></outputDirectory>
-      <includes>
         <include>log4j.properties</include>
         <include>fuseki</include>
         <include>fuseki-server</include>

http://git-wip-us.apache.org/repos/asf/jena/blob/caa3c3d7/jena-fuseki1/dist/README
----------------------------------------------------------------------
diff --git a/jena-fuseki1/dist/README b/jena-fuseki1/dist/README
new file mode 100644
index 0000000..daa410a
--- /dev/null
+++ b/jena-fuseki1/dist/README
@@ -0,0 +1,48 @@
+Apache Jena Fuseki1
+===================
+
+Apache Jena Fuseki1 is deprecated in favor of Apache Jena Fuseki2
+
+Documentation on Fuseki1:
+  http://jena.apache.org/documentation/serving_data/
+
+Documentation on Fuseki2:
+  http://jena.apache.org/documentation/fuseki2/
+
+
+Cryptographic Software Notice
+-----------------------------
+
+This distribution includes cryptographic software. The country in which
+you currently reside may have restrictions on the import, possession,
+use, and/or re-export to another country, of encryption software. BEFORE
+using any encryption software, please check your country's laws,
+regulations and policies concerning the import, possession, or use, and
+re-export of encryption software, to see if this is permitted.
+See <http://www.wassenaar.org/> for more information.
+
+The U.S. Government Department of Commerce, Bureau of Industry and
+Security (BIS), has classified this software as Export Commodity
+Control Number (ECCN) 5D002.C.1, which includes information security
+software using or performing cryptographic functions with asymmetric
+algorithms. The form and manner of this Apache Software Foundation
+distribution makes it eligible for export under the License Exception
+ENC Technology Software Unrestricted (TSU) exception (see the BIS
+Export Administration Regulations, Section 740.13) for both object
+code and source code.
+
+The following provides more details on the included software that
+may be subject to export controls on cryptographic software:
+
+  Apache Jena Fuseki1 (distribution) includes
+     Apache HttpComponents Client 
+     Apache HttpComponents Core
+  which interfaces with the Java Secure Socket Extension (JSSE) API
+  and also 
+     Eclipse Jetty
+  to provide
+
+     - HTTPS support
+
+   Apache Jena Fuseki1 (distribution) does not include any
+   implementation of JSSE.

http://git-wip-us.apache.org/repos/asf/jena/blob/caa3c3d7/jena-fuseki2/apache-jena-fuseki/assembly-dist.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/assembly-dist.xml b/jena-fuseki2/apache-jena-fuseki/assembly-dist.xml
index 14cef50..f59b655 100644
--- a/jena-fuseki2/apache-jena-fuseki/assembly-dist.xml
+++ b/jena-fuseki2/apache-jena-fuseki/assembly-dist.xml
@@ -24,7 +24,7 @@
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-
+  
   <id>distribution</id>
 
   <formats>
@@ -65,6 +65,10 @@
       <source>dist/NOTICE</source>
       <destName>NOTICE</destName>
     </file>
+    <file>
+      <source>dist/README</source>
+      <destName>README</destName>
+    </file>
   </files>
 
   <fileSets>

http://git-wip-us.apache.org/repos/asf/jena/blob/caa3c3d7/jena-fuseki2/apache-jena-fuseki/dist/README
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/dist/README b/jena-fuseki2/apache-jena-fuseki/dist/README
new file mode 100644
index 0000000..9b5154a
--- /dev/null
+++ b/jena-fuseki2/apache-jena-fuseki/dist/README
@@ -0,0 +1,61 @@
+Apache Jena Fuseki2
+===================
+
+Apache Jena Fuseki2 is a SPARQL server.It provides
+
+Full documentation:
+  http://jena.apache.org/documentation/fuseki2/
+
+This distribution contains Fuseki2 package as a WAR file ('fuseki.war'),
+to run in a webapp conatiner server such as Apache Tomcat, and also a
+self-contained jar, to run as a operation system process.
+
+The script 'fuseki' is an Linux init script to run Fuseki2 as a service.
+Instructions are in comments at the start of the script.
+
+The script 'fuseki-server' is a script to run the server using
+fuseki-server.jar from the command line.  Use 'fuseki-server --help' for
+details.
+
+The directory 'bin/' contains some scripts execute SPARQL Protocol and
+SPARQL Graph Store Protocol operations.
+Documentation: http://jena.apache.org/documentation/fuseki2/soh.html
+
+
+Cryptographic Software Notice
+-----------------------------
+
+This distribution includes cryptographic software. The country in which
+you currently reside may have restrictions on the import, possession,
+use, and/or re-export to another country, of encryption software. BEFORE
+using any encryption software, please check your country's laws,
+regulations and policies concerning the import, possession, or use, and
+re-export of encryption software, to see if this is permitted.
+See <http://www.wassenaar.org/> for more information.
+
+The U.S. Government Department of Commerce, Bureau of Industry and
+Security (BIS), has classified this software as Export Commodity
+Control Number (ECCN) 5D002.C.1, which includes information security
+software using or performing cryptographic functions with asymmetric
+algorithms. The form and manner of this Apache Software Foundation
+distribution makes it eligible for export under the License Exception
+ENC Technology Software Unrestricted (TSU) exception (see the BIS
+Export Administration Regulations, Section 740.13) for both object
+code and source code.
+
+The following provides more details on the included software that
+may be subject to export controls on cryptographic software:
+
+  Apache Jena Fuseki2 (distribution) includes
+     Apache HttpComponents Client 
+     Apache HttpComponents Core
+  which interfaces with the Java Secure Socket Extension (JSSE) API
+  and also 
+     Apache Shiro
+     Eclipse Jetty
+  to provide
+
+     - HTTPS support
+
+   Apache Jena Fuseki2 (distribution) does not include any
+   implementation of JSSE.