From 5f5762e1a58c92cf110f2d0b48d79394cc6fc15c Mon Sep 17 00:00:00 2001
From: Ralf Eichinger <ralf.eichinger@bsb-muenchen.de>
Date: Fri, 28 Oct 2016 10:59:55 +0200
Subject: [PATCH] upgraded to new image api and presentation api versions

---
 pom.xml                                                       | 4 ++--
 .../de/digitalcollections/iiif/serverdemo/Application.java    | 1 +
 .../core/config/multiPatternResolving-PROD.properties         | 3 +++
 .../iiif/image/config/SpringConfigBackend-PROD.properties     | 3 +--
 .../iiif/image/config/image-resolvingpatterns-PROD.properties | 2 --
 .../config/presentation-resolvingpatterns-PROD.properties     | 1 -
 6 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 src/main/resources/de/digitalcollections/core/config/multiPatternResolving-PROD.properties
 delete mode 100644 src/main/resources/de/digitalcollections/iiif/image/config/image-resolvingpatterns-PROD.properties
 delete mode 100644 src/main/resources/de/digitalcollections/iiif/presentation/config/presentation-resolvingpatterns-PROD.properties

diff --git a/pom.xml b/pom.xml
index 0e7ee2b..cfa80e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,8 +50,8 @@
     <maven.compiler.target>1.8</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     
-    <version.iiif-image>2.0.1</version.iiif-image>
-    <version.iiif-presentation>2.0.0</version.iiif-presentation>
+    <version.iiif-image>2.1.0</version.iiif-image>
+    <version.iiif-presentation>3.1.0</version.iiif-presentation>
     <version.jacoco-maven-plugin>0.7.4.201502262128</version.jacoco-maven-plugin>
     <version.maven-compiler-plugin>3.3</version.maven-compiler-plugin>
     <version.maven-gpg-plugin>1.6</version.maven-gpg-plugin>
diff --git a/src/main/java/de/digitalcollections/iiif/serverdemo/Application.java b/src/main/java/de/digitalcollections/iiif/serverdemo/Application.java
index d871f41..fe691f2 100644
--- a/src/main/java/de/digitalcollections/iiif/serverdemo/Application.java
+++ b/src/main/java/de/digitalcollections/iiif/serverdemo/Application.java
@@ -19,6 +19,7 @@
 public class Application {
 
   public static void main(String[] args) {
+    System.setProperty("spring.profiles.active", "PROD");
     ApplicationContext ctx = SpringApplication.run(Application.class, args);
   }
 }
diff --git a/src/main/resources/de/digitalcollections/core/config/multiPatternResolving-PROD.properties b/src/main/resources/de/digitalcollections/core/config/multiPatternResolving-PROD.properties
new file mode 100644
index 0000000..36c2edb
--- /dev/null
+++ b/src/main/resources/de/digitalcollections/core/config/multiPatternResolving-PROD.properties
@@ -0,0 +1,3 @@
+iiiftest_image = classpath\:/static/images/iiiftest.png
+^(.*)_image$ = classpath\:/static/images/$1.jpg
+^(.*)_manifest.json$ = classpath\:/static/manifests/$1.json
\ No newline at end of file
diff --git a/src/main/resources/de/digitalcollections/iiif/image/config/SpringConfigBackend-PROD.properties b/src/main/resources/de/digitalcollections/iiif/image/config/SpringConfigBackend-PROD.properties
index cdb5541..da5b785 100644
--- a/src/main/resources/de/digitalcollections/iiif/image/config/SpringConfigBackend-PROD.properties
+++ b/src/main/resources/de/digitalcollections/iiif/image/config/SpringConfigBackend-PROD.properties
@@ -1,2 +1 @@
-bufferedImageCacheDirectory=~/.iiif-server-demo/bufferedImageCache
-image.resolvingPatternFile=/de/digitalcollections/iiif/image/config/image-resolvingpatterns-PROD.properties
+bufferedImageCacheDirectory=~/.iiif-server-demo/bufferedImageCache
\ No newline at end of file
diff --git a/src/main/resources/de/digitalcollections/iiif/image/config/image-resolvingpatterns-PROD.properties b/src/main/resources/de/digitalcollections/iiif/image/config/image-resolvingpatterns-PROD.properties
deleted file mode 100644
index f769b2b..0000000
--- a/src/main/resources/de/digitalcollections/iiif/image/config/image-resolvingpatterns-PROD.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-iiiftest = classpath\:/static/images/iiiftest.png
-^(.*)$ = classpath\:/static/images/$1.jpg
\ No newline at end of file
diff --git a/src/main/resources/de/digitalcollections/iiif/presentation/config/presentation-resolvingpatterns-PROD.properties b/src/main/resources/de/digitalcollections/iiif/presentation/config/presentation-resolvingpatterns-PROD.properties
deleted file mode 100644
index 49d7e3f..0000000
--- a/src/main/resources/de/digitalcollections/iiif/presentation/config/presentation-resolvingpatterns-PROD.properties
+++ /dev/null
@@ -1 +0,0 @@
-^(.*)$ = classpath\:/static/manifests/$1.json
\ No newline at end of file