You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by tk...@apache.org on 2014/11/12 10:47:51 UTC
[2/2] marmotta git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/marmotta into develop
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta into develop
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/d3f9ff54
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/d3f9ff54
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/d3f9ff54
Branch: refs/heads/develop
Commit: d3f9ff5403d3febd5a68cd229164713f57ad84d4
Parents: 03d1300 e0f279c
Author: tkurz <tk...@apache.org>
Authored: Wed Nov 12 10:47:22 2014 +0100
Committer: tkurz <tk...@apache.org>
Committed: Wed Nov 12 10:47:22 2014 +0100
----------------------------------------------------------------------
.../main/resources/archetype-resources/pom.xml | 2 +-
.../src/main/webapp/WEB-INF/web.xml | 8 +-
.../marmotta/client/ClientConfiguration.java | 8 +-
.../client/clients/ConfigurationClient.java | 28 +-
.../marmotta/client/clients/ImportClient.java | 68 +-
.../marmotta/client/clients/LDPathClient.java | 25 +-
.../marmotta/client/clients/ResourceClient.java | 17 +-
.../marmotta/client/clients/SPARQLClient.java | 20 +-
.../apache/marmotta/client/util/HTTPUtil.java | 109 +-
.../marmotta/client/test/io/ImportIT.java | 9 +-
commons/marmotta-commons/pom.xml | 5 +-
.../commons/collections/CollectionUtils.java | 157 --
.../commons/collections/EquivalenceHashMap.java | 563 -----
.../commons/collections/EquivalenceHashSet.java | 472 ----
.../marmotta/commons/constants/Namespace.java | 2142 ------------------
.../commons/http/MarmottaHttpUtils.java | 6 +-
.../marmotta/commons/locking/ObjectLocks.java | 2 -
.../commons/sesame/model/LiteralCommons.java | 115 +-
.../sesame/repository/ResourceUtils.java | 6 +-
.../apache/marmotta/commons/util/DateUtils.java | 66 +-
.../collections/BaseEquivalenceHashMapTest.java | 98 -
.../collections/BaseEquivalenceHashSetTest.java | 211 --
.../collections/FastEquivalenceHashSetTest.java | 62 -
.../StandardEquivalenceHashMapTest.java | 35 -
.../StandardEquivalenceHashSetTest.java | 35 -
.../sesame/model/LiteralCommonsTest.java | 11 +-
.../marmotta-util-facading/pom.xml | 5 +
.../impl/FacadingInvocationHandler.java | 15 +-
.../sesame/facading/util/FacadeUtils.java | 19 +-
.../facading/primitive/BoxedFacadingTest.java | 24 +-
.../facading/primitive/model/PropBuilder.java | 2 +-
.../commons/sesame/tripletable/TripleTable.java | 1 -
.../src/main/resources/installer/LICENSE.txt | 2 +-
.../src/main/webapp/META-INF/LICENSE | 2 +-
.../src/main/webapp/WEB-INF/web.xml | 7 +-
libraries/kiwi/kiwi-loader/pom.xml | 4 -
.../kiwi/loader/csv/SQLDateTimeProcessor.java | 51 +
.../kiwi/loader/csv/SQLTimestampProcessor.java | 2 +-
.../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 | 8 +
.../persistence/KWRLProgramPersistenceTest.java | 3 +-
libraries/kiwi/kiwi-sparql/pom.xml | 4 -
.../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 | 723 ++----
.../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 | 423 ++++
.../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 +-
.../testsuite/KiWiSparqlComplianceTest.java | 354 +++
.../marmotta/kiwi/sparql/testsuite/ceil.sparql | 5 +
.../kiwi/sparql/testsuite/date-num-str.ttl | 24 +
.../marmotta/kiwi/sparql/testsuite/floor.sparql | 5 +
.../marmotta/kiwi/sparql/testsuite/hours.sparql | 4 +
.../kiwi/sparql/testsuite/minutes.sparql | 4 +
.../marmotta/kiwi/sparql/testsuite/month.sparql | 4 +
.../marmotta/kiwi/sparql/testsuite/round.sparql | 5 +
.../kiwi/sparql/testsuite/seconds.sparql | 4 +
.../marmotta/kiwi/sparql/testsuite/year.sparql | 4 +
libraries/kiwi/kiwi-triplestore/pom.xml | 9 +
.../marmotta/kiwi/config/KiWiConfiguration.java | 95 +-
.../org/apache/marmotta/kiwi/io/KiWiIO.java | 7 +-
.../marmotta/kiwi/jmx/KiWiStatisticsMBean.java | 26 +
.../kiwi/model/rdf/KiWiDateLiteral.java | 52 +-
.../kiwi/model/rdf/KiWiDoubleLiteral.java | 15 +-
.../kiwi/model/rdf/KiWiUriResource.java | 4 +
.../kiwi/persistence/KiWiConnection.java | 96 +-
.../marmotta/kiwi/persistence/KiWiDialect.java | 15 +-
.../marmotta/kiwi/persistence/h2/H2Dialect.java | 30 +
.../kiwi/persistence/mysql/MySQLDialect.java | 31 +
.../persistence/pgsql/PostgreSQLDialect.java | 30 +
.../marmotta/kiwi/sail/KiWiValueFactory.java | 23 +-
.../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/sesame/KiWiStoreTest.java | 11 +
libraries/kiwi/kiwi-versioning/pom.xml | 4 -
.../test/VersioningPersistenceTest.java | 3 +-
.../kiwi/test/LDCachePersistenceTest.java | 2 +-
.../services/provider/AbstractHttpProvider.java | 21 +-
.../ldclient/ldclient-provider-facebook/pom.xml | 4 +
.../facebook/FacebookGraphProvider.java | 7 +-
.../ldclient/ldclient-provider-freebase/pom.xml | 4 +
.../test/freebase/TestFreebaseProvider.java | 17 +-
.../ldclient/ldclient-provider-html/pom.xml | 4 +
.../ldclient/ldclient-provider-ldap/pom.xml | 4 +
.../provider/ldap/LdapFoafProvider.java | 18 +-
.../ldap/mapping/LiteralPredicateFactory.java | 9 +-
.../ldap/mapping/PredicateObjectFactory.java | 10 +-
.../mapping/TypedLiteralPredicateFactory.java | 47 -
.../ldap/mapping/UriPredicateFactory.java | 9 +-
.../ldclient-provider-mediawiki/pom.xml | 4 +
.../ldclient/ldclient-provider-phpbb/pom.xml | 5 +
.../ldclient/ldclient-provider-vimeo/pom.xml | 5 +
.../model/functions/date/DateFunctionsTest.java | 4 +-
.../ldpath-ldquery-cli/src/main/doc/LICENSE.txt | 2 +-
loader/marmotta-loader-core/pom.xml | 5 +
parent/pom.xml | 14 +-
platform/marmotta-core/pom.xml | 5 +
.../core/api/config/DependenciesService.java | 4 +-
.../core/exception/HttpErrorException.java | 21 +-
.../platform/core/jaxrs/ErrorMessage.java | 50 +
.../HttpErrorExceptionMapper.java | 68 +-
.../MarmottaInitialContextFactoryBuilder.java | 2 +-
.../platform/core/model/config/CoreOptions.java | 6 +
.../core/model/module/ModuleConfiguration.java | 6 +-
.../config/DependenciesServiceImpl.java | 18 +-
.../services/content/HTTPContentReader.java | 8 +-
.../jaxrs/ExceptionMapperServiceImpl.java | 17 +-
.../platform/core/services/prefix/PrefixCC.java | 19 +-
.../config/DependenciesWebService.java | 4 +-
.../core/webservices/io/ExportWebService.java | 9 +-
.../core/webservices/io/ImportWebService.java | 6 +-
.../webservices/resource/ContentWebService.java | 48 +-
.../resource/InspectionWebService.java | 5 +-
.../webservices/resource/MetaWebService.java | 47 +-
.../resource/ResourceWebService.java | 106 +-
.../resource/ResourceWebServiceHelper.java | 47 +-
.../triplestore/ContextWebService.java | 3 +-
.../core/test/base/AbstractMarmotta.java | 11 +-
.../platform/core/test/base/JettyMarmotta.java | 1 +
.../core/test/base/TestStoreProvider.java | 2 +-
.../core/test/base/jetty/TestApplication.java | 1 -
.../test/base/jetty/TestInjectorFactory.java | 5 +-
.../core/test/jaxrs/ExceptionHandlingTest.java | 70 +
.../platform/core/test/ld/LinkedDataTest.java | 2 -
.../marmotta/platform/ldp/api/Preference.java | 36 +-
.../platform/ldp/services/LdpServiceImpl.java | 1 +
.../ldp/util/AbstractResourceUriGenerator.java | 63 +
.../marmotta/platform/ldp/util/LdpUtils.java | 4 +-
.../platform/ldp/util/RandomUriGenerator.java | 77 +
.../platform/ldp/util/ResponseBuilderImpl.java | 345 ---
.../platform/ldp/util/SlugUriGenerator.java | 50 +
.../platform/ldp/util/UuidUriGenerator.java | 38 +
.../platform/ldp/webservices/LdpWebService.java | 53 +-
.../ldp/webservices/LdpWebServiceTest.java | 184 +-
.../ldpath/webservices/LDPathWebService.java | 34 +
.../security/model/SecurityConstraint.java | 36 +-
.../services/sparql/SparqlServiceImpl.java | 84 +-
.../sparql/webservices/SparqlWebService.java | 12 +-
.../user/webservices/UserWebService.java | 13 +-
.../webservices/MementoWebService.java | 20 +-
239 files changed, 6334 insertions(+), 8365 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/d3f9ff54/parent/pom.xml
----------------------------------------------------------------------