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 2013/01/08 19:43:57 UTC
svn commit: r1430439 [1/4] - in /jena/branches/streaming-update/jena-arq: ./
Grammar/ Vocabularies/ bin/ bin2/ src-examples/arq/examples/riot/
src-examples/arq/examples/update/ src/main/java/arq/
src/main/java/arq/cmdline/ src/main/java/com/hp/hpl/jena...
Author: andy
Date: Tue Jan 8 18:43:53 2013
New Revision: 1430439
URL: http://svn.apache.org/viewvc?rev=1430439&view=rev
Log:
Sync to ARQ 2.10.0 dev trunk
Added:
jena/branches/streaming-update/jena-arq/Vocabularies/EARL-v0.rdf
- copied unchanged from r1430205, jena/trunk/jena-arq/Vocabularies/EARL-v0.rdf
jena/branches/streaming-update/jena-arq/Vocabularies/EARL.rdf
- copied unchanged from r1430205, jena/trunk/jena-arq/Vocabularies/EARL.rdf
jena/branches/streaming-update/jena-arq/bin/rdfxml
- copied unchanged from r1430205, jena/trunk/jena-arq/bin/rdfxml
jena/branches/streaming-update/jena-arq/bin2/rdfxml
- copied unchanged from r1430205, jena/trunk/jena-arq/bin2/rdfxml
jena/branches/streaming-update/jena-arq/src-examples/arq/examples/riot/ExRIOT_4.java
- copied unchanged from r1430205, jena/trunk/jena-arq/src-examples/arq/examples/riot/ExRIOT_4.java
jena/branches/streaming-update/jena-arq/src-examples/arq/examples/riot/ExRIOT_5.java
- copied unchanged from r1430205, jena/trunk/jena-arq/src-examples/arq/examples/riot/ExRIOT_5.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/SPARQLParser.java
- copied unchanged from r1430205, jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/SPARQLParser.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/SPARQLParserFactory.java
- copied unchanged from r1430205, jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/SPARQLParserFactory.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/SPARQLParserRegistry.java
- copied unchanged from r1430205, jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/SPARQLParserRegistry.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/Lang.java
- copied unchanged from r1430205, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
- copied unchanged from r1430205, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java
- copied unchanged from r1430205, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/RIOT.java
- copied unchanged from r1430205, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RIOT.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/RiotException.java
- copied unchanged from r1430205, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RiotException.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/RiotNotFoundException.java
- copied unchanged from r1430205, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RiotNotFoundException.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/RiotParseException.java
- copied unchanged from r1430205, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RiotParseException.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
- copied unchanged from r1430205, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/RiotWriter.java
- copied unchanged from r1430205, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RiotWriter.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/SysRIOT.java
- copied unchanged from r1430205, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/SysRIOT.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/WebContent.java
- copied unchanged from r1430205, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebContent.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderFactoryRIOT.java
- copied unchanged from r1430205, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderFactoryRIOT.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT.java
- copied unchanged from r1430205, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT_ARP.java
- copied unchanged from r1430205, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT_ARP.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/checker/
- copied from r1430205, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/lang/
- copied from r1430205, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/out/
- copied from r1430205, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/process/
- copied from r1430205, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/stream/LocationMapper.java
- copied unchanged from r1430205, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocationMapper.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorFile.java
- copied unchanged from r1430205, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorFile.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL.java
- copied unchanged from r1430205, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/system/
- copied from r1430205, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/tokens/
- copied from r1430205, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/web/
- copied from r1430205, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/
jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/rdfxml.java
- copied unchanged from r1430205, jena/trunk/jena-arq/src/main/java/riotcmd/rdfxml.java
jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/ErrorHandlerTestLib.java
- copied unchanged from r1430205, jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/ErrorHandlerTestLib.java
jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TestReadData.java
- copied unchanged from r1430205, jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestReadData.java
jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/VocabTestRIOT.java
- copied unchanged from r1430205, jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/VocabTestRIOT.java
jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/lang/
- copied from r1430205, jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/
jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/out/
- copied from r1430205, jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/
jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/process/
- copied from r1430205, jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/process/
jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/system/
- copied from r1430205, jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/
jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/tokens/
- copied from r1430205, jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/tokens/
jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/web/
- copied from r1430205, jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/web/
jena/branches/streaming-update/jena-arq/testing/RIOT/Lang/Turtle/turtle-syntax-struct-04.ttl
- copied unchanged from r1430205, jena/trunk/jena-arq/testing/RIOT/Lang/Turtle/turtle-syntax-struct-04.ttl
jena/branches/streaming-update/jena-arq/testing/RIOT/Lang/Turtle/turtle-syntax-struct-05.ttl
- copied unchanged from r1430205, jena/trunk/jena-arq/testing/RIOT/Lang/Turtle/turtle-syntax-struct-05.ttl
Removed:
jena/branches/streaming-update/jena-arq/Vocabularies/EARL.ttl
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingIndex.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/Reifier2.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/Parser.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/ParserFactory.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/ParserRegistry.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/HttpOp2.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/IO_Dataset.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/IO_Model.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/Lang2.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/ParserRegistry.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/RDFReaderFactoryRIOT.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/RDFReaderRIOT.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/RDFReaderRIOT_ARP.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/TypedInputStream2.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/TypedInputStreamHttp.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/WebReader2.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/stream/LocationMapper2.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorFile2.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL2.java
jena/branches/streaming-update/jena-arq/src/main/java/org/openjena/riot/ErrorHandler.java
jena/branches/streaming-update/jena-arq/src/main/java/org/openjena/riot/ErrorHandlerFactory.java
jena/branches/streaming-update/jena-arq/src/main/java/org/openjena/riot/LangTag.java
jena/branches/streaming-update/jena-arq/src/main/java/org/openjena/riot/RiotLoader.java
jena/branches/streaming-update/jena-arq/src/main/java/org/openjena/riot/WebContent.java
jena/branches/streaming-update/jena-arq/src/main/java/org/openjena/riot/checker/
jena/branches/streaming-update/jena-arq/src/main/java/org/openjena/riot/lang/
jena/branches/streaming-update/jena-arq/src/main/java/org/openjena/riot/out/
jena/branches/streaming-update/jena-arq/src/main/java/org/openjena/riot/process/
jena/branches/streaming-update/jena-arq/src/main/java/org/openjena/riot/system/
jena/branches/streaming-update/jena-arq/src/main/java/org/openjena/riot/tokens/
jena/branches/streaming-update/jena-arq/src/main/java/org/openjena/riot/web/
jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestReifier2.java
jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TestReadDataset.java
jena/branches/streaming-update/jena-arq/src/test/java/org/openjena/riot/ErrorHandlerTestLib.java
jena/branches/streaming-update/jena-arq/src/test/java/org/openjena/riot/TS_Riot1.java
jena/branches/streaming-update/jena-arq/src/test/java/org/openjena/riot/TestChecker.java
jena/branches/streaming-update/jena-arq/src/test/java/org/openjena/riot/TestLangTag.java
jena/branches/streaming-update/jena-arq/src/test/java/org/openjena/riot/TestPrefixMap.java
jena/branches/streaming-update/jena-arq/src/test/java/org/openjena/riot/TestVocabRIOT.java
jena/branches/streaming-update/jena-arq/src/test/java/org/openjena/riot/TestWebContent.java
jena/branches/streaming-update/jena-arq/src/test/java/org/openjena/riot/lang/
jena/branches/streaming-update/jena-arq/src/test/java/org/openjena/riot/langsuite/
jena/branches/streaming-update/jena-arq/src/test/java/org/openjena/riot/out/TestNodeFmt.java
jena/branches/streaming-update/jena-arq/src/test/java/org/openjena/riot/out/TestNodeFmtLib.java
jena/branches/streaming-update/jena-arq/src/test/java/org/openjena/riot/out/TestOutput.java
jena/branches/streaming-update/jena-arq/src/test/java/org/openjena/riot/out/TestOutputNTriples.java
jena/branches/streaming-update/jena-arq/src/test/java/org/openjena/riot/out/TestOutputRDFJSON.java
jena/branches/streaming-update/jena-arq/src/test/java/org/openjena/riot/process/
jena/branches/streaming-update/jena-arq/src/test/java/org/openjena/riot/tokens/
Modified:
jena/branches/streaming-update/jena-arq/ (props changed)
jena/branches/streaming-update/jena-arq/Grammar/arq.jj
jena/branches/streaming-update/jena-arq/Grammar/master.jj
jena/branches/streaming-update/jena-arq/Grammar/sparql_11.jj
jena/branches/streaming-update/jena-arq/NOTICE
jena/branches/streaming-update/jena-arq/ReleaseNotes.txt
jena/branches/streaming-update/jena-arq/Vocabularies/build
jena/branches/streaming-update/jena-arq/bin/make_classpath_mvn
jena/branches/streaming-update/jena-arq/log4j.properties
jena/branches/streaming-update/jena-arq/pom.xml
jena/branches/streaming-update/jena-arq/src-examples/arq/examples/riot/ExRIOT_1.java
jena/branches/streaming-update/jena-arq/src-examples/arq/examples/riot/ExRIOT_2.java
jena/branches/streaming-update/jena-arq/src-examples/arq/examples/riot/ExRIOT_3.java
jena/branches/streaming-update/jena-arq/src-examples/arq/examples/update/UpdateExecuteOperations.java
jena/branches/streaming-update/jena-arq/src-examples/arq/examples/update/UpdateProgrammatic.java
jena/branches/streaming-update/jena-arq/src-examples/arq/examples/update/UpdateReadFromFile.java
jena/branches/streaming-update/jena-arq/src/main/java/arq/cmdline/CmdGeneral.java
jena/branches/streaming-update/jena-arq/src/main/java/arq/cmdline/ModDatasetGeneral.java
jena/branches/streaming-update/jena-arq/src/main/java/arq/cmdline/ModLangParse.java
jena/branches/streaming-update/jena-arq/src/main/java/arq/cmdline/ModSymbol.java
jena/branches/streaming-update/jena-arq/src/main/java/arq/iri.java
jena/branches/streaming-update/jena-arq/src/main/java/arq/update.java
jena/branches/streaming-update/jena-arq/src/main/java/arq/wwwdec.java
jena/branches/streaming-update/jena-arq/src/main/java/arq/wwwenc.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryExecution.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryFactory.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpAsQuery.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCaching.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetImpl.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DynamicDatasets.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingInputStream.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingOutputStream.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/HttpQuery.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/QueryEngineHTTP.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/Service.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIteratorBase.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrUUID.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphBase2.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphDataBag.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphDefaultDataBag.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphDistinctDataBag.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphMemPlain.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphReadOnly.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphUnionRead.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphWrapper.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/ParserARQ.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/ParserBase.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/ParserSPARQL10.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/ParserSPARQL11.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineWorker.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessRemote.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessRemoteForm.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateDataWriter.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateWriter.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONInput.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/ResultsFormat.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/TSVInput.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/TSVInputIterator.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/TSVOutput.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInputStAX.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/serializer/FormatterBase.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/serializer/FormatterElement.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/serializer/QuerySerializer.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/serializer/Serializer.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/MappingRegistry.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeFactory.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/QueryUtils.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/vocabulary/EARL.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/atlas/io/Writer2.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/JSONP.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/ParserBase.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/TokenizerJSON.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/atlas/lib/StrUtils.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/atlas/logging/Log.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/atlas/web/MediaType.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/atlas/web/TypedInputStream.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/IO_Jena.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/LangBuilder.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/ReaderRIOT.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/ReaderRIOTBase.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/ReaderRIOTFactory.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLocationMapper.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLocator.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/adapters/FileManagerModelCache.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/stream/JenaIOEnvironment.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/stream/Locator.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorClassLoader.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorZip.java
jena/branches/streaming-update/jena-arq/src/main/java/org/apache/jena/riot/stream/StreamManager.java
jena/branches/streaming-update/jena-arq/src/main/java/org/openjena/riot/Lang.java
jena/branches/streaming-update/jena-arq/src/main/java/org/openjena/riot/RIOT.java
jena/branches/streaming-update/jena-arq/src/main/java/org/openjena/riot/RiotException.java
jena/branches/streaming-update/jena-arq/src/main/java/org/openjena/riot/RiotNotFoundException.java
jena/branches/streaming-update/jena-arq/src/main/java/org/openjena/riot/RiotParseException.java
jena/branches/streaming-update/jena-arq/src/main/java/org/openjena/riot/RiotParsePuller.java
jena/branches/streaming-update/jena-arq/src/main/java/org/openjena/riot/RiotQuadParsePuller.java
jena/branches/streaming-update/jena-arq/src/main/java/org/openjena/riot/RiotReader.java
jena/branches/streaming-update/jena-arq/src/main/java/org/openjena/riot/RiotTripleParsePuller.java
jena/branches/streaming-update/jena-arq/src/main/java/org/openjena/riot/RiotWriter.java
jena/branches/streaming-update/jena-arq/src/main/java/org/openjena/riot/SerializationFactoryFinder.java
jena/branches/streaming-update/jena-arq/src/main/java/org/openjena/riot/SysRIOT.java
jena/branches/streaming-update/jena-arq/src/main/java/org/openjena/riot/WebReader.java
jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/CmdLangParse.java
jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/CmdTokens.java
jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/infer.java
jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/nquads.java
jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/ntriples.java
jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/riot.java
jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/trig.java
jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/turtle.java
jena/branches/streaming-update/jena-arq/src/main/resources/META-INF/NOTICE
jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/OpAsQueryTest.java
jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TS_Core.java
jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetGraphMemTriplesQuads.java
jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetMem.java
jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDynamicDatasetMem.java
jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java
jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/AbstractTestGraph2.java
jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TS_Graph.java
jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphsDataBag.java
jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/EarlReport.java
jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java
jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/UpdateTest.java
jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateBase.java
jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSetFormat2.java
jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/atlas/junit/BaseTest.java
jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java
jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TS_LangSuite.java
jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TS_ReaderRIOT.java
jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java
jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TestLangRIOT.java
jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java
jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/langsuite/LangTestCase.java
jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadEval.java
jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntax.java
jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java
jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntax.java
jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/stream/TestLocators.java
jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java
jena/branches/streaming-update/jena-arq/src/test/java/riotcmd/rdflangtest.java
jena/branches/streaming-update/jena-arq/testing/RIOT/Lang/Turtle/manifest.ttl
jena/branches/streaming-update/jena-arq/testing/RIOT/Lang/Turtle/master
Propchange: jena/branches/streaming-update/jena-arq/
------------------------------------------------------------------------------
svn:mergeinfo = /jena/trunk/jena-arq:1415418-1430205
Modified: jena/branches/streaming-update/jena-arq/Grammar/arq.jj
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/Grammar/arq.jj?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/Grammar/arq.jj (original)
+++ jena/branches/streaming-update/jena-arq/Grammar/arq.jj Tue Jan 8 18:43:53 2013
@@ -364,6 +364,7 @@ void Update() : { }
(
Update1()
(
+ // This syntactic lookahead is necessitated by the optional trailing semicolon and prologue
LOOKAHEAD( <SEMICOLON> Prologue() ( <LOAD> | <CLEAR> | <DROP> | <ADD> |
<MOVE> | <COPY> | <CREATE> | <WITH> | <DELETE> | <INSERT> |
<USING> | <INSERT_DATA> | <DELETE_DATA> | <DELETE_WHERE> ) )
@@ -951,7 +952,7 @@ void PropertyListPathNotEmpty(Node s, Tr
( path = VerbPath()
| p = VerbSimple()
)
- ObjectList(s, p, path, acc)
+ ObjectListPath(s, p, path, acc)
)?
)*
}
Modified: jena/branches/streaming-update/jena-arq/Grammar/master.jj
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/Grammar/master.jj?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/Grammar/master.jj (original)
+++ jena/branches/streaming-update/jena-arq/Grammar/master.jj Tue Jan 8 18:43:53 2013
@@ -1159,7 +1159,7 @@ void PropertyListPathNotEmpty(Node s, Tr
( path = VerbPath()
| p = VerbSimple()
)
- ObjectList(s, p, path, acc)
+ ObjectListPath(s, p, path, acc)
)?
)*
#if 0
Modified: jena/branches/streaming-update/jena-arq/Grammar/sparql_11.jj
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/Grammar/sparql_11.jj?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/Grammar/sparql_11.jj (original)
+++ jena/branches/streaming-update/jena-arq/Grammar/sparql_11.jj Tue Jan 8 18:43:53 2013
@@ -895,7 +895,7 @@ void PropertyListPathNotEmpty(Node s, Tr
( path = VerbPath()
| p = VerbSimple()
)
- ObjectList(s, p, path, acc)
+ ObjectListPath(s, p, path, acc)
)?
)*
}
Modified: jena/branches/streaming-update/jena-arq/NOTICE
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/NOTICE?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/NOTICE (original)
+++ jena/branches/streaming-update/jena-arq/NOTICE Tue Jan 8 18:43:53 2013
@@ -1,5 +1,5 @@
Apache Jena - ARQ module
-Copyright 2011, 2012 The Apache Software Foundation
+Copyright 2011-2013 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: jena/branches/streaming-update/jena-arq/ReleaseNotes.txt
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/ReleaseNotes.txt?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/ReleaseNotes.txt (original)
+++ jena/branches/streaming-update/jena-arq/ReleaseNotes.txt Tue Jan 8 18:43:53 2013
@@ -6,6 +6,9 @@ ChangeLog for ARQ
==== Jena 2.10.0
+ Consolidation of versions numbers.
+
++ Introduce RDFParserOutput as output interface for parsers (was Sink<Triple> or Sink<Quad>)
++ RIOT - internal reorganisation moving to org.apache.jena.riot.
+ Remove the partial migration support for old-style SPARQL submission update forms.
+ Update Turtle/Trig parsers for prefixed name details in RDF 1.1
Add %-sequences, \char sequences and ':' to local part of prefixed names.
Modified: jena/branches/streaming-update/jena-arq/Vocabularies/build
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/Vocabularies/build?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/Vocabularies/build (original)
+++ jena/branches/streaming-update/jena-arq/Vocabularies/build Tue Jan 8 18:43:53 2013
@@ -4,7 +4,7 @@ function syntaxCheck
{
FILE="$1"
echo "Syntax check: $FILE"
- turtle --sink "$FILE"
+ riot --validate --sink "$FILE"
}
function proc
@@ -18,7 +18,8 @@ function proc
shift
echo "Schemagen: $FILE"
- schemagen --rdfs -i "$FILE" -n "$CLASS" -a "$NS" -o "$CLASS".java -e N3 "$@"
+ # -e syntax
+ schemagen --rdfs -i "$FILE" -n "$CLASS" -a "$NS" -o "$CLASS".java "$@"
# Add imports
echo "package com.hp.hpl.jena.sparql.vocabulary ;" >> "$TMP"
echo >>"$TMP"
@@ -41,9 +42,9 @@ function proc
## proc test-manifest.ttl TestManifest \
## "http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#"
-syntaxCheck test-manifest-1_1.ttl
-proc test-manifest-1_1.ttl TestManifest_11 \
- "http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#"
+## syntaxCheck test-manifest-1_1.ttl
+## proc test-manifest-1_1.ttl TestManifest_11 \
+## "http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#"
## syntaxCheck test-update.n3
## proc test-update.n3 TestManifestUpdate_11 \
@@ -65,8 +66,8 @@ proc test-manifest-1_1.ttl TestManifest_
##java jena.schemagen -i schema.rdf -o Earl.java -a http://www.w3.org/ns/earl# --inference
-## syntaxCheck EARL.ttl
-## proc EARL.ttl VocabEARL "http://www.w3.org/ns/earl#" --inference
+syntaxCheck EARL.rdf
+proc EARL.rdf VocabEARL "http://www.w3.org/ns/earl#"
## syntaxCheck FOAF.ttl
## proc FOAF.ttl FOAF "http://xmlns.com/foaf/0.1/"
Modified: jena/branches/streaming-update/jena-arq/bin/make_classpath_mvn
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/bin/make_classpath_mvn?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/bin/make_classpath_mvn (original)
+++ jena/branches/streaming-update/jena-arq/bin/make_classpath_mvn Tue Jan 8 18:43:53 2013
@@ -38,6 +38,7 @@ done
if [ -e "$DIRROOT/classes" ]
then
+ CP="$DIRROOT/../jena-core/classes${SEP}$CP"
CP="$DIRROOT/classes${SEP}$CP"
elif [ -e "$DIRROOT/target/classes" ]
then
Modified: jena/branches/streaming-update/jena-arq/log4j.properties
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/log4j.properties?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/log4j.properties (original)
+++ jena/branches/streaming-update/jena-arq/log4j.properties Tue Jan 8 18:43:53 2013
@@ -11,8 +11,8 @@ log4j.logger.com.hp.hpl.jena.arq.exec=IN
# Everything else in Jena
log4j.logger.com.hp.hpl.jena=WARN
-log4j.logger.org.openjena=WARN
-log4j.logger.org.openjena.riot=INFO
+log4j.logger.org.apache.jena=WARN
+log4j.logger.org.apache.jena.riot=INFO
# Joseki server
log4j.logger.org.joseki=INFO
Modified: jena/branches/streaming-update/jena-arq/pom.xml
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/pom.xml?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/pom.xml (original)
+++ jena/branches/streaming-update/jena-arq/pom.xml Tue Jan 8 18:43:53 2013
@@ -22,7 +22,7 @@
<artifactId>jena-arq</artifactId>
<packaging>jar</packaging>
<name>Apache Jena - ARQ (SPARQL 1.1 Query Engine)</name>
- <version>2.9.5-SNAPSHOT</version>
+ <version>2.10.0-SNAPSHOT</version>
<parent>
<groupId>org.apache.jena</groupId>
@@ -53,8 +53,8 @@
<properties>
<this.root>${project.artifactId}-${project.version}</this.root>
- <ver.httpclient>4.1.2</ver.httpclient>
- <ver.httpcore>4.1.3</ver.httpcore>
+ <ver.httpclient>4.2.2</ver.httpclient>
+ <ver.httpcore>4.2.3</ver.httpcore>
<ver.commons-codec>1.5</ver.commons-codec>
<maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
<build.time.xsd>${maven.build.timestamp}</build.time.xsd>
@@ -65,14 +65,14 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
- <version>2.7.5-SNAPSHOT</version>
+ <version>2.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
<classifier>tests</classifier>
- <version>2.7.5-SNAPSHOT</version>
+ <version>2.10.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
@@ -205,7 +205,7 @@
</group>
<group>
<title>RIOT</title>
- <packages>org.openjena.riot</packages>
+ <packages>org.apache.jena.riot</packages>
</group>
</groups>
<bottom>Licenced under the Apache License, Version 2.0</bottom>
Modified: jena/branches/streaming-update/jena-arq/src-examples/arq/examples/riot/ExRIOT_1.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src-examples/arq/examples/riot/ExRIOT_1.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src-examples/arq/examples/riot/ExRIOT_1.java (original)
+++ jena/branches/streaming-update/jena-arq/src-examples/arq/examples/riot/ExRIOT_1.java Tue Jan 8 18:43:53 2013
@@ -18,12 +18,16 @@
package arq.examples.riot;
-import org.openjena.riot.SysRIOT ;
+import org.apache.jena.riot.RDFDataMgr ;
+import org.apache.jena.riot.RDFLanguages ;
+import org.apache.jena.riot.RIOT ;
import com.hp.hpl.jena.rdf.model.Model ;
-import com.hp.hpl.jena.util.FileManager ;
+import com.hp.hpl.jena.rdf.model.ModelFactory ;
/** Example of using RIOT with Jena readers.
+ * Normally, the application just needs to call model.read and
+ * not interact with RIOT directly.
*/
public class ExRIOT_1
{
@@ -32,21 +36,25 @@ public class ExRIOT_1
// Ensure RIOT loaded.
// This is only needed to be sure - touching any ARQ code will load RIOT.
// This operation can be called several times.
- SysRIOT.wireIntoJena() ;
-
- Model m = null ;
+ RIOT.init() ;
+
+ Model m = ModelFactory.createDefaultModel() ;
+ // read into the model.
+ m.read("data.ttl") ;
+
+ // Alternatively, use the RDFDataMgr, which reads from the web,
+ // with content negotiation. Plain names are assumed to be
+ // local files where file extension indicates the syntax.
- // Load data, creating the model
- m = FileManager.get().loadModel("D.ttl") ;
+ Model m2 = RDFDataMgr.loadModel("data.ttl") ;
- // Or read into an existing model.
- FileManager.get().readModel(m, "D2.ttl") ;
+ // read in more data, the remote server serves up the data
+ // with the right MIME type.
+ RDFDataMgr.read(m2, "http://host/some-published-data") ;
- // Or use Model.read
- m.read("file:D3.nt", "TTL") ;
- // Go back to using the old Jena readers.
- SysRIOT.resetJenaReaders() ;
- m = FileManager.get().loadModel("D.nt") ;
+ // Read some data but also give a hint for the synatx if it is not
+ // discovered by inspectying the file or by HTTP content negotiation.
+ RDFDataMgr.read(m2, "some-more-data.out", RDFLanguages.TURTLE) ;
}
}
Modified: jena/branches/streaming-update/jena-arq/src-examples/arq/examples/riot/ExRIOT_2.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src-examples/arq/examples/riot/ExRIOT_2.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src-examples/arq/examples/riot/ExRIOT_2.java (original)
+++ jena/branches/streaming-update/jena-arq/src-examples/arq/examples/riot/ExRIOT_2.java Tue Jan 8 18:43:53 2013
@@ -22,42 +22,43 @@ import java.io.FileInputStream ;
import java.io.FileNotFoundException ;
import java.io.InputStream ;
-import org.apache.jena.atlas.lib.Sink ;
-import org.apache.jena.atlas.lib.SinkNull ;
-import org.openjena.riot.ErrorHandler ;
-import org.openjena.riot.ErrorHandlerFactory ;
-import org.openjena.riot.Lang ;
-import org.openjena.riot.RiotReader ;
-import org.openjena.riot.SysRIOT ;
-import org.openjena.riot.lang.LangRIOT ;
-import org.openjena.riot.system.ParserProfile ;
-import org.openjena.riot.system.RiotLib ;
-
-import com.hp.hpl.jena.sparql.core.Quad ;
+import org.apache.jena.riot.RDFLanguages ;
+import org.apache.jena.riot.RIOT ;
+import org.apache.jena.riot.RiotReader ;
+import org.apache.jena.riot.lang.LangRIOT ;
+import org.apache.jena.riot.system.* ;
/** Example of using RIOT directly.
+ *
+ * RDFDataMgr is the general place to read data - see {@link ExRIOT_1}
+ *
+ * RiotReader is the place for making parsers and can be used to read
+ * from files or InputStreams. It can give more detailed control of error handling
+ * and specialised destination of parser output.
+ * It does not perform HTTP content negotiation.
*/
public class ExRIOT_2
{
public static void main(String...argv) throws FileNotFoundException
{
// Ensure RIOT loaded.
- SysRIOT.wireIntoJena() ;
-
- Sink<Quad> noWhere = new SinkNull<Quad>() ;
+ RIOT.init() ;
// ---- Parse to a Sink.
+ StreamRDF noWhere = StreamRDFLib.sinkNull() ;
+
// RIOT controls the conversion from bytes to java chars.
InputStream in = new FileInputStream("data.trig") ;
- RiotReader.parseQuads(in, Lang.TRIG, "http://example/base", noWhere) ;
-
+ RiotReader.parse(in, RDFLanguages.TRIG, "http://example/base", noWhere) ;
// --- Or create a parser and do the parsing as separate steps.
String baseURI = "http://example/base" ;
+ // It is always better to use an InputStream, rather than a Java Reader.
+ // The parsers will do the necessary character set conversion.
in = new FileInputStream("data.trig") ;
- LangRIOT parser = RiotReader.createParserQuads(in, Lang.TRIG, "http://example/base", noWhere) ;
+ LangRIOT parser = RiotReader.createParser(in, RDFLanguages.TRIG, "http://example/base", noWhere) ;
// Parser to first error or warning.
ErrorHandler errHandler = ErrorHandlerFactory.errorHandlerStrict ;
@@ -68,7 +69,7 @@ public class ExRIOT_2
// Just set the error handler.
parser.getProfile().setHandler(errHandler) ;
- // Or replave the whole parser profile.
+ // Or replace the whole parser profile.
parser.setProfile(profile) ;
// Do the work.
Modified: jena/branches/streaming-update/jena-arq/src-examples/arq/examples/riot/ExRIOT_3.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src-examples/arq/examples/riot/ExRIOT_3.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src-examples/arq/examples/riot/ExRIOT_3.java (original)
+++ jena/branches/streaming-update/jena-arq/src-examples/arq/examples/riot/ExRIOT_3.java Tue Jan 8 18:43:53 2013
@@ -18,15 +18,14 @@
package arq.examples.riot;
-import org.openjena.riot.RiotLoader ;
-import org.openjena.riot.SysRIOT ;
+import static org.apache.jena.riot.RDFLanguages.TRIG ;
+import org.apache.jena.riot.RDFDataMgr ;
+import org.apache.jena.riot.RIOT ;
import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.query.DatasetFactory ;
-import com.hp.hpl.jena.sparql.core.DatasetGraph ;
-/** Example of using RIOT : reading dada into datasets.
- */
+/** Example of using RIOT : reading data into datasets. */
public class ExRIOT_3
{
public static void main(String...argv)
@@ -34,19 +33,19 @@ public class ExRIOT_3
// Ensure RIOT loaded.
// This is only needed to be sure - touching any ARQ code will load RIOT.
// This operation can be called several times.
- SysRIOT.wireIntoJena() ;
- DatasetGraph dsg = null ;
+ RIOT.init() ;
+ Dataset ds = null ;
// Read a TriG file into quad storage in-memory.
- dsg = RiotLoader.load("data.trig") ;
+ ds = RDFDataMgr.loadDataset("data.trig") ;
// read some (more) data into a dataset graph.
- RiotLoader.read("data2.trig", dsg) ;
+ RDFDataMgr.read(ds, "data2.trig") ;
// Create a dataset,
- Dataset ds = DatasetFactory.createMem() ;
- // read in data.
- RiotLoader.read("data2.trig", ds.asDatasetGraph()) ;
-
+ Dataset ds2 = DatasetFactory.createMem() ;
+ // read in data, indicating the syntax in case the remote end does not
+ // correctly provide the HTTP content type.
+ RDFDataMgr.read(ds2, "http://host/data2.unknown", TRIG) ;
}
}
Modified: jena/branches/streaming-update/jena-arq/src-examples/arq/examples/update/UpdateExecuteOperations.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src-examples/arq/examples/update/UpdateExecuteOperations.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src-examples/arq/examples/update/UpdateExecuteOperations.java (original)
+++ jena/branches/streaming-update/jena-arq/src-examples/arq/examples/update/UpdateExecuteOperations.java Tue Jan 8 18:43:53 2013
@@ -19,7 +19,7 @@
package arq.examples.update;
import org.apache.jena.atlas.lib.StrUtils ;
-import org.openjena.riot.RiotWriter ;
+import org.apache.jena.riot.RiotWriter ;
import com.hp.hpl.jena.sparql.sse.SSE ;
import com.hp.hpl.jena.update.GraphStore ;
Modified: jena/branches/streaming-update/jena-arq/src-examples/arq/examples/update/UpdateProgrammatic.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src-examples/arq/examples/update/UpdateProgrammatic.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src-examples/arq/examples/update/UpdateProgrammatic.java (original)
+++ jena/branches/streaming-update/jena-arq/src-examples/arq/examples/update/UpdateProgrammatic.java Tue Jan 8 18:43:53 2013
@@ -18,7 +18,7 @@
package arq.examples.update;
-import org.openjena.riot.RiotWriter ;
+import org.apache.jena.riot.RiotWriter ;
import com.hp.hpl.jena.sparql.modify.request.Target ;
import com.hp.hpl.jena.sparql.modify.request.UpdateCreate ;
Modified: jena/branches/streaming-update/jena-arq/src-examples/arq/examples/update/UpdateReadFromFile.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src-examples/arq/examples/update/UpdateReadFromFile.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src-examples/arq/examples/update/UpdateReadFromFile.java (original)
+++ jena/branches/streaming-update/jena-arq/src-examples/arq/examples/update/UpdateReadFromFile.java Tue Jan 8 18:43:53 2013
@@ -18,7 +18,7 @@
package arq.examples.update;
-import org.openjena.riot.RiotWriter ;
+import org.apache.jena.riot.RiotWriter ;
import com.hp.hpl.jena.sparql.sse.SSE ;
import com.hp.hpl.jena.update.GraphStore ;
Modified: jena/branches/streaming-update/jena-arq/src/main/java/arq/cmdline/CmdGeneral.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/arq/cmdline/CmdGeneral.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/arq/cmdline/CmdGeneral.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/arq/cmdline/CmdGeneral.java Tue Jan 8 18:43:53 2013
@@ -20,6 +20,8 @@ package arq.cmdline;
import java.io.PrintStream ;
+import com.hp.hpl.jena.query.ARQ ;
+
import org.apache.jena.atlas.io.IndentedWriter ;
import arq.cmd.CmdUtils ;
import arq.cmd.TerminationException ;
@@ -29,7 +31,7 @@ import arq.cmd.TerminationException ;
public abstract class CmdGeneral extends CmdArgModule implements CallbackHelp//, VersionCallback
{
- static { CmdUtils.setN3Params() ; }
+ static { CmdUtils.setN3Params() ; ARQ.init() ; }
protected ModGeneral modGeneral = new ModGeneral(this) ;
protected ModVersion modVersion = new ModVersion(true) ;
Modified: jena/branches/streaming-update/jena-arq/src/main/java/arq/cmdline/ModDatasetGeneral.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/arq/cmdline/ModDatasetGeneral.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/arq/cmdline/ModDatasetGeneral.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/arq/cmdline/ModDatasetGeneral.java Tue Jan 8 18:43:53 2013
@@ -21,9 +21,9 @@ package arq.cmdline;
import java.util.ArrayList ;
import java.util.List ;
-import org.openjena.riot.Lang ;
-import org.openjena.riot.RiotLoader ;
-
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFLanguages ;
+import org.apache.jena.riot.RDFDataMgr ;
import arq.cmd.CmdException ;
import com.hp.hpl.jena.query.Dataset ;
@@ -113,20 +113,19 @@ public class ModDatasetGeneral extends M
for ( String fn : graphURLs )
{
- if ( Lang.guess(fn).isQuads() )
+ Lang lang = RDFLanguages.filenameToLang(fn) ;
+
+ if ( RDFLanguages.isQuads(lang) )
quads.add(fn) ;
else
triples.add(fn) ;
}
for ( String fn : quads )
- RiotLoader.read(fn, ds.asDatasetGraph()) ;
-
+ RDFDataMgr.read(ds.asDatasetGraph(), fn) ;
dataset =
DatasetUtils.addInGraphs(ds, triples, namedGraphURLs, fileManager, null) ;
}
-
-
}
catch (LabelExistsException ex)
{ throw new CmdException(ex.getMessage()) ; }
Modified: jena/branches/streaming-update/jena-arq/src/main/java/arq/cmdline/ModLangParse.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/arq/cmdline/ModLangParse.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/arq/cmdline/ModLangParse.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/arq/cmdline/ModLangParse.java Tue Jan 8 18:43:53 2013
@@ -18,10 +18,11 @@
package arq.cmdline;
-import org.openjena.riot.system.IRIResolver ;
+import org.apache.jena.iri.IRI ;
+import org.apache.jena.riot.RiotException ;
+import org.apache.jena.riot.system.IRIResolver ;
import arq.cmd.CmdException ;
-import org.apache.jena.iri.IRI ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.util.FileManager ;
@@ -62,7 +63,7 @@ public class ModLangParse implements Arg
cmdLine.add(argCheck, "--check", "Addition checking of RDF terms") ; // (default: off for N-triples, N-Quads, on for Turtle and TriG)") ;
cmdLine.add(argStrict, "--strict", "Run with in strict mode") ;
cmdLine.add(argValidate,"--validate", "Same as --sink --check=true --strict") ;
-// cmdLine.add(argRDFS, "--rdfs=file", "Apply some RDFS inference using the vocabulary in the file") ;
+ cmdLine.add(argRDFS, "--rdfs=file", "Apply some RDFS inference using the vocabulary in the file") ;
cmdLine.add(argNoCheck, "--nocheck", "Turn off checking of RDF terms") ;
// cmdLine.add(argSkip, "--noSkip", "Skip (do not output) triples failing the RDF term tests") ;
@@ -113,8 +114,15 @@ public class ModLangParse implements Arg
if ( cmdLine.contains(argRDFS) )
{
- rdfsVocabFilename = cmdLine.getArg(argRDFS).getValue() ;
- rdfsVocab = FileManager.get().loadModel(rdfsVocabFilename) ;
+ try {
+ rdfsVocabFilename = cmdLine.getArg(argRDFS).getValue() ;
+ rdfsVocab = FileManager.get().loadModel(rdfsVocabFilename) ;
+ }
+ catch (RiotException ex)
+ { throw new CmdException("Error in RDFS vocabulary: "+rdfsVocabFilename) ; }
+ catch (Exception ex)
+ { throw new CmdException("Error: "+ex.getMessage()) ; }
+
}
}
Modified: jena/branches/streaming-update/jena-arq/src/main/java/arq/cmdline/ModSymbol.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/arq/cmdline/ModSymbol.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/arq/cmdline/ModSymbol.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/arq/cmdline/ModSymbol.java Tue Jan 8 18:43:53 2013
@@ -51,6 +51,8 @@ public class ModSymbol implements ArgMod
@Override
public void processArgs(CmdArgModule cmdLine)
{
+ ARQ.init();
+
if ( cmdLine.getValues(setDecl) == null || cmdLine.getValues(setDecl).size() == 0 )
return ;
Modified: jena/branches/streaming-update/jena-arq/src/main/java/arq/iri.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/arq/iri.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/arq/iri.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/arq/iri.java Tue Jan 8 18:43:53 2013
@@ -20,11 +20,11 @@ package arq;
import java.util.Iterator ;
-import org.openjena.riot.system.IRIResolver ;
import org.apache.jena.iri.IRI ;
import org.apache.jena.iri.IRIFactory ;
import org.apache.jena.iri.Violation ;
+import org.apache.jena.riot.system.IRIResolver ;
public class iri
{
Modified: jena/branches/streaming-update/jena-arq/src/main/java/arq/update.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/arq/update.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/arq/update.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/arq/update.java Tue Jan 8 18:43:53 2013
@@ -21,7 +21,7 @@ package arq;
import java.util.Iterator ;
import java.util.List ;
-import org.openjena.riot.out.NQuadsWriter ;
+import org.apache.jena.riot.out.NQuadsWriter ;
import arq.cmd.CmdException ;
import arq.cmdline.ArgDecl ;
import arq.cmdline.CmdUpdate ;
Modified: jena/branches/streaming-update/jena-arq/src/main/java/arq/wwwdec.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/arq/wwwdec.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/arq/wwwdec.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/arq/wwwdec.java Tue Jan 8 18:43:53 2013
@@ -18,14 +18,11 @@
package arq;
-import java.io.UnsupportedEncodingException ;
-
import org.apache.jena.atlas.lib.StrUtils ;
-
public class wwwdec
{
- public static void main(String...args) throws UnsupportedEncodingException
+ public static void main(String...args)
{
for ( String x : args)
{
Modified: jena/branches/streaming-update/jena-arq/src/main/java/arq/wwwenc.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/arq/wwwenc.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/arq/wwwenc.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/arq/wwwenc.java Tue Jan 8 18:43:53 2013
@@ -18,11 +18,8 @@
package arq;
-import java.io.UnsupportedEncodingException ;
-
import org.apache.jena.atlas.lib.StrUtils ;
-
public class wwwenc
{
/* http://en.wikipedia.org/wiki/Percent-encoding
@@ -39,7 +36,7 @@ public class wwwenc
*
*
*/
- public static void main(String...args) throws UnsupportedEncodingException
+ public static void main(String...args)
{
// Reserved characters + space
char reserved[] =
Modified: jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java Tue Jan 8 18:43:53 2013
@@ -18,7 +18,7 @@
package com.hp.hpl.jena.query;
-import org.openjena.riot.RIOT ;
+import org.apache.jena.riot.RIOT ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
Modified: jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryExecution.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryExecution.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryExecution.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryExecution.java Tue Jan 8 18:43:53 2013
@@ -152,13 +152,17 @@ public interface QueryExecution
* A timeout of less than zero means no timeout; this can be used for timeout1 or timeout2.
*/
- //public void setTimeout(long timeout1, long timeout2) ;
public void setTimeout(long timeout1, TimeUnit timeUnit1, long timeout2, TimeUnit timeUnit2) ;
/** Set time, in milliseconds
* @see #setTimeout(long, TimeUnit, long, TimeUnit)
*/
public void setTimeout(long timeout1, long timeout2) ;
+
+ /** Return the first timeout (time to first result), in millseconds: negative if unset */
+ public long getTimeout1() ;
+ /** Return the second timeout (overall query execution after first result), in millseconds: negative if unset */
+ public long getTimeout2() ;
// /** Say whether this QueryExecution is useable or not.
// * An active execution is one that has not been closed, ended or aborted yet.
Modified: jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryFactory.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryFactory.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryFactory.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryFactory.java Tue Jan 8 18:43:53 2013
@@ -19,9 +19,9 @@
package com.hp.hpl.jena.query;
import com.hp.hpl.jena.n3.IRIResolver ;
-import com.hp.hpl.jena.sparql.lang.Parser ;
+import com.hp.hpl.jena.sparql.lang.SPARQLParser ;
import com.hp.hpl.jena.sparql.lang.ParserARQ ;
-import com.hp.hpl.jena.sparql.lang.ParserRegistry ;
+import com.hp.hpl.jena.sparql.lang.SPARQLParserRegistry ;
import com.hp.hpl.jena.sparql.syntax.Element ;
import com.hp.hpl.jena.sparql.syntax.Template ;
import com.hp.hpl.jena.util.FileManager ;
@@ -138,7 +138,7 @@ public class QueryFactory
else
query.setSyntax(syntaxURI) ;
- Parser parser = Parser.createParser(syntaxURI) ;
+ SPARQLParser parser = SPARQLParser.createParser(syntaxURI) ;
if ( parser == null )
throw new UnsupportedOperationException("Unrecognized syntax for parsing: "+syntaxURI) ;
@@ -158,7 +158,7 @@ public class QueryFactory
static boolean knownParserSyntax(Syntax syntaxURI)
{
- return ParserRegistry.get().containsFactory(syntaxURI) ;
+ return SPARQLParserRegistry.get().containsFactory(syntaxURI) ;
}
Modified: jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpAsQuery.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpAsQuery.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpAsQuery.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpAsQuery.java Tue Jan 8 18:43:53 2013
@@ -30,6 +30,7 @@ import com.hp.hpl.jena.sparql.ARQInterna
import com.hp.hpl.jena.sparql.ARQNotImplemented ;
import com.hp.hpl.jena.sparql.algebra.op.* ;
import com.hp.hpl.jena.sparql.core.BasicPattern ;
+import com.hp.hpl.jena.sparql.core.Quad ;
import com.hp.hpl.jena.sparql.core.Var ;
import com.hp.hpl.jena.sparql.core.VarExprList ;
import com.hp.hpl.jena.sparql.engine.QueryIterator ;
@@ -218,7 +219,26 @@ public class OpAsQuery
@Override
public void visit(OpQuadPattern quadPattern)
- { throw new ARQNotImplemented("OpQuadPattern") ; }
+ {
+ Node graphNode = quadPattern.getGraphNode();
+ if (graphNode.equals(Quad.defaultGraphNodeGenerated)) {
+ currentGroup().addElement(process(quadPattern.getBasicPattern())) ;
+ } else {
+ startSubGroup();
+ Element e = asElement(new OpBGP(quadPattern.getBasicPattern())) ;
+ endSubGroup();
+
+ //If not element group make it one
+ if (!(e instanceof ElementGroup)) {
+ ElementGroup g = new ElementGroup();
+ g.addElement(e);
+ e = g;
+ }
+
+ Element graphElt = new ElementNamedGraph(graphNode, e) ;
+ currentGroup().addElement(graphElt) ;
+ }
+ }
@Override
public void visit(OpPath opPath)
@@ -331,7 +351,14 @@ public class OpAsQuery
{
startSubGroup() ;
Element e = asElement(opGraph.getSubOp()) ;
- ElementGroup g = endSubGroup() ;
+ endSubGroup() ;
+
+ //If not element group make it one
+ if (!(e instanceof ElementGroup)) {
+ ElementGroup g = new ElementGroup();
+ g.addElement(e);
+ e = g;
+ }
Element graphElt = new ElementNamedGraph(opGraph.getNode(), e) ;
currentGroup().addElement(graphElt) ;
Modified: jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCaching.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCaching.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCaching.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCaching.java Tue Jan 8 18:43:53 2013
@@ -26,6 +26,7 @@ import org.apache.jena.atlas.lib.Cache ;
import org.apache.jena.atlas.lib.CacheFactory ;
import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.GraphUtil ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
@@ -107,7 +108,7 @@ abstract public class DatasetGraphCachin
public void addGraph(Node graphName, Graph graph)
{
removeGraph(graphName) ;
- getGraph(graphName).getBulkUpdateHandler().add(graph) ;
+ GraphUtil.addInto(getGraph(graphName), graph) ;
}
@Override
Modified: jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetImpl.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetImpl.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetImpl.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetImpl.java Tue Jan 8 18:43:53 2013
@@ -53,7 +53,7 @@ public class DatasetImpl implements Data
protected DatasetGraph dsg = null ;
private Transactional transactional = null ;
// Cache of graph -> model so that we don't churn model creation.
- private Cache<Graph, Model> cache = CacheFactory.createCache(0.75f, 20) ;
+ private Cache<Graph, Model> cache = createCache() ;
private Object internalLock = new Object() ;
//private DatasetImpl() {}
@@ -243,7 +243,9 @@ public class DatasetImpl implements Data
cache = null ;
}
- private void removeFromCache(Graph graph)
+ protected Cache<Graph, Model> createCache() { return CacheFactory.createCache(0.75f, 20) ; }
+
+ protected void removeFromCache(Graph graph)
{
// Assume MRSW - no synchronized needed.
if ( graph == null )
@@ -251,13 +253,13 @@ public class DatasetImpl implements Data
cache.remove(graph) ;
}
- private void addToCache(Model model)
+ protected void addToCache(Model model)
{
// Assume MRSW - no synchronized needed.
cache.put(model.getGraph(), model) ;
}
- private Model graph2model(Graph graph)
+ protected Model graph2model(Graph graph)
{
// Called from readers -- outer synchronation needed.
Model model = cache.get(graph) ;
@@ -269,7 +271,7 @@ public class DatasetImpl implements Data
return model ;
}
- private static void checkGraphName(String uri)
+ protected static void checkGraphName(String uri)
{
if ( uri == null )
throw new ARQException("null for graph name") ;
Modified: jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DynamicDatasets.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DynamicDatasets.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DynamicDatasets.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DynamicDatasets.java Tue Jan 8 18:43:53 2013
@@ -34,7 +34,6 @@ public class DynamicDatasets
{
/** Given a Dataset and a query, form a Dataset that
* is the dynamic dataset from the query.
- * Returns the original Dataset if the query has no dataset description.
*/
public static Dataset dynamicDataset(DatasetDescription description, Dataset ds, boolean defaultUnionGraph)
{
Modified: jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java Tue Jan 8 18:43:53 2013
@@ -385,6 +385,11 @@ public class QueryExecutionBase implemen
return (duration < 0 ) ? duration : timeUnit.toMillis(duration) ;
}
+ @Override
+ public long getTimeout1() { return timeout1 ; }
+ @Override
+ public long getTimeout2() { return timeout2 ; }
+
private static final long TIMEOUT_UNSET = -1 ;
private static final long TIMEOUT_INF = -2 ;
private long timeout1 = TIMEOUT_UNSET ;
@@ -397,7 +402,6 @@ public class QueryExecutionBase implemen
public void proc(QueryExecution qExec)
{
qExec.abort() ;
-
}
} ;
Modified: jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingInputStream.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingInputStream.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingInputStream.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingInputStream.java Tue Jan 8 18:43:53 2013
@@ -18,9 +18,9 @@
package com.hp.hpl.jena.sparql.engine.binding;
-import static org.openjena.riot.tokens.TokenType.DOT ;
-import static org.openjena.riot.tokens.TokenType.IRI ;
-import static org.openjena.riot.tokens.TokenType.PREFIXED_NAME ;
+import static org.apache.jena.riot.tokens.TokenType.DOT ;
+import static org.apache.jena.riot.tokens.TokenType.IRI ;
+import static org.apache.jena.riot.tokens.TokenType.PREFIXED_NAME ;
import java.io.InputStream ;
import java.util.ArrayList ;
@@ -28,26 +28,21 @@ import java.util.Collections ;
import java.util.Iterator ;
import java.util.List ;
-import org.openjena.riot.ErrorHandler ;
-import org.openjena.riot.ErrorHandlerFactory ;
-import org.openjena.riot.lang.LabelToNode ;
-import org.openjena.riot.lang.LangEngine ;
-import org.openjena.riot.out.NodeFmtLib ;
-import org.openjena.riot.system.IRIResolver ;
-import org.openjena.riot.system.ParserProfile ;
-import org.openjena.riot.system.ParserProfileBase ;
-import org.openjena.riot.system.PrefixMap ;
-import org.openjena.riot.system.Prologue ;
-import org.openjena.riot.tokens.Token ;
-import org.openjena.riot.tokens.TokenType ;
-import org.openjena.riot.tokens.Tokenizer ;
-import org.openjena.riot.tokens.TokenizerFactory ;
import com.hp.hpl.jena.graph.Node ;
import org.apache.jena.atlas.iterator.IteratorSlotted ;
import org.apache.jena.atlas.lib.Closeable ;
import org.apache.jena.iri.IRI ;
+import org.apache.jena.riot.lang.LabelToNode ;
+import org.apache.jena.riot.lang.LangEngine ;
+import org.apache.jena.riot.out.NodeFmtLib ;
+import org.apache.jena.riot.system.* ;
+import org.apache.jena.riot.tokens.Token ;
+import org.apache.jena.riot.tokens.TokenType ;
+import org.apache.jena.riot.tokens.Tokenizer ;
+import org.apache.jena.riot.tokens.TokenizerFactory ;
+
import com.hp.hpl.jena.rdf.model.AnonId ;
import com.hp.hpl.jena.sparql.core.Var ;
Modified: jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingOutputStream.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingOutputStream.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingOutputStream.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingOutputStream.java Tue Jan 8 18:43:53 2013
@@ -22,10 +22,6 @@ import java.io.* ;
import java.util.List ;
import java.util.Map ;
-import org.openjena.riot.RiotException ;
-import org.openjena.riot.out.NodeFormatter ;
-import org.openjena.riot.out.NodeFormatterTTL ;
-import org.openjena.riot.system.PrefixMap ;
import com.hp.hpl.jena.graph.Node ;
@@ -33,6 +29,11 @@ import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.iterator.Iter ;
import org.apache.jena.atlas.lib.Sink ;
import org.apache.jena.iri.IRI ;
+import org.apache.jena.riot.RiotException ;
+import org.apache.jena.riot.out.NodeFormatter ;
+import org.apache.jena.riot.out.NodeFormatterTTL ;
+import org.apache.jena.riot.system.PrefixMap ;
+
import com.hp.hpl.jena.sparql.core.Var ;
/** Parser for the RDF Tuples language */
Modified: jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/HttpQuery.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/HttpQuery.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/HttpQuery.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/HttpQuery.java Tue Jan 8 18:43:53 2013
@@ -33,7 +33,7 @@ import java.util.zip.GZIPInputStream ;
import org.apache.commons.codec.binary.Base64 ;
import org.apache.jena.atlas.lib.StrUtils ;
-import org.openjena.riot.WebContent ;
+import org.apache.jena.riot.WebContent ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
@@ -407,10 +407,15 @@ public class HttpQuery extends Params
private InputStream execCommon() throws QueryExceptionHTTP
{
- try {
- responseCode = httpConnection.getResponseCode() ;
- responseMessage = Convert.decWWWForm(httpConnection.getResponseMessage()) ;
-
+ try {
+ try {
+ responseCode = httpConnection.getResponseCode() ;
+ responseMessage = Convert.decWWWForm(httpConnection.getResponseMessage()) ;
+ } catch (NullPointerException ex) {
+ // This happens if you talk to a non-HTTP port.
+ // e.g. memcached!
+ throw new QueryExceptionHTTP("Problems with HTTP response (was it an HTTP server?)", ex) ;
+ }
// 1xx: Informational
// 2xx: Success
// 3xx: Redirection
Modified: jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/QueryEngineHTTP.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/QueryEngineHTTP.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/QueryEngineHTTP.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/QueryEngineHTTP.java Tue Jan 8 18:43:53 2013
@@ -27,28 +27,21 @@ import java.util.Map ;
import java.util.concurrent.TimeUnit ;
import org.apache.jena.atlas.io.IO ;
-import org.openjena.riot.Lang ;
-import org.openjena.riot.RiotReader ;
-import org.openjena.riot.WebContent ;
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFLanguages ;
+import org.apache.jena.riot.RiotReader ;
+import org.apache.jena.riot.WebContent ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
import com.hp.hpl.jena.graph.Triple ;
-import com.hp.hpl.jena.query.ARQ ;
-import com.hp.hpl.jena.query.Dataset ;
-import com.hp.hpl.jena.query.Query ;
-import com.hp.hpl.jena.query.QueryException ;
-import com.hp.hpl.jena.query.QueryExecException ;
-import com.hp.hpl.jena.query.QueryExecution ;
-import com.hp.hpl.jena.query.QuerySolution ;
-import com.hp.hpl.jena.query.ResultSet ;
-import com.hp.hpl.jena.query.ResultSetFactory ;
+import com.hp.hpl.jena.query.* ;
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.CSVInput ;
import com.hp.hpl.jena.sparql.resultset.JSONInput ;
-import com.hp.hpl.jena.sparql.resultset.TSVInput;
+import com.hp.hpl.jena.sparql.resultset.TSVInput ;
import com.hp.hpl.jena.sparql.resultset.XMLInput ;
import com.hp.hpl.jena.sparql.util.Context ;
import com.hp.hpl.jena.util.FileManager ;
@@ -76,9 +69,9 @@ public class QueryEngineHTTP implements
private boolean finished = false ;
//Timeouts
- private long connectTimeout = 0;
+ private long connectTimeout = -1 ;
private TimeUnit connectTimeoutUnit = TimeUnit.MILLISECONDS;
- private long readTimeout = 0;
+ private long readTimeout = -1 ;
private TimeUnit readTimeoutUnit = TimeUnit.MILLISECONDS;
//Compression Support
@@ -281,8 +274,8 @@ public class QueryEngineHTTP implements
//Try to select language appropriately here based on the model content type
Lang lang = WebContent.contentTypeToLang(actualContentType);
- if (!lang.isTriples())
- throw new QueryException("Endpoint returned Content Type: " + actualContentType + " which is not a valid RDF Graph syntax");
+ if (! RDFLanguages.isTriples(lang))
+ throw new QueryException("Endpoint returned Content Type: " + actualContentType + " which is not a valid RDF Graph syntax");
model.read(in, null, lang.getName()) ;
this.close() ;
return model ;
@@ -306,7 +299,8 @@ public class QueryEngineHTTP implements
//Try to select language appropriately here based on the model content type
Lang lang = WebContent.contentTypeToLang(actualContentType);
- if (!lang.isTriples()) throw new QueryException("Endpoint returned Content Type: " + actualContentType + " which is not a valid RDF Graph syntax");
+ if (! RDFLanguages.isTriples(lang))
+ throw new QueryException("Endpoint returned Content Type: " + actualContentType + " which is not a valid RDF Graph syntax");
return RiotReader.createIteratorTriples(in, lang, null);
}
@@ -328,7 +322,9 @@ public class QueryEngineHTTP implements
{
actualContentType = askContentType;
}
-
+ Lang lang = WebContent.contentTypeToLang(actualContentType);
+ if (! RDFLanguages.isTriples(lang))
+
//Parse the result appropriately depending on the selected content type
if (actualContentType.equals(WebContent.contentTypeResultsXML))
return XMLInput.booleanFromXML(in) ;
@@ -389,6 +385,17 @@ public class QueryEngineHTTP implements
this.connectTimeoutUnit = timeUnit2;
}
+ @Override
+ public long getTimeout1() { return asMillis(readTimeout, readTimeoutUnit) ; }
+
+ @Override
+ public long getTimeout2() { return asMillis(connectTimeout, connectTimeoutUnit) ; }
+
+ private static long asMillis(long duration, TimeUnit timeUnit)
+ {
+ return (duration < 0 ) ? duration : timeUnit.toMillis(duration) ;
+ }
+
private HttpQuery makeHttpQuery()
{
// Also need to tie to ResultSet returned which is streamed back if StAX.
@@ -528,11 +535,12 @@ public class QueryEngineHTTP implements
*/
public void setModelContentType(String contentType)
{
- //Check that this is a valid setting
- Lang lang = WebContent.contentTypeToLang(contentType);
- if (lang == null) throw new IllegalArgumentException("Given Content Type '" + contentType + "' is not supported by RIOT");
- if (!lang.isTriples()) throw new IllegalArgumentException("Given Content Type '" + contentType + " is not a RDF Graph format");
-
- modelContentType = contentType;
+ // Check that this is a valid setting
+ Lang lang = WebContent.contentTypeToLang(contentType) ;
+ if (lang == null)
+ throw new IllegalArgumentException("Given Content Type '" + contentType + "' is not supported by RIOT") ;
+ if (!RDFLanguages.isTriples(lang))
+ throw new IllegalArgumentException("Given Content Type '" + contentType + " is not a RDF Graph format") ;
+ modelContentType = contentType ;
}
}
Modified: jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/Service.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/Service.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/Service.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/Service.java Tue Jan 8 18:43:53 2013
@@ -22,7 +22,7 @@ import java.io.InputStream ;
import java.util.Map ;
import org.apache.jena.atlas.io.IO ;
-import org.openjena.riot.WebContent ;
+import org.apache.jena.riot.WebContent ;
import com.hp.hpl.jena.query.Query ;
import com.hp.hpl.jena.query.QueryExecException ;
Modified: jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIteratorBase.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIteratorBase.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIteratorBase.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIteratorBase.java Tue Jan 8 18:43:53 2013
@@ -200,7 +200,7 @@ public abstract class QueryIteratorBase
// Need to set the flags before allowing subclasses to handle requestCancel() in order
// to prevent a race condition. We want to be sure that calls to hasNext()/nextBinding()
// will definitely throw a QueryCancelledException in this class and not allow a
- // situation in which a subclass component thinks it is canceled, while this class does not.
+ // situation in which a subclass component thinks it is cancelled, while this class does not.
this.abortIterator = true ;
this.requestingCancel = true;
this.requestCancel() ;
Modified: jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrUUID.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrUUID.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrUUID.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrUUID.java Tue Jan 8 18:43:53 2013
@@ -24,7 +24,7 @@ import com.hp.hpl.jena.sparql.sse.Tags ;
public class E_StrUUID extends ExprFunction0
{
- static private String fName = Tags.tagUUID ;
+ static private String fName = Tags.tagStrUUID ;
public E_StrUUID()
{