You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@any23.apache.org by an...@apache.org on 2017/01/14 01:04:03 UTC

any23 git commit: Fix more references to Sesame

Repository: any23
Updated Branches:
  refs/heads/master 2cda1a892 -> a5f24cbbf


Fix more references to Sesame

Signed-off-by: Peter Ansell <p_...@yahoo.com>


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

Branch: refs/heads/master
Commit: a5f24cbbf886331388ddde28f12cdfc3d38bdec4
Parents: 2cda1a8
Author: Peter Ansell <p_...@yahoo.com>
Authored: Sat Jan 14 12:03:28 2017 +1100
Committer: Peter Ansell <p_...@yahoo.com>
Committed: Sat Jan 14 12:03:28 2017 +1100

----------------------------------------------------------------------
 LICENSE.txt                                     | 58 +++++++++----------
 cli/pom.xml                                     |  4 +-
 cli/src/main/assembly/LICENSE-with-deps.txt     | 59 ++++++++++----------
 core/pom.xml                                    |  4 +-
 plugins/basic-crawler/pom.xml                   |  2 +-
 plugins/html-scraper/pom.xml                    |  2 +-
 plugins/office-scraper/pom.xml                  |  2 +-
 pom.xml                                         |  7 +--
 .../main/assembly/LICENSE-server-embedded.txt   | 59 ++++++++++----------
 service/src/main/assembly/LICENSE-with-deps.txt | 59 ++++++++++----------
 src/site/apt/dev-data-conversion.apt            |  2 +-
 11 files changed, 131 insertions(+), 127 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/any23/blob/a5f24cbb/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
index 560739e..ac9bdec 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -239,31 +239,33 @@ The following files contain code from the jQuery Foundation (http://jquery.com)
     
 ----------------------------------------------------------------------------------------
 
-This software contains inclusions of source from OpenRDF Sesame which is licensed
-under a BSD-style license 
-
-    Copyright Aduna (http://www.aduna-software.com/) 2001-2013
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without modification,
-    are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * 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.
-    * Neither the name of the copyright holder 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.
+This software contains inclusions of source from Eclipse RDF4J which is licensed
+under the Eclipse Distribution License (a BSD-style license) 
+
+   Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors.
+   Copyright Aduna (http://www.aduna-software.com/) 2001-2013
+
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are met:
+
+   * Redistributions of source code must retain the above copyright notice, this
+     list of conditions and the following disclaimer.
+   * 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.
+   * Neither the name of the Eclipse Foundation, Inc. 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.

http://git-wip-us.apache.org/repos/asf/any23/blob/a5f24cbb/cli/pom.xml
----------------------------------------------------------------------
diff --git a/cli/pom.xml b/cli/pom.xml
index 6b7e5f5..2682d0d 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -102,7 +102,7 @@
     </dependency>
     <!-- END: Tika -->
 
-    <!-- BEGIN: Sesame -->
+    <!-- BEGIN: RDF4J -->
     <dependency>
       <groupId>org.eclipse.rdf4j</groupId>
       <artifactId>rdf4j-model</artifactId>
@@ -147,7 +147,7 @@
       <groupId>org.semarglproject</groupId>
       <artifactId>semargl-rdf4j</artifactId>
     </dependency>
-    <!-- END: Sesame -->
+    <!-- END: RDF4J -->
     
     <!-- BEGIN:  Apache Commons, this version is hosted in the 
            any23-repository-external repository -->

http://git-wip-us.apache.org/repos/asf/any23/blob/a5f24cbb/cli/src/main/assembly/LICENSE-with-deps.txt
----------------------------------------------------------------------
diff --git a/cli/src/main/assembly/LICENSE-with-deps.txt b/cli/src/main/assembly/LICENSE-with-deps.txt
index e367dc2..9e292a0 100644
--- a/cli/src/main/assembly/LICENSE-with-deps.txt
+++ b/cli/src/main/assembly/LICENSE-with-deps.txt
@@ -207,35 +207,36 @@ The Apache Any23 distribution packages include a number of dependencies with
 separate copyright notices and license terms. Your use of the binaries for these
 dependencies is subject to the terms and conditions of the following licenses.
 
-For the OpenRDF Sesame components (http://www.openrdf.org/)
-Copyright Aduna (http://www.aduna-software.com/) \ufffd 2001-2011
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted
-provided that the following conditions are met:
-
-    Redistributions of source code must retain the above copyright notice, this list of conditions
-    and the following disclaimer.
-
-    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.
-
-    Neither the name of the copyright holder 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.
-
-For the Aduna Commons components (http://www.aduna-software.org/)
-This is licensed under the Aduna BSD license, see above
+For the Eclipse RDF4J components licensed under the Eclipse Distribution 
+License (a BSD-style license) 
+
+   Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors.
+   Copyright Aduna (http://www.aduna-software.com/) 2001-2013
+
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are met:
+
+   * Redistributions of source code must retain the above copyright notice, this
+     list of conditions and the following disclaimer.
+   * 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.
+   * Neither the name of the Eclipse Foundation, Inc. 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.
 
 For the TagSoup component (http://home.ccil.org/~cowan/XML/tagsoup/)
 This is licensed under the The Apache Software License, Version 2.0, see above

http://git-wip-us.apache.org/repos/asf/any23/blob/a5f24cbb/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 8381189..6cf97e4 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -99,7 +99,7 @@
     </dependency>
     <!-- END: Tika -->
 
-    <!-- BEGIN: Sesame -->
+    <!-- BEGIN: RDF4J -->
     <dependency>
       <groupId>org.eclipse.rdf4j</groupId>
       <artifactId>rdf4j-model</artifactId>
@@ -144,7 +144,7 @@
       <groupId>org.semarglproject</groupId>
       <artifactId>semargl-rdf4j</artifactId>
     </dependency>
-    <!-- END: Sesame -->
+    <!-- END: RDF4J -->
     
     <!-- BEGIN:  Apache Commons, this version is hosted in the 
            any23-repository-external repository -->

http://git-wip-us.apache.org/repos/asf/any23/blob/a5f24cbb/plugins/basic-crawler/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/basic-crawler/pom.xml b/plugins/basic-crawler/pom.xml
index d5a5b05..88c8670 100644
--- a/plugins/basic-crawler/pom.xml
+++ b/plugins/basic-crawler/pom.xml
@@ -32,7 +32,7 @@
   <description>Any23 plugin for crawling sites.</description>
 
   <dependencies>
-    <!-- Sesame. -->
+    <!-- RDF4J -->
     <dependency>
       <groupId>org.eclipse.rdf4j</groupId>
       <artifactId>rdf4j-model</artifactId>

http://git-wip-us.apache.org/repos/asf/any23/blob/a5f24cbb/plugins/html-scraper/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/html-scraper/pom.xml b/plugins/html-scraper/pom.xml
index 359b08a..05aa51a 100644
--- a/plugins/html-scraper/pom.xml
+++ b/plugins/html-scraper/pom.xml
@@ -32,7 +32,7 @@
   <description>Any23 plugin for scraping HTML code.</description>
 
   <dependencies>
-    <!-- Sesame. -->
+    <!-- RDF4J -->
     <dependency>
       <groupId>org.eclipse.rdf4j</groupId>
       <artifactId>rdf4j-model</artifactId>

http://git-wip-us.apache.org/repos/asf/any23/blob/a5f24cbb/plugins/office-scraper/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/office-scraper/pom.xml b/plugins/office-scraper/pom.xml
index 40476a3..59d57c6 100644
--- a/plugins/office-scraper/pom.xml
+++ b/plugins/office-scraper/pom.xml
@@ -32,7 +32,7 @@
   <description>Any23 plugin for scraping metadata from MS Office related file formats.</description>
 
   <dependencies>
-    <!-- Sesame. -->
+    <!-- RDF4J -->
     <dependency>
       <groupId>org.eclipse.rdf4j</groupId>
       <artifactId>rdf4j-model</artifactId>

http://git-wip-us.apache.org/repos/asf/any23/blob/a5f24cbb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5549eb3..a2f5d66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -381,7 +381,7 @@
       </dependency>
       <!-- END: Tika -->
 
-      <!-- BEGIN: Sesame -->
+      <!-- BEGIN: RDF4J -->
       <dependency>
         <groupId>org.eclipse.rdf4j</groupId>
         <artifactId>rdf4j-model</artifactId>
@@ -447,7 +447,7 @@
         <artifactId>semargl-rdf4j</artifactId>
         <version>${semargl.version}</version>
       </dependency>
-      <!-- END: Sesame -->
+      <!-- END: RDF4J -->
       
       <!-- BEGIN: Misc -->
       <dependency>
@@ -728,9 +728,8 @@
           <!--
             Declaring default file encoding: UTF-8
             Enabling assertions.
-            Disabling assertions for Sesame Sail.
            -->
-          <argLine>-Dfile.encoding=UTF-8 -ea -da:org.openrdf.sail.memory.model.MemValueFactory</argLine>
+          <argLine>-Dfile.encoding=UTF-8 -ea</argLine>
           <includes>
             <include>**/*Test.java</include>
             <include>**/*TestCase.java</include>

http://git-wip-us.apache.org/repos/asf/any23/blob/a5f24cbb/service/src/main/assembly/LICENSE-server-embedded.txt
----------------------------------------------------------------------
diff --git a/service/src/main/assembly/LICENSE-server-embedded.txt b/service/src/main/assembly/LICENSE-server-embedded.txt
index 0f7b7c3..ada5751 100644
--- a/service/src/main/assembly/LICENSE-server-embedded.txt
+++ b/service/src/main/assembly/LICENSE-server-embedded.txt
@@ -232,39 +232,40 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 For the Twitter Bootstrap components (http://twitter.github.com/bootstrap/)
 This is licensed under the The Apache Software License, Version 2.0, see above
 
-For the OpenRDF Sesame components (http://www.openrdf.org/)
-Copyright Aduna (http://www.aduna-software.com/) \ufffd 2001-2011
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted
-provided that the following conditions are met:
-
-    Redistributions of source code must retain the above copyright notice, this list of conditions
-    and the following disclaimer.
-
-    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.
-
-    Neither the name of the copyright holder 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.
+For the Eclipse RDF4J components licensed under the Eclipse Distribution 
+License (a BSD-style license) 
+
+   Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors.
+   Copyright Aduna (http://www.aduna-software.com/) 2001-2013
+
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are met:
+
+   * Redistributions of source code must retain the above copyright notice, this
+     list of conditions and the following disclaimer.
+   * 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.
+   * Neither the name of the Eclipse Foundation, Inc. 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.
 
 For the Jetty Web Container (http://mortbay.com/)
 This is licensed under the Apache License v2.0, see above
 
-For the Aduna Commons components (http://www.aduna-software.org/)
-This is licensed under the Aduna BSD license, see above
-
 For the TagSoup component (http://home.ccil.org/~cowan/XML/tagsoup/)
 This is licensed under the The Apache Software License, Version 2.0, see above
 

http://git-wip-us.apache.org/repos/asf/any23/blob/a5f24cbb/service/src/main/assembly/LICENSE-with-deps.txt
----------------------------------------------------------------------
diff --git a/service/src/main/assembly/LICENSE-with-deps.txt b/service/src/main/assembly/LICENSE-with-deps.txt
index 119eb40..c480f37 100644
--- a/service/src/main/assembly/LICENSE-with-deps.txt
+++ b/service/src/main/assembly/LICENSE-with-deps.txt
@@ -235,35 +235,36 @@ This is licensed under the The Apache Software License, Version 2.0, see above
 For the simplePopup components (http://www.phpixel.fr/simple-popup/)
 TO BE DEFINED
 
-For the OpenRDF Sesame components (http://www.openrdf.org/)
-Copyright Aduna (http://www.aduna-software.com/) \ufffd 2001-2011
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted
-provided that the following conditions are met:
-
-    Redistributions of source code must retain the above copyright notice, this list of conditions
-    and the following disclaimer.
-
-    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.
-
-    Neither the name of the copyright holder 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.
-
-For the Aduna Commons components (http://www.aduna-software.org/)
-This is licensed under the Aduna BSD license, see above
+For the Eclipse RDF4J components licensed under the Eclipse Distribution 
+License (a BSD-style license) 
+
+   Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors.
+   Copyright Aduna (http://www.aduna-software.com/) 2001-2013
+
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are met:
+
+   * Redistributions of source code must retain the above copyright notice, this
+     list of conditions and the following disclaimer.
+   * 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.
+   * Neither the name of the Eclipse Foundation, Inc. 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.
 
 For the TagSoup component (http://home.ccil.org/~cowan/XML/tagsoup/)
 This is licensed under the The Apache Software License, Version 2.0, see above

http://git-wip-us.apache.org/repos/asf/any23/blob/a5f24cbb/src/site/apt/dev-data-conversion.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/dev-data-conversion.apt b/src/site/apt/dev-data-conversion.apt
index dd569c0..319eadd 100644
--- a/src/site/apt/dev-data-conversion.apt
+++ b/src/site/apt/dev-data-conversion.apt
@@ -64,7 +64,7 @@ Data Conversion
  A writer stores the extracted triples in some destination.
  We use an {{{./xref/org/apache/any23/writer/NTriplesWriter.html}NTriplesWriter}} here that writes
  into a <<ByteArrayOutputStream>>. The main <<RDF>> formats writers are available and it is possible also to store
- the triples directly into a <<Sesame>> repository to query them via <<SPARQL>>.
+ the triples directly into an <<RDF4J>> repository to query them via <<SPARQL>>.
  See {{{./xref/org/apache/any23/writer/RepositoryWriter.html}RepositoryWriter}} and the writer
  {{{./xref/org/apache/any23/writer/package-summary.html}package}}.