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 2017/06/28 16:57:24 UTC
[15/18] jena git commit: Merge remote-tracking branch 'apache/master'
into generic-text-analyzers
Merge remote-tracking branch 'apache/master' into generic-text-analyzers
# Conflicts:
# jena-text/src/main/java/org/apache/jena/query/text/assembler/TextVocab.java
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/1d687f01
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/1d687f01
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/1d687f01
Branch: refs/heads/master
Commit: 1d687f01deb634adc6882b119510901cec73402f
Parents: 6ac75fe eb4b5b6
Author: Chris Tomlinson <ct...@moonvine.org>
Authored: Tue Jun 27 10:51:13 2017 -0500
Committer: Chris Tomlinson <ct...@moonvine.org>
Committed: Tue Jun 27 10:51:13 2017 -0500
----------------------------------------------------------------------
apache-jena/bin/tdbloader2common | 24 +-
.../arq/examples/riot/ExRIOT_2.java | 8 -
.../arq/examples/riot/ExRIOT_4.java | 6 +-
.../arq/examples/riot/ExRIOT_6.java | 5 +-
.../arq/examples/riot/ExRIOT_7.java | 4 +-
.../apache/jena/atlas/web/TypedInputStream.java | 6 +-
.../java/org/apache/jena/query/Dataset.java | 3 +
.../java/org/apache/jena/riot/RDFDataMgr.java | 139 +-
.../java/org/apache/jena/riot/RDFParser.java | 15 +-
.../org/apache/jena/riot/RDFParserBuilder.java | 20 +-
.../org/apache/jena/riot/RDFParserRegistry.java | 14 +-
.../java/org/apache/jena/riot/WebContent.java | 11 +-
.../apache/jena/riot/lang/ReaderRIOTCSV.java | 2 +-
.../org/apache/jena/riot/lang/RiotParsers.java | 4 +-
.../jena/riot/system/ErrorHandlerFactory.java | 132 +-
.../jena/riot/system/ParserProfileStd.java | 4 +
.../org/apache/jena/riot/system/RiotLib.java | 2 +-
.../org/apache/jena/riot/tokens/TokenType.java | 2 +-
.../java/org/apache/jena/riot/web/HttpOp.java | 4 +-
.../apache/jena/riot/web/HttpResponseLib.java | 7 +-
.../apache/jena/riot/writer/TurtleShell.java | 2 +-
.../jena/sparql/algebra/optimize/Optimize.java | 4 +-
.../apache/jena/sparql/core/DatasetGraph.java | 7 +
.../jena/sparql/core/DatasetGraphBase.java | 10 +
.../jena/sparql/core/DatasetGraphBaseFind.java | 18 +-
.../jena/sparql/core/DatasetGraphWrapper.java | 4 +
.../apache/jena/sparql/core/DatasetImpl.java | 5 +
.../java/org/apache/jena/sparql/core/Quad.java | 12 +-
.../org/apache/jena/sparql/core/Substitute.java | 4 +-
.../sparql/core/mem/DatasetGraphInMemory.java | 4 +-
.../jena/sparql/engine/iterator/QueryIter1.java | 6 +-
.../sparql/engine/iterator/QueryIterRoot.java | 20 +-
.../jena/sparql/engine/main/JoinClassifier.java | 4 +-
.../jena/sparql/engine/main/OpExecutor.java | 2 +-
.../sparql/engine/main/QueryEngineMain.java | 6 +-
.../jena/sparql/engine/main/VarFinder.java | 9 +-
.../org/apache/jena/sparql/engine/ref/Eval.java | 4 +-
.../jena/sparql/engine/ref/EvaluatorSimple.java | 4 +-
.../jena/sparql/expr/E_FunctionDynamic.java | 2 +-
.../org/apache/jena/sparql/expr/E_Regex.java | 32 +-
.../org/apache/jena/sparql/expr/NodeValue.java | 61 +-
.../apache/jena/sparql/expr/RegexEngine.java | 2 +-
.../org/apache/jena/sparql/expr/RegexJava.java | 19 +-
.../apache/jena/sparql/expr/RegexXerces.java | 5 +
.../sparql/expr/ValueSpaceClassification.java | 2 +-
.../sparql/expr/nodevalue/NodeFunctions.java | 6 +
.../sparql/expr/nodevalue/NodeValueSortKey.java | 122 +
.../sparql/expr/nodevalue/NodeValueVisitor.java | 1 +
.../jena/sparql/function/StandardFunctions.java | 3 +
.../sparql/function/library/FN_Collation.java | 64 +
.../jena/sparql/graph/GraphUnionRead.java | 13 +-
.../jena/sparql/modify/UpdateEngineWorker.java | 28 +-
.../sparql/modify/request/UpdateWriter.java | 2 +
.../modify/request/UpdateWriterVisitor.java | 10 +-
.../jena/sparql/path/eval/PathEngine.java | 2 +-
.../jena/sparql/pfunction/library/strSplit.java | 68 +-
.../jena/sparql/serializer/FmtEltLib.java | 195 +
.../sparql/serializer/FormatterElement.java | 688 +-
.../sparql/serializer/TriplesListBlock.java | 43 +
.../jena/sparql/syntax/ElementPathBlock.java | 2 +-
.../jena/sparql/syntax/ElementTriplesBlock.java | 2 +-
.../org/apache/jena/sparql/util/VarUtils.java | 8 +-
.../apache/jena/sparql/util/graph/Findable.java | 19 +-
.../sparql/util/graph/FindableBasicPattern.java | 89 -
.../sparql/util/graph/FindableCollection.java | 68 +
.../apache/jena/sparql/util/graph/GNode.java | 8 +-
.../org/apache/jena/riot/TestRDFParser.java | 11 +
.../jena/riot/lang/TestParserFactory.java | 4 +-
.../jena/riot/lang/TestPipedRDFIterators.java | 6 +-
.../org/apache/jena/riot/lang/TestTriXBad.java | 4 +-
.../java/org/apache/jena/sparql/TC_General.java | 2 +
.../jena/sparql/algebra/TestVarFinder.java | 5 +
.../org/apache/jena/sparql/api/TestAPI.java | 12 +
.../sparql/core/AbstractDatasetGraphFind.java | 53 +-
.../mem/TestDatasetGraphInMemoryPromote.java | 5 +
.../jena/sparql/expr/TestE_FunctionDynamic.java | 36 +
.../apache/jena/sparql/expr/TestNodeValue.java | 124 +
.../org/apache/jena/sparql/expr/TestRegex.java | 63 +-
.../expr/nodevalue/TestNodeFunctions.java | 40 +
.../expr/nodevalue/TestNodeValueSortKey.java | 86 +
.../function/library/TestFunctionCollation.java | 70 +
.../sparql/pfunction/library/TS_PFunction.java | 30 +
.../sparql/pfunction/library/TestStrSplit.java | 158 +
.../transaction/AbstractTestTransPromote.java | 116 +-
.../apache/jena/atlas/io/IndentedWriter.java | 1 -
.../java/org/apache/jena/atlas/lib/Creator.java | 4 +-
.../java/arq/cmdline/ModDatasetAssembler.java | 4 +
jena-cmds/src/main/java/arq/uparse.java | 70 +-
.../src/main/java/riotcmd/CmdLangParse.java | 61 +-
jena-cmds/src/main/java/riotcmd/riot.java | 12 +-
jena-cmds/src/main/java/tdb/tools/dumpbpt.java | 34 +-
.../src/main/java/tdb/tools/dumpjournal.java | 81 +
.../src/main/java/tdb/tools/dumpnodetable.java | 68 +-
.../src/main/java/tdb/tools/dumpnodetable1.java | 184 +
.../main/java/org/apache/jena/graph/Graph.java | 20 +-
.../org/apache/jena/rdf/model/impl/Util.java | 4 +
.../apache/jena/hadoop/rdf/stats/RdfStats.java | 13 +-
jena-extras/jena-querybuilder/pom.xml | 4 +
.../arq/querybuilder/AbstractQueryBuilder.java | 17 +-
.../jena/arq/querybuilder/AskBuilder.java | 26 +-
.../jena/arq/querybuilder/ConstructBuilder.java | 25 +-
.../jena/arq/querybuilder/DescribeBuilder.java | 316 +
.../jena/arq/querybuilder/ExprFactory.java | 1783 ++++
.../jena/arq/querybuilder/SelectBuilder.java | 47 +-
.../jena/arq/querybuilder/UpdateBuilder.java | 1027 ++
.../arq/querybuilder/clauses/PrologClause.java | 8 +
.../arq/querybuilder/clauses/SelectClause.java | 22 +-
.../clauses/SolutionModifierClause.java | 14 +
.../arq/querybuilder/clauses/WhereClause.java | 99 +-
.../arq/querybuilder/handlers/HandlerBlock.java | 2 +-
.../querybuilder/handlers/PrologHandler.java | 5 +
.../arq/querybuilder/handlers/WhereHandler.java | 231 +-
.../rewriters/NodeValueRewriter.java | 5 +
.../updatebuilder/PrefixHandler.java | 115 +
.../updatebuilder/QBQuadHolder.java | 79 +
.../querybuilder/updatebuilder/QuadHolder.java | 46 +
.../updatebuilder/QuadIteratorBuilder.java | 180 +
.../updatebuilder/SingleQuadHolder.java | 97 +
.../updatebuilder/WhereProcessor.java | 433 +
.../jena/arq/AbstractRegexpBasedTest.java | 4 +
.../querybuilder/AbstractQueryBuilderTest.java | 18 +-
.../jena/arq/querybuilder/AskBuilderTest.java | 42 +-
.../arq/querybuilder/ConstructBuilderTest.java | 41 +-
.../DescribeBuilderContractTest.java | 53 +
.../jena/arq/querybuilder/ExprFactoryTest.java | 701 ++
.../arq/querybuilder/SelectBuilderTest.java | 98 +-
.../querybuilder/UpdateBuilderExampleTests.java | 625 ++
.../arq/querybuilder/UpdateBuilderTest.java | 411 +
.../jena/arq/querybuilder/WhereValidator.java | 205 +
.../querybuilder/clauses/SelectClauseTest.java | 70 +-
.../querybuilder/clauses/WhereClauseTest.java | 203 +-
.../querybuilder/handlers/WhereHandlerTest.java | 337 +-
jena-fuseki1/pom.xml | 2 +-
.../jena/fuseki/migrate/GraphLoadUtils.java | 8 +-
jena-fuseki2/jena-fuseki-basic/pom.xml | 256 +
jena-fuseki2/jena-fuseki-basic/run-sparqler | 8 +
.../jena-fuseki-basic/sparqler/data/books.ttl | 46 +
.../jena-fuseki-basic/sparqler/data/empty.nt | 1 +
.../sparqler/data/sparql-data.ttl | 101 +
.../sparqler/data/underground.ttl | 8996 ++++++++++++++++++
.../sparqler/log4j-foreground.properties | 44 +
.../sparqler/log4j-server.properties | 44 +
.../jena-fuseki-basic/sparqler/pages/D.nt | 0
.../jena-fuseki-basic/sparqler/pages/D.rdf | 8 +
.../jena-fuseki-basic/sparqler/pages/D.ttl | 3 +
.../sparqler/pages/crossdomain.xml | 3 +
.../sparqler/pages/data-validator.html | 48 +
.../jena-fuseki-basic/sparqler/pages/doc.css | 127 +
.../jena-fuseki-basic/sparqler/pages/fuseki.css | 148 +
.../jena-fuseki-basic/sparqler/pages/index.html | 73 +
.../sparqler/pages/iri-validator.html | 22 +
.../sparqler/pages/query-validator.html | 71 +
.../jena-fuseki-basic/sparqler/pages/query.html | 63 +
.../jena-fuseki-basic/sparqler/pages/robots.txt | 2 +
.../sparqler/pages/sparql.html | 51 +
.../sparqler/pages/update-validator.html | 46 +
.../sparqler/pages/update.html | 27 +
.../sparqler/pages/validator.html | 35 +
.../sparqler/pages/xml-to-html-links.xsl | 183 +
.../sparqler/pages/xml-to-html-plain.xsl | 187 +
.../sparqler/pages/xml-to-html.xsl | 187 +
.../jena-fuseki-basic/sparqler/run-sparqler | 64 +
.../apache/jena/fuseki/cmds/FusekiBasicCmd.java | 485 +
.../apache/jena/fuseki/cmds/PlatformInfo.java | 122 +
jena-fuseki2/jena-fuseki-core/pom.xml | 13 -
.../java/org/apache/jena/fuseki/Fuseki.java | 4 +-
.../java/org/apache/jena/fuseki/FusekiLib.java | 13 +-
.../org/apache/jena/fuseki/build/Template.java | 1 +
.../org/apache/jena/fuseki/cmd/FusekiCmd.java | 28 +-
.../apache/jena/fuseki/mgt/ActionDatasets.java | 22 +-
.../jena/fuseki/migrate/GraphLoadUtils.java | 8 +-
.../apache/jena/fuseki/server/FusekiEnv.java | 13 +-
.../apache/jena/fuseki/server/FusekiInfo.java | 160 +
.../jena/fuseki/server/FusekiInitialConfig.java | 61 +
.../apache/jena/fuseki/server/FusekiServer.java | 4 +-
.../fuseki/server/FusekiServerListener.java | 5 +-
.../jena/fuseki/server/ServerInitialConfig.java | 56 -
.../jena/fuseki/servlets/SPARQL_GSP_RW.java | 7 +-
.../fuseki/servlets/SPARQL_QueryGeneral.java | 4 +-
.../jena/fuseki/validation/DataValidator.java | 113 +-
.../jena/fuseki/validation/IRIValidator.java | 155 +-
.../jena/fuseki/validation/QueryValidator.java | 138 +-
.../jena/fuseki/validation/UpdateValidator.java | 75 +-
.../fuseki/validation/ValidationAction.java | 95 -
.../jena/fuseki/validation/ValidationError.java | 24 -
.../jena/fuseki/validation/ValidatorBase.java | 176 +
.../fuseki/validation/ValidatorBaseJson.java | 25 +-
.../validation/html/DataValidatorHTML.java | 220 +
.../validation/html/IRIValidatorHTML.java | 103 +
.../validation/html/QueryValidatorHTML.java | 234 +
.../validation/html/UpdateValidatorHTML.java | 142 +
.../validation/html/ValidatorHtmlLib.java | 117 +
.../validation/json/DataValidatorJSON.java | 94 +
.../validation/json/IRIValidatorJSON.java | 104 +
.../validation/json/QueryValidatorJSON.java | 157 +
.../validation/json/UpdateValidatorJSON.java | 94 +
.../validation/json/ValidationAction.java | 95 +
.../fuseki/validation/json/ValidationError.java | 24 +
.../validation/json/ValidatorJsonLib.java | 85 +
.../src/main/webapp/WEB-INF/web.xml | 45 +-
.../java/org/apache/jena/fuseki/ServerCtl.java | 25 +-
.../java/org/apache/jena/fuseki/TestAuth.java | 3 +-
.../org/apache/jena/fuseki/TestDatasetOps.java | 18 +-
jena-fuseki2/jena-fuseki-embedded/pom.xml | 32 +-
.../fuseki/embedded/FusekiEmbeddedServer.java | 125 +-
.../jena/fuseki/embedded/FusekiTestAuth.java | 191 +
.../jena/fuseki/embedded/FusekiTestServer.java | 123 +-
.../jena/fuseki/embedded/TS_EmbeddedFuseki.java | 2 +
.../fuseki/embedded/TestEmbeddedFuseki.java | 43 +-
.../fuseki/embedded/TestFusekiTestAuth.java | 100 +
.../fuseki/embedded/TestFusekiTestServer.java | 60 +
.../fuseki/embedded/TestMultipleEmbedded.java | 16 +-
.../testing/FusekiEmbedded/test.txt | 1 +
jena-fuseki2/pom.xml | 4 +-
jena-integration-tests/pom.xml | 2 +-
.../rdfconnection/TestRDFConnectionRemote.java | 1 -
jena-jdbc/jena-jdbc-driver-bundle/pom.xml | 4 +-
jena-jdbc/jena-jdbc-driver-remote/pom.xml | 164 +-
.../jena/jdbc/remote/TS_JdbcDriverRemote.java | 6 +-
.../TestRemoteEndpointConnection.java | 16 +-
.../TestRemoteEndpointConnectionWithAuth.java | 57 +-
...stRemoteEndpointConnectionWithGraphUris.java | 16 +-
...oteEndpointConnectionWithResultSetTypes.java | 16 +-
.../metadata/TestRemoteConnectionMetadata.java | 12 +-
.../results/TestRemoteEndpointResults.java | 18 +-
.../TestRemoteEndpointResultsWithAuth.java | 49 +-
.../TestRemoteEndpointResultsWithGraphUris.java | 18 +-
...RemoteEndpointResultsWithResultSetTypes.java | 18 +-
.../TestRemoteEndpointStatements.java | 12 +-
jena-parent/pom.xml | 15 +-
.../example/readonly/ReadOnlyEval.java | 104 +
.../example/readonly/package-info.java | 22 +
.../graph/SecuredGraphEventManager.java | 6 +-
.../apache/jena/sdb/engine/QueryEngineSDB.java | 2 +-
.../jena/tdb/base/block/BlockMgrCache.java | 10 +-
.../base/recordbuffer/RecordBufferPageMgr.java | 5 +-
.../jena/tdb/setup/DatasetBuilderStd.java | 4 +-
.../jena/tdb/transaction/BlockMgrJournal.java | 15 +-
.../transaction/DatasetGraphTransaction.java | 12 +-
.../apache/jena/tdb/transaction/Journal.java | 6 -
.../jena/tdb/transaction/JournalControl.java | 18 +-
.../jena/tdb/transaction/JournalEntry.java | 19 +-
.../jena/tdb/transaction/NodeTableTrans.java | 2 +-
.../jena/tdb/transaction/Transaction.java | 15 +-
.../tdb/transaction/TransactionManager.java | 2 +
.../tdb/transaction/AbstractTestTransSeq.java | 3 +-
.../tdb/transaction/TestTransPromoteTDB.java | 6 +
jena-text-es/pom.xml | 2 +-
.../jena/query/text/es/InitJenaTextES.java | 9 +-
.../org/apache/jena/query/text/es/TextES.java | 47 +
.../apache/jena/query/text/es/TextIndexES.java | 2 +-
.../apache/jena/query/text/es/TextVocabES.java | 35 +
.../text/es/assembler/TextAssemblerES.java | 37 +
.../text/es/assembler/TextIndexESAssembler.java | 5 +-
jena-text-es/src/main/resources/META-INF/NOTICE | 2 +-
.../apache/jena/query/text/InitJenaText.java | 11 +
jena-text/src/main/resources/text-config-es.ttl | 64 -
257 files changed, 24322 insertions(+), 2356 deletions(-)
----------------------------------------------------------------------