Merge pull request #8 from apache/master pull master up to date
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/1348bf54 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/1348bf54 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/1348bf54 Branch: refs/heads/JENA-491-construct-quads Commit: 1348bf5498543f747f1b4707f011a46bfcca90e1 Parents: 21b37d1 d38ba28 Author: confidencesun <[email protected]> Authored: Wed Jul 22 03:16:15 2015 -0300 Committer: confidencesun <[email protected]> Committed: Wed Jul 22 03:16:15 2015 -0300 ---------------------------------------------------------------------- apache-jena-osgi/jena-osgi/pom.xml | 4 +- apache-jena/README | 9 +- apache-jena/bin/arq | 77 +- apache-jena/bin/infer | 77 +- apache-jena/bin/iri | 77 +- apache-jena/bin/juuid | 77 +- apache-jena/bin/nquads | 77 +- apache-jena/bin/ntriples | 77 +- apache-jena/bin/qparse | 77 +- apache-jena/bin/rdfcat | 77 +- apache-jena/bin/rdfcompare | 77 +- apache-jena/bin/rdfcopy | 77 +- apache-jena/bin/rdfparse | 77 +- apache-jena/bin/rdfxml | 77 +- apache-jena/bin/riot | 77 +- apache-jena/bin/rset | 77 +- apache-jena/bin/rsparql | 77 +- apache-jena/bin/rupdate | 77 +- apache-jena/bin/schemagen | 77 +- apache-jena/bin/sparql | 77 +- apache-jena/bin/tdbbackup | 77 +- apache-jena/bin/tdbdump | 77 +- apache-jena/bin/tdbloader | 77 +- apache-jena/bin/tdbloader2 | 331 ++- apache-jena/bin/tdbloader2common | 195 ++ apache-jena/bin/tdbloader2data | 288 +++ apache-jena/bin/tdbloader2index | 426 ++++ apache-jena/bin/tdbloader2worker | 154 -- apache-jena/bin/tdbquery | 77 +- apache-jena/bin/tdbstats | 77 +- apache-jena/bin/tdbupdate | 77 +- apache-jena/bin/trig | 77 +- apache-jena/bin/turtle | 77 +- apache-jena/bin/uparse | 77 +- apache-jena/bin/update | 77 +- apache-jena/bin/utf8 | 77 +- apache-jena/bin/wwwdec | 77 +- apache-jena/bin/wwwenc | 77 +- apache-jena/cmd-maker | 12 +- apache-jena/pom.xml | 78 +- apache-jena/template.bin | 77 +- jena-arq/src/main/java/arq/cmd/Arg.java | 69 - jena-arq/src/main/java/arq/cmd/ArgDecl.java | 97 - jena-arq/src/main/java/arq/cmd/ArgModule.java | 27 - .../src/main/java/arq/cmd/ArgModuleGeneral.java | 29 - jena-arq/src/main/java/arq/cmd/ArgProc.java | 27 - .../src/main/java/arq/cmd/CmdArgModule.java | 68 - .../src/main/java/arq/cmd/CmdException.java | 30 - jena-arq/src/main/java/arq/cmd/CmdLineArgs.java | 412 ---- jena-arq/src/main/java/arq/cmd/CmdMain.java | 114 - .../src/main/java/arq/cmd/CommandLineBase.java | 137 -- .../main/java/arq/cmd/TerminationException.java | 30 - jena-arq/src/main/java/arq/cmd/Usage.java | 105 - .../src/main/java/arq/cmdline/CallbackHelp.java | 24 - jena-arq/src/main/java/arq/cmdline/CmdARQ.java | 18 +- .../src/main/java/arq/cmdline/CmdGeneral.java | 89 - .../src/main/java/arq/cmdline/ModAlgebra.java | 10 +- .../src/main/java/arq/cmdline/ModAssembler.java | 9 +- jena-arq/src/main/java/arq/cmdline/ModBase.java | 25 - .../src/main/java/arq/cmdline/ModDataset.java | 2 + .../java/arq/cmdline/ModDatasetAssembler.java | 10 +- .../java/arq/cmdline/ModDatasetGeneral.java | 8 +- .../arq/cmdline/ModDatasetGeneralAssembler.java | 4 +- .../src/main/java/arq/cmdline/ModEngine.java | 96 +- .../src/main/java/arq/cmdline/ModFormat.java | 14 +- .../src/main/java/arq/cmdline/ModGeneral.java | 63 - jena-arq/src/main/java/arq/cmdline/ModItem.java | 12 +- .../main/java/arq/cmdline/ModLangOutput.java | 9 +- .../src/main/java/arq/cmdline/ModLangParse.java | 9 +- .../src/main/java/arq/cmdline/ModQueryIn.java | 10 +- .../src/main/java/arq/cmdline/ModQueryOut.java | 10 +- .../src/main/java/arq/cmdline/ModRemote.java | 11 +- .../src/main/java/arq/cmdline/ModResultsIn.java | 9 +- .../main/java/arq/cmdline/ModResultsOut.java | 10 +- .../src/main/java/arq/cmdline/ModSymbol.java | 14 +- jena-arq/src/main/java/arq/cmdline/ModTime.java | 13 +- .../src/main/java/arq/cmdline/ModVersion.java | 71 - jena-arq/src/main/java/arq/juuid.java | 9 +- jena-arq/src/main/java/arq/load.java | 6 +- jena-arq/src/main/java/arq/qexpr.java | 9 +- jena-arq/src/main/java/arq/qparse.java | 6 +- jena-arq/src/main/java/arq/query.java | 8 +- jena-arq/src/main/java/arq/rsparql.java | 4 +- jena-arq/src/main/java/arq/rupdate.java | 6 +- jena-arq/src/main/java/arq/sse.java | 6 +- jena-arq/src/main/java/arq/sse_query.java | 8 +- jena-arq/src/main/java/arq/uparse.java | 6 +- jena-arq/src/main/java/arq/update.java | 6 +- jena-arq/src/main/java/arq/version.java | 2 +- .../main/java/org/apache/jena/query/ARQ.java | 12 + .../java/org/apache/jena/query/Dataset.java | 3 +- .../main/java/org/apache/jena/query/Query.java | 7 - .../org/apache/jena/query/QuerySolutionMap.java | 12 +- .../main/java/org/apache/jena/riot/RIOT.java | 2 +- .../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 +- .../jena/riot/writer/StreamWriterTriX.java | 24 +- .../apache/jena/sparql/algebra/OpAsQuery.java | 1063 +++++---- .../jena/sparql/algebra/optimize/Optimize.java | 9 +- .../optimize/TransformEliminateAssignments.java | 618 +++++ .../optimize/TransformRemoveAssignment.java | 143 ++ .../algebra/optimize/VariableUsagePopper.java | 57 + .../algebra/optimize/VariableUsagePusher.java | 59 + .../algebra/optimize/VariableUsageTracker.java | 92 + .../algebra/optimize/VariableUsageVisitor.java | 206 ++ .../apache/jena/sparql/core/DatasetChanges.java | 4 + .../jena/sparql/core/DatasetChangesBatched.java | 76 +- .../jena/sparql/core/DatasetChangesCapture.java | 109 +- .../jena/sparql/core/DatasetChangesCounter.java | 1 + .../sparql/core/DatasetGraphCollection.java | 10 +- .../org/apache/jena/sparql/core/Prologue.java | 10 + .../engine/binding/BindingInputStream.java | 3 +- .../org/apache/jena/sparql/expr/E_BNode.java | 2 +- .../org/apache/jena/sparql/expr/E_Exists.java | 42 +- .../apache/jena/sparql/expr/E_NotExists.java | 14 +- .../java/org/apache/jena/sparql/expr/Expr.java | 33 + .../apache/jena/sparql/expr/ExprAggregator.java | 5 +- .../apache/jena/sparql/expr/ExprFunction.java | 16 +- .../apache/jena/sparql/expr/ExprFunctionOp.java | 1 + .../org/apache/jena/sparql/expr/ExprList.java | 14 +- .../org/apache/jena/sparql/expr/ExprNode.java | 75 +- .../org/apache/jena/sparql/expr/ExprVar.java | 5 +- .../org/apache/jena/sparql/expr/ExprVars.java | 28 + .../org/apache/jena/sparql/expr/NodeValue.java | 36 +- .../jena/sparql/expr/aggregate/AggAvg.java | 6 +- .../sparql/expr/aggregate/AggAvgDistinct.java | 6 +- .../jena/sparql/expr/aggregate/AggCount.java | 4 +- .../sparql/expr/aggregate/AggCountDistinct.java | 4 +- .../jena/sparql/expr/aggregate/AggCountVar.java | 6 +- .../expr/aggregate/AggCountVarDistinct.java | 6 +- .../jena/sparql/expr/aggregate/AggCustom.java | 18 +- .../sparql/expr/aggregate/AggGroupConcat.java | 7 +- .../expr/aggregate/AggGroupConcatDistinct.java | 7 +- .../jena/sparql/expr/aggregate/AggMax.java | 8 +- .../sparql/expr/aggregate/AggMaxDistinct.java | 9 +- .../jena/sparql/expr/aggregate/AggMin.java | 8 +- .../sparql/expr/aggregate/AggMinDistinct.java | 8 +- .../jena/sparql/expr/aggregate/AggNull.java | 4 +- .../jena/sparql/expr/aggregate/AggSample.java | 8 +- .../expr/aggregate/AggSampleDistinct.java | 8 +- .../jena/sparql/expr/aggregate/AggSum.java | 6 +- .../sparql/expr/aggregate/AggSumDistinct.java | 8 +- .../jena/sparql/expr/aggregate/Aggregator.java | 3 + .../sparql/expr/aggregate/AggregatorBase.java | 8 +- .../org/apache/jena/sparql/lang/ParserBase.java | 4 +- .../apache/jena/sparql/lang/SyntaxVarScope.java | 4 +- .../apache/jena/sparql/modify/TemplateLib.java | 2 +- .../apache/jena/sparql/path/eval/PathEval.java | 3 +- .../sparql/resultset/JSONInputIterator.java | 28 +- .../jena/sparql/resultset/XMLInputStAX.java | 3 +- .../jena/sparql/serializer/FmtExprSPARQL.java | 13 +- .../sparql/serializer/FormatterElement.java | 408 ++-- .../jena/sparql/sse/lang/ParseHandlerPlain.java | 2 +- .../jena/sparql/syntax/ElementFilter.java | 2 +- .../apache/jena/sparql/syntax/ElementGroup.java | 11 +- .../syntaxtransform/ElementTransform.java | 51 + .../ElementTransformCleanGroupsOfOne.java | 108 + .../ElementTransformCopyBase.java | 145 ++ .../ElementTransformIdentity.java | 74 + .../syntaxtransform/ElementTransformSubst.java | 109 + .../syntaxtransform/ElementTransformer.java | 289 +++ .../ExprTransformApplyElementTransform.java | 52 + .../ExprTransformNodeElement.java | 78 + .../syntaxtransform/NodeTransformSubst.java | 42 + .../syntaxtransform/QueryTransformOps.java | 238 ++ .../syntaxtransform/TransformElementLib.java | 61 + .../syntaxtransform/UpdateTransformOps.java | 209 ++ .../org/apache/jena/sparql/util/Context.java | 27 +- .../apache/jena/sparql/util/LabelToNodeMap.java | 2 +- .../org/apache/jena/sparql/util/Version.java | 148 -- .../jena/sparql/util/graph/GraphList.java | 4 +- .../src/main/java/riotcmd/CmdLangParse.java | 29 +- jena-arq/src/main/java/riotcmd/infer.java | 7 +- jena-arq/src/test/java/arq/TestCmdLine.java | 5 +- jena-arq/src/test/java/arq/qtest.java | 8 +- .../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 +- .../java/org/apache/jena/sparql/TC_General.java | 4 +- .../jena/sparql/algebra/TestOpAsQuery.java | 333 ++- .../algebra/optimize/TS_Optimization.java | 1 + .../TestTransformEliminateAssignments.java | 744 ++++++ .../sparql/core/AbstractDatasetGraphTests.java | 6 +- .../apache/jena/sparql/core/TestContext.java | 27 +- .../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 +- .../jena/sparql/syntax/TS_Serialization.java | 30 - .../apache/jena/sparql/syntax/TS_Syntax.java | 37 + .../syntaxtransform/TestFlattenSyntax.java | 120 + .../syntax/syntaxtransform/TestQueryOps.java | 59 + .../syntaxtransform/TestSubstitution.java | 93 + .../org/apache/jena/sparql/util/TS_Util.java | 1 - .../apache/jena/sparql/util/TestFmtUtils.java | 8 +- .../apache/jena/sparql/util/TestVersion.java | 14 +- jena-arq/src/test/java/riotcmd/rdflangtest.java | 10 +- 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 + jena-base/src/main/java/jena/cmd/Arg.java | 69 + jena-base/src/main/java/jena/cmd/ArgDecl.java | 93 + jena-base/src/main/java/jena/cmd/ArgModule.java | 26 + .../main/java/jena/cmd/ArgModuleGeneral.java | 25 + jena-base/src/main/java/jena/cmd/ArgProc.java | 27 + .../src/main/java/jena/cmd/CmdArgModule.java | 70 + .../src/main/java/jena/cmd/CmdException.java | 30 + .../src/main/java/jena/cmd/CmdGeneral.java | 92 + .../src/main/java/jena/cmd/CmdLineArgs.java | 413 ++++ jena-base/src/main/java/jena/cmd/CmdMain.java | 108 + .../src/main/java/jena/cmd/CommandLineBase.java | 136 ++ jena-base/src/main/java/jena/cmd/ModBase.java | 23 + .../src/main/java/jena/cmd/ModGeneral.java | 57 + .../src/main/java/jena/cmd/ModVersion.java | 67 + .../java/jena/cmd/TerminationException.java | 31 + jena-base/src/main/java/jena/cmd/Usage.java | 102 + .../src/main/java/jena/cmd/package-info.java | 6 + .../apache/jena/atlas/lib/ActionKeyValue.java | 2 +- .../java/org/apache/jena/atlas/lib/Bytes.java | 4 +- .../org/apache/jena/atlas/lib/ListUtils.java | 2 +- .../apache/jena/atlas/lib/PropertyUtils.java | 27 +- .../java/org/apache/jena/atlas/lib/Version.java | 139 ++ .../org/apache/jena/atlas/logging/LogCtl.java | 42 +- jena-core/pom.xml | 509 ++-- jena-core/src/main/java/jena/rdfcat.java | 14 +- jena-core/src/main/java/jena/rdfcompare.java | 2 +- jena-core/src/main/java/jena/rdfcopy.java | 2 +- jena-core/src/main/java/jena/rdfparse.java | 2 +- jena-core/src/main/java/jena/schemagen.java | 2 +- jena-core/src/main/java/jena/version.java | 2 +- .../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 +- .../jena/ontology/CardinalityQRestriction.java | 3 +- .../java/org/apache/jena/rdf/model/AnonId.java | 121 +- .../apache/jena/rdf/model/impl/ModelCom.java | 4 +- .../rdf/model/impl/RDFDefaultErrorHandler.java | 9 +- .../apache/jena/rdf/model/impl/ReifierStd.java | 2 +- .../jena/rdf/model/impl/ResourceImpl.java | 13 +- .../apache/jena/rdfxml/xmlinput/JenaReader.java | 2 +- .../jena/rdfxml/xmloutput/impl/Unparser.java | 9 +- .../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 +- .../jena/shared/AccessDeniedException.java | 56 + .../apache/jena/shared/AddDeniedException.java | 44 +- .../shared/AuthenticationRequiredException.java | 45 + .../jena/shared/CannotCreateException.java | 2 +- .../jena/shared/DeleteDeniedException.java | 44 +- .../jena/shared/OperationDeniedException.java | 31 + .../apache/jena/shared/ReadDeniedException.java | 57 + .../jena/shared/UpdateDeniedException.java | 74 +- .../util/iterator/EarlyBindingIterator.java | 38 - .../jena/util/iterator/LateBindingIterator.java | 75 - .../apache/jena/util/iterator/LazyIterator.java | 49 +- .../util/iterator/UniqueExtendedIterator.java | 93 - .../src/test/java/jena/test/Test_rdfcat.java | 11 + .../jena/assembler/test/TestAssemblerGroup.java | 12 +- .../jena/assembler/test/TestAssemblerHelp.java | 12 +- .../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 +- .../java/org/apache/jena/test/TestPackage.java | 9 +- .../jena/testing_framework/NodeCreateUtils.java | 20 +- .../jena/testing_framework/TestFileData.java | 36 +- jena-elephas/jena-elephas-common/pom.xml | 13 +- .../hadoop/rdf/types/NodeTupleWritable.java | 2 +- jena-elephas/jena-elephas-io/pom.xml | 21 +- jena-elephas/jena-elephas-mapreduce/pom.xml | 31 +- jena-elephas/pom.xml | 52 +- .../arq/querybuilder/AbstractQueryBuilder.java | 1 + .../arq/querybuilder/handlers/WhereHandler.java | 23 +- .../jena/arq/AbstractRegexpBasedTest.java | 7 +- .../arq/querybuilder/SelectBuilderTest.java | 32 +- .../querybuilder/clauses/WhereClauseTest.java | 66 +- .../handlers/PrologHandlerTest.java | 12 +- .../querybuilder/handlers/WhereHandlerTest.java | 82 +- jena-extras/pom.xml | 2 +- .../java/org/apache/jena/fuseki/FusekiCmd.java | 4 +- jena-fuseki2/apache-jena-fuseki/fuseki | 27 +- .../main/java/org/apache/jena/fuseki/DEF.java | 6 +- .../org/apache/jena/fuseki/build/Builder.java | 2 +- .../apache/jena/fuseki/build/FusekiConfig.java | 45 +- .../org/apache/jena/fuseki/cmd/FusekiCmd.java | 4 +- .../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 | 157 +- .../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 +- .../java/org/apache/jena/fuseki/mgt/Backup.java | 2 +- .../org/apache/jena/fuseki/mgt/MgtConst.java | 11 +- .../apache/jena/fuseki/server/FusekiEnv.java | 2 +- .../apache/jena/fuseki/server/FusekiServer.java | 2 +- .../apache/jena/fuseki/servlets/ActionBase.java | 4 +- .../src/main/webapp/WEB-INF/web.xml | 12 +- .../java/org/apache/jena/fuseki/ServerTest.java | 2 + .../java/org/apache/jena/fuseki/TestAdmin.java | 73 +- .../jdbc/mem/metadata/MemDatasetMetadata.java | 10 +- .../remote/metadata/RemoteEndpointMetadata.java | 12 +- .../jdbc/tdb/metadata/TDBDatasetMetadata.java | 12 +- jena-maven-tools/pom.xml | 8 +- jena-parent/pom.xml | 54 +- jena-permissions/pom.xml | 4 + .../permissions/example/ExampleEvaluator.java | 59 +- .../example/ShiroExampleEvaluator.java | 69 +- .../jena/permissions/AccessDeniedException.java | 66 - .../apache/jena/permissions/SecuredItem.java | 241 ++ .../jena/permissions/SecurityEvaluator.java | 380 +-- .../permissions/SecurityEvaluatorAssembler.java | 2 +- .../permissions/graph/SecuredCapabilities.java | 14 +- .../jena/permissions/graph/SecuredGraph.java | 68 +- .../graph/SecuredGraphEventManager.java | 55 +- .../permissions/graph/SecuredPrefixMapping.java | 57 +- .../graph/impl/SecuredGraphImpl.java | 5 +- .../impl/CachedSecurityEvaluator.java | 18 +- .../jena/permissions/impl/ItemHolder.java | 1 + .../jena/permissions/impl/SecuredItem.java | 185 -- .../jena/permissions/impl/SecuredItemImpl.java | 349 ++- .../permissions/impl/SecuredItemInvoker.java | 2 + .../jena/permissions/model/SecuredAlt.java | 117 +- .../permissions/model/SecuredContainer.java | 103 +- .../jena/permissions/model/SecuredLiteral.java | 83 +- .../jena/permissions/model/SecuredModel.java | 688 +++--- .../jena/permissions/model/SecuredProperty.java | 6 +- .../jena/permissions/model/SecuredRDFList.java | 144 +- .../jena/permissions/model/SecuredRDFNode.java | 16 +- .../model/SecuredReifiedStatement.java | 7 +- .../jena/permissions/model/SecuredResource.java | 154 +- .../jena/permissions/model/SecuredSeq.java | 153 +- .../permissions/model/SecuredStatement.java | 128 +- ...SecuredUnsupportedPolymorphismException.java | 5 + .../model/impl/SecuredModelImpl.java | 2215 +++++++----------- .../model/impl/SecuredRDFListImpl.java | 67 +- .../model/impl/SecuredRSIterator.java | 7 +- .../model/impl/SecuredResourceImpl.java | 13 +- .../permissions/model/impl/SecuredSelector.java | 19 +- .../model/impl/SecuredStatementImpl.java | 6 +- .../permissions/query/SecuredQueryEngine.java | 25 +- .../permissions/query/rewriter/OpRewriter.java | 20 +- .../query/rewriter/SecuredFunction.java | 34 +- .../permissions/utils/PermStatementFilter.java | 10 +- .../permissions/utils/PermTripleFilter.java | 12 +- .../permissions/utils/RDFListSecFilter.java | 6 +- .../jena/permissions/MockSecurityEvaluator.java | 30 +- .../ModelBasedSecurityEvaluator.java | 20 +- .../jena/permissions/SecuredAssemblerTest.java | 1 - .../permissions/StaticSecurityEvaluator.java | 39 +- .../graph/CachedSecurityEvaluatorTest.java | 8 +- .../graph/CrossIDGraphEventManagerTest.java | 20 +- .../graph/GraphEventManagerTest.java | 58 +- .../jena/permissions/graph/MemGraphTest.java | 221 +- .../graph/RecordingGraphListener.java | 55 +- .../graph/SecuredPrefixMappingTest.java | 332 +-- .../jena/permissions/graph/TDBGraphTest.java | 20 +- .../permissions/impl/SecuredItemImplTest.java | 232 ++ .../jena/permissions/model/SecuredAltTest.java | 554 ++--- .../jena/permissions/model/SecuredBagTest.java | 13 +- .../permissions/model/SecuredContainerTest.java | 392 ++-- .../permissions/model/SecuredLiteralTest.java | 405 ++-- .../model/SecuredModelDetailTest.java | 457 ++-- .../permissions/model/SecuredModelTest.java | 1741 +++++--------- .../permissions/model/SecuredPropertyTest.java | 40 +- .../permissions/model/SecuredRDFListTest.java | 806 +++---- .../permissions/model/SecuredRDFNodeTest.java | 112 +- .../model/SecuredReifiedStatementTest.java | 42 +- .../permissions/model/SecuredResourceTest.java | 717 ++---- .../jena/permissions/model/SecuredSeqTest.java | 860 +++---- .../permissions/model/SecuredStatementTest.java | 546 ++--- .../jena/permissions/query/DataSetTest.java | 203 +- .../jena/permissions/query/QueryEngineTest.java | 96 +- .../query/rewriter/OpRewriterTest.java | 128 +- .../apache/jena/sdb/layout1/CodecSimple.java | 4 +- .../org/apache/jena/sdb/layout2/SQLBridge2.java | 13 +- .../org/apache/jena/sdb/script/CmdDesc.java | 3 +- jena-sdb/src/main/java/sdb/SDBCmd.java | 3 +- jena-sdb/src/main/java/sdb/cmd/CmdArgsDB.java | 17 +- jena-sdb/src/main/java/sdb/cmd/ModConfig.java | 8 +- jena-sdb/src/main/java/sdb/cmd/ModData.java | 12 +- .../src/main/java/sdb/cmd/ModDatasetStore.java | 10 +- jena-sdb/src/main/java/sdb/cmd/ModGraph.java | 9 +- jena-sdb/src/main/java/sdb/cmd/ModLogSQL.java | 11 +- jena-sdb/src/main/java/sdb/cmd/ModStore.java | 11 +- jena-sdb/src/main/java/sdb/sdbconfig.java | 4 +- jena-sdb/src/main/java/sdb/sdbdelete.java | 4 +- jena-sdb/src/main/java/sdb/sdbdump.java | 4 +- jena-sdb/src/main/java/sdb/sdbinfo.java | 4 +- jena-sdb/src/main/java/sdb/sdbload.java | 4 +- jena-sdb/src/main/java/sdb/sdbmeta.java | 8 +- jena-sdb/src/main/java/sdb/sdbprint.java | 6 +- jena-sdb/src/main/java/sdb/sdbquery.java | 4 +- jena-sdb/src/main/java/sdb/sdbsql.java | 6 +- jena-sdb/src/main/java/sdb/sdbtruncate.java | 6 +- jena-sdb/src/main/java/sdb/sdbtuple.java | 10 +- jena-sdb/src/test/java/sdb/DBTest.java | 4 +- jena-sdb/src/test/java/sdb/sdbtest.java | 4 +- .../src/main/java/jena/spatialindexdump.java | 4 +- .../src/main/java/jena/spatialindexer.java | 4 +- .../spatial/SpatialDocProducerTriples.java | 3 + .../jena/query/spatial/SpatialQueryFuncs.java | 3 +- jena-tdb/bin/tdbloader2 | 47 - jena-tdb/bin/tdbloader2worker | 154 -- .../java/org/apache/jena/tdb/lib/DumpOps.java | 3 +- .../store/bulkloader2/CmdNodeTableBuilder.java | 8 +- .../jena/tdb/store/nodetable/NodecLib.java | 3 +- .../jena/tdb/store/nodetable/NodecSSE.java | 3 +- jena-tdb/src/main/java/tdb/cmdline/CmdSub.java | 2 +- .../src/main/java/tdb/cmdline/CmdTDBGraph.java | 5 +- .../src/main/java/tdb/cmdline/ModLocation.java | 12 +- .../src/main/java/tdb/cmdline/ModModel.java | 11 +- .../main/java/tdb/cmdline/ModTDBAssembler.java | 8 +- .../main/java/tdb/cmdline/ModTDBDataset.java | 10 +- jena-tdb/src/main/java/tdb/tdbconfig.java | 4 +- jena-tdb/src/main/java/tdb/tdbloader.java | 6 +- jena-tdb/src/main/java/tdb/tools/dumpbpt.java | 5 +- .../src/main/java/tdb/tools/dumpnodetable.java | 5 +- .../jena/tdb/store/nodetable/TestCodec.java | 9 +- jena-text/pom.xml | 7 +- jena-text/src/main/java/jena/textindexdump.java | 4 +- jena-text/src/main/java/jena/textindexer.java | 4 +- .../jena/query/text/DatasetGraphText.java | 2 +- .../java/org/apache/jena/query/text/Entity.java | 19 +- .../jena/query/text/EntityDefinition.java | 9 + .../jena/query/text/TextDocProducerTriples.java | 27 +- .../org/apache/jena/query/text/TextHit.java | 10 +- .../jena/query/text/TextHitConverter.java | 11 +- .../org/apache/jena/query/text/TextIndex.java | 5 +- .../apache/jena/query/text/TextIndexConfig.java | 9 + .../apache/jena/query/text/TextIndexLucene.java | 81 +- .../apache/jena/query/text/TextIndexSolr.java | 21 +- .../apache/jena/query/text/TextQueryFuncs.java | 15 +- .../org/apache/jena/query/text/TextQueryPF.java | 47 +- .../assembler/EntityDefinitionAssembler.java | 5 + .../assembler/TextIndexLuceneAssembler.java | 11 + .../jena/query/text/assembler/TextVocab.java | 2 + ...tasetWithLuceneTextIndexDeletionSupport.java | 53 + .../AbstractTestDatasetWithTextIndexBase.java | 56 +- .../org/apache/jena/query/text/TS_Text.java | 4 +- ...tDatasetWithLuceneMultilingualTextIndex.java | 2 +- .../TestDatasetWithLuceneStoredLiterals.java | 248 ++ ...tasetWithLuceneTextIndexDeletionSupport.java | 109 + ...DatasetWithLuceneTextIndexWithLangField.java | 2 +- .../text/TestLuceneWithMultipleThreads.java | 2 +- .../assembler/TestTextDatasetAssembler.java | 6 + pom.xml | 2 +- 488 files changed, 18522 insertions(+), 13332 deletions(-) ----------------------------------------------------------------------
