Merge branch 'develop' into MARMOTTA-584
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/d702f9ed Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/d702f9ed Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/d702f9ed Branch: refs/heads/MARMOTTA-584 Commit: d702f9edaab81572b99ade6f87f2eb0715628952 Parents: e382dc9 b4d8c33 Author: Sergio Fernández <[email protected]> Authored: Fri Oct 9 17:51:44 2015 +0200 Committer: Sergio Fernández <[email protected]> Committed: Fri Oct 9 17:51:44 2015 +0200 ---------------------------------------------------------------------- .../commons/http/MarmottaHttpUtils.java | 4 +- .../commons/http/MarmottaHttpUtilsTest.java | 27 +++++++++++++ .../kiwi/sparql/builder/SQLBuilder.java | 2 + .../kiwi/sparql/test/KiWiSparqlTest.java | 36 +++++++++++++++-- .../kiwi/sparql/test/MARMOTTA-617.sparql | 28 +++++++++++++ .../marmotta/kiwi/sparql/test/MARMOTTA-617.ttl | 41 ++++++++++++++++++++ 6 files changed, 132 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/d702f9ed/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java ----------------------------------------------------------------------
