JENA-1350: Merge commit 'refs/pull/255/head' of github.com:apache/jena This closes #255.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/ff723ecf Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ff723ecf Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ff723ecf Branch: refs/heads/master Commit: ff723ecfee9f2f27e994170441e4ec1fc4098650 Parents: cfbc6da be052f4 Author: Andy Seaborne <[email protected]> Authored: Mon May 29 18:31:43 2017 +0100 Committer: Andy Seaborne <[email protected]> Committed: Mon May 29 18:31:43 2017 +0100 ---------------------------------------------------------------------- jena-fuseki2/jena-fuseki-core/pom.xml | 13 -- .../java/org/apache/jena/fuseki/FusekiLib.java | 13 +- .../apache/jena/fuseki/server/FusekiEnv.java | 11 -- .../src/main/webapp/WEB-INF/web.xml | 8 +- .../java/org/apache/jena/fuseki/ServerCtl.java | 23 ++- .../java/org/apache/jena/fuseki/TestAuth.java | 3 +- jena-fuseki2/jena-fuseki-embedded/pom.xml | 32 +++- .../fuseki/embedded/FusekiEmbeddedServer.java | 58 ++++-- .../jena/fuseki/embedded/FusekiTestAuth.java | 191 +++++++++++++++++++ .../jena/fuseki/embedded/FusekiTestServer.java | 123 +++++++----- .../jena/fuseki/embedded/TS_EmbeddedFuseki.java | 2 + .../fuseki/embedded/TestEmbeddedFuseki.java | 20 +- .../fuseki/embedded/TestFusekiTestAuth.java | 100 ++++++++++ .../fuseki/embedded/TestFusekiTestServer.java | 60 ++++++ .../fuseki/embedded/TestMultipleEmbedded.java | 16 +- jena-integration-tests/pom.xml | 2 +- .../rdfconnection/TestRDFConnectionRemote.java | 1 - jena-jdbc/jena-jdbc-driver-bundle/pom.xml | 4 +- jena-jdbc/jena-jdbc-driver-remote/pom.xml | 164 ++++++++-------- .../jena/jdbc/remote/TS_JdbcDriverRemote.java | 6 +- .../TestRemoteEndpointConnection.java | 16 +- .../TestRemoteEndpointConnectionWithAuth.java | 57 ++---- ...stRemoteEndpointConnectionWithGraphUris.java | 16 +- ...oteEndpointConnectionWithResultSetTypes.java | 16 +- .../metadata/TestRemoteConnectionMetadata.java | 12 +- .../results/TestRemoteEndpointResults.java | 18 +- .../TestRemoteEndpointResultsWithAuth.java | 49 ++--- .../TestRemoteEndpointResultsWithGraphUris.java | 18 +- ...RemoteEndpointResultsWithResultSetTypes.java | 18 +- .../TestRemoteEndpointStatements.java | 12 +- jena-parent/pom.xml | 2 +- 31 files changed, 731 insertions(+), 353 deletions(-) ----------------------------------------------------------------------
