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 2018/01/17 18:51:39 UTC

[4/6] jena git commit: Merge branch 'master' into JENA-1459-Highlighting

Merge branch 'master' into JENA-1459-Highlighting

Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/c9453b4c
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/c9453b4c
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/c9453b4c

Branch: refs/heads/master
Commit: c9453b4c835ac7ab3eb9b0c9bcf8857d11b1a8b8
Parents: d0e5bd2 9f4010e
Author: Chris Tomlinson <ct...@moonvine.org>
Authored: Mon Jan 15 09:32:51 2018 -0600
Committer: GitHub <no...@github.com>
Committed: Mon Jan 15 09:32:51 2018 -0600

----------------------------------------------------------------------
 .../main/java/org/apache/jena/query/ARQ.java    |  10 +
 .../org/apache/jena/riot/RDFParserRegistry.java |  14 +-
 .../apache/jena/riot/checker/CheckerIRI.java    |   2 +-
 .../apache/jena/riot/lang/ReaderRIOTRDFXML.java |   3 +-
 .../org/apache/jena/riot/out/NodeFmtLib.java    |   2 +-
 .../apache/jena/riot/out/NodeFormatterTTL.java  |   2 +-
 .../org/apache/jena/riot/system/Checker.java    |   2 +-
 .../apache/jena/riot/system/IRIResolver.java    | 248 ++++++++++---------
 .../apache/jena/riot/system/PrefixMapBase.java  |   3 +-
 .../apache/jena/riot/system/PrefixMapStd.java   |   3 +-
 .../org/apache/jena/sparql/ARQConstants.java    |   7 +
 .../org/apache/jena/sparql/expr/E_Function.java |  44 +++-
 .../jena/sparql/expr/ExprUndefFunction.java     |  32 +++
 .../sparql/expr/nodevalue/NodeFunctions.java    |   3 +-
 .../jena/sparql/function/FunctionBase.java      |   2 +-
 .../jena/sparql/function/js/EnvJavaScript.java  | 138 +++++++++++
 .../sparql/function/js/FunctionJavaScript.java  |  91 +++++++
 .../jena/sparql/function/js/JSEngine.java       | 109 ++++++++
 .../org/apache/jena/sparql/function/js/NV.java  | 217 ++++++++++++++++
 .../apache/jena/sparql/function/js/RDFJS.java   |  35 +++
 .../jena/sparql/resultset/ResultsFormat.java    |  19 +-
 .../org/apache/jena/sparql/util/FmtUtils.java   |   2 +-
 .../apache/jena/sparql/util/QueryExecUtils.java |  10 +
 .../jena/sparql/util/graph/GraphUtils.java      |   9 +-
 .../query/TestParameterizedSparqlString.java    |   4 +-
 .../java/org/apache/jena/riot/lang/TestIRI.java |   3 +-
 .../jena/riot/langsuite/FactoryTestRiot.java    |   1 -
 .../jena/riot/system/AbstractTestPrefixMap.java |   2 +-
 .../jena/riot/system/TestPrefixMapOther.java    |   4 +-
 .../java/org/apache/jena/sparql/TC_General.java |   2 +
 .../jena/sparql/function/js/TS_FunctionJS.java  |  49 ++++
 .../function/js/TestJavaScriptFunctions.java    | 198 +++++++++++++++
 .../apache/jena/sparql/function/js/TestNV.java  |  71 ++++++
 .../jena/sparql/function/js/TestSPARQL_JS.java  |  49 ++++
 .../function/library/TS_LibraryFunctions.java   |   2 +-
 jena-arq/testing/ARQ/JS/data.ttl                |   5 +
 jena-arq/testing/ARQ/JS/js-query-1.rq           |   4 +
 jena-arq/testing/ARQ/JS/js-query-1.srj          |  12 +
 jena-arq/testing/ARQ/JS/js-query-2.rq           |   4 +
 jena-arq/testing/ARQ/JS/js-query-2.srj          |  12 +
 jena-arq/testing/ARQ/JS/js-query-3.rq           |   4 +
 jena-arq/testing/ARQ/JS/js-query-3.srj          |  12 +
 jena-arq/testing/ARQ/JS/js-query-4.rq           |   9 +
 jena-arq/testing/ARQ/JS/js-query-4.srj          |  14 ++
 jena-arq/testing/ARQ/JS/js-query-5.rq           |   7 +
 jena-arq/testing/ARQ/JS/js-query-5.srj          |   8 +
 jena-arq/testing/ARQ/JS/manifest.ttl            |  56 +++++
 jena-arq/testing/ARQ/JS/test-library.js         |  14 ++
 .../java/org/apache/jena/atlas/lib/IRILib.java  |   6 +-
 .../jena/atlas/lib/TestFilenameProcessing.java  |   7 +-
 jena-cmds/src/main/java/arq/iri.java            |   2 +-
 .../java/org/apache/jena/n3/N3IRIResolver.java  |  34 ++-
 .../apache/jena/rdfxml/xmlinput/ARPOptions.java |   6 +
 .../rdfxml/xmloutput/impl/BaseXMLWriter.java    |   2 +
 .../jena/shared/wg/LazyFileInputStream.java     |  46 ----
 .../apache/jena/shared/wg/LazyInputStream.java  |  62 -----
 .../jena/shared/wg/LazyURLInputStream.java      |  50 ----
 .../jena/shared/wg/LazyZipEntryInputStream.java |  52 ----
 .../jena/shared/wg/TestInputStreamFactory.java  | 192 --------------
 .../java/org/apache/jena/shared/wg/package.html |  30 ---
 .../java/org/apache/jena/util/FileUtils.java    |  15 +-
 .../java/org/apache/jena/n3/TestResolver.java   |   7 +-
 .../jena/rdfxml/xmlinput/NTripleTestSuite.java  |   8 +-
 .../jena/rdfxml/xmlinput/TestARPMain.java       |   8 +-
 .../apache/jena/rdfxml/xmlinput/URITests.java   |   2 +
 .../jena/rdfxml/xmlinput/WGTestSuite.java       |  12 +-
 .../jena/shared/wg/InputStreamFactoryTests.java | 193 +++++++++++++++
 .../jena/shared/wg/LazyFileInputStream.java     |  46 ++++
 .../apache/jena/shared/wg/LazyInputStream.java  |  62 +++++
 .../jena/shared/wg/LazyURLInputStream.java      |  50 ++++
 .../jena/shared/wg/LazyZipEntryInputStream.java |  52 ++++
 .../java/org/apache/jena/shared/wg/package.html |  30 +++
 .../org/apache/jena/util/TestFileUtils.java     |   3 +-
 .../jena/fuseki/validation/IRIValidator.java    |   3 +-
 .../apache/jena/fuseki/build/FusekiConfig.java  |  51 ++--
 .../apache/jena/fuseki/mgt/ActionDatasets.java  |   2 +-
 .../apache/jena/fuseki/server/FusekiSystem.java |  29 +--
 .../validation/html/IRIValidatorHTML.java       |   2 +-
 .../validation/json/IRIValidatorJSON.java       |   2 +-
 .../jena/fuseki/embedded/FusekiServer.java      |  28 ++-
 .../org/apache/jena/query/text/TS_Text.java     |   2 +-
 81 files changed, 1948 insertions(+), 701 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/c9453b4c/jena-text/src/test/java/org/apache/jena/query/text/TS_Text.java
----------------------------------------------------------------------
diff --cc jena-text/src/test/java/org/apache/jena/query/text/TS_Text.java
index 8fce7fd,d8d2b19..8dbbd45
--- a/jena-text/src/test/java/org/apache/jena/query/text/TS_Text.java
+++ b/jena-text/src/test/java/org/apache/jena/query/text/TS_Text.java
@@@ -51,7 -51,6 +51,7 @@@ import org.junit.runners.Suite.SuiteCla
      , TestGenericAnalyzerAssembler.class
      , TestTextGraphIndexExtra.class
      , TestTextGraphIndexExtra2.class
-     , TestTextHighlighting.class
++`    , TestTextHighlighting.class
  })
  
  public class TS_Text