upgraded iiif api versions

dbmdz · Nov 14, 2016 · 8a9f90b · 8a9f90b
1 parent ce81e4a
commit 8a9f90b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,5 @@ target
 .classpath
 .project
 .settings
-/target
+/target
+/src/main/resources/multiPatternResolving-local.yml
diff --git a/pom.xml b/pom.xml
@@ -45,9 +45,9 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <version.aspectjweaver>1.8.9</version.aspectjweaver>
-    <version.iiif-image>2.1.3</version.iiif-image>
+    <version.iiif-image>2.2.1</version.iiif-image>
     <version.iiif-mirador>2.1.1</version.iiif-mirador>
-    <version.iiif-presentation>3.1.1</version.iiif-presentation>
+    <version.iiif-presentation>3.2.1</version.iiif-presentation>
     <version.jacoco-maven-plugin>0.7.4.201502262128</version.jacoco-maven-plugin>
     <version.jetty-maven-plugin>9.3.10.v20160621</version.jetty-maven-plugin>
     <version.maven-compiler-plugin>3.3</version.maven-compiler-plugin>

diff --git a/...a/de/digitalcollections/iiif/hymir/frontend/impl/springmvc/controller/ViewController.java b/...a/de/digitalcollections/iiif/hymir/frontend/impl/springmvc/controller/ViewController.java
@@ -1,7 +1,7 @@
 package de.digitalcollections.iiif.hymir.frontend.impl.springmvc.controller;
 
-import de.digitalcollections.iiif.image.frontend.impl.springmvc.controller.v2_0_0.IIIFImageApiController;
-import de.digitalcollections.iiif.presentation.frontend.impl.springmvc.controller.v2_0_0.IIIFPresentationApiController;
+import de.digitalcollections.iiif.image.frontend.impl.springmvc.controller.v2.IIIFImageApiController;
+import de.digitalcollections.iiif.presentation.frontend.impl.springmvc.controller.v2.IIIFPresentationApiController;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -22,7 +22,7 @@ public String viewHomepage() {
 
   @RequestMapping(value = "/iiif/image/{identifier}/view.html", method = RequestMethod.GET)
   public String viewImageGet(@PathVariable String identifier, Model model) {
-    model.addAttribute("infoUrl", "/iiif/image/" + IIIFImageApiController.VERSION + "/" + identifier + "/info.json");
+    model.addAttribute("infoUrl", "/image/" + IIIFImageApiController.VERSION + "/" + identifier + "/info.json");
     return "openseadragon/view";
   }
 
@@ -34,7 +34,7 @@ public String viewImagePost(@RequestParam String identifier) {
   @RequestMapping(value = "/iiif/presentation/{identifier}/view.html", method = RequestMethod.GET)
   public String viewPresentationGet(@PathVariable String identifier, Model model) {
     model.
-            addAttribute("presentationUri", "/iiif/presentation/" + IIIFPresentationApiController.VERSION + "/" + identifier);
+            addAttribute("presentationUri", "/presentation/" + IIIFPresentationApiController.VERSION + "/" + identifier);
     return "mirador/view";
   }
 
@@ -45,6 +45,6 @@ public String viewPresentationPost(@RequestParam String identifier, Model model)
 
   @RequestMapping(value = "/iiif/presentation/manifest", method = RequestMethod.GET)
   public String viewPresentationManifest(@RequestParam String identifier) {
-    return "forward:/iiif/presentation/" + IIIFPresentationApiController.VERSION + "/" + identifier + "/manifest";
+    return "forward:/presentation/" + IIIFPresentationApiController.VERSION + "/" + identifier + "/manifest";
   }
 }
diff --git a/src/main/webapp/WEB-INF/templates/index.html b/src/main/webapp/WEB-INF/templates/index.html
@@ -57,7 +57,7 @@ <h4>View object with Mirador</h4>
                     <form class="form-inline" action="#" th:action="@{/iiif/presentation/manifest}" method="get">
                       <h4>View manifest.json</h4>
                       <div class="form-group">
-                        /iiif/presentation/2.0.0/ <input type="text" class="form-control" placeholder="identifier" name="identifier" /> /manifest
+                        /presentation/v2/ <input type="text" class="form-control" placeholder="identifier" name="identifier" /> /manifest
                       </div>
                       <button type="submit" class="btn btn-success pull-right">view</button>
                     </form>