JENA-1435: Merge commit 'refs/pull/316/head' of github.com:apache/jena This closes #316.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/88fbc93d Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/88fbc93d Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/88fbc93d Branch: refs/heads/master Commit: 88fbc93d28cda50d3ae5964b4bd51c8d19bcbfb2 Parents: ee9c98b 11cf0c8 Author: Andy Seaborne <[email protected]> Authored: Sun Dec 17 18:45:47 2017 +0000 Committer: Andy Seaborne <[email protected]> Committed: Sun Dec 17 18:45:47 2017 +0000 ---------------------------------------------------------------------- .../apache/jena/fuseki/cmds/FusekiBasicCmd.java | 4 +- .../java/org/apache/jena/fuseki/Fuseki.java | 26 +- .../jena/fuseki/FusekiConfigException.java | 2 - .../org/apache/jena/fuseki/FusekiException.java | 2 - .../jena/fuseki/FusekiNotFoundException.java | 2 - .../jena/fuseki/FusekiRequestException.java | 2 - .../apache/jena/fuseki/build/FusekiBuilder.java | 96 +++-- .../apache/jena/fuseki/jetty/JettyFuseki.java | 2 - .../apache/jena/fuseki/mgt/ActionAsyncTask.java | 2 - .../apache/jena/fuseki/mgt/ActionBackup.java | 2 - .../jena/fuseki/mgt/ActionBackupList.java | 2 - .../jena/fuseki/mgt/ActionContainerItem.java | 2 - .../org/apache/jena/fuseki/mgt/ActionCtl.java | 7 +- .../apache/jena/fuseki/mgt/ActionDatasets.java | 14 +- .../org/apache/jena/fuseki/mgt/ActionItem.java | 2 - .../org/apache/jena/fuseki/mgt/ActionLogs.java | 2 - .../org/apache/jena/fuseki/mgt/ActionPing.java | 2 - .../jena/fuseki/mgt/ActionServerStatus.java | 2 - .../org/apache/jena/fuseki/mgt/ActionSleep.java | 2 - .../org/apache/jena/fuseki/mgt/ActionStats.java | 49 ++- .../org/apache/jena/fuseki/mgt/ActionTasks.java | 2 - .../apache/jena/fuseki/mgt/JsonDescription.java | 14 +- .../org/apache/jena/fuseki/package-info.java | 61 +++ .../apache/jena/fuseki/server/CounterName.java | 6 +- .../jena/fuseki/server/DataAccessPoint.java | 1 - .../fuseki/server/DataAccessPointRegistry.java | 13 +- .../apache/jena/fuseki/server/DataService.java | 47 ++- .../org/apache/jena/fuseki/server/Endpoint.java | 16 +- .../apache/jena/fuseki/server/FusekiInfo.java | 4 +- .../jena/fuseki/server/FusekiInitialConfig.java | 3 +- .../server/FusekiServerEnvironmentInit.java | 2 +- .../fuseki/server/FusekiServerListener.java | 20 +- .../apache/jena/fuseki/server/FusekiSystem.java | 2 +- .../apache/jena/fuseki/server/Operation.java | 95 +++++ .../jena/fuseki/server/OperationName.java | 85 ---- .../apache/jena/fuseki/servlets/ActionBase.java | 17 +- .../apache/jena/fuseki/servlets/ActionLib.java | 49 ++- .../apache/jena/fuseki/servlets/ActionREST.java | 6 +- .../jena/fuseki/servlets/ActionSPARQL.java | 216 ---------- .../jena/fuseki/servlets/ActionService.java | 265 ++++++++++++ .../jena/fuseki/servlets/FusekiFilter.java | 6 +- .../apache/jena/fuseki/servlets/HttpAction.java | 42 +- .../servlets/HttpServletResponseTracker.java | 4 +- .../apache/jena/fuseki/servlets/REST_Quads.java | 2 - .../jena/fuseki/servlets/REST_Quads_R.java | 2 - .../jena/fuseki/servlets/REST_Quads_RW.java | 2 - .../apache/jena/fuseki/servlets/SPARQL_GSP.java | 2 - .../jena/fuseki/servlets/SPARQL_GSP_R.java | 2 - .../jena/fuseki/servlets/SPARQL_GSP_RW.java | 2 - .../jena/fuseki/servlets/SPARQL_Protocol.java | 4 +- .../jena/fuseki/servlets/SPARQL_Query.java | 6 +- .../fuseki/servlets/SPARQL_QueryDataset.java | 2 - .../fuseki/servlets/SPARQL_QueryGeneral.java | 2 - .../fuseki/servlets/SPARQL_UberServlet.java | 412 ------------------- .../servlets/SPARQL_UberServlet_Original.java | 408 ++++++++++++++++++ .../jena/fuseki/servlets/SPARQL_Update.java | 3 - .../jena/fuseki/servlets/SPARQL_Upload.java | 14 +- .../servlets/ServiceDispatchRegistry.java | 121 ++++++ .../jena/fuseki/servlets/ServiceRouter.java | 389 +++++++++++++++++ .../jena/fuseki/servlets/ServletBase.java | 2 - .../org/apache/jena/fuseki/servlets/Upload.java | 4 +- .../validation/json/QueryValidatorJSON.java | 2 - .../validation/json/UpdateValidatorJSON.java | 2 - .../org/apache/jena/fuseki/TestDatasetOps.java | 11 +- .../apache/jena/fuseki/TestHttpOperations.java | 5 +- .../fuseki/embedded/FusekiEmbeddedServer.java | 96 ----- .../jena/fuseki/embedded/FusekiServer.java | 317 ++++++++------ .../jena/fuseki/embedded/CustomService.java | 81 ++++ .../jena/fuseki/embedded/TS_EmbeddedFuseki.java | 1 + .../fuseki/embedded/TestEmbeddedFuseki.java | 16 +- .../embedded/TestFusekiCustomOperation.java | 188 +++++++++ .../examples/ExtendFuseki_AddService_1.java | 158 +++++++ .../examples/ExtendFuseki_AddService_2.java | 123 ++++++ .../examples/ExtendFuseki_AddService_3.java | 107 +++++ .../embedded/examples/SpecialService.java | 81 ++++ .../src/test/resources/log4j.properties | 40 ++ 76 files changed, 2609 insertions(+), 1198 deletions(-) ----------------------------------------------------------------------
