Merge branch 'master' into eliminate-assignments Bring eliminate-assignments up to date with master
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e1a83576 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e1a83576 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e1a83576 Branch: refs/heads/eliminate-assignments Commit: e1a8357697948c5e43f81033d47ef0840061c1db Parents: 62dfb5a 4554915 Author: Rob Vesse <rve...@apache.org> Authored: Mon Nov 10 10:51:47 2014 +0000 Committer: Rob Vesse <rve...@apache.org> Committed: Mon Nov 10 10:51:47 2014 +0000 ---------------------------------------------------------------------- apache-jena-libs/pom.xml | 12 +- apache-jena/assembly-jena-zip.xml | 11 - apache-jena/jena-log4j.properties | 16 + apache-jena/pom.xml | 71 +- jena-arq/.gitattributes | 17 +- jena-arq/Grammar/.gitignore | 4 + jena-arq/Grammar/BinaryRDF.thrift | 18 + jena-arq/Grammar/Final/jj2html_11 | 16 + jena-arq/Grammar/JSON/json | 16 + jena-arq/Grammar/Notes | 2 + jena-arq/Grammar/XMLchars.txt | 56 - jena-arq/Grammar/arq.jj | 247 +-- jena-arq/Grammar/gen-thrift | 1 + jena-arq/Grammar/grammar | 20 +- jena-arq/Grammar/grammarExtracts | 16 + jena-arq/Grammar/header.jj | 18 + jena-arq/Grammar/jj2html | 16 + jena-arq/Grammar/jj2tokens | 2 + jena-arq/Grammar/master.jj | 28 +- jena-arq/Grammar/sparql2html | 1 + jena-arq/Grammar/sparql_11.jj | 208 +- jena-arq/Grammar/sse/grammar-sse | 16 + jena-arq/Grammar/sse/jj2html | 922 ++++----- jena-arq/Grammar/sse/sse.jj | 490 ++--- jena-arq/Grammar/sse/tokens.inc | 334 ++-- jena-arq/Grammar/tokens2bnf | 88 +- jena-arq/bat/make_classpath.bat | 20 + jena-arq/etc/dataset-db.ttl | 16 + jena-arq/etc/dataset-owl-inf.ttl | 16 + jena-arq/etc/dataset-owl.ttl | 16 + jena-arq/etc/dataset-rdfs.ttl | 16 + jena-arq/etc/dataset-rules.ttl | 16 + jena-arq/etc/dataset-trans.ttl | 16 + jena-arq/etc/dataset.ttl | 16 + jena-arq/etc/graphstore.ttl | 16 + jena-arq/etc/update-data.ttl | 16 + jena-arq/log4j.properties | 16 + jena-arq/pom.xml | 14 +- .../main/java/arq/cmdline/ModLangOutput.java | 4 +- .../hp/hpl/jena/sparql/algebra/Transformer.java | 1 - .../jena/sparql/algebra/optimize/Optimize.java | 2 +- .../optimize/TransformExtendCombine.java | 9 +- .../sparql/core/DatasetGraphCollection.java | 2 +- .../java/com/hp/hpl/jena/sparql/core/Quad.java | 6 +- .../engine/iterator/QueryIterNullIterator.java | 2 +- .../optimizer/reorder/ReorderFixedAlt.java | 80 + .../com/hp/hpl/jena/sparql/expr/E_Scalar.java | 0 .../jena/sparql/expr/aggregate/AggCustom.java | 91 + .../hpl/jena/sparql/expr/aggregate/AggNull.java | 2 +- .../expr/aggregate/AggregatorFactory.java | 68 +- .../hpl/jena/sparql/lang/ParserARQUpdate.java | 5 +- .../jena/sparql/lang/ParserSPARQL11Update.java | 28 +- .../hp/hpl/jena/sparql/lang/SPARQLParser.java | 3 - .../hp/hpl/jena/sparql/lang/UpdateParser.java | 18 +- .../hp/hpl/jena/sparql/lang/arq/ARQParser.java | 1399 +++++++------ .../sparql/lang/arq/ARQParserConstants.java | 416 ++-- .../sparql/lang/arq/ARQParserTokenManager.java | 1880 +++++++++--------- .../jena/sparql/lang/arq/JavaCharStream.java | 19 +- .../jena/sparql/lang/arq/ParseException.java | 47 +- .../com/hp/hpl/jena/sparql/lang/arq/Token.java | 19 +- .../hpl/jena/sparql/lang/arq/TokenMgrError.java | 21 +- .../sparql/lang/sparql_11/JavaCharStream.java | 19 +- .../sparql/lang/sparql_11/ParseException.java | 47 +- .../sparql/lang/sparql_11/SPARQLParser11.java | 464 ++--- .../lang/sparql_11/SPARQLParser11Constants.java | 402 ++-- .../sparql_11/SPARQLParser11TokenManager.java | 1822 +++++++++-------- .../hpl/jena/sparql/lang/sparql_11/Token.java | 19 +- .../sparql/lang/sparql_11/TokenMgrError.java | 21 +- .../modify/request/UpdateWriterVisitor.java | 18 + .../hp/hpl/jena/sparql/resultset/CSVInput.java | 1 - .../hpl/jena/sparql/util/NodeFactoryExtra.java | 73 +- .../apache/jena/atlas/RuntimeIOException.java | 34 + .../org/apache/jena/atlas/csv/CSVParser.java | 67 +- .../main/java/org/apache/jena/atlas/io/IO.java | 13 +- .../apache/jena/atlas/io/IndentedWriter.java | 6 +- .../org/apache/jena/atlas/iterator/Iter.java | 41 +- .../java/org/apache/jena/atlas/json/JSON.java | 19 +- .../org/apache/jena/atlas/json/JsonBuilder.java | 2 + .../org/apache/jena/atlas/json/JsonObject.java | 9 +- .../apache/jena/atlas/json/io/JsonWriter.java | 8 +- .../java/org/apache/jena/atlas/lib/FileOps.java | 236 ++- .../org/apache/jena/atlas/logging/LogCtl.java | 23 +- .../main/java/org/apache/jena/riot/Lang.java | 3 + .../java/org/apache/jena/riot/RDFFormat.java | 81 +- .../java/org/apache/jena/riot/RDFLanguages.java | 43 +- .../org/apache/jena/riot/RDFParserRegistry.java | 16 +- .../org/apache/jena/riot/RDFWriterRegistry.java | 76 +- .../java/org/apache/jena/riot/WebContent.java | 6 +- .../org/apache/jena/riot/lang/ReaderTriX.java | 440 ++++ .../java/org/apache/jena/riot/lang/TriX.java | 59 + .../apache/jena/riot/out/JenaRDF2JSONLD.java | 14 +- .../apache/jena/riot/system/StreamRDFLib.java | 6 +- .../jena/riot/system/StreamRDFWriter.java | 13 +- .../org/apache/jena/riot/thrift/BinRDF.java | 2 +- .../org/apache/jena/riot/web/HttpNames.java | 10 +- .../jena/riot/writer/StreamWriterTriX.java | 263 +++ .../org/apache/jena/riot/writer/WriterTriX.java | 91 + .../algebra/optimize/AbstractTestTransform.java | 16 +- .../sparql/algebra/optimize/TestOptimizer.java | 19 +- .../optimize/TestSemanticEquivalence.java | 16 +- .../jena/sparql/negation/TestGraphDeltas.java | 18 + .../hp/hpl/jena/sparql/util/TestFmtUtils.java | 18 + .../apache/jena/atlas/csv/TestCSVParser.java | 4 +- .../apache/jena/atlas/lib/TestAlarmClock.java | 5 +- .../java/org/apache/jena/riot/lang/TS_Lang.java | 4 + .../jena/riot/lang/TestCollectorStream.java | 18 + .../org/apache/jena/riot/lang/TestTriXBad.java | 76 + .../apache/jena/riot/lang/TestTriXReader.java | 126 ++ .../jena/riot/langsuite/UnitTestEval.java | 1 + .../riot/system/TestFormatRegistration.java | 3 + .../jena/riot/system/TestLangRegistration.java | 7 +- .../apache/jena/riot/writer/TS_RiotWriter.java | 1 + .../jena/riot/writer/TestRiotWriterDataset.java | 3 + .../jena/riot/writer/TestRiotWriterGraph.java | 8 +- .../apache/jena/riot/writer/TestTriXWriter.java | 78 + jena-arq/testing/RIOT/Lang/.gitattributes | 1 - jena-arq/testing/RIOT/Lang/TriX/trix-01.nq | 0 jena-arq/testing/RIOT/Lang/TriX/trix-01.trix | 4 + jena-arq/testing/RIOT/Lang/TriX/trix-02.nq | 0 jena-arq/testing/RIOT/Lang/TriX/trix-02.trix | 4 + jena-arq/testing/RIOT/Lang/TriX/trix-03.nq | 0 jena-arq/testing/RIOT/Lang/TriX/trix-03.trix | 7 + jena-arq/testing/RIOT/Lang/TriX/trix-04.nq | 1 + jena-arq/testing/RIOT/Lang/TriX/trix-04.trix | 9 + jena-arq/testing/RIOT/Lang/TriX/trix-05.nq | 1 + jena-arq/testing/RIOT/Lang/TriX/trix-05.trix | 10 + jena-arq/testing/RIOT/Lang/TriX/trix-06.nq | 1 + jena-arq/testing/RIOT/Lang/TriX/trix-06.trix | 10 + jena-arq/testing/RIOT/Lang/TriX/trix-10.nq | 6 + jena-arq/testing/RIOT/Lang/TriX/trix-10.trix | 36 + jena-arq/testing/RIOT/Lang/TriX/trix-11.nq | 1 + jena-arq/testing/RIOT/Lang/TriX/trix-11.trix | 13 + jena-arq/testing/RIOT/Lang/TriX/trix-12.nq | 1 + jena-arq/testing/RIOT/Lang/TriX/trix-12.trix | 14 + jena-arq/testing/RIOT/Lang/TriX/trix-13.nq | 1 + jena-arq/testing/RIOT/Lang/TriX/trix-13.trix | 13 + jena-arq/testing/RIOT/Lang/TriX/trix-14.nq | 1 + jena-arq/testing/RIOT/Lang/TriX/trix-14.trix | 20 + jena-arq/testing/RIOT/Lang/TriX/trix-15.nq | 3 + jena-arq/testing/RIOT/Lang/TriX/trix-15.trix | 21 + .../testing/RIOT/Lang/TriX/trix-bad-00.trix | 4 + .../testing/RIOT/Lang/TriX/trix-bad-01.trix | 6 + .../testing/RIOT/Lang/TriX/trix-bad-02.trix | 7 + .../testing/RIOT/Lang/TriX/trix-bad-03.trix | 8 + .../testing/RIOT/Lang/TriX/trix-bad-04.trix | 10 + .../testing/RIOT/Lang/TriX/trix-bad-05.trix | 11 + .../testing/RIOT/Lang/TriX/trix-bad-06.trix | 10 + .../testing/RIOT/Lang/TriX/trix-bad-07.trix | 7 + .../testing/RIOT/Lang/TriX/trix-bad-08.trix | 11 + .../testing/RIOT/Lang/TriX/trix-bad-09.trix | 11 + .../testing/RIOT/Lang/TriX/trix-bad-10.trix | 9 + jena-arq/testing/RIOT/Lang/TriX/trix-ex-1.trix | 26 + jena-arq/testing/RIOT/Lang/TriX/trix-ex-2.trix | 32 + jena-arq/testing/RIOT/Lang/TriX/trix-ex-3.trix | 30 + jena-arq/testing/RIOT/Lang/TriX/trix-ex-4.trix | 34 + jena-arq/testing/RIOT/Lang/TriX/trix-ex-5.trix | 42 + jena-core/Grammar/turtle | 16 + jena-core/etc/location-mapping.ex | 16 + jena-core/etc/schemagen_example.rdf | 16 + jena-core/pom.xml | 12 +- .../main/java/com/hp/hpl/jena/JenaRuntime.java | 55 + .../main/java/com/hp/hpl/jena/graph/Graph.java | 9 +- .../java/com/hp/hpl/jena/graph/GraphAdd.java | 37 - .../com/hp/hpl/jena/graph/compose/Delta.java | 43 +- .../hp/hpl/jena/graph/compose/Difference.java | 1 - .../hp/hpl/jena/graph/compose/Intersection.java | 4 +- .../hp/hpl/jena/graph/impl/GraphAddList.java | 65 - .../hp/hpl/jena/graph/impl/GraphMatcher.java | 28 +- jena-core/src/main/java/link2readme.html | 16 + jena-core/src/main/resources/etc/owl-b.rules | 16 + .../src/main/resources/etc/owl-fb-micro.rules | 16 + .../src/main/resources/etc/owl-fb-mini.rules | 16 + .../src/main/resources/etc/owl-fb-old.rules | 16 + jena-core/src/main/resources/etc/owl-fb.rules | 16 + jena-core/src/main/resources/etc/owl.rules | 16 + .../src/main/resources/etc/rdfs-b-tuned.rules | 16 + jena-core/src/main/resources/etc/rdfs-b.rules | 16 + .../main/resources/etc/rdfs-fb-lp-expt.rules | 16 + .../resources/etc/rdfs-fb-tgc-noresource.rules | 16 + .../main/resources/etc/rdfs-fb-tgc-simple.rules | 16 + .../src/main/resources/etc/rdfs-fb-tgc.rules | 16 + jena-core/src/main/resources/etc/rdfs-fb.rules | 16 + .../main/resources/etc/rdfs-noresource.rules | 16 + jena-core/src/main/resources/etc/rdfs.rules | 16 + .../src/main/resources/jena-log4j.properties | 16 + jena-core/src/main/resources/ont-policy.rdf | 16 + .../org/apache/jena/vocabulary/assembler.ttl | 16 + .../hpl/jena/graph/compose/test/TestDelta.java | 149 +- .../jena/graph/compose/test/TestDifference.java | 119 +- .../hpl/jena/graph/compose/test/TestDyadic.java | 5 +- .../graph/compose/test/TestIntersection.java | 138 +- .../jena/graph/compose/test/TestPackage.java | 9 +- .../hpl/jena/graph/compose/test/TestUnion.java | 120 +- .../java/com/hp/hpl/jena/test/TestPackage.java | 3 +- .../com/hp/hpl/jena/test/TestSystemSetup.java | 39 + .../testing/Turtle/RaptorTurtle/README.txt | 4 + .../testing/Turtle/RaptorTurtle/test-10.out | 4 +- jena-csv/LICENSE | 202 ++ jena-csv/NOTICE | 5 + jena-csv/ReleaseNotes.txt | 14 + jena-csv/pom.xml | 178 ++ .../org/apache/jena/propertytable/Column.java | 45 + .../jena/propertytable/PropertyTable.java | 126 ++ .../java/org/apache/jena/propertytable/Row.java | 75 + .../jena/propertytable/graph/GraphCSV.java | 62 + .../propertytable/graph/GraphPropertyTable.java | 203 ++ .../graph/QueryIterPropertyTable.java | 115 ++ .../graph/QueryIterPropertyTableRow.java | 243 +++ .../jena/propertytable/graph/RowMatch.java | 48 + .../graph/StageGeneratorPropertyTable.java | 57 + .../jena/propertytable/impl/ColumnImpl.java | 58 + .../impl/PropertyTableArrayImpl.java | 346 ++++ .../impl/PropertyTableBuilder.java | 136 ++ .../impl/PropertyTableHashMapImpl.java | 357 ++++ .../apache/jena/propertytable/lang/CSV2RDF.java | 33 + .../apache/jena/propertytable/lang/LangCSV.java | 155 ++ .../lang/ReaderRIOTFactoryCSV.java | 31 + .../propertytable/lang/ReaderRIOTLangCSV.java | 77 + .../apache/jena/propertytable/util/IRILib.java | 264 +++ jena-csv/src/main/java/riotcmdx/csv2rdf.java | 53 + .../jena/propertytable/AbstractColumnTest.java | 80 + .../AbstractPropertyTableTest.java | 57 + .../jena/propertytable/AbstractRowTest.java | 106 + .../org/apache/jena/propertytable/BaseTest.java | 47 + .../jena/propertytable/TS_PropertyTable.java | 42 + .../jena/propertytable/graph/GraphCSVTest.java | 156 ++ .../impl/AbstractPropertyTableBuilderTest.java | 139 ++ .../impl/PropertyTableArrayImplTest.java | 84 + .../PropertyTableBuilderForArrayImplTest.java | 39 + .../PropertyTableBuilderForHashMapImplTest.java | 34 + .../impl/PropertyTableHashMapImplTest.java | 46 + .../jena/propertytable/lang/TestLangCSV.java | 113 ++ .../HEFCE_organogram_senior_data_31032011.csv | 5 + .../test/resources/PLOSone-search-results.csv | 6 + jena-csv/src/test/resources/Palo_Alto_Trees.csv | 6 + jena-csv/src/test/resources/log4j.properties | 19 + jena-csv/src/test/resources/test.csv | 3 + jena-extras/jena-querybuilder/LICENSE | 202 ++ jena-extras/jena-querybuilder/README.md | 49 + .../jena-querybuilder/license-header.txt | 14 + jena-extras/jena-querybuilder/pom.xml | 56 + .../arq/querybuilder/AbstractQueryBuilder.java | 362 ++++ .../jena/arq/querybuilder/AskBuilder.java | 198 ++ .../jena/arq/querybuilder/ConstructBuilder.java | 244 +++ .../jena/arq/querybuilder/SelectBuilder.java | 281 +++ .../querybuilder/clauses/ConstructClause.java | 74 + .../arq/querybuilder/clauses/DatasetClause.java | 75 + .../arq/querybuilder/clauses/PrologClause.java | 105 + .../arq/querybuilder/clauses/SelectClause.java | 79 + .../clauses/SolutionModifierClause.java | 89 + .../arq/querybuilder/clauses/WhereClause.java | 153 ++ .../arq/querybuilder/clauses/package-info.java | 7 + .../querybuilder/handlers/ConstructHandler.java | 89 + .../querybuilder/handlers/DatasetHandler.java | 149 ++ .../jena/arq/querybuilder/handlers/Handler.java | 42 + .../querybuilder/handlers/PrologHandler.java | 126 ++ .../querybuilder/handlers/SelectHandler.java | 133 ++ .../handlers/SolutionModifierHandler.java | 269 +++ .../arq/querybuilder/handlers/WhereHandler.java | 310 +++ .../arq/querybuilder/handlers/package-info.java | 9 + .../jena/arq/querybuilder/package-info.java | 9 + .../rewriters/AbstractRewriter.java | 222 +++ .../querybuilder/rewriters/ElementRewriter.java | 213 ++ .../querybuilder/rewriters/ExprRewriter.java | 203 ++ .../rewriters/NodeValueRewriter.java | 96 + .../arq/querybuilder/rewriters/OpRewriter.java | 368 ++++ .../querybuilder/rewriters/PathRewriter.java | 163 ++ .../querybuilder/rewriters/package-info.java | 7 + .../jena/arq/AbstractRegexpBasedTest.java | 99 + .../querybuilder/AbstractQueryBuilderTest.java | 126 ++ .../querybuilder/AskBuilderContractTest.java | 53 + .../ConstructBuilderContractTest.java | 53 + .../querybuilder/SelectBuilderContractTest.java | 53 + .../arq/querybuilder/SelectBuilderTest.java | 132 ++ .../clauses/AbstractClauseTest.java | 58 + .../querybuilder/clauses/DatasetClauseTest.java | 150 ++ .../querybuilder/clauses/PrologClauseTest.java | 144 ++ .../querybuilder/clauses/SelectClauseTest.java | 170 ++ .../clauses/SolutionModifierTest.java | 175 ++ .../querybuilder/clauses/WhereClauseTest.java | 285 +++ .../handlers/AbstractHandlerTest.java | 44 + .../handlers/ConstructHandlerTest.java | 96 + .../handlers/DatasetHandlerTest.java | 126 ++ .../handlers/PrologHandlerTest.java | 109 + .../handlers/SelectHandlerTest.java | 152 ++ .../handlers/SolutionModifierHandlerTest.java | 201 ++ .../querybuilder/handlers/WhereHandlerTest.java | 296 +++ jena-extras/pom.xml | 135 ++ jena-fuseki/Data/books.ttl | 16 + jena-fuseki/Data/test_abox.ttl | 16 + jena-fuseki/Data/test_data_rdfs.ttl | 16 + jena-fuseki/Data/test_tbox.ttl | 16 + jena-fuseki/SEE_FUSEKI2 | 0 jena-fuseki/assembly-dist.xml | 4 +- jena-fuseki/config-tdb-text.ttl | 16 + jena-fuseki/dist/LICENSE | 548 +++++ jena-fuseki/dist/LICENSE-dist | 548 ----- jena-fuseki/dist/NOTICE | 216 ++ jena-fuseki/dist/NOTICE-dist | 216 -- jena-fuseki/fuseki-server.bat | 16 + jena-fuseki/jetty-fuseki.xml | 17 + jena-fuseki/make_cp_mvn | 16 + jena-fuseki/make_links | 3 +- jena-fuseki/pom.xml | 24 +- jena-fuseki/run_cp | 17 +- jena-fuseki/s-delete | 714 ++++++- jena-fuseki/s-get | 714 ++++++- jena-fuseki/s-head | 714 ++++++- jena-fuseki/s-post | 714 ++++++- jena-fuseki/s-put | 714 ++++++- jena-fuseki/s-query | 714 ++++++- jena-fuseki/s-update | 714 ++++++- jena-fuseki/s-update-form | 714 ++++++- .../dev/BackwardForwardDescribeFactory.java | 95 - jena-fuseki/src-dev/dev/DevFuseki.java | 149 -- jena-fuseki/src-dev/dev/RunFuseki.java | 2 +- .../java/org/apache/jena/fuseki/FusekiCmd.java | 13 +- .../java/org/apache/jena/fuseki/FusekiLib.java | 2 +- .../java/org/apache/jena/fuseki/HttpNames.java | 3 +- .../jena/fuseki/mgt/ManagementServer.java | 1 + .../org/apache/jena/fuseki/mgt/PingServlet.java | 75 + .../apache/jena/fuseki/servlets/HttpAction.java | 52 +- .../jena/fuseki/servlets/SPARQL_Query.java | 34 +- .../jena/fuseki/servlets/SPARQL_REST_R.java | 5 +- .../jena/fuseki/servlets/SPARQL_REST_RW.java | 6 + .../fuseki/servlets/SPARQL_ServletBase.java | 165 +- .../jena/fuseki/servlets/SPARQL_Update.java | 1 + .../jena/fuseki/servlets/SPARQL_Upload.java | 1 + .../jena/fuseki/servlets/ServletBase.java | 15 + jena-fuseki/tdb.ttl | 16 + jena-fuseki2/.gitignore | 3 + jena-fuseki2/D.trig | 18 +- jena-fuseki2/D.ttl | 18 +- jena-fuseki2/Data/books.ttl | 16 + jena-fuseki2/Data/test_abox.ttl | 16 + jena-fuseki2/Data/test_data_rdfs.ttl | 16 + jena-fuseki2/Data/test_tbox.ttl | 16 + jena-fuseki2/assembly-dist.xml | 4 +- jena-fuseki2/backup | 15 + jena-fuseki2/dist/LICENSE | 608 ++++++ jena-fuseki2/dist/LICENSE-dist | 600 ------ jena-fuseki2/dist/NOTICE | 216 ++ jena-fuseki2/dist/NOTICE-dist | 216 -- jena-fuseki2/docs/fuseki-configuration.md | 155 -- jena-fuseki2/docs/fuseki-data-services.md | 60 - jena-fuseki2/docs/fuseki-java.md | 7 - jena-fuseki2/docs/fuseki-layout.md | 72 - jena-fuseki2/docs/fuseki-logging.md | 40 - jena-fuseki2/docs/fuseki-main.md | 108 - jena-fuseki2/docs/fuseki-quick-start.md | 28 - jena-fuseki2/docs/fuseki-run.md | 51 - jena-fuseki2/docs/fuseki-security.md | 12 - jena-fuseki2/docs/fuseki-server-protocol.md | 204 -- jena-fuseki2/docs/fuseki-stats.md | 113 -- jena-fuseki2/docs/rdf-sparql-standards.md | 23 - jena-fuseki2/docs/soh.md | 95 - jena-fuseki2/dwim | 16 +- jena-fuseki2/dwim-upload | 16 + jena-fuseki2/examples/jetty-fuseki.xml | 17 + jena-fuseki2/fuseki-server.bat | 16 + jena-fuseki2/make-html | 15 + jena-fuseki2/make_cp_mvn | 16 + jena-fuseki2/pom.xml | 27 +- jena-fuseki2/run-fuseki | 3 +- .../dev/BackwardForwardDescribeFactory.java | 95 - jena-fuseki2/src-dev/dev/PROJECT.java | 80 - jena-fuseki2/src-dev/dev/RunAsWebapp.java | 50 - jena-fuseki2/src-dev/dev/RunFuseki2.java | 96 - .../java/org/apache/jena/fuseki/Fuseki.java | 25 +- .../java/org/apache/jena/fuseki/FusekiCmd.java | 13 +- .../java/org/apache/jena/fuseki/FusekiLib.java | 2 +- .../org/apache/jena/fuseki/FusekiLogging.java | 44 +- .../apache/jena/fuseki/jetty/JettyFuseki.java | 6 +- .../org/apache/jena/fuseki/mgt/ActionPing.java | 9 +- .../org/apache/jena/fuseki/mgt/ActionStats.java | 1 + .../apache/jena/fuseki/server/CounterName.java | 3 +- .../apache/jena/fuseki/server/SystemState.java | 2 +- .../apache/jena/fuseki/servlets/ActionBase.java | 55 +- .../apache/jena/fuseki/servlets/ActionLib.java | 18 +- .../jena/fuseki/servlets/ActionSPARQL.java | 36 +- .../apache/jena/fuseki/servlets/HttpAction.java | 68 +- .../jena/fuseki/servlets/ResponseResultSet.java | 3 +- .../jena/fuseki/servlets/SPARQL_GSP_R.java | 4 +- .../jena/fuseki/servlets/SPARQL_GSP_RW.java | 14 +- .../jena/fuseki/servlets/SPARQL_Query.java | 70 +- .../jena/fuseki/servlets/SPARQL_Update.java | 98 +- .../jena/fuseki/servlets/SPARQL_Upload.java | 2 + .../jena/fuseki/servlets/ServletBase.java | 15 +- .../org/apache/jena/fuseki/servlets/Upload.java | 1 - .../src/main/resources/log4j.properties | 23 +- .../org/apache/jena/fuseki/server/config.ttl | 4 +- .../org/apache/jena/fuseki/server/shiro.ini | 2 + jena-fuseki2/src/main/webapp/WEB-INF/web.xml | 16 + jena-iri/pom.xml | 10 +- jena-jdbc/jena-jdbc-core/pom.xml | 4 +- .../main/resources/jena-jdbc-log4j.properties | 16 + jena-jdbc/jena-jdbc-driver-bundle/pom.xml | 20 +- jena-jdbc/jena-jdbc-driver-mem/pom.xml | 6 +- jena-jdbc/jena-jdbc-driver-remote/pom.xml | 10 +- jena-jdbc/jena-jdbc-driver-tdb/pom.xml | 10 +- jena-jdbc/pom.xml | 4 +- jena-maven-tools/pom.xml | 11 +- jena-parent/pom.xml | 102 +- jena-sdb/Data/data.ttl | 16 + jena-sdb/Data/data2.ttl | 16 + jena-sdb/Old/PG_GRANT | 10 - jena-sdb/Old/ToDo-AFS | 67 - jena-sdb/Store/sdb-sap-layout1.ttl | 16 + jena-sdb/Store/sdb-sap.ttl | 16 + jena-sdb/assembly.xml | 4 +- jena-sdb/dist/LICENSE | 246 +++ jena-sdb/dist/LICENSE-dist | 246 --- jena-sdb/dist/NOTICE | 42 + jena-sdb/dist/NOTICE-dist | 42 - jena-sdb/dist/dist.sh | 15 + jena-sdb/log4j.properties | 16 + jena-sdb/pom.xml | 18 +- jena-sdb/src-dev/resources/etc/daml-micro.rules | 16 + .../src-dev/resources/etc/dig-daml-axioms.rdf | 17 +- .../src-dev/resources/etc/dig-owl-axioms.rdf | 16 + .../src-dev/resources/etc/location-mapping.ex | 16 + .../src-dev/resources/etc/ont-policy-test.rdf | 17 + jena-sdb/src-dev/resources/etc/ont-policy.rdf | 17 + jena-sdb/src-dev/resources/etc/owl-b.rules | 16 + .../src-dev/resources/etc/owl-fb-micro.rules | 16 + .../src-dev/resources/etc/owl-fb-mini.rules | 16 + jena-sdb/src-dev/resources/etc/owl-fb-old.rules | 16 + jena-sdb/src-dev/resources/etc/owl-fb.rules | 16 + jena-sdb/src-dev/resources/etc/owl.rules | 16 + .../src-dev/resources/etc/rdfs-b-tuned.rules | 16 + jena-sdb/src-dev/resources/etc/rdfs-b.rules | 16 + .../src-dev/resources/etc/rdfs-fb-lp-expt.rules | 16 + .../resources/etc/rdfs-fb-tgc-noresource.rules | 16 + .../resources/etc/rdfs-fb-tgc-simple.rules | 16 + .../src-dev/resources/etc/rdfs-fb-tgc.rules | 16 + jena-sdb/src-dev/resources/etc/rdfs-fb.rules | 16 + .../src-dev/resources/etc/rdfs-noresource.rules | 16 + jena-sdb/src-dev/resources/etc/rdfs.rules | 16 + .../src-dev/resources/etc/schemagen_example.rdf | 17 + jena-security/pom.xml | 16 +- .../apache/jena/security/example/example.ttl | 16 + .../graph/SecuredPrefixMappingTest.java | 3 +- .../jena/security/graph/TDBGraphTest.java | 4 +- jena-spatial/pom.xml | 8 +- .../jena/query/spatial/SpatialIndexContext.java | 5 +- .../jena/query/spatial/SpatialIndexLucene.java | 8 +- .../jena/query/spatial/SpatialIndexSolr.java | 49 +- .../jena/query/spatial/SpatialQueryFuncs.java | 59 + jena-tdb/log4j.properties | 16 + jena-tdb/pom.xml | 18 +- .../com/hp/hpl/jena/tdb/StoreConnection.java | 20 +- .../java/com/hp/hpl/jena/tdb/TDBFactory.java | 6 +- .../jena/tdb/assembler/DatasetAssemblerTDB.java | 2 +- .../jena/tdb/assembler/NodeTableAssembler.java | 4 +- .../jena/tdb/assembler/TDBGraphAssembler.java | 2 +- .../hp/hpl/jena/tdb/base/block/BlockParams.java | 6 +- .../tdb/base/file/BufferAllocatorDirect.java | 18 + .../jena/tdb/base/file/BufferAllocatorMem.java | 18 + .../com/hp/hpl/jena/tdb/base/file/FileSet.java | 4 +- .../com/hp/hpl/jena/tdb/base/file/Location.java | 10 +- .../com/hp/hpl/jena/tdb/index/IndexParams.java | 39 +- .../java/com/hp/hpl/jena/tdb/setup/Build.java | 72 +- .../hpl/jena/tdb/setup/DatasetBuilderBasic.java | 14 +- .../hpl/jena/tdb/setup/DatasetBuilderStd.java | 110 +- .../com/hp/hpl/jena/tdb/setup/StoreParams.java | 434 +++- .../hpl/jena/tdb/setup/StoreParamsBuilder.java | 278 +-- .../hp/hpl/jena/tdb/setup/StoreParamsCodec.java | 215 ++ .../hp/hpl/jena/tdb/setup/StoreParamsConst.java | 118 ++ .../hpl/jena/tdb/setup/StoreParamsDynamic.java | 54 + .../com/hp/hpl/jena/tdb/solver/SolverLib.java | 65 +- .../tdb/store/bulkloader2/CmdIndexBuild.java | 2 +- .../tdb/store/bulkloader2/CmdIndexCopy.java | 4 +- .../store/bulkloader2/CmdNodeTableBuilder.java | 4 +- .../hpl/jena/tdb/store/nodetable/NodeTable.java | 4 + .../tdb/store/nodetable/NodeTableCache.java | 3 +- .../tdb/store/nodetable/NodeTableLogger.java | 5 + .../tdb/store/nodetable/NodeTableNative.java | 5 + .../tdb/store/nodetable/NodeTableWrapper.java | 1 + .../java/com/hp/hpl/jena/tdb/sys/DebugTDB.java | 2 +- .../java/com/hp/hpl/jena/tdb/sys/SystemTDB.java | 2 +- .../java/com/hp/hpl/jena/tdb/sys/TDBMaker.java | 32 +- .../jena/tdb/transaction/NodeTableTrans.java | 6 + .../hpl/jena/tdb/transaction/Transaction.java | 186 +- jena-tdb/src/main/java/tdb/CmdRewriteIndex.java | 4 +- .../src/main/java/tdb/cmdline/ModLocation.java | 2 +- .../main/java/tdb/cmdline/ModTDBDataset.java | 2 +- .../src/main/java/tdb/tools/dumpnodetable.java | 2 +- .../src/main/java/tdb/tools/tdbgenindex.java | 4 +- .../test/java/com/hp/hpl/jena/tdb/TC_TDB.java | 8 +- .../jena/tdb/base/file/TestLocationLock.java | 30 +- .../tdb/base/objectfile/TestStringFileDisk.java | 2 +- .../hpl/jena/tdb/extra/T_QuadsObjectIsNull.java | 2 +- .../jena/tdb/extra/T_TDBWriteTransaction.java | 2 +- .../hp/hpl/jena/tdb/extra/T_TransSystem.java | 6 +- .../tdb/extra/T_TransSystemMultiDatasets.java | 4 +- .../jena/tdb/graph/AbstractTestGraphsTDB.java | 6 +- .../jena/tdb/graph/TestPrefixMappingTDB.java | 6 +- .../java/com/hp/hpl/jena/tdb/junit/Base_TS.java | 8 +- .../com/hp/hpl/jena/tdb/setup/TS_TDBSetup.java | 33 + .../hp/hpl/jena/tdb/setup/TestStoreParams.java | 143 ++ .../jena/tdb/setup/TestStoreParamsChoose.java | 158 ++ .../jena/tdb/setup/TestStoreParamsCreate.java | 171 ++ .../jena/tdb/store/TestDatasetTDBPersist.java | 2 +- .../com/hp/hpl/jena/tdb/store/TestGraphTDB.java | 2 +- .../com/hp/hpl/jena/tdb/store/TestLoader.java | 2 +- .../tdb/transaction/TestNodeTableTransDisk.java | 2 +- .../transaction/TestObjectFileTransStorage.java | 4 +- .../jena/tdb/transaction/TestTransRestart.java | 4 +- .../tdb/transaction/TestTransactionTDB.java | 2 +- jena-text/.gitignore | 0 jena-text/data.ttl | 4 - jena-text/pom.xml | 16 +- .../apache/jena/query/text/TextQueryFuncs.java | 2 +- .../assembler/AbstractTestTextAssembler.java | 2 +- jena-text/text-config.ttl | 18 +- pom.xml | 22 +- 516 files changed, 30085 insertions(+), 10019 deletions(-) ----------------------------------------------------------------------