TimeGate does not provice a Memento-Datetime anaymore.
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/badefd3e Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/badefd3e Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/badefd3e Branch: refs/heads/MARMOTTA-655_Memento_Compliance_Issues Commit: badefd3e66ef85feab6837ca5f9f6c415c398e91 Parents: d216030 Author: Thomas Kurz <[email protected]> Authored: Thu Oct 13 17:51:56 2016 +0200 Committer: Thomas Kurz <[email protected]> Committed: Thu Oct 13 17:51:56 2016 +0200 ---------------------------------------------------------------------- .../platform/versioning/webservices/MementoWebService.java | 1 - .../marmotta/platform/versioning/MementoWebServiceTest.java | 9 +++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/badefd3e/platform/marmotta-versioning-kiwi/src/main/java/org/apache/marmotta/platform/versioning/webservices/MementoWebService.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-versioning-kiwi/src/main/java/org/apache/marmotta/platform/versioning/webservices/MementoWebService.java b/platform/marmotta-versioning-kiwi/src/main/java/org/apache/marmotta/platform/versioning/webservices/MementoWebService.java index 2f7dec4..9d35e59 100644 --- a/platform/marmotta-versioning-kiwi/src/main/java/org/apache/marmotta/platform/versioning/webservices/MementoWebService.java +++ b/platform/marmotta-versioning-kiwi/src/main/java/org/apache/marmotta/platform/versioning/webservices/MementoWebService.java @@ -135,7 +135,6 @@ public class MementoWebService { .status(302) .location(MementoUtils.resourceURI(resource_string, versions.getCurrent().getCommitTime(), configurationService.getBaseUri())) .header(VARY, "negotiate, accept-datetime, accept") - .header("Memento-Datetime", versions.getCurrent().getCommitTime().toString()) .header(LINK, Joiner.on(", ").join(links)) .build(); http://git-wip-us.apache.org/repos/asf/marmotta/blob/badefd3e/platform/marmotta-versioning-kiwi/src/test/java/org/apache/marmotta/platform/versioning/MementoWebServiceTest.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-versioning-kiwi/src/test/java/org/apache/marmotta/platform/versioning/MementoWebServiceTest.java b/platform/marmotta-versioning-kiwi/src/test/java/org/apache/marmotta/platform/versioning/MementoWebServiceTest.java index 1b165ff..c78b551 100644 --- a/platform/marmotta-versioning-kiwi/src/test/java/org/apache/marmotta/platform/versioning/MementoWebServiceTest.java +++ b/platform/marmotta-versioning-kiwi/src/test/java/org/apache/marmotta/platform/versioning/MementoWebServiceTest.java @@ -16,6 +16,7 @@ import org.slf4j.LoggerFactory; import java.io.InputStream; import java.net.URISyntaxException; +import java.util.Date; import static com.jayway.restassured.RestAssured.expect; @@ -29,6 +30,8 @@ public class MementoWebServiceTest { private static JettyMarmotta marmotta; + private static Date date1,date2,date3; + @BeforeClass public static void setUp() throws MarmottaImportException, URISyntaxException { marmotta = new JettyMarmotta("/marmotta", MementoWebService.class); @@ -37,16 +40,22 @@ public class MementoWebServiceTest { UserService userService = marmotta.getService(UserService.class); ContextService contextService = marmotta.getService(ContextService.class); + date1 = new Date(); + //import some data InputStream is_v1 = Thread.currentThread().getContextClassLoader().getResourceAsStream("data_v1.ttl"); int n_v1 = importService.importData(is_v1, "text/turtle", userService.getAnonymousUser(), contextService.getDefaultContext()); log.info("Imported RDF data_v1 with {} triples", n_v1); + date2 = new Date(); + //import some data including updates InputStream is_v2 = Thread.currentThread().getContextClassLoader().getResourceAsStream("data_v2.ttl"); int n_v2 = importService.importData(is_v2, "text/turtle", userService.getAnonymousUser(), contextService.getDefaultContext()); log.info("Imported RDF data_v2 with {} triples", n_v2); + date3 = new Date(); + RestAssured.baseURI = "http://localhost";; RestAssured.port = marmotta.getPort(); RestAssured.basePath = marmotta.getContext();
