Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/bc27036d Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/bc27036d Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/bc27036d Branch: refs/heads/develop Commit: bc27036d0d4944c88cde37efef4fcae59fcd4d90 Parents: d6c49ac c8f1d6c Author: Sebastian Schaffert <[email protected]> Authored: Mon Sep 22 14:51:32 2014 +0200 Committer: Sebastian Schaffert <[email protected]> Committed: Mon Sep 22 14:51:32 2014 +0200 ---------------------------------------------------------------------- .../main/resources/archetype-resources/pom.xml | 6 ++ .../modules/MarmottaResourceServiceImpl.java | 75 ++++--------- .../triplestore/ContextWebService.java | 104 +++++++++++++++---- .../modules/MarmottaResourceServiceTest.java | 85 +++++++++++++++ 4 files changed, 197 insertions(+), 73 deletions(-) ----------------------------------------------------------------------
