You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by rv...@apache.org on 2014/11/10 11:51:49 UTC
[50/50] [abbrv] jena git commit: Merge branch 'master' into hadoop-rdf
Merge branch 'master' into hadoop-rdf
Bring hadoop-rdf branch up to date with master
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/ab54442e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ab54442e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ab54442e
Branch: refs/heads/hadoop-rdf
Commit: ab54442e959b86e4b6a7baf8a208e35f08fbc1e9
Parents: d8019fb 4554915
Author: Rob Vesse <rv...@apache.org>
Authored: Mon Nov 10 10:50:33 2014 +0000
Committer: Rob Vesse <rv...@apache.org>
Committed: Mon Nov 10 10:50:33 2014 +0000
----------------------------------------------------------------------
jena-arq/Grammar/.gitignore | 4 +
jena-arq/Grammar/arq.jj | 247 +--
jena-arq/Grammar/grammar | 20 +-
jena-arq/Grammar/header.jj | 18 +
jena-arq/Grammar/master.jj | 28 +-
jena-arq/Grammar/sparql_11.jj | 208 +-
.../hp/hpl/jena/sparql/algebra/Transformer.java | 1 -
.../jena/sparql/algebra/optimize/Optimize.java | 2 +-
.../optimize/TransformExtendCombine.java | 9 +-
.../optimizer/reorder/ReorderFixedAlt.java | 80 +
.../jena/sparql/expr/aggregate/AggCustom.java | 91 +
.../hpl/jena/sparql/expr/aggregate/AggNull.java | 2 +-
.../expr/aggregate/AggregatorFactory.java | 68 +-
.../hpl/jena/sparql/lang/ParserARQUpdate.java | 5 +-
.../jena/sparql/lang/ParserSPARQL11Update.java | 28 +-
.../hp/hpl/jena/sparql/lang/SPARQLParser.java | 3 -
.../hp/hpl/jena/sparql/lang/UpdateParser.java | 18 +-
.../hp/hpl/jena/sparql/lang/arq/ARQParser.java | 1399 +++++++------
.../sparql/lang/arq/ARQParserConstants.java | 416 ++--
.../sparql/lang/arq/ARQParserTokenManager.java | 1880 +++++++++---------
.../jena/sparql/lang/arq/JavaCharStream.java | 19 +-
.../jena/sparql/lang/arq/ParseException.java | 47 +-
.../com/hp/hpl/jena/sparql/lang/arq/Token.java | 19 +-
.../hpl/jena/sparql/lang/arq/TokenMgrError.java | 21 +-
.../sparql/lang/sparql_11/JavaCharStream.java | 19 +-
.../sparql/lang/sparql_11/ParseException.java | 47 +-
.../sparql/lang/sparql_11/SPARQLParser11.java | 464 ++---
.../lang/sparql_11/SPARQLParser11Constants.java | 402 ++--
.../sparql_11/SPARQLParser11TokenManager.java | 1822 +++++++++--------
.../hpl/jena/sparql/lang/sparql_11/Token.java | 19 +-
.../sparql/lang/sparql_11/TokenMgrError.java | 21 +-
.../main/java/org/apache/jena/atlas/io/IO.java | 3 +-
.../java/org/apache/jena/atlas/json/JSON.java | 19 +-
.../java/org/apache/jena/atlas/lib/FileOps.java | 236 ++-
.../org/apache/jena/atlas/logging/LogCtl.java | 23 +-
.../algebra/optimize/AbstractTestTransform.java | 16 +-
.../sparql/algebra/optimize/TestOptimizer.java | 19 +-
.../main/java/com/hp/hpl/jena/JenaRuntime.java | 55 +
.../main/java/com/hp/hpl/jena/graph/Graph.java | 9 +-
.../java/com/hp/hpl/jena/graph/GraphAdd.java | 37 -
.../com/hp/hpl/jena/graph/compose/Delta.java | 43 +-
.../hp/hpl/jena/graph/compose/Difference.java | 1 -
.../hp/hpl/jena/graph/compose/Intersection.java | 4 +-
.../hp/hpl/jena/graph/impl/GraphAddList.java | 65 -
.../hp/hpl/jena/graph/impl/GraphMatcher.java | 28 +-
.../hpl/jena/graph/compose/test/TestDelta.java | 149 +-
.../jena/graph/compose/test/TestDifference.java | 119 +-
.../hpl/jena/graph/compose/test/TestDyadic.java | 5 +-
.../graph/compose/test/TestIntersection.java | 138 +-
.../jena/graph/compose/test/TestPackage.java | 9 +-
.../hpl/jena/graph/compose/test/TestUnion.java | 120 +-
.../java/com/hp/hpl/jena/test/TestPackage.java | 3 +-
.../com/hp/hpl/jena/test/TestSystemSetup.java | 39 +
.../testing/Turtle/RaptorTurtle/README.txt | 4 +
.../testing/Turtle/RaptorTurtle/test-10.out | 4 +-
jena-csv/pom.xml | 2 +-
jena-fuseki/pom.xml | 2 +-
.../dev/BackwardForwardDescribeFactory.java | 95 -
jena-fuseki/src-dev/dev/DevFuseki.java | 149 --
.../java/org/apache/jena/fuseki/FusekiCmd.java | 13 +-
.../java/org/apache/jena/fuseki/HttpNames.java | 3 +-
.../jena/fuseki/mgt/ManagementServer.java | 1 +
.../org/apache/jena/fuseki/mgt/PingServlet.java | 75 +
.../jena/fuseki/servlets/SPARQL_Query.java | 3 +-
.../jena/fuseki/servlets/SPARQL_REST_R.java | 5 +-
.../jena/fuseki/servlets/SPARQL_REST_RW.java | 1 +
.../jena/fuseki/servlets/SPARQL_Update.java | 1 +
.../jena/fuseki/servlets/SPARQL_Upload.java | 1 +
.../jena/fuseki/servlets/ServletBase.java | 5 +
jena-fuseki2/pom.xml | 2 +-
jena-fuseki2/run-fuseki | 3 +-
.../java/org/apache/jena/fuseki/Fuseki.java | 25 +-
.../java/org/apache/jena/fuseki/FusekiCmd.java | 13 +-
.../org/apache/jena/fuseki/FusekiLogging.java | 44 +-
.../apache/jena/fuseki/jetty/JettyFuseki.java | 4 +-
.../org/apache/jena/fuseki/mgt/ActionPing.java | 9 +-
.../apache/jena/fuseki/server/SystemState.java | 2 +-
.../apache/jena/fuseki/servlets/ActionBase.java | 2 +
.../apache/jena/fuseki/servlets/HttpAction.java | 2 +-
.../jena/fuseki/servlets/SPARQL_GSP_R.java | 4 +-
.../jena/fuseki/servlets/SPARQL_GSP_RW.java | 7 +-
.../jena/fuseki/servlets/SPARQL_Query.java | 3 +-
.../jena/fuseki/servlets/SPARQL_Update.java | 98 +-
.../jena/fuseki/servlets/SPARQL_Upload.java | 2 +
.../jena/fuseki/servlets/ServletBase.java | 11 +-
.../org/apache/jena/fuseki/servlets/Upload.java | 1 -
.../src/main/resources/log4j.properties | 21 +-
jena-parent/pom.xml | 2 +
.../jena/query/spatial/SpatialQueryFuncs.java | 2 -
.../com/hp/hpl/jena/tdb/StoreConnection.java | 20 +-
.../java/com/hp/hpl/jena/tdb/TDBFactory.java | 6 +-
.../jena/tdb/assembler/DatasetAssemblerTDB.java | 2 +-
.../jena/tdb/assembler/NodeTableAssembler.java | 4 +-
.../jena/tdb/assembler/TDBGraphAssembler.java | 2 +-
.../hp/hpl/jena/tdb/base/block/BlockParams.java | 6 +-
.../com/hp/hpl/jena/tdb/base/file/FileSet.java | 4 +-
.../com/hp/hpl/jena/tdb/base/file/Location.java | 10 +-
.../com/hp/hpl/jena/tdb/index/IndexParams.java | 39 +-
.../java/com/hp/hpl/jena/tdb/setup/Build.java | 72 +-
.../hpl/jena/tdb/setup/DatasetBuilderBasic.java | 14 +-
.../hpl/jena/tdb/setup/DatasetBuilderStd.java | 108 +-
.../com/hp/hpl/jena/tdb/setup/StoreParams.java | 434 +++-
.../hpl/jena/tdb/setup/StoreParamsBuilder.java | 278 +--
.../hp/hpl/jena/tdb/setup/StoreParamsCodec.java | 215 ++
.../hp/hpl/jena/tdb/setup/StoreParamsConst.java | 118 ++
.../hpl/jena/tdb/setup/StoreParamsDynamic.java | 54 +
.../tdb/store/bulkloader2/CmdIndexBuild.java | 2 +-
.../tdb/store/bulkloader2/CmdIndexCopy.java | 4 +-
.../store/bulkloader2/CmdNodeTableBuilder.java | 4 +-
.../java/com/hp/hpl/jena/tdb/sys/DebugTDB.java | 2 +-
.../java/com/hp/hpl/jena/tdb/sys/TDBMaker.java | 32 +-
.../hpl/jena/tdb/transaction/Transaction.java | 186 +-
jena-tdb/src/main/java/tdb/CmdRewriteIndex.java | 4 +-
.../src/main/java/tdb/cmdline/ModLocation.java | 2 +-
.../main/java/tdb/cmdline/ModTDBDataset.java | 2 +-
.../src/main/java/tdb/tools/dumpnodetable.java | 2 +-
.../src/main/java/tdb/tools/tdbgenindex.java | 4 +-
.../test/java/com/hp/hpl/jena/tdb/TC_TDB.java | 2 +
.../jena/tdb/base/file/TestLocationLock.java | 12 +-
.../tdb/base/objectfile/TestStringFileDisk.java | 2 +-
.../hpl/jena/tdb/extra/T_QuadsObjectIsNull.java | 2 +-
.../jena/tdb/extra/T_TDBWriteTransaction.java | 2 +-
.../hp/hpl/jena/tdb/extra/T_TransSystem.java | 6 +-
.../tdb/extra/T_TransSystemMultiDatasets.java | 4 +-
.../jena/tdb/graph/TestPrefixMappingTDB.java | 6 +-
.../com/hp/hpl/jena/tdb/setup/TS_TDBSetup.java | 33 +
.../hp/hpl/jena/tdb/setup/TestStoreParams.java | 143 ++
.../jena/tdb/setup/TestStoreParamsChoose.java | 158 ++
.../jena/tdb/setup/TestStoreParamsCreate.java | 171 ++
.../jena/tdb/store/TestDatasetTDBPersist.java | 2 +-
.../com/hp/hpl/jena/tdb/store/TestGraphTDB.java | 2 +-
.../com/hp/hpl/jena/tdb/store/TestLoader.java | 2 +-
.../tdb/transaction/TestNodeTableTransDisk.java | 2 +-
.../transaction/TestObjectFileTransStorage.java | 4 +-
.../jena/tdb/transaction/TestTransRestart.java | 4 +-
.../tdb/transaction/TestTransactionTDB.java | 2 +-
jena-text/.gitignore | 1 -
jena-text/data.ttl | 20 -
pom.xml | 2 +-
139 files changed, 6174 insertions(+), 5226 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/ab54442e/jena-parent/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/ab54442e/pom.xml
----------------------------------------------------------------------