marmotta-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ja...@apache.org
Subject [3/3] git commit: Revert "Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta into develop"
Date Wed, 03 Apr 2013 13:59:23 GMT
Revert "Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta into develop"

This reverts commit 09906665136ad74f861deb69131ea099756ec810, reversing
changes made to 101ac6b86b0a0fbb271f0b5360956501e04e4beb.


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

Branch: refs/heads/develop
Commit: 094984842e2593c05009cf70540b7d35a20de3cb
Parents: 29b2258
Author: Jakob Frank <jakob.frank@salzburgresearch.at>
Authored: Wed Apr 3 15:55:30 2013 +0200
Committer: Jakob Frank <jakob.frank@salzburgresearch.at>
Committed: Wed Apr 3 15:55:30 2013 +0200

----------------------------------------------------------------------
 LICENSE.txt                                        |  601 ++-------------
 NOTICE.txt                                         |  130 +++-
 build/archetypes/marmotta-archetype-module/pom.xml |    2 +-
 build/archetypes/marmotta-archetype-webapp/pom.xml |    2 +-
 build/archetypes/pom.xml                           |    2 +-
 build/checkstyle-resources/pom.xml                 |    2 +-
 build/dependency-resource-supplement/pom.xml       |    2 +-
 build/plugins/buildinfo-maven-plugin/pom.xml       |    2 +-
 build/plugins/marmotta-maven-plugin/pom.xml        |    2 +-
 build/plugins/pom.xml                              |    2 +-
 build/plugins/refpack-maven-plugin/pom.xml         |    2 +-
 build/plugins/repocheck-maven-plugin/pom.xml       |    2 +-
 build/pom.xml                                      |    2 +-
 client/marmotta-client-java/pom.xml                |    2 +-
 client/marmotta-client-js/pom.xml                  |    2 +-
 client/pom.xml                                     |    2 +-
 commons/marmotta-commons/pom.xml                   |    2 +-
 commons/pom.xml                                    |    2 +-
 commons/sesame-filter/pom.xml                      |    2 +-
 commons/sesame-tools-facading/pom.xml              |    2 +-
 commons/sesame-tools-rio-api/pom.xml               |    2 +-
 commons/sesame-tools-rio-ical/pom.xml              |    2 +-
 commons/sesame-tools-rio-jsonld/pom.xml            |    2 +-
 commons/sesame-tools-rio-rdfjson/pom.xml           |    2 +-
 commons/sesame-tools-rio-rss/pom.xml               |    2 +-
 commons/sesame-tools-rio-vcard/pom.xml             |    2 +-
 extras/pom.xml                                     |    2 +-
 launchers/marmotta-installer/pom.xml               |    2 +-
 launchers/marmotta-splash/pom.xml                  |    2 +-
 launchers/marmotta-webapp/pom.xml                  |    2 +-
 launchers/pom.xml                                  |    2 +-
 libraries/kiwi/kiwi-contextaware/pom.xml           |    2 +-
 libraries/kiwi/kiwi-reasoner/pom.xml               |    2 +-
 libraries/kiwi/kiwi-transactions/pom.xml           |    2 +-
 libraries/kiwi/kiwi-triplestore/pom.xml            |    2 +-
 .../kiwi/persistence/KiWiGarbageCollector.java     |   15 +-
 .../marmotta/kiwi/persistence/KiWiPersistence.java |   20 -
 .../apache/marmotta/kiwi/test/PersistenceTest.java |   74 --
 libraries/kiwi/kiwi-tripletable/pom.xml            |    2 +-
 libraries/kiwi/kiwi-versioning/pom.xml             |    2 +-
 .../versioning/test/VersioningPersistenceTest.java |   29 +-
 libraries/kiwi/pom.xml                             |    2 +-
 libraries/ldcache/ldcache-api/pom.xml              |    2 +-
 libraries/ldcache/ldcache-backend-ehcache/pom.xml  |    2 +-
 libraries/ldcache/ldcache-backend-file/pom.xml     |    2 +-
 libraries/ldcache/ldcache-backend-kiwi/pom.xml     |    2 +-
 libraries/ldcache/ldcache-core/pom.xml             |    2 +-
 libraries/ldcache/ldcache-sail-generic/pom.xml     |    2 +-
 libraries/ldcache/ldcache-sail-kiwi/pom.xml        |    2 +-
 libraries/ldcache/pom.xml                          |    2 +-
 libraries/ldclient/ldclient-api/pom.xml            |    2 +-
 libraries/ldclient/ldclient-core/pom.xml           |    2 +-
 .../ldclient/ldclient-provider-facebook/pom.xml    |    2 +-
 libraries/ldclient/ldclient-provider-html/pom.xml  |    2 +-
 libraries/ldclient/ldclient-provider-ldap/pom.xml  |    2 +-
 .../ldclient/ldclient-provider-mediawiki/pom.xml   |    2 +-
 libraries/ldclient/ldclient-provider-phpbb/pom.xml |    2 +-
 libraries/ldclient/ldclient-provider-rdf/pom.xml   |    2 +-
 libraries/ldclient/ldclient-provider-rdfa/pom.xml  |    2 +-
 libraries/ldclient/ldclient-provider-vimeo/pom.xml |    2 +-
 libraries/ldclient/ldclient-provider-xml/pom.xml   |    2 +-
 .../ldclient/ldclient-provider-youtube/pom.xml     |    2 +-
 libraries/ldclient/pom.xml                         |    2 +-
 libraries/ldpath/ldpath-api/pom.xml                |    2 +-
 libraries/ldpath/ldpath-backend-file/pom.xml       |    2 +-
 libraries/ldpath/ldpath-backend-jena/pom.xml       |    2 +-
 libraries/ldpath/ldpath-backend-linkeddata/pom.xml |    2 +-
 libraries/ldpath/ldpath-backend-sesame/pom.xml     |    2 +-
 libraries/ldpath/ldpath-core/pom.xml               |    2 +-
 .../ldpath/parser/DefaultConfiguration.java        |    4 +-
 .../ldpath/ldpath-functions-collections/pom.xml    |    2 +-
 libraries/ldpath/ldpath-functions-date/pom.xml     |    2 +-
 libraries/ldpath/ldpath-functions-html/pom.xml     |    2 +-
 libraries/ldpath/ldpath-functions-math/pom.xml     |    2 +-
 libraries/ldpath/ldpath-functions-text/pom.xml     |    2 +-
 libraries/ldpath/ldpath-functions-xml/pom.xml      |    2 +-
 .../ldpath/ldpath-template-linkeddata/pom.xml      |    2 +-
 libraries/ldpath/ldpath-template/pom.xml           |    2 +-
 libraries/ldpath/pom.xml                           |    2 +-
 libraries/pom.xml                                  |    2 +-
 parent/pom.xml                                     |    8 +-
 platform/marmotta-core/pom.xml                     |    2 +-
 .../resources/web/public/style/scheme/dark.css     |    8 -
 platform/marmotta-ldcache/pom.xml                  |    2 +-
 platform/marmotta-ldpath/pom.xml                   |    2 +-
 .../src/main/resources/web/cm/LICENSE.txt          |   23 -
 .../src/main/resources/web/cm/codemirror.css       |   37 +-
 .../src/main/resources/web/cm/codemirror.js        |   37 +-
 .../src/main/resources/web/cm/ldpath.js            |   36 +-
 .../src/main/resources/web/cm/simple-hint.css      |   34 +-
 .../src/main/resources/web/cm/simple-hint.js       |   36 +-
 platform/marmotta-reasoner/pom.xml                 |    2 +-
 platform/marmotta-security/pom.xml                 |    2 +-
 platform/marmotta-sparql/pom.xml                   |    2 +-
 .../web/admin/editor/flint_sparql_editor.html      |   50 +-
 .../resources/web/admin/editor/sparql/css/docs.css |   35 +-
 .../resources/web/admin/editor/sparql/css/font.js  |    2 -
 .../web/admin/editor/sparql/css/sparqlcolors.css   |   35 +-
 .../web/admin/editor/sparql/flint-editor.js        |   34 +-
 .../web/admin/editor/sparql/init-local.js          |   35 +-
 .../web/admin/editor/sparql/init-openuplabs.js     |   35 +-
 .../web/admin/editor/sparql/init-sparqlservice.js  |   35 +-
 .../web/admin/editor/sparql/lib/codemirror.css     |   35 +-
 .../web/admin/editor/sparql/lib/codemirror.js      |   37 +-
 .../web/admin/editor/sparql/lib/overlay.js         |   43 +-
 .../web/admin/editor/sparql/lib/runmode.js         |   36 +-
 .../web/admin/editor/sparql/sparqlParser.js        |   33 +-
 .../web/admin/editor/sparql/sparqlmode.js          |   33 +-
 .../web/admin/editor/sparql/sparqlmode_ll1.js      |   33 +-
 .../src/main/resources/web/admin/snorql/NOTICE     |    5 -
 .../main/resources/web/admin/snorql/namespaces.js  |    2 -
 .../main/resources/web/admin/snorql/prototype.js   |   19 +-
 .../web/admin/snorql/scriptaculous/builder.js      |   17 +
 .../web/admin/snorql/scriptaculous/controls.js     |   17 +
 .../web/admin/snorql/scriptaculous/dragdrop.js     |   22 +-
 .../web/admin/snorql/scriptaculous/effects.js      |   22 +-
 .../admin/snorql/scriptaculous/scriptaculous.js    |   24 +-
 .../web/admin/snorql/scriptaculous/slider.js       |   22 +-
 .../web/admin/snorql/scriptaculous/sound.js        |   22 +-
 .../web/admin/snorql/scriptaculous/unittest.js     |   24 +-
 .../main/resources/web/admin/snorql/snorql.html    |    1 -
 .../src/main/resources/web/admin/snorql/snorql.js  |    2 -
 .../src/main/resources/web/admin/snorql/sparql.js  |   17 +
 .../src/main/resources/web/admin/snorql/style.css  |    2 -
 .../src/main/resources/web/cm/LICENSE.txt          |   23 -
 .../src/main/resources/web/cm/codemirror.css       |   34 +-
 .../src/main/resources/web/cm/codemirror.js        |   37 +-
 .../src/main/resources/web/cm/simple-hint.css      |   35 +-
 .../src/main/resources/web/cm/simple-hint.js       |   37 +-
 .../src/main/resources/web/cm/sparql.js            |   37 +-
 platform/marmotta-user/pom.xml                     |    2 +-
 platform/marmotta-versioning/pom.xml               |    2 +-
 platform/pom.xml                                   |    2 +-
 pom.xml                                            |   27 +-
 134 files changed, 820 insertions(+), 1395 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
index 85a36dd..ada0127 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,5 +1,4 @@
- 
-                                Apache License
+                                 Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
 
@@ -202,570 +201,62 @@
    limitations under the License.
 
 
+==============================================================================
+==  New (3-clause) BSD License                                              ==
+==============================================================================
 
-Apache Marmotta subcomponents:
-=============================
+Copyright (c) <YEAR>, <OWNER> (see NOTICE)
+All rights reserved.
 
-The Apache Marmotta project includes a number of subcomponents (libraries) from 
-external projects with separate copyright notices and license terms. Your use of 
-the code for the these subcomponents is subject to the terms and conditions of the 
-following licenses.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-For the D3.js component,
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
 
-    located at:
-        platform/marmotta-core/src/main/resources/web/admin/js/lib/
-        platform/marmotta-sparql/src/main/resources/web/admin/sgvizler/0.5/lib/
+ 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.
 
-    Copyright (c) 2013 Michael Bostock, http://d3js.org
+ 3. Neither the name of the <ORGANIZATION> nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
 
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
+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 HOLDER 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.
 
-    * Redistributions of source code must retain the above copyright notice, this
-      list of conditions and the following disclaimer.
+==============================================================================
+==  MIT License                                                             ==
+==============================================================================
 
-    * 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.
+Copyright (c) <year> <copyright holders>  (see NOTICE)
 
-    * The name Michael Bostock may not be used to endorse or promote products
-      derived from this software without specific prior written permission.
+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:
 
-    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 MICHAEL BOSTOCK 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.
+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.
 
-For the Dracula Graph Library component,
 
-    located at:
-        platform/marmotta-core/src/main/resources/web/admin/js/lib/
-
-    Copyright (c) 2013 Johann Philipp Strathausen, http://www.graphdracula.net
-
-    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.
-
-
-For the strftime component,
-
-    located at:
-        platform/marmotta-core/src/main/resources/web/public/js/lib
-
-    Copyright (c) 2008 Philip S Tellis, http://hacks.bluesmoon.info/strftime
-
-    Redistribution and use of this software 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.
-       * The names of the contributors to this file may not 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 jQuery component,
-
-    located at:
-        platform/marmotta-core/src/main/resources/web/public/js/lib
-
-    Copyright (c) 2013 jQuery Foundation, http://jquery.com
-
-    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.
-
-
-For the CodeMirror component,
-
-    located at:
-        platform/marmotta-ldpath/src/main/resources/web/cm
-        platform/marmotta-sparql/src/main/resources/web/cm
-        platform/marmotta-sparql/src/main/resources/web/admin/editor/sparql/lib
-
-    Copyright (c) 2013 Marijn Haverbeke, http://codemirror.net
-
-    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.
-
-
-For the D2R Snorql component,
-
-    located at:
-        platform/marmotta-sparql/src/main/resources/web/admin/snorql
-
-    Copyright (c) 2007 Richard Cyganiak, http://www4.wiwiss.fu-berlin.de/bizer/d2r-server/
-    with some minor modifications for Apache Marmotta.
-
-    D2R Snorql is provided under the Apache License, version 2.0.
-    
-
-For the script.aculo.us component,
-
-    located at:
-        platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous
-
-    Copyright (c) 2010 Thomas Fuchs, http://script.aculo.us
-
-    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.
-
-
-For the Prototype component,
-
-    located at:
-        platform/marmotta-sparql/src/main/resources/web/admin/snorql
-
-    Copyright (c) 2010 Sam Stephenson, http://prototypejs.org
-
-    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.    
-
-
-For the SPARQL Flint Editor component, 
-
-    located at:
-        platform/marmotta-sparql/src/main/resources/web/admin/editor/
-
-    Copyright (c) 2011 TSO Ltd, http://github.com/TSO-Openup/FlintSparqlEditor
-
-    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.   
-
-
-For the Sgvizler component,
-
-    located at:
-        platform/marmotta-core/src/main/resources/web/admin/js/lib
-        platform/marmotta-sparql/src/main/resources/web/admin/sgvizler
-
-    Copyright (c) 2011 Martin G. Skjæveland, http://sgvizler.googlecode.com
-
-    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. 
-
-
-
-Apache Marmotta 3rd party source code:
-=====================================
-
-Due some restrictions (artifacts availability, custom patches, etc.), the Apache 
-Marmotta project directly includes some code of a number of subcomponents from 
-external projects with separate copyright notices and license terms. Your use of 
-the code for the these subcomponents is subject to the terms and conditions of 
-the following licenses.
-
-For the MigLayout component,
-
-    located at:
-        launchers/marmotta-splash/src/ext/java
-
-    Copyright (c) 2004 MiG InfoCom AB, http://www.migcalendar.com/miglayout
-
-    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. Neither the name of the MiG InfoCom AB 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 HOLDER 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 SwingBits component,
-
-    located at:
-        launchers/marmotta-splash/src/ext/java
-
-    Copyright (c) 2006 EzWare, http://swingbits.sourceforge.net
-
-    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. Neither the name of the EzWare 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 HOLDER 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 ROME component,
-
-    located at:
-        commons/sesame-tools-rio-rss/src/ext/java/
-
-    Copyright (c) 2004 Sun Microsystems, http://rometools.jira.com
-    with some minor modifications for Apache Marmotta.
-
-    ROME is provided under the Apache License, version 2.0.
-
-
-For the JSONLD-Java component,
-
-    located at:
-        commons/sesame-tools-rio-jsonld/src/ext/java/
-
-    Copyright (c) 2012, Deutsches Forschungszentrum für Künstliche Intelligenz
-    GmbH, http://github.com/tristan/jsonld-java
-
-    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 Deutsches Forschungszentrum für Künstliche 
-        Intelligenz GmbH 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 HOLDER 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.
-        
-
-
-Apache Marmotta 3rd party data files:
-====================================
-
-The Apache Marmotta project directly includes some testsuite data file of a number 
-of subcomponents from external projects with separate copyright notices and license 
-terms. Your use of the code for the these subcomponents is subject to the terms and 
-conditions of the following licenses.
-
-For the JSON-LD component,
-
-    located at:
-        commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/
-
-    Public Domain (Creative Commons Zero license) without copyright, 
-    http://json-ld.org/test-suite
-
-    CC0 1.0 Universal
-
-        CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
-        LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
-        ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
-        INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-        REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
-        PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
-        THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
-        HEREUNDER.
-
-    Statement of Purpose
-
-    The laws of most jurisdictions throughout the world automatically confer
-    exclusive Copyright and Related Rights (defined below) upon the creator
-    and subsequent owner(s) (each and all, an "owner") of an original work of
-    authorship and/or a database (each, a "Work").
-
-    Certain owners wish to permanently relinquish those rights to a Work for
-    the purpose of contributing to a commons of creative, cultural and
-    scientific works ("Commons") that the public can reliably and without fear
-    of later claims of infringement build upon, modify, incorporate in other
-    works, reuse and redistribute as freely as possible in any form whatsoever
-    and for any purposes, including without limitation commercial purposes.
-    These owners may contribute to the Commons to promote the ideal of a free
-    culture and the further production of creative, cultural and scientific
-    works, or to gain reputation or greater distribution for their Work in
-    part through the use and efforts of others.
-
-    For these and/or other purposes and motivations, and without any
-    expectation of additional consideration or compensation, the person
-    associating CC0 with a Work (the "Affirmer"), to the extent that he or she
-    is an owner of Copyright and Related Rights in the Work, voluntarily
-    elects to apply CC0 to the Work and publicly distribute the Work under its
-    terms, with knowledge of his or her Copyright and Related Rights in the
-    Work and the meaning and intended legal effect of CC0 on those rights.
-
-    1. Copyright and Related Rights. A Work made available under CC0 may be
-    protected by copyright and related or neighboring rights ("Copyright and
-    Related Rights"). Copyright and Related Rights include, but are not
-    limited to, the following:
-
-      i. the right to reproduce, adapt, distribute, perform, display,
-         communicate, and translate a Work;
-     ii. moral rights retained by the original author(s) and/or performer(s);
-    iii. publicity and privacy rights pertaining to a person's image or
-         likeness depicted in a Work;
-     iv. rights protecting against unfair competition in regards to a Work,
-         subject to the limitations in paragraph 4(a), below;
-      v. rights protecting the extraction, dissemination, use and reuse of data
-         in a Work;
-     vi. database rights (such as those arising under Directive 96/9/EC of the
-         European Parliament and of the Council of 11 March 1996 on the legal
-         protection of databases, and under any national implementation
-         thereof, including any amended or successor version of such
-         directive); and
-    vii. other similar, equivalent or corresponding rights throughout the
-         world based on applicable law or treaty, and any national
-         implementations thereof.
-
-    2. Waiver. To the greatest extent permitted by, but not in contravention
-    of, applicable law, Affirmer hereby overtly, fully, permanently,
-    irrevocably and unconditionally waives, abandons, and surrenders all of
-    Affirmer's Copyright and Related Rights and associated claims and causes
-    of action, whether now known or unknown (including existing as well as
-    future claims and causes of action), in the Work (i) in all territories
-    worldwide, (ii) for the maximum duration provided by applicable law or
-    treaty (including future time extensions), (iii) in any current or future
-    medium and for any number of copies, and (iv) for any purpose whatsoever,
-    including without limitation commercial, advertising or promotional
-    purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
-    member of the public at large and to the detriment of Affirmer's heirs and
-    successors, fully intending that such Waiver shall not be subject to
-    revocation, rescission, cancellation, termination, or any other legal or
-    equitable action to disrupt the quiet enjoyment of the Work by the public
-    as contemplated by Affirmer's express Statement of Purpose.
-
-    3. Public License Fallback. Should any part of the Waiver for any reason
-    be judged legally invalid or ineffective under applicable law, then the
-    Waiver shall be preserved to the maximum extent permitted taking into
-    account Affirmer's express Statement of Purpose. In addition, to the
-    extent the Waiver is so judged Affirmer hereby grants to each affected
-    person a royalty-free, non transferable, non sublicensable, non exclusive,
-    irrevocable and unconditional license to exercise Affirmer's Copyright and
-    Related Rights in the Work (i) in all territories worldwide, (ii) for the
-    maximum duration provided by applicable law or treaty (including future
-    time extensions), (iii) in any current or future medium and for any number
-    of copies, and (iv) for any purpose whatsoever, including without
-    limitation commercial, advertising or promotional purposes (the
-    "License"). The License shall be deemed effective as of the date CC0 was
-    applied by Affirmer to the Work. Should any part of the License for any
-    reason be judged legally invalid or ineffective under applicable law, such
-    partial invalidity or ineffectiveness shall not invalidate the remainder
-    of the License, and in such case Affirmer hereby affirms that he or she
-    will not (i) exercise any of his or her remaining Copyright and Related
-    Rights in the Work or (ii) assert any associated claims and causes of
-    action with respect to the Work, in either case contrary to Affirmer's
-    express Statement of Purpose.
-
-    4. Limitations and Disclaimers.
-
-     a. No trademark or patent rights held by Affirmer are waived, abandoned,
-        surrendered, licensed or otherwise affected by this document.
-     b. Affirmer offers the Work as-is and makes no representations or
-        warranties of any kind concerning the Work, express, implied,
-        statutory or otherwise, including without limitation warranties of
-        title, merchantability, fitness for a particular purpose, non
-        infringement, or the absence of latent or other defects, accuracy, or
-        the present or absence of errors, whether or not discoverable, all to
-        the greatest extent permissible under applicable law.
-     c. Affirmer disclaims responsibility for clearing rights of other persons
-        that may apply to the Work or any use thereof, including without
-        limitation any person's Copyright and Related Rights in the Work.
-        Further, Affirmer disclaims responsibility for obtaining any necessary
-        consents, permissions or other rights required for any use of the
-        Work.
-     d. Affirmer understands and acknowledges that Creative Commons is not a
-        party to this document and has no duty or obligation with respect to
-        this CC0 or use of the Work.
-
-
-For the ical4j component,
-
-    located at:
-        commons/sesame-tools-rio-vcard/src/test/resources/org/apache/marmotta/commons/sesame/rio/vcard/
-
-    Copyright (c) 2011 Ben Fortuna, http://ical4j.googlecode.com
-
-    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 Ben Fortuna 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 HOLDER 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/incubator-marmotta/blob/09498484/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
index 58b42ff..22f8d89 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,6 +1,6 @@
 Apache Marmotta, Copyright 2012-2013 The Apache Software Foundation
 
-This product includes software developed at The Apache Software Foundation (http://www.apache.org).
+This product includes software developed at The Apache Software Foundation (http://www.apache.org/).
 
 Portions of this software were originally based on the following:
 
@@ -8,69 +8,131 @@ Portions of this software were originally based on the following:
 
 These have been licensed to the Apache Software Foundation under a software grant.
 
-This product also includes the following third-party components:
 
-* D3.js, http://d3js.org
+==============================================================================
+Javascript Libraries included in Marmotta Platform
+==============================================================================
 
-  Copyright (c) 2013 Michael Bostock
+D3.js is copyright (c) 2013, Michael Bostock and licensed under New BSD
+License. The source code is available at https://github.com/mbostock/d3
 
-* Dracula Graph Library, http://www.graphdracula.net
+Source Locations:
+- platform/marmotta-core/src/main/resources/web/admin/js/lib/
+- platform/marmotta-sparql/src/main/resources/web/admin/sgvizler/0.5/lib/
 
-  Copyright (c) 2013 Johann Philipp Strathausen
 
-* strftime, http://hacks.bluesmoon.info/strftime
+The Dracula Graph Library is (c) 2010 by Johann Philipp Strathausen
+<strathausen@gmail.com> and licensed under MIT License. The source code is
+available at https://github.com/strathausen/dracula
 
-  Copyright (c) 2008 Philip S Tellis
+Source Locations:
+- platform/marmotta-core/src/main/resources/web/admin/js/lib/
 
-* jQuery, http://jquery.com
 
-  Copyright (c) 2013 jQuery Foundation
+The strftime library is copyright (c) 2008, Philip S Tellis
+<philip@bluesmoon.info> and licensed under New BSD License. The source code
+is available at http://hacks.bluesmoon.info/strftime/files.html
 
-* CodeMirror, http://codemirror.net
+Source Locations:
+- platform/marmotta-core/src/main/resources/web/public/js/lib
 
-  Copyright (c) 2013 Marijn Haverbeke
 
-* D2R Snorql, http://www4.wiwiss.fu-berlin.de/bizer/d2r-server/,
+The JQuery Library is copyright 2013 jQuery Foundation and other contributors,
+and licensed under MIT License. The source code is available at
+https://github.com/jquery/jquery
 
-  Copyright (c) 2007 Richard Cyganiak
+Source Locations:
+- platform/marmotta-core/src/main/resources/web/public/js/lib
 
-* script.aculo.us, http://script.aculo.us
 
-  Copyright (c) 2010 Thomas Fuchs
+The CodeMirror Library is copyright (C) 2013 by Marijn Haverbeke
+<marijnh@gmail.com> and licensed under MIT License. The source code is
+available at https://github.com/marijnh/CodeMirror
 
-* Prototype, http://prototypejs.org
+Source Locations:
+- platform/marmotta-ldpath/src/main/resources/web/cm
+- platform/marmotta-sparql/src/main/resources/web/cm
+- platform/marmotta-sparql/src/main/resources/web/admin/editor/sparql/lib
 
-  Copyright (c) 2010 Sam Stephenson
 
-* SPARQL Flint Editor, http://github.com/TSO-Openup/FlintSparqlEditor
+The D2R Snorql Library was originally created by Richard Cyganaik
+(http://richard.cyganiak.de/) for the D2R server project
+(http://www4.wiwiss.fu-berlin.de/bizer/d2r-server/). It is licensed under the
+Apache Software License 2.0. The source code is available at
+https://github.com/kurtjx/SNORQL
 
-  Copyright (c) 2011 TSO Ltd
+Source Locations:
+- platform/marmotta-sparql/src/main/resources/web/admin/snorql
 
-* Sgvizler, http://sgvizler.googlecode.com
 
-  Copyright (c) 2011 Martin G. Skjæveland
+The script.aculo.us library is copyright (c) 2005-2010 Thomas Fuchs and is
+licensed under MIT License. The source code is available at
+https://github.com/madrobby/scriptaculous
 
-* MigLayout, http://www.migcalendar.com/miglayout
+Source Locations:
+- platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous
 
-  Copyright (c) 2004 MiG InfoCom AB
 
-* SwingBits, http://swingbits.sourceforge.net
+The Prototype Library is copyright (c) 2005-2010 Sam Stephenson and is
+licensed under MIT License. The source code is available at
+https://github.com/sstephenson/prototype
 
-  Copyright (c) 2006 EzWare
+Source Locations:
+- platform/marmotta-sparql/src/main/resources/web/admin/snorql
 
-* ROME, http://rometools.jira.com
 
-  Copyright (c) 2004 Sun Microsystems
+The SPARQL Flint Editor is copyright (c) 2011 TSO Ltd and is licensed under
+MIT License. The source code is available at
+https://github.com/TSO-Openup/FlintSparqlEditor
 
-* JSONLD-Java, http://github.com/tristan/jsonld-java
+Source Locations:
+- platform/marmotta-sparql/src/main/resources/web/admin/editor/
 
-  Copyright (c) 2012, Deutsches Forschungszentrum für Künstliche Intelligenz GmbH
 
-* JSON-LD Test Suite, http://json-ld.org/test-suite
+The Sgvizler Library is copyright (c) 2011 Martin G. Skjæveland and is
+licensed under MIT License. The source code is available at
+https://code.google.com/p/sgvizler/source
 
-  Public Domain (Creative Commons Zero license) without copyright
+Source Locations:
+- platform/marmotta-core/src/main/resources/web/admin/js/lib
+- platform/marmotta-sparql/src/main/resources/web/admin/sgvizler
 
-* ical4j test suite, http://ical4j.googlecode.com
 
-  Copyright (c) 2011 Ben Fortuna
+==============================================================================
+3rd Party Source Code
+==============================================================================
 
+The module launchers/marmotta-splash contains source code from the projects
+MigLayout and SwingBits, which has the following copyrights:
+
+The MigLayout library is copyright (c) 2004, Mikael Grev, MiG InfoCom AB, and
+licensed under a New BSD License. The source code is available at
+http://www.migcalendar.com/miglayout/versions/
+
+The SwingBits library is copyright (C) 2006 Michael Hjembaek, and licensed
+under a New BSD License. The source code is available at
+http://swingbits.sourceforge.net/
+
+
+The module commons/sesame-tools-rio-rss contains source code from the
+orphaned ROME project. ROME has copyright 2004 Sun Microsystems, Inc.
+and copyright 2011 The ROME Team, and is licensed under Apache License 2.0.
+The source code is available at
+https://rometools.jira.com/source/browse/ROME/trunk
+
+
+The module commons/sesame-tools-rio-jsonld contains source code from the
+JSONLD-Java project. JSONLD-Java is copyright (c) 2012, Deutsches
+Forschungszentrum für Künstliche Intelligenz GmbH and licensed under a
+New BSD License. The source code is available at
+https://github.com/tristan/jsonld-java
+
+
+==============================================================================
+3rd Party Data Files
+==============================================================================
+
+The test sources for commons/sesame-tools-rio-jsonld contain the data files
+from the JSON-LD Test Suite. The JSON-LD Test Suite is published as public
+domain (with a Creative Commons Zero license and without copyright). The
+source code is available at https://github.com/json-ld/json-ld.org
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/build/archetypes/marmotta-archetype-module/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-module/pom.xml b/build/archetypes/marmotta-archetype-module/pom.xml
index 715bfb9..15ab89d 100644
--- a/build/archetypes/marmotta-archetype-module/pom.xml
+++ b/build/archetypes/marmotta-archetype-module/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>marmotta-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../../../parent</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/build/archetypes/marmotta-archetype-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/pom.xml b/build/archetypes/marmotta-archetype-webapp/pom.xml
index 6db894d..dde1896 100644
--- a/build/archetypes/marmotta-archetype-webapp/pom.xml
+++ b/build/archetypes/marmotta-archetype-webapp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>marmotta-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../../../parent</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/build/archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/pom.xml b/build/archetypes/pom.xml
index b3ab06d..bb1c01b 100644
--- a/build/archetypes/pom.xml
+++ b/build/archetypes/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>marmotta-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../../parent</relativePath>
     </parent>
     <artifactId>archetypes-reactor</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/build/checkstyle-resources/pom.xml
----------------------------------------------------------------------
diff --git a/build/checkstyle-resources/pom.xml b/build/checkstyle-resources/pom.xml
index 45f30fb..2a55e83 100644
--- a/build/checkstyle-resources/pom.xml
+++ b/build/checkstyle-resources/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>marmotta-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../../parent</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/build/dependency-resource-supplement/pom.xml
----------------------------------------------------------------------
diff --git a/build/dependency-resource-supplement/pom.xml b/build/dependency-resource-supplement/pom.xml
index a1696f6..d9eb75a 100644
--- a/build/dependency-resource-supplement/pom.xml
+++ b/build/dependency-resource-supplement/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>marmotta-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../../parent</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/build/plugins/buildinfo-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/buildinfo-maven-plugin/pom.xml b/build/plugins/buildinfo-maven-plugin/pom.xml
index 251268f..ab3bf6a 100644
--- a/build/plugins/buildinfo-maven-plugin/pom.xml
+++ b/build/plugins/buildinfo-maven-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>marmotta-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../../../parent</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/build/plugins/marmotta-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/marmotta-maven-plugin/pom.xml b/build/plugins/marmotta-maven-plugin/pom.xml
index e6ae50a..eb4f2ca 100644
--- a/build/plugins/marmotta-maven-plugin/pom.xml
+++ b/build/plugins/marmotta-maven-plugin/pom.xml
@@ -20,7 +20,7 @@
 
     <parent>
         <groupId>org.apache.marmotta</groupId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../</relativePath>
         <artifactId>plugins-reactor</artifactId>
     </parent>

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/build/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/pom.xml b/build/plugins/pom.xml
index 318c492..d25196d 100644
--- a/build/plugins/pom.xml
+++ b/build/plugins/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>marmotta-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../../parent</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/build/plugins/refpack-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/refpack-maven-plugin/pom.xml b/build/plugins/refpack-maven-plugin/pom.xml
index 3a89d0e..50671aa 100644
--- a/build/plugins/refpack-maven-plugin/pom.xml
+++ b/build/plugins/refpack-maven-plugin/pom.xml
@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>org.apache.marmotta</groupId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <artifactId>plugins-reactor</artifactId>
         <relativePath>../</relativePath>
     </parent>

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/build/plugins/repocheck-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/repocheck-maven-plugin/pom.xml b/build/plugins/repocheck-maven-plugin/pom.xml
index 4e9a097..3da02ac 100644
--- a/build/plugins/repocheck-maven-plugin/pom.xml
+++ b/build/plugins/repocheck-maven-plugin/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>plugins-reactor</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../</relativePath>
         <!-- <artifactId>maven-plugins</artifactId> <groupId>org.apache.maven.plugins</groupId> 
             <version>23</version> <relativePath /> -->

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/build/pom.xml
----------------------------------------------------------------------
diff --git a/build/pom.xml b/build/pom.xml
index 96512e8..b6b8359 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>marmotta-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/client/marmotta-client-java/pom.xml
----------------------------------------------------------------------
diff --git a/client/marmotta-client-java/pom.xml b/client/marmotta-client-java/pom.xml
index 4b986b5..a083897 100644
--- a/client/marmotta-client-java/pom.xml
+++ b/client/marmotta-client-java/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>marmotta-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../../parent</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/client/marmotta-client-js/pom.xml
----------------------------------------------------------------------
diff --git a/client/marmotta-client-js/pom.xml b/client/marmotta-client-js/pom.xml
index 78aa907..2213ba3 100644
--- a/client/marmotta-client-js/pom.xml
+++ b/client/marmotta-client-js/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>marmotta-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 13180c7..f63e640 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>marmotta-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/commons/marmotta-commons/pom.xml
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/pom.xml b/commons/marmotta-commons/pom.xml
index 2a4fa1d..53b4a06 100644
--- a/commons/marmotta-commons/pom.xml
+++ b/commons/marmotta-commons/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>marmotta-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../../parent</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/commons/pom.xml
----------------------------------------------------------------------
diff --git a/commons/pom.xml b/commons/pom.xml
index b79b5d4..05b28bf 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>marmotta-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/commons/sesame-filter/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-filter/pom.xml b/commons/sesame-filter/pom.xml
index 4054eca..10c433e 100644
--- a/commons/sesame-filter/pom.xml
+++ b/commons/sesame-filter/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>marmotta-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../../parent</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/commons/sesame-tools-facading/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/pom.xml b/commons/sesame-tools-facading/pom.xml
index f98e2f1..021b47a 100644
--- a/commons/sesame-tools-facading/pom.xml
+++ b/commons/sesame-tools-facading/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>marmotta-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../../parent</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/commons/sesame-tools-rio-api/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-api/pom.xml b/commons/sesame-tools-rio-api/pom.xml
index 2f8e912..18c3eee 100644
--- a/commons/sesame-tools-rio-api/pom.xml
+++ b/commons/sesame-tools-rio-api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>marmotta-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../../parent</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/commons/sesame-tools-rio-ical/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-ical/pom.xml b/commons/sesame-tools-rio-ical/pom.xml
index cbab00c..3414eed 100644
--- a/commons/sesame-tools-rio-ical/pom.xml
+++ b/commons/sesame-tools-rio-ical/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>marmotta-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../../parent</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/commons/sesame-tools-rio-jsonld/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/pom.xml b/commons/sesame-tools-rio-jsonld/pom.xml
index b2cde39..028556c 100644
--- a/commons/sesame-tools-rio-jsonld/pom.xml
+++ b/commons/sesame-tools-rio-jsonld/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>marmotta-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../../parent</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/commons/sesame-tools-rio-rdfjson/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-rdfjson/pom.xml b/commons/sesame-tools-rio-rdfjson/pom.xml
index fd2f480..da00181 100644
--- a/commons/sesame-tools-rio-rdfjson/pom.xml
+++ b/commons/sesame-tools-rio-rdfjson/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>marmotta-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../../parent</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/commons/sesame-tools-rio-rss/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-rss/pom.xml b/commons/sesame-tools-rio-rss/pom.xml
index 90e5be9..5dd8f40 100644
--- a/commons/sesame-tools-rio-rss/pom.xml
+++ b/commons/sesame-tools-rio-rss/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>marmotta-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../../parent</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/commons/sesame-tools-rio-vcard/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-vcard/pom.xml b/commons/sesame-tools-rio-vcard/pom.xml
index 1620100..6d88340 100644
--- a/commons/sesame-tools-rio-vcard/pom.xml
+++ b/commons/sesame-tools-rio-vcard/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>marmotta-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../../parent</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/extras/pom.xml
----------------------------------------------------------------------
diff --git a/extras/pom.xml b/extras/pom.xml
index 51b89f1..4d9cf28 100644
--- a/extras/pom.xml
+++ b/extras/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>marmotta-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/launchers/marmotta-installer/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/pom.xml b/launchers/marmotta-installer/pom.xml
index 36d5baa..6023723 100644
--- a/launchers/marmotta-installer/pom.xml
+++ b/launchers/marmotta-installer/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>marmotta-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../../parent</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/launchers/marmotta-splash/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-splash/pom.xml b/launchers/marmotta-splash/pom.xml
index 949bed6..2d67d85 100644
--- a/launchers/marmotta-splash/pom.xml
+++ b/launchers/marmotta-splash/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>marmotta-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../../parent</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/launchers/marmotta-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
index 91afcc8..4649c5c 100644
--- a/launchers/marmotta-webapp/pom.xml
+++ b/launchers/marmotta-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>marmotta-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../../parent</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/launchers/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/pom.xml b/launchers/pom.xml
index f0e15e4..01fc15b 100644
--- a/launchers/pom.xml
+++ b/launchers/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>marmotta-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/libraries/kiwi/kiwi-contextaware/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-contextaware/pom.xml b/libraries/kiwi/kiwi-contextaware/pom.xml
index 822f240..ce9fda9 100644
--- a/libraries/kiwi/kiwi-contextaware/pom.xml
+++ b/libraries/kiwi/kiwi-contextaware/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>kiwi-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/libraries/kiwi/kiwi-reasoner/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/pom.xml b/libraries/kiwi/kiwi-reasoner/pom.xml
index f46f1fa..8d77e79 100644
--- a/libraries/kiwi/kiwi-reasoner/pom.xml
+++ b/libraries/kiwi/kiwi-reasoner/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>kiwi-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/libraries/kiwi/kiwi-transactions/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-transactions/pom.xml b/libraries/kiwi/kiwi-transactions/pom.xml
index 21dd8e0..4be1e0a 100644
--- a/libraries/kiwi/kiwi-transactions/pom.xml
+++ b/libraries/kiwi/kiwi-transactions/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>kiwi-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/libraries/kiwi/kiwi-triplestore/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/pom.xml b/libraries/kiwi/kiwi-triplestore/pom.xml
index af3f054..6249f8d 100644
--- a/libraries/kiwi/kiwi-triplestore/pom.xml
+++ b/libraries/kiwi/kiwi-triplestore/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>kiwi-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiGarbageCollector.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiGarbageCollector.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiGarbageCollector.java
index 7d674a5..f832dd8 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiGarbageCollector.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiGarbageCollector.java
@@ -99,7 +99,7 @@ public class KiWiGarbageCollector extends Thread {
     }
 
 
-    protected int garbageCollect() throws SQLException {
+    private int garbageCollect() throws SQLException {
         round++;
 
         Connection con = persistence.getJDBCConnection();
@@ -190,12 +190,13 @@ public class KiWiGarbageCollector extends Thread {
         builder.append("DELETE FROM triples WHERE deleted = true");
 
         if(tripleTableDependencies.size() > 0) {
+            builder.append(" AND NOT EXISTS (");
 
             Iterator<TableDependency> iterator = tripleTableDependencies.iterator();
             while (iterator.hasNext()) {
                 TableDependency next = iterator.next();
 
-                builder.append(" AND NOT EXISTS (");
+                builder.append("(");
                 builder.append("SELECT ");
                 builder.append(next.column);
                 builder.append(" FROM ");
@@ -205,8 +206,13 @@ public class KiWiGarbageCollector extends Thread {
                 builder.append(" = triples.id");
 
                 builder.append(")");
+
+                if(iterator.hasNext()) {
+                    builder.append(" UNION ");
+                }
             }
 
+            builder.append(")");
         }
         return builder.toString();
     }
@@ -222,6 +228,7 @@ public class KiWiGarbageCollector extends Thread {
             while (iterator.hasNext()) {
                 TableDependency next = iterator.next();
 
+                builder.append("(");
                 builder.append("SELECT ");
                 builder.append(next.column);
                 builder.append(" FROM ");
@@ -233,9 +240,11 @@ public class KiWiGarbageCollector extends Thread {
                 builder.append(")");
 
                 if(iterator.hasNext()) {
-                    builder.append(" AND NOT EXISTS (");
+                    builder.append(" UNION ");
                 }
             }
+
+            builder.append(")");
         }
         return builder.toString();
     }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiPersistence.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiPersistence.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiPersistence.java
index 3df970d..bb8604d 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiPersistence.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiPersistence.java
@@ -406,25 +406,5 @@ public class KiWiPersistence {
         cacheManager.clear();
     }
 
-    /**
-     * Notify the garbage collector thread to run. The garbage collection will be executed in the scope of the
-     * garbage collector thread.
-     */
-    public void notifyGarbageCollector() {
-        synchronized (garbageCollector) {
-            garbageCollector.notify();
-        }
-    }
-
-    /**
-     * Force the garbage collector to execute instantly in the scope of the calling thread.
-     *
-     * @throws SQLException
-     */
-    public void forceGarbageCollector() throws SQLException {
-        synchronized (garbageCollector) {
-            garbageCollector.garbageCollect();
-        }
-    }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PersistenceTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PersistenceTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PersistenceTest.java
index c863cbf..4b0384c 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PersistenceTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PersistenceTest.java
@@ -1110,78 +1110,4 @@ public class PersistenceTest {
             connection.close();
         }
     }
-
-    /**
-     * Test if the garbage collection runs successfully.
-     *
-     * @throws Exception
-     */
-    @Test
-    public void testGarbageCollector() throws Exception {
-        // store some triples first
-
-        KiWiConnection connection = persistence.getConnection();
-        try {
-            KiWiUriResource stype    = new KiWiUriResource(Namespaces.NS_XSD+"string");
-            KiWiUriResource subject  = new KiWiUriResource("http://localhost/resource/"+RandomStringUtils.randomAlphanumeric(8));
-            KiWiUriResource pred_1   = new KiWiUriResource("http://localhost/predicate/P1");
-            KiWiUriResource pred_2   = new KiWiUriResource("http://localhost/predicate/P2");
-            KiWiUriResource object_1 = new KiWiUriResource("http://localhost/resource/"+RandomStringUtils.randomAlphanumeric(8));
-            KiWiStringLiteral object_2 = new KiWiStringLiteral(RandomStringUtils.randomAlphanumeric(32),null,stype);
-            KiWiUriResource context  = new KiWiUriResource("http://localhost/context/"+RandomStringUtils.randomAlphanumeric(8));
-
-            connection.storeNode(stype);
-            connection.storeNode(subject);
-            connection.storeNode(pred_1);
-            connection.storeNode(pred_2);
-            connection.storeNode(object_1);
-            connection.storeNode(object_2);
-            connection.storeNode(context);
-
-            KiWiTriple triple1 = new KiWiTriple(subject,pred_1,object_1,context);
-            KiWiTriple triple2 = new KiWiTriple(subject,pred_2,object_2,context);
-
-            connection.storeTriple(triple1);
-            connection.storeTriple(triple2);
-
-            connection.commit();
-
-            // delete all triples again
-            connection.deleteTriple(triple1);
-            connection.deleteTriple(triple2);
-
-            connection.commit();
-
-            // test database contents
-            PreparedStatement stmt = connection.getJDBCConnection().prepareStatement("SELECT * FROM triples WHERE deleted = true");
-            ResultSet dbResult1 = stmt.executeQuery();
-
-            Assert.assertTrue(dbResult1.next());
-            Assert.assertEquals((long) triple1.getId(), dbResult1.getLong("id"));
-            Assert.assertEquals((long) triple1.getSubject().getId(), dbResult1.getLong("subject"));
-            Assert.assertEquals((long) triple1.getPredicate().getId(), dbResult1.getLong("predicate"));
-            Assert.assertEquals((long)triple1.getObject().getId(),dbResult1.getLong("object"));
-
-            Assert.assertTrue(dbResult1.next());
-            Assert.assertEquals((long)triple2.getId(),dbResult1.getLong("id"));
-            Assert.assertEquals((long)triple2.getSubject().getId(),dbResult1.getLong("subject"));
-            Assert.assertEquals((long)triple2.getPredicate().getId(),dbResult1.getLong("predicate"));
-            Assert.assertEquals((long)triple2.getObject().getId(),dbResult1.getLong("object"));
-
-            dbResult1.close();
-
-
-            persistence.forceGarbageCollector();
-
-            // test database contents
-            ResultSet dbResult2 = stmt.executeQuery();
-
-            Assert.assertFalse(dbResult2.next());
-
-
-        } finally {
-            connection.close();
-        }
-
-    }
 }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/libraries/kiwi/kiwi-tripletable/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-tripletable/pom.xml b/libraries/kiwi/kiwi-tripletable/pom.xml
index b512664..3aa74e9 100644
--- a/libraries/kiwi/kiwi-tripletable/pom.xml
+++ b/libraries/kiwi/kiwi-tripletable/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>kiwi-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
     </parent>
 
     <artifactId>kiwi-tripletable</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/libraries/kiwi/kiwi-versioning/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-versioning/pom.xml b/libraries/kiwi/kiwi-versioning/pom.xml
index 05dba38..3d37f81 100644
--- a/libraries/kiwi/kiwi-versioning/pom.xml
+++ b/libraries/kiwi/kiwi-versioning/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>kiwi-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningPersistenceTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningPersistenceTest.java b/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningPersistenceTest.java
index 960bbc7..10ad516 100644
--- a/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningPersistenceTest.java
+++ b/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningPersistenceTest.java
@@ -17,7 +17,6 @@
  */
 package org.apache.marmotta.kiwi.versioning.test;
 
-import info.aduna.iteration.Iterations;
 import org.apache.commons.lang.RandomStringUtils;
 import org.apache.marmotta.kiwi.model.rdf.KiWiStringLiteral;
 import org.apache.marmotta.kiwi.model.rdf.KiWiTriple;
@@ -39,8 +38,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Date;
@@ -295,7 +292,6 @@ public class VersioningPersistenceTest {
             version2.setCommitTime(new Date());
             version2.addTriple(triple2);
             version2.removeTriple(triple1);
-            connection.deleteTriple(triple1);
             connection.storeVersion(version2);
             connection.commit();
 
@@ -306,7 +302,7 @@ public class VersioningPersistenceTest {
 
 
             // now we test different ways of listing versions between dates
-            List<Version> list1 = Iterations.asList(connection.listVersions(date1, date2));
+            List<Version> list1 = connection.listVersions(date1,date2).asList();
             Assert.assertEquals("there should be exactly one version from "+date1+" to "+date2,1,list1.size());
             Assert.assertEquals("contents of version differ", version1, list1.get(0));
             Assert.assertEquals("version id is not 1", 1L, (long)list1.get(0).getId());
@@ -317,42 +313,27 @@ public class VersioningPersistenceTest {
             Assert.assertEquals("latest version is not the expected version", version1,latest2);
 
             // check if listVersions with subject1 now gives exactly one version
-            List<Version> listr1 = Iterations.asList(connection.listVersions(subject, date1, date2));
+            List<Version> listr1 = connection.listVersions(subject,date1,date2).asList();
             Assert.assertEquals("there should be exactly one version", 1, listr1.size());
             Assert.assertEquals("contents of version differ", version1, listr1.get(0));
             Assert.assertEquals("version id is not 1", 1L, (long)listr1.get(0).getId());
 
 
-            List<Version> list2 = Iterations.asList(connection.listVersions(date2, date3));
+            List<Version> list2 = connection.listVersions(date2,date3).asList();
             Assert.assertEquals("there should be exactly one version from "+date2+" to "+date3,1,list2.size());
             Assert.assertEquals("contents of version differ", version2, list2.get(0));
             Assert.assertEquals("version id is not 2", 2L, (long)list2.get(0).getId());
 
-            List<Version> list3 = Iterations.asList(connection.listVersions(date3, new Date()));
+            List<Version> list3 = connection.listVersions(date3,new Date()).asList();
             Assert.assertEquals("there should be no version from "+date3+" to now",0,list3.size());
 
-            List<Version> list4 = Iterations.asList(connection.listVersions(date1, date3));
+            List<Version> list4 = connection.listVersions(date1,date3).asList();
             Assert.assertEquals("there should be exactly two versions from "+date1+" to "+date3,2,list4.size());
             Assert.assertEquals("contents of version1 differ", version1, list4.get(0));
             Assert.assertEquals("contents of version2 differ", version2, list4.get(1));
 
 
             connection.commit();
-
-            // test garbage collector (should not throw an error and should not remove any triples, since they are
-            // referenced by the versioning table)
-            // test database contents
-            PreparedStatement stmt = connection.getJDBCConnection().prepareStatement("SELECT * FROM triples WHERE deleted = true");
-            ResultSet dbResult1 = stmt.executeQuery();
-            Assert.assertTrue(dbResult1.next());
-
-            persistence.forceGarbageCollector();
-
-            // triple should not be garbage collected
-            ResultSet dbResult2 = stmt.executeQuery();
-            Assert.assertTrue(dbResult2.next());
-
-
         } finally {
             connection.close();
         }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/libraries/kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/pom.xml b/libraries/kiwi/pom.xml
index f5fac0c..39132c6 100644
--- a/libraries/kiwi/pom.xml
+++ b/libraries/kiwi/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>marmotta-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../../parent</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/libraries/ldcache/ldcache-api/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-api/pom.xml b/libraries/ldcache/ldcache-api/pom.xml
index 96d0304..8462669 100644
--- a/libraries/ldcache/ldcache-api/pom.xml
+++ b/libraries/ldcache/ldcache-api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>marmotta-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../../../parent</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/libraries/ldcache/ldcache-backend-ehcache/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-ehcache/pom.xml b/libraries/ldcache/ldcache-backend-ehcache/pom.xml
index d951255..86a9d92 100644
--- a/libraries/ldcache/ldcache-backend-ehcache/pom.xml
+++ b/libraries/ldcache/ldcache-backend-ehcache/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>marmotta-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../../../parent</relativePath>
     </parent>
 


Mime
View raw message