# HG changeset patch # User Robert Casties # Date 1496322362 -7200 # Node ID 5418b39dd49f225a9b75fa0dc42ed13607cec16e # Parent 3f3a4f4eecb15fa0731709de7e74c9d102f8cd52# Parent 62246fdad98050c4c371e0e6c2d8e5c56a73c092 Merge from iiif-presentation branch 62246fdad98050c4c371e0e6c2d8e5c56a73c092 diff -r 62246fdad980 -r 5418b39dd49f servlet3/pom.xml.orig --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/servlet3/pom.xml.orig Thu Jun 01 15:06:02 2017 +0200 @@ -0,0 +1,39 @@ + + 4.0.0 + + digilib + digilib + 2.3.1 + + digilib-servlet3 + digilib-servlet3 + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.3 + + 1.7 + 1.7 + + + + + + + + org.mortbay.jetty + servlet-api + 3.0.20100224 + jar + provided + + + digilib + digilib-servlet + + + digilib servlet components using asynchronous servlet API. + \ No newline at end of file diff -r 62246fdad980 -r 5418b39dd49f text/pom.xml.orig --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/text/pom.xml.orig Thu Jun 01 15:06:02 2017 +0200 @@ -0,0 +1,72 @@ + + 4.0.0 + + digilib + digilib + 2.3.1 + + digilib-text + digilib-text + + + digilib + digilib-common + jar + compile + + + The Digital Image Library - text (plain or XML) serving servlet + http://digilib.sourceforge.net + + + servlet2 + + true + + servletapi + 2 + + + + + digilib + digilib-servlet2 + jar + provided + + + javax.servlet + servlet-api + 2.3 + jar + provided + + + + + servlet3 + + + servletapi + 3 + + + + + digilib + digilib-servlet3 + jar + provided + + + org.mortbay.jetty + servlet-api + 3.0.20100224 + jar + provided + + + + + \ No newline at end of file diff -r 62246fdad980 -r 5418b39dd49f webapp/pom.xml.orig --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/webapp/pom.xml.orig Thu Jun 01 15:06:02 2017 +0200 @@ -0,0 +1,204 @@ + + + 4.0.0 + + digilib + digilib + 2.3.7 + + digilib-webapp + digilib-webapp + The Digital Image Library - web application server and HTML and JS clients. + http://digilib.sourceforge.net + war + + + true + + + + + + + org.apache.maven.plugins + maven-war-plugin + 2.6 + + + org.codehaus.mojo + license-maven-plugin + 1.4 + + + **/*digilib*.js + **/*.jsp + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.19 + + ${skipTests} + + + + + + + + servlet2 + + + servletapi + 2 + + + + + digilib + digilib-servlet2 + jar + compile + + + + + + org.apache.maven.plugins + maven-war-plugin + + ${basedir}/src/main/webapp/WEB-INF/web-2.4.xml + srv2 + + + + + + + servlet3 + + true + + servletapi + 3 + + + + + digilib + digilib-servlet3 + jar + compile + + + + + + org.apache.maven.plugins + maven-war-plugin + + ${basedir}/src/main/webapp/WEB-INF/web-3.0.xml + srv3 + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.7 + 1.7 + + + + + + + pdf + + + digilib + digilib-pdf + jar + compile + + + + + text + + + digilib + digilib-text + jar + compile + + + + + codec-jai + + + digilib + digilib-common-jai + jar + compile + + + + + codec-imagej + + + digilib + digilib-common-imagej + jar + compile + + + + + codec-bioformats + + + digilib + digilib-common-bioformats + jar + compile + + + + + cors-filter + + + + org.eclipse.jetty + jetty-servlets + 9.2.13.v20150730 + + + + + + + org.eclipse.jetty + jetty-servlet + 9.2.13.v20150730 + test + + + org.eclipse.jetty + jetty-http + 9.2.13.v20150730 + test + + + junit + junit + 4.12 + test + + + diff -r 62246fdad980 -r 5418b39dd49f webapp/src/main/webapp/jquery/digilib-auth.html.orig --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/webapp/src/main/webapp/jquery/digilib-auth.html.orig Thu Jun 01 15:06:02 2017 +0200 @@ -0,0 +1,61 @@ + + + + + + Digilib jQuery: fullscreen + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

digilib doesn't work! Please switch on Javascript or notify the server administrator!

+ +
+ + + diff -r 62246fdad980 -r 5418b39dd49f webapp/src/main/webapp/jquery/digilib.html.orig --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/webapp/src/main/webapp/jquery/digilib.html.orig Thu Jun 01 15:06:02 2017 +0200 @@ -0,0 +1,39 @@ + + + + + + Digilib jQuery: fullscreen + + + + + + + + + + + + +
+

digilib doesn't work! Please switch on Javascript or notify the server administrator!

+ +
+ + + diff -r 62246fdad980 -r 5418b39dd49f webapp/src/main/webapp/jquery/jquery.digilib-ann.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/webapp/src/main/webapp/jquery/jquery.digilib-ann.css Thu Jun 01 15:06:02 2017 +0200 @@ -0,0 +1,1 @@ +../../../../target/digilib-webapp-2.5-SNAPSHOT/jquery/jquery.digilib-ann.css \ No newline at end of file diff -r 62246fdad980 -r 5418b39dd49f webapp/src/main/webapp/jquery/jquery.digilib-ann.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/webapp/src/main/webapp/jquery/jquery.digilib-ann.js Thu Jun 01 15:06:02 2017 +0200 @@ -0,0 +1,1 @@ +../../../../target/digilib-webapp-2.5-SNAPSHOT/jquery/jquery.digilib-ann.js \ No newline at end of file diff -r 62246fdad980 -r 5418b39dd49f webapp/src/main/webapp/jquery/jquery.digilib-ann.min.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/webapp/src/main/webapp/jquery/jquery.digilib-ann.min.css Thu Jun 01 15:06:02 2017 +0200 @@ -0,0 +1,1 @@ +../../../../target/digilib-webapp-2.5-SNAPSHOT/jquery/jquery.digilib-ann.min.css \ No newline at end of file diff -r 62246fdad980 -r 5418b39dd49f webapp/src/main/webapp/jquery/jquery.digilib-ann.min.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/webapp/src/main/webapp/jquery/jquery.digilib-ann.min.js Thu Jun 01 15:06:02 2017 +0200 @@ -0,0 +1,1 @@ +../../../../target/digilib-webapp-2.5-SNAPSHOT/jquery/jquery.digilib-ann.min.js \ No newline at end of file diff -r 62246fdad980 -r 5418b39dd49f webapp/src/main/webapp/jquery/jquery.digilib-ann.min.js.map --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/webapp/src/main/webapp/jquery/jquery.digilib-ann.min.js.map Thu Jun 01 15:06:02 2017 +0200 @@ -0,0 +1,1 @@ +../../../../target/digilib-webapp-2.5-SNAPSHOT/jquery/jquery.digilib-ann.min.js.map \ No newline at end of file diff -r 62246fdad980 -r 5418b39dd49f webapp/src/main/webapp/jquery/jquery.digilib-auth.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/webapp/src/main/webapp/jquery/jquery.digilib-auth.css Thu Jun 01 15:06:02 2017 +0200 @@ -0,0 +1,1 @@ +../../../../target/digilib-webapp-2.5-SNAPSHOT/jquery/jquery.digilib-auth.css \ No newline at end of file diff -r 62246fdad980 -r 5418b39dd49f webapp/src/main/webapp/jquery/jquery.digilib-auth.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/webapp/src/main/webapp/jquery/jquery.digilib-auth.js Thu Jun 01 15:06:02 2017 +0200 @@ -0,0 +1,1 @@ +../../../../target/digilib-webapp-2.5-SNAPSHOT/jquery/jquery.digilib-auth.js \ No newline at end of file diff -r 62246fdad980 -r 5418b39dd49f webapp/src/main/webapp/jquery/jquery.digilib-auth.min.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/webapp/src/main/webapp/jquery/jquery.digilib-auth.min.css Thu Jun 01 15:06:02 2017 +0200 @@ -0,0 +1,1 @@ +../../../../target/digilib-webapp-2.5-SNAPSHOT/jquery/jquery.digilib-auth.min.css \ No newline at end of file diff -r 62246fdad980 -r 5418b39dd49f webapp/src/main/webapp/jquery/jquery.digilib-auth.min.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/webapp/src/main/webapp/jquery/jquery.digilib-auth.min.js Thu Jun 01 15:06:02 2017 +0200 @@ -0,0 +1,1 @@ +../../../../target/digilib-webapp-2.5-SNAPSHOT/jquery/jquery.digilib-auth.min.js \ No newline at end of file