Mercurial > hg > digilib-old
changeset 894:6e15201cdce9 mvnify
make servlet compile with maven
| author | robcast |
|---|---|
| date | Tue, 19 Apr 2011 20:54:58 +0200 |
| parents | 1f7ab2c3c27b |
| children | 84783821ecac |
| files | servlet/DigilibServlet.jardesc servlet/pom.xml servlet/src/main/java/digilib/image/ImageInfoDocuImage.java |
| diffstat | 3 files changed, 71 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/servlet/DigilibServlet.jardesc Tue Apr 19 18:48:07 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="MacRoman" standalone="no"?> -<jardesc> - <jar path="digilib-servlet/DigilibServlet.jar"/> - <options buildIfNeeded="true" compress="true" descriptionLocation="/digilib-servlet/DigilibServlet.jardesc" exportErrors="false" exportWarnings="true" includeDirectoryEntries="false" overwrite="true" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/> - <storedRefactorings deprecationInfo="true" structuralOnly="false"/> - <selectedProjects/> - <manifest generateManifest="true" manifestLocation="" manifestVersion="1.0" reuseManifest="false" saveManifest="false" usesManifest="true"> - <sealing sealJar="false"> - <packagesToSeal/> - <packagesToUnSeal/> - </sealing> - </manifest> - <selectedElements exportClassFiles="true" exportJavaFiles="false" exportOutputFolder="false"> - <javaElement handleIdentifier="=digilib-servlet/src<digilib.util"/> - <javaElement handleIdentifier="=digilib-servlet/src<digilib.auth"/> - <file path="/digilib-servlet/license.txt"/> - <javaElement handleIdentifier="=digilib-servlet/src<digilib.meta"/> - <javaElement handleIdentifier="=digilib-servlet/src<digilib.pdf"/> - <javaElement handleIdentifier="=digilib-servlet/src<digilib.io"/> - <file path="/digilib-servlet/DigilibServlet.jardesc"/> - <javaElement handleIdentifier="=digilib-servlet/src<digilib.servlet"/> - <javaElement handleIdentifier="=digilib-servlet/src<digilib.image"/> - </selectedElements> -</jardesc>
--- a/servlet/pom.xml Tue Apr 19 18:48:07 2011 +0200 +++ b/servlet/pom.xml Tue Apr 19 20:54:58 2011 +0200 @@ -8,16 +8,82 @@ <version>1.0-SNAPSHOT</version> </parent> <groupId>digilib</groupId> - <artifactId>servlet</artifactId> - <version>1.0-SNAPSHOT</version> - <name>servlet</name> - <url>http://maven.apache.org</url> + <artifactId>digilib-servlet</artifactId> + <version>2.0-SNAPSHOT</version> + <name>digilib-servlet</name> + <description>The Digital Image Library - Servlet</description> + <url>http://digilib.berlios.de</url> <packaging>jar</packaging> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> + <repositories> + <!-- This provides the required versions of JAI-ImageIO --> + <repository> + <id>maven2-aux-repository.tidalwave.kenai.com</id> + <name>Tidalwave Maven Aux Repository</name> + <url>https://kenai.com/svn/tidalwave~maven-repo/aux/2</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>itextpdf.com</id> + <name>Maven Repository for iText</name> + <url>http://maven.itextpdf.com/</url> + </repository> + </repositories> + <dependencies> + <dependency> + <groupId>com.sun.media</groupId> + <artifactId>jai_imageio</artifactId> + <version>1.1</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>javax.media</groupId> + <artifactId>jai_core</artifactId> + <version>1.1.3</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.devlib.schmidt</groupId> + <artifactId>imageinfo</artifactId> + <version>1.9</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.jdom</groupId> + <artifactId>jdom</artifactId> + <version>1.1</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.itextpdf</groupId> + <artifactId>itextpdf</artifactId> + <version>5.0.4</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api</artifactId> + <version>3.0.20100224</version> + <type>jar</type> + <scope>provided</scope> + </dependency> </dependencies> </project>
--- a/servlet/src/main/java/digilib/image/ImageInfoDocuImage.java Tue Apr 19 18:48:07 2011 +0200 +++ b/servlet/src/main/java/digilib/image/ImageInfoDocuImage.java Tue Apr 19 20:54:58 2011 +0200 @@ -6,7 +6,7 @@ import java.io.IOException; import java.io.RandomAccessFile; -import org.marcoschmidt.image.ImageInfo; +import org.devlib.schmidt.imageinfo.ImageInfo; import digilib.io.ImageInput; import digilib.util.ImageSize;