marmotta-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sschaff...@apache.org
Subject [3/8] git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta into sparql
Date Tue, 16 Sep 2014 09:55:01 GMT
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta into sparql

Conflicts:
	libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/persistence/KiWiSparqlConnection.java


Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/3779418e
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/3779418e
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/3779418e

Branch: refs/heads/develop
Commit: 3779418eb584ec6cadecc30efa772b6a3f756db4
Parents: 886e961 89fd424
Author: Sebastian Schaffert <sschaffert@apache.org>
Authored: Mon Sep 15 13:39:43 2014 +0200
Committer: Sebastian Schaffert <sschaffert@apache.org>
Committed: Mon Sep 15 13:39:43 2014 +0200

----------------------------------------------------------------------
 client/marmotta-client-js-sample-webapp/pom.xml |  10 +-
 client/marmotta-client-php/pom.xml              |  45 +-
 client/pom.xml                                  |   6 +-
 .../marmotta/commons/util/StringUtils.java      |  40 +
 .../commons/sesame/test/SesameMatchers.java     | 295 +++++++-
 .../AbstractRepositoryConnectionMatcher.java    |   1 -
 .../sesame/test/base/RdfStringMatcher.java      |  50 +-
 .../sesame/test/base/RepositoryMatcher.java     |  50 +-
 .../commons/sesame/test/base/SesameMatcher.java |   1 -
 .../test/connection/HasStatementMatcher.java    |  42 +-
 .../sesame/test/sparql/SparqlAskMatcher.java    |  16 +
 .../test/sparql/SparqlGraphQueryMatcher.java    |  51 +-
 .../test/sparql/SparqlTupleQueryMatcher.java    |   1 -
 launchers/marmotta-installer/pom.xml            |   4 +-
 launchers/marmotta-webapp/pom.xml               |   1 -
 libraries/kiwi/kiwi-caching-infinispan/pom.xml  |   9 +-
 .../optimizer/DistinctLimitOptimizer.java       |   8 +
 .../kiwi/sparql/test/KiWiSparqlUpdateTest.java  |  43 ++
 .../persistence/pgsql/PostgreSQLDialect.java    |   2 +-
 .../kiwi/test/junit/KiWiDatabaseRunner.java     |   9 +-
 .../test/provider/ProviderTestBase.java         |   2 +-
 .../ldclient/ldclient-provider-freebase/pom.xml |   4 +
 .../provider/freebase/FreebaseProvider.java     |  20 +-
 .../youtube/YoutubePlaylistProvider.java        |   3 -
 .../test/youtube/youtube-playlist.sparql        |   4 +-
 .../ldpath-backend-linkeddata/assembly.xml      |  56 --
 .../ldpath/ldpath-backend-linkeddata/pom.xml    | 265 +------
 .../src/main/doc/LICENSE.txt                    | 754 ------------------
 .../src/main/doc/NOTICE.txt                     |  18 -
 .../src/main/doc/README.txt                     |  99 ---
 .../ldpath/backend/linkeddata/LDQuery.java      | 173 -----
 libraries/ldpath/ldpath-core-bundle/pom.xml     |  10 +-
 .../model/selectors/RecursivePathSelector.java  |  17 +-
 .../marmotta/ldpath/parser/SelectorsTest.java   |  10 +
 libraries/ldpath/ldpath-functions-json/pom.xml  | 107 +++
 .../model/functions/json/JsonPathFunction.java  |  84 +++
 ...rmotta.ldpath.api.functions.SelectorFunction |   1 +
 .../functions/json/JsonPathFunctionTest.java    |  61 ++
 .../src/test/resources/logback.xml              |  27 +
 .../ldpath/model/functions/json/data.n3         |  31 +
 .../ldpath/ldpath-ldquery-cli/assembly.xml      |  56 ++
 libraries/ldpath/ldpath-ldquery-cli/pom.xml     | 338 +++++++++
 .../ldpath-ldquery-cli/src/main/doc/LICENSE.txt | 755 +++++++++++++++++++
 .../ldpath-ldquery-cli/src/main/doc/NOTICE.txt  |  18 +
 .../ldpath-ldquery-cli/src/main/doc/README.txt  |  99 +++
 .../apache/marmotta/ldpath/ldquery/LDQuery.java | 196 +++++
 .../ldpath/ldpath-template-linkeddata/pom.xml   | 134 ++++
 .../marmotta/ldpath/template/LDTemplate.java    |   2 +-
 libraries/ldpath/pom.xml                        |   2 +
 parent/pom.xml                                  |  92 ++-
 .../backends/marmotta-backend-bigdata/pom.xml   |   6 +-
 platform/backends/marmotta-backend-http/pom.xml |   4 +-
 platform/backends/marmotta-backend-kiwi/pom.xml |   4 +-
 .../backends/marmotta-backend-memory/pom.xml    |   4 +-
 .../backends/marmotta-backend-native/pom.xml    |   4 +-
 .../backends/marmotta-backend-sparql/pom.xml    |   6 +-
 .../backends/marmotta-backend-titan/pom.xml     |   4 +-
 .../ldcache/marmotta-ldcache-common/pom.xml     |  10 +-
 platform/ldcache/marmotta-ldcache-file/pom.xml  |   4 +-
 platform/ldcache/marmotta-ldcache-kiwi/pom.xml  |   4 +-
 platform/marmotta-core/pom.xml                  |   4 +-
 .../config/ConfigurationServiceImpl.java        |  21 +
 .../services/content/ContentServiceImpl.java    |   1 +
 .../services/logging/LoggingServiceImpl.java    |  11 +-
 .../main/resources/config-defaults.properties   |   2 +-
 .../src/main/resources/web/admin/dataview.html  |   3 +-
 .../core/test/base/AbstractMarmotta.java        |  15 +-
 .../core/test/base/EmbeddedMarmotta.java        |   9 +-
 .../platform/core/test/base/JettyMarmotta.java  |   6 +-
 .../platform/core/test/ld/LinkedDataTest.java   |   2 +-
 platform/marmotta-ldp/pom.xml                   |  23 +-
 .../marmotta/platform/ldp/api/LdpService.java   |   9 +-
 .../IncompatibleResourceTypeException.java      |  59 ++
 .../InvalidInteractionModelException.java       |   2 +-
 .../InvalidModificationException.java           |   2 +-
 .../platform/ldp/exceptions/LDPException.java   |  56 ++
 .../platform/ldp/services/LdpServiceImpl.java   |  78 ++
 .../platform/ldp/util/EntityTagUtils.java       |  19 +
 .../platform/ldp/webservices/LdpWebService.java |  33 +-
 .../platform/ldp/testsuite/LdpManifestTest.java |  73 --
 .../platform/ldp/testsuite/LdpTestCase.java     | 185 -----
 .../ldp/testsuite/LdpTestCaseRunner.java        |  61 --
 .../platform/ldp/testsuite/LdpTestCases.java    |  80 --
 .../ldp/testsuite/LdpTestCasesRunner.java       | 100 ---
 .../ldp/testsuite/LdpTestCasesUtils.java        | 130 ----
 .../ldp/webservices/LdpWebServiceTest.java      | 115 ++-
 .../ldp/webservices/util/HeaderMatchers.java    |  13 +-
 .../src/test/resources/test_update.ttl          |  27 +
 .../src/test/resources/test_update_invalid.ttl  |  25 +
 platform/marmotta-ldpath/pom.xml                |   4 +-
 .../src/main/resources/kiwi-module.properties   |   8 +-
 platform/marmotta-reasoner-kiwi/pom.xml         |   4 +-
 platform/marmotta-security/pom.xml              |   4 +-
 platform/marmotta-sparql/pom.xml                |   4 +-
 .../sparql/webservices/SparqlWebService.java    |   4 +-
 platform/marmotta-user/pom.xml                  |   6 +-
 platform/marmotta-versioning-common/pom.xml     |   6 +-
 platform/marmotta-versioning-kiwi/pom.xml       |   4 +-
 platform/marmotta-zookeeper/pom.xml             |   6 +-
 pom.xml                                         |  30 +-
 100 files changed, 3155 insertions(+), 2261 deletions(-)
----------------------------------------------------------------------



Mime
View raw message