Merge branch 'develop' into MARMOTTA-556
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/d46a959a Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/d46a959a Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/d46a959a Branch: refs/heads/MARMOTTA-556 Commit: d46a959a188276a58409121bf8a12df0c807421b Parents: f7b1f84 d0810b4 Author: Sergio Fernández <[email protected]> Authored: Wed Jul 1 12:29:01 2015 +0200 Committer: Sergio Fernández <[email protected]> Committed: Wed Jul 1 12:29:01 2015 +0200 ---------------------------------------------------------------------- LICENSE.txt | 100 +- NOTICE.txt | 2 +- .../marmotta-archetype-module/pom.xml | 2 +- .../marmotta-archetype-webapp/pom.xml | 2 +- .../main/resources/archetype-resources/pom.xml | 2 +- .../src/main/webapp/META-INF/jetty-web.xml | 30 - .../src/main/webapp/WEB-INF/jetty-web.xml | 24 +- .../src/main/webapp/WEB-INF/web.xml | 8 +- .../src/test/resources/test-config.properties | 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 +- .../plugins/buildinfo/AbstractInfoProvider.java | 2 +- .../maven/plugins/buildinfo/BuildInfoMojo.java | 2 +- .../plugins/buildinfo/GitInfoProvider.java | 2 +- .../maven/plugins/buildinfo/InfoProvider.java | 2 +- .../buildinfo/MercurialInfoProvider.java | 2 +- .../plugins/buildinfo/ProjectInfoProvider.java | 2 +- build/plugins/marmotta-maven-plugin/pom.xml | 2 +- build/plugins/pom.xml | 16 +- build/plugins/refpack-maven-plugin/pom.xml | 2 +- .../maven/plugins/refpack/RefPackMojo.java | 35 +- build/plugins/repocheck-maven-plugin/pom.xml | 2 +- .../plugins/repochecker/LogMatrixPrinter.java | 2 +- .../plugins/repochecker/MatrixPrinter.java | 2 +- .../repochecker/RepositoryCheckerMojo.java | 2 +- .../repochecker/SilentMatrixPrinter.java | 2 +- build/pom.xml | 2 +- client/marmotta-client-java/pom.xml | 11 +- .../marmotta/client/ClientConfiguration.java | 10 +- .../apache/marmotta/client/MarmottaClient.java | 2 +- .../client/clients/ConfigurationClient.java | 30 +- .../marmotta/client/clients/ContextClient.java | 2 +- .../marmotta/client/clients/ImportClient.java | 70 +- .../marmotta/client/clients/LDPathClient.java | 27 +- .../marmotta/client/clients/ResourceClient.java | 19 +- .../marmotta/client/clients/SPARQLClient.java | 22 +- .../exception/ContentFormatException.java | 2 +- .../exception/MarmottaClientException.java | 2 +- .../client/exception/NotFoundException.java | 2 +- .../client/exception/ParseException.java | 2 +- .../model/classification/Classification.java | 2 +- .../client/model/config/Configuration.java | 2 +- .../client/model/content/ByteContent.java | 2 +- .../marmotta/client/model/content/Content.java | 2 +- .../client/model/content/StreamContent.java | 2 +- .../client/model/content/StringContent.java | 2 +- .../marmotta/client/model/meta/Metadata.java | 2 +- .../apache/marmotta/client/model/rdf/BNode.java | 2 +- .../marmotta/client/model/rdf/Literal.java | 2 +- .../marmotta/client/model/rdf/RDFNode.java | 2 +- .../apache/marmotta/client/model/rdf/URI.java | 2 +- .../client/model/sparql/SPARQLResult.java | 2 +- .../marmotta/client/util/CollectionUtils.java | 2 +- .../apache/marmotta/client/util/HTTPUtil.java | 111 +- .../apache/marmotta/client/util/MetaUtil.java | 2 +- .../marmotta/client/util/RDFJSONParser.java | 2 +- .../marmotta/client/test/AbstractClientIT.java | 2 +- .../client/test/config/ConfigurationIT.java | 2 +- .../marmotta/client/test/io/ImportIT.java | 11 +- .../marmotta/client/test/ldpath/LDPathIT.java | 2 +- .../marmotta/client/test/sparql/SPARQLIT.java | 2 +- client/marmotta-client-js-sample-webapp/pom.xml | 5 +- client/marmotta-client-js/pom.xml | 2 +- client/pom.xml | 2 +- commons/marmotta-commons/pom.xml | 7 +- .../commons/collections/CollectionUtils.java | 157 -- .../commons/collections/EquivalenceHashMap.java | 563 ----- .../commons/collections/EquivalenceHashSet.java | 472 ---- .../marmotta/commons/constants/Namespace.java | 2142 ------------------ .../marmotta/commons/http/ContentType.java | 2 +- .../marmotta/commons/http/ETagGenerator.java | 2 +- .../commons/http/MarmottaHttpUtils.java | 30 +- .../apache/marmotta/commons/http/UriUtil.java | 2 +- .../marmotta/commons/locking/ObjectLocks.java | 2 - .../commons/sesame/model/BNodeCommons.java | 2 +- .../commons/sesame/model/LiteralCommons.java | 53 +- .../commons/sesame/model/Namespaces.java | 2 +- .../commons/sesame/model/URICommons.java | 2 +- .../sesame/repository/ExceptionUtils.java | 2 +- .../sesame/repository/ResourceConnection.java | 2 +- .../sesame/repository/ResourceUtils.java | 8 +- .../commons/sesame/repository/ResultUtils.java | 2 +- .../apache/marmotta/commons/util/DateUtils.java | 18 +- .../apache/marmotta/commons/util/JSONUtils.java | 2 +- .../marmotta/commons/util/StringUtils.java | 16 + .../src/main/resources/META-INF/NOTICE | 2 +- .../collections/BaseEquivalenceHashMapTest.java | 98 - .../collections/BaseEquivalenceHashSetTest.java | 211 -- .../collections/FastEquivalenceHashSetTest.java | 62 - .../StandardEquivalenceHashMapTest.java | 35 - .../StandardEquivalenceHashSetTest.java | 35 - .../commons/http/ContentTypeMatchingTest.java | 2 +- .../commons/http/ETagGeneratorTest.java | 2 +- .../commons/http/MarmottaHttpUtilsTest.java | 2 +- .../marmotta/commons/http/UriUtilTest.java | 2 +- .../sesame/model/LiteralCommonsTest.java | 5 +- .../commons/sesame/model/ResourceUtilsTest.java | 2 +- .../commons/sesame/model/URICommonsTest.java | 2 +- .../marmotta/commons/util/DateUtilsTest.java | 2 +- .../marmotta-model-vocabs/pom.xml | 2 +- .../marmotta/commons/vocabulary/SPARQL_SD.java | 2 +- .../marmotta-rio-api/pom.xml | 2 +- .../marmotta-rio-ical/pom.xml | 2 +- .../commons/sesame/rio/ical/ICalParser.java | 2 +- .../sesame/rio/ical/ICalParserFactory.java | 2 +- .../marmotta-rio-rss/pom.xml | 2 +- .../commons/sesame/rio/rss/AtomParser.java | 2 +- .../sesame/rio/rss/AtomParserFactory.java | 2 +- .../commons/sesame/rio/rss/FeedParserBase.java | 2 +- .../commons/sesame/rio/rss/RSSParser.java | 2 +- .../sesame/rio/rss/RSSParserFactory.java | 2 +- .../marmotta-rio-vcard/pom.xml | 2 +- .../commons/sesame/rio/vcard/VCardParser.java | 4 +- .../sesame/rio/vcard/VCardParserFactory.java | 2 +- .../sesame/rio/vcard/TestVCardParser.java | 2 +- .../marmotta-sail-contextaware/pom.xml | 2 +- .../sesame/contextaware/ContextAwareSail.java | 2 +- .../ContextAwareSailConnection.java | 2 +- .../marmotta-sail-transactions/pom.xml | 2 +- .../transactions/api/TransactionListener.java | 2 +- .../transactions/api/TransactionalSail.java | 2 +- .../api/TransactionalSailConnection.java | 2 +- .../transactions/model/TransactionData.java | 2 +- .../sail/KiWiTransactionalConnection.java | 2 +- .../sail/KiWiTransactionalSail.java | 2 +- .../TransactionalSailConnectionWrapper.java | 2 +- .../wrapper/TransactionalSailWrapper.java | 2 +- .../marmotta/kiwi/test/TransactionTest.java | 2 +- .../marmotta-sesame-matchers/pom.xml | 2 +- .../marmotta-util-facading/pom.xml | 7 +- .../impl/FacadingInvocationHandler.java | 15 +- .../sesame/facading/util/FacadeUtils.java | 19 +- .../facading/primitive/BoxedFacadingTest.java | 24 +- .../facading/primitive/model/PropBuilder.java | 2 +- .../marmotta-util-filter/pom.xml | 2 +- .../commons/sesame/filter/AllOfFilter.java | 2 +- .../sesame/filter/AlwaysFalseFilter.java | 2 +- .../commons/sesame/filter/AlwaysTrueFilter.java | 2 +- .../commons/sesame/filter/NotFilter.java | 2 +- .../commons/sesame/filter/OneOfFilter.java | 2 +- .../commons/sesame/filter/SesameFilter.java | 2 +- .../sesame/filter/resource/ResourceFilter.java | 2 +- .../sesame/filter/resource/UriPrefixFilter.java | 2 +- .../sesame/filter/resource/UriRegexFilter.java | 2 +- .../filter/statement/StatementFilter.java | 2 +- .../marmotta-util-rdfpatch/pom.xml | 2 +- .../marmotta-util-tripletable/pom.xml | 2 +- .../commons/sesame/tripletable/ByteArray.java | 2 +- .../commons/sesame/tripletable/IntArray.java | 2 +- .../commons/sesame/tripletable/TripleTable.java | 3 +- commons/marmotta-sesame-tools/pom.xml | 2 +- commons/pom.xml | 2 +- extras/pom.xml | 2 +- extras/webjars/codemirror/pom.xml | 2 +- extras/webjars/pom.xml | 2 +- extras/webjars/strftime/pom.xml | 2 +- launchers/marmotta-installer/pom.xml | 2 +- .../src/main/resources/installer/LICENSE.txt | 928 +++++++- .../src/main/resources/installer/NOTICE.txt | 40 +- launchers/marmotta-splash/pom.xml | 2 +- .../splash/systray/SystrayListener.java | 2 +- launchers/marmotta-webapp/pom.xml | 101 +- .../marmotta-webapp/src/deb/control/control | 2 +- launchers/marmotta-webapp/src/deb/pkg/copyright | 2 +- .../src/main/webapp/META-INF/LICENSE | 99 +- .../src/main/webapp/META-INF/NOTICE | 14 +- .../src/main/webapp/META-INF/jetty-web.xml | 27 - .../src/main/webapp/WEB-INF/jetty-web.xml | 24 +- .../src/main/webapp/WEB-INF/web.xml | 11 +- .../src/test/resources/test-config.properties | 2 +- launchers/pom.xml | 2 +- libraries/kiwi/kiwi-caching-ehcache/pom.xml | 3 +- libraries/kiwi/kiwi-caching-hazelcast/pom.xml | 3 +- libraries/kiwi/kiwi-caching-infinispan/pom.xml | 2 +- .../InfinispanEmbeddedCacheManager.java | 2 +- libraries/kiwi/kiwi-loader/pom.xml | 11 +- .../kiwi/loader/csv/SQLDateTimeProcessor.java | 51 + .../kiwi/loader/csv/SQLTimestampProcessor.java | 2 +- .../kiwi/loader/generic/KiWiBatchHandler.java | 6 +- .../kiwi/loader/generic/KiWiHandler.java | 40 +- .../kiwi/loader/mysql/MySQLLoadUtil.java | 47 +- .../kiwi/loader/pgsql/KiWiPostgresHandler.java | 2 +- .../marmotta/kiwi/loader/pgsql/PGCopyUtil.java | 31 +- .../marmotta/kiwi/loader/KiWiHandlerTest.java | 42 +- .../marmotta/kiwi/loader/PGCopyUtilTest.java | 8 +- .../apache/marmotta/kiwi/loader/demo-data.foaf | 2 + .../marmotta/kiwi/loader/demo-duplicates.ttl | 25 + libraries/kiwi/kiwi-reasoner/pom.xml | 2 +- .../reasoner/engine/ReasoningConfiguration.java | 2 +- .../kiwi/reasoner/engine/ReasoningEngine.java | 2 +- .../kiwi/reasoner/model/program/Field.java | 2 +- .../kiwi/reasoner/model/program/Filter.java | 2 +- .../reasoner/model/program/Justification.java | 2 +- .../reasoner/model/program/LiteralField.java | 2 +- .../kiwi/reasoner/model/program/Pattern.java | 2 +- .../kiwi/reasoner/model/program/Program.java | 2 +- .../reasoner/model/program/ResourceField.java | 2 +- .../kiwi/reasoner/model/program/Rule.java | 2 +- .../reasoner/model/program/VariableField.java | 2 +- .../kiwi/reasoner/model/query/QueryResult.java | 2 +- .../model/query/QueryResultIterator.java | 2 +- .../reasoner/parser/KWRLProgramParserBase.java | 2 +- .../persistence/KiWiReasoningConnection.java | 2 +- .../persistence/KiWiReasoningPersistence.java | 2 +- .../kiwi/reasoner/sail/KiWiReasoningSail.java | 2 +- .../test/engine/ReasoningEngineTest.java | 2 +- .../test/parser/KWRLProgramParserTest.java | 2 +- .../test/parser/KWRLRuleParserTest.java | 2 +- .../JustificationPersistenceTest.java | 2 +- .../persistence/KWRLProgramPersistenceTest.java | 5 +- .../test/persistence/PatternQueryTest.java | 2 +- .../reasoner/test/sail/ReasoningLargeTest.java | 2 +- .../reasoner/test/sail/ReasoningSailTest.java | 2 +- libraries/kiwi/kiwi-sparql/pom.xml | 8 +- .../kiwi/sparql/builder/ConditionFinder.java | 62 - .../kiwi/sparql/builder/DistinctFinder.java | 55 - .../kiwi/sparql/builder/ExtensionFinder.java | 66 - .../kiwi/sparql/builder/GroupFinder.java | 58 - .../kiwi/sparql/builder/LimitFinder.java | 58 - .../kiwi/sparql/builder/OPTypeFinder.java | 134 -- .../marmotta/kiwi/sparql/builder/OPTypes.java | 27 - .../kiwi/sparql/builder/OrderFinder.java | 56 - .../kiwi/sparql/builder/PatternCollector.java | 104 - .../kiwi/sparql/builder/ProjectionType.java | 27 - .../sparql/builder/SQLAbstractSubquery.java | 81 - .../kiwi/sparql/builder/SQLBuilder.java | 752 +++--- .../marmotta/kiwi/sparql/builder/SQLClause.java | 80 - .../kiwi/sparql/builder/SQLFragment.java | 182 -- .../kiwi/sparql/builder/SQLPattern.java | 196 -- .../sparql/builder/SQLProjectionFinder.java | 88 - .../kiwi/sparql/builder/SQLSubQuery.java | 99 - .../marmotta/kiwi/sparql/builder/SQLUnion.java | 215 -- .../kiwi/sparql/builder/SQLVariable.java | 168 -- .../marmotta/kiwi/sparql/builder/ValueType.java | 43 + .../kiwi/sparql/builder/VariableFinder.java | 66 - .../kiwi/sparql/builder/VariableMapping.java | 62 - .../sparql/builder/collect/ConditionFinder.java | 263 +++ .../sparql/builder/collect/DistinctFinder.java | 55 + .../sparql/builder/collect/ExtensionFinder.java | 66 + .../sparql/builder/collect/GroupFinder.java | 58 + .../sparql/builder/collect/LimitFinder.java | 58 + .../collect/LiteralTypeExpressionFinder.java | 69 + .../sparql/builder/collect/OPTypeFinder.java | 147 ++ .../sparql/builder/collect/OrderFinder.java | 56 + .../builder/collect/PatternCollector.java | 113 + .../builder/collect/SQLProjectionFinder.java | 88 + .../sparql/builder/collect/SupportedFinder.java | 169 ++ .../sparql/builder/collect/VariableFinder.java | 53 + .../builder/eval/ValueExpressionEvaluator.java | 812 +++++++ .../builder/model/SQLAbstractSubquery.java | 124 + .../kiwi/sparql/builder/model/SQLClause.java | 81 + .../kiwi/sparql/builder/model/SQLFragment.java | 193 ++ .../kiwi/sparql/builder/model/SQLPattern.java | 196 ++ .../kiwi/sparql/builder/model/SQLSubQuery.java | 103 + .../kiwi/sparql/builder/model/SQLUnion.java | 218 ++ .../kiwi/sparql/builder/model/SQLVariable.java | 197 ++ .../evaluation/KiWiEvaluationStrategy.java | 421 ++++ .../evaluation/KiWiEvaluationStrategyImpl.java | 376 --- .../kiwi/sparql/function/NativeFunction.java | 6 +- .../kiwi/sparql/function/cast/NBooleanCast.java | 10 +- .../sparql/function/cast/NDateTimeCast.java | 10 +- .../kiwi/sparql/function/cast/NDecimalCast.java | 10 +- .../kiwi/sparql/function/cast/NDoubleCast.java | 10 +- .../kiwi/sparql/function/cast/NFloatCast.java | 10 +- .../kiwi/sparql/function/cast/NIntegerCast.java | 10 +- .../kiwi/sparql/function/cast/NStringCast.java | 10 +- .../function/custom/FulltextQueryFunction.java | 10 +- .../function/custom/FulltextSearchFunction.java | 10 +- .../kiwi/sparql/function/custom/Stddev.java | 10 +- .../kiwi/sparql/function/custom/Variance.java | 10 +- .../kiwi/sparql/function/datetime/NDay.java | 10 +- .../kiwi/sparql/function/datetime/NHours.java | 10 +- .../kiwi/sparql/function/datetime/NMinutes.java | 10 +- .../kiwi/sparql/function/datetime/NMonth.java | 10 +- .../kiwi/sparql/function/datetime/NNow.java | 10 +- .../kiwi/sparql/function/datetime/NSeconds.java | 12 +- .../kiwi/sparql/function/datetime/NYear.java | 10 +- .../kiwi/sparql/function/hash/NMD5.java | 10 +- .../kiwi/sparql/function/hash/NSHA1.java | 10 +- .../kiwi/sparql/function/hash/NSHA256.java | 10 +- .../kiwi/sparql/function/hash/NSHA384.java | 10 +- .../kiwi/sparql/function/hash/NSHA512.java | 10 +- .../kiwi/sparql/function/numeric/NAbs.java | 10 +- .../kiwi/sparql/function/numeric/NCeil.java | 10 +- .../kiwi/sparql/function/numeric/NFloor.java | 10 +- .../kiwi/sparql/function/numeric/NRand.java | 10 +- .../kiwi/sparql/function/numeric/NRound.java | 16 +- .../kiwi/sparql/function/rdfterm/NSTRUUID.java | 10 +- .../kiwi/sparql/function/rdfterm/NUUID.java | 10 +- .../kiwi/sparql/function/string/NConcat.java | 10 +- .../kiwi/sparql/function/string/NContains.java | 10 +- .../kiwi/sparql/function/string/NLowerCase.java | 10 +- .../kiwi/sparql/function/string/NReplace.java | 10 +- .../kiwi/sparql/function/string/NStrAfter.java | 10 +- .../kiwi/sparql/function/string/NStrBefore.java | 10 +- .../kiwi/sparql/function/string/NStrEnds.java | 10 +- .../kiwi/sparql/function/string/NStrLen.java | 10 +- .../kiwi/sparql/function/string/NStrStarts.java | 10 +- .../kiwi/sparql/function/string/NSubstring.java | 12 +- .../kiwi/sparql/function/string/NUpperCase.java | 10 +- .../persistence/KiWiSparqlConnection.java | 210 -- .../kiwi/sparql/sail/KiWiSparqlSail.java | 7 +- .../sparql/sail/KiWiSparqlSailConnection.java | 20 +- .../sparql/test/ComplexKiWiSparqlQueryTest.java | 3 - .../kiwi/sparql/test/ContextAwareTest.java | 2 - .../kiwi/sparql/test/KiWiSparqlJoinTest.java | 18 +- .../kiwi/sparql/test/KiWiSparqlTest.java | 255 +++ .../kiwi/sparql/test/KiWiSparqlUpdateTest.java | 3 +- .../testsuite/KiWiSparqlComplianceTest.java | 353 +++ .../kiwi/sparql/test/MARMOTTA-578.sparql | 27 + .../marmotta/kiwi/sparql/testsuite/ceil.sparql | 22 + .../kiwi/sparql/testsuite/date-num-str.ttl | 41 + .../marmotta/kiwi/sparql/testsuite/floor.sparql | 22 + .../marmotta/kiwi/sparql/testsuite/hours.sparql | 21 + .../kiwi/sparql/testsuite/minutes.sparql | 21 + .../marmotta/kiwi/sparql/testsuite/month.sparql | 21 + .../marmotta/kiwi/sparql/testsuite/round.sparql | 22 + .../kiwi/sparql/testsuite/seconds.sparql | 21 + .../marmotta/kiwi/sparql/testsuite/year.sparql | 21 + libraries/kiwi/kiwi-triplestore/pom.xml | 11 +- .../marmotta/kiwi/config/KiWiConfiguration.java | 97 +- .../kiwi/exception/DriverNotFoundException.java | 2 +- .../org/apache/marmotta/kiwi/io/KiWiIO.java | 7 +- .../marmotta/kiwi/jmx/KiWiStatisticsMBean.java | 26 + .../kiwi/model/rdf/KiWiAnonResource.java | 2 +- .../kiwi/model/rdf/KiWiBooleanLiteral.java | 2 +- .../kiwi/model/rdf/KiWiDateLiteral.java | 49 +- .../kiwi/model/rdf/KiWiDoubleLiteral.java | 17 +- .../marmotta/kiwi/model/rdf/KiWiIntLiteral.java | 2 +- .../marmotta/kiwi/model/rdf/KiWiLiteral.java | 2 +- .../marmotta/kiwi/model/rdf/KiWiNamespace.java | 2 +- .../marmotta/kiwi/model/rdf/KiWiNode.java | 9 +- .../marmotta/kiwi/model/rdf/KiWiResource.java | 2 +- .../kiwi/model/rdf/KiWiStringLiteral.java | 2 +- .../marmotta/kiwi/model/rdf/KiWiTriple.java | 2 +- .../kiwi/model/rdf/KiWiUriResource.java | 6 +- .../kiwi/persistence/KiWiConnection.java | 372 ++- .../marmotta/kiwi/persistence/KiWiDialect.java | 51 +- .../kiwi/persistence/KiWiGarbageCollector.java | 22 +- .../kiwi/persistence/KiWiPersistence.java | 23 +- .../marmotta/kiwi/persistence/h2/H2Dialect.java | 32 +- .../kiwi/persistence/mysql/MySQLDialect.java | 33 +- .../persistence/pgsql/PostgreSQLDialect.java | 34 +- .../persistence/util/ResultSetIteration.java | 4 +- .../util/ResultTransformerFunction.java | 2 +- .../kiwi/persistence/util/ScriptRunner.java | 4 +- .../marmotta/kiwi/sail/KiWiSailConnection.java | 2 +- .../apache/marmotta/kiwi/sail/KiWiStore.java | 2 +- .../marmotta/kiwi/sail/KiWiValueFactory.java | 25 +- .../kiwi/persistence/h2/create_base_tables.sql | 3 +- .../kiwi/persistence/h2/statements.properties | 24 +- .../persistence/h2/upgrade_base_003_004.sql | 18 + .../persistence/mysql/create_base_tables.sql | 3 +- .../persistence/mysql/statements.properties | 24 +- .../persistence/mysql/upgrade_base_003_004.sql | 18 + .../persistence/pgsql/create_base_tables.sql | 3 +- .../persistence/pgsql/statements.properties | 24 +- .../persistence/pgsql/upgrade_base_003_004.sql | 18 + .../apache/marmotta/kiwi/test/DialectTest.java | 10 +- .../marmotta/kiwi/test/PersistenceTest.java | 14 +- .../marmotta/kiwi/test/TestValueFactory.java | 8 +- .../kiwi/test/junit/KiWiDatabaseRunner.java | 4 +- libraries/kiwi/kiwi-versioning/pom.xml | 6 +- .../kiwi/versioning/api/VersioningSail.java | 2 +- .../marmotta/kiwi/versioning/model/Version.java | 2 +- .../persistence/KiWiVersioningConnection.java | 2 +- .../persistence/KiWiVersioningPersistence.java | 2 +- .../repository/SnapshotRepository.java | 2 +- .../SnapshotRepositoryConnection.java | 2 +- .../versioning/sail/KiWiSnapshotConnection.java | 2 +- .../versioning/sail/KiWiVersionListener.java | 2 +- .../versioning/sail/KiWiVersioningSail.java | 2 +- .../versioning/test/SnapshotRepositoryTest.java | 2 +- .../test/VersioningPersistenceTest.java | 5 +- .../test/VersioningRepositoryTest.java | 2 +- libraries/kiwi/pom.xml | 12 +- libraries/ldcache/ldcache-api/pom.xml | 2 +- .../ldcache/api/LDCachingConnection.java | 2 +- .../ldcache/model/CacheConfiguration.java | 2 +- .../marmotta/ldcache/model/CacheEntry.java | 2 +- libraries/ldcache/ldcache-backend-file/pom.xml | 2 +- .../ldcache/ldcache-backend-infinispan/pom.xml | 2 +- libraries/ldcache/ldcache-backend-kiwi/pom.xml | 2 +- .../backend/kiwi/model/KiWiCacheEntry.java | 2 +- .../persistence/LDCachingKiWiPersistence.java | 2 +- .../LDCachingKiWiPersistenceConnection.java | 2 +- .../kiwi/test/LDCachePersistenceTest.java | 4 +- libraries/ldcache/ldcache-core/pom.xml | 2 +- .../services/test/dummy/DummyEndpoint.java | 2 +- .../ldcache/services/test/dummy/DummyTest.java | 2 +- libraries/ldcache/ldcache-sail-generic/pom.xml | 2 +- libraries/ldcache/ldcache-sail-kiwi/pom.xml | 2 +- .../ldcache/sail/KiWiLinkedDataSail.java | 2 +- .../sail/KiWiLinkedDataSailConnection.java | 2 +- .../test/KiWiLinkedDataSailOfflineTest.java | 2 +- libraries/ldcache/pom.xml | 2 +- libraries/ldclient/ldclient-api/pom.xml | 2 +- .../ldclient/api/endpoint/Endpoint.java | 2 +- .../ldclient/api/ldclient/LDClientService.java | 2 +- .../ldclient/api/provider/DataProvider.java | 2 +- .../ldclient/api/provider/ValueMapper.java | 2 +- .../exception/DataRetrievalException.java | 2 +- .../ldclient/model/ClientConfiguration.java | 2 +- .../marmotta/ldclient/model/ClientResponse.java | 2 +- libraries/ldclient/ldclient-core/pom.xml | 2 +- .../ldclient/services/ldclient/LDClient.java | 2 +- .../services/provider/AbstractHttpProvider.java | 23 +- .../services/provider/BlockingProvider.java | 2 +- .../marmotta/ldclient/dummy/DummyEndpoint.java | 2 +- .../marmotta/ldclient/dummy/DummyProvider.java | 2 +- .../ldclient/test/TestLDClientTest.java | 2 +- .../ldclient/test/helper/TestLDClient.java | 2 +- .../test/provider/ProviderTestBase.java | 54 +- .../ldclient/ldclient-provider-facebook/pom.xml | 6 +- .../facebook/FacebookGraphProvider.java | 7 +- .../ldclient/ldclient-provider-freebase/pom.xml | 6 +- .../endpoint/freebase/FreebaseEndpoint.java | 2 +- .../provider/freebase/FreebaseProvider.java | 2 +- .../test/freebase/TestFreebaseProvider.java | 58 +- .../ldclient/ldclient-provider-html/pom.xml | 6 +- .../provider/html/AbstractHTMLDataProvider.java | 2 +- .../html/mapping/CssDateLiteralMapper.java | 2 +- .../html/mapping/CssLiteralAttrMapper.java | 2 +- .../html/mapping/CssSelectorMapper.java | 2 +- .../html/mapping/CssTextLiteralMapper.java | 2 +- .../CssUriAttrBlacklistQueryParamsMapper.java | 2 +- .../provider/html/mapping/CssUriAttrMapper.java | 2 +- .../CssUriAttrWhitelistQueryParamsMapper.java | 2 +- .../provider/html/mapping/JSoupMapper.java | 2 +- .../ldclient/ldclient-provider-ldap/pom.xml | 6 +- .../ldclient/provider/ldap/LdapEndpoint.java | 2 +- .../provider/ldap/LdapFoafProvider.java | 20 +- .../ldap/mapping/LiteralPredicateFactory.java | 11 +- .../ldap/mapping/PredicateObjectFactory.java | 12 +- .../mapping/TypedLiteralPredicateFactory.java | 47 - .../ldap/mapping/UriPredicateFactory.java | 11 +- .../provider/ldap/TestLdapFoafProvider.java | 2 +- .../ldclient-provider-mediawiki/pom.xml | 6 +- .../mediawiki/WikipediaIndexEndpoint.java | 2 +- .../mediawiki/WikipediaPageEndpoint.java | 2 +- .../provider/mediawiki/MediawikiProvider.java | 2 +- .../test/mediawiki/TestMediawikiProvider.java | 2 +- .../ldclient/ldclient-provider-phpbb/pom.xml | 7 +- .../ldclient/endpoint/phpbb/PHPBBEndpoints.java | 2 +- .../endpoint/phpbb/PHPBBForumEndpoint.java | 2 +- .../endpoint/phpbb/PHPBBPostEndpoint.java | 2 +- .../endpoint/phpbb/PHPBBTopicEndpoint.java | 2 +- .../provider/phpbb/PHPBBForumProvider.java | 2 +- .../provider/phpbb/PHPBBPostProvider.java | 2 +- .../provider/phpbb/PHPBBTopicProvider.java | 2 +- .../provider/phpbb/mapping/PHPBBDateMapper.java | 2 +- .../phpbb/mapping/PHPBBForumHrefMapper.java | 2 +- .../phpbb/mapping/PHPBBPostIdMapper.java | 2 +- .../phpbb/mapping/PHPBBTopicHrefMapper.java | 2 +- .../ldclient/ldclient-provider-rdf/pom.xml | 2 +- .../endpoint/rdf/LinkedDataEndpoint.java | 2 +- .../ldclient/endpoint/rdf/SPARQLEndpoint.java | 2 +- .../ldclient/endpoint/rdf/StanbolEndpoint.java | 2 +- .../provider/rdf/AbstractRDFProvider.java | 2 +- .../ldclient/provider/rdf/CacheProvider.java | 2 +- .../provider/rdf/LinkedDataProvider.java | 2 +- .../ldclient/provider/rdf/RegexUriProvider.java | 2 +- .../ldclient/provider/rdf/SPARQLProvider.java | 2 +- .../test/rdf/TestLinkedDataProvider.java | 2 +- .../ldclient/test/rdf/TestSPARQLProvider.java | 2 +- .../ldclient/test/rdf/TestStanbolProvider.java | 2 +- .../ldclient/ldclient-provider-rdfa/pom.xml | 2 +- .../ldclient/ldclient-provider-vimeo/pom.xml | 7 +- .../endpoint/vimeo/VimeoChannelEndpoint.java | 2 +- .../endpoint/vimeo/VimeoGroupEndpoint.java | 2 +- .../endpoint/vimeo/VimeoVideoEndpoint.java | 2 +- .../provider/vimeo/VimeoChannelProvider.java | 2 +- .../provider/vimeo/VimeoVideoProvider.java | 2 +- .../provider/vimeo/mapping/VimeoDateMapper.java | 2 +- .../ldclient/test/vimeo/TestVimeoProvider.java | 2 +- .../ldclient/ldclient-provider-xml/pom.xml | 2 +- .../provider/xml/AbstractXMLDataProvider.java | 2 +- .../xml/mapping/CommaSeparatedMapper.java | 2 +- .../xml/mapping/XPathLiteralMapper.java | 2 +- .../provider/xml/mapping/XPathURIMapper.java | 2 +- .../provider/xml/mapping/XPathValueMapper.java | 2 +- .../ldclient/ldclient-provider-youtube/pom.xml | 2 +- .../youtube/YoutubeChannelEndpointGData.java | 2 +- .../youtube/YoutubeChannelEndpointWeb.java | 2 +- .../youtube/YoutubePlaylistEndpointGData.java | 2 +- .../youtube/YoutubePlaylistEndpointWeb.java | 2 +- .../youtube/YoutubePlaylistEndpointWebLong.java | 2 +- .../endpoint/youtube/YoutubeVideoEndpoint.java | 2 +- .../youtube/YoutubeVideoPageEndpointGData.java | 2 +- .../youtube/YoutubeVideoPageEndpointWatch.java | 2 +- .../youtube/YoutubeVideoPageEndpointWeb.java | 2 +- .../youtube/YoutubeChannelProvider.java | 2 +- .../youtube/YoutubePlaylistProvider.java | 2 +- .../youtube/YoutubeVideoPagesProvider.java | 2 +- .../provider/youtube/YoutubeVideoProvider.java | 2 +- .../youtube/mapping/YoutubeCategoryMapper.java | 2 +- .../youtube/mapping/YoutubeLatitudeMapper.java | 2 +- .../youtube/mapping/YoutubeLongitudeMapper.java | 2 +- .../youtube/mapping/YoutubeUriMapper.java | 2 +- .../test/youtube/TestYoutubeProvider.java | 4 +- libraries/ldclient/pom.xml | 2 +- libraries/ldpath/ldpath-api/pom.xml | 2 +- .../marmotta/ldpath/api/LDPathConstruct.java | 2 +- .../ldpath/api/backend/NodeBackend.java | 2 +- .../marmotta/ldpath/api/backend/RDFBackend.java | 2 +- .../ldpath/api/functions/NodeFunction.java | 2 +- .../ldpath/api/functions/SelectorFunction.java | 2 +- .../ldpath/api/functions/TestFunction.java | 2 +- .../ldpath/api/selectors/NodeSelector.java | 2 +- .../marmotta/ldpath/api/tests/NodeTest.java | 2 +- .../api/transformers/NodeTransformer.java | 2 +- libraries/ldpath/ldpath-backend-file/pom.xml | 2 +- .../ldpath/backend/file/FileBackend.java | 2 +- .../marmotta/ldpath/backend/file/FileQuery.java | 2 +- .../ldpath/backend/file/ParserTest.java | 2 +- .../marmotta/ldpath/backend/file/PathTest.java | 2 +- libraries/ldpath/ldpath-backend-jena/pom.xml | 2 +- .../ldpath/backend/jena/GenericJenaBackend.java | 2 +- .../ldpath/ldpath-backend-linkeddata/pom.xml | 2 +- .../backend/linkeddata/LDCacheBackend.java | 2 +- libraries/ldpath/ldpath-backend-sesame/pom.xml | 2 +- .../backend/sesame/SesameRepositoryBackend.java | 2 +- .../backend/sesame/ThreadingSesameBackend.java | 2 +- libraries/ldpath/ldpath-core-bundle/pom.xml | 2 +- libraries/ldpath/ldpath-core/pom.xml | 2 +- .../java/org/apache/marmotta/ldpath/LDPath.java | 2 +- .../ldpath/exception/LDPathParseException.java | 2 +- .../apache/marmotta/ldpath/model/Constants.java | 2 +- .../ldpath/model/backend/AbstractBackend.java | 42 +- .../ldpath/model/fields/FieldMapping.java | 13 +- .../model/functions/ConcatenateFunction.java | 2 +- .../ldpath/model/functions/CountFunction.java | 4 +- .../ldpath/model/functions/FirstFunction.java | 9 +- .../ldpath/model/functions/LastFunction.java | 9 +- .../ldpath/model/functions/SortFunction.java | 8 +- .../marmotta/ldpath/model/programs/Program.java | 22 +- .../model/selectors/FunctionSelector.java | 29 +- .../ldpath/model/selectors/GroupedSelector.java | 9 +- .../model/selectors/IntersectionSelector.java | 29 +- .../ldpath/model/selectors/PathSelector.java | 33 +- .../model/selectors/PropertySelector.java | 19 +- .../model/selectors/RecursivePathSelector.java | 28 +- .../selectors/ReversePropertySelector.java | 9 +- .../ldpath/model/selectors/SelfSelector.java | 2 +- .../model/selectors/StringConstantSelector.java | 20 +- .../ldpath/model/selectors/TestingSelector.java | 31 +- .../ldpath/model/selectors/UnionSelector.java | 30 +- .../model/selectors/WildcardSelector.java | 2 +- .../marmotta/ldpath/model/tests/AndTest.java | 24 +- .../ldpath/model/tests/ComplexTest.java | 2 +- .../ldpath/model/tests/FunctionTest.java | 28 +- .../marmotta/ldpath/model/tests/IsATest.java | 6 +- .../ldpath/model/tests/LiteralLanguageTest.java | 17 +- .../ldpath/model/tests/LiteralTypeTest.java | 21 +- .../marmotta/ldpath/model/tests/NotTest.java | 10 +- .../marmotta/ldpath/model/tests/OrTest.java | 22 +- .../ldpath/model/tests/PathEqualityTest.java | 19 +- .../marmotta/ldpath/model/tests/PathTest.java | 17 +- .../tests/functions/BinaryNumericTest.java | 4 +- .../ldpath/model/tests/functions/EqualTest.java | 2 +- .../model/tests/functions/GreaterEqualTest.java | 2 +- .../model/tests/functions/GreaterThanTest.java | 2 +- .../model/tests/functions/LessEqualTest.java | 2 +- .../model/tests/functions/LessThanTest.java | 2 +- .../model/tests/functions/NotEqualTest.java | 2 +- .../transformers/BigDecimalTransformer.java | 2 +- .../transformers/BigIntegerTransformer.java | 2 +- .../model/transformers/BooleanTransformer.java | 2 +- .../model/transformers/ByteTransformer.java | 2 +- .../model/transformers/DateTimeTransformer.java | 2 +- .../model/transformers/DateTransformer.java | 2 +- .../model/transformers/DoubleTransformer.java | 2 +- .../model/transformers/DurationTransformer.java | 2 +- .../model/transformers/FloatTransformer.java | 2 +- .../model/transformers/IdentityTransformer.java | 2 +- .../model/transformers/IntTransformer.java | 2 +- .../model/transformers/LongTransformer.java | 2 +- .../model/transformers/ShortTransformer.java | 2 +- .../model/transformers/StringTransformer.java | 2 +- .../model/transformers/TimeTransformer.java | 2 +- .../marmotta/ldpath/parser/Configuration.java | 10 +- .../ldpath/parser/DefaultConfiguration.java | 10 +- .../marmotta/ldpath/util/Collections.java | 2 +- .../marmotta/ldpath/util/FormatUtils.java | 2 +- .../org/apache/marmotta/ldpath/parser/ldpath.jj | 140 +- .../BinaryNumericTestFunctionsTest.java | 2 +- .../ldpath/model/functions/FunctionsTest.java | 2 +- .../marmotta/ldpath/parser/ProgramTest.java | 3 +- .../marmotta/ldpath/test/AbstractTestBase.java | 2 +- .../ldpath/ldpath-functions-collections/pom.xml | 2 +- .../functions/coll/AbstractCollFunction.java | 2 +- .../model/functions/coll/FlattenFunction.java | 2 +- .../model/functions/coll/GetFunction.java | 2 +- .../model/functions/coll/SubListFunction.java | 2 +- .../model/functions/coll/CollectionsTest.java | 2 +- libraries/ldpath/ldpath-functions-date/pom.xml | 2 +- .../model/functions/date/DateFunction.java | 2 +- .../functions/date/EarliestDateFunction.java | 2 +- .../functions/date/LatestDateFunction.java | 2 +- .../model/functions/date/DateFunctionsTest.java | 6 +- libraries/ldpath/ldpath-functions-html/pom.xml | 2 +- .../model/functions/html/CleanHtmlFunction.java | 2 +- .../model/functions/html/CssSelectFunction.java | 2 +- .../model/functions/html/HtmlFunctionsTest.java | 2 +- libraries/ldpath/ldpath-functions-json/pom.xml | 22 +- .../model/functions/json/JsonPathFunction.java | 16 + .../functions/json/JsonPathFunctionTest.java | 17 +- libraries/ldpath/ldpath-functions-math/pom.xml | 2 +- .../model/functions/math/MathFunction.java | 2 +- .../model/functions/math/MaxFunction.java | 2 +- .../model/functions/math/MinFunction.java | 2 +- .../model/functions/math/RoundFunction.java | 2 +- .../model/functions/math/SumFunction.java | 2 +- .../model/functions/math/MathFunctionTest.java | 2 +- libraries/ldpath/ldpath-functions-text/pom.xml | 2 +- .../model/functions/text/ReplaceFunction.java | 2 +- .../model/functions/text/StrJoinFunction.java | 2 +- .../model/functions/text/StrLeftFunction.java | 2 +- .../model/functions/text/StrLenFunction.java | 2 +- .../model/functions/text/StrRightFunction.java | 2 +- .../model/functions/text/SubstringFunction.java | 2 +- .../model/functions/text/WordCountFunction.java | 2 +- .../text/AbstractBinaryStringTest.java | 2 +- .../functions/text/AbstractStringTest.java | 2 +- .../functions/text/StringContainsTest.java | 2 +- .../functions/text/StringEndsWithTest.java | 2 +- .../tests/functions/text/StringEqualsIC.java | 2 +- .../tests/functions/text/StringEqualsTest.java | 2 +- .../tests/functions/text/StringIsEmptyTest.java | 2 +- .../functions/text/StringStartsWithTest.java | 2 +- .../model/functions/text/TextFunctionsTest.java | 2 +- .../tests/functions/text/StringTestTest.java | 2 +- libraries/ldpath/ldpath-functions-xml/pom.xml | 2 +- .../model/functions/xml/XPathFunction.java | 2 +- libraries/ldpath/ldpath-ldquery-cli/pom.xml | 2 +- .../ldpath-ldquery-cli/src/main/doc/LICENSE.txt | 5 +- .../ldpath-ldquery-cli/src/main/doc/NOTICE.txt | 8 +- .../ldpath-ldquery-cli/src/main/doc/README.txt | 16 +- .../apache/marmotta/ldpath/ldquery/LDQuery.java | 2 +- .../ldpath/ldpath-template-linkeddata/pom.xml | 2 +- .../marmotta/ldpath/template/LDTemplate.java | 2 +- libraries/ldpath/ldpath-template/pom.xml | 2 +- .../ldpath/template/engine/LDPathDirective.java | 2 +- .../ldpath/template/engine/LDPathMethod.java | 2 +- .../template/engine/NamespaceDirective.java | 2 +- .../ldpath/template/engine/TemplateEngine.java | 2 +- .../model/freemarker/TemplateNodeModel.java | 2 +- .../model/freemarker/TemplateStackModel.java | 2 +- .../model/freemarker/TemplateWrapperModel.java | 2 +- .../TemplateBooleanTransformer.java | 2 +- .../transformers/TemplateDateTransformer.java | 2 +- .../transformers/TemplateDoubleTransformer.java | 2 +- .../transformers/TemplateFloatTransformer.java | 2 +- .../TemplateIntegerTransformer.java | 2 +- .../transformers/TemplateLongTransformer.java | 2 +- .../transformers/TemplateScalarTransformer.java | 2 +- .../ldpath/template/util/FormatUtil.java | 2 +- libraries/ldpath/pom.xml | 2 +- libraries/pom.xml | 2 +- loader/marmotta-loader-berkeley/pom.xml | 2 +- loader/marmotta-loader-core/pom.xml | 6 +- loader/marmotta-loader-hbase/pom.xml | 2 +- loader/marmotta-loader-kiwi/pom.xml | 2 +- loader/marmotta-loader-titan/pom.xml | 2 +- loader/pom.xml | 2 +- parent/pom.xml | 63 +- .../marmotta-backend-accumulograph/pom.xml | 63 + .../AccumuloGraphLoggingModule.java | 79 + .../accumulograph/AccumuloGraphProvider.java | 128 ++ .../src/main/resources/META-INF/beans.xml | 28 + .../main/resources/config-defaults.properties | 28 + .../resources/config-descriptions.properties | 133 ++ .../src/main/resources/kiwi-module.properties | 37 + .../src/main/resources/web/admin/about.html | 36 + .../main/resources/web/admin/configuration.html | 54 + platform/backends/marmotta-backend-kiwi/pom.xml | 2 +- .../backend/kiwi/KiWiStoreProvider.java | 1 - .../main/resources/config-defaults.properties | 2 +- .../backends/marmotta-backend-memory/pom.xml | 2 +- .../backends/marmotta-backend-native/pom.xml | 2 +- .../backends/marmotta-backend-titan/pom.xml | 2 +- platform/backends/pom.xml | 3 +- .../ldcache/marmotta-ldcache-common/pom.xml | 2 +- .../api/endpoint/LinkedDataEndpointService.java | 2 +- .../model/filter/MarmottaNotCachedFilter.java | 2 +- .../endpoint/LinkedDataEndpointServiceImpl.java | 2 +- .../LinkedDataCachingWebService.java | 2 +- platform/ldcache/marmotta-ldcache-file/pom.xml | 2 +- platform/ldcache/marmotta-ldcache-kiwi/pom.xml | 2 +- .../services/kiwi/KiWiLDCacheSailProvider.java | 2 +- platform/ldcache/pom.xml | 2 +- platform/marmotta-core/pom.xml | 7 +- .../platform/core/api/cache/CachingService.java | 2 +- .../core/api/config/ConfigurationService.java | 2 +- .../core/api/config/DependenciesService.java | 6 +- .../core/api/content/ContentReader.java | 2 +- .../core/api/content/ContentService.java | 2 +- .../core/api/content/ContentWriter.java | 2 +- .../core/api/exporter/ExportService.java | 2 +- .../core/api/http/HttpClientService.java | 2 +- .../core/api/importer/ImportService.java | 2 +- .../core/api/importer/ImportWatchService.java | 2 +- .../platform/core/api/importer/Importer.java | 2 +- .../platform/core/api/io/MarmottaIOService.java | 2 +- .../platform/core/api/io/RDFHtmlWriter.java | 2 +- .../platform/core/api/io/RDFWriterPriority.java | 2 +- .../core/api/logging/LoggingService.java | 2 +- .../core/api/modules/MarmottaHttpFilter.java | 2 +- .../api/modules/MarmottaResourceService.java | 2 +- .../core/api/modules/ModuleService.java | 2 +- .../core/api/modules/ResourceEntry.java | 2 +- .../core/api/prefix/PrefixProvider.java | 2 +- .../platform/core/api/prefix/PrefixService.java | 2 +- .../platform/core/api/ssl/SSLService.java | 2 +- .../core/api/statistics/StatisticsModule.java | 2 +- .../core/api/statistics/StatisticsService.java | 2 +- .../marmotta/platform/core/api/task/Task.java | 2 +- .../platform/core/api/task/TaskInfo.java | 2 +- .../core/api/task/TaskManagerService.java | 2 +- .../api/templating/AdminInterfaceService.java | 2 +- .../core/api/templating/TemplatingService.java | 2 +- .../core/api/triplestore/ContextService.java | 2 +- .../api/triplestore/NotifyingSailProvider.java | 2 +- .../core/api/triplestore/SailProvider.java | 2 +- .../core/api/triplestore/SesameService.java | 2 +- .../api/triplestore/StandardSailProvider.java | 2 +- .../triplestore/TransactionalSailProvider.java | 2 +- .../core/api/ui/MarmottaSystrayLink.java | 2 +- .../platform/core/api/user/UserService.java | 2 +- .../events/ConfigurationServiceInitEvent.java | 2 +- .../core/exception/HttpErrorException.java | 23 +- .../exception/InvalidArgumentException.java | 2 +- .../MarmottaConfigurationException.java | 2 +- .../core/exception/MarmottaException.java | 2 +- .../core/exception/ResolvingException.java | 2 +- .../core/exception/TemplatingException.java | 2 +- .../core/exception/UserExistsException.java | 2 +- .../exception/WritingNotSupportedException.java | 2 +- .../authentication/LoginFailedException.java | 2 +- .../exception/io/MarmottaExportException.java | 2 +- .../exception/io/MarmottaImportException.java | 2 +- .../io/UnsupportedExporterException.java | 2 +- .../security/AccessDeniedException.java | 2 +- .../exception/webservice/NotFoundException.java | 2 +- .../exception/webservice/ServerException.java | 2 +- .../core/filters/MarmottaServerNameFilter.java | 2 +- .../core/filters/ModuleResourceFilter.java | 2 +- .../platform/core/filters/TemplatingFilter.java | 2 +- .../platform/core/jaxrs/ErrorMessage.java | 50 + .../HttpErrorExceptionMapper.java | 68 +- .../platform/core/jndi/MarmottaContext.java | 2 +- .../core/jndi/MarmottaContextFactory.java | 2 +- .../core/jndi/MarmottaInitialContext.java | 2 +- .../MarmottaInitialContextFactoryBuilder.java | 4 +- .../core/jndi/MarmottaJndiListener.java | 2 +- .../platform/core/model/config/CoreOptions.java | 6 + .../platform/core/model/content/Content.java | 2 +- .../core/model/content/MediaContent.java | 2 +- .../core/model/content/MediaContentItem.java | 2 +- .../core/model/filter/MarmottaLocalFilter.java | 2 +- .../core/model/module/ModuleConfiguration.java | 8 +- .../platform/core/model/template/MenuItem.java | 2 +- .../platform/core/model/user/MarmottaUser.java | 2 +- .../platform/core/model/user/OnlineAccount.java | 2 +- .../core/qualifiers/cache/MarmottaCache.java | 2 +- .../core/qualifiers/event/ContentCreated.java | 2 +- .../platform/core/qualifiers/event/Created.java | 2 +- .../platform/core/qualifiers/event/Removed.java | 2 +- .../platform/core/qualifiers/event/Updated.java | 2 +- .../event/transaction/AfterCommit.java | 2 +- .../event/transaction/AfterRollback.java | 2 +- .../event/transaction/BeforeCommit.java | 2 +- .../event/transaction/BeforeRollback.java | 2 +- .../qualifiers/event/transaction/OnAbort.java | 2 +- .../kspace/ActiveKnowledgeSpaces.java | 2 +- .../kspace/CurrentKnowledgeSpace.java | 2 +- .../kspace/DefaultKnowledgeSpace.java | 2 +- .../kspace/InferredKnowledgeSpace.java | 2 +- .../qualifiers/kspace/SystemKnowledgeSpace.java | 2 +- .../core/qualifiers/user/AdminUser.java | 2 +- .../core/qualifiers/user/AnonymousUser.java | 2 +- .../core/qualifiers/user/CurrentUser.java | 2 +- .../platform/core/rio/RDFHtmlFormat.java | 2 +- .../platform/core/rio/RDFHtmlWriterFactory.java | 2 +- .../platform/core/rio/RDFHtmlWriterImpl.java | 2 +- .../core/services/cache/CachingServiceImpl.java | 2 +- .../config/ConfigurationServiceImpl.java | 2 +- .../config/DependenciesServiceImpl.java | 20 +- .../services/content/ContentServiceImpl.java | 2 +- .../content/FileSystemContentReader.java | 2 +- .../content/FileSystemContentWriter.java | 2 +- .../services/content/HTTPContentReader.java | 10 +- .../services/exporter/ExporterServiceImpl.java | 2 +- .../services/http/HttpClientServiceImpl.java | 2 +- .../core/services/http/MonitoredHttpEntity.java | 2 +- .../response/LastModifiedResponseHandler.java | 2 +- .../response/StatusCodeResponseHandler.java | 2 +- .../response/StringBodyResponseHandler.java | 2 +- .../services/importer/ImportServiceImpl.java | 2 +- .../services/importer/rdf/RDFImporterImpl.java | 2 +- .../core/services/io/MarmottaIOServiceImpl.java | 2 +- .../jaxrs/ExceptionMapperServiceImpl.java | 17 +- .../services/logging/LoggingServiceImpl.java | 2 +- .../modules/MarmottaResourceServiceImpl.java | 2 +- .../services/modules/ModuleServiceImpl.java | 2 +- .../platform/core/services/prefix/PrefixCC.java | 21 +- .../core/services/prefix/PrefixServiceCC.java | 2 +- .../core/services/prefix/PrefixServiceImpl.java | 2 +- .../sesame/ResourceSubjectMetadata.java | 2 +- .../core/services/ssl/SSLServiceImpl.java | 2 +- .../statistics/StatisticsServiceImpl.java | 2 +- .../system/SystemStatisticsModule.java | 2 +- .../platform/core/services/task/TaskImpl.java | 2 +- .../services/task/TaskManagerServiceImpl.java | 2 +- .../templating/AdminTemplatingServiceImpl.java | 2 +- .../templating/TemplatingServiceImpl.java | 2 +- .../triplestore/ContextServiceImpl.java | 2 +- .../services/triplestore/SesameServiceImpl.java | 2 +- .../core/services/user/UserServiceImpl.java | 2 +- .../core/servlet/MarmottaH2ConsoleFilter.java | 2 +- .../core/servlet/MarmottaOptionsFilter.java | 2 +- .../core/servlet/MarmottaPostStartupFilter.java | 2 +- .../core/servlet/MarmottaPreStartupFilter.java | 2 +- .../servlet/MarmottaPreStartupListener.java | 2 +- .../core/servlet/MarmottaResourceFilter.java | 2 +- .../core/startup/MarmottaStartupService.java | 63 +- .../marmotta/platform/core/util/CDIContext.java | 12 +- .../marmotta/platform/core/util/CDIUtils.java | 2 +- .../marmotta/platform/core/util/DateUtil.java | 2 +- .../core/util/FallbackConfiguration.java | 2 +- .../marmotta/platform/core/util/KiWiIO.java | 2 +- .../core/util/LinkedHashSetBlockingQueue.java | 2 +- .../platform/core/util/ReflectionUtils.java | 2 +- .../platform/core/util/WebServiceUtil.java | 2 +- .../core/util/http/HttpRequestUtil.java | 2 +- .../core/webservices/CoreApplication.java | 2 +- .../config/ConfigurationWebService.java | 2 +- .../config/DependenciesWebService.java | 6 +- .../core/webservices/io/ExportWebService.java | 9 +- .../core/webservices/io/ImportWebService.java | 6 +- .../webservices/modules/ModuleWebService.java | 2 +- .../webservices/prefix/PrefixWebService.java | 2 +- .../resource/AnonResourceWebService.java | 2 +- .../webservices/resource/ContentWebService.java | 50 +- .../resource/InspectionWebService.java | 7 +- .../webservices/resource/MetaWebService.java | 49 +- .../resource/ResourceWebService.java | 108 +- .../resource/ResourceWebServiceHelper.java | 49 +- .../statistics/StatisticsWebService.java | 2 +- .../webservices/status/StatusWebservice.java | 327 +++ .../webservices/system/SystemWebService.java | 2 +- .../webservices/task/TaskManagerWebService.java | 2 +- .../triplestore/ContextWebService.java | 5 +- .../main/resources/config-defaults.properties | 5 +- .../src/main/resources/kiwi-module.properties | 3 +- .../core/test/base/AbstractMarmotta.java | 13 +- .../core/test/base/EmbeddedMarmotta.java | 2 +- .../platform/core/test/base/JettyMarmotta.java | 10 +- .../core/test/base/TestStoreProvider.java | 2 +- .../core/test/base/jetty/TestApplication.java | 3 +- .../test/base/jetty/TestInjectorFactory.java | 7 +- .../test/config/ConfigurationServiceTest.java | 2 +- .../config/ConfigurationWebServiceTest.java | 2 +- .../test/embedded/EmbeddedMarmottaTest.java | 2 +- .../core/test/jaxrs/ExceptionHandlingTest.java | 86 + .../platform/core/test/ld/LinkedDataTest.java | 28 +- .../modules/MarmottaResourceServiceTest.java | 2 +- .../platform/core/test/prefix/PrefixCCTest.java | 2 +- .../core/test/prefix/PrefixServiceTest.java | 2 +- .../core/test/prefix/PrefixWebServiceTest.java | 2 +- .../core/test/user/UserServiceTest.java | 2 +- .../platform/core/util/http/UriUtilTests.java | 2 +- platform/marmotta-ldp/pom.xml | 2 +- .../marmotta/platform/ldp/api/LdpService.java | 8 +- .../marmotta/platform/ldp/api/Preference.java | 36 +- .../platform/ldp/services/LdpServiceImpl.java | 40 +- .../ldp/util/AbstractResourceUriGenerator.java | 63 + .../marmotta/platform/ldp/util/LdpUtils.java | 98 +- .../platform/ldp/util/RandomUriGenerator.java | 77 + .../platform/ldp/util/ResponseBuilderImpl.java | 345 --- .../ServerManagedPropertiesInterceptor.java | 95 + .../platform/ldp/util/SlugUriGenerator.java | 50 + .../platform/ldp/util/UuidUriGenerator.java | 38 + .../platform/ldp/webservices/LdpWebService.java | 84 +- .../ldp/webservices/LdpWebServiceTest.java | 184 +- platform/marmotta-ldpath/pom.xml | 2 +- .../api/AutoRegisteredLDPathFunction.java | 2 +- .../platform/ldpath/api/LDPathService.java | 2 +- .../platform/ldpath/backend/LMFBackend.java | 2 +- .../ldpath/model/functions/ContentFunction.java | 2 +- .../ldpath/model/functions/JsoupFunction.java | 2 +- .../ldpath/services/LDPathServiceImpl.java | 2 +- .../webservices/LDPathUtilWebService.java | 2 +- .../ldpath/webservices/LDPathWebService.java | 36 +- platform/marmotta-reasoner-kiwi/pom.xml | 2 +- .../services/ReasoningSailProvider.java | 2 +- .../reasoner/webservices/ProgramWebService.java | 2 +- .../webservices/ReasonerWebService.java | 2 +- platform/marmotta-security/pom.xml | 2 +- .../platform/security/api/SecurityService.java | 2 +- .../filters/MarmottaAccessControlFilter.java | 2 +- .../platform/security/model/HTTPMethods.java | 2 +- .../security/model/SecurityConstraint.java | 38 +- .../security/services/SecurityServiceImpl.java | 2 +- .../platform/security/util/IPv4SubnetInfo.java | 2 +- .../platform/security/util/IPv6SubnetInfo.java | 2 +- .../platform/security/util/SubnetInfo.java | 2 +- .../webservices/SecurityWebService.java | 2 +- platform/marmotta-sparql/pom.xml | 8 +- .../platform/sparql/api/sparql/QueryType.java | 2 +- .../sparql/api/sparql/SparqlService.java | 2 +- .../services/sparql/SparqlServiceImpl.java | 86 +- .../services/sparql/SparqlWritersHelper.java | 2 +- .../sparqlio/rdf/SPARQLGraphResultWriter.java | 2 +- .../sparqlhtml/SPARQLBooleanHTMLFormat.java | 2 +- .../sparqlhtml/SPARQLBooleanHTMLWriter.java | 2 +- .../SPARQLBooleanHTMLWriterFactory.java | 2 +- .../sparqlio/sparqlhtml/SPARQLHTMLSettings.java | 2 +- .../sparqlhtml/SPARQLResultsHTMLFormat.java | 2 +- .../sparqlhtml/SPARQLResultsHTMLWriter.java | 2 +- .../SPARQLResultsHTMLWriterFactory.java | 2 +- .../sparqlhtml/SPARQLResultsHTMLWriterXSL.java | 2 +- .../sparql/webservices/SparqlWebService.java | 250 +- .../src/main/resources/web/admin/squebi.html | 21 +- .../webservices/SparqlWebServiceTest.java | 14 + platform/marmotta-user/pom.xml | 2 +- .../platform/user/api/AccountService.java | 2 +- .../user/api/AuthenticationProvider.java | 2 +- .../user/api/AuthenticationService.java | 2 +- .../user/api/UserConfigurationService.java | 2 +- .../filters/MarmottaAuthenticationFilter.java | 2 +- .../platform/user/model/UserAccount.java | 2 +- .../user/services/AccountServiceImpl.java | 2 +- .../services/AuthenticationServiceImpl.java | 2 +- .../services/UserConfigurationServiceImpl.java | 2 +- .../user/services/auth/LMFAuthProviderImpl.java | 2 +- .../user/services/auth/LdapAuthProvider.java | 2 +- .../webservices/UserManagementWebService.java | 2 +- .../user/webservices/UserWebService.java | 15 +- platform/marmotta-versioning-common/pom.xml | 2 +- platform/marmotta-versioning-kiwi/pom.xml | 2 +- .../platform/versioning/api/MementoService.java | 2 +- .../api/VersionSerializerService.java | 2 +- .../versioning/exception/MementoException.java | 2 +- .../versioning/filter/MementoFilter.java | 2 +- .../versioning/io/HtmlVersionSerializer.java | 2 +- .../versioning/io/LinkVersionSerializer.java | 2 +- .../versioning/io/VersionSerializer.java | 2 +- .../versioning/model/MementoVersionSet.java | 2 +- .../versioning/services/MementoServiceImpl.java | 2 +- .../services/VersionSerializerServiceImpl.java | 2 +- .../services/VersioningSailProvider.java | 2 +- .../platform/versioning/utils/MementoUtils.java | 2 +- .../webservices/MementoWebService.java | 22 +- .../webservices/VersioningWebService.java | 2 +- platform/marmotta-zookeeper/pom.xml | 2 +- platform/pom.xml | 2 +- pom.xml | 13 +- 960 files changed, 10691 insertions(+), 10197 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/d46a959a/launchers/marmotta-webapp/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/d46a959a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/triplestore/ContextServiceImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/d46a959a/platform/marmotta-ldp/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/d46a959a/platform/marmotta-sparql/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/d46a959a/platform/pom.xml ----------------------------------------------------------------------
