Merge branch 'master' into hadoop-rdf
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/80bccb96 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/80bccb96 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/80bccb96 Branch: refs/heads/hadoop-rdf Commit: 80bccb965067c99cf6d44ebce9a135124d733b2b Parents: c7f8c89 a539ff0 Author: Rob Vesse <[email protected]> Authored: Tue Nov 25 16:25:56 2014 +0000 Committer: Rob Vesse <[email protected]> Committed: Tue Nov 25 16:25:56 2014 +0000 ---------------------------------------------------------------------- jena-arq/ReleaseNotes.txt | 3 +- .../jena/sparql/core/DatasetGraphBaseFind.java | 2 +- .../jena/sparql/core/DatasetGraphCaching.java | 2 +- .../com/hp/hpl/jena/sparql/expr/NodeValue.java | 17 +- .../hpl/jena/sparql/expr/aggregate/AggSum.java | 3 +- .../sparql/expr/nodevalue/NodeFunctions.java | 18 +- .../sparql/expr/nodevalue/NodeValueDecimal.java | 2 +- .../sparql/expr/nodevalue/NodeValueDouble.java | 2 +- .../expr/nodevalue/NodeValueDuration.java | 2 +- .../sparql/expr/nodevalue/NodeValueFloat.java | 2 +- .../sparql/expr/nodevalue/NodeValueInteger.java | 2 +- .../jena/sparql/expr/nodevalue/XSDFuncOp.java | 21 +-- .../hp/hpl/jena/sparql/graph/GraphMemPlain.java | 4 +- .../com/hp/hpl/jena/sparql/graph/NodeConst.java | 16 +- .../com/hp/hpl/jena/sparql/lang/ParserBase.java | 16 +- .../sparql/resultset/JSONInputIterator.java | 2 +- .../jena/sparql/sse/lang/ParseHandlerPlain.java | 4 +- .../com/hp/hpl/jena/sparql/util/FmtUtils.java | 67 ++++---- .../hpl/jena/sparql/util/NodeFactoryExtra.java | 18 +- .../com/hp/hpl/jena/sparql/util/NodeUtils.java | 28 +++- .../org/apache/jena/atlas/iterator/Iter.java | 44 ++--- .../jena/atlas/iterator/IteratorConcat.java | 13 +- .../jena/atlas/iterator/IteratorCons.java | 141 ++++++++-------- .../java/org/apache/jena/atlas/lib/Map2.java | 2 +- .../org/apache/jena/atlas/logging/FmtLog.java | 61 ++++++- .../java/org/apache/jena/riot/ResultSetMgr.java | 2 +- .../java/org/apache/jena/riot/RiotReader.java | 2 +- .../jena/riot/checker/CheckerLiterals.java | 164 ++++++++++--------- .../org/apache/jena/riot/lang/JsonLDReader.java | 2 +- .../org/apache/jena/riot/lang/LangRDFXML.java | 4 +- .../apache/jena/riot/out/NodeFormatterBase.java | 24 ++- .../process/normalize/CanonicalizeLiteral.java | 27 ++- .../riot/process/normalize/NormalizeValue.java | 16 +- .../riot/process/normalize/NormalizeValue2.java | 4 +- .../apache/jena/riot/system/IRIResolver.java | 2 +- .../jena/riot/system/ParserProfileBase.java | 4 +- .../jena/riot/system/ParserProfileChecker.java | 4 +- .../org/apache/jena/riot/system/RiotLib.java | 2 +- .../apache/jena/riot/thrift/ThriftConvert.java | 6 +- .../java/org/apache/jena/riot/tokens/Token.java | 10 +- .../apache/jena/riot/writer/TurtleShell.java | 14 +- .../engine/iterator/TestQueryIterSort.java | 2 +- .../hp/hpl/jena/sparql/expr/TestFunctions.java | 4 +- .../hpl/jena/sparql/expr/TestNodeFunctions.java | 39 ++--- .../hp/hpl/jena/sparql/expr/TestNodeValue.java | 26 +-- .../hp/hpl/jena/sparql/expr/TestOrdering.java | 52 +++--- .../hpl/jena/sparql/syntax/TestSSE_Basic.java | 8 +- .../hpl/jena/sparql/syntax/TestSSE_Forms.java | 2 +- .../com/hp/hpl/jena/sparql/util/TestList.java | 10 +- .../jena/atlas/data/TestDistinctDataBag.java | 2 +- .../jena/atlas/data/TestDistinctDataNet.java | 2 +- .../jena/atlas/data/TestSortedDataBag.java | 2 +- .../apache/jena/atlas/iterator/TestIter.java | 24 +-- .../jena/atlas/iterator/TestIteratorPeek.java | 2 +- .../apache/jena/riot/ErrorHandlerTestLib.java | 15 +- .../org/apache/jena/riot/out/TestNodeFmt.java | 16 +- .../apache/jena/riot/system/TestChecker.java | 1 + .../jena/riot/tokens/TestTokenForNode.java | 6 +- .../apache/jena/riot/writer/TestRDFJSON.java | 17 +- jena-arq/testing/ARQ/GroupBy/agg-1.srj | 3 +- jena-arq/testing/ARQ/GroupBy/agg-2.srj | 3 +- .../main/java/com/hp/hpl/jena/JenaRuntime.java | 2 +- .../hp/hpl/jena/datatypes/xsd/XSDDatatype.java | 2 +- .../datatypes/xsd/impl/XSDBaseStringType.java | 24 +-- .../java/com/hp/hpl/jena/graph/NodeFactory.java | 146 ++++++++++------- .../hp/hpl/jena/graph/impl/CollectionGraph.java | 4 +- .../jena/graph/impl/LiteralLabelFactory.java | 79 +++++---- .../hpl/jena/graph/impl/LiteralLabelImpl.java | 60 ++++--- .../hp/hpl/jena/rdf/model/ResourceFactory.java | 6 +- .../hp/hpl/jena/rdf/model/SimpleSelector.java | 2 +- .../com/hp/hpl/jena/rdf/model/impl/AltImpl.java | 2 +- .../hpl/jena/rdf/model/impl/ContainerImpl.java | 2 +- .../hp/hpl/jena/rdf/model/impl/ModelCom.java | 8 +- .../com/hp/hpl/jena/rdf/model/impl/SeqImpl.java | 2 +- .../hpl/jena/rdf/model/impl/StatementBase.java | 9 +- .../com/hp/hpl/jena/rdf/model/impl/Util.java | 56 +++---- .../hp/hpl/jena/rdfxml/xmlinput/JenaReader.java | 4 +- .../hpl/jena/rdfxml/xmloutput/impl/Basic.java | 18 +- .../jena/rdfxml/xmloutput/impl/Unparser.java | 45 ++--- .../com/hp/hpl/jena/reasoner/rulesys/Rule.java | 10 +- .../java/com/hp/hpl/jena/vocabulary/RDF.java | 4 + .../jena/graph/compose/test/TestDifference.java | 60 +++---- .../hp/hpl/jena/graph/test/NodeCreateUtils.java | 4 +- .../hpl/jena/graph/test/TestLiteralLabels.java | 10 +- .../com/hp/hpl/jena/graph/test/TestNode.java | 10 +- .../hpl/jena/graph/test/TestTypedLiterals.java | 12 +- .../rulesys/test/TestComparatorBuiltins.java | 20 +-- .../jena/reasoner/rulesys/test/TestFBRules.java | 58 +++---- .../apache/jena/fuseki/server/FusekiServer.java | 3 +- .../apache/jena/fuseki/server/SystemState.java | 24 +++ jena-parent/pom.xml | 5 +- .../com/hp/hpl/jena/sdb/layout2/SQLBridge2.java | 12 +- jena-tdb/ReleaseNotes.txt | 4 + .../hp/hpl/jena/tdb/solver/StageMatchTuple.java | 11 +- .../java/com/hp/hpl/jena/tdb/store/NodeId.java | 8 +- .../java/com/hp/hpl/jena/tdb/sys/FileRef.java | 6 +- .../hp/hpl/jena/tdb/extra/T_TransSystem.java | 2 +- .../tdb/extra/T_TransSystemMultiDatasets.java | 2 +- .../com/hp/hpl/jena/tdb/store/TestNodeId.java | 6 +- .../store/nodetable/AbstractTestNodeTable.java | 2 +- jena-tdb/tdb-default.cfg | 20 +++ 101 files changed, 978 insertions(+), 801 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/80bccb96/jena-parent/pom.xml ----------------------------------------------------------------------
