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/08/31 12:05:17 UTC
[27/27] jena git commit: JENA-1594: Merge commit 'refs/pull/465/head'
of https://github.com/apache/jena
JENA-1594: Merge commit 'refs/pull/465/head' of https://github.com/apache/jena
This closes #465.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/c8a31476
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/c8a31476
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/c8a31476
Branch: refs/heads/master
Commit: c8a31476d4072b44790965d5d79963c545e6c2ec
Parents: 0a0b831 3b01252
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Aug 31 13:04:11 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Aug 31 13:04:11 2018 +0100
----------------------------------------------------------------------
.travis.yml | 2 +-
.../org/apache/jena/query/DatasetFactory.java | 9 +-
.../jena/query/QueryExecutionFactory.java | 62 ++-
.../apache/jena/sparql/core/DatasetGraph.java | 4 +-
.../jena/sparql/core/DatasetGraphCopyAdd.java | 41 --
.../jena/sparql/core/DatasetGraphFactory.java | 5 +-
.../sparql/core/DatasetGraphFilteredView.java | 159 ++++++
.../jena/sparql/core/DatasetGraphReadOnly.java | 21 +-
.../jena/sparql/core/DatasetGraphWrapper.java | 17 +-
.../sparql/core/DatasetGraphWrapperView.java | 30 ++
.../engine/QueryEngineFactoryWrapper.java | 13 +-
.../jena/sparql/engine/QueryExecutionBase.java | 36 +-
.../org/apache/jena/sparql/expr/ExprSystem.java | 9 +-
.../jena/sparql/sse/builders/BuilderLib.java | 245 ++++-----
.../org/apache/jena/sparql/util/Context.java | 89 +--
.../org/apache/jena/sparql/util/FmtUtils.java | 2 +-
.../org/apache/jena/sparql/core/TS_Core.java | 3 +-
.../core/TestDatasetGraphFilteredView.java | 162 ++++++
jena-base/pom.xml | 7 +
.../rulesys/impl/TestLPBRuleEngine.java | 4 +-
.../tdb2/solver/StageGeneratorDirectTDB.java | 2 +-
.../jena/tdb2/store/GraphViewSwitchable.java | 11 +-
jena-fuseki2/jena-fuseki-access/pom.xml | 104 ++++
.../fuseki/access/AssemblerAccessDataset.java | 63 +++
.../access/AssemblerSecurityRegistry.java | 130 +++++
.../fuseki/access/AuthorizationService.java | 30 ++
.../jena/fuseki/access/DataAccessCtl.java | 163 ++++++
.../jena/fuseki/access/DataAccessLib.java | 81 +++
.../access/DatasetGraphAccessControl.java | 59 ++
.../fuseki/access/Filtered_REST_Quads_R.java | 43 ++
.../fuseki/access/Filtered_SPARQL_GSP_R.java | 39 ++
.../access/Filtered_SPARQL_QueryDataset.java | 63 +++
.../apache/jena/fuseki/access/GraphFilter.java | 76 +++
.../jena/fuseki/access/GraphFilterTDB1.java | 70 +++
.../jena/fuseki/access/GraphFilterTDB2.java | 70 +++
.../apache/jena/fuseki/access/InitSecurity.java | 38 ++
.../jena/fuseki/access/SecurityContext.java | 162 ++++++
.../jena/fuseki/access/SecurityRegistry.java | 63 +++
.../jena/fuseki/access/VocabSecurity.java | 55 ++
.../org.apache.jena.sys.JenaSubsystemLifecycle | 1 +
.../access/AbstractTestSecurityAssembler.java | 326 +++++++++++
.../jena/fuseki/access/AccessTestLib.java | 70 +++
.../fuseki/access/TS_SecurityFiltering.java | 44 ++
.../fuseki/access/TestAssemblerSeparate.java | 26 +
.../jena/fuseki/access/TestAssemblerShared.java | 26 +
.../access/TestSecurityAssemblerBuild.java | 46 ++
.../fuseki/access/TestSecurityFilterFuseki.java | 315 +++++++++++
.../fuseki/access/TestSecurityFilterLocal.java | 355 ++++++++++++
.../src/test/resources/log4j.properties | 40 ++
.../testing/Access/assem-security-shared.ttl | 58 ++
.../testing/Access/assem-security.ttl | 63 +++
.../apache/jena/fuseki/cmds/FusekiBasicCmd.java | 539 +------------------
.../jena/fuseki/cmds/FusekiBasicMain.java | 513 ++++++++++++++++++
.../apache/jena/fuseki/cmds/ServerConfig.java | 51 ++
jena-fuseki2/jena-fuseki-core/pom.xml | 2 +
.../java/org/apache/jena/fuseki/Fuseki.java | 2 +-
.../jena/fuseki/build/FusekiBuildLib.java | 5 +-
.../apache/jena/fuseki/build/FusekiBuilder.java | 3 +
.../apache/jena/fuseki/build/FusekiConfig.java | 3 +-
.../apache/jena/fuseki/build/FusekiConst.java | 41 ++
.../org/apache/jena/fuseki/cmd/FusekiCmd.java | 6 +-
.../org/apache/jena/fuseki/cmd/JettyFuseki.java | 325 +++++++++++
.../apache/jena/fuseki/ctl/ActionAsyncTask.java | 1 -
.../apache/jena/fuseki/ctl/ActionBackup.java | 65 ---
.../jena/fuseki/ctl/ActionBackupList.java | 94 ----
.../org/apache/jena/fuseki/ctl/ActionItem.java | 46 ++
.../org/apache/jena/fuseki/ctl/ActionStats.java | 11 +-
.../apache/jena/fuseki/ctl/JsonDescription.java | 73 +++
.../org/apache/jena/fuseki/ctl/TaskBase.java | 4 +-
.../apache/jena/fuseki/jetty/JettyFuseki.java | 325 -----------
.../org/apache/jena/fuseki/jetty/JettyLib.java | 169 ++++++
.../apache/jena/fuseki/mgt/ActionBackup.java | 68 +++
.../jena/fuseki/mgt/ActionBackupList.java | 95 ++++
.../apache/jena/fuseki/mgt/ActionDatasets.java | 7 +-
.../org/apache/jena/fuseki/mgt/ActionItem.java | 46 --
.../jena/fuseki/mgt/ActionServerStatus.java | 12 +-
.../apache/jena/fuseki/mgt/JsonDescription.java | 72 ---
.../org/apache/jena/fuseki/mgt/MgtConst.java | 52 --
.../java/org/apache/jena/fuseki/mgt/MgtJMX.java | 61 ---
.../apache/jena/fuseki/mgt/ServerMgtConst.java | 39 ++
.../apache/jena/fuseki/mgt/ServiceMXBean.java | 32 --
.../apache/jena/fuseki/server/Operation.java | 6 +-
.../apache/jena/fuseki/server/ServerConst.java | 41 ++
.../apache/jena/fuseki/servlets/ActionREST.java | 9 +
.../jena/fuseki/servlets/ActionService.java | 2 +-
.../jena/fuseki/servlets/REST_Quads_R.java | 2 +-
.../jena/fuseki/servlets/REST_Quads_RW.java | 4 +-
.../apache/jena/fuseki/servlets/SPARQL_GSP.java | 16 +-
.../jena/fuseki/servlets/SPARQL_GSP_R.java | 13 +-
.../jena/fuseki/servlets/SPARQL_GSP_RW.java | 21 +-
.../jena/fuseki/servlets/SPARQL_Query.java | 16 +-
.../servlets/ServiceDispatchRegistry.java | 10 +-
.../jena/fuseki/system/FusekiLogging.java | 18 +-
.../webapp/FusekiServerEnvironmentInit.java | 5 +-
.../apache/jena/fuseki/webapp/SystemState.java | 16 -
.../src/main/webapp/WEB-INF/web.xml | 8 +-
.../src/main/webapp/js/app/controllers/.svnkeep | 0
.../src/main/webapp/js/app/layouts/.svnkeep | 0
.../src/main/webapp/js/app/routers/.svnkeep | 0
.../src/main/webapp/js/app/views/.svnkeep | 0
.../java/org/apache/jena/fuseki/ServerCtl.java | 2 +-
.../java/org/apache/jena/fuseki/TS_Fuseki.java | 2 +-
.../java/org/apache/jena/fuseki/TestAdmin.java | 19 +-
.../jena/fuseki/embedded/FusekiServer.java | 126 +++--
.../jena/fuseki/embedded/JettyServer.java | 369 +++++++++++++
jena-fuseki2/pom.xml | 1 +
.../jena/permissions/SecurityEvaluator.java | 67 +--
.../rdfconnection/RDFConnectionFactory.java | 25 +
.../jena/rdfconnection/RDFConnectionRemote.java | 2 +-
pom.xml | 4 +-
110 files changed, 5432 insertions(+), 1746 deletions(-)
----------------------------------------------------------------------