Merge branch 'master' into JENA-507 Bring JENA-507 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/a122afcd Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a122afcd Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a122afcd Branch: refs/heads/JENA-507 Commit: a122afcd8932338ec21f44d161433c56e8fb4e73 Parents: 8c80b78 4554915 Author: Rob Vesse <rve...@apache.org> Authored: Mon Nov 10 10:52:19 2014 +0000 Committer: Rob Vesse <rve...@apache.org> Committed: Mon Nov 10 10:52:19 2014 +0000 ---------------------------------------------------------------------- apache-jena/assembly-jena-zip.xml | 11 - apache-jena/jena-log4j.properties | 16 + apache-jena/pom.xml | 39 +- 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 + .../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 +- .../optimizer/reorder/ReorderFixedAlt.java | 80 + .../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 +- .../apache/jena/atlas/RuntimeIOException.java | 34 + .../main/java/org/apache/jena/atlas/io/IO.java | 13 +- .../apache/jena/atlas/io/IndentedWriter.java | 6 +- .../org/apache/jena/atlas/iterator/Iter.java | 23 +- .../java/org/apache/jena/atlas/json/JSON.java | 19 +- .../org/apache/jena/atlas/json/JsonBuilder.java | 2 + .../java/org/apache/jena/atlas/lib/FileOps.java | 236 ++- .../org/apache/jena/atlas/logging/LogCtl.java | 23 +- .../org/apache/jena/riot/web/HttpNames.java | 10 +- .../algebra/optimize/AbstractTestTransform.java | 16 +- .../sparql/algebra/optimize/TestOptimizer.java | 19 +- .../apache/jena/atlas/lib/TestAlarmClock.java | 5 +- jena-core/Grammar/turtle | 16 + jena-core/etc/location-mapping.ex | 16 + jena-core/etc/schemagen_example.rdf | 16 + .../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/pom.xml | 4 +- 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/pom.xml | 2 +- jena-fuseki/run_cp | 15 + .../dev/BackwardForwardDescribeFactory.java | 95 - jena-fuseki/src-dev/dev/DevFuseki.java | 149 -- .../java/org/apache/jena/fuseki/FusekiCmd.java | 13 +- .../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 | 1 + .../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/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 | 608 ------ 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 | 8 +- 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 +- .../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 | 7 +- .../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 + .../main/resources/jena-jdbc-log4j.properties | 16 + jena-parent/pom.xml | 91 + 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/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 + .../apache/jena/security/example/example.ttl | 16 + .../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 + .../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 +- .../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 | 108 +- .../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 + .../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/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 | 2 + .../jena/tdb/base/file/TestLocationLock.java | 12 +- .../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/TestPrefixMappingTDB.java | 6 +- .../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 - .../apache/jena/query/text/TextQueryFuncs.java | 2 +- jena-text/text-config.ttl | 18 +- pom.xml | 6 +- 358 files changed, 18328 insertions(+), 9593 deletions(-) ----------------------------------------------------------------------