Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e819ac32 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e819ac32 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e819ac32
Branch: refs/heads/master Commit: e819ac32dac6efac1c7726dd9d738db7e33769ef Parents: 3a67dbc e743d25 Author: confidencesun <[email protected]> Authored: Mon Aug 10 19:24:31 2015 +0800 Committer: confidencesun <[email protected]> Committed: Mon Aug 10 19:24:31 2015 +0800 ---------------------------------------------------------------------- .../arq/querybuilder/handlers/WhereHandler.java | 14 +- .../querybuilder/handlers/WhereHandlerTest.java | 33 + .../permissions/example/ExampleEvaluator.java | 43 +- .../example/ShiroExampleEvaluator.java | 15 +- .../jena/security/example/fuseki/config.ttl | 26 +- .../apache/jena/permissions/SecuredItem.java | 142 +- .../jena/permissions/SecurityEvaluator.java | 112 +- .../jena/permissions/graph/SecuredGraph.java | 102 +- .../graph/SecuredGraphEventManager.java | 233 ++-- .../permissions/graph/SecuredPrefixMapping.java | 81 +- .../graph/impl/SecuredGraphImpl.java | 184 ++- .../graph/impl/SecuredPrefixMappingImpl.java | 89 +- .../impl/CachedSecurityEvaluator.java | 28 +- .../jena/permissions/impl/SecuredItemImpl.java | 779 +++++------ .../jena/permissions/model/SecuredAlt.java | 163 ++- .../permissions/model/SecuredContainer.java | 133 +- .../jena/permissions/model/SecuredLiteral.java | 93 +- .../jena/permissions/model/SecuredModel.java | 1243 ++++++++++++------ .../jena/permissions/model/SecuredProperty.java | 11 +- .../jena/permissions/model/SecuredRDFList.java | 236 +++- .../jena/permissions/model/SecuredRDFNode.java | 26 +- .../model/SecuredReifiedStatement.java | 12 +- .../jena/permissions/model/SecuredResource.java | 214 ++- .../jena/permissions/model/SecuredSeq.java | 288 ++-- .../permissions/model/SecuredStatement.java | 166 ++- .../permissions/model/impl/SecuredAltImpl.java | 207 ++- .../model/impl/SecuredContainerImpl.java | 438 ++---- .../model/impl/SecuredLiteralImpl.java | 162 ++- .../model/impl/SecuredModelImpl.java | 610 +++++---- .../model/impl/SecuredPropertyImpl.java | 51 +- .../model/impl/SecuredRDFListImpl.java | 704 ++++------ .../model/impl/SecuredRDFNodeImpl.java | 211 ++- .../model/impl/SecuredReifiedStatementImpl.java | 29 +- .../model/impl/SecuredResourceImpl.java | 570 ++++---- .../permissions/model/impl/SecuredSelector.java | 39 +- .../permissions/model/impl/SecuredSeqImpl.java | 326 ++--- .../model/impl/SecuredStatementImpl.java | 278 ++-- .../permissions/query/SecuredQueryEngine.java | 100 +- .../permissions/query/rewriter/OpRewriter.java | 379 +++--- .../query/rewriter/SecuredFunction.java | 104 +- .../permissions/utils/PermStatementFilter.java | 48 +- .../permissions/utils/PermTripleFilter.java | 45 +- .../permissions/utils/RDFListSecFilter.java | 23 +- .../jena/permissions/MockSecurityEvaluator.java | 6 + .../ModelBasedSecurityEvaluator.java | 9 +- .../permissions/StaticSecurityEvaluator.java | 5 + .../jena/permissions/graph/TDBGraphTest.java | 3 - .../model/SecuredModelDetailTest.java | 5 + .../permissions/model/SecuredModelTest.java | 6 +- .../jena/permissions/query/DataSetTest.java | 15 +- .../jena/permissions/query/QueryEngineTest.java | 9 +- 51 files changed, 4778 insertions(+), 4070 deletions(-) ----------------------------------------------------------------------
