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 2017/07/07 15:30:53 UTC

[3/3] jena git commit: JENA-1371: Merge commit 'refs/pull/268/head' of github.com:apache/jena

JENA-1371: Merge commit 'refs/pull/268/head' of github.com:apache/jena


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

Branch: refs/heads/master
Commit: f30ac0f89d7657a5cd2a65b4f6a11b18b58c9cd4
Parents: 6857bf5 2e579e3
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Jul 7 16:29:33 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Jul 7 16:29:33 2017 +0100

----------------------------------------------------------------------
 .../apache/jena/fuseki/cmds/FusekiBasicCmd.java |  10 +-
 .../apache/jena/fuseki/build/FusekiConfig.java  |   6 +-
 .../org/apache/jena/fuseki/cmd/FusekiCmd.java   |   4 +-
 .../jena/fuseki/mgt/ActionBackupList.java       |   8 +-
 .../apache/jena/fuseki/mgt/ActionDatasets.java  |  12 +-
 .../java/org/apache/jena/fuseki/mgt/Backup.java |   4 +-
 .../apache/jena/fuseki/server/FusekiEnv.java    |  55 +--
 .../apache/jena/fuseki/server/FusekiServer.java | 420 -----------------
 .../fuseki/server/FusekiServerListener.java     |  10 +-
 .../apache/jena/fuseki/server/FusekiSystem.java | 463 +++++++++++++++++++
 .../fuseki/server/ShiroEnvironmentLoader.java   |   2 +-
 .../apache/jena/fuseki/server/SystemState.java  |   2 +-
 .../java/org/apache/jena/fuseki/ServerCtl.java  |   2 +-
 .../fuseki/embedded/FusekiEmbeddedServer.java   | 333 +------------
 .../jena/fuseki/embedded/FusekiServer.java      | 390 ++++++++++++++++
 .../jena/fuseki/embedded/FusekiTestAuth.java    |   4 +-
 .../jena/fuseki/embedded/FusekiTestServer.java  |   8 +-
 .../fuseki/embedded/TestEmbeddedFuseki.java     |  22 +-
 .../fuseki/embedded/TestMultipleEmbedded.java   |  16 +-
 .../rdfconnection/TestRDFConnectionRemote.java  |   6 +-
 20 files changed, 932 insertions(+), 845 deletions(-)
----------------------------------------------------------------------