Merge branch 'upstream/master' into upstream/jena-text-triple-deletion
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/ded53377 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ded53377 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ded53377 Branch: refs/heads/master Commit: ded53377178cb5b88f846b6d09fd09147736e6e3 Parents: 8e9babe d5b3f91 Author: Alexis Miara <[email protected]> Authored: Mon Jun 1 09:58:07 2015 -0400 Committer: Alexis Miara <[email protected]> Committed: Mon Jun 1 09:58:07 2015 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/jena/query/Query.java | 17 -- jena-core/pom.xml | 7 +- .../handlers/SolutionModifierHandler.java | 4 +- .../java/org/apache/jena/fuseki/Fuseki.java | 11 + .../apache/jena/fuseki/build/FusekiConfig.java | 2 +- .../org/apache/jena/fuseki/cmd/FusekiCmd.java | 10 +- .../apache/jena/fuseki/server/FusekiServer.java | 40 +-- .../fuseki/server/FusekiServerListener.java | 5 +- .../jena/fuseki/server/ServerInitialConfig.java | 24 +- .../java/org/apache/jena/jdbc/JenaDriver.java | 4 +- .../jdbc/connections/DatasetConnection.java | 6 +- .../jena/jdbc/connections/JenaConnection.java | 23 +- .../jena/jdbc/metadata/DatasetMetadata.java | 4 +- .../apache/jena/jdbc/metadata/JenaMetadata.java | 294 +++++++++---------- .../jdbc/metadata/results/MetaResultSet.java | 40 +-- .../apache/jena/jdbc/results/AskResults.java | 16 +- .../apache/jena/jdbc/results/JenaResultSet.java | 20 +- .../jena/jdbc/results/MaterializedResults.java | 8 +- .../jdbc/results/MaterializedSelectResults.java | 12 +- .../jdbc/results/QueryExecutionResults.java | 2 +- .../apache/jena/jdbc/results/SelectResults.java | 4 +- .../jena/jdbc/results/StreamedResults.java | 8 +- .../jdbc/results/TripleIteratorResults.java | 4 +- .../jena/jdbc/results/TripleListResults.java | 12 +- .../metadata/AbstractResultsMetadata.java | 9 +- .../statements/DatasetPreparedStatement.java | 2 +- .../jena/jdbc/statements/DatasetStatement.java | 2 +- .../jdbc/statements/JenaPreparedStatement.java | 16 +- .../jena/jdbc/statements/JenaStatement.java | 46 +-- .../metadata/JenaParameterMetadata.java | 2 +- .../AbstractJenaConnectionTests.java | 6 +- .../jena/jdbc/postprocessing/ResultsEcho.java | 3 +- .../apache/jena/jdbc/preprocessing/Echo.java | 7 +- .../statements/AbstractJenaStatementTests.java | 15 +- .../jdbc/mem/connections/MemConnection.java | 2 +- .../jdbc/mem/metadata/MemDatasetMetadata.java | 18 +- .../jena/jdbc/mem/results/TestResultSets.java | 4 +- .../connections/RemoteEndpointConnection.java | 14 +- .../remote/metadata/RemoteEndpointMetadata.java | 22 +- .../RemoteEndpointPreparedStatement.java | 2 +- .../statements/RemoteEndpointStatement.java | 2 +- ...stRemoteEndpointConnectionWithGraphUris.java | 2 +- .../results/TestRemoteEndpointResults.java | 6 +- .../TestRemoteEndpointResultsWithAuth.java | 6 +- .../TestRemoteEndpointResultsWithGraphUris.java | 6 +- ...RemoteEndpointResultsWithResultSetTypes.java | 6 +- .../jdbc/tdb/connections/TDBConnection.java | 2 +- .../jdbc/tdb/metadata/TDBDatasetMetadata.java | 24 +- .../jdbc/tdb/results/TestTdbDiskResultSets.java | 4 +- .../jdbc/tdb/results/TestTdbMemResultSets.java | 4 +- 50 files changed, 396 insertions(+), 413 deletions(-) ----------------------------------------------------------------------
