Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/09906665 Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/09906665 Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/09906665 Branch: refs/heads/develop Commit: 09906665136ad74f861deb69131ea099756ec810 Parents: 101ac6b 5aec3c9 Author: Jakob Frank <[email protected]> Authored: Wed Apr 3 12:33:04 2013 +0200 Committer: Jakob Frank <[email protected]> Committed: Wed Apr 3 12:33:04 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, 1395 insertions(+), 820 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09906665/libraries/ldpath/ldpath-api/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09906665/libraries/ldpath/ldpath-core/pom.xml ----------------------------------------------------------------------
