Mercurial > hg > digilib

changeset 1428:053ff2ca45e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleaned poms and web.xmls.
author robcast
date Wed, 28 Oct 2015 15:55:46 +0100
parents a244753f8f33
children f7a89b9adb9d
files common/pom.xml pdf/pom.xml pom.xml servlet3/pom.xml text/pom.xml webapp/pom.xml webapp/src/main/webapp/WEB-INF/web-2.4.xml webapp/src/main/webapp/WEB-INF/web-3.0.xml webapp/src/main/webapp/WEB-INF/web-additional.xml
diffstat 9 files changed, 25 insertions(+), 45 deletions(-) [+]
line wrap: on
line diff
--- a/common/pom.xml	Tue Oct 27 18:44:43 2015 +0100
+++ b/common/pom.xml	Wed Oct 28 15:55:46 2015 +0100
@@ -15,21 +15,6 @@
 	<url>http://digilib.sourceforge.net</url>
 	<packaging>jar</packaging>
 	
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<configuration>
-						<source>1.7</source>
-						<target>1.7</target>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
-
 	<profiles>
 		<profile>
 			<id>imageio-jai</id>
@@ -49,13 +34,11 @@
                     <type>jar</type>
                     <scope>compile</scope>
 				</dependency>
-				<!-- 
 				<dependency> 
 			         <groupId>com.github.jai-imageio</groupId> 
 			         <artifactId>jai-imageio-jpeg2000</artifactId> 
 				     <version>1.3.0</version> 
 				 </dependency> 
-				 -->
 			</dependencies>
 		</profile>
 		<profile>
--- a/pdf/pom.xml	Tue Oct 27 18:44:43 2015 +0100
+++ b/pdf/pom.xml	Wed Oct 28 15:55:46 2015 +0100
@@ -11,11 +11,11 @@
 	<description>The Digital Image Library - PDF generation servlet</description>
 	<url>http://digilib.sourceforge.net</url>
 	<repositories>
-    <repository>
+    <!-- <repository>
       <id>itextpdf.com</id>
       <name>Maven Repository for iText</name>
       <url>http://maven.itextpdf.com/</url>
-    </repository>
+    </repository> -->
     </repositories>
 	<dependencies>
 		<dependency>
@@ -27,7 +27,7 @@
 		<dependency>
 			<groupId>com.itextpdf</groupId>
 			<artifactId>itextpdf</artifactId>
-	        <version>5.5.5</version>
+	        <version>5.5.7</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
@@ -57,7 +57,7 @@
 				<dependency>
 					<groupId>javax.servlet</groupId>
 					<artifactId>servlet-api</artifactId>
-					<version>2.3</version>
+					<version>2.4</version>
 					<type>jar</type>
 					<scope>provided</scope>
 				</dependency>
--- a/pom.xml	Tue Oct 27 18:44:43 2015 +0100
+++ b/pom.xml	Wed Oct 28 15:55:46 2015 +0100
@@ -102,6 +102,14 @@
           <artifactId>maven-compiler-plugin</artifactId>
           <version>3.3</version>
         </plugin>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+                <source>1.7</source>
+                <target>1.7</target>
+            </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
--- a/servlet3/pom.xml	Tue Oct 27 18:44:43 2015 +0100
+++ b/servlet3/pom.xml	Wed Oct 28 15:55:46 2015 +0100
@@ -7,20 +7,7 @@
   </parent>
   <artifactId>digilib-servlet3</artifactId>
   <name>digilib-servlet3</name>
-  <build>
-  	<pluginManagement>
-  		<plugins>
-  			<plugin>
-  				<groupId>org.apache.maven.plugins</groupId>
-  				<artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target> 
-                </configuration>
-  			</plugin>
-  		</plugins>
-  	</pluginManagement>
-  </build>
+
   <dependencies>
   	<dependency>
   		<groupId>org.mortbay.jetty</groupId>
--- a/text/pom.xml	Tue Oct 27 18:44:43 2015 +0100
+++ b/text/pom.xml	Wed Oct 28 15:55:46 2015 +0100
@@ -38,7 +38,7 @@
 				<dependency>
 					<groupId>javax.servlet</groupId>
 					<artifactId>servlet-api</artifactId>
-					<version>2.3</version>
+					<version>2.4</version>
 					<type>jar</type>
 					<scope>provided</scope>
 				</dependency>
--- a/webapp/pom.xml	Tue Oct 27 18:44:43 2015 +0100
+++ b/webapp/pom.xml	Wed Oct 28 15:55:46 2015 +0100
@@ -14,10 +14,6 @@
 	<url>http://digilib.sourceforge.net</url>
 	<packaging>war</packaging>
 
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
-
 	<build>
 		<pluginManagement>
 			<plugins>
--- a/webapp/src/main/webapp/WEB-INF/web-2.4.xml	Tue Oct 27 18:44:43 2015 +0100
+++ b/webapp/src/main/webapp/WEB-INF/web-2.4.xml	Wed Oct 28 15:55:46 2015 +0100
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
- 
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+     version="2.4">
+     
   <!-- General description of your web application -->
   <display-name>
         digilib
--- a/webapp/src/main/webapp/WEB-INF/web-3.0.xml	Tue Oct 27 18:44:43 2015 +0100
+++ b/webapp/src/main/webapp/WEB-INF/web-3.0.xml	Wed Oct 28 15:55:46 2015 +0100
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app
-        version="3.0"
         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">
+        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>
--- a/webapp/src/main/webapp/WEB-INF/web-additional.xml	Tue Oct 27 18:44:43 2015 +0100
+++ b/webapp/src/main/webapp/WEB-INF/web-additional.xml	Wed Oct 28 15:55:46 2015 +0100
@@ -40,6 +40,10 @@
     <!-- The mapping for the PDFCache servlet -->
     <servlet-mapping>
         <servlet-name>PDFCache</servlet-name>
+        <url-pattern>/PDFCache/*</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>PDFCache</servlet-name>
         <url-pattern>/servlet/PDFCache/*</url-pattern>
     </servlet-mapping>
     <servlet-mapping>