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 2015/06/01 16:04:22 UTC
[1/4] jena git commit: Include requesting action id in JSON details.
Repository: jena
Updated Branches:
refs/heads/master d5b3f91ec -> 7a8130df8
Include requesting action id in JSON details.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a977f6a1
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a977f6a1
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a977f6a1
Branch: refs/heads/master
Commit: a977f6a1e1b46fe763dda7542e49359c8f5e532b
Parents: 951fd34
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Jun 1 13:17:36 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Jun 1 13:17:36 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 ----
.../java/org/apache/jena/fuseki/mgt/Async.java | 17 ++-----
.../org/apache/jena/fuseki/mgt/JsonConst.java | 49 ++++++++++----------
5 files changed, 40 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/a977f6a1/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/async/AsyncPool.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/async/AsyncPool.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/async/AsyncPool.java
index 1d98ff2..a593e56 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/async/AsyncPool.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/async/AsyncPool.java
@@ -47,12 +47,12 @@ public class AsyncPool
private AsyncPool() { }
- public AsyncTask submit(Runnable task, String displayName, DataService dataService) {
+ public AsyncTask submit(Runnable task, String displayName, DataService dataService, long requestId) {
synchronized(mutex) {
String taskId = Long.toString(++counter) ;
Fuseki.serverLog.info(format("Task : %s : %s",taskId, displayName)) ;
Callable<Object> c = Executors.callable(task) ;
- AsyncTask asyncTask = new AsyncTask(c, this, taskId, displayName, dataService) ;
+ AsyncTask asyncTask = new AsyncTask(c, this, taskId, displayName, dataService, requestId) ;
Future<Object> x = executor.submit(asyncTask) ;
runningTasks.put(taskId, asyncTask) ;
return asyncTask ;
http://git-wip-us.apache.org/repos/asf/jena/blob/a977f6a1/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/async/AsyncTask.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/async/AsyncTask.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/async/AsyncTask.java
index 6ddd1bd..b25f238 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/async/AsyncTask.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/async/AsyncTask.java
@@ -45,21 +45,28 @@ public class AsyncTask implements Callable<Object>
private final String taskId ;
+ private long requestId ;
+
/*package*/ AsyncTask(Callable<Object> callable,
AsyncPool pool,
String taskId,
String displayName,
- DataService dataService ) {
+ DataService dataService,
+ long requestId) {
this.callable = callable ;
this.pool = pool ;
this.taskId = taskId ;
this.displayName = displayName ;
this.dataService = dataService ;
+ this.requestId = requestId ;
}
/** Unique task id */
public String getTaskId() { return taskId ; }
+ /** Request id that caused this task (may be -1 for N/A) */
+ public long getOriginatingRequestId() { return requestId ; }
+
/** Display name - no newlines */
public String displayName() { return displayName ; }
http://git-wip-us.apache.org/repos/asf/jena/blob/a977f6a1/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionAsyncTask.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionAsyncTask.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionAsyncTask.java
index 8d8a080..e02161d 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionAsyncTask.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionAsyncTask.java
@@ -57,14 +57,6 @@ public abstract class ActionAsyncTask extends ActionItem
return Async.asJson(aTask) ;
}
- public static AsyncTask execASyncTask(HttpAction action, AsyncPool asyncPool, String displayName, Runnable task) {
- AsyncTask atask = Async.asyncTask(asyncPool, displayName, action.getDataService(), task) ;
- Async.setLocationHeader(action, atask);
- JsonValue v = Async.asJson(atask) ;
- ServletOps.sendJsonReponse(action, v);
- return atask ;
- }
-
protected abstract Runnable createRunnable(HttpAction action) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/a977f6a1/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/Async.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/Async.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/Async.java
index 1cbda48..3f143b1 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/Async.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/Async.java
@@ -28,8 +28,8 @@ import org.apache.jena.fuseki.servlets.HttpAction ;
public class Async
{
- public static AsyncTask asyncTask(AsyncPool asyncPool, String displayName, DataService dataService, Runnable task) {
- AsyncTask asyncTask = asyncPool.submit(task, displayName, dataService) ;
+ public static AsyncTask asyncTask(AsyncPool asyncPool, String displayName, DataService dataService, Runnable task, long requestId) {
+ AsyncTask asyncTask = asyncPool.submit(task, displayName, dataService, requestId) ;
return asyncTask ;
}
@@ -37,6 +37,8 @@ public class Async
JsonBuilder builder = new JsonBuilder() ;
builder.startObject("outer") ;
builder.key(JsonConst.taskId).value(asyncTask.getTaskId()) ;
+ if ( asyncTask.getOriginatingRequestId() > 0 )
+ builder.key(JsonConst.taskRequestId).value(asyncTask.getOriginatingRequestId()) ;
builder.finishObject("outer") ;
return builder.build() ;
}
@@ -51,18 +53,9 @@ public class Async
}
public static AsyncTask execASyncTask(HttpAction action, AsyncPool asyncPool, String displayName, Runnable runnable) {
- AsyncTask atask = Async.asyncTask(asyncPool, "backup", action.getDataService(), runnable) ;
+ AsyncTask atask = Async.asyncTask(asyncPool, "backup", action.getDataService(), runnable, action.id) ;
Async.setLocationHeader(action, atask);
return atask ;
}
-
- // Combined does not work very well - e.g sleep does not set Location.
-// public static AsyncTask execASyncTask(HttpAction action, AsyncPool asyncPool, String displayName, Runnable task) {
-// AsyncTask atask = Async.asyncTask(asyncPool, displayName, action.getDataService(), task) ;
-// Async.setLocationHeader(action, atask);
-// JsonValue v = Async.asJson(atask) ;
-// ServletOps.sendJsonReponse(action, v);
-// return atask ;
-// }
}
http://git-wip-us.apache.org/repos/asf/jena/blob/a977f6a1/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/JsonConst.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/JsonConst.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/JsonConst.java
index e943ac1..baaef7a 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/JsonConst.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/JsonConst.java
@@ -20,30 +20,31 @@ package org.apache.jena.fuseki.mgt ;
public class JsonConst
{
- public static final String taskId = "taskId" ;
- public static final String task = "task" ;
- public static final String datasets = "datasets" ;
-
- public static final String finished = "finished" ;
- public static final String started = "started" ;
-
- public static final String uptime = "uptime" ;
- public static final String startDT = "startDateTime" ;
- public static final String server = "server" ;
- public static final String port = "port" ;
- public static final String hostname = "hostname" ;
- public static final String admin = "admin" ;
- public static final String version = "version" ;
- public static final String built = "built" ;
-
- public static final String services = "services" ;
- public static final String operation = "operation" ;
- public static final String description = "description" ;
- public static final String endpoints = "endpoints" ;
-
- public static final String dsName = "ds.name" ;
- public static final String dsState = "ds.state" ;
- public static final String dsService = "ds.services" ;
+ public static final String taskId = "taskId" ;
+ public static final String taskRequestId = "requestId" ;
+ public static final String task = "task" ;
+ public static final String datasets = "datasets" ;
+
+ public static final String finished = "finished" ;
+ public static final String started = "started" ;
+
+ public static final String uptime = "uptime" ;
+ public static final String startDT = "startDateTime" ;
+ public static final String server = "server" ;
+ public static final String port = "port" ;
+ public static final String hostname = "hostname" ;
+ public static final String admin = "admin" ;
+ public static final String version = "version" ;
+ public static final String built = "built" ;
+
+ public static final String services = "services" ;
+ public static final String operation = "operation" ;
+ public static final String description = "description" ;
+ public static final String endpoints = "endpoints" ;
+
+ public static final String dsName = "ds.name" ;
+ public static final String dsState = "ds.state" ;
+ public static final String dsService = "ds.services" ;
public static final String srvType = "srv.type" ;
public static final String srvDescription = "srv.description" ;
[3/4] jena git commit: This closes #62. (correct close instruction
from earlier).
Posted by an...@apache.org.
This closes #62. (correct close instruction from earlier).
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0143577f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0143577f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0143577f
Branch: refs/heads/master
Commit: 0143577faf923148858637ba2f5997ed4fe4d5e6
Parents: 52ac62d
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Jun 1 15:03:02 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Jun 1 15:03:02 2015 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[4/4] jena git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/jena
Posted by an...@apache.org.
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/7a8130df
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/7a8130df
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/7a8130df
Branch: refs/heads/master
Commit: 7a8130df8e43d6e255f482e706110cc07b047633
Parents: 0143577 d5b3f91
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Jun 1 15:03:12 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Jun 1 15:03:12 2015 +0100
----------------------------------------------------------------------
jena-core/pom.xml | 6 +-
.../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 +-
42 files changed, 335 insertions(+), 360 deletions(-)
----------------------------------------------------------------------
[2/4] jena git commit: JENA-869 : Find the graph in the database
based on dataset name.
Posted by an...@apache.org.
JENA-869 : Find the graph in the database based on dataset name.
This fix is based on based on PR#66.
This closes #66.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/52ac62d8
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/52ac62d8
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/52ac62d8
Branch: refs/heads/master
Commit: 52ac62d8484c255018f2309bb654bcdbf16b3644
Parents: a977f6a
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Jun 1 15:00:52 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Jun 1 15:00:52 2015 +0100
----------------------------------------------------------------------
.../org/apache/jena/fuseki/mgt/ActionDatasets.java | 10 ++++++----
.../webapp/js/app/templates/dataset-management.tpl | 3 +--
.../main/webapp/js/app/views/dataset-management.js | 16 +++++++++++++---
3 files changed, 20 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/52ac62d8/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
index 273d717..e28c2ba 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
@@ -302,9 +302,11 @@ public class ActionDatasets extends ActionContainerItem {
// Make it invisible to the outside.
DataAccessPointRegistry.get().remove(name) ;
- // Name to graph
- // Statically configured databases aren't in the system database.
- Quad q = getOne(systemDSG, null, null, pServiceName.asNode(), null) ;
+ // Find graph associated with this dataset name.
+ // (Statically configured databases aren't in the system database.)
+
+ Node n = NodeFactory.createLiteral(DataAccessPoint.canonical(name)) ;
+ Quad q = getOne(systemDSG, null, null, pServiceName.asNode(), n) ;
// if ( q == null )
// ServletOps.errorBadRequest("Failed to find dataset for '"+name+"'");
if ( q != null ) {
@@ -350,7 +352,7 @@ public class ActionDatasets extends ActionContainerItem {
}
}
- // ---- Auxilary functions
+ // ---- Auxiliary functions
private static Quad getOne(DatasetGraph dsg, Node g, Node s, Node p, Node o) {
Iterator<Quad> iter = dsg.findNG(g, s, p, o) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/52ac62d8/jena-fuseki2/jena-fuseki-core/src/main/webapp/js/app/templates/dataset-management.tpl
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/webapp/js/app/templates/dataset-management.tpl b/jena-fuseki2/jena-fuseki-core/src/main/webapp/js/app/templates/dataset-management.tpl
index 24d40a6..9a01812 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/webapp/js/app/templates/dataset-management.tpl
+++ b/jena-fuseki2/jena-fuseki-core/src/main/webapp/js/app/templates/dataset-management.tpl
@@ -23,9 +23,8 @@
-->
<td>
<div>
- <!-- JENA-869 Disable download button until it works again
+ <!-- JENA-869 Disable download button until it works again -->
<a class="btn btn-sm action remove btn-primary" data-ds-id='<%= ds.name() %>'><i class='fa fa-times-circle'></i> remove</a>
- -->
<a class="btn btn-sm action backup btn-primary" data-ds-id='<%= ds.name() %>'><i class='fa fa-download'></i> backup</a>
<a class="btn btn-sm action add-data btn-primary" href="dataset.html?tab=upload&ds=<%= ds.name() %>"><i class='fa fa-upload'></i> upload data</a>
</div>
http://git-wip-us.apache.org/repos/asf/jena/blob/52ac62d8/jena-fuseki2/jena-fuseki-core/src/main/webapp/js/app/views/dataset-management.js
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/webapp/js/app/views/dataset-management.js b/jena-fuseki2/jena-fuseki-core/src/main/webapp/js/app/views/dataset-management.js
index b4405dd..ca3af74 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/webapp/js/app/views/dataset-management.js
+++ b/jena-fuseki2/jena-fuseki-core/src/main/webapp/js/app/views/dataset-management.js
@@ -10,7 +10,7 @@ define(
initialize: function(){
_.bindAll( this, "onRemoveDataset", "onConfirmAction",
"onDatasetRemoveSuccess", "onDatasetRemoveFail",
- "onTaskStatus", "onTaskFailed" );
+ "onTaskStatus", "onTaskFailed", "cleanup" );
this.listenTo( this.model, "change", this.onModelChange, this );
@@ -38,10 +38,17 @@ define(
templateHelpers: {
},
+ cleanup: function() {
+ this.unbind();
+ this.undelegateEvents();
+ this.model.unbind( 'change', this.onModelChange, this );
+ fui.vent.unbind( 'action.delete.confirm', this.onConfirmRemoveDataset, this );
+ },
/** If the model changes, update the summary */
onModelChange: function( event ) {
- this.render();
+ this.cleanup();
+ this.render();
},
/** User has requested a dataset be removed */
@@ -86,7 +93,10 @@ define(
var dsId = elem.data( "ds-id" );
var eventId = elem.data( "event-id" );
- this.ui.actionConfirmModal.modal( 'hide' );
+ //this.ui.actionConfirmModal.modal( 'hide' );
+ $('.modal.in').modal('hide');
+ $('body').removeClass('modal-open');
+ $('.modal-backdrop').remove();
_.delay( function() {
fui.vent.trigger( eventId, dsId );
}, 100 );