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/07 12:02:27 UTC

[15/16] jena git commit: JENA-1585: Merge commit 'refs/pull/456/head' of https://github.com/apache/jena

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

This closes #456.


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

Branch: refs/heads/master
Commit: 59b38995d2586c4248be05727c76b0f77b80a421
Parents: 02086d2 f926341
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Aug 7 12:55:56 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Aug 7 12:55:56 2018 +0100

----------------------------------------------------------------------
 .../apache/jena/fuseki/cmds/FusekiBasicCmd.java |   2 +-
 .../java/org/apache/jena/fuseki/FusekiLib.java  |  99 ----
 .../org/apache/jena/fuseki/FusekiLogging.java   | 190 --------
 .../jena/fuseki/FusekiNotFoundException.java    |  26 --
 .../jena/fuseki/FusekiRequestException.java     |  57 ---
 .../jena/fuseki/build/FusekiBuildLib.java       | 126 +++++
 .../apache/jena/fuseki/build/FusekiBuilder.java |  17 +-
 .../apache/jena/fuseki/build/FusekiConfig.java  |   8 +-
 .../org/apache/jena/fuseki/build/Template.java  |   2 +-
 .../org/apache/jena/fuseki/cmd/FusekiCmd.java   |   8 +-
 .../apache/jena/fuseki/ctl/ActionAsyncTask.java |  57 +++
 .../apache/jena/fuseki/ctl/ActionBackup.java    |  65 +++
 .../jena/fuseki/ctl/ActionBackupList.java       |  94 ++++
 .../jena/fuseki/ctl/ActionContainerItem.java    | 118 +++++
 .../org/apache/jena/fuseki/ctl/ActionCtl.java   |  85 ++++
 .../org/apache/jena/fuseki/ctl/ActionPing.java  |  77 ++++
 .../org/apache/jena/fuseki/ctl/ActionSleep.java |  94 ++++
 .../org/apache/jena/fuseki/ctl/ActionStats.java | 203 +++++++++
 .../org/apache/jena/fuseki/ctl/ActionTasks.java | 125 +++++
 .../java/org/apache/jena/fuseki/ctl/Async.java  |  61 +++
 .../java/org/apache/jena/fuseki/ctl/Backup.java | 131 ++++++
 .../apache/jena/fuseki/ctl/JsonConstCtl.java    |  29 ++
 .../org/apache/jena/fuseki/ctl/TaskBase.java    |  43 ++
 .../apache/jena/fuseki/jetty/JettyFuseki.java   |   2 +-
 .../apache/jena/fuseki/mgt/ActionAsyncTask.java |  56 ---
 .../apache/jena/fuseki/mgt/ActionBackup.java    |  64 ---
 .../jena/fuseki/mgt/ActionBackupList.java       |  94 ----
 .../jena/fuseki/mgt/ActionContainerItem.java    | 118 -----
 .../org/apache/jena/fuseki/mgt/ActionCtl.java   |  85 ----
 .../apache/jena/fuseki/mgt/ActionDatasets.java  |   7 +-
 .../org/apache/jena/fuseki/mgt/ActionItem.java  |   1 +
 .../org/apache/jena/fuseki/mgt/ActionLogs.java  |   1 +
 .../org/apache/jena/fuseki/mgt/ActionPing.java  |  77 ----
 .../jena/fuseki/mgt/ActionServerStatus.java     |  11 +-
 .../org/apache/jena/fuseki/mgt/ActionSleep.java |  94 ----
 .../org/apache/jena/fuseki/mgt/ActionStats.java | 202 ---------
 .../org/apache/jena/fuseki/mgt/ActionTasks.java | 125 -----
 .../java/org/apache/jena/fuseki/mgt/Async.java  |  61 ---
 .../java/org/apache/jena/fuseki/mgt/Backup.java | 131 ------
 .../org/apache/jena/fuseki/mgt/DumpServlet.java |  14 +-
 .../org/apache/jena/fuseki/mgt/JsonConst.java   |  53 ---
 .../apache/jena/fuseki/mgt/JsonDescription.java |  12 +-
 .../org/apache/jena/fuseki/mgt/MgtConst.java    |  21 +
 .../apache/jena/fuseki/mgt/ServiceMXBean.java   |  32 ++
 .../org/apache/jena/fuseki/mgt/TaskBase.java    |  43 --
 .../jena/fuseki/migrate/GraphLoadUtils.java     |  71 ---
 .../jena/fuseki/migrate/StreamRDFLimited.java   |  62 ---
 .../apache/jena/fuseki/server/FusekiEnv.java    | 168 -------
 .../server/FusekiServerEnvironmentInit.java     |  53 ---
 .../fuseki/server/FusekiServerListener.java     | 105 -----
 .../apache/jena/fuseki/server/FusekiSystem.java | 453 ------------------
 .../jena/fuseki/server/ServiceMXBean.java       |  32 --
 .../fuseki/server/ShiroEnvironmentLoader.java   | 163 -------
 .../apache/jena/fuseki/server/SystemState.java  | 108 -----
 .../jena/fuseki/servlets/NullOutputStream.java  |  53 ---
 .../jena/fuseki/servlets/REST_Quads_RW.java     |   2 +
 .../jena/fuseki/servlets/SPARQL_GSP_RW.java     |   4 +-
 .../fuseki/servlets/SPARQL_QueryGeneral.java    |   2 +-
 .../apache/jena/fuseki/servlets/ServletOps.java |   3 +-
 .../org/apache/jena/fuseki/servlets/Upload.java | 164 -------
 .../jena/fuseki/servlets/UploadDetails.java     |  86 ----
 .../jena/fuseki/system/FusekiLogging.java       | 191 ++++++++
 .../jena/fuseki/system/GraphLoadUtils.java      |  71 +++
 .../jena/fuseki/system/StreamRDFLimited.java    |  62 +++
 .../org/apache/jena/fuseki/system/Upload.java   | 168 +++++++
 .../jena/fuseki/system/UploadDetails.java       |  86 ++++
 .../apache/jena/fuseki/webapp/FusekiEnv.java    | 168 +++++++
 .../webapp/FusekiServerEnvironmentInit.java     |  53 +++
 .../fuseki/webapp/FusekiServerListener.java     | 108 +++++
 .../apache/jena/fuseki/webapp/FusekiSystem.java | 454 +++++++++++++++++++
 .../fuseki/webapp/ShiroEnvironmentLoader.java   | 163 +++++++
 .../apache/jena/fuseki/webapp/SystemState.java  | 112 +++++
 .../org/apache/jena/fuseki/server/config.ttl    |  30 --
 .../org/apache/jena/fuseki/server/shiro.ini     |  37 --
 .../jena/fuseki/server/templates/config-mem     |  27 --
 .../jena/fuseki/server/templates/config-service |  23 -
 .../jena/fuseki/server/templates/config-tdb     |  31 --
 .../jena/fuseki/server/templates/config-tdb-dir |  30 --
 .../jena/fuseki/server/templates/config-tdb-mem |  30 --
 .../jena/fuseki/server/templates/config-tdb2    |  31 --
 .../fuseki/server/templates/config-tdb2-dir     |  30 --
 .../fuseki/server/templates/config-tdb2-mem     |  30 --
 .../org/apache/jena/fuseki/webapp/config.ttl    |  30 ++
 .../org/apache/jena/fuseki/webapp/shiro.ini     |  37 ++
 .../jena/fuseki/webapp/templates/config-mem     |  27 ++
 .../jena/fuseki/webapp/templates/config-service |  23 +
 .../jena/fuseki/webapp/templates/config-tdb     |  31 ++
 .../jena/fuseki/webapp/templates/config-tdb-dir |  30 ++
 .../jena/fuseki/webapp/templates/config-tdb-mem |  30 ++
 .../jena/fuseki/webapp/templates/config-tdb2    |  31 ++
 .../fuseki/webapp/templates/config-tdb2-dir     |  30 ++
 .../fuseki/webapp/templates/config-tdb2-mem     |  30 ++
 .../src/main/webapp/WEB-INF/web.xml             | 137 +++---
 .../apache/jena/fuseki/AbstractFusekiTest.java  |  18 +-
 .../java/org/apache/jena/fuseki/ServerCtl.java  |   6 +-
 .../java/org/apache/jena/fuseki/ServerTest.java |   2 +-
 .../java/org/apache/jena/fuseki/TS_Fuseki.java  |  11 +-
 .../java/org/apache/jena/fuseki/TestAdmin.java  |   8 +-
 .../java/org/apache/jena/fuseki/TestAuth.java   |   6 +-
 .../org/apache/jena/fuseki/TestBuilder.java     |  68 +++
 .../jena/fuseki/TestDatasetAccessorHTTP.java    | 318 +++++++++++++
 .../fuseki/TestDatasetGraphAccessorHTTP.java    |  40 ++
 .../org/apache/jena/fuseki/TestDatasetOps.java  |   2 +-
 .../org/apache/jena/fuseki/TestFileUpload.java  |   2 -
 .../java/org/apache/jena/fuseki/TestHttpOp.java | 198 ++++++++
 .../apache/jena/fuseki/TestHttpOperations.java  |   2 -
 .../apache/jena/fuseki/build/TestBuilder.java   |  66 ---
 .../fuseki/http/TestDatasetAccessorHTTP.java    | 320 -------------
 .../http/TestDatasetGraphAccessorHTTP.java      |  41 --
 .../org/apache/jena/fuseki/http/TestHttpOp.java | 199 --------
 .../jena/fuseki/embedded/FusekiServer.java      |  15 +-
 .../jena/fuseki/embedded/TS_EmbeddedFuseki.java |   2 -
 .../fuseki/embedded/TestFusekiTestAuth.java     |   2 -
 113 files changed, 4086 insertions(+), 4161 deletions(-)
----------------------------------------------------------------------