You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by cl...@apache.org on 2015/06/01 19:40:07 UTC
[2/3] jena git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/jena
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/jena
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e5bc2171
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e5bc2171
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e5bc2171
Branch: refs/heads/master
Commit: e5bc217154d4957a49b6e4fd8f6798a0aa68b2d4
Parents: fc1bbf3 7a8130d
Author: Claude Warren <cl...@apache.org>
Authored: Mon Jun 1 17:20:09 2015 +0100
Committer: Claude Warren <cl...@apache.org>
Committed: Mon Jun 1 17:20:09 2015 +0100
----------------------------------------------------------------------
.../org/apache/jena/fuseki/async/AsyncPool.java | 4 +-
.../org/apache/jena/fuseki/async/AsyncTask.java | 9 +-
.../apache/jena/fuseki/mgt/ActionAsyncTask.java | 8 -
.../apache/jena/fuseki/mgt/ActionDatasets.java | 10 +-
.../java/org/apache/jena/fuseki/mgt/Async.java | 17 +-
.../org/apache/jena/fuseki/mgt/JsonConst.java | 49 ++--
.../js/app/templates/dataset-management.tpl | 3 +-
.../webapp/js/app/views/dataset-management.js | 16 +-
.../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 +-
49 files changed, 392 insertions(+), 413 deletions(-)
----------------------------------------------------------------------