You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by de...@apache.org on 2016/10/06 13:57:25 UTC

[4/4] jena git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/jena

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/ec9573f2
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ec9573f2
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ec9573f2

Branch: refs/heads/master
Commit: ec9573f2a5a5ed8fc512dd2f6f5d36a061c1ac73
Parents: 9cec0c2 95235b8
Author: der <da...@epimorphics.com>
Authored: Thu Oct 6 14:56:35 2016 +0100
Committer: der <da...@epimorphics.com>
Committed: Thu Oct 6 14:56:35 2016 +0100

----------------------------------------------------------------------
 .../java/org/apache/jena/rdf/model/Model.java   | 23 ++++++++-
 .../org/apache/jena/rdf/model/Resource.java     | 14 +++++-
 .../apache/jena/rdf/model/impl/ModelCom.java    | 29 ++++++++----
 .../jena/rdf/model/impl/ResourceImpl.java       |  8 +++-
 jena-permissions/pom.xml                        | 32 +++++++++++++
 .../model/impl/SecuredModelImpl.java            | 49 ++++++++++++++++---
 .../model/impl/SecuredResourceImpl.java         | 50 ++++++++++++++++++--
 7 files changed, 183 insertions(+), 22 deletions(-)
----------------------------------------------------------------------