JENA-1249: Merge commit 'refs/pull/183/head' of github.com:apache/jena This closes #183.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/fd44d834 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/fd44d834 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/fd44d834 Branch: refs/heads/master Commit: fd44d834ac940005e9067947d3a5968bdc0779db Parents: 4a68c5e 3f3434e Author: Andy Seaborne <[email protected]> Authored: Wed Oct 26 22:34:47 2016 +0100 Committer: Andy Seaborne <[email protected]> Committed: Wed Oct 26 22:34:47 2016 +0100 ---------------------------------------------------------------------- .../jena/query/ParameterizedSparqlString.java | 10 +++++ .../sparql/graph/GraphPrefixesProjection.java | 10 ++++- .../apache/jena/sparql/util/PrefixMapping2.java | 17 ++++++++ .../compose/PolyadicPrefixMappingImpl.java | 10 +++++ .../org/apache/jena/rdf/model/ModelFactory.java | 4 ++ .../apache/jena/rdf/model/impl/ModelCom.java | 42 +++++++++++++++++--- .../org/apache/jena/shared/PrefixMapping.java | 15 ++++++- .../jena/shared/impl/PrefixMappingImpl.java | 8 ++++ .../jena/rdf/model/test/TestModelFactory.java | 4 +- .../rdf/model/test/TestModelPrefixMapping.java | 3 ++ .../jena/shared/AbstractTestPrefixMapping.java | 15 +++++++ .../graph/impl/SecuredPrefixMappingImpl.java | 12 ++++++ .../jena/permissions/impl/SecuredItemImpl.java | 3 +- .../model/impl/SecuredModelImpl.java | 12 ++++++ .../jena/permissions/MockPrefixMapping.java | 5 +++ .../model/SecuredModelDetailTest.java | 6 ++- .../jena/permissions/query/DataSetTest.java | 20 ++-------- .../jena/permissions/query/QueryEngineTest.java | 22 ++-------- .../jena/tdb/store/DatasetPrefixesTDB.java | 6 +-- 19 files changed, 172 insertions(+), 52 deletions(-) ----------------------------------------------------------------------
