You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2013/06/10 12:38:05 UTC
git commit: UI support for in-memory LDCache endpoints
Updated Branches:
refs/heads/develop 0f0d5a797 -> c933437d2
UI support for in-memory LDCache endpoints
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/c933437d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/c933437d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/c933437d
Branch: refs/heads/develop
Commit: c933437d2343b6081ca350b7e60419ae840a0f3e
Parents: 0f0d5a7
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Mon Jun 10 12:37:08 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Mon Jun 10 12:37:08 2013 +0200
----------------------------------------------------------------------
.../services/ldcache/LDCacheSailProvider.java | 8 ++++++
.../LinkedDataCachingWebService.java | 10 +++++---
.../resources/web/admin/widgets/lmf_ldcache.js | 26 ++++++++++++--------
3 files changed, 31 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c933437d/platform/marmotta-ldcache/src/main/java/org/apache/marmotta/platform/ldcache/services/ldcache/LDCacheSailProvider.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldcache/src/main/java/org/apache/marmotta/platform/ldcache/services/ldcache/LDCacheSailProvider.java b/platform/marmotta-ldcache/src/main/java/org/apache/marmotta/platform/ldcache/services/ldcache/LDCacheSailProvider.java
index 1297bab..af76385 100644
--- a/platform/marmotta-ldcache/src/main/java/org/apache/marmotta/platform/ldcache/services/ldcache/LDCacheSailProvider.java
+++ b/platform/marmotta-ldcache/src/main/java/org/apache/marmotta/platform/ldcache/services/ldcache/LDCacheSailProvider.java
@@ -210,4 +210,12 @@ public class LDCacheSailProvider implements NotifyingSailProvider {
updateEndpoints();
}
}
+
+ /**
+ * Return all configured volatile endpoints.
+ * @return
+ */
+ public Set<Endpoint> getVolatileEndpoints() {
+ return new HashSet<Endpoint>(volatileEndpoints);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c933437d/platform/marmotta-ldcache/src/main/java/org/apache/marmotta/platform/ldcache/webservices/LinkedDataCachingWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldcache/src/main/java/org/apache/marmotta/platform/ldcache/webservices/LinkedDataCachingWebService.java b/platform/marmotta-ldcache/src/main/java/org/apache/marmotta/platform/ldcache/webservices/LinkedDataCachingWebService.java
index d245612..234f62c 100644
--- a/platform/marmotta-ldcache/src/main/java/org/apache/marmotta/platform/ldcache/webservices/LinkedDataCachingWebService.java
+++ b/platform/marmotta-ldcache/src/main/java/org/apache/marmotta/platform/ldcache/webservices/LinkedDataCachingWebService.java
@@ -218,7 +218,10 @@ public class LinkedDataCachingWebService {
List<Map<String, Object>> result = new LinkedList<Map<String, Object>>();
for(Endpoint endpoint : endpointService.listEndpoints()) {
- result.add(buildEndpointJSON(endpoint));
+ result.add(buildEndpointJSON(endpoint, false));
+ }
+ for(Endpoint endpoint : cacheSailProvider.getVolatileEndpoints()) {
+ result.add(buildEndpointJSON(endpoint, true));
}
return Response.ok().entity(result).build();
@@ -245,7 +248,7 @@ public class LinkedDataCachingWebService {
if (endpoint == null) return notFound(id);
- return Response.ok().entity(buildEndpointJSON(endpoint)).build();
+ return Response.ok().entity(buildEndpointJSON(endpoint, false)).build();
}
@DELETE
@@ -287,7 +290,7 @@ public class LinkedDataCachingWebService {
}
- private Map<String, Object> buildEndpointJSON(Endpoint endpoint) {
+ private Map<String, Object> buildEndpointJSON(Endpoint endpoint, boolean isVolatile) {
HashMap<String, Object> resultMap = new HashMap<String, Object>();
resultMap.put("id",endpoint.getName().replaceAll("[^A-Za-z0-9 ]", "").toLowerCase());
resultMap.put("name",endpoint.getName());
@@ -297,6 +300,7 @@ public class LinkedDataCachingWebService {
resultMap.put("kind",endpoint.getType().toString());
resultMap.put("mimetype",endpoint.getContentTypes());
resultMap.put("active", endpoint.isActive());
+ resultMap.put("volatile", isVolatile);
return resultMap;
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c933437d/platform/marmotta-ldcache/src/main/resources/web/admin/widgets/lmf_ldcache.js
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldcache/src/main/resources/web/admin/widgets/lmf_ldcache.js b/platform/marmotta-ldcache/src/main/resources/web/admin/widgets/lmf_ldcache.js
index ef36e0e..ac5246d 100644
--- a/platform/marmotta-ldcache/src/main/resources/web/admin/widgets/lmf_ldcache.js
+++ b/platform/marmotta-ldcache/src/main/resources/web/admin/widgets/lmf_ldcache.js
@@ -213,15 +213,17 @@
}
for ( var i = 0; i < ps.length; i++) {
- var delBtn = $("<button/>").text("delete");
- delBtn.attr('data-id', ps[i].id);
- delBtn.click(function() {
- removeProgram($(this));
- });
- var modBtn = $("<button>", {text: (ps[i].active?"deactivate":"activate"), 'data-id': ps[i].id, 'data-active':ps[i].active})
- modBtn.click(function() {
- activateProgram($(this));
- });
+ if(ps[i].volatile) {
+ var delBtn = $("<button/>").text("delete");
+ delBtn.attr('data-id', ps[i].id);
+ delBtn.click(function() {
+ removeProgram($(this));
+ });
+ var modBtn = $("<button>", {text: (ps[i].active?"deactivate":"activate"), 'data-id': ps[i].id, 'data-active':ps[i].active})
+ modBtn.click(function() {
+ activateProgram($(this));
+ });
+ }
var col = "";
if (i % 2) {
col = "even";
@@ -236,7 +238,11 @@
$("<td/>").text(ps[i].endpoint || '').appendTo(tr);
$("<td/>").text(ps[i].mimetype != undefined ? ctToString(ps[i].mimetype) : '').appendTo(tr);
$("<td/>").text(ps[i].expiry || '').appendTo(tr);
- $("<td/>").append(modBtn).append(delBtn).appendTo(tr);
+ if(ps[i].volatile) {
+ $("<td/>").append(modBtn).append(delBtn).appendTo(tr);
+ } else {
+ $("<td>autoregistered</td>").appendTo(tr);
+ }
table.append(tr);
}
programs.empty().append(table);