# HG changeset patch
# User Robert Casties <casties@mpiwg-berlin.mpg.de>
# Date 1496314371 -7200
# Node ID 62246fdad98050c4c371e0e6c2d8e5c56a73c092
# Parent  0b6ee26b3d3732112932b3f99397ffaa43bf9e57
better pom that uses special web.xml for iiif-presentation profile.

diff -r 0b6ee26b3d37 -r 62246fdad980 webapp/pom.xml
--- a/webapp/pom.xml	Tue May 30 19:27:26 2017 +0200
+++ b/webapp/pom.xml	Thu Jun 01 12:52:51 2017 +0200
@@ -278,6 +278,7 @@
 		</profile>
         <profile>
             <id>iiif-presentation</id>
+            <!-- IIIF presentation servlet uses servlet3 and has a web.xml -->
             <dependencies>
                 <dependency>
                     <groupId>digilib</groupId>
@@ -285,7 +286,25 @@
                     <type>jar</type>
                     <scope>compile</scope>
                 </dependency>
+                <dependency>
+                    <groupId>digilib</groupId>
+                    <artifactId>digilib-servlet3</artifactId>
+                    <type>jar</type>
+                    <scope>compile</scope>
+                </dependency>
             </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-war-plugin</artifactId>
+                        <configuration>
+                            <webXml>${basedir}/src/main/webapp/WEB-INF/web-iiif-pres.xml</webXml>
+                            <classifier>srv3p</classifier>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
         </profile>
 		<profile>
 			<id>codec-jai</id>
diff -r 0b6ee26b3d37 -r 62246fdad980 webapp/src/main/webapp/WEB-INF/web-3.0.xml
--- a/webapp/src/main/webapp/WEB-INF/web-3.0.xml	Tue May 30 19:27:26 2017 +0200
+++ b/webapp/src/main/webapp/WEB-INF/web-3.0.xml	Thu Jun 01 12:52:51 2017 +0200
@@ -51,23 +51,5 @@
         </url-pattern>
   </servlet-mapping>
   
-    <!-- The Manifest servlet -->
-    <servlet>
-        <servlet-name>Manifester</servlet-name>
-        <servlet-class>digilib.servlet.Manifester</servlet-class>
-    </servlet>
-    <!-- The Intialisation Listener -->
-    <listener>
-        <listener-class>
-            digilib.conf.ManifestServletConfiguration
-        </listener-class>
-    </listener>
-    <!-- The mapping for the Manifest servlet -->
-    <servlet-mapping>
-        <servlet-name>Manifester</servlet-name>
-        <url-pattern>/servlet/Manifester/*</url-pattern>
-    </servlet-mapping>
-
-
   
 </web-app>
diff -r 0b6ee26b3d37 -r 62246fdad980 webapp/src/main/webapp/WEB-INF/web-iiif-pres.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/webapp/src/main/webapp/WEB-INF/web-iiif-pres.xml	Thu Jun 01 12:52:51 2017 +0200
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app
+        xmlns="http://java.sun.com/xml/ns/javaee"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+        version="3.0">
+        
+  <!-- General description of your web application -->
+  <display-name>
+        digilib
+  </display-name>
+  <description>
+        This is the web frontend of the Digital Document Library.
+  </description>
+  <!-- The Intialisation Listener (also configured by annotation) -->
+  <listener>
+        <listener-class>
+            digilib.conf.DigilibServlet3Configuration
+        </listener-class>
+  </listener>
+  <!-- The Scaler servlet (also configured by annotation) -->
+  <servlet>
+        <servlet-name>
+            Scaler
+        </servlet-name>
+        <servlet-class>
+            digilib.servlet.Scaler
+        </servlet-class>
+        <!-- Load this servlet at server startup time -->
+        <load-on-startup>
+            5
+        </load-on-startup>
+        <!-- yes we do use async, Jetty! -->
+        <async-supported>true</async-supported>
+  </servlet>
+  <!-- The mapping for the Scaler servlet -->
+  <servlet-mapping>
+        <servlet-name>
+            Scaler
+        </servlet-name>
+        <url-pattern>
+            /servlet/Scaler/*
+        </url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+        <servlet-name>
+            Scaler
+        </servlet-name>
+        <url-pattern>
+            /Scaler/*
+        </url-pattern>
+  </servlet-mapping>
+  
+    <!-- The Manifest servlet -->
+    <servlet>
+        <servlet-name>Manifester</servlet-name>
+        <servlet-class>digilib.servlet.Manifester</servlet-class>
+    </servlet>
+    <!-- The Intialisation Listener -->
+    <listener>
+        <listener-class>
+            digilib.conf.ManifestServletConfiguration
+        </listener-class>
+    </listener>
+    <!-- The mapping for the Manifest servlet -->
+    <servlet-mapping>
+        <servlet-name>Manifester</servlet-name>
+        <url-pattern>/servlet/Manifester/*</url-pattern>
+    </servlet-mapping>
+
+
+  
+</web-app>