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/11/22 11:51:37 UTC

[5/6] jena git commit: JENA-1623: Merge commit 'refs/pull/492/head' of https://github.com/apache/jena

JENA-1623: Merge commit 'refs/pull/492/head' of https://github.com/apache/jena

This closes #492.


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

Branch: refs/heads/master
Commit: 78affd221010a51bbee43fe0c7d22ae0804e91d6
Parents: df9b41d 61e900e
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Nov 22 11:45:24 2018 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Nov 22 11:45:24 2018 +0000

----------------------------------------------------------------------
 .../jena/riot/system/StreamRDFWriter.java       |  12 +-
 .../jena/fuseki/access/DataAccessCtl.java       |   2 +-
 .../org/apache/jena/fuseki/access/Users.java    |  35 --
 .../java/org/apache/jena/fuseki/auth/Auth.java  | 104 +++++
 .../org/apache/jena/fuseki/auth/AuthPolicy.java |  39 ++
 .../apache/jena/fuseki/auth/AuthPolicyList.java |  73 ++++
 .../apache/jena/fuseki/auth/AuthUserList.java   |  60 +++
 .../java/org/apache/jena/fuseki/auth/Users.java |  33 ++
 .../jena/fuseki/build/FusekiBuildLib.java       |   1 +
 .../apache/jena/fuseki/build/FusekiBuilder.java |  54 ++-
 .../apache/jena/fuseki/build/FusekiConfig.java  |   5 +-
 .../jena/fuseki/build/RequestAuthorization.java | 115 ------
 .../org/apache/jena/fuseki/ctl/ActionCtl.java   |   2 +-
 .../org/apache/jena/fuseki/ctl/ActionStats.java |   2 +-
 .../apache/jena/fuseki/ctl/JsonDescription.java |   2 +-
 .../jena/fuseki/jetty/FusekiErrorHandler.java   |  12 +-
 .../org/apache/jena/fuseki/jetty/JettyLib.java  |   3 +
 .../fuseki/server/DataAccessPointRegistry.java  |   2 +-
 .../apache/jena/fuseki/server/DataService.java  |  20 +-
 .../org/apache/jena/fuseki/server/Endpoint.java |  73 ++--
 .../apache/jena/fuseki/server/FusekiInfo.java   |   2 +-
 .../jena/fuseki/servlets/ActionService.java     |  85 +++-
 .../apache/jena/fuseki/servlets/AuthFilter.java |   2 +-
 .../jena/fuseki/servlets/FusekiFilter.java      |   2 +-
 .../apache/jena/fuseki/servlets/HttpAction.java |  20 +-
 .../jena/fuseki/servlets/ServiceRouter.java     | 157 +++----
 .../apache/jena/fuseki/servlets/ServletOps.java |   9 +-
 .../test/java/org/apache/jena/fuseki/Dummy.java |   4 +
 .../apache/jena/fuseki/main/FusekiServer.java   | 143 ++++---
 .../jena/fuseki/main/cmds/FusekiMain.java       |   2 +-
 .../jena/fuseki/main/TestFusekiTestServer.java  |   3 +-
 .../AbstractTestFusekiSecurityAssembler.java    |   2 +-
 .../fuseki/main/access/TS_SecurityFuseki.java   |   6 +-
 .../jena/fuseki/main/access/TestAuthorized.java | 111 +++++
 .../main/access/TestAuthorizedRequest.java      | 110 -----
 .../fuseki/main/access/TestPasswordServer.java  | 219 ----------
 .../main/access/TestPasswordServices.java       | 232 -----------
 .../main/access/TestSecurityBuilderSetup.java   | 229 +++++++++++
 .../fuseki/main/access/TestSecurityConfig.java  | 411 +++++++++++++++++++
 .../testing/Access/allowedUsers.ttl             |   6 +-
 .../testing/Access/assem-security-shared.ttl    |   3 +
 .../testing/Access/assem-security.ttl           |   3 +
 .../testing/Access/config-server-0.ttl          |  61 +++
 .../testing/Access/config-server-1.ttl          |   3 +
 .../testing/Access/config-server-2.ttl          |   3 +
 .../testing/Access/config-server-3.ttl          |  51 +++
 .../testing/Access/config-server-4.ttl          |  45 ++
 jena-fuseki2/jena-fuseki-webapp/fuseki-dev      |   2 +-
 48 files changed, 1603 insertions(+), 972 deletions(-)
----------------------------------------------------------------------