Merge branch 'develop' into ldp
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/652ab44b Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/652ab44b Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/652ab44b Branch: refs/heads/ldp Commit: 652ab44bbcf0aa66866c5fdc5ea448a66d7bf079 Parents: 3d11389 30ef267 Author: Jakob Frank <[email protected]> Authored: Wed Sep 3 14:48:34 2014 +0200 Committer: Jakob Frank <[email protected]> Committed: Wed Sep 3 14:48:34 2014 +0200 ---------------------------------------------------------------------- client/marmotta-client-js-sample-webapp/pom.xml | 10 ++++- client/marmotta-client-php/pom.xml | 45 +------------------- client/pom.xml | 6 +-- .../model/selectors/RecursivePathSelector.java | 17 +++++--- .../marmotta/ldpath/parser/SelectorsTest.java | 10 +++++ parent/pom.xml | 2 +- .../backends/marmotta-backend-bigdata/pom.xml | 2 +- platform/backends/marmotta-backend-http/pom.xml | 2 +- .../backends/marmotta-backend-sparql/pom.xml | 2 +- .../src/main/resources/web/admin/dataview.html | 3 +- 10 files changed, 39 insertions(+), 60 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/652ab44b/parent/pom.xml ----------------------------------------------------------------------
