Merge branch 'MARMOTTA-499' into develop
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/ff564579 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/ff564579 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/ff564579 Branch: refs/heads/develop Commit: ff5645799bafd9e8fab9d744de3c925daf236b47 Parents: 5cfbf7a 0d3bdf8 Author: Sergio Fernández <[email protected]> Authored: Sat Sep 20 19:52:40 2014 +0200 Committer: Sergio Fernández <[email protected]> Committed: Sat Sep 20 19:52:40 2014 +0200 ---------------------------------------------------------------------- .../modules/MarmottaResourceServiceImpl.java | 75 +++++------------ .../modules/MarmottaResourceServiceTest.java | 85 ++++++++++++++++++++ 2 files changed, 105 insertions(+), 55 deletions(-) ----------------------------------------------------------------------
