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/07/17 20:06:16 UTC
[09/10] jena git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/jena Fixed confilcts Conflicts:
jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelDetailTest.java
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/jena
Fixed confilcts
Conflicts:
jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelDetailTest.java
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e48966cd
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e48966cd
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e48966cd
Branch: refs/heads/master
Commit: e48966cd308bf417c14f52afa239218f2d262785
Parents: fcf7188 2ab1ca8
Author: Claude Warren <cl...@apache.org>
Authored: Fri Jul 17 07:47:26 2015 +0100
Committer: Claude Warren <cl...@apache.org>
Committed: Fri Jul 17 07:47:26 2015 +0100
----------------------------------------------------------------------
.../jena/riot/checker/CheckerVisitor.java | 3 +-
.../jena/riot/lang/BlankNodeAllocatorHash.java | 3 +-
.../jena/riot/lang/BlankNodeAllocatorLabel.java | 3 +-
.../lang/BlankNodeAllocatorLabelEncoded.java | 5 +-
.../lang/BlankNodeAllocatorTraditional.java | 2 +-
.../java/org/apache/jena/riot/lang/LangCSV.java | 2 +-
.../org/apache/jena/riot/lang/LangRDFXML.java | 2 +-
.../apache/jena/riot/lang/LangTurtleBase.java | 2 +-
.../org/apache/jena/riot/system/RiotLib.java | 3 +-
.../apache/jena/riot/thrift/ThriftConvert.java | 3 +-
.../java/org/apache/jena/riot/tokens/Token.java | 27 +-
.../apache/jena/sparql/algebra/OpAsQuery.java | 129 +++++--
.../engine/binding/BindingInputStream.java | 3 +-
.../org/apache/jena/sparql/expr/E_BNode.java | 2 +-
.../org/apache/jena/sparql/expr/NodeValue.java | 29 +-
.../apache/jena/sparql/modify/TemplateLib.java | 2 +-
.../sparql/resultset/JSONInputIterator.java | 28 +-
.../jena/sparql/resultset/XMLInputStAX.java | 3 +-
.../sparql/serializer/FormatterElement.java | 373 ++++++++-----------
.../jena/sparql/sse/lang/ParseHandlerPlain.java | 2 +-
.../apache/jena/sparql/syntax/ElementGroup.java | 5 +
.../ElementTransformCleanGroupsOfOne.java | 53 +--
.../apache/jena/sparql/util/LabelToNodeMap.java | 2 +-
.../jena/sparql/util/graph/GraphList.java | 4 +-
.../jena/atlas/data/TestDistinctDataBag.java | 6 +-
.../jena/atlas/data/TestDistinctDataNet.java | 6 +-
.../jena/atlas/data/TestSortedDataBag.java | 6 +-
.../jena/riot/lang/TestCollectorStream.java | 4 +-
.../apache/jena/riot/lang/TestNodeToLabel.java | 6 +-
.../jena/riot/lang/TestPipedRDFIterators.java | 4 +-
.../apache/jena/riot/thrift/TestThriftTerm.java | 5 +-
.../jena/riot/tokens/TestTokenForNode.java | 3 +-
.../apache/jena/riot/writer/TestRDFJSON.java | 2 +-
.../jena/sparql/algebra/TestOpAsQuery.java | 83 ++++-
.../sparql/core/AbstractDatasetGraphTests.java | 6 +-
.../engine/binding/TestBindingStreams.java | 3 +-
.../engine/iterator/TestQueryIterSort.java | 6 +-
.../jena/sparql/expr/TestExpressions.java | 2 +-
.../jena/sparql/expr/TestNodeFunctions.java | 6 +-
.../apache/jena/sparql/expr/TestOrdering.java | 2 +-
.../apache/jena/sparql/expr/TestXSDFuncOp.java | 8 +-
.../sparql/modify/AbstractTestUpdateGraph.java | 8 +-
.../apache/jena/sparql/util/TestFmtUtils.java | 8 +-
jena-arq/testing/ARQ/Serialization/func.sh | 1 -
jena-arq/testing/ARQ/Serialization/manifest.ttl | 24 ++
.../testing/ARQ/Serialization/syntax-path-01.rq | 5 +
.../testing/ARQ/Serialization/syntax-path-02.rq | 5 +
.../testing/ARQ/Serialization/syntax-path-03.rq | 6 +
.../testing/ARQ/Serialization/syntax-path-04.rq | 6 +
.../testing/ARQ/Serialization/syntax-path-05.rq | 7 +
.../testing/ARQ/Serialization/syntax-path-06.rq | 8 +
.../java/org/apache/jena/graph/BlankNodeId.java | 156 ++++++++
.../main/java/org/apache/jena/graph/Node.java | 34 +-
.../java/org/apache/jena/graph/NodeFactory.java | 49 ++-
.../java/org/apache/jena/graph/NodeVisitor.java | 5 +-
.../java/org/apache/jena/graph/Node_Blank.java | 12 +-
.../org/apache/jena/graph/Node_Literal.java | 5 +
.../java/org/apache/jena/graph/Node_URI.java | 5 +
.../org/apache/jena/graph/Node_Variable.java | 1 +
.../apache/jena/n3/turtle/LabelToNodeMap.java | 2 +-
.../org/apache/jena/n3/turtle/ParserBase.java | 3 +-
.../java/org/apache/jena/rdf/model/AnonId.java | 121 +++---
.../apache/jena/rdf/model/impl/ModelCom.java | 4 +-
.../apache/jena/rdf/model/impl/ReifierStd.java | 2 +-
.../jena/rdf/model/impl/ResourceImpl.java | 13 +-
.../apache/jena/rdfxml/xmlinput/JenaReader.java | 2 +-
.../jena/reasoner/rulesys/FBRuleInfGraph.java | 2 +-
.../org/apache/jena/reasoner/rulesys/Rule.java | 19 +-
.../org/apache/jena/reasoner/rulesys/Util.java | 2 +-
.../reasoner/rulesys/builtins/MakeSkolem.java | 10 +-
.../reasoner/rulesys/builtins/MakeTemp.java | 2 +-
.../reasoner/rulesys/impl/BindingStack.java | 6 +-
.../reasoner/rulesys/impl/BindingVector.java | 6 +-
.../rulesys/impl/LPBindingEnvironment.java | 6 +-
.../reasoner/rulesys/impl/TempNodeCache.java | 2 +-
.../apache/jena/enhanced/test/TestPackage.java | 2 +-
.../jena/graph/test/AbstractTestReifier.java | 2 +-
.../apache/jena/graph/test/NodeCreateUtils.java | 4 +-
.../org/apache/jena/graph/test/TestNode.java | 46 +--
.../org/apache/jena/graph/test/TestTriple.java | 7 +-
.../jena/rdfxml/xmloutput/TestXMLFeatures.java | 2 +-
.../jena/reasoner/rulesys/test/TestBugs.java | 4 +-
.../jena/reasoner/rulesys/test/TestFBRules.java | 2 +-
.../jena/testing_framework/NodeCreateUtils.java | 20 +-
.../jena/testing_framework/TestFileData.java | 36 +-
.../apache/jena/fuseki/mgt/ActionAsyncTask.java | 5 +-
.../apache/jena/fuseki/mgt/ActionBackup.java | 10 -
.../jena/fuseki/mgt/ActionBackupList.java | 94 +++++
.../jena/fuseki/mgt/ActionContainerItem.java | 26 +-
.../apache/jena/fuseki/mgt/ActionDatasets.java | 21 +-
.../org/apache/jena/fuseki/mgt/ActionSleep.java | 2 +-
.../org/apache/jena/fuseki/mgt/ActionStats.java | 7 -
.../java/org/apache/jena/fuseki/mgt/Async.java | 2 +-
.../org/apache/jena/fuseki/mgt/MgtConst.java | 11 +-
.../src/main/webapp/WEB-INF/web.xml | 12 +-
.../java/org/apache/jena/fuseki/TestAdmin.java | 12 +-
.../permissions/example/ExampleEvaluator.java | 22 +-
.../example/ShiroExampleEvaluator.java | 26 +-
.../jena/permissions/ReadDeniedException.java | 22 ++
.../jena/permissions/SecurityEvaluator.java | 4 +-
.../jena/permissions/UpdateDeniedException.java | 22 ++
.../jena/permissions/model/SecuredModel.java | 194 +++++-----
.../jena/permissions/model/SecuredSeq.java | 1 +
...SecuredUnsupportedPolymorphismException.java | 5 +
.../model/impl/SecuredModelImpl.java | 8 +-
.../model/impl/SecuredResourceImpl.java | 3 +-
.../jena/permissions/SecuredAssemblerTest.java | 1 -
.../model/SecuredModelDetailTest.java | 51 ++-
.../apache/jena/sdb/layout1/CodecSimple.java | 4 +-
.../org/apache/jena/sdb/layout2/SQLBridge2.java | 13 +-
.../jena/query/spatial/SpatialQueryFuncs.java | 3 +-
.../jena/tdb/store/nodetable/NodecLib.java | 3 +-
.../jena/tdb/store/nodetable/NodecSSE.java | 3 +-
.../jena/tdb/store/nodetable/TestCodec.java | 9 +-
.../apache/jena/query/text/TextQueryFuncs.java | 5 +-
.../org/apache/jena/query/text/TextQueryPF.java | 5 +-
116 files changed, 1216 insertions(+), 910 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/e48966cd/jena-permissions/src/main/java/org/apache/jena/permissions/ReadDeniedException.java
----------------------------------------------------------------------
diff --cc jena-permissions/src/main/java/org/apache/jena/permissions/ReadDeniedException.java
index 5e95725,0000000..f266dfc
mode 100644,000000..100644
--- a/jena-permissions/src/main/java/org/apache/jena/permissions/ReadDeniedException.java
+++ b/jena-permissions/src/main/java/org/apache/jena/permissions/ReadDeniedException.java
@@@ -1,43 -1,0 +1,65 @@@
++/*
++ * Licensed to the Apache Software Foundation (ASF) under one
++ * or more contributor license agreements. See the NOTICE file
++ * distributed with this work for additional information
++ * regarding copyright ownership. The ASF licenses this file
++ * to you under the Apache License, Version 2.0 (the
++ * "License"); you may not use this file except in compliance
++ * with the License. You may obtain a copy of the License at
++ *
++ * http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software
++ * distributed under the License is distributed on an "AS IS" BASIS,
++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ * See the License for the specific language governing permissions and
++ * limitations under the License.
++ */
+package org.apache.jena.permissions;
+
+import org.apache.jena.graph.Triple;
+import org.apache.jena.shared.AccessDeniedException;
+
+public class ReadDeniedException extends AccessDeniedException {
+
++ /**
++ *
++ */
++ private static final long serialVersionUID = 2241945715756635813L;
++
+ public ReadDeniedException() {
+ super();
+ // TODO Auto-generated constructor stub
+ }
+
+ public ReadDeniedException(String message, Throwable cause, Triple triple) {
+ super(message, cause, triple);
+ // TODO Auto-generated constructor stub
+ }
+
+ public ReadDeniedException(String message, Throwable cause) {
+ super(message, cause);
+ // TODO Auto-generated constructor stub
+ }
+
+ public ReadDeniedException(String message, Triple triple) {
+ super(message, triple);
+ // TODO Auto-generated constructor stub
+ }
+
+ public ReadDeniedException(String message) {
+ super(message);
+ // TODO Auto-generated constructor stub
+ }
+
+ public ReadDeniedException(Throwable cause, Triple triple) {
+ super(cause, triple);
+ // TODO Auto-generated constructor stub
+ }
+
+ public ReadDeniedException(Throwable cause) {
+ super(cause);
+ // TODO Auto-generated constructor stub
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/jena/blob/e48966cd/jena-permissions/src/main/java/org/apache/jena/permissions/SecurityEvaluator.java
----------------------------------------------------------------------
diff --cc jena-permissions/src/main/java/org/apache/jena/permissions/SecurityEvaluator.java
index 9a2a396,1e28084..bf52c5b
--- a/jena-permissions/src/main/java/org/apache/jena/permissions/SecurityEvaluator.java
+++ b/jena-permissions/src/main/java/org/apache/jena/permissions/SecurityEvaluator.java
@@@ -23,14 -23,6 +23,13 @@@ import java.util.LinkedHashSet
import java.util.Set;
import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.jena.graph.FrontsNode;
+import org.apache.jena.graph.FrontsTriple;
+import org.apache.jena.graph.Node;
+import org.apache.jena.graph.NodeFactory;
+import org.apache.jena.graph.Triple;
+import org.apache.jena.graph.impl.LiteralLabel;
+import org.apache.jena.graph.impl.LiteralLabelFactory;
- import org.apache.jena.rdf.model.AnonId;
/**
* SecurityEvaluator.
@@@ -302,25 -294,6 +301,24 @@@ public interface SecurityEvaluator
public String toString() {
return String.format("[%s:%s]", getType(), getValue());
}
+
+ @Override
+ public Node asNode() {
+ switch (type) {
+ case Anonymous:
- AnonId id = AnonId.create(value);
- return NodeFactory.createAnon( id );
++ return NodeFactory.createBlankNode( value );
+ case Any:
+ return Node.ANY;
+ case Literal:
+ LiteralLabel lit = LiteralLabelFactory.create(value, (String)null);
+ return NodeFactory.createLiteral(lit);
+ case URI:
+ return NodeFactory.createURI( value );
+
+ default :
+ return Node.ANY;
+ }
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/jena/blob/e48966cd/jena-permissions/src/main/java/org/apache/jena/permissions/UpdateDeniedException.java
----------------------------------------------------------------------
diff --cc jena-permissions/src/main/java/org/apache/jena/permissions/UpdateDeniedException.java
index d1c6011,0000000..2138e8f
mode 100644,000000..100644
--- a/jena-permissions/src/main/java/org/apache/jena/permissions/UpdateDeniedException.java
+++ b/jena-permissions/src/main/java/org/apache/jena/permissions/UpdateDeniedException.java
@@@ -1,43 -1,0 +1,65 @@@
++/*
++ * Licensed to the Apache Software Foundation (ASF) under one
++ * or more contributor license agreements. See the NOTICE file
++ * distributed with this work for additional information
++ * regarding copyright ownership. The ASF licenses this file
++ * to you under the Apache License, Version 2.0 (the
++ * "License"); you may not use this file except in compliance
++ * with the License. You may obtain a copy of the License at
++ *
++ * http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software
++ * distributed under the License is distributed on an "AS IS" BASIS,
++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ * See the License for the specific language governing permissions and
++ * limitations under the License.
++ */
+package org.apache.jena.permissions;
+
+import org.apache.jena.graph.Triple;
+import org.apache.jena.shared.AccessDeniedException;
+
+public class UpdateDeniedException extends AccessDeniedException {
+
++ /**
++ *
++ */
++ private static final long serialVersionUID = -2200205468688578585L;
++
+ public UpdateDeniedException() {
+ super();
+ // TODO Auto-generated constructor stub
+ }
+
+ public UpdateDeniedException(String message, Throwable cause, Triple triple) {
+ super(message, cause, triple);
+ // TODO Auto-generated constructor stub
+ }
+
+ public UpdateDeniedException(String message, Throwable cause) {
+ super(message, cause);
+ // TODO Auto-generated constructor stub
+ }
+
+ public UpdateDeniedException(String message, Triple triple) {
+ super(message, triple);
+ // TODO Auto-generated constructor stub
+ }
+
+ public UpdateDeniedException(String message) {
+ super(message);
+ // TODO Auto-generated constructor stub
+ }
+
+ public UpdateDeniedException(Throwable cause, Triple triple) {
+ super(cause, triple);
+ // TODO Auto-generated constructor stub
+ }
+
+ public UpdateDeniedException(Throwable cause) {
+ super(cause);
+ // TODO Auto-generated constructor stub
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/jena/blob/e48966cd/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredModel.java
----------------------------------------------------------------------
diff --cc jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredModel.java
index a8b5530,f506308..d3575e8
--- a/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredModel.java
+++ b/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredModel.java
@@@ -60,16 -56,15 +60,16 @@@ public interface SecuredModel extends M
*/
@Override
public SecuredModel add( final List<Statement> statements )
- throws UpdateDeniedException, AddDeniedException;
- throws AccessDeniedException;
++ throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
* @sec.triple Create for each statement in the securedModel as a triple.
- * @throws AccessDeniedException
+ * @throws UpdateDeniedException
+ * @throws AddDeniedException
*/
@Override
- public SecuredModel add( final Model m ) throws UpdateDeniedException, AddDeniedException;
- public SecuredModel add( final Model m ) throws AccessDeniedException;
++ public SecuredModel add( final Model m ) throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -79,7 -73,7 +79,7 @@@
*/
@Override
public SecuredModel add( final Resource s, final Property p, final RDFNode o )
- throws UpdateDeniedException, AddDeniedException;
- throws AccessDeniedException;
++ throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -89,7 -82,7 +89,7 @@@
*/
@Override
public SecuredModel add( final Resource s, final Property p, final String o )
- throws UpdateDeniedException, AddDeniedException;
- throws AccessDeniedException;
++ throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -100,7 -92,7 +100,7 @@@
@Override
public SecuredModel add( final Resource s, final Property p,
final String o, final boolean wellFormed )
- throws UpdateDeniedException, AddDeniedException;
- throws AccessDeniedException;
++ throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -111,7 -102,7 +111,7 @@@
@Override
public SecuredModel add( final Resource s, final Property p,
final String lex, final RDFDatatype datatype )
- throws UpdateDeniedException, AddDeniedException;
- throws AccessDeniedException;
++ throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -121,16 -111,15 +121,16 @@@
*/
@Override
public SecuredModel add( final Resource s, final Property p,
- final String o, final String l ) throws UpdateDeniedException, AddDeniedException;
- final String o, final String l ) throws AccessDeniedException;
++ final String o, final String l ) throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
* @sec.triple Create the statement as a triple
- * @throws AccessDeniedException
+ * @throws UpdateDeniedException
+ * @throws AddDeniedException
*/
@Override
- public SecuredModel add( final Statement s ) throws UpdateDeniedException, AddDeniedException;
- public SecuredModel add( final Statement s ) throws AccessDeniedException;
++ public SecuredModel add( final Statement s ) throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -140,7 -128,7 +140,7 @@@
*/
@Override
public SecuredModel add( final Statement[] statements )
- throws UpdateDeniedException, AddDeniedException;
- throws AccessDeniedException;
++ throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -150,7 -137,7 +150,7 @@@
*/
@Override
public SecuredModel add( final StmtIterator iter )
- throws UpdateDeniedException, AddDeniedException;
- throws AccessDeniedException;
++ throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -160,7 -146,7 +160,7 @@@
*/
@Override
public SecuredModel addLiteral( final Resource s, final Property p,
- final boolean o ) throws UpdateDeniedException, AddDeniedException;
- final boolean o ) throws AccessDeniedException;
++ final boolean o ) throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -170,7 -155,7 +170,7 @@@
*/
@Override
public SecuredModel addLiteral( final Resource s, final Property p,
- final char o ) throws UpdateDeniedException, AddDeniedException;
- final char o ) throws AccessDeniedException;
++ final char o ) throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -180,7 -164,7 +180,7 @@@
*/
@Override
public SecuredModel addLiteral( final Resource s, final Property p,
- final double o ) throws UpdateDeniedException, AddDeniedException;
- final double o ) throws AccessDeniedException;
++ final double o ) throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -190,7 -173,7 +190,7 @@@
*/
@Override
public SecuredModel addLiteral( final Resource s, final Property p,
- final float o ) throws UpdateDeniedException, AddDeniedException;
- final float o ) throws AccessDeniedException;
++ final float o ) throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -200,7 -182,7 +200,7 @@@
*/
@Override
public SecuredModel addLiteral( final Resource s, final Property p,
- final int o ) throws UpdateDeniedException, AddDeniedException;
- final int o ) throws AccessDeniedException;
++ final int o ) throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -210,7 -191,7 +210,7 @@@
*/
@Override
public SecuredModel addLiteral( final Resource s, final Property p,
- final Literal o ) throws UpdateDeniedException, AddDeniedException;
- final Literal o ) throws AccessDeniedException;
++ final Literal o ) throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -220,7 -200,7 +220,7 @@@
*/
@Override
public SecuredModel addLiteral( final Resource s, final Property p,
- final long o ) throws UpdateDeniedException, AddDeniedException;
- final long o ) throws AccessDeniedException;
++ final long o ) throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -231,7 -210,7 +231,7 @@@
@Override
@Deprecated
public SecuredModel addLiteral( final Resource s, final Property p,
- final Object o ) throws UpdateDeniedException, AddDeniedException;
- final Object o ) throws AccessDeniedException;
++ final Object o ) throws AddDeniedException, UpdateDeniedException;
@Override
public SecuredRDFNode asRDFNode( final Node n );
@@@ -302,11 -279,11 +302,10 @@@
/**
* @sec.graph Read
* @sec.triple Read every statement in securedModel.
- * @throws AccessDeniedException
+ * @throws ReadDeniedException
*/
@Override
-- public boolean containsAll( final Model model )
- throws ReadDeniedException;
- throws AccessDeniedException;
++ public boolean containsAll( final Model model ) throws ReadDeniedException;
/**
* @sec.graph Read
@@@ -414,11 -391,10 +413,11 @@@
/**
* @sec.graph Update
* @sec.triple Create SecTriple( SecNode.ANY, RDF.type, Rdf.Alt)
- * @throws AccessDeniedException
+ * @throws UpdateDeniedException
+ * @throws AddDeniedException
*/
@Override
- public SecuredAlt createAlt() throws UpdateDeniedException, AddDeniedException;
- public SecuredAlt createAlt() throws AccessDeniedException;
++ public SecuredAlt createAlt() throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -428,16 -403,15 +427,16 @@@
*/
@Override
public SecuredAlt createAlt( final String uri )
- throws UpdateDeniedException, AddDeniedException;
- throws AccessDeniedException;
++ throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
* @sec.triple Create SecTriple( SecNode.ANY, RDF.type, Rdf.Bag)
- * @throws AccessDeniedException
+ * @throws UpdateDeniedException
+ * @throws AddDeniedException
*/
@Override
- public SecuredBag createBag() throws UpdateDeniedException, AddDeniedException;
- public SecuredBag createBag() throws AccessDeniedException;
++ public SecuredBag createBag() throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -447,14 -420,14 +446,14 @@@
*/
@Override
public SecuredBag createBag( final String uri )
- throws UpdateDeniedException, AddDeniedException;
- throws AccessDeniedException;
++ throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
- * @throws AccessDeniedException
+ * @throws UpdateDeniedException
*/
@Override
- public SecuredRDFList createList() throws UpdateDeniedException, AddDeniedException;
- public SecuredRDFList createList() throws AccessDeniedException;
++ public SecuredRDFList createList() throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -468,7 -440,7 +467,7 @@@
*/
@Override
public SecuredRDFList createList( final Iterator<? extends RDFNode> members )
- throws UpdateDeniedException, AddDeniedException;
- throws AccessDeniedException;
++ throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -482,7 -453,7 +481,7 @@@
*/
@Override
public SecuredRDFList createList( final RDFNode[] members )
- throws UpdateDeniedException, AddDeniedException;
- throws AccessDeniedException;
++ throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -492,7 -462,7 +491,7 @@@
*/
@Override
public SecuredStatement createLiteralStatement( final Resource s,
- final Property p, final boolean o ) throws UpdateDeniedException, AddDeniedException;
- final Property p, final boolean o ) throws AccessDeniedException;
++ final Property p, final boolean o ) throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -502,7 -471,7 +501,7 @@@
*/
@Override
public SecuredStatement createLiteralStatement( final Resource s,
- final Property p, final char o ) throws UpdateDeniedException, AddDeniedException;
- final Property p, final char o ) throws AccessDeniedException;
++ final Property p, final char o ) throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -512,7 -480,7 +511,7 @@@
*/
@Override
public SecuredStatement createLiteralStatement( final Resource s,
- final Property p, final double o ) throws UpdateDeniedException, AddDeniedException;
- final Property p, final double o ) throws AccessDeniedException;
++ final Property p, final double o ) throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -522,7 -489,7 +521,7 @@@
*/
@Override
public SecuredStatement createLiteralStatement( final Resource s,
- final Property p, final float o ) throws UpdateDeniedException, AddDeniedException;
- final Property p, final float o ) throws AccessDeniedException;
++ final Property p, final float o ) throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -532,7 -498,7 +531,7 @@@
*/
@Override
public SecuredStatement createLiteralStatement( final Resource s,
- final Property p, final int o ) throws UpdateDeniedException, AddDeniedException;
- final Property p, final int o ) throws AccessDeniedException;
++ final Property p, final int o ) throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -542,7 -507,7 +541,7 @@@
*/
@Override
public SecuredStatement createLiteralStatement( final Resource s,
- final Property p, final long o ) throws UpdateDeniedException, AddDeniedException;
- final Property p, final long o ) throws AccessDeniedException;
++ final Property p, final long o ) throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -552,7 -516,7 +551,7 @@@
*/
@Override
public SecuredStatement createLiteralStatement( final Resource s,
- final Property p, final Object o ) throws UpdateDeniedException, AddDeniedException;
- final Property p, final Object o ) throws AccessDeniedException;
++ final Property p, final Object o ) throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -562,7 -525,7 +561,7 @@@
*/
@Override
public Property createProperty( final String uri )
- throws UpdateDeniedException, AddDeniedException;
- throws AccessDeniedException;
++ throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -572,7 -534,7 +571,7 @@@
*/
@Override
public Property createProperty( final String nameSpace,
- final String localName ) throws UpdateDeniedException, AddDeniedException;
- final String localName ) throws AccessDeniedException;
++ final String localName ) throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -588,7 -548,7 +587,7 @@@
*/
@Override
public ReifiedStatement createReifiedStatement( final Statement s )
- throws UpdateDeniedException, ReadDeniedException, AddDeniedException;
- throws AccessDeniedException;
++ throws AddDeniedException, UpdateDeniedException, ReadDeniedException;
/**
* @sec.graph Update
@@@ -602,19 -560,17 +601,19 @@@
*/
@Override
public ReifiedStatement createReifiedStatement( final String uri,
- final Statement s ) throws UpdateDeniedException, ReadDeniedException, AddDeniedException;
- final Statement s ) throws AccessDeniedException;
++ final Statement s ) throws AddDeniedException, UpdateDeniedException, ReadDeniedException;
/**
* @sec.graph Update
* @sec.triple Read s as a triple
- * @sec.triple create SecTriple( SecNode.FUTURE, SecNode.IGNORE,
+ * @sec.triple Create SecTriple( SecNode.FUTURE, SecNode.IGNORE,
* SecNode.IGNORE )
- * @throws AccessDeniedException
+ * @throws UpdateDeniedException
+ * @throws ReadDeniedException
+ * @throws AddDeniedException
*/
@Override
- public SecuredResource createResource() throws UpdateDeniedException, ReadDeniedException, AddDeniedException;
- public SecuredResource createResource() throws AccessDeniedException;
++ public SecuredResource createResource() throws AddDeniedException, UpdateDeniedException, ReadDeniedException;
/**
* @sec.graph Update
@@@ -627,7 -581,7 +626,7 @@@
*/
@Override
public SecuredResource createResource( final AnonId id )
- throws UpdateDeniedException, ReadDeniedException, AddDeniedException;
- throws AccessDeniedException;
++ throws AddDeniedException, UpdateDeniedException, ReadDeniedException;
/**
* @sec.graph Update
@@@ -637,7 -590,7 +636,7 @@@
*/
@Override
public SecuredResource createResource( final Resource type )
- throws UpdateDeniedException, AddDeniedException;
- throws AccessDeniedException;
++ throws AddDeniedException, UpdateDeniedException;
@Override
@Deprecated
@@@ -657,7 -608,7 +656,7 @@@
*/
@Override
public SecuredResource createResource( final String uri, final Resource type )
- throws UpdateDeniedException, ReadDeniedException, AddDeniedException;
- throws AccessDeniedException;
++ throws AddDeniedException, UpdateDeniedException, ReadDeniedException;
@Override
@Deprecated
@@@ -666,11 -617,10 +665,11 @@@
/**
* @sec.graph Update
* @sec.triple Create SecTriple( SecNode.FUTURE, RDF.type, RDF.Alt )
- * @throws AccessDeniedException
+ * @throws UpdateDeniedException
+ * @trhows AddDeniedException
*/
@Override
- public SecuredSeq createSeq() throws UpdateDeniedException, AddDeniedException;
- public SecuredSeq createSeq() throws AccessDeniedException;
++ public SecuredSeq createSeq() throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -680,7 -629,7 +679,7 @@@
*/
@Override
public SecuredSeq createSeq( final String uri )
- throws UpdateDeniedException, AddDeniedException;
- throws AccessDeniedException;
++ throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -690,7 -638,7 +689,7 @@@
*/
@Override
public SecuredStatement createStatement( final Resource s,
- final Property p, final RDFNode o ) throws UpdateDeniedException, AddDeniedException;
- final Property p, final RDFNode o ) throws AccessDeniedException;
++ final Property p, final RDFNode o ) throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -700,7 -647,7 +699,7 @@@
*/
@Override
public SecuredStatement createStatement( final Resource s,
- final Property p, final String o ) throws UpdateDeniedException, AddDeniedException;
- final Property p, final String o ) throws AccessDeniedException;
++ final Property p, final String o ) throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -710,7 -657,7 +709,7 @@@
@Override
public SecuredStatement createStatement( final Resource s,
final Property p, final String o, final boolean wellFormed )
- throws UpdateDeniedException, AddDeniedException;
- throws AccessDeniedException;
++ throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -721,7 -667,7 +720,7 @@@
@Override
public SecuredStatement createStatement( final Resource s,
final Property p, final String o, final String l )
- throws UpdateDeniedException, AddDeniedException;
- throws AccessDeniedException;
++ throws AddDeniedException, UpdateDeniedException;
/**
* @sec.graph Update
@@@ -732,7 -677,7 +731,7 @@@
@Override
public SecuredStatement createStatement( final Resource s,
final Property p, final String o, final String l,
- final boolean wellFormed ) throws UpdateDeniedException, AddDeniedException;
- final boolean wellFormed ) throws AccessDeniedException;
++ final boolean wellFormed ) throws AddDeniedException, UpdateDeniedException;
@Override
public SecuredLiteral createTypedLiteral( final boolean v );
@@@ -788,20 -733,19 +787,18 @@@
/**
* @sec.graph Read if read lock is requested
* @sec.graph Update if write lock is requested
- * @throws AccessDeniedException
+ * @throws ReadDeniedException
+ * @throws UpdateDeniedException
*/
@Override
-- public void enterCriticalSection( final boolean readLockRequested )
- throws ReadDeniedException, UpdateDeniedException;
- throws AccessDeniedException;
++ public void enterCriticalSection( final boolean readLockRequested ) throws ReadDeniedException, UpdateDeniedException;
/**
* @sec.graph Read
- * @throws AccessDeniedException
+ * @throws ReadDeniedException
*/
@Override
-- public String expandPrefix( final String prefixed )
- throws ReadDeniedException;
- throws AccessDeniedException;
++ public String expandPrefix( final String prefixed ) throws ReadDeniedException;
/**
* @sec.graph Read
@@@ -841,7 -783,7 +838,7 @@@
*/
@Override
public SecuredResource getAnyReifiedStatement( final Statement s )
- throws ReadDeniedException, UpdateDeniedException, AddDeniedException;
- throws AccessDeniedException;
++ throws AddDeniedException, ReadDeniedException, UpdateDeniedException;
/**
* @sec.graph Read
@@@ -865,27 -807,27 +862,24 @@@
/**
* @sec.graph Read
* @sec.triple Read on the returned statement.
- * @throws AccessDeniedException
+ * @throws ReadDeniedException
*/
@Override
-- public SecuredStatement getProperty( final Resource s, final Property p )
- throws ReadDeniedException;
- throws AccessDeniedException;
++ public SecuredStatement getProperty( final Resource s, final Property p ) throws ReadDeniedException;
/**
* @sec.graph Read
- * @throws AccessDeniedException
+ * @throws ReadDeniedException
*/
@Override
-- public Property getProperty( final String uri )
- throws ReadDeniedException;
- throws AccessDeniedException;
++ public Property getProperty( final String uri ) throws ReadDeniedException;
/**
* @sec.graph Read
- * @throws AccessDeniedException
+ * @throws ReadDeniedException
*/
@Override
-- public Property getProperty( final String nameSpace, final String localName )
- throws ReadDeniedException;
- throws AccessDeniedException;
++ public Property getProperty( final String nameSpace, final String localName ) throws ReadDeniedException;
/**
* @sec.graph Read if the node exists
@@@ -913,8 -855,8 +907,7 @@@
*/
@Override
public SecuredStatement getRequiredProperty( final Resource s,
-- final Property p ) throws PropertyNotFoundException,
- ReadDeniedException;
- AccessDeniedException;
++ final Property p ) throws PropertyNotFoundException, ReadDeniedException;
@Override
public SecuredResource getResource( final String uri );
@@@ -963,11 -905,11 +956,10 @@@
* @sec.graph Read
* @sec.triple Read all compared triples. Triples that can not be read will
* not be compared.
- * @throws AccessDeniedException
+ * @throws ReadDeniedException
*/
@Override
-- public boolean isIsomorphicWith( final Model g )
- throws ReadDeniedException;
- throws AccessDeniedException;
++ public boolean isIsomorphicWith( final Model g ) throws ReadDeniedException;
/**
*
@@@ -999,8 -941,8 +991,7 @@@
@Override
public SecuredStatementIterator listLiteralStatements(
-- final Resource subject, final Property predicate, final char object )
- throws ReadDeniedException;
- throws AccessDeniedException;
++ final Resource subject, final Property predicate, final char object ) throws ReadDeniedException;
/**
*
@@@ -1018,12 -960,13 +1009,11 @@@
*
* @sec.graph Read
* @sec.triple Read on all triples returned.
- * @throws AccessDeniedException
+ * @throws ReadDeniedException
*/
-
@Override
public SecuredStatementIterator listLiteralStatements(
-- final Resource subject, final Property predicate, final float object )
- throws ReadDeniedException;
- throws AccessDeniedException;
++ final Resource subject, final Property predicate, final float object ) throws ReadDeniedException;
/**
*
@@@ -1034,8 -977,8 +1024,7 @@@
@Override
public SecuredStatementIterator listLiteralStatements(
-- final Resource subject, final Property predicate, final long object )
- throws ReadDeniedException;
- throws AccessDeniedException;
++ final Resource subject, final Property predicate, final long object ) throws ReadDeniedException;
/**
*
@@@ -1058,11 -1001,11 +1047,10 @@@
*
* @sec.graph Read
* @sec.triple Read on each RDFNode returned
- * @throws AccessDeniedException
+ * @throws ReadDeniedException
*/
@Override
-- public SecuredNodeIterator<RDFNode> listObjectsOfProperty( final Property p )
- throws ReadDeniedException;
- throws AccessDeniedException;
++ public SecuredNodeIterator<RDFNode> listObjectsOfProperty( final Property p ) throws ReadDeniedException;
/**
*
@@@ -1078,21 -1021,21 +1066,19 @@@
*
* @sec.graph Read
* @sec.triple Read on each Reified statement returned
- * @throws AccessDeniedException
+ * @throws ReadDeniedException
*/
@Override
-- public SecuredRSIterator listReifiedStatements()
- throws ReadDeniedException;
- throws AccessDeniedException;
++ public SecuredRSIterator listReifiedStatements() throws ReadDeniedException;
/**
*
* @sec.graph Read
* @sec.triple Read on each Reified statement returned
- * @throws AccessDeniedException
+ * @throws ReadDeniedException
*/
@Override
-- public SecuredRSIterator listReifiedStatements( final Statement st )
- throws ReadDeniedException;
- throws AccessDeniedException;
++ public SecuredRSIterator listReifiedStatements( final Statement st ) throws ReadDeniedException;
/**
*
@@@ -1100,11 -1043,11 +1086,10 @@@
* @sec.triple Read at least one SecTriple( resource, p, o ) for each
* resource
* returned;
- * @throws AccessDeniedException
+ * @throws ReadDeniedException
*/
@Override
-- public SecuredResIterator listResourcesWithProperty( final Property p )
- throws ReadDeniedException;
- throws AccessDeniedException;
++ public SecuredResIterator listResourcesWithProperty( final Property p ) throws ReadDeniedException;
/**
*
@@@ -1194,11 -1139,11 +1179,10 @@@
*
* @sec.graph Read
* @sec.triple Read on all triples returned
- * @throws AccessDeniedException
+ * @throws ReadDeniedException
*/
@Override
-- public SecuredStatementIterator listStatements()
- throws ReadDeniedException;
- throws AccessDeniedException;
++ public SecuredStatementIterator listStatements() throws ReadDeniedException;
/**
*
@@@ -1218,8 -1163,8 +1202,7 @@@
*/
@Override
public SecuredStatementIterator listStatements( final Resource subject,
-- final Property predicate, final String object )
- throws ReadDeniedException;
- throws AccessDeniedException;
++ final Property predicate, final String object ) throws ReadDeniedException;
/**
*
@@@ -1229,18 -1174,18 +1212,16 @@@
*/
@Override
public SecuredStatementIterator listStatements( final Resource subject,
-- final Property predicate, final String object, final String lang )
- throws ReadDeniedException;
- throws AccessDeniedException;
++ final Property predicate, final String object, final String lang ) throws ReadDeniedException;
/**
*
* @sec.graph Read
* @sec.triple Read on all triples returned
- * @throws AccessDeniedException
+ * @throws ReadDeniedException
*/
@Override
-- public SecuredStatementIterator listStatements( final Selector s )
- throws ReadDeniedException;
- throws AccessDeniedException;
++ public SecuredStatementIterator listStatements( final Selector s ) throws ReadDeniedException;
/**
*
@@@ -1259,11 -1204,11 +1240,10 @@@
* @sec.triple Read at least one SecTriple( resource, p, o ) for each
* resource
* returned
- * @throws AccessDeniedException
+ * @throws ReadDeniedException
*/
@Override
-- public SecuredResIterator listSubjectsWithProperty( final Property p )
- throws ReadDeniedException;
- throws AccessDeniedException;
++ public SecuredResIterator listSubjectsWithProperty( final Property p ) throws ReadDeniedException;
/**
*
@@@ -1331,11 -1276,11 +1311,10 @@@
/**
*
* @sec.graph Update
- * @throws AccessDeniedException
+ * @throws UpdateDeniedException
*/
@Override
-- public SecuredModel read( final InputStream in, final String base )
- throws UpdateDeniedException;
- throws AccessDeniedException;
++ public SecuredModel read( final InputStream in, final String base ) throws UpdateDeniedException;
/**
*
@@@ -1349,11 -1294,11 +1328,10 @@@
/**
*
* @sec.graph Update
- * @throws AccessDeniedException
+ * @throws UpdateDeniedException
*/
@Override
-- public SecuredModel read( final Reader reader, final String base )
- throws UpdateDeniedException;
- throws AccessDeniedException;
++ public SecuredModel read( final Reader reader, final String base ) throws UpdateDeniedException;
/**
*
@@@ -1375,11 -1320,11 +1353,10 @@@
/**
*
* @sec.graph Update
- * @throws AccessDeniedException
+ * @throws UpdateDeniedException
*/
@Override
-- public SecuredModel read( final String url, final String lang )
- throws UpdateDeniedException;
- throws AccessDeniedException;
++ public SecuredModel read( final String url, final String lang ) throws UpdateDeniedException;
/**
*
@@@ -1395,11 -1340,11 +1372,10 @@@
* Listener will be filtered to only report events that the user can see.
*
* @sec.graph Read
- * @throws AccessDeniedException
+ * @throws ReadDeniedException
*/
@Override
-- public SecuredModel register( final ModelChangedListener listener )
- throws ReadDeniedException;
- throws AccessDeniedException;
++ public SecuredModel register( final ModelChangedListener listener ) throws ReadDeniedException;
/**
*
@@@ -1410,27 -1354,25 +1386,27 @@@
*/
@Override
public SecuredModel remove( final List<Statement> statements )
- throws UpdateDeniedException, DeleteDeniedException;
- throws AccessDeniedException;
++ throws DeleteDeniedException, UpdateDeniedException;
/**
*
* @sec.graph Update
* @sec.triple Delete on every statement in baseModel.
- * @throws AccessDeniedException
+ * @throws UpdateDeniedException
+ * @throws DeleteDeniedException
*/
@Override
- public SecuredModel remove( final Model m ) throws UpdateDeniedException, DeleteDeniedException;
- public SecuredModel remove( final Model m ) throws AccessDeniedException;
++ public SecuredModel remove( final Model m ) throws DeleteDeniedException, UpdateDeniedException;;
/**
*
* @sec.graph Update
* @sec.triple Delete on SecTriple( s, p, o )
- * @throws AccessDeniedException
+ * @throws UpdateDeniedException
+ * @throws DeleteDeniedException
*/
@Override
- public SecuredModel remove( final Resource s, final Property p, final RDFNode o ) throws UpdateDeniedException, DeleteDeniedException;
- public SecuredModel remove( final Resource s, final Property p, final RDFNode o ) throws AccessDeniedException;
++ public SecuredModel remove( final Resource s, final Property p, final RDFNode o ) throws DeleteDeniedException, UpdateDeniedException;;
/**
*
@@@ -1441,7 -1382,7 +1417,7 @@@
*/
@Override
public SecuredModel remove( final Statement s )
- throws UpdateDeniedException, DeleteDeniedException;
- throws AccessDeniedException;
++ throws DeleteDeniedException, UpdateDeniedException;;
/**
*
@@@ -1452,7 -1392,7 +1428,7 @@@
*/
@Override
public SecuredModel remove( final Statement[] statements )
- throws UpdateDeniedException, DeleteDeniedException;
- throws AccessDeniedException;
++ throws DeleteDeniedException, UpdateDeniedException;;
/**
*
@@@ -1463,17 -1402,16 +1439,17 @@@
*/
@Override
public SecuredModel remove( final StmtIterator iter )
- throws UpdateDeniedException, DeleteDeniedException;
- throws AccessDeniedException;
++ throws DeleteDeniedException, UpdateDeniedException;;
/**
*
* @sec.graph Update
* @sec.triple Delete on every statement in the securedModel
- * @throws AccessDeniedException
+ * @throws UpdateDeniedException
+ * @throws DeleteDeniedException
*/
@Override
- public SecuredModel removeAll() throws UpdateDeniedException, DeleteDeniedException;
- public SecuredModel removeAll() throws AccessDeniedException;
++ public SecuredModel removeAll() throws DeleteDeniedException, UpdateDeniedException;;
/**
*
@@@ -1484,7 -1421,7 +1460,7 @@@
*/
@Override
public SecuredModel removeAll( final Resource s, final Property p,
- final RDFNode r ) throws UpdateDeniedException, DeleteDeniedException;
- final RDFNode r ) throws AccessDeniedException;
++ final RDFNode r ) throws DeleteDeniedException, UpdateDeniedException;;
/**
*
@@@ -1496,7 -1432,7 +1472,7 @@@
*/
@Override
public void removeAllReifications( final Statement s )
- throws UpdateDeniedException, DeleteDeniedException;
- throws AccessDeniedException;
++ throws DeleteDeniedException, UpdateDeniedException;;
/**
*
@@@ -1517,25 -1452,25 +1493,23 @@@
*/
@Override
public void removeReification( final ReifiedStatement rs )
- throws UpdateDeniedException, DeleteDeniedException;
- throws AccessDeniedException;
++ throws DeleteDeniedException, UpdateDeniedException;;
/**
*
* @sec.graph Update
- * @throws AccessDeniedException
+ * @throws UpdateDeniedException
*/
@Override
-- public String setReaderClassName( final String lang, final String className )
- throws UpdateDeniedException;
- throws AccessDeniedException;
++ public String setReaderClassName( final String lang, final String className ) throws UpdateDeniedException;
/**
*
* @sec.graph Update
- * @throws AccessDeniedException
+ * @throws UpdateDeniedException
*/
@Override
-- public String setWriterClassName( final String lang, final String className )
- throws UpdateDeniedException;
- throws AccessDeniedException;
++ public String setWriterClassName( final String lang, final String className ) throws UpdateDeniedException;
/**
*
http://git-wip-us.apache.org/repos/asf/jena/blob/e48966cd/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredSeq.java
----------------------------------------------------------------------
diff --cc jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredSeq.java
index 329e511,7ce88b4..0fb6e2b
--- a/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredSeq.java
+++ b/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredSeq.java
@@@ -34,13 -31,11 +34,14 @@@ import org.apache.jena.shared.DeleteDen
* http://www.w3.org/TR/2004/REC-rdf-mt-20040210/#Containers
*
*/
++@SuppressWarnings("deprecation")
public interface SecuredSeq extends Seq, SecuredContainer
{
- /**
+ /** *
* @sec.graph Update
* @sec.triple Create SecTriple( this, RDF.li(1), o )
+ * @throws UpdateDeniedException
+ * @throws DeleteDeniedException
*/
@Override
public SecuredSeq add( final int index, final boolean o )
http://git-wip-us.apache.org/repos/asf/jena/blob/e48966cd/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredUnsupportedPolymorphismException.java
----------------------------------------------------------------------
diff --cc jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredUnsupportedPolymorphismException.java
index 32a81be,32a81be..e5cef53
--- a/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredUnsupportedPolymorphismException.java
+++ b/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredUnsupportedPolymorphismException.java
@@@ -28,6 -28,6 +28,11 @@@ public class SecuredUnsupportedPolymorp
UnsupportedPolymorphismException
{
++ /**
++ *
++ */
++ private static final long serialVersionUID = 4329005499222402816L;
++
public SecuredUnsupportedPolymorphismException(
final SecuredRDFNodeImpl node, final Class<?> type )
{
http://git-wip-us.apache.org/repos/asf/jena/blob/e48966cd/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredModelImpl.java
----------------------------------------------------------------------
diff --cc jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredModelImpl.java
index 8810487,37d856b..52f413a
--- a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredModelImpl.java
+++ b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredModelImpl.java
@@@ -347,7 -348,7 +347,7 @@@ public class SecuredModelImpl extends S
super(securityEvaluator, modelURI, holder);
this.graph = org.apache.jena.permissions.Factory.getInstance(securityEvaluator, modelURI, holder
.getBaseItem().getGraph());
-- this.holder = holder; // FIXME -- this should just access the super holder.
++ this.holder = holder;
}
private RDFNode asObject( Object o )
@@@ -1536,11 -1537,11 +1536,13 @@@
return holder.getBaseItem().getReader(lang);
}
++ @SuppressWarnings("deprecation")
@Override
public void resetRDFReaderF() {
holder.getBaseItem().resetRDFReaderF();
}
++ @SuppressWarnings("deprecation")
@Override
public String removeReader(String lang) throws IllegalArgumentException {
return holder.getBaseItem().removeReader(lang);
@@@ -1621,11 -1622,11 +1623,13 @@@
return holder.getBaseItem().getWriter(lang);
}
++ @SuppressWarnings("deprecation")
@Override
public void resetRDFWriterF() {
holder.getBaseItem().resetRDFWriterF();
}
++ @SuppressWarnings("deprecation")
@Override
public String removeWriter(String lang) throws IllegalArgumentException {
return holder.getBaseItem().removeWriter(lang);
@@@ -2485,6 -2486,6 +2489,7 @@@
return holder.getSecuredItem();
}
++ @SuppressWarnings("deprecation")
@Override
public String setReaderClassName( final String lang, final String className )
{
@@@ -2492,6 -2493,6 +2497,7 @@@
return holder.getBaseItem().setReaderClassName(lang, className);
}
++ @SuppressWarnings("deprecation")
@Override
public String setWriterClassName( final String lang, final String className )
{
http://git-wip-us.apache.org/repos/asf/jena/blob/e48966cd/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredResourceImpl.java
----------------------------------------------------------------------
diff --cc jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredResourceImpl.java
index 7f6c511,156b5b9..d6be052
--- a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredResourceImpl.java
+++ b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredResourceImpl.java
@@@ -21,11 -21,10 +21,10 @@@ import org.apache.jena.datatypes.RDFDat
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
import org.apache.jena.graph.Triple ;
-import org.apache.jena.permissions.AccessDeniedException;
+import org.apache.jena.permissions.ReadDeniedException;
import org.apache.jena.permissions.SecurityEvaluator.Action;
import org.apache.jena.permissions.impl.ItemHolder;
-import org.apache.jena.permissions.impl.SecuredItemImpl;
+import org.apache.jena.permissions.impl.SecuredItem;
- import org.apache.jena.permissions.impl.SecuredItemImpl;
import org.apache.jena.permissions.impl.SecuredItemInvoker;
import org.apache.jena.permissions.model.SecuredModel;
import org.apache.jena.permissions.model.SecuredResource;
http://git-wip-us.apache.org/repos/asf/jena/blob/e48966cd/jena-permissions/src/test/java/org/apache/jena/permissions/SecuredAssemblerTest.java
----------------------------------------------------------------------
diff --cc jena-permissions/src/test/java/org/apache/jena/permissions/SecuredAssemblerTest.java
index db6b55d,db6b55d..ba19d2d
--- a/jena-permissions/src/test/java/org/apache/jena/permissions/SecuredAssemblerTest.java
+++ b/jena-permissions/src/test/java/org/apache/jena/permissions/SecuredAssemblerTest.java
@@@ -44,7 -44,7 +44,6 @@@ public class SecuredAssemblerTes
model = ModelFactory.createDefaultModel();
URL url = SecuredAssemblerTest.class.getClassLoader().getResource( SecuredAssemblerTest.class.getName().replace(".", "/")+".ttl");
model.read( url.toURI().toString(), "TURTLE" );
-- //model.write( System.out, "TURTLE" );
}
@Test
http://git-wip-us.apache.org/repos/asf/jena/blob/e48966cd/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelDetailTest.java
----------------------------------------------------------------------
diff --cc jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelDetailTest.java
index edd51ba,f93d644..30f7533
--- a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelDetailTest.java
+++ b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelDetailTest.java
@@@ -17,23 -17,22 +17,22 @@@
*/
package org.apache.jena.permissions.model;
- import java.net.URL;
- import java.security.Principal;
- import java.util.Set;
-
- import org.apache.http.auth.BasicUserPrincipal;
- import org.apache.jena.graph.NodeFactory;
- import org.apache.jena.permissions.Factory;
- import org.apache.jena.permissions.SecurityEvaluator;
- import org.apache.jena.permissions.model.SecuredModel;
- import org.apache.jena.rdf.model.*;
- import org.apache.jena.vocabulary.RDF;
- import org.junit.Assert;
- import org.junit.Before;
- import org.junit.Test;
+ import java.net.URL ;
+ import java.security.Principal ;
+ import java.util.Set ;
+
+ import org.apache.http.auth.BasicUserPrincipal ;
+ import org.apache.jena.graph.NodeFactory ;
+ import org.apache.jena.permissions.Factory ;
+ import org.apache.jena.permissions.SecurityEvaluator ;
+ import org.apache.jena.rdf.model.* ;
+ import org.apache.jena.vocabulary.RDF ;
+ import org.junit.Assert ;
+ import org.junit.Before ;
+ import org.junit.Test ;
/**
- * Tests secured model functions against graph where only partial data is
+ * Tests secured model functions against graph where only partial data is
* available to the user.
*
*/
@@@ -296,30 -246,33 +295,30 @@@ public class SecuredModelDetailTest
return true;
}
- private boolean evaluate( Resource r )
- {
+ private boolean evaluate(Resource r) {
// a message is only available to sender or recipient
- if (r.hasProperty( RDF.type, msgType ))
- {
- return r.hasProperty( pTo, ((Principal)principal).getName() ) ||
- r.hasProperty( pFrom, ((Principal)principal).getName());
+ if (r.hasProperty(RDF.type, msgType)) {
+ return r.hasProperty(pTo, principal.getName())
+ || r.hasProperty(pFrom,
+ principal.getName());
}
- return true;
+ return true;
}
-
+
- private boolean evaluate(SecNode node) {
- if (node.equals(SecNode.ANY)) {
- return false; // all wild cards are false
+ private boolean evaluate( SecNode node )
+ {
+ if (node.equals( SecNode.ANY )) {
+ return false; // all wild cards are false
}
-
- if (node.getType().equals(SecNode.Type.URI)) {
- Resource r = model.createResource(node.getValue());
- return evaluate(r);
- } else if (node.getType().equals(SecNode.Type.Anonymous)) {
- Resource r = model.getRDFNode(
- NodeFactory.createAnon(new AnonId(node.getValue())))
- .asResource();
- return evaluate(r);
+
+ if (node.getType().equals( SecNode.Type.URI)) {
+ Resource r = model.createResource( node.getValue() );
+ return evaluate( r );
+ }
+ else if (node.getType().equals( SecNode.Type.Anonymous)) {
+ Resource r = model.getRDFNode( NodeFactory.createBlankNode( node.getValue()) ).asResource();
+ return evaluate( r );
- }
- else
- {
+ } else {
return true;
}