Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/jena
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b44125aa Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b44125aa Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b44125aa Branch: refs/heads/master Commit: b44125aa23b0668e6ace9eb7636ebca21fd6756c Parents: 31af91f 62558f4 Author: Claude Warren <[email protected]> Authored: Fri Jul 24 17:38:56 2015 +0100 Committer: Claude Warren <[email protected]> Committed: Fri Jul 24 17:38:56 2015 +0100 ---------------------------------------------------------------------- apache-jena-osgi/jena-osgi/pom.xml | 4 +- apache-jena/bin/arq | 6 +- apache-jena/bin/infer | 6 +- apache-jena/bin/iri | 6 +- apache-jena/bin/juuid | 6 +- apache-jena/bin/nquads | 6 +- apache-jena/bin/ntriples | 6 +- apache-jena/bin/qparse | 6 +- apache-jena/bin/rdfcat | 6 +- apache-jena/bin/rdfcompare | 6 +- apache-jena/bin/rdfcopy | 6 +- apache-jena/bin/rdfparse | 6 +- apache-jena/bin/rdfxml | 6 +- apache-jena/bin/riot | 6 +- apache-jena/bin/rset | 6 +- apache-jena/bin/rsparql | 6 +- apache-jena/bin/rupdate | 6 +- apache-jena/bin/schemagen | 6 +- apache-jena/bin/sparql | 6 +- apache-jena/bin/tdbbackup | 6 +- apache-jena/bin/tdbdump | 6 +- apache-jena/bin/tdbloader | 6 +- apache-jena/bin/tdbloader2 | 8 +-- apache-jena/bin/tdbloader2common | 20 ++++++- apache-jena/bin/tdbloader2data | 15 ++--- apache-jena/bin/tdbloader2index | 62 ++++++++++++-------- apache-jena/bin/tdbquery | 6 +- apache-jena/bin/tdbstats | 6 +- apache-jena/bin/tdbupdate | 6 +- apache-jena/bin/trig | 6 +- apache-jena/bin/turtle | 6 +- apache-jena/bin/uparse | 6 +- apache-jena/bin/update | 6 +- apache-jena/bin/utf8 | 6 +- apache-jena/bin/wwwdec | 6 +- apache-jena/bin/wwwenc | 6 +- apache-jena/jena-log4j.properties | 29 ++------- apache-jena/template.bin | 6 +- .../java/org/apache/jena/riot/RDFLanguages.java | 2 +- .../apache/jena/riot/TestJenaReaderRIOT.java | 6 +- .../java/org/apache/jena/riot/TestLangRIOT.java | 3 +- .../jena/riot/stream/TestStreamManager.java | 6 +- jena-arq/testing/RIOT/Reader/D.json | 5 -- jena-arq/testing/RIOT/Reader/D.jsonld | 10 ++++ jena-arq/testing/RIOT/Reader/D.rj | 5 ++ jena-arq/testing/RIOT/StreamManager/D.json | 5 -- jena-arq/testing/RIOT/StreamManager/D.jsonld | 10 ++++ jena-arq/testing/RIOT/StreamManager/D.rj | 5 ++ .../org/apache/jena/atlas/logging/LogCtl.java | 57 ++++++++---------- .../jena/ontology/CardinalityQRestriction.java | 3 +- jena-elephas/jena-elephas-common/pom.xml | 13 ++-- jena-elephas/jena-elephas-io/pom.xml | 21 ++++--- jena-elephas/jena-elephas-mapreduce/pom.xml | 31 +++++----- jena-elephas/pom.xml | 52 ++++++++-------- jena-maven-tools/pom.xml | 8 ++- jena-parent/pom.xml | 23 ++++++-- .../jena/permissions/graph/SecuredGraph.java | 8 ++- .../graph/SecuredGraphEventManager.java | 1 - .../jena/permissions/model/SecuredModel.java | 21 +++---- .../model/impl/SecuredRDFListImpl.java | 1 - .../model/impl/SecuredRSIterator.java | 1 - .../permissions/query/rewriter/OpRewriter.java | 1 - .../query/rewriter/SecuredFunction.java | 10 ++-- .../graph/GraphEventManagerTest.java | 9 +-- .../jena/permissions/graph/MemGraphTest.java | 1 - .../model/SecuredModelDetailTest.java | 5 +- .../model/SecuredReifiedStatementTest.java | 4 -- .../permissions/model/SecuredResourceTest.java | 1 - .../permissions/model/SecuredStatementTest.java | 1 - .../query/rewriter/OpRewriterTest.java | 8 +-- jena-text/pom.xml | 7 ++- .../apache/jena/query/text/TextIndexLucene.java | 2 +- .../org/apache/jena/query/text/TextQueryPF.java | 4 +- .../text/AbstractTestDatasetWithTextIndex.java | 16 +++++ .../AbstractTestDatasetWithTextIndexBase.java | 5 +- .../text/TestLuceneWithMultipleThreads.java | 2 +- .../org/apache/jena/query/text/TestTextTDB.java | 26 ++++++++ 77 files changed, 379 insertions(+), 350 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/b44125aa/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelDetailTest.java ----------------------------------------------------------------------
