Merge branch 'upstream/master' into upstream/jena-text-triple-deletion
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/bb1c4601 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/bb1c4601 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/bb1c4601 Branch: refs/heads/master Commit: bb1c46013b1ec775900c547d2544c4296e24af27 Parents: dfe1e9b 26c97e6 Author: Alexis Miara <[email protected]> Authored: Mon May 4 11:50:18 2015 -0400 Committer: Alexis Miara <[email protected]> Committed: Mon May 4 11:50:18 2015 -0400 ---------------------------------------------------------------------- apache-jena/pom.xml | 13 - jena-arq/Grammar/arq.jj | 8 +- jena-arq/Grammar/master.jj | 21 +- jena-arq/Grammar/sparql_11.jj | 8 +- 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 | 3 +- jena-arq/src/main/java/arq/cmd/CmdLineArgs.java | 412 ++++++++++++++++++ jena-arq/src/main/java/arq/cmd/CmdMain.java | 114 +++++ jena-arq/src/main/java/arq/cmd/CmdUtils.java | 34 -- .../src/main/java/arq/cmd/CommandLineBase.java | 137 ++++++ jena-arq/src/main/java/arq/cmd/Usage.java | 105 +++++ jena-arq/src/main/java/arq/cmdline/Arg.java | 69 ---- jena-arq/src/main/java/arq/cmdline/ArgDecl.java | 97 ----- .../src/main/java/arq/cmdline/ArgModule.java | 26 -- .../main/java/arq/cmdline/ArgModuleGeneral.java | 26 -- jena-arq/src/main/java/arq/cmdline/ArgProc.java | 27 -- .../main/java/arq/cmdline/CallbackVersion.java | 24 -- jena-arq/src/main/java/arq/cmdline/CmdARQ.java | 1 + .../src/main/java/arq/cmdline/CmdArgModule.java | 68 --- .../src/main/java/arq/cmdline/CmdGeneral.java | 5 +- .../src/main/java/arq/cmdline/CmdLineArgs.java | 413 ------------------- .../src/main/java/arq/cmdline/CmdLineTest.java | 39 -- jena-arq/src/main/java/arq/cmdline/CmdMain.java | 116 ------ .../main/java/arq/cmdline/CommandLineBase.java | 137 ------ .../src/main/java/arq/cmdline/ModAlgebra.java | 3 + .../src/main/java/arq/cmdline/ModAssembler.java | 4 +- jena-arq/src/main/java/arq/cmdline/ModBase.java | 2 + .../java/arq/cmdline/ModDatasetAssembler.java | 3 +- .../java/arq/cmdline/ModDatasetGeneral.java | 4 +- .../arq/cmdline/ModDatasetGeneralAssembler.java | 1 + .../src/main/java/arq/cmdline/ModEngine.java | 4 +- .../src/main/java/arq/cmdline/ModFormat.java | 7 +- .../src/main/java/arq/cmdline/ModGeneral.java | 3 + .../main/java/arq/cmdline/ModGraphStore.java | 1 + jena-arq/src/main/java/arq/cmdline/ModItem.java | 3 + .../main/java/arq/cmdline/ModLangOutput.java | 2 +- .../src/main/java/arq/cmdline/ModLangParse.java | 2 +- .../src/main/java/arq/cmdline/ModQueryIn.java | 3 +- .../src/main/java/arq/cmdline/ModQueryOut.java | 3 + .../src/main/java/arq/cmdline/ModRemote.java | 4 + .../src/main/java/arq/cmdline/ModResultsIn.java | 2 +- .../main/java/arq/cmdline/ModResultsOut.java | 3 + .../src/main/java/arq/cmdline/ModSymbol.java | 3 + jena-arq/src/main/java/arq/cmdline/ModTime.java | 3 + .../src/main/java/arq/cmdline/ModVersion.java | 3 + jena-arq/src/main/java/arq/cmdline/Usage.java | 105 ----- jena-arq/src/main/java/arq/juuid.java | 4 +- jena-arq/src/main/java/arq/load.java | 2 +- jena-arq/src/main/java/arq/qexpr.java | 8 +- jena-arq/src/main/java/arq/qparse.java | 2 +- jena-arq/src/main/java/arq/query.java | 2 +- jena-arq/src/main/java/arq/rupdate.java | 2 +- jena-arq/src/main/java/arq/sse.java | 2 +- jena-arq/src/main/java/arq/sse_query.java | 2 +- jena-arq/src/main/java/arq/uparse.java | 53 ++- jena-arq/src/main/java/arq/update.java | 2 +- .../main/java/org/apache/jena/query/Syntax.java | 6 +- .../org/apache/jena/riot/lang/LangEngine.java | 9 +- .../apache/jena/riot/tokens/TokenizerText.java | 98 ++--- .../apache/jena/sparql/graph/GraphMemPlain.java | 6 +- .../apache/jena/sparql/lang/arq/ARQParser.java | 384 +++++++++-------- .../sparql/lang/sparql_11/SPARQLParser11.java | 140 ++++--- .../sparql/util/graph/GraphContainerUtils.java | 6 +- jena-arq/src/main/java/riotcmd/infer.java | 2 +- jena-arq/src/test/java/arq/TestCmdLine.java | 4 +- jena-arq/src/test/java/arq/qtest.java | 2 +- .../apache/jena/riot/tokens/TestTokenizer.java | 45 +- jena-arq/src/test/java/riotcmd/rdflangtest.java | 2 +- .../jena/atlas/iterator/PeekIterator.java | 2 +- .../java/org/apache/jena/atlas/lib/IRILib.java | 7 +- .../jena/atlas/lib/TestFilenameProcessing.java | 135 +++--- jena-core/src/main/java/jena/schemagen.java | 46 ++- .../org/apache/jena/assembler/Assembler.java | 3 - .../apache/jena/assembler/AssemblerHelp.java | 12 +- .../apache/jena/assembler/ModelExpansion.java | 2 +- .../assembler/assemblers/AssemblerBase.java | 17 +- .../assembler/assemblers/AssemblerGroup.java | 2 +- .../assemblers/FileModelAssembler.java | 109 ----- .../assembler/assemblers/ModelAssembler.java | 26 +- .../java/org/apache/jena/graph/GraphUtil.java | 30 +- .../main/java/org/apache/jena/graph/Node.java | 126 ------ .../java/org/apache/jena/graph/Node_URI.java | 4 +- .../main/java/org/apache/jena/graph/Triple.java | 40 +- .../jena/graph/compose/CompositionBase.java | 47 +-- .../apache/jena/graph/impl/CollectionGraph.java | 21 +- .../org/apache/jena/graph/impl/FileGraph.java | 207 ---------- .../apache/jena/graph/impl/FileGraphMaker.java | 224 ---------- .../graph/impl/FileGraphTransactionHandler.java | 81 ---- .../apache/jena/graph/impl/GraphMatcher.java | 34 +- .../apache/jena/mem/GraphTripleStoreBase.java | 6 +- .../org/apache/jena/mem/NodeToTriplesMap.java | 25 +- .../apache/jena/mem/NodeToTriplesMapMem.java | 11 +- .../java/org/apache/jena/ontology/OntTools.java | 12 +- .../jena/ontology/impl/AllDifferentImpl.java | 7 +- .../impl/BooleanClassDescriptionImpl.java | 2 +- .../jena/ontology/impl/DataRangeImpl.java | 2 +- .../jena/ontology/impl/EnumeratedClassImpl.java | 2 +- .../jena/ontology/impl/IndividualImpl.java | 2 +- .../apache/jena/ontology/impl/OntClassImpl.java | 17 +- .../apache/jena/ontology/impl/OntModelImpl.java | 76 +--- .../jena/ontology/impl/OntPropertyImpl.java | 17 +- .../jena/ontology/impl/OntResourceImpl.java | 107 +---- .../org/apache/jena/rdf/model/ModelFactory.java | 12 - .../java/org/apache/jena/rdf/model/RDFList.java | 5 +- .../org/apache/jena/rdf/model/Selector.java | 9 +- .../org/apache/jena/rdf/model/Statement.java | 27 +- .../jena/rdf/model/impl/IteratorFactory.java | 15 +- .../apache/jena/rdf/model/impl/ModelCom.java | 85 ++-- .../jena/rdf/model/impl/ModelReifier.java | 15 +- .../apache/jena/rdf/model/impl/RDFListImpl.java | 3 +- .../apache/jena/rdf/model/impl/ReifierStd.java | 10 +- .../org/apache/jena/rdf/model/impl/Util.java | 19 +- .../rdfxml/xmloutput/impl/BaseXMLWriter.java | 4 +- .../jena/rdfxml/xmloutput/impl/Relation.java | 27 +- .../jena/rdfxml/xmloutput/impl/Unparser.java | 101 ++--- .../jena/reasoner/rulesys/FBRuleInfGraph.java | 5 +- .../apache/jena/reasoner/rulesys/Functor.java | 9 +- .../rulesys/impl/ConsumerChoicePointFrame.java | 11 + .../jena/reasoner/rulesys/impl/FrameObject.java | 5 +- .../reasoner/rulesys/impl/LPInterpreter.java | 3 +- .../rulesys/impl/LPTopGoalIterator.java | 1 + .../jena/reasoner/rulesys/impl/SafeGraph.java | 11 +- .../rulesys/impl/TopLevelTripleMatchFrame.java | 2 + .../reasoner/rulesys/impl/TripleMatchFrame.java | 1 + .../jena/shared/impl/PrefixMappingImpl.java | 2 +- .../jena/util/iterator/ExtendedIterator.java | 8 +- .../org/apache/jena/util/iterator/Filter.java | 166 +++++--- .../jena/util/iterator/FilterDropIterator.java | 34 -- .../jena/util/iterator/FilterIterator.java | 14 +- .../jena/util/iterator/FilterKeepIterator.java | 34 -- .../apache/jena/util/iterator/LazyIterator.java | 9 +- .../org/apache/jena/util/iterator/Map1.java | 17 +- .../apache/jena/util/iterator/Map1Iterator.java | 7 +- .../apache/jena/util/iterator/NiceIterator.java | 12 +- .../apache/jena/util/iterator/UniqueFilter.java | 5 +- .../jena/assembler/test/TestAssemblers.java | 1 - .../test/TestBuiltinAssemblerGroup.java | 2 - .../assembler/test/TestFileModelAssembler.java | 282 ------------- .../apache/jena/graph/test/TestFileGraph.java | 194 --------- .../jena/graph/test/TestFileGraphMaker.java | 111 ----- .../jena/graph/test/TestFindLiterals.java | 9 +- .../org/apache/jena/graph/test/TestNode.java | 2 +- .../org/apache/jena/graph/test/TestPackage.java | 2 - .../org/apache/jena/graph/test/TestTriple.java | 12 +- .../apache/jena/graph/test/TestTripleField.java | 23 +- .../apache/jena/ontology/impl/TestOntTools.java | 5 +- .../apache/jena/rdf/model/test/TestList.java | 9 +- .../jena/rdf/model/test/TestResources.java | 6 +- .../jena/rdf/model/test/TestStatements.java | 11 +- .../rulesys/impl/TestLPBRuleEngineLeak.java | 171 ++++++++ .../jena/reasoner/rulesys/test/TestPackage.java | 4 + .../org/apache/jena/util/TestOneToManyMap.java | 4 +- .../java/org/apache/jena/util/TestUtil.java | 2 +- .../jena/util/iterator/test/TestFilters.java | 82 +--- .../util/iterator/test/TestMapIterators.java | 8 +- .../util/iterator/test/TestResourceUtils.java | 3 + .../propertytable/graph/GraphPropertyTable.java | 10 +- .../arq/querybuilder/handlers/WhereHandler.java | 3 + .../jena/arq/AbstractRegexpBasedTest.java | 1 + .../querybuilder/handlers/WhereHandlerTest.java | 33 +- .../java/org/apache/jena/fuseki/FusekiCmd.java | 2 +- jena-fuseki2/jena-fuseki-core/fuseki-dev | 6 +- .../apache/jena/fuseki/build/FusekiConfig.java | 4 +- .../org/apache/jena/fuseki/cmd/FusekiCmd.java | 14 +- .../apache/jena/fuseki/server/FusekiServer.java | 2 +- .../jena/fuseki/server/templates/config-tdb | 5 - .../jena/fuseki/server/templates/config-tdb-dir | 5 - .../jena/fuseki/server/templates/config-tdb-mem | 5 - .../model/impl/SecuredContainerImpl.java | 23 +- .../model/impl/SecuredLiteralImpl.java | 15 +- .../model/impl/SecuredModelImpl.java | 12 +- .../model/impl/SecuredNodeIterator.java | 14 +- .../model/impl/SecuredRDFListImpl.java | 29 +- .../model/impl/SecuredRSIterator.java | 19 +- .../model/impl/SecuredResIterator.java | 14 +- .../permissions/model/impl/SecuredSeqImpl.java | 7 +- .../model/impl/SecuredStatementIterator.java | 14 +- .../jena/permissions/utils/ContainerFilter.java | 7 +- .../permissions/utils/PermStatementFilter.java | 6 +- .../permissions/utils/PermTripleFilter.java | 6 +- .../permissions/utils/RDFListSecFilter.java | 6 +- .../org/apache/jena/sdb/script/CmdDesc.java | 2 +- jena-sdb/src/main/java/sdb/SDBCmd.java | 2 +- jena-sdb/src/main/java/sdb/cmd/CmdArgsDB.java | 2 +- jena-sdb/src/main/java/sdb/cmd/ModConfig.java | 2 + jena-sdb/src/main/java/sdb/cmd/ModData.java | 6 +- .../src/main/java/sdb/cmd/ModDatasetStore.java | 8 +- jena-sdb/src/main/java/sdb/cmd/ModGraph.java | 6 +- jena-sdb/src/main/java/sdb/cmd/ModLogSQL.java | 8 +- jena-sdb/src/main/java/sdb/cmd/ModStore.java | 8 +- jena-sdb/src/main/java/sdb/sdbconfig.java | 2 +- jena-sdb/src/main/java/sdb/sdbdelete.java | 2 +- jena-sdb/src/main/java/sdb/sdbdump.java | 2 +- jena-sdb/src/main/java/sdb/sdbinfo.java | 2 +- jena-sdb/src/main/java/sdb/sdbload.java | 2 +- jena-sdb/src/main/java/sdb/sdbmeta.java | 6 +- jena-sdb/src/main/java/sdb/sdbprint.java | 4 +- jena-sdb/src/main/java/sdb/sdbquery.java | 2 +- jena-sdb/src/main/java/sdb/sdbsql.java | 4 +- jena-sdb/src/main/java/sdb/sdbtruncate.java | 4 +- jena-sdb/src/main/java/sdb/sdbtuple.java | 6 +- jena-sdb/src/test/java/sdb/DBTest.java | 2 +- jena-sdb/src/test/java/sdb/sdbtest.java | 2 +- .../src/main/java/jena/spatialindexdump.java | 2 +- .../src/main/java/jena/spatialindexer.java | 4 +- .../java/org/apache/jena/tdb/TDBLoader.java | 61 +-- .../java/org/apache/jena/tdb/lib/DumpOps.java | 2 +- .../jena/tdb/store/bulkloader/BulkLoader.java | 72 ++-- .../store/bulkloader2/CmdNodeTableBuilder.java | 30 +- jena-tdb/src/main/java/tdb/cmdline/CmdSub.java | 2 +- .../src/main/java/tdb/cmdline/CmdTDBGraph.java | 4 +- .../src/main/java/tdb/cmdline/ModLocation.java | 8 +- .../src/main/java/tdb/cmdline/ModModel.java | 6 +- .../main/java/tdb/cmdline/ModTDBAssembler.java | 6 +- .../main/java/tdb/cmdline/ModTDBDataset.java | 4 +- .../main/java/tdb/cmdline/ModTDBGraphStore.java | 2 +- jena-tdb/src/main/java/tdb/tdbloader.java | 18 +- jena-text/src/main/java/jena/textindexdump.java | 2 +- jena-text/src/main/java/jena/textindexer.java | 2 +- 224 files changed, 2636 insertions(+), 4198 deletions(-) ----------------------------------------------------------------------
