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 2019/09/01 16:43:52 UTC

[jena] branch master updated (0654565 -> 4aa30ca)

This is an automated email from the ASF dual-hosted git repository.

andy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jena.git.


    from 0654565  Merge pull request #585 from grosscol/patch-1
     new 33aee14  JENA-1731: Fuseki service configuration
     new be53694  JENA-1743: Introduce QueryExecutionBuilder
     new f4b5643  JENA-1731: Fuseki service configuration (context and tests)
     new 4aa30ca  Merge pull request #595 from afs/fuseki-setup

The 7996 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../java/org/apache/jena/query/QueryExecution.java |  15 +-
 .../apache/jena/query/QueryExecutionBuilder.java   |  94 ++++++
 .../apache/jena/query/QueryExecutionFactory.java   |  43 +--
 .../jena/sparql/core/assembler/AssemblerUtils.java |  23 +-
 .../sparql/core/assembler/DatasetAssembler.java    |   2 +-
 .../core/assembler/DatasetNullAssembler.java       |   2 +-
 .../sparql/core/assembler/DatasetOneAssembler.java |   2 +-
 .../core/assembler/InMemDatasetAssembler.java      |   4 +-
 .../apache/jena/sparql/engine/QueryEngineBase.java |   3 +-
 .../jena/sparql/engine/QueryExecutionBase.java     |  28 +-
 .../jena/sparql/engine/http/QueryEngineHTTP.java   |   5 +-
 .../jena/sparql/function/library/context.java      |  73 +++++
 .../sparql/modify/UpdateProcessRemoteBase.java     |   2 +-
 .../jena/sparql/modify/UpdateProcessorBase.java    |   3 +-
 .../modify/UpdateProcessorStreamingBase.java       |   3 +-
 .../java/org/apache/jena/sparql/util/Context.java  |  27 +-
 .../java/org/apache/jena/sparql/util/Symbol.java   |  71 +++--
 .../src/main/java/org/apache/jena/system/Txn.java  |   2 +-
 .../apache/jena/update/UpdateExecutionFactory.java |  21 +-
 .../main/java/org/apache/jena/assembler/JA.java    |   6 +
 .../apache/jena/sys/JenaSubsystemLifecycle.java    |  12 +-
 .../main/java/org/apache/jena/sys/JenaSystem.java  |   5 +-
 .../main/java/org/apache/jena/util/SplitIRI.java   |   2 +-
 .../jena/tdb2/assembler/DatasetAssemblerTDB.java   |   2 +-
 .../main/java/org/apache/jena/tdb2/sys/EnvTDB.java |   5 -
 .../jena/fuseki/access/AccessCtl_AllowGET.java     |  52 ++--
 .../apache/jena/fuseki/access/AccessCtl_Deny.java  |  48 +++
 .../apache/jena/fuseki/access/DataAccessCtl.java   |   2 +-
 .../org/apache/jena/fuseki/build/BuildLib.java     |  65 ++++-
 .../org/apache/jena/fuseki/build/FusekiConfig.java | 294 +++++++++++++------
 .../org/apache/jena/fuseki/build/FusekiExt.java    |  77 +++++
 .../jena/fuseki/server/ActionServiceFactory.java   |  43 +++
 .../org/apache/jena/fuseki/server/CounterName.java |   2 +-
 .../apache/jena/fuseki/server/DataAccessPoint.java |  16 +-
 .../fuseki/server/DataAccessPointRegistry.java     |   6 +
 .../org/apache/jena/fuseki/server/DataService.java | 116 ++++----
 .../fuseki/{servlets => server}/Dispatcher.java    | 128 ++++----
 .../org/apache/jena/fuseki/server/Endpoint.java    |  56 +++-
 .../apache/jena/fuseki/server/EndpointBuilder.java |  79 +++++
 .../fuseki/server/EndpointFactoryRegistry.java     |  23 +-
 .../org/apache/jena/fuseki/server/EndpointSet.java |   1 -
 .../org/apache/jena/fuseki/server/FusekiVocab.java |  42 ++-
 .../org/apache/jena/fuseki/server/NameMgr.java     |  13 +-
 .../org/apache/jena/fuseki/server/Operation.java   | 116 ++++++--
 .../{servlets => server}/OperationRegistry.java    |  78 ++++-
 .../apache/jena/fuseki/servlets/ActionBase.java    |   2 +
 .../org/apache/jena/fuseki/servlets/ActionLib.java |   6 +-
 .../jena/fuseki/servlets/ActionProcessor.java      |  21 +-
 .../apache/jena/fuseki/servlets/ActionREST.java    |   8 +-
 .../apache/jena/fuseki/servlets/FusekiFilter.java  |   1 +
 .../org/apache/jena/fuseki/servlets/GSPLib.java    |  51 ++++
 .../org/apache/jena/fuseki/servlets/GSP_Base.java  |  30 +-
 .../org/apache/jena/fuseki/servlets/GSP_R.java     |   4 +-
 .../org/apache/jena/fuseki/servlets/GSP_RW.java    |   9 +-
 .../apache/jena/fuseki/servlets/HttpAction.java    |   2 +
 .../jena/fuseki/servlets/NoOpActionService.java    |  32 +-
 .../jena/fuseki/servlets/SPARQLQueryProcessor.java |  16 +-
 .../jena/fuseki/servlets/SPARQL_QueryGeneral.java  |  12 +-
 .../org/apache/jena/fuseki/main/FusekiLib.java     |  65 ++---
 .../org/apache/jena/fuseki/main/FusekiServer.java  |  66 +++--
 .../org/apache/jena/fuseki/main/JettyServer.java   |   4 +-
 .../apache/jena/fuseki/main/cmds/FusekiMain.java   |   7 +-
 .../org/apache/jena/fuseki/main/TC_FusekiMain.java |  13 +-
 .../apache/jena/fuseki/main/TestConfigFile.java    | 322 +++++++++++++++++++++
 .../jena/fuseki/main/TestEmbeddedFuseki.java       |   6 +-
 .../fuseki/main/TestFusekiCustomOperation.java     |  76 +++--
 .../AbstractTestFusekiSecurityAssembler.java       |  26 +-
 .../main/access/TestServiceDataAuthConfig.java     |   7 +-
 .../main/examples/ExtendFuseki_AddService_1.java   |   2 +-
 .../main/examples/ExtendFuseki_AddService_2.java   |   2 +-
 .../main/examples/ExtendFuseki_AddService_3.java   |   2 +-
 .../src/test/resources/log4j.properties            |  10 +-
 .../jena-fuseki-main/testing/Access/empty-passwd   |   1 +
 .../jena-fuseki-main/testing/Config/basic.ttl      |  24 ++
 .../jena-fuseki-main/testing/Config/context.ttl    |  47 +++
 .../jena-fuseki-main/testing/Config/setup1.ttl     |  27 ++
 .../jena-fuseki-main/testing/Config/setup2.ttl     |  29 ++
 .../testing/Config/std-dataset.ttl                 |  25 ++
 .../jena-fuseki-main/testing/Config/std-empty.ttl  |  18 ++
 .../testing/Config/std-general.ttl                 |  24 ++
 .../jena-fuseki-main/testing/Config/std-named.ttl  |  28 ++
 .../testing/Config/tdb1-endpoints.ttl              |  28 ++
 .../testing/Config/tdb2-endpoints.ttl              |  29 ++
 .../apache/jena/fuseki/cmd/JettyFusekiWebapp.java  |   2 +-
 .../org/apache/jena/fuseki/mgt/ActionDatasets.java |   1 +
 .../jena/fuseki/webapp/FusekiServerListener.java   |  15 +-
 .../apache/jena/fuseki/webapp/FusekiWebapp.java    |  24 +-
 .../jena/rdfconnection/RDFConnectionRemote.java    |   2 +-
 .../jena/sdb/assembler/DatasetStoreAssembler.java  |   2 +-
 .../src/main/java/org/apache/jena/tdb/TDB.java     |   3 +-
 .../jena/tdb/assembler/DatasetAssemblerTDB.java    |   2 +-
 .../main/java/org/apache/jena/tdb/sys/EnvTDB.java  |   5 -
 .../java/org/apache/jena/tdb/sys/SystemTDB.java    |   5 +-
 93 files changed, 2168 insertions(+), 687 deletions(-)
 create mode 100644 jena-arq/src/main/java/org/apache/jena/query/QueryExecutionBuilder.java
 create mode 100644 jena-arq/src/main/java/org/apache/jena/sparql/function/library/context.java
 create mode 100644 jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/AccessCtl_Deny.java
 create mode 100644 jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiExt.java
 create mode 100644 jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/ActionServiceFactory.java
 rename jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/{servlets => server}/Dispatcher.java (82%)
 create mode 100644 jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/EndpointBuilder.java
 copy jena-core/src/main/java/org/apache/jena/sys/JenaSubsystemLifecycle.java => jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/EndpointFactoryRegistry.java (59%)
 rename jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/{servlets => server}/OperationRegistry.java (64%)
 create mode 100644 jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/GSPLib.java
 copy jena-core/src/main/java/org/apache/jena/sys/JenaSubsystemLifecycle.java => jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/NoOpActionService.java (59%)
 create mode 100644 jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestConfigFile.java
 create mode 100644 jena-fuseki2/jena-fuseki-main/testing/Access/empty-passwd
 create mode 100644 jena-fuseki2/jena-fuseki-main/testing/Config/basic.ttl
 create mode 100644 jena-fuseki2/jena-fuseki-main/testing/Config/context.ttl
 create mode 100644 jena-fuseki2/jena-fuseki-main/testing/Config/setup1.ttl
 create mode 100644 jena-fuseki2/jena-fuseki-main/testing/Config/setup2.ttl
 create mode 100644 jena-fuseki2/jena-fuseki-main/testing/Config/std-dataset.ttl
 create mode 100644 jena-fuseki2/jena-fuseki-main/testing/Config/std-empty.ttl
 create mode 100644 jena-fuseki2/jena-fuseki-main/testing/Config/std-general.ttl
 create mode 100644 jena-fuseki2/jena-fuseki-main/testing/Config/std-named.ttl
 create mode 100644 jena-fuseki2/jena-fuseki-main/testing/Config/tdb1-endpoints.ttl
 create mode 100644 jena-fuseki2/jena-fuseki-main/testing/Config/tdb2-endpoints.ttl