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 2016/09/05 12:29:38 UTC
[02/10] jena git commit: Merge https://github.com/apache/jena
Merge https://github.com/apache/jena
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/18d28f5f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/18d28f5f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/18d28f5f
Branch: refs/heads/master
Commit: 18d28f5f77ba1273471b2bc82573c7aae2f42115
Parents: c88e008 e3c6a0b
Author: Chris Dollin <eh...@googlemail.com>
Authored: Wed Aug 31 14:22:13 2016 +0100
Committer: Chris Dollin <eh...@googlemail.com>
Committed: Wed Aug 31 14:22:13 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/atlas/json/JSON.java | 117 +++--
.../org/apache/jena/atlas/json/JsonArray.java | 86 ++--
.../org/apache/jena/atlas/json/JsonBuilder.java | 6 +-
.../org/apache/jena/atlas/json/JsonObject.java | 75 ++-
.../jena/query/ParameterizedSparqlString.java | 5 +
.../org/apache/jena/riot/out/JsonLDWriter.java | 1 -
.../riot/system/FastAbbreviatingPrefixMap.java | 7 +
.../apache/jena/riot/system/IRIResolver.java | 2 +-
.../org/apache/jena/riot/system/PrefixMap.java | 5 +
.../jena/riot/system/PrefixMapExtended.java | 7 +
.../apache/jena/riot/system/PrefixMapNull.java | 61 +--
.../apache/jena/riot/system/PrefixMapStd.java | 5 +
.../jena/riot/system/PrefixMapWrapper.java | 4 +
.../apache/jena/sparql/algebra/OpVisitor.java | 4 +-
.../apache/jena/sparql/algebra/op/OpFilter.java | 100 ++--
.../jena/sparql/algebra/optimize/Optimize.java | 289 ++---------
.../sparql/algebra/optimize/OptimizeStd.java | 293 +++++++++++
.../sparql/algebra/optimize/RewriteFactory.java | 27 +
.../optimize/TransformEliminateAssignments.java | 2 +-
.../algebra/optimize/TransformExpandOneOf.java | 2 +-
.../optimize/TransformFilterDisjunction.java | 2 +-
.../optimize/TransformFilterEquality.java | 4 +-
.../optimize/TransformFilterImplicitJoin.java | 4 +-
.../optimize/TransformFilterInequality.java | 4 +-
.../optimize/TransformFilterPlacement.java | 14 +-
.../algebra/optimize/TransformJoinStrategy.java | 2 +-
.../algebra/walker/ApplyTransformVisitor.java | 30 +-
.../apache/jena/sparql/core/DatasetGraph.java | 4 +-
.../sparql/core/DatasetGraphTrackActive.java | 2 +-
.../jena/sparql/core/DatasetGraphWrapper.java | 76 +--
.../apache/jena/sparql/core/DatasetImpl.java | 10 +-
.../jena/sparql/core/DatasetPrefixStorage.java | 5 +-
.../org/apache/jena/sparql/core/Substitute.java | 2 +-
.../apache/jena/sparql/core/Transactional.java | 6 +-
.../jena/sparql/core/TransactionalLock.java | 5 -
.../sparql/core/mem/DatasetGraphInMemory.java | 1 +
.../core/mem/DatasetPrefixStorageInMemory.java | 5 +
.../sparql/engine/http/QueryEngineHTTP.java | 11 +-
.../org/apache/jena/sparql/expr/ExprList.java | 2 +-
.../org/apache/jena/sparql/expr/NodeValue.java | 4 +-
.../jena/sparql/graph/NodeTransformOp.java | 2 +-
.../jena/sparql/resultset/ResultSetWrapper.java | 72 +++
.../jena/sparql/sse/builders/BuilderOp.java | 2 +-
.../syntaxtransform/QueryTransformOps.java | 27 +-
.../apache/jena/sparql/util/PrefixMapping2.java | 7 +
.../org/apache/jena/system/ThreadAction.java | 140 +++++
.../java/org/apache/jena/system/ThreadTxn.java | 134 ++---
.../java/org/apache/jena/system/TxnCounter.java | 2 +-
.../org/apache/jena/atlas/json/TestJson.java | 66 ++-
.../algebra/optimize/TestTransformFilters.java | 27 +
.../org/apache/jena/sparql/api/TestAPI.java | 23 +-
.../apache/jena/sparql/expr/TestNodeValue.java | 52 +-
.../sparql/modify/TestUpdateOperations.java | 4 +-
.../java/org/apache/jena/system/TS_System.java | 1 +
.../apache/jena/system/TestThreadAction.java | 140 +++++
.../org/apache/jena/system/TestTxnThread.java | 14 +-
.../apache/jena/atlas/io/IndentedWriter.java | 197 ++++---
.../java/org/apache/jena/atlas/lib/Trie.java | 15 +
.../org/apache/jena/atlas/logging/LogCtl.java | 144 +++---
.../logging/java/ConsoleHandlerStdout.java | 59 +--
.../logging/java/ConsoleHandlerStream.java | 117 +++++
.../jena/atlas/logging/java/FlatFormatter.java | 45 ++
.../jena/atlas/logging/java/FlatHandler.java | 45 ++
.../jena/atlas/logging/java/TextFormatter.java | 89 +++-
.../jena/atlas/io/TestIndentedWriter.java | 71 ++-
.../org/apache/jena/atlas/lib/TestTrie.java | 16 +
jena-cmds/src/main/java/arq/qparse.java | 2 +-
.../src/main/java/tdb/cmdline/CmdTDBGraph.java | 9 +-
jena-cmds/src/main/java/tdb/tdbloader.java | 6 +-
.../compose/PolyadicPrefixMappingImpl.java | 7 +
.../apache/jena/rdf/model/impl/ModelCom.java | 7 +
.../org/apache/jena/shared/PrefixMapping.java | 6 +
.../jena/shared/impl/PrefixMappingImpl.java | 17 +-
.../test/TestGenericRuleReasonerConfig.java | 15 +-
.../jena/shared/AbstractTestPrefixMapping.java | 17 +
.../arq/querybuilder/rewriters/OpRewriter.java | 2 +-
jena-fuseki2/apache-jena-fuseki/fuseki | 9 +-
.../java/org/apache/jena/fuseki/Fuseki.java | 2 -
.../org/apache/jena/fuseki/FusekiLogging.java | 19 +-
.../org/apache/jena/fuseki/build/Builder.java | 157 ------
.../apache/jena/fuseki/build/FusekiBuilder.java | 166 ++++++
.../apache/jena/fuseki/build/FusekiConfig.java | 21 +-
.../org/apache/jena/fuseki/cmd/FusekiCmd.java | 24 +-
.../jena/fuseki/jetty/FusekiErrorHandler.java | 6 +-
.../jena/fuseki/jetty/FusekiErrorHandler1.java | 57 +++
.../jena/fuseki/jetty/JettyServerConfig.java | 15 +-
.../org/apache/jena/fuseki/mgt/ActionCtl.java | 3 +-
.../apache/jena/fuseki/mgt/ActionDatasets.java | 18 +-
.../jena/fuseki/mgt/ActionServerStatus.java | 6 +-
.../org/apache/jena/fuseki/mgt/ActionStats.java | 62 +--
.../apache/jena/fuseki/mgt/JsonDescription.java | 2 +-
.../fuseki/server/DataAccessPointRegistry.java | 43 +-
.../apache/jena/fuseki/server/FusekiEnv.java | 4 +-
.../apache/jena/fuseki/server/FusekiServer.java | 31 +-
.../server/FusekiServerEnvironmentInit.java | 5 +-
.../fuseki/server/FusekiServerListener.java | 21 +-
.../apache/jena/fuseki/server/FusekiVocab.java | 10 +-
.../fuseki/server/ShiroEnvironmentLoader.java | 4 +-
.../apache/jena/fuseki/servlets/ActionLib.java | 4 +-
.../jena/fuseki/servlets/ActionSPARQL.java | 2 +-
.../jena/fuseki/servlets/FusekiFilter.java | 9 +-
.../apache/jena/fuseki/servlets/HttpAction.java | 14 +-
.../apache/jena/fuseki/servlets/SPARQL_GSP.java | 9 +-
.../jena/fuseki/servlets/SPARQL_GSP_R.java | 4 +-
.../jena/fuseki/servlets/SPARQL_GSP_RW.java | 15 +-
.../jena/fuseki/servlets/SPARQL_Query.java | 13 +-
.../fuseki/servlets/SPARQL_UberServlet.java | 24 +-
.../org/apache/jena/fuseki/log4j.properties | 1 -
.../java/org/apache/jena/fuseki/ServerTest.java | 1 -
.../java/org/apache/jena/fuseki/TS_Fuseki.java | 24 +-
.../java/org/apache/jena/fuseki/TestAuth.java | 6 +-
.../apache/jena/fuseki/build/TestBuilder.java | 8 +-
jena-fuseki2/jena-fuseki-embedded/pom.xml | 131 +++++
.../fuseki/embedded/FusekiEmbeddedServer.java | 305 +++++++++++
.../jena/fuseki/embedded/TS_EmbeddedFuseki.java | 49 ++
.../fuseki/embedded/TestEmbeddedFuseki.java | 269 ++++++++++
.../testing/FusekiEmbedded/config.ttl | 18 +
jena-fuseki2/pom.xml | 1 +
.../jdbc/results/AbstractResultSetTests.java | 6 +-
.../tdb/results/AbstractTdbResultSetTests.java | 2 +-
.../jdbc/tdb/results/TestTdbDiskResultSets.java | 97 +++-
.../graph/impl/SecuredPrefixMappingImpl.java | 7 +
.../model/impl/SecuredModelImpl.java | 18 +-
.../permissions/query/rewriter/OpRewriter.java | 2 +-
.../jena/permissions/MockPrefixMapping.java | 6 +
.../apache/jena/sdb/layout2/QueryCompiler2.java | 2 +-
.../jena/query/spatial/DatasetGraphSpatial.java | 16 +-
.../java/org/apache/jena/tdb/TDBLoader.java | 36 +-
.../tdb/base/file/BufferAllocatorDirect.java | 16 +-
.../apache/jena/tdb/solver/OpExecutorTDB1.java | 20 +-
.../apache/jena/tdb/store/DatasetGraphTDB.java | 25 +-
.../tdb/store/DatasetPrefixStorageLogger.java | 6 +
.../jena/tdb/store/DatasetPrefixesTDB.java | 21 +-
.../apache/jena/tdb/store/GraphNonTxnTDB.java | 49 ++
.../org/apache/jena/tdb/store/GraphTDB.java | 188 ++-----
.../org/apache/jena/tdb/store/GraphTxnTDB.java | 63 +++
.../transaction/DatasetGraphTransaction.java | 39 ++
.../jena/tdb/transaction/DatasetGraphTxn.java | 2 +-
.../jena/tdb/transaction/Transaction.java | 20 +-
.../tdb/transaction/TransactionManager.java | 512 ++++++++++---------
.../jena/tdb/assembler/TestTDBAssembler.java | 4 +-
.../org/apache/jena/tdb/store/TestLoader.java | 6 +-
.../transaction/AbstractTestNodeTableTrans.java | 2 +-
.../AbstractTestObjectFileTrans.java | 2 +-
.../jena/tdb/transaction/TS_TransactionTDB.java | 2 +
.../jena/tdb/transaction/TestTransControl.java | 213 ++++++++
.../jena/tdb/transaction/TestTransPromote.java | 394 ++++++++++++++
.../tdb/transaction/TestTransactionTDB.java | 10 +
.../jena/query/text/DatasetGraphText.java | 12 +-
...TestDatasetWithComplexPhraseQueryParser.java | 9 +-
.../text/TestDatasetWithKeywordAnalyzer.java | 1 +
151 files changed, 4431 insertions(+), 1859 deletions(-)
----------------------------------------------------------------------