Repository: incubator-taverna-language Updated Branches: refs/heads/master 6171859dc -> ce77335ee
Add retrievedFrom, retrievedOn and retrievedBy to manifest+aggregates Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/e0e68bd7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/e0e68bd7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/e0e68bd7 Branch: refs/heads/master Commit: e0e68bd7867b83b812ca29cd4616347b894074e9 Parents: 6171859 Author: Mark Robinson <[email protected]> Authored: Sat Feb 18 20:27:55 2017 +0000 Committer: Mark Robinson <[email protected]> Committed: Sat Feb 18 20:27:55 2017 +0000 ---------------------------------------------------------------------- .../taverna/robundle/manifest/Manifest.java | 32 ++++++++++++++++++-- .../taverna/robundle/manifest/PathMetadata.java | 31 ++++++++++++++++++- 2 files changed, 60 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/e0e68bd7/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/Manifest.java ---------------------------------------------------------------------- diff --git a/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/Manifest.java b/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/Manifest.java index e8a6394..ba23bf1 100644 --- a/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/Manifest.java +++ b/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/Manifest.java @@ -68,8 +68,9 @@ import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.databind.ObjectMapper; @JsonPropertyOrder(value = { "@context", "id", "manifest", "createdOn", - "createdBy", "createdOn", "authoredOn", "authoredBy", "history", - "aggregates", "annotations", "@graph" }) + "createdBy", "createdOn", "authoredOn", "authoredBy", + "retrievedFrom", "retrievedOn", "retrievedBy", + "history", "aggregates", "annotations", "@graph" }) public class Manifest { public abstract class FileTimeMixin { @Override @@ -120,6 +121,9 @@ public class Manifest { private Bundle bundle; private Agent createdBy = null; private FileTime createdOn = now(); + private URI retrievedFrom = null; + private Agent retrievedBy = null; + private FileTime retrievedOn = null; private List<String> graph; private List<Path> history = new ArrayList<>(); private URI id = URI.create("/"); @@ -195,6 +199,18 @@ public class Manifest { return createdOn; } + public URI getRetrievedFrom() { + return retrievedFrom; + } + + public Agent getRetrievedBy() { + return retrievedBy; + } + + public FileTime getRetrievedOn() { + return retrievedOn; + } + public List<String> getGraph() { return graph; } @@ -385,6 +401,18 @@ public class Manifest { this.createdOn = createdOn; } + public void setRetrievedFrom(URI retrievedFrom) { + this.retrievedFrom = retrievedFrom; + } + + public void setRetrievedBy(Agent retrievedBy) { + this.retrievedBy = retrievedBy; + } + + public void setRetrievedOn(FileTime retrievedOn) { + this.retrievedOn = retrievedOn; + } + public void setGraph(List<String> graph) { this.graph = graph; } http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/e0e68bd7/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/PathMetadata.java ---------------------------------------------------------------------- diff --git a/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/PathMetadata.java b/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/PathMetadata.java index 2e22ae2..d145fdd 100644 --- a/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/PathMetadata.java +++ b/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/PathMetadata.java @@ -31,7 +31,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @JsonPropertyOrder(value = { "uri", "mediatype", "createdOn", "createdBy", - "authoredOn", "authoredBy", "conformsTo", "bundledAs" }) + "authoredOn", "authoredBy", "retrievedFrom", "retrievedOn", + "retrievedBy", "conformsTo", "bundledAs" }) public class PathMetadata { private static URI ROOT = URI.create("/"); @@ -46,6 +47,10 @@ public class PathMetadata { private FileTime createdOn; private Path file; + private URI retrievedFrom; + private Agent retrievedBy; + private FileTime retrievedOn; + private String mediatype; private URI uri; @@ -82,6 +87,18 @@ public class PathMetadata { return createdOn; } + public URI getRetrievedFrom() { + return retrievedFrom; + } + + public Agent getRetrievedBy() { + return retrievedBy; + } + + public FileTime getRetrievedOn() { + return retrievedOn; + } + @JsonIgnore public Path getFile() { return file; @@ -155,6 +172,18 @@ public class PathMetadata { this.createdOn = createdOn; } + public void setRetrievedFrom(URI retrievedFrom) { + this.retrievedFrom = retrievedFrom; + } + + public void setRetrievedBy(Agent retrievedBy) { + this.retrievedBy = retrievedBy; + } + + public void setRetrievedOn(FileTime retrievedOn) { + this.retrievedOn = retrievedOn; + } + public void setFile(Path file) { this.file = file; Path root = this.file.resolve("/");
