You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by cl...@apache.org on 2015/01/19 21:46:17 UTC
[1/2] jena git commit: Fixes for JENA-854
Repository: jena
Updated Branches:
refs/heads/master 1992b41e6 -> 0361959fa
Fixes for JENA-854
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/93e242ec
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/93e242ec
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/93e242ec
Branch: refs/heads/master
Commit: 93e242ece5d83f12d874e28003171ed503779d5c
Parents: 2baabae
Author: Claude Warren <cl...@apache.org>
Authored: Mon Jan 19 20:34:51 2015 +0000
Committer: Claude Warren <cl...@apache.org>
Committed: Mon Jan 19 20:34:51 2015 +0000
----------------------------------------------------------------------
.../security/SecurityEvaluatorAssembler.java | 2 +-
.../jena/security/SecuredAssemblerTest.java | 13 ++++++++--
.../jena/security/SecuredAssemblerTest.ttl | 25 ++++++++++++++------
3 files changed, 30 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/93e242ec/jena-security/src/main/java/org/apache/jena/security/SecurityEvaluatorAssembler.java
----------------------------------------------------------------------
diff --git a/jena-security/src/main/java/org/apache/jena/security/SecurityEvaluatorAssembler.java b/jena-security/src/main/java/org/apache/jena/security/SecurityEvaluatorAssembler.java
index 0669c5d..7aa6d4f 100644
--- a/jena-security/src/main/java/org/apache/jena/security/SecurityEvaluatorAssembler.java
+++ b/jena-security/src/main/java/org/apache/jena/security/SecurityEvaluatorAssembler.java
@@ -145,7 +145,7 @@ public class SecurityEvaluatorAssembler extends AssemblerBase implements Assembl
}
else if (n.isResource())
{
- a.open( a, n.asResource(), mode );
+ args.add( a.open( a, n.asResource(), mode ) );
}
else
{
http://git-wip-us.apache.org/repos/asf/jena/blob/93e242ec/jena-security/src/test/java/org/apache/jena/security/SecuredAssemblerTest.java
----------------------------------------------------------------------
diff --git a/jena-security/src/test/java/org/apache/jena/security/SecuredAssemblerTest.java b/jena-security/src/test/java/org/apache/jena/security/SecuredAssemblerTest.java
index ed5a265..7d6f8c2 100644
--- a/jena-security/src/test/java/org/apache/jena/security/SecuredAssemblerTest.java
+++ b/jena-security/src/test/java/org/apache/jena/security/SecuredAssemblerTest.java
@@ -67,11 +67,20 @@ public class SecuredAssemblerTest
}
@Test
- public void testSecurityEvaluatorWithArgs() throws Exception {
+ public void testSecurityEvaluatorWithStringArgs() throws Exception {
Resource r = model.createResource( "http://apache.org/jena/security/test#secEvaluator");
Object o = assembler.open( r );
Assert.assertTrue( o instanceof SecurityEvaluator );
- Assert.assertTrue( o instanceof MockSecurityEvaluator );
+ Assert.assertTrue( o instanceof StaticSecurityEvaluator );
+ }
+
+ @Test
+ public void testSecurityEvaluatorWithModelArgs() throws Exception {
+
+ Resource r = model.createResource( "http://apache.org/jena/security/test#secEvaluator2");
+ Object o = assembler.open( r );
+ Assert.assertTrue( o instanceof SecurityEvaluator );
+ Assert.assertTrue( o instanceof ModelBasedSecurityEvaluator );
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/93e242ec/jena-security/src/test/resources/org/apache/jena/security/SecuredAssemblerTest.ttl
----------------------------------------------------------------------
diff --git a/jena-security/src/test/resources/org/apache/jena/security/SecuredAssemblerTest.ttl b/jena-security/src/test/resources/org/apache/jena/security/SecuredAssemblerTest.ttl
index 60ac5bb..b8289f7 100644
--- a/jena-security/src/test/resources/org/apache/jena/security/SecuredAssemblerTest.ttl
+++ b/jena-security/src/test/resources/org/apache/jena/security/SecuredAssemblerTest.ttl
@@ -33,13 +33,24 @@ my:secModel2
my:secEvaluator
a sec:Evaluator ;
- sec:args [ rdf:_1 "true"^^xsd:boolean ;
- rdf:_2 "false"^^xsd:boolean ;
- rdf:_3 "true"^^xsd:boolean ;
- rdf:_4 "true"^^xsd:boolean ;
- rdf:_5 "true"^^xsd:boolean ;
- rdf:_6 "false"^^xsd:boolean ;
+ sec:args [ rdf:_1 "bob" ;
] ;
- sec:evaluatorClass "org.apache.jena.security.MockSecurityEvaluator" ;
+ sec:evaluatorClass "org.apache.jena.security.StaticSecurityEvaluator" ;
.
+
+my:secModel3
+ a sec:Model;
+ sec:baseModel my:baseModel ;
+ ja:modelName "http://example.com/securedModel3" ;
+ sec:evaluatorImpl my:secEvaluator2 ;
+ .
+
+ my:secEvaluator2
+ a sec:Evaluator ;
+ sec:args [ rdf:_1 my:baseModel ;
+ ] ;
+ sec:evaluatorClass "org.apache.jena.security.ModelBasedSecurityEvaluator" ;
+ .
+
+
\ No newline at end of file
[2/2] jena git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/jena
Posted by cl...@apache.org.
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/0361959f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0361959f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0361959f
Branch: refs/heads/master
Commit: 0361959fa1332e46d14bdba80cbd0eeae4bc85d2
Parents: 93e242e 1992b41
Author: Claude Warren <cl...@apache.org>
Authored: Mon Jan 19 20:45:07 2015 +0000
Committer: Claude Warren <cl...@apache.org>
Committed: Mon Jan 19 20:45:07 2015 +0000
----------------------------------------------------------------------
.../com/hp/hpl/jena/sparql/expr/NodeValue.java | 5 +-
.../sparql/expr/nodevalue/NodeFunctions.java | 14 +--
.../apache/jena/riot/tokens/TokenizerText.java | 18 ++--
.../hpl/jena/sparql/expr/TestNodeFunctions.java | 24 +++++-
.../apache/jena/riot/tokens/TestTokenizer.java | 91 +++++++++++++-------
.../jena/query/text/DatasetGraphText.java | 2 +-
6 files changed, 103 insertions(+), 51 deletions(-)
----------------------------------------------------------------------