Merge branch 'develop' into MARMOTTA-588
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/940cac1f Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/940cac1f Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/940cac1f Branch: refs/heads/MARMOTTA-588 Commit: 940cac1f945ddd8f0ab8efe4bd6c97cb4de4f545 Parents: 2fa66e7 adefed4 Author: Sergio Fernández <[email protected]> Authored: Thu Nov 12 15:55:55 2015 +0100 Committer: Sergio Fernández <[email protected]> Committed: Thu Nov 12 15:55:55 2015 +0100 ---------------------------------------------------------------------- .../main/java/exceptions/DoThisException.java | 2 +- .../src/ext/java/javolution/lang/Immutable.java | 2 +- .../src/ext/java/javolution/lang/ValueType.java | 2 +- .../java/javolution/util/FastCollection.java | 2 +- .../src/ext/java/javolution/util/FastSet.java | 2 +- .../ext/java/javolution/util/FastSortedSet.java | 2 +- .../java/javolution/util/FastSortedTable.java | 2 +- .../src/ext/java/javolution/util/FastTable.java | 2 +- .../java/javolution/util/function/Consumer.java | 2 +- .../javolution/util/function/Equalities.java | 2 +- .../java/javolution/util/function/Function.java | 2 +- .../javolution/util/function/Iteration.java | 2 +- .../javolution/util/function/MultiVariable.java | 2 +- .../javolution/util/function/Predicate.java | 2 +- .../java/javolution/util/function/Reducer.java | 2 +- .../java/javolution/util/function/Reducers.java | 2 +- .../javolution/util/function/Splittable.java | 2 +- .../java/javolution/util/function/Supplier.java | 2 +- .../util/internal/table/FractalTableImpl.java | 2 +- .../util/internal/table/SharedTableImpl.java | 2 +- .../table/sorted/SharedSortedTableImpl.java | 2 +- .../util/service/CollectionService.java | 2 +- .../javolution/util/service/MapService.java | 2 +- .../util/service/SortedTableService.java | 2 +- .../commons/http/MarmottaHttpUtils.java | 4 +- .../commons/http/MarmottaHttpUtilsTest.java | 27 ++++++++++++ .../marmotta-model-vocabs/pom.xml | 2 +- .../src/test/resources/logback.xml | 4 +- .../com/sun/syndication/feed/synd/SyndLink.java | 2 +- .../sun/syndication/io/impl/FeedGenerators.java | 2 +- .../module/sle/io/LabelNamespaceElement.java | 2 +- .../src/test/resources/logback.xml | 4 +- .../src/test/resources/logback.xml | 4 +- .../src/test/resources/logback.xml | 4 +- .../src/test/resources/logback.xml | 4 +- .../kiwi-loader/src/main/resources/logback.xml | 4 +- .../src/test/resources/logback-test.xml | 4 +- .../reasoner/model/program/Justification.java | 3 +- .../engine/JustificationResolutionTest.java | 19 +++------ .../reasoner/test/model/JustificationTest.java | 9 ---- .../kiwi/sparql/builder/SQLBuilder.java | 2 + .../evaluation/KiWiEvaluationStrategy.java | 1 - .../kiwi/sparql/test/KiWiSparqlTest.java | 44 ++++++++++++++------ .../kiwi/sparql/test/MARMOTTA-617.sparql | 28 +++++++++++++ .../marmotta/kiwi/sparql/test/MARMOTTA-617.ttl | 41 ++++++++++++++++++ .../kiwi/persistence/util/ScriptRunner.java | 2 +- .../src/test/resources/logback.xml | 4 +- .../backend/file/test/LDCacheFileTest.java | 29 +++++-------- .../src/test/resources/logback.xml | 7 +++- .../src/test/resources/logback.xml | 7 +++- .../services/test/ng/BaseLDCacheTest.java | 13 +++--- .../ldcache-core/src/test/resources/logback.xml | 7 +++- .../src/test/resources/logback.xml | 4 +- .../src/test/resources/logback.xml | 4 +- .../test/provider/ProviderTestBase.java | 20 +++++---- .../src/test/resources/logback.xml | 4 +- .../src/test/resources/logback.xml | 4 +- .../src/test/resources/logback.xml | 4 +- .../src/test/resources/logback.xml | 4 +- .../mediawiki/WikipediaIndexEndpoint.java | 2 +- .../mediawiki/WikipediaPageEndpoint.java | 2 +- .../test/mediawiki/TestMediawikiProvider.java | 8 +++- .../src/test/resources/logback.xml | 4 +- .../test/mediawiki/wikipedia-marmot-http.sparql | 29 +++++++++++++ .../test/mediawiki/wikipedia-marmot.sparql | 4 +- .../src/test/resources/logback.xml | 4 +- .../src/test/resources/logback.xml | 4 +- .../src/test/resources/logback.xml | 4 +- .../ldpath/api/backend/NodeBackend.java | 2 +- .../src/test/resources/logback.xml | 4 +- .../backend/sesame/SesameValueBackend.java | 2 +- .../functions/AbstractTextFilterFunction.java | 2 +- .../ldpath/parser/EmptyTestingBackend.java | 2 +- .../ldpath-core/src/test/resources/logback.xml | 4 +- .../src/test/resources/logback.xml | 4 +- .../src/test/resources/logback.xml | 4 +- .../src/test/resources/logback.xml | 4 +- .../functions/json/JsonPathFunctionTest.java | 2 +- .../src/test/resources/logback.xml | 4 +- .../model/functions/math/MathFunction.java | 2 +- .../src/test/resources/logback.xml | 4 +- .../src/test/resources/logback.xml | 4 +- .../src/test/resources/logback.xml | 4 +- .../src/test/resources/logback.xml | 4 +- .../src/main/resources/logback.xml | 4 +- .../src/main/resources/logback.xml | 4 +- .../AccumuloGraphLoggingModule.java | 2 +- .../bigdata/BigDataSesame27Repository.java | 2 +- .../main/resources/config-defaults.properties | 11 +---- .../resources/config-descriptions.properties | 4 -- .../config/ConfigurationServiceImpl.java | 1 - .../response/LastModifiedResponseHandler.java | 2 +- .../response/StatusCodeResponseHandler.java | 2 +- .../response/StringBodyResponseHandler.java | 2 +- .../services/importer/ImportServiceImpl.java | 2 +- .../services/modules/ModuleServiceImpl.java | 2 +- .../templating/AdminTemplatingServiceImpl.java | 2 +- .../services/LdpBinaryStoreServiceImplTest.java | 2 +- platform/marmotta-sparql/pom.xml | 4 ++ .../user/webservices/UserWebService.java | 2 +- 100 files changed, 335 insertions(+), 201 deletions(-) ----------------------------------------------------------------------
