You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2011/11/13 19:59:57 UTC
svn commit: r1201474 [1/4] - in /incubator/jena/Jena2/ARQ/trunk:
src/main/java/com/hp/hpl/jena/query/ src/main/java/com/hp/hpl/jena/sparql/
src/main/java/com/hp/hpl/jena/sparql/core/
src/main/java/com/hp/hpl/jena/sparql/core/assembler/ src/main/java/co...
Author: andy
Date: Sun Nov 13 18:59:51 2011
New Revision: 1201474
URL: http://svn.apache.org/viewvc?rev=1201474&view=rev
Log:
Add symbol for dataset description in the context.
Consolidate making of Datasets/DatasetGraphs
Much tidying up.
Added:
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetDescription.java
- copied, changed from r1199234, incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetDesc.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/assembler/DatasetDescriptionAssembler.java
- copied, changed from r1199234, incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/assembler/DatasetDescAssembler.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/graph/GraphFactory.java
incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetMem.java
- copied, changed from r1199454, incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetDataSource.java
Removed:
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetDesc.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/assembler/DatasetDescAssembler.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphFactory.java
incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetDataSource.java
Modified:
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/query/DatasetFactory.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/query/Query.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/query/ResultSetFactory.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/ARQConstants.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphFactory.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphMaker.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphMap.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetImpl.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/assembler/DatasetAssembler.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/http/QueryEngineHTTP.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/graph/GraphSPARQL.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineWorker.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONInput.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/RDFOutput.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInputSAX.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInputStAX.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderGraph.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/Closure.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/DatasetUtils.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/NodeUtils.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/web/HttpResponseLib.java
incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/TS_General.java
incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/api/TestAPI.java
incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/api/TestQueryExecutionCancel.java
incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/api/TestQueryExecutionTimeout.java
incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/core/DatasetGraphTests.java
incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/core/TestDataset.java
incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphsMem.java
incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateBase.java
incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateGraph.java
incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateGraphMgt.java
incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/path/TestPath.java
incubator/jena/Jena2/ARQ/trunk/src/test/java/org/openjena/riot/lang/TestLangTurtle.java
incubator/jena/Jena2/ARQ/trunk/testing/ARQ/RDQL-SPARQL.txt
incubator/jena/Jena2/ARQ/trunk/testing/ARQ/ValueTesting/xsd-string-gt.rq
incubator/jena/Jena2/ARQ/trunk/testing/ARQ/ValueTesting/xsd-string-lt.rq
incubator/jena/Jena2/ARQ/trunk/testing/ARQ/makeResults
incubator/jena/Jena2/ARQ/trunk/testing/ARQ/manifest-arq.ttl
incubator/jena/Jena2/ARQ/trunk/testing/ARQ/manifest-ref-arq.ttl
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/basic/quotes-1.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/basic/quotes-1.srx
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/basic/quotes-2.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/basic/quotes-2.srx
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/basic/quotes-3.srx
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/basic/quotes-4.srx
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/cast/cast-bool.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/cast/cast-dT.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/cast/cast-dbl.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/cast/cast-dec.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/cast/cast-flt.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/cast/cast-int.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/cast/cast-str.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/cast/data.ttl
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/distinct/data-star.ttl
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/distinct/distinct-star-1.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/expr-ops/query-ge-1.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/expr-ops/query-le-1.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/expr-ops/query-minus-1.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/expr-ops/query-mul-1.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/expr-ops/query-plus-1.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/expr-ops/query-unminus-1.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/expr-ops/query-unplus-1.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/i18n/kanji-01-results.ttl
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/i18n/kanji-01.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/i18n/kanji-02-results.ttl
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/i18n/kanji-02.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/i18n/normalization-01-results.ttl
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/i18n/normalization-01.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/i18n/normalization-01.ttl
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/i18n/normalization-02-results.ttl
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/i18n/normalization-02.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/i18n/normalization-02.ttl
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/i18n/normalization-03-results.ttl
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/i18n/normalization-03.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/i18n/normalization-03.ttl
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/reduced/reduced-1.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/reduced/reduced-star.ttl
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/triple-match/data-03.ttl
incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final_data-r2.zip
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/Misc/dawg-data-01.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/Misc/dawg-query-001.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/Misc/dawg-query-002.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/Misc/dawg-query-003.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/Misc/dawg-query-004.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/Misc/dawg-result-001.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/Misc/dawg-result-002.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/Misc/dawg-result-003.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/Misc/dawg-result-004.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/Misc/manifest-dawg.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/Misc/manifest.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/Syntax/manifest.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/Syntax/result-syn-001.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/Syntax/result-syn-002.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/Syntax/result-syn-003.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/Syntax/result-syn-004.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/Syntax/syn-data-02.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/Syntax/syntax-001.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/Syntax/syntax-002.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/Syntax/syntax-003.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/Syntax/syntax-004.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex11.2.3.1_0-result.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex11.2.3.1_0.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex11.2.3.1_0.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex11.2.3.1_1-result.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex11.2.3.1_1.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex11.2.3.1_1.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex11.2.3.2_0-result.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex11.2.3.2_0.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex11.2.3.2_0.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex11.2.3.2_1-result.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex11.2.3.2_1.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex11.2.3.3_0-result.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex11.2.3.3_0.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex11.2.3.3_0.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex11.2.3.4_0-result.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex11.2.3.4_0.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex11.2.3.4_0.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex11.2.3.5_0-result.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex11.2.3.5_0.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex11.2.3.5_0.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex11.2.3.6_0-result.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex11.2.3.6_0.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex11.2.3.6_0.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex11.2.3.7_0-result.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex11.2.3.7_0.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex11.2.3.7_0.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex11.2.3.8_0-result.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex11.2.3.8_0.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex11.2.3.8_0.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex11_0-result.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex11_0.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex11_0.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex11_1-result.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex11_1.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex2-1a-result.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex2-1a.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex2-1a.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex2-1b.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex2-1c.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex2-1d.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex2-1e.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex2-1f.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex2-2a-result.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex2-2a.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex2-2a.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex2-3a-result.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex2-3a.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex2-3a.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex2-4a-result.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex2-4a.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex2-4a.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex3-result.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex3.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/ex3.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/examples/manifest.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/i18n/kanji-01-results.ttl
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/i18n/kanji-01.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/i18n/kanji-02-results.ttl
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/i18n/kanji-02.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/i18n/kanji.ttl
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/i18n/manifest.ttl
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/i18n/normalization-01-results.ttl
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/i18n/normalization-01.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/i18n/normalization-01.ttl
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/i18n/normalization-02-results.ttl
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/i18n/normalization-02.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/i18n/normalization-02.ttl
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/i18n/normalization-03-results.ttl
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/i18n/normalization-03.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/i18n/normalization-03.ttl
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/regex/manifest.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/regex/regex-data-01.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/regex/regex-query-001.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/regex/regex-query-002.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/regex/regex-query-003.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/regex/regex-query-004.rq
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/regex/regex-result-001.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/regex/regex-result-002.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/regex/regex-result-003.n3
incubator/jena/Jena2/ARQ/trunk/testing/DAWG/regex/regex-result-004.n3
incubator/jena/Jena2/ARQ/trunk/testing/LARQ/data-1.ttl
incubator/jena/Jena2/ARQ/trunk/testing/LARQ/data-2.ttl
incubator/jena/Jena2/ARQ/trunk/testing/LARQ/data.ttl
incubator/jena/Jena2/ARQ/trunk/testing/LARQ/larq-q-1.rq
incubator/jena/Jena2/ARQ/trunk/testing/LARQ/larq-q-2.rq
incubator/jena/Jena2/ARQ/trunk/testing/LARQ/larq-q-3.rq
incubator/jena/Jena2/ARQ/trunk/testing/LARQ/larq-q-4.rq
incubator/jena/Jena2/ARQ/trunk/testing/LARQ/larq-q-5.rq
incubator/jena/Jena2/ARQ/trunk/testing/LARQ/larq-q-6.rq
incubator/jena/Jena2/ARQ/trunk/testing/LARQ/larq-q-7.rq
incubator/jena/Jena2/ARQ/trunk/testing/LARQ/results-1.srj
incubator/jena/Jena2/ARQ/trunk/testing/LARQ/results-2.srj
incubator/jena/Jena2/ARQ/trunk/testing/LARQ/results-3.srj
incubator/jena/Jena2/ARQ/trunk/testing/LARQ/results-4.srj
incubator/jena/Jena2/ARQ/trunk/testing/LARQ/results-5.srj
incubator/jena/Jena2/ARQ/trunk/testing/LARQ/results-6.srj
incubator/jena/Jena2/ARQ/trunk/testing/LARQ/results-7.srj
incubator/jena/Jena2/ARQ/trunk/testing/README.txt
incubator/jena/Jena2/ARQ/trunk/testing/RIOT/TriG/trig-bad-00.trig
incubator/jena/Jena2/ARQ/trunk/testing/RIOT/TriG/trig-bad-01.trig
incubator/jena/Jena2/ARQ/trunk/testing/RIOT/TriG/trig-empty.trig
incubator/jena/Jena2/ARQ/trunk/testing/RIOT/TriG/trig-test-00.nq
incubator/jena/Jena2/ARQ/trunk/testing/RIOT/TriG/trig-test-00.trig
incubator/jena/Jena2/ARQ/trunk/testing/RIOT/TriG/trig-test-01.nq
incubator/jena/Jena2/ARQ/trunk/testing/RIOT/TriG/trig-test-01.trig
incubator/jena/Jena2/ARQ/trunk/testing/RIOT/TriG/trig-test-02.trig
incubator/jena/Jena2/ARQ/trunk/testing/ResultSet/output.srj
incubator/jena/Jena2/ARQ/trunk/testing/ResultSet/output.srx
incubator/jena/Jena2/ARQ/trunk/testing/ResultSet/output2.srx
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/query/DatasetFactory.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/query/DatasetFactory.java?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/query/DatasetFactory.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/query/DatasetFactory.java Sun Nov 13 18:59:51 2011
@@ -26,10 +26,11 @@ import com.hp.hpl.jena.rdf.model.ModelFa
import com.hp.hpl.jena.rdf.model.Resource ;
import com.hp.hpl.jena.sparql.ARQException ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
+import com.hp.hpl.jena.sparql.core.DatasetGraphFactory ;
import com.hp.hpl.jena.sparql.core.DatasetImpl ;
import com.hp.hpl.jena.sparql.core.assembler.DatasetAssembler ;
+import com.hp.hpl.jena.sparql.graph.GraphFactory ;
import com.hp.hpl.jena.sparql.util.DatasetUtils ;
-import com.hp.hpl.jena.sparql.util.graph.GraphFactory ;
import com.hp.hpl.jena.sparql.util.graph.GraphUtils ;
import com.hp.hpl.jena.util.FileManager ;
@@ -37,9 +38,14 @@ import com.hp.hpl.jena.util.FileManager
public class DatasetFactory
{
- /** Create an in-memory, modifable Dataset */
- public static Dataset createMem() { return create() ; }
+ /** Create an in-memory, modifiable Dataset */
+ public static Dataset createMem() { return create(DatasetGraphFactory.createMem()) ; }
+ /** Create an in-memory, modifiable Dataset.
+ * New graphs must be explicitly added using .addGraph.
+ */
+ public static Dataset createMemFixed() { return create(DatasetGraphFactory.createMemFixed()) ; }
+
/** Create an in-memory, modifable Dataset
* @deprecated Use createMem
*/
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/query/Query.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/query/Query.java?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/query/Query.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/query/Query.java Sun Nov 13 18:59:51 2011
@@ -34,12 +34,7 @@ import org.openjena.atlas.logging.Log ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.sparql.ARQConstants ;
-import com.hp.hpl.jena.sparql.core.Prologue ;
-import com.hp.hpl.jena.sparql.core.QueryCompare ;
-import com.hp.hpl.jena.sparql.core.QueryHashCode ;
-import com.hp.hpl.jena.sparql.core.Var ;
-import com.hp.hpl.jena.sparql.core.VarAlloc ;
-import com.hp.hpl.jena.sparql.core.VarExprList ;
+import com.hp.hpl.jena.sparql.core.* ;
import com.hp.hpl.jena.sparql.engine.binding.Binding ;
import com.hp.hpl.jena.sparql.expr.Expr ;
import com.hp.hpl.jena.sparql.expr.ExprAggregator ;
@@ -341,6 +336,18 @@ public class Query extends Prologue impl
return false ;
}
+ /** Return a dataset description (FROM/FROM NAMED clauses) for the query. */
+ public DatasetDescription getDatasetDescription()
+ {
+ DatasetDescription description = new DatasetDescription() ;
+ if ( ! hasDatasetDescription() )
+ return description ;
+
+ description.addAllDefaultGraphURI(getGraphURIs()) ;
+ description.addAllNamedGraphURI(getNamedGraphURIs()) ;
+ return description ;
+ }
+
// ---- SELECT
protected VarExprList projectVars = new VarExprList() ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/query/ResultSetFactory.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/query/ResultSetFactory.java?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/query/ResultSetFactory.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/query/ResultSetFactory.java Sun Nov 13 18:59:51 2011
@@ -26,12 +26,12 @@ import com.hp.hpl.jena.rdf.model.ModelFa
import com.hp.hpl.jena.shared.NotFoundException ;
import com.hp.hpl.jena.sparql.engine.QueryIterator ;
import com.hp.hpl.jena.sparql.engine.ResultSetStream ;
+import com.hp.hpl.jena.sparql.graph.GraphFactory ;
import com.hp.hpl.jena.sparql.resultset.* ;
import com.hp.hpl.jena.sparql.sse.Item ;
import com.hp.hpl.jena.sparql.sse.SSE ;
import com.hp.hpl.jena.sparql.sse.builders.BuilderTable ;
import org.openjena.atlas.logging.Log ;
-import com.hp.hpl.jena.sparql.util.graph.GraphFactory ;
import com.hp.hpl.jena.util.FileManager ;
/** ResultSetFactory - make result sets from places other than a query. */
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/ARQConstants.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/ARQConstants.java?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/ARQConstants.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/ARQConstants.java Sun Nov 13 18:59:51 2011
@@ -195,11 +195,23 @@ public class ARQConstants
/** Context key for the optimizer used in this execution */
public static final Symbol sysOptimizer = Symbol.create(systemVarNS+"optimizer") ;
- /** Context key for the dataset for the current query execution
- * May be null if was not created from a query string.
- */
+ /** Context key for the dataset for the current query execution. */
public static final Symbol sysCurrentDataset = Symbol.create(systemVarNS+"dataset") ;
+ /** Context key for the dataset description (if any).
+ * See the <a href="http://www.w3.org/TR/sparql11-protocol">SPARQL protocol</a>.
+ * <p>
+ * A dataset description specified outside the query should override a dataset description
+ * in query and also the implicit dataset of a service. The order is:
+ * <ol>
+ * <li>Dataset description from the protocol</li>
+ * <li>Dataset description from the query (FROM/FROM NAMED)</li>
+ * <li>Dataset of the service</li>
+ * </ol>
+ * Use in other situations should reflect this design.
+ */
+ public static final Symbol sysDatasetDescription = Symbol.create(systemVarNS+"datasetDescription") ;
+
/** Context key for the algebra expression of the query execution after optimization */
public static final Symbol sysCurrentAlgebra = Symbol.create(systemVarNS+"algebra") ;
Copied: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetDescription.java (from r1199234, incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetDesc.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetDescription.java?p2=incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetDescription.java&p1=incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetDesc.java&r1=1199234&r2=1201474&rev=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetDesc.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetDescription.java Sun Nov 13 18:59:51 2011
@@ -19,6 +19,7 @@
package com.hp.hpl.jena.sparql.core;
import java.util.ArrayList ;
+import java.util.Collection ;
import java.util.Iterator ;
import java.util.List ;
@@ -30,22 +31,29 @@ import com.hp.hpl.jena.sparql.util.Datas
// use in DatasetUtils
// use in tests
-public class DatasetDesc
+public class DatasetDescription
{
private List<String> defaultGraphURIs = new ArrayList<String>() ;
private List<String> namedGraphURIs = new ArrayList<String>() ;
- public DatasetDesc() {}
- public void addDefaultGraphURI(String uri) { defaultGraphURIs.add(uri) ; }
- public void addNamedGraphURI(String uri) { namedGraphURIs.add(uri) ; }
+ public DatasetDescription() {}
+ public boolean isEmpty() { return defaultGraphURIs.isEmpty() && namedGraphURIs.isEmpty() ; }
- public List<String> getDefaultGraphURIs() { return defaultGraphURIs ; }
- public List<String> getNamedGraphURIs() { return namedGraphURIs ; }
+ public void addDefaultGraphURI(String uri) { defaultGraphURIs.add(uri) ; }
+ public void addAllDefaultGraphURI(Collection<String> uris) { defaultGraphURIs.addAll(uris) ; }
- public Iterator<String> eachDefaultGraphURI() { return defaultGraphURIs.iterator() ; }
- public Iterator<String> eachNamedGraphURI() { return namedGraphURIs.iterator() ; }
+ public void addNamedGraphURI(String uri) { namedGraphURIs.add(uri) ; }
+ public void addAllNamedGraphURI(Collection<String> uris) { namedGraphURIs.addAll(uris) ; }
+ public List<String> getDefaultGraphURIs() { return defaultGraphURIs ; }
+ public List<String> getNamedGraphURIs() { return namedGraphURIs ; }
+
+ public Iterator<String> eachDefaultGraphURI() { return defaultGraphURIs.iterator() ; }
+ public Iterator<String> eachNamedGraphURI() { return namedGraphURIs.iterator() ; }
+
+ /** Create a dataset from the description - reads URLs into an in-memory dataset */
public Dataset create() { return DatasetUtils.createDataset(this) ; }
+
+ /** Create a DatasetGraph from the description - reads URLs into an in-memory DatasetGraph */
public DatasetGraph createDatasetGraph() { return DatasetUtils.createDatasetGraph(this) ; }
-
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphFactory.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphFactory.java?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphFactory.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphFactory.java Sun Nov 13 18:59:51 2011
@@ -22,7 +22,7 @@ import java.util.Iterator ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
-import com.hp.hpl.jena.sparql.util.graph.GraphFactory ;
+import com.hp.hpl.jena.sparql.graph.GraphFactory ;
public class DatasetGraphFactory
{
@@ -51,22 +51,34 @@ public class DatasetGraphFactory
/**
* Create a DatasetGraph starting with a single graph.
+ * New graphs must be explicitly added.
*/
public static DatasetGraph create(Graph graph)
{
- // Fixed - requires explicit "add graph"
- return new DatasetGraphMap(graph) ;
-// DatasetGraph dsg2 = createMem() ;
-// dsg2.setDefaultGraph(graph) ;
-// return dsg2 ;
+ DatasetGraph dsg2 = createMemFixed() ;
+ dsg2.setDefaultGraph(graph) ;
+ return dsg2 ;
}
/**
* Create a DatasetGraph which only ever has a single default graph.
*/
- public static DatasetGraph createOneGraph(Graph graph) { return new DatasetGraphOne(graph) ; }
+ public static DatasetGraph createOneGraph(Graph graph) { return new DatasetGraphOne(graph) ; }
+
+ /** Interface for makign graphs when a dataset needs to add a new graph.
+ * Return null for no graph created.
+ */
+ public interface GraphMaker { public Graph create() ; }
+
+ /** A graph maker that doesn't make graphs */
+ public static GraphMaker graphMakerNull = new GraphMaker() {
+ @Override
+ public Graph create()
+ {
+ return null ;
+ } } ;
- private static DatasetGraphMaker.GraphMaker memGraphMaker = new DatasetGraphMaker.GraphMaker()
+ private static GraphMaker memGraphMaker = new GraphMaker()
{
@Override
public Graph create()
@@ -81,5 +93,5 @@ public class DatasetGraphFactory
public static DatasetGraph createMem() { return new DatasetGraphMaker(memGraphMaker) ; }
- public static DatasetGraph createMemFixed() { return new DatasetGraphMap() ; }
+ public static DatasetGraph createMemFixed() { return new DatasetGraphMap(GraphFactory.createDefaultGraph()) ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphMaker.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphMaker.java?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphMaker.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphMaker.java Sun Nov 13 18:59:51 2011
@@ -19,6 +19,7 @@
package com.hp.hpl.jena.sparql.core;
import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.sparql.core.DatasetGraphFactory.GraphMaker ;
/** Implementation of a DatasetGraph as an open set of graphs where all graphs "exist".
* New graphs are created (via the policy of a GraphMaker) when a getGraph call is
@@ -26,15 +27,6 @@ import com.hp.hpl.jena.graph.Graph ;
*/
public class DatasetGraphMaker extends DatasetGraphMap
{
- public interface GraphMaker { public Graph create() ; }
-
- private static GraphMaker graphMakerNull = new GraphMaker() {
- @Override
- public Graph create()
- {
- return null ;
- } } ;
-
private GraphMaker graphMaker ;
public DatasetGraphMaker(GraphMaker graphMaker)
@@ -46,7 +38,7 @@ public class DatasetGraphMaker extends D
public DatasetGraphMaker(Graph graph)
{
super(graph) ;
- this.graphMaker = graphMakerNull ;
+ this.graphMaker = DatasetGraphFactory.graphMakerNull ;
}
@Override
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphMap.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphMap.java?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphMap.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphMap.java Sun Nov 13 18:59:51 2011
@@ -34,9 +34,6 @@ public class DatasetGraphMap extends Dat
private Graph defaultGraph ;
- public DatasetGraphMap()
- { }
-
public DatasetGraphMap(Graph defaultGraph)
{ this.defaultGraph = defaultGraph ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetImpl.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetImpl.java?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetImpl.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetImpl.java Sun Nov 13 18:59:51 2011
@@ -88,7 +88,6 @@ public class DatasetImpl implements Data
public DatasetImpl(Model model)
{
addToCache(model) ;
- // TODO Is this right? this sort of DatasetGraph can't auto-add graphs.
this.dsg = DatasetGraphFactory.create(model.getGraph()) ;
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/assembler/DatasetAssembler.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/assembler/DatasetAssembler.java?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/assembler/DatasetAssembler.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/assembler/DatasetAssembler.java Sun Nov 13 18:59:51 2011
@@ -35,8 +35,8 @@ import org.slf4j.LoggerFactory ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.core.DatasetGraphFactory ;
+import com.hp.hpl.jena.sparql.graph.GraphFactory ;
import com.hp.hpl.jena.sparql.util.FmtUtils ;
-import com.hp.hpl.jena.sparql.util.graph.GraphFactory ;
import com.hp.hpl.jena.sparql.util.graph.GraphUtils ;
public class DatasetAssembler extends AssemblerBase implements Assembler
Copied: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/assembler/DatasetDescriptionAssembler.java (from r1199234, incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/assembler/DatasetDescAssembler.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/assembler/DatasetDescriptionAssembler.java?p2=incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/assembler/DatasetDescriptionAssembler.java&p1=incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/assembler/DatasetDescAssembler.java&r1=1199234&r2=1201474&rev=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/assembler/DatasetDescAssembler.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/assembler/DatasetDescriptionAssembler.java Sun Nov 13 18:59:51 2011
@@ -24,18 +24,19 @@ import com.hp.hpl.jena.assembler.Assembl
import com.hp.hpl.jena.assembler.Mode ;
import com.hp.hpl.jena.assembler.assemblers.AssemblerBase ;
import com.hp.hpl.jena.rdf.model.Resource ;
-import com.hp.hpl.jena.sparql.core.DatasetDesc ;
+import com.hp.hpl.jena.sparql.core.DatasetDescription ;
import com.hp.hpl.jena.sparql.util.graph.GraphUtils ;
-public class DatasetDescAssembler extends AssemblerBase implements Assembler
+public class DatasetDescriptionAssembler extends AssemblerBase implements Assembler
{
-
- public static Resource getType() { return DatasetAssemblerVocab.tDataset ; }
+ public DatasetDescriptionAssembler() {}
+
+ public static Resource getType() { return DatasetAssemblerVocab.tDataset ; }
@Override
public Object open(Assembler a, Resource root, Mode mode)
{
- DatasetDesc ds = new DatasetDesc() ;
+ DatasetDescription ds = new DatasetDescription() ;
// -------- Default graph
// Can use ja:graph or ja:defaultGraph
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java Sun Nov 13 18:59:51 2011
@@ -56,13 +56,13 @@ import com.hp.hpl.jena.sparql.engine.bin
import com.hp.hpl.jena.sparql.engine.binding.BindingUtils ;
import com.hp.hpl.jena.sparql.engine.iterator.QueryIteratorBase ;
import com.hp.hpl.jena.sparql.engine.iterator.QueryIteratorWrapper ;
+import com.hp.hpl.jena.sparql.graph.GraphFactory ;
import com.hp.hpl.jena.sparql.syntax.ElementGroup ;
import com.hp.hpl.jena.sparql.syntax.Template ;
import com.hp.hpl.jena.sparql.util.Context ;
import com.hp.hpl.jena.sparql.util.DatasetUtils ;
import com.hp.hpl.jena.sparql.util.ModelUtils ;
import com.hp.hpl.jena.sparql.util.NodeFactory ;
-import com.hp.hpl.jena.sparql.util.graph.GraphFactory ;
import com.hp.hpl.jena.util.FileManager ;
/** All the SPARQL query result forms made from a graph-level execution object */
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/http/QueryEngineHTTP.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/http/QueryEngineHTTP.java?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/http/QueryEngineHTTP.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/http/QueryEngineHTTP.java Sun Nov 13 18:59:51 2011
@@ -40,9 +40,9 @@ import com.hp.hpl.jena.query.ResultSet ;
import com.hp.hpl.jena.query.ResultSetFactory ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.sparql.ARQException ;
+import com.hp.hpl.jena.sparql.graph.GraphFactory ;
import com.hp.hpl.jena.sparql.resultset.XMLInput ;
import com.hp.hpl.jena.sparql.util.Context ;
-import com.hp.hpl.jena.sparql.util.graph.GraphFactory ;
import com.hp.hpl.jena.util.FileManager ;
Added: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/graph/GraphFactory.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/graph/GraphFactory.java?rev=1201474&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/graph/GraphFactory.java (added)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/graph/GraphFactory.java Sun Nov 13 18:59:51 2011
@@ -0,0 +1,94 @@
+/*
+ * 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 com.hp.hpl.jena.sparql.graph;
+
+import org.openjena.atlas.data.ThresholdPolicy ;
+
+import com.hp.hpl.jena.graph.Factory ;
+import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.query.ARQ ;
+import com.hp.hpl.jena.rdf.model.Model ;
+import com.hp.hpl.jena.rdf.model.ModelFactory ;
+import com.hp.hpl.jena.sparql.util.RefBoolean ;
+import com.hp.hpl.jena.sparql.util.graph.GraphSink ;
+
+/** Ways to make graphs and models */
+public class GraphFactory
+{
+ private static RefBoolean usePlainGraph = new RefBoolean(ARQ.strictGraph) ;
+
+ /** Create a graph that is a Jena memory graph
+ * @see #createDefaultGraph
+ */
+ public static Graph createGraphMem()
+ {
+ return Factory.createGraphMem() ;
+ }
+
+ /** Create a graph - ARQ-wide default type */
+ public static Graph createDefaultGraph()
+ {
+ return usePlainGraph.getValue() ? createPlainGraph() : createJenaDefaultGraph() ;
+ }
+
+ /** Create a graph - always the Jena default graph type */
+ public static Graph createJenaDefaultGraph()
+ {
+ return Factory.createDefaultGraph() ;
+ }
+
+ /** Very simple graph that uses same-term for find() (small-scale use only) */
+ public static Graph createPlainGraph()
+ {
+ return new GraphMemSimple2() ; // new PlainGraphMem() ;
+ }
+
+ public static Graph sinkGraph()
+ {
+ return new GraphSink() ;
+ }
+
+ /** A graph backed by a DistinctDataBag<Triple>. */
+ public static Graph createDataBagGraph(ThresholdPolicy<Triple> thresholdPolicy)
+ {
+ return new GraphDistinctDataBag(thresholdPolicy) ;
+ }
+
+ /** Guaranteed call-through to Jena's ModelFactory operation */
+ public static Model makeJenaDefaultModel() { return ModelFactory.createDefaultModel() ; }
+
+ /** Create a model over a default graph (ARQ-wide for degault graph type) */
+ public static Model makeDefaultModel()
+ {
+ return ModelFactory.createModelForGraph(createDefaultGraph()) ;
+ }
+
+ /** Create a model over a plain graph (small-scale use only) */
+ public static Model makePlainModel()
+ {
+ return ModelFactory.createModelForGraph(createPlainGraph()) ;
+ }
+
+ /** Create a model over a DataBag graph (will spill to disk when it get large) */
+ public static Model makeDataBagModel(ThresholdPolicy<Triple> thresholdPolicy)
+ {
+ return ModelFactory.createModelForGraph(createDataBagGraph(thresholdPolicy)) ;
+ }
+}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/graph/GraphSPARQL.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/graph/GraphSPARQL.java?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/graph/GraphSPARQL.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/graph/GraphSPARQL.java Sun Nov 13 18:59:51 2011
@@ -24,11 +24,7 @@ import java.util.List ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
-import com.hp.hpl.jena.graph.Capabilities ;
-import com.hp.hpl.jena.graph.Graph ;
-import com.hp.hpl.jena.graph.Node ;
-import com.hp.hpl.jena.graph.Triple ;
-import com.hp.hpl.jena.graph.TripleMatch ;
+import com.hp.hpl.jena.graph.* ;
import com.hp.hpl.jena.graph.impl.AllCapabilities ;
import com.hp.hpl.jena.graph.impl.GraphBase ;
import com.hp.hpl.jena.sparql.algebra.Op ;
@@ -68,9 +64,10 @@ public class GraphSPARQL extends GraphBa
this(dataset, Node.createURI(uri)) ;
}
- public GraphSPARQL(DatasetGraph dataset, Node gn)
+ public GraphSPARQL(DatasetGraph dsg, Node gn)
{
- this.dataset = toDSG(dataset, gn) ;
+ this.dataset = DatasetGraphFactory.create(dsg) ;
+ dataset.setDefaultGraph(dsg.getGraph(gn)) ;
factory = null ;
}
@@ -80,7 +77,7 @@ public class GraphSPARQL extends GraphBa
public GraphSPARQL(Graph graph, QueryEngineFactory factory)
{
- this.dataset = DatasetGraphFactory.create(graph) ;
+ this.dataset = DatasetGraphFactory.createOneGraph(graph) ;
this.factory = factory ;
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineWorker.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineWorker.java?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineWorker.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineWorker.java Sun Nov 13 18:59:51 2011
@@ -44,6 +44,7 @@ import com.hp.hpl.jena.sparql.core.Quad
import com.hp.hpl.jena.sparql.engine.Plan ;
import com.hp.hpl.jena.sparql.engine.binding.Binding ;
import com.hp.hpl.jena.sparql.engine.binding.BindingRoot ;
+import com.hp.hpl.jena.sparql.graph.GraphFactory ;
import com.hp.hpl.jena.sparql.graph.NodeTransform ;
import com.hp.hpl.jena.sparql.graph.NodeTransformLib ;
import com.hp.hpl.jena.sparql.modify.request.Target ;
@@ -65,7 +66,6 @@ import com.hp.hpl.jena.sparql.syntax.Ele
import com.hp.hpl.jena.sparql.syntax.ElementGroup ;
import com.hp.hpl.jena.sparql.syntax.ElementNamedGraph ;
import com.hp.hpl.jena.sparql.syntax.ElementTriplesBlock ;
-import com.hp.hpl.jena.sparql.util.graph.GraphFactory ;
import com.hp.hpl.jena.update.GraphStore ;
import com.hp.hpl.jena.update.UpdateException ;
import com.hp.hpl.jena.util.FileManager ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONInput.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONInput.java?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONInput.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONInput.java Sun Nov 13 18:59:51 2011
@@ -40,9 +40,9 @@ import com.hp.hpl.jena.sparql.engine.bin
import com.hp.hpl.jena.sparql.engine.binding.BindingFactory ;
import com.hp.hpl.jena.sparql.engine.binding.BindingMap ;
import com.hp.hpl.jena.sparql.engine.iterator.QueryIterPlainWrapper ;
+import com.hp.hpl.jena.sparql.graph.GraphFactory ;
import com.hp.hpl.jena.sparql.resultset.ResultSetException ;
import com.hp.hpl.jena.sparql.resultset.SPARQLResult ;
-import com.hp.hpl.jena.sparql.util.graph.GraphFactory ;
public class JSONInput extends SPARQLResult
{
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/RDFOutput.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/RDFOutput.java?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/RDFOutput.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/RDFOutput.java Sun Nov 13 18:59:51 2011
@@ -27,7 +27,7 @@ import com.hp.hpl.jena.rdf.model.Literal
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.RDFNode ;
import com.hp.hpl.jena.rdf.model.Resource ;
-import com.hp.hpl.jena.sparql.util.graph.GraphFactory ;
+import com.hp.hpl.jena.sparql.graph.GraphFactory ;
import com.hp.hpl.jena.sparql.vocabulary.ResultSetGraphVocab ;
import com.hp.hpl.jena.vocabulary.RDF ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInputSAX.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInputSAX.java?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInputSAX.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInputSAX.java Sun Nov 13 18:59:51 2011
@@ -42,9 +42,9 @@ import com.hp.hpl.jena.sparql.engine.bin
import com.hp.hpl.jena.sparql.engine.binding.BindingFactory ;
import com.hp.hpl.jena.sparql.engine.binding.BindingMap ;
import com.hp.hpl.jena.sparql.engine.iterator.QueryIterPlainWrapper ;
+import com.hp.hpl.jena.sparql.graph.GraphFactory ;
import com.hp.hpl.jena.sparql.util.FmtUtils ;
import com.hp.hpl.jena.sparql.util.LabelToNodeMap ;
-import com.hp.hpl.jena.sparql.util.graph.GraphFactory ;
import com.hp.hpl.jena.vocabulary.RDF ;
/** Code that reads an XML Result Set and builds the ARQ structure for the same. */
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInputStAX.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInputStAX.java?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInputStAX.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInputStAX.java Sun Nov 13 18:59:51 2011
@@ -48,8 +48,8 @@ import com.hp.hpl.jena.sparql.core.Var ;
import com.hp.hpl.jena.sparql.engine.binding.Binding ;
import com.hp.hpl.jena.sparql.engine.binding.BindingFactory ;
import com.hp.hpl.jena.sparql.engine.binding.BindingMap ;
+import com.hp.hpl.jena.sparql.graph.GraphFactory ;
import com.hp.hpl.jena.sparql.util.LabelToNodeMap ;
-import com.hp.hpl.jena.sparql.util.graph.GraphFactory ;
/** Code that reads an XML Results format and builds the ARQ structure for the same.
* Can read result set and boolean result forms.
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderGraph.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderGraph.java?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderGraph.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderGraph.java Sun Nov 13 18:59:51 2011
@@ -27,11 +27,11 @@ import com.hp.hpl.jena.rdf.model.ModelFa
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.core.DatasetGraphFactory ;
import com.hp.hpl.jena.sparql.core.Quad ;
+import com.hp.hpl.jena.sparql.graph.GraphFactory ;
import com.hp.hpl.jena.sparql.sse.Item ;
import com.hp.hpl.jena.sparql.sse.ItemList ;
import com.hp.hpl.jena.sparql.sse.Tags ;
import com.hp.hpl.jena.sparql.util.NodeUtils ;
-import com.hp.hpl.jena.sparql.util.graph.GraphFactory ;
import com.hp.hpl.jena.util.FileManager ;
public class BuilderGraph
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/Closure.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/Closure.java?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/Closure.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/Closure.java Sun Nov 13 18:59:51 2011
@@ -29,7 +29,7 @@ import com.hp.hpl.jena.rdf.model.RDFNode
import com.hp.hpl.jena.rdf.model.Resource ;
import com.hp.hpl.jena.rdf.model.Statement ;
import com.hp.hpl.jena.rdf.model.StmtIterator ;
-import com.hp.hpl.jena.sparql.util.graph.GraphFactory ;
+import com.hp.hpl.jena.sparql.graph.GraphFactory ;
public class Closure
{
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/DatasetUtils.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/DatasetUtils.java?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/DatasetUtils.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/DatasetUtils.java Sun Nov 13 18:59:51 2011
@@ -27,10 +27,10 @@ import com.hp.hpl.jena.n3.IRIResolver ;
import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.query.DatasetFactory ;
import com.hp.hpl.jena.rdf.model.Model ;
-import com.hp.hpl.jena.sparql.core.DatasetDesc ;
+import com.hp.hpl.jena.sparql.core.DatasetDescription ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.core.DatasetGraphFactory ;
-import com.hp.hpl.jena.sparql.util.graph.GraphFactory ;
+import com.hp.hpl.jena.sparql.graph.GraphFactory ;
import com.hp.hpl.jena.util.FileManager ;
/** Internal Dataset/DataSource factory + graph equivalents. */
@@ -59,17 +59,18 @@ public class DatasetUtils
public static Dataset createDataset(List<String> uriList, List<String> namedSourceList,
FileManager fileManager, String baseURI)
{
- Dataset ds = DatasetFactory.createMem() ;
+ // Fixed dataset - any GRAPH <notThere> in a query must return no match.
+ Dataset ds = DatasetFactory.createMemFixed() ;
addInGraphs(ds, uriList, namedSourceList, fileManager, baseURI) ;
return ds ;
}
- public static Dataset createDataset(DatasetDesc datasetDesc)
+ public static Dataset createDataset(DatasetDescription datasetDesc)
{
return createDataset(datasetDesc.getDefaultGraphURIs(), datasetDesc.getNamedGraphURIs(), null, null) ;
}
- public static Dataset createDataset(DatasetDesc datasetDesc,
+ public static Dataset createDataset(DatasetDescription datasetDesc,
FileManager fileManager, String baseURI)
{
return createDataset(datasetDesc.getDefaultGraphURIs(), datasetDesc.getNamedGraphURIs(), fileManager, baseURI) ;
@@ -127,12 +128,12 @@ public class DatasetUtils
// ---- DatasetGraph level.
- public static DatasetGraph createDatasetGraph(DatasetDesc datasetDesc)
+ public static DatasetGraph createDatasetGraph(DatasetDescription datasetDesc)
{
return createDatasetGraph(datasetDesc.getDefaultGraphURIs(), datasetDesc.getNamedGraphURIs(), null, null) ;
}
- public static DatasetGraph createDatasetGraph(DatasetDesc datasetDesc,
+ public static DatasetGraph createDatasetGraph(DatasetDescription datasetDesc,
FileManager fileManager, String baseURI)
{
return createDatasetGraph(datasetDesc.getDefaultGraphURIs(), datasetDesc.getNamedGraphURIs(), fileManager, baseURI) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/NodeUtils.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/NodeUtils.java?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/NodeUtils.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/NodeUtils.java Sun Nov 13 18:59:51 2011
@@ -18,7 +18,10 @@
package com.hp.hpl.jena.sparql.util;
+import java.util.Collection ;
+import java.util.HashSet ;
import java.util.Iterator ;
+import java.util.Set ;
import org.openjena.atlas.lib.StrUtils ;
@@ -95,6 +98,14 @@ public class NodeUtils
return conv ;
}
+ public static Set<Node> convertToNodes(Collection<String> uris)
+ {
+ Set<Node> nodes = new HashSet<Node>() ;
+ for ( String x : uris )
+ nodes.add(Node.createURI(x)) ;
+ return nodes ;
+ }
+
/** Compare two Nodes, based on their RDF terms forms, not value */
public static int compareRDFTerms(Node node1, Node node2)
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/web/HttpResponseLib.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/web/HttpResponseLib.java?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/web/HttpResponseLib.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/web/HttpResponseLib.java Sun Nov 13 18:59:51 2011
@@ -37,8 +37,8 @@ import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.query.ResultSet ;
import com.hp.hpl.jena.query.ResultSetFactory ;
+import com.hp.hpl.jena.sparql.graph.GraphFactory ;
import com.hp.hpl.jena.sparql.resultset.ResultsFormat ;
-import com.hp.hpl.jena.sparql.util.graph.GraphFactory ;
/** A collection of handlers for response handling.
* @see HttpOp#execHttpGet(String, String, java.util.Map)
Modified: incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/TS_General.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/TS_General.java?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/TS_General.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/TS_General.java Sun Nov 13 18:59:51 2011
@@ -22,7 +22,7 @@ package com.hp.hpl.jena.sparql;
import junit.framework.TestSuite ;
import com.hp.hpl.jena.sparql.core.TestContext ;
-import com.hp.hpl.jena.sparql.core.TestDatasetDataSource ;
+import com.hp.hpl.jena.sparql.core.TestDatasetMem ;
import com.hp.hpl.jena.sparql.core.TestDatasetGraphMem ;
import com.hp.hpl.jena.sparql.core.TestDatasetGraphMemTriplesQuads ;
import com.hp.hpl.jena.sparql.core.TestEsc ;
@@ -45,7 +45,7 @@ public class TS_General extends TestSuit
addTest(TestEsc.suite()) ;
addTest(TestSerialization.suite()) ;
addTest(TestContext.suite()) ;
- addTest(TestDatasetDataSource.suite()) ;
+ addTest(TestDatasetMem.suite()) ;
addTest(TestDatasetGraphMem.suite()) ;
addTest(TestDatasetGraphMemTriplesQuads.suite()) ;
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/api/TestAPI.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/api/TestAPI.java?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/api/TestAPI.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/api/TestAPI.java Sun Nov 13 18:59:51 2011
@@ -33,7 +33,7 @@ import com.hp.hpl.jena.query.Syntax ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.Property ;
import com.hp.hpl.jena.rdf.model.Resource ;
-import com.hp.hpl.jena.sparql.util.graph.GraphFactory ;
+import com.hp.hpl.jena.sparql.graph.GraphFactory ;
import com.hp.hpl.jena.vocabulary.OWL ;
public class TestAPI extends BaseTest
Modified: incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/api/TestQueryExecutionCancel.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/api/TestQueryExecutionCancel.java?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/api/TestQueryExecutionCancel.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/api/TestQueryExecutionCancel.java Sun Nov 13 18:59:51 2011
@@ -33,7 +33,7 @@ import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.Property ;
import com.hp.hpl.jena.rdf.model.Resource ;
import com.hp.hpl.jena.sparql.function.FunctionRegistry ;
-import com.hp.hpl.jena.sparql.util.graph.GraphFactory ;
+import com.hp.hpl.jena.sparql.graph.GraphFactory ;
public class TestQueryExecutionCancel extends BaseTest {
Modified: incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/api/TestQueryExecutionTimeout.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/api/TestQueryExecutionTimeout.java?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/api/TestQueryExecutionTimeout.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/api/TestQueryExecutionTimeout.java Sun Nov 13 18:59:51 2011
@@ -44,7 +44,7 @@ import com.hp.hpl.jena.sparql.sse.SSE ;
public class TestQueryExecutionTimeout extends BaseTest
{
static Graph g = SSE.parseGraph("(graph (<s> <p> <o1>) (<s> <p> <o2>) (<s> <p> <o3>))") ;
- static DatasetGraph dsg = DatasetGraphFactory.create(g) ;
+ static DatasetGraph dsg = DatasetGraphFactory.createOneGraph(g) ;
static Dataset ds = DatasetFactory.create(dsg) ;
private static final String ns = "http://example/ns#" ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/core/DatasetGraphTests.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/core/DatasetGraphTests.java?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/core/DatasetGraphTests.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/core/DatasetGraphTests.java Sun Nov 13 18:59:51 2011
@@ -32,8 +32,8 @@ import org.openjena.atlas.iterator.Iter
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.sparql.graph.GraphFactory ;
import com.hp.hpl.jena.sparql.sse.SSE ;
-import com.hp.hpl.jena.sparql.util.graph.GraphFactory ;
public abstract class DatasetGraphTests
{
Modified: incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/core/TestDataset.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/core/TestDataset.java?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/core/TestDataset.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/core/TestDataset.java Sun Nov 13 18:59:51 2011
@@ -37,7 +37,8 @@ import com.hp.hpl.jena.rdf.model.Resourc
public abstract class TestDataset
{
- protected abstract Dataset create() ;
+ // Assumes a dadatset which need explicit add graph
+ protected abstract Dataset createFixed() ;
static Model model1 = ModelFactory.createDefaultModel() ;
static Model model2 = ModelFactory.createDefaultModel() ;
@@ -56,38 +57,23 @@ public abstract class TestDataset
model2.add(s2, p2, o2) ;
}
- /*
- public Model getDefaultModel() ;
- public Model getNamedModel(String uri) ;
- public boolean containsNamedModel(String uri) ;
- public Iterator<String> listNames() ;
- public Lock getLock() ;
- public DatasetGraph asDatasetGraph() ;
- public void close() ;
-
- public void setDefaultModel(Model model) ;
- public void addNamedModel(String uri, Model model) throws LabelExistsException ;
- public void removeNamedModel(String uri) ;
- public void replaceNamedModel(String uri, Model model) ;
- */
-
@Test public void dataset_01()
{
- Dataset ds = create() ;
+ Dataset ds = createFixed() ;
assertNotNull(ds.getDefaultModel()) ;
assertNotNull(ds.asDatasetGraph()) ;
}
@Test public void dataset_02()
{
- Dataset ds = create() ;
+ Dataset ds = createFixed() ;
ds.getDefaultModel().add(s1,p1,o1) ;
assertTrue(model1.isIsomorphicWith(ds.getDefaultModel())) ;
}
@Test public void datasource_01()
{
- Dataset ds = create() ;
+ Dataset ds = createFixed() ;
ds.setDefaultModel(model2) ;
assertTrue(model2.isIsomorphicWith(ds.getDefaultModel())) ;
}
@@ -95,7 +81,7 @@ public abstract class TestDataset
@Test public void datasource_02()
{
String graphName = "http://example/" ;
- Dataset ds = create() ;
+ Dataset ds = createFixed() ;
ds.addNamedModel(graphName, model1) ;
assertTrue(ds.containsNamedModel(graphName)) ;
@@ -117,7 +103,7 @@ public abstract class TestDataset
@Test public void datasource_03()
{
String graphName = "http://example/" ;
- Dataset ds = create() ;
+ Dataset ds = createFixed() ;
ds.addNamedModel(graphName, model1) ;
ds.replaceNamedModel(graphName, model2) ;
assertTrue(ds.containsNamedModel(graphName)) ;
Copied: incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetMem.java (from r1199454, incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetDataSource.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetMem.java?p2=incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetMem.java&p1=incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetDataSource.java&r1=1199454&r2=1201474&rev=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetDataSource.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetMem.java Sun Nov 13 18:59:51 2011
@@ -23,13 +23,13 @@ import junit.framework.JUnit4TestAdapter
import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.query.DatasetFactory ;
-public class TestDatasetDataSource extends TestDataset
+public class TestDatasetMem extends TestDataset
{
public static junit.framework.Test suite()
{
- return new JUnit4TestAdapter(TestDatasetDataSource.class) ;
+ return new JUnit4TestAdapter(TestDatasetMem.class) ;
}
@Override
- protected Dataset create() { return DatasetFactory.createMem() ; }
+ protected Dataset createFixed() { return DatasetFactory.createMemFixed() ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphsMem.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphsMem.java?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphsMem.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphsMem.java Sun Nov 13 18:59:51 2011
@@ -25,7 +25,6 @@ import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.query.DatasetFactory ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.core.DatasetGraphFactory ;
-import com.hp.hpl.jena.sparql.util.graph.GraphFactory ;
/** Test the test for datasets and graphs */
public class TestGraphsMem extends GraphsTests
Modified: incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateBase.java?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateBase.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateBase.java Sun Nov 13 18:59:51 2011
@@ -23,7 +23,7 @@ import junit.framework.TestCase ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
-import com.hp.hpl.jena.sparql.util.graph.GraphFactory ;
+import com.hp.hpl.jena.sparql.graph.GraphFactory ;
import com.hp.hpl.jena.update.GraphStore ;
import com.hp.hpl.jena.update.UpdateAction ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateGraph.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateGraph.java?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateGraph.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateGraph.java Sun Nov 13 18:59:51 2011
@@ -31,6 +31,7 @@ import com.hp.hpl.jena.sparql.core.Quad
import com.hp.hpl.jena.sparql.core.Var ;
import com.hp.hpl.jena.sparql.engine.binding.Binding ;
import com.hp.hpl.jena.sparql.engine.binding.BindingFactory ;
+import com.hp.hpl.jena.sparql.graph.GraphFactory ;
import com.hp.hpl.jena.sparql.modify.request.QuadAcc ;
import com.hp.hpl.jena.sparql.modify.request.QuadDataAcc ;
import com.hp.hpl.jena.sparql.modify.request.Target ;
@@ -42,7 +43,6 @@ import com.hp.hpl.jena.sparql.modify.req
import com.hp.hpl.jena.sparql.sse.SSE ;
import com.hp.hpl.jena.sparql.syntax.Element ;
import com.hp.hpl.jena.sparql.util.NodeFactory ;
-import com.hp.hpl.jena.sparql.util.graph.GraphFactory ;
import com.hp.hpl.jena.update.GraphStore ;
import com.hp.hpl.jena.update.UpdateAction ;
import com.hp.hpl.jena.update.UpdateExecutionFactory ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateGraphMgt.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateGraphMgt.java?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateGraphMgt.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateGraphMgt.java Sun Nov 13 18:59:51 2011
@@ -21,9 +21,9 @@ package com.hp.hpl.jena.sparql.modify;
import org.junit.Test ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.sparql.graph.GraphFactory ;
import com.hp.hpl.jena.sparql.modify.request.UpdateCreate ;
import com.hp.hpl.jena.sparql.modify.request.UpdateDrop ;
-import com.hp.hpl.jena.sparql.util.graph.GraphFactory ;
import com.hp.hpl.jena.update.GraphStore ;
import com.hp.hpl.jena.update.Update ;
import com.hp.hpl.jena.update.UpdateAction ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/path/TestPath.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/path/TestPath.java?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/path/TestPath.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/path/TestPath.java Sun Nov 13 18:59:51 2011
@@ -36,11 +36,11 @@ import com.hp.hpl.jena.query.QueryParseE
import com.hp.hpl.jena.shared.PrefixMapping ;
import com.hp.hpl.jena.shared.impl.PrefixMappingImpl ;
import com.hp.hpl.jena.sparql.core.Prologue ;
+import com.hp.hpl.jena.sparql.graph.GraphFactory ;
import com.hp.hpl.jena.sparql.sse.Item ;
import com.hp.hpl.jena.sparql.sse.SSE ;
import com.hp.hpl.jena.sparql.sse.builders.BuilderPath ;
import com.hp.hpl.jena.sparql.sse.writers.WriterPath ;
-import com.hp.hpl.jena.sparql.util.graph.GraphFactory ;
public class TestPath
{
Modified: incubator/jena/Jena2/ARQ/trunk/src/test/java/org/openjena/riot/lang/TestLangTurtle.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/test/java/org/openjena/riot/lang/TestLangTurtle.java?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/test/java/org/openjena/riot/lang/TestLangTurtle.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/test/java/org/openjena/riot/lang/TestLangTurtle.java Sun Nov 13 18:59:51 2011
@@ -41,8 +41,8 @@ import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
import com.hp.hpl.jena.rdf.model.RDFReader ;
+import com.hp.hpl.jena.sparql.graph.GraphFactory ;
import com.hp.hpl.jena.sparql.sse.SSE ;
-import com.hp.hpl.jena.sparql.util.graph.GraphFactory ;
public class TestLangTurtle extends BaseTest
{
Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/RDQL-SPARQL.txt
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/RDQL-SPARQL.txt?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/RDQL-SPARQL.txt (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/RDQL-SPARQL.txt Sun Nov 13 18:59:51 2011
@@ -1,30 +1,30 @@
-Converting RDQL test suite to SPARQL
-
-Check some test have \u and some have raw UTF-8 bytes still
- test-S-01 has \u00E9
- test-S-02 has literal UTF-8 bytes
- test-S-03 has \u00E9
- test-S-04 has \u00e9
- test-S-05 has \u03b1
-
-Replace "SELECT *"
-(NB printing fixed)
-
-Fix by adding str()
-
-To Do:
-
-1/ Check for uses of str() latr when URI equals agreed (and implemented)
-
-2/ Check manifest for commented out tests
-
-3/ Reduce duplications.
-
-Known outstanding:
-
-A/ Tests involving string compares of URIs don't work.
- test-A-01.rq
- test-A-02.rq
-
-B/ Uses of model9.n3 commented out
+Converting RDQL test suite to SPARQL
+
+Check some test have \u and some have raw UTF-8 bytes still
+ test-S-01 has \u00E9
+ test-S-02 has literal UTF-8 bytes
+ test-S-03 has \u00E9
+ test-S-04 has \u00e9
+ test-S-05 has \u03b1
+
+Replace "SELECT *"
+(NB printing fixed)
+
+Fix by adding str()
+
+To Do:
+
+1/ Check for uses of str() latr when URI equals agreed (and implemented)
+
+2/ Check manifest for commented out tests
+
+3/ Reduce duplications.
+
+Known outstanding:
+
+A/ Tests involving string compares of URIs don't work.
+ test-A-01.rq
+ test-A-02.rq
+
+B/ Uses of model9.n3 commented out
Has illegal langtag&datatype literals
\ No newline at end of file
Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/ValueTesting/xsd-string-gt.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/ValueTesting/xsd-string-gt.rq?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/ValueTesting/xsd-string-gt.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/ValueTesting/xsd-string-gt.rq Sun Nov 13 18:59:51 2011
@@ -1,9 +1,9 @@
-PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
-SELECT ?name
-WHERE {
- _:someone foaf:name ?name .
- FILTER ( ?name > "M"^^xsd:string )
-}
-
-
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
+SELECT ?name
+WHERE {
+ _:someone foaf:name ?name .
+ FILTER ( ?name > "M"^^xsd:string )
+}
+
+
Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/ValueTesting/xsd-string-lt.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/ValueTesting/xsd-string-lt.rq?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/ValueTesting/xsd-string-lt.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/ValueTesting/xsd-string-lt.rq Sun Nov 13 18:59:51 2011
@@ -1,8 +1,8 @@
-PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
-SELECT ?name
-WHERE {
- _:someone foaf:name ?name .
- FILTER ( ?name < "M"^^xsd:string )
-}
-
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
+SELECT ?name
+WHERE {
+ _:someone foaf:name ?name .
+ FILTER ( ?name < "M"^^xsd:string )
+}
+
Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/makeResults
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/makeResults?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/makeResults (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/makeResults Sun Nov 13 18:59:51 2011
@@ -1,19 +1,19 @@
-#!/bin/bash
-
-DATA=${DATA:-data.ttl}
-for q in "$@"
-do
- QUERY=$q
- RESULTS="$(basename $q .rq)-result.srx"
- sparql --data "$DATA" --query "$QUERY" --results srx > $RESULTS
- # Fragment of manifest
- cat <<EOF
- [ mf:name "$QUERY" ;
- mf:action
- [ qt:query <$QUERY> ;
- qt:data <$DATA> ] ;
- mf:result <$RESULTS>
- ]
-EOF
-
- done
+#!/bin/bash
+
+DATA=${DATA:-data.ttl}
+for q in "$@"
+do
+ QUERY=$q
+ RESULTS="$(basename $q .rq)-result.srx"
+ sparql --data "$DATA" --query "$QUERY" --results srx > $RESULTS
+ # Fragment of manifest
+ cat <<EOF
+ [ mf:name "$QUERY" ;
+ mf:action
+ [ qt:query <$QUERY> ;
+ qt:data <$DATA> ] ;
+ mf:result <$RESULTS>
+ ]
+EOF
+
+ done
Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/manifest-arq.ttl
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/manifest-arq.ttl?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/manifest-arq.ttl (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/manifest-arq.ttl Sun Nov 13 18:59:51 2011
@@ -1,72 +1,72 @@
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix mf: <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> .
-@prefix mfx: <http://jena.hpl.hp.com/2005/05/test-manifest-extra#> .
-@prefix qt: <http://www.w3.org/2001/sw/DataAccess/tests/test-query#> .
-
-<> rdf:type mf:Manifest ;
- rdfs:label "ARQ - Scripts" ;
- mfx:include (
- ## Syntax tests are in <Syntax/manifest-syntax.ttl>
- ## but called by a different test suite for separate
- ## testing runs
-
- <Basic/manifest.ttl>
- <BasicPatterns/manifest.n3>
-
- <Optional/manifest.ttl>
- <Union/manifest.ttl>
-
- <Algebra/manifest.ttl>
- <Optimization/manifest.ttl>
-
- <Select/manifest.ttl>
- <Construct/manifest.ttl>
- <Describe/manifest.ttl>
- <Ask/manifest.ttl>
-
- <Dataset/manifest.ttl>
-
- <Bound/manifest.n3>
- <Expr/manifest.ttl>
-
- <Expr/manifest.ttl>
- <Expr1/manifest.n3>
- <Expr2/manifest.n3>
- <ExprBuiltIns/manifest.ttl>
- <ExprDatatypes/manifest.ttl>
- <ExprEquals/manifest.n3>
- <ExprRegex/manifest.ttl>
- <OpenWorld/manifest.ttl>
-
- <Function/manifest.ttl>
- <PropertyFunctions/manifest.ttl>
- <TypePromotion/manifest.ttl>
-
- <OrderBy/manifest.ttl> # DAWG tests/data/sort
- <ValueTesting/manifest.n3>
- <SolutionSeq/manifest.ttl>
-
- <Planning/manifest.ttl>
-
- <General/manifest.ttl>
-
- <Distinct/manifest.ttl>
- <Sort/manifest.ttl>
- ## References the src-examples area - does not work in build.
- ##<Examples/manifest.ttl>
-
-
- ## Engines
- <EngineRef/manifest.ttl>
- <EngineMain/manifest.ttl>
-
- ## ARQ extensions
- <Assign/manifest.ttl>
- <SelectExpr/manifest.ttl>
- <GroupBy/manifest.ttl>
- <SubQuery/manifest.ttl>
- <Paths/manifest.ttl>
- <Negation/manifest.ttl>
- ) .
-
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix mf: <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> .
+@prefix mfx: <http://jena.hpl.hp.com/2005/05/test-manifest-extra#> .
+@prefix qt: <http://www.w3.org/2001/sw/DataAccess/tests/test-query#> .
+
+<> rdf:type mf:Manifest ;
+ rdfs:label "ARQ - Scripts" ;
+ mfx:include (
+ ## Syntax tests are in <Syntax/manifest-syntax.ttl>
+ ## but called by a different test suite for separate
+ ## testing runs
+
+ <Basic/manifest.ttl>
+ <BasicPatterns/manifest.n3>
+
+ <Optional/manifest.ttl>
+ <Union/manifest.ttl>
+
+ <Algebra/manifest.ttl>
+ <Optimization/manifest.ttl>
+
+ <Select/manifest.ttl>
+ <Construct/manifest.ttl>
+ <Describe/manifest.ttl>
+ <Ask/manifest.ttl>
+
+ <Dataset/manifest.ttl>
+
+ <Bound/manifest.n3>
+ <Expr/manifest.ttl>
+
+ <Expr/manifest.ttl>
+ <Expr1/manifest.n3>
+ <Expr2/manifest.n3>
+ <ExprBuiltIns/manifest.ttl>
+ <ExprDatatypes/manifest.ttl>
+ <ExprEquals/manifest.n3>
+ <ExprRegex/manifest.ttl>
+ <OpenWorld/manifest.ttl>
+
+ <Function/manifest.ttl>
+ <PropertyFunctions/manifest.ttl>
+ <TypePromotion/manifest.ttl>
+
+ <OrderBy/manifest.ttl> # DAWG tests/data/sort
+ <ValueTesting/manifest.n3>
+ <SolutionSeq/manifest.ttl>
+
+ <Planning/manifest.ttl>
+
+ <General/manifest.ttl>
+
+ <Distinct/manifest.ttl>
+ <Sort/manifest.ttl>
+ ## References the src-examples area - does not work in build.
+ ##<Examples/manifest.ttl>
+
+
+ ## Engines
+ <EngineRef/manifest.ttl>
+ <EngineMain/manifest.ttl>
+
+ ## ARQ extensions
+ <Assign/manifest.ttl>
+ <SelectExpr/manifest.ttl>
+ <GroupBy/manifest.ttl>
+ <SubQuery/manifest.ttl>
+ <Paths/manifest.ttl>
+ <Negation/manifest.ttl>
+ ) .
+
Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/manifest-ref-arq.ttl
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/manifest-ref-arq.ttl?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/manifest-ref-arq.ttl (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/manifest-ref-arq.ttl Sun Nov 13 18:59:51 2011
@@ -1,74 +1,74 @@
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix mf: <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> .
-@prefix mfx: <http://jena.hpl.hp.com/2005/05/test-manifest-extra#> .
-@prefix qt: <http://www.w3.org/2001/sw/DataAccess/tests/test-query#> .
-
-<> rdf:type mf:Manifest ;
- rdfs:label "ARQ - Scripts (Reference Query Engine)" ;
- mfx:include (
- ## Syntax tests are in <Syntax/manifest-syntax.ttl>
- ## but called by a different test suite for separate
- ## testing runs
-
- <Basic/manifest.ttl>
- <BasicPatterns/manifest.n3>
-
- <Optional/manifest.ttl>
- <Union/manifest.ttl>
-
- <Algebra/manifest.ttl>
- <Optimization/manifest.ttl>
-
- <Select/manifest.ttl>
- <Construct/manifest.ttl>
- <Describe/manifest.ttl>
- <Ask/manifest.ttl>
-
- <Dataset/manifest.n3>
-
- <Bound/manifest.n3>
- <Expr/manifest.ttl>
-
- <Expr/manifest.ttl>
- <Expr1/manifest.n3>
- <Expr2/manifest.n3>
- <ExprBuiltIns/manifest.ttl>
- <ExprDatatypes/manifest.ttl>
- <ExprEquals/manifest.n3>
- <ExprRegex/manifest.ttl>
- <OpenWorld/manifest.ttl>
-
- <Function/manifest.ttl>
-
-## Property functions not full covered by the reference query engine.
-## because of order of execution (variables bound between different
-## operators - see testing/PropertyFunctions/splitIRI-09.rq
-
-## <PropertyFunctions/manifest.ttl>
- <TypePromotion/manifest.ttl>
-
- <OrderBy/manifest.ttl> # DAWG tests/data/sort
- <ValueTesting/manifest.n3>
- <SolutionSeq/manifest.ttl>
-
- <Planning/manifest.ttl>
-
- <General/manifest.ttl>
-
- <Distinct/manifest.ttl>
- <Sort/manifest.ttl>
-## More property functions
-## <Examples/manifest.ttl>
-
-## ## Engines
-## <EngineRef/manifest.ttl>
-## <EngineMain/manifest.ttl>
-
- ## ARQ extensions
- <Assign/manifest.ttl>
- <GroupBy/manifest.ttl>
- <SubQuery/manifest.ttl>
- <Paths/manifest.ttl>
- ) .
-
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix mf: <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> .
+@prefix mfx: <http://jena.hpl.hp.com/2005/05/test-manifest-extra#> .
+@prefix qt: <http://www.w3.org/2001/sw/DataAccess/tests/test-query#> .
+
+<> rdf:type mf:Manifest ;
+ rdfs:label "ARQ - Scripts (Reference Query Engine)" ;
+ mfx:include (
+ ## Syntax tests are in <Syntax/manifest-syntax.ttl>
+ ## but called by a different test suite for separate
+ ## testing runs
+
+ <Basic/manifest.ttl>
+ <BasicPatterns/manifest.n3>
+
+ <Optional/manifest.ttl>
+ <Union/manifest.ttl>
+
+ <Algebra/manifest.ttl>
+ <Optimization/manifest.ttl>
+
+ <Select/manifest.ttl>
+ <Construct/manifest.ttl>
+ <Describe/manifest.ttl>
+ <Ask/manifest.ttl>
+
+ <Dataset/manifest.n3>
+
+ <Bound/manifest.n3>
+ <Expr/manifest.ttl>
+
+ <Expr/manifest.ttl>
+ <Expr1/manifest.n3>
+ <Expr2/manifest.n3>
+ <ExprBuiltIns/manifest.ttl>
+ <ExprDatatypes/manifest.ttl>
+ <ExprEquals/manifest.n3>
+ <ExprRegex/manifest.ttl>
+ <OpenWorld/manifest.ttl>
+
+ <Function/manifest.ttl>
+
+## Property functions not full covered by the reference query engine.
+## because of order of execution (variables bound between different
+## operators - see testing/PropertyFunctions/splitIRI-09.rq
+
+## <PropertyFunctions/manifest.ttl>
+ <TypePromotion/manifest.ttl>
+
+ <OrderBy/manifest.ttl> # DAWG tests/data/sort
+ <ValueTesting/manifest.n3>
+ <SolutionSeq/manifest.ttl>
+
+ <Planning/manifest.ttl>
+
+ <General/manifest.ttl>
+
+ <Distinct/manifest.ttl>
+ <Sort/manifest.ttl>
+## More property functions
+## <Examples/manifest.ttl>
+
+## ## Engines
+## <EngineRef/manifest.ttl>
+## <EngineMain/manifest.ttl>
+
+ ## ARQ extensions
+ <Assign/manifest.ttl>
+ <GroupBy/manifest.ttl>
+ <SubQuery/manifest.ttl>
+ <Paths/manifest.ttl>
+ ) .
+
Modified: incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/basic/quotes-1.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/basic/quotes-1.rq?rev=1201474&r1=1201473&r2=1201474&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/basic/quotes-1.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/DAWG-Final/basic/quotes-1.rq Sun Nov 13 18:59:51 2011
@@ -1,6 +1,6 @@
-PREFIX : <http://example.org/ns#>
-
-SELECT ?x
-{ ?x ?p '''x''' }
-
-
+PREFIX : <http://example.org/ns#>
+
+SELECT ?x
+{ ?x ?p '''x''' }
+
+