You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by rp...@apache.org on 2013/11/02 11:48:00 UTC
[09/11] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-marmotta into develop
Merge branch 'develop' 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/fbde7ab6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/fbde7ab6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/fbde7ab6
Branch: refs/heads/develop
Commit: fbde7ab6e148c9a5c807b560a05138bd3c5229b5
Parents: 3a0dadf d871482
Author: Raffaele Palmieri <rp...@apache.org>
Authored: Wed Oct 16 18:09:50 2013 +0200
Committer: Raffaele Palmieri <rp...@apache.org>
Committed: Wed Oct 16 18:09:50 2013 +0200
----------------------------------------------------------------------
.../src/main/webapp/WEB-INF/web.xml | 96 +-
.../src/test/resources/test-config.properties | 5 +-
build/git-tag-revision.sh | 4 +
.../marmotta/SplashScreenBuilderMojo.java | 165 +
build/scripts/check-parent-pom.sh | 19 +
build/scripts/check-rebel.root.sh | 11 +
client/marmotta-client-java/pom.xml | 5 +
commons/marmotta-commons/pom.xml | 14 +-
.../commons/http/MarmottaHttpUtils.java | 29 +
.../commons/nio/watch/AbstractTreeWatcher.java | 250 ++
.../commons/nio/watch/SimpleTreeWatcher.java | 78 +
.../commons/sesame/model/StatementCommons.java | 5 +-
.../sesame/repository/ResourceUtils.java | 120 +-
.../apache/marmotta/commons/util/HashUtils.java | 86 +-
.../commons/sesame/rio/vcard/Denis_Hennessy.vcf | 0
.../commons/sesame/rio/vcard/Tony_Small.vcf | 0
.../webjars/snorql/src/main/resources/LICENSE | 0
extras/webjars/snorql/src/main/resources/README | 0
.../webjars/snorql/src/main/resources/link.png | Bin
.../snorql/src/main/resources/namespaces.js | 0
.../snorql/src/main/resources/prototype.js | 0
.../snorql/src/main/resources/rdf_flyer.24.gif | Bin
.../src/main/resources/scriptaculous/builder.js | 0
.../main/resources/scriptaculous/controls.js | 0
.../main/resources/scriptaculous/dragdrop.js | 0
.../src/main/resources/scriptaculous/effects.js | 0
.../resources/scriptaculous/scriptaculous.js | 0
.../src/main/resources/scriptaculous/slider.js | 0
.../src/main/resources/scriptaculous/sound.js | 0
.../main/resources/scriptaculous/unittest.js | 0
.../webjars/snorql/src/main/resources/snorql.js | 0
.../webjars/snorql/src/main/resources/sparql.js | 0
.../webjars/snorql/src/main/resources/style.css | 0
.../snorql/src/main/resources/xml-to-html.xsl | 0
launchers/marmotta-installer/pom.xml | 24 +
.../apache/marmotta/splash/systray/systray.png | Bin
launchers/marmotta-webapp-bigdata/assembly.xml | 63 +
launchers/marmotta-webapp-bigdata/pom.xml | 268 ++
.../src/main/doc/README.txt | 111 +
.../src/main/resources/META-INF/beans.xml | 28 +
.../src/main/resources/ehcache-marmotta.xml | 407 +++
.../src/main/resources/logback.xml | 39 +
.../src/main/webapp/META-INF/DISCLAIMER | 16 +
.../src/main/webapp/META-INF/LICENSE | 2893 ++++++++++++++++++
.../src/main/webapp/META-INF/NOTICE | 42 +
.../src/main/webapp/META-INF/jetty-web.xml | 27 +
.../src/main/webapp/WEB-INF/jetty-web.xml | 36 +
.../src/main/webapp/WEB-INF/web.xml | 95 +
.../src/main/webapp/index.jsp | 25 +
.../src/test/resources/META-INF/beans.xml | 26 +
.../resources/META-INF/test-persistence.xml | 83 +
.../src/test/resources/WEB-INF/test-web.xml | 188 ++
.../src/test/resources/arquillian.xml | 27 +
.../src/test/resources/ehcache.xml | 377 +++
.../src/test/resources/jndi.properties | 14 +
.../src/test/resources/logback.xml | 68 +
.../src/test/resources/test-config.properties | 71 +
launchers/marmotta-webapp/pom.xml | 23 +-
.../src/main/webapp/WEB-INF/web.xml | 91 +-
.../marmotta-webapp/src/main/webapp/index.jsp | 2 +-
.../src/test/resources/test-config.properties | 3 -
launchers/pom.xml | 10 +
libraries/kiwi/kiwi-loader/pom.xml | 181 ++
.../apache/marmotta/kiwi/loader/KiWiLoader.java | 541 ++++
.../marmotta/kiwi/loader/KiWiLoaderTest.java | 219 ++
.../src/test/resources/logback-test.xml | 28 +
.../kiwi/persistence/h2/statements.properties | 4 +
.../evaluation/KiWiEvaluationStrategyImpl.java | 4 +-
.../persistence/KiWiSparqlConnection.java | 116 +-
.../kiwi/sparql/test/ContextAwareTest.java | 204 ++
libraries/kiwi/kiwi-triplestore/pom.xml | 6 +
.../marmotta/kiwi/config/KiWiConfiguration.java | 127 +-
.../generator/DatabaseSequenceIDGenerator.java | 75 +
.../marmotta/kiwi/generator/IDGenerator.java | 61 +
.../kiwi/generator/IDGeneratorType.java | 54 +
.../generator/MemorySequenceIDGenerator.java | 178 ++
.../kiwi/generator/SnowflakeIDGenerator.java | 178 ++
.../kiwi/generator/UUIDRandomIDGenerator.java | 82 +
.../kiwi/generator/UUIDTimeIDGenerator.java | 108 +
.../kiwi/persistence/KiWiConnection.java | 92 +-
.../kiwi/persistence/KiWiPersistence.java | 144 +-
.../marmotta/kiwi/sail/KiWiValueFactory.java | 5 +-
.../kiwi/persistence/h2/statements.properties | 3 +
.../kiwi/test/generator/SnowflakeTest.java | 77 +
.../kiwi/test/generator/UUIDRandomTest.java | 81 +
.../kiwi/test/generator/UUIDTimeTest.java | 81 +
.../kiwi/persistence/h2/statements.properties | 1 +
.../test/VersioningPersistenceTest.java | 24 +-
.../test/VersioningRepositoryTest.java | 26 +-
libraries/kiwi/pom.xml | 23 +-
.../kiwi/persistence/h2/statements.properties | 1 +
.../ldcache/sail/GenericLinkedDataSail.java | 4 +
.../ldpath-backend-linkeddata/assembly.xml | 4 +-
.../ldpath/ldpath-backend-linkeddata/pom.xml | 8 -
.../backend/sesame/AbstractSesameBackend.java | 15 +-
.../ContextAwareSesameConnectionBackend.java | 47 +
.../backend/sesame/SesameConnectionBackend.java | 28 +-
.../functions/AbstractTextFilterFunction.java | 74 +
.../marmotta/ldpath/model/programs/Program.java | 32 +-
.../at/newmedialab/ldpath/parser/rdfpath.jj | 10 +-
libraries/ldpath/ldpath-functions-html/pom.xml | 4 +
.../model/functions/html/CleanHtmlFunction.java | 61 +-
.../model/functions/html/HtmlTextFunction.java | 52 +
...rmotta.ldpath.api.functions.SelectorFunction | 3 +-
.../model/functions/html/HtmlFunctionsTest.java | 36 +-
libraries/ldpath/ldpath-functions-xml/pom.xml | 4 +
.../functions/xml/RemoveXmlTagsFunction.java | 60 +-
.../model/functions/xml/XmlTextFunction.java | 58 +
.../functions/xml/XmlUnescapeFunction.java | 57 +
...rmotta.ldpath.api.functions.SelectorFunction | 4 +-
.../xml/RemoveXmlTagsFunctionTest.java | 2 +-
.../model/functions/xml/XPathFunctionTest.java | 2 +-
.../functions/xml/XmlTextFunctionTest.java | 87 +
parent/pom.xml | 57 +-
.../backends/marmotta-backend-bigdata/pom.xml | 192 ++
.../bigdata/BigDataSesame27Repository.java | 151 +
.../backend/bigdata/BigDataSesame27Sail.java | 293 ++
.../backend/bigdata/BigDataStoreProvider.java | 127 +
.../src/main/resources/META-INF/beans.xml | 28 +
.../main/resources/config-defaults.properties | 24 +
.../resources/config-descriptions.properties | 24 +
.../src/main/resources/kiwi-module.properties | 38 +
.../src/main/resources/web/admin/about.html | 43 +
.../main/resources/web/admin/configuration.html | 53 +
platform/backends/marmotta-backend-kiwi/pom.xml | 172 ++
.../backend/kiwi/DatabaseWebService.java | 109 +
.../kiwi/KiWiGarbageCollectionProvider.java | 46 +
.../backend/kiwi/KiWiStoreProvider.java | 161 +
.../src/main/resources/META-INF/beans.xml | 28 +
.../main/resources/config-defaults.properties | 75 +
.../resources/config-descriptions.properties | 61 +
.../src/main/resources/kiwi-module.properties | 41 +
.../src/main/resources/web/admin/about.html | 62 +
.../main/resources/web/admin/configuration.html | 46 +
.../src/main/resources/web/admin/database.html | 37 +
.../resources/web/admin/js/widgets/database.js | 303 ++
.../backends/marmotta-backend-memory/pom.xml | 154 +
.../backend/memory/MemoryStoreProvider.java | 83 +
.../src/main/resources/META-INF/beans.xml | 28 +
.../src/main/resources/kiwi-module.properties | 38 +
.../backends/marmotta-backend-native/pom.xml | 170 +
.../backend/sesame/NativeStoreProvider.java | 94 +
.../src/main/resources/META-INF/beans.xml | 28 +
.../src/main/resources/kiwi-module.properties | 38 +
platform/backends/pom.xml | 72 +
.../ldcache/marmotta-ldcache-common/pom.xml | 198 ++
.../api/endpoint/LinkedDataEndpointService.java | 87 +
.../api/ldcache/LDCacheSailProvider.java | 191 ++
.../model/filter/LDCacheIgnoreFilter.java | 32 +
.../model/filter/MarmottaNotCachedFilter.java | 85 +
.../endpoint/LinkedDataEndpointServiceImpl.java | 207 ++
.../LinkedDataCachingWebService.java | 327 ++
.../src/main/resources/META-INF/beans.xml | 28 +
.../main/resources/config-defaults.properties | 49 +
.../resources/config-descriptions.properties | 41 +
.../src/main/resources/kiwi-module.properties | 35 +
.../src/main/resources/web/admin/about.html | 271 ++
.../main/resources/web/admin/configuration.html | 83 +
.../main/resources/web/admin/img/ld-caching.png | Bin 0 -> 758 bytes
.../resources/web/admin/widgets/lmf_ldcache.js | 360 +++
platform/ldcache/marmotta-ldcache-file/pom.xml | 174 ++
.../services/kiwi/FileLDCacheSailProvider.java | 131 +
.../src/main/resources/META-INF/beans.xml | 28 +
platform/ldcache/marmotta-ldcache-kiwi/pom.xml | 174 ++
.../services/kiwi/KiWiLDCacheSailProvider.java | 113 +
.../src/main/resources/META-INF/beans.xml | 28 +
platform/ldcache/pom.xml | 65 +
platform/marmotta-core/pom.xml | 35 +-
.../core/api/importer/ImportWatchService.java | 22 +-
.../core/api/triplestore/ContextService.java | 27 +-
.../triplestore/GarbageCollectionProvider.java | 37 +
.../core/api/triplestore/StoreProvider.java | 49 +
.../platform/core/api/user/UserToken.java | 84 -
.../core/jndi/MarmottaJndiListener.java | 8 +-
.../platform/core/rio/RDFHtmlWriterImpl.java | 51 +-
.../config/ConfigurationServiceImpl.java | 71 +-
.../content/FileSystemContentReader.java | 33 +-
.../content/FileSystemContentWriter.java | 18 +-
.../services/content/HTTPContentReader.java | 36 +-
.../services/http/HttpClientServiceImpl.java | 35 +-
.../services/importer/ImportServiceImpl.java | 6 +-
.../importer/ImportWatchServiceImpl.java | 695 +++--
.../core/services/io/MarmottaIOServiceImpl.java | 8 +-
.../core/services/sesame/KiWiSesameUtil.java | 63 -
.../sesame/ResourceSubjectMetadata.java | 6 +-
.../triplestore/ContextServiceImpl.java | 38 +-
.../services/triplestore/SesameServiceImpl.java | 113 +-
.../core/servlet/MarmottaH2ConsoleFilter.java | 11 +-
.../core/servlet/MarmottaOptionsFilter.java | 19 +-
.../core/servlet/MarmottaPostStartupFilter.java | 2 +
.../core/servlet/MarmottaPreStartupFilter.java | 13 +-
.../servlet/MarmottaPreStartupListener.java | 15 +-
.../core/servlet/MarmottaResourceFilter.java | 4 +
.../marmotta/platform/core/util/CDIContext.java | 51 +-
.../platform/core/util/JerseyUtils.java | 45 -
.../marmotta/platform/core/util/KiWiIO.java | 35 +-
.../platform/core/util/WebServiceUtil.java | 16 +
.../core/webservices/io/ImportWebService.java | 68 +-
.../resource/InspectionWebService.java | 93 +-
.../webservices/resource/MetaWebService.java | 109 +-
.../resource/ResourceWebService.java | 3 +-
.../webservices/system/SystemWebService.java | 64 -
.../triplestore/ContextWebService.java | 42 +-
.../triplestore/KnowledgeSpaceWebService.java | 122 -
.../webservices/triplestore/LdpWebService.java | 33 +-
.../main/resources/config-defaults.properties | 8 +-
.../resources/config-descriptions.properties | 30 +-
.../src/main/resources/kiwi-module.properties | 4 -
.../src/main/resources/templates/admin.ftl | 56 -
.../main/resources/web/admin/configuration.html | 9 -
.../src/main/resources/web/admin/database.html | 37 -
.../resources/web/admin/js/widgets/database.js | 303 --
.../main/resources/web/public/img/icon/link.png | Bin
.../resources/web/public/style/blue/style.css | 55 +-
.../resources/web/public/style/white/style.css | 54 +
.../core/test/base/TestStoreProvider.java | 85 +
.../src/test/resources/META-INF/beans.xml | 4 +
platform/marmotta-ldcache/pom.xml | 199 --
.../api/endpoint/LinkedDataEndpointService.java | 87 -
.../model/filter/LDCacheIgnoreFilter.java | 32 -
.../model/filter/MarmottaNotCachedFilter.java | 85 -
.../endpoint/LinkedDataEndpointServiceImpl.java | 211 --
.../services/ldcache/LDCacheSailProvider.java | 239 --
.../LinkedDataCachingWebService.java | 318 --
.../src/main/resources/META-INF/beans.xml | 28 -
.../main/resources/config-defaults.properties | 49 -
.../resources/config-descriptions.properties | 41 -
.../src/main/resources/kiwi-module.properties | 35 -
.../src/main/resources/web/admin/about.html | 264 --
.../main/resources/web/admin/configuration.html | 83 -
.../main/resources/web/admin/img/ld-caching.png | Bin 758 -> 0 bytes
.../resources/web/admin/widgets/lmf_ldcache.js | 360 ---
.../ldpath/model/functions/ContentFunction.java | 12 +-
.../ldpath/webservices/LDPathWebService.java | 23 +-
.../resources/web/admin/img/ld_path_small.png | Bin
platform/marmotta-reasoner-kiwi/pom.xml | 232 ++
.../services/ReasoningSailProvider.java | 261 ++
.../reasoner/webservices/ProgramWebService.java | 153 +
.../webservices/ReasonerWebService.java | 186 ++
.../src/main/resources/META-INF/beans.xml | 28 +
.../main/resources/config-defaults.properties | 34 +
.../resources/config-descriptions.properties | 35 +
.../src/main/resources/kiwi-module.properties | 32 +
.../src/main/resources/owl.kwrl | 20 +
.../src/main/resources/rdfs.kwrl | 23 +
.../src/main/resources/skos.kwrl | 29 +
.../src/main/resources/uploadOWL.sh | 19 +
.../src/main/resources/uploadRDFS.sh | 19 +
.../src/main/resources/uploadSKOS.sh | 19 +
.../src/main/resources/web/admin/about.html | 325 ++
.../src/main/resources/web/admin/configure.html | 55 +
.../resources/web/admin/img/reasoner_small.png | Bin 0 -> 562 bytes
.../resources/web/admin/widget/conf_reasoner.js | 198 ++
.../reasoner/test/engine/test-001.initial.ttl | 23 +
.../platform/reasoner/test/engine/test-001.kwrl | 18 +
.../reasoner/test/engine/test-001.result.ttl | 23 +
.../platform/reasoner/test/parser/test-001.kwrl | 23 +
.../platform/reasoner/test/parser/test-002.kwrl | 18 +
.../platform/reasoner/test/parser/test-003.kwrl | 29 +
.../platform/reasoner/test/parser/test-004.kwrl | 20 +
platform/marmotta-reasoner/pom.xml | 227 --
.../services/ReasoningSailProvider.java | 261 --
.../reasoner/webservices/ProgramWebService.java | 160 -
.../webservices/ReasonerWebService.java | 195 --
.../src/main/resources/META-INF/beans.xml | 28 -
.../main/resources/config-defaults.properties | 34 -
.../resources/config-descriptions.properties | 35 -
.../src/main/resources/kiwi-module.properties | 32 -
.../src/main/resources/owl.kwrl | 20 -
.../src/main/resources/rdfs.kwrl | 23 -
.../src/main/resources/skos.kwrl | 29 -
.../src/main/resources/uploadOWL.sh | 19 -
.../src/main/resources/uploadRDFS.sh | 19 -
.../src/main/resources/uploadSKOS.sh | 19 -
.../src/main/resources/web/admin/about.html | 325 --
.../src/main/resources/web/admin/configure.html | 55 -
.../resources/web/admin/img/reasoner_small.png | Bin 562 -> 0 bytes
.../resources/web/admin/widget/conf_reasoner.js | 198 --
.../reasoner/test/engine/test-001.initial.ttl | 23 -
.../platform/reasoner/test/engine/test-001.kwrl | 18 -
.../reasoner/test/engine/test-001.result.ttl | 23 -
.../platform/reasoner/test/parser/test-001.kwrl | 23 -
.../platform/reasoner/test/parser/test-002.kwrl | 18 -
.../platform/reasoner/test/parser/test-003.kwrl | 29 -
.../platform/reasoner/test/parser/test-004.kwrl | 20 -
platform/marmotta-sparql/pom.xml | 7 +-
.../services/sail/SPARQLSailProvider.java | 77 -
.../sparql/webservices/SparqlWebService.java | 37 +-
.../resources/web/admin/img/sparql_small.png | Bin
.../src/main/resources/web/admin/link.png | Bin
.../src/main/resources/web/admin/snorql.html | 0
.../webservices/SparqlWebServiceTest.java | 3 +-
.../src/main/resources/META-INF/beans.xml | 28 -
.../src/main/resources/kiwi-module.properties | 34 -
.../user/services/AccountServiceImpl.java | 31 +-
platform/marmotta-versioning-common/pom.xml | 168 +
platform/marmotta-versioning-kiwi/pom.xml | 175 ++
.../platform/versioning/api/MementoService.java | 61 +
.../api/VersionSerializerService.java | 40 +
.../versioning/exception/MementoException.java | 37 +
.../versioning/filter/MementoFilter.java | 154 +
.../versioning/io/HtmlVersionSerializer.java | 140 +
.../versioning/io/LinkVersionSerializer.java | 126 +
.../versioning/io/VersionSerializer.java | 56 +
.../versioning/model/MementoVersionSet.java | 120 +
.../versioning/services/MementoServiceImpl.java | 112 +
.../services/VersionSerializerServiceImpl.java | 56 +
.../services/VersioningSailProvider.java | 269 ++
.../platform/versioning/utils/MementoUtils.java | 83 +
.../webservices/MementoWebService.java | 324 ++
.../webservices/VersioningWebService.java | 251 ++
.../src/main/resources/META-INF/beans.xml | 28 +
.../main/resources/config-defaults.properties | 29 +
.../resources/config-descriptions.properties | 31 +
.../src/main/resources/kiwi-module.properties | 34 +
.../src/main/resources/template/timemap.ftl | 68 +
.../src/main/resources/web/admin/about.html | 98 +
.../main/resources/web/admin/configuration.html | 67 +
.../resources/web/admin/img/clock_small.png | Bin 0 -> 677 bytes
platform/marmotta-versioning/pom.xml | 168 -
.../platform/versioning/api/MementoService.java | 60 -
.../api/VersionSerializerService.java | 40 -
.../versioning/exception/MementoException.java | 37 -
.../versioning/filter/MementoFilter.java | 154 -
.../versioning/io/HtmlVersionSerializer.java | 140 -
.../versioning/io/LinkVersionSerializer.java | 123 -
.../versioning/io/VersionSerializer.java | 56 -
.../versioning/model/MementoVersionSet.java | 120 -
.../versioning/services/MementoServiceImpl.java | 112 -
.../services/VersionSerializerServiceImpl.java | 56 -
.../services/VersioningSailProvider.java | 271 --
.../platform/versioning/utils/MementoUtils.java | 83 -
.../webservices/MementoWebService.java | 325 --
.../webservices/VersioningWebService.java | 256 --
.../src/main/resources/META-INF/beans.xml | 28 -
.../main/resources/config-defaults.properties | 29 -
.../resources/config-descriptions.properties | 31 -
.../src/main/resources/kiwi-module.properties | 34 -
.../src/main/resources/template/timemap.ftl | 68 -
.../src/main/resources/web/admin/about.html | 98 -
.../main/resources/web/admin/configuration.html | 67 -
.../resources/web/admin/img/clock_small.png | Bin 677 -> 0 bytes
platform/pom.xml | 18 +-
pom.xml | 7 +-
344 files changed, 19914 insertions(+), 8660 deletions(-)
----------------------------------------------------------------------