Eclipse config files removed.

Maven repository updated (and redundant repository removed).
Multi-Module project created for pdf-as-lib, pdf-as-web.
Maven assemblies updated.
Snapshot releases (zxing) replaced.

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/pdf-as/trunk@927 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c

3 files changed, 15 insertions, 185 deletions

diff --git a/pdf-as-web/maven2-repository/maven2-repository.zip b/pdf-as-web/maven2-repository/maven2-repository.zip
deleted file mode 100644
index 2c1d43c..0000000
--- a/pdf-as-web/maven2-repository/maven2-repository.zip
+++ /dev/null
diff --git a/pdf-as-web/pom.xml b/pdf-as-web/pom.xml
index 3709232..ba21311 100644
--- a/pdf-as-web/pom.xml
+++ b/pdf-as-web/pom.xml
@@ -2,220 +2,69 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"

 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

+

 	<modelVersion>4.0.0</modelVersion>

 

+	<parent>

+		<groupId>at.gv.egiz</groupId>

+		<artifactId>pdf-as</artifactId>

+		<version>3.3-SNAPSHOT</version>

+	</parent>

+

 	<packaging>war</packaging>

 

-	<groupId>at.gv.egiz</groupId>

 	<artifactId>pdf-as-web</artifactId>

-	<name>PDF-AS-WEB</name>

-	<version>3.2</version>

-

+	<name>PDF-AS Web</name>

 	<description>Webapplikation zur Amtssignatur fuer elektronische Aktenfuehrung</description>

-	<url>http://egovlabs.gv.at/projects/pdf-as</url>

-	<inceptionYear>2006</inceptionYear>

-

-	<developers>

-

-		<developer>

-			<id>wlackner</id>

-			<name>Wilfried Lackner</name>

-			<email>wlackner@iicm.edu</email>

-			<organization>KnowCenter</organization>

-			<roles>

-				<role>developer</role>

-			</roles>

-			<timezone>+1</timezone>

-		</developer>

-

-		<developer>

-			<id>wprinz</id>

-			<name>Wolfgang Prinz</name>

-			<email>w.prinz@netconomy.net</email>

-			<organization>Netconomy</organization>

-			<roles>

-				<role>developer</role>

-			</roles>

-			<timezone>+1</timezone>

-		</developer>

-

-		<developer>

-			<id>tknall</id>

-			<name>Thomas Knall</name>

-			<email>thomas.knall@egiz.gv.at</email>

-			<organization>EGIZ</organization>

-			<roles>

-				<role>developer</role>

-			</roles>

-			<timezone>+1</timezone>

-		</developer>

-		

-		<developer>

-			<id>tzefferer</id>

-			<name>Thomas Zefferer</name>

-			<email>thomas.zefferer@egiz.gv.at</email>

-			<organization>EGIZ</organization>

-			<roles>

-				<role>developer</role>

-			</roles>

-			<timezone>+1</timezone>

-		</developer>

-		

-		<developer>

-			<id>gfliess</id>

-			<name>Gerhard Fliess</name>

-			<organization>XiCrypt</organization>

-			<roles>

-				<role>developer</role>

-			</roles>

-			<timezone>+1</timezone>

-		</developer>

-		

-		<developer>

-			<id>amavriqi</id>

-			<name>Arian Mavriqi</name>

-			<email>amavriqi@iicm.edu</email>

-			<organization>KnowCenter</organization>

-			<roles>

-				<role>developer</role>

-			</roles>

-			<timezone>+1</timezone>

-		</developer>

-

-	</developers>

 

 	<build>

 

-		<resources>

-

-			<resource>

-				<filtering>false</filtering>

-				<directory>src/main/resources</directory>

-				<excludes>

-					<exclude>**/package.html</exclude>

-				</excludes>

-			</resource>

-		</resources>

-

-		<!--

-		<finalName>${project.artifactId}-${project.version}</finalName>

-		-->

-		<finalName>pdf-as</finalName>

-

-		<plugins>

-

-			<plugin>

-				<artifactId>maven-resources-plugin</artifactId>

-				<configuration>

-					<encoding>UTF-8</encoding>

-				</configuration>

-			</plugin>

-

-			<plugin>

-				<artifactId>maven-site-plugin</artifactId>

-				<configuration>

-					<locales>en</locales>

-				</configuration>

-			</plugin>

-

-			<plugin>

-				<artifactId>maven-compiler-plugin</artifactId>

-				<configuration>

-					<source>1.4</source>

-					<target>1.4</target>

-					<excludes>

-						<exclude>at/gv/egiz/pdfas/test/*/</exclude>

-						<exclude>demo/*/</exclude>

-					</excludes>

-				</configuration>

-			</plugin>

-

-			<plugin>

-				<artifactId>maven-assembly-plugin</artifactId>

-				<configuration>

-					<descriptors>

-						<descriptor>src/main/assembly/assemble_repository.xml</descriptor>

-					</descriptors>

-				</configuration>

-			</plugin>

-

-			<plugin>

-				<artifactId>maven-javadoc-plugin</artifactId>

-				<configuration>

-					<public>true</public>

-					<package>true</package>

-					<private>true</private>

-					<links>

-						<link>http://java.sun.com/j2se/1.4.2/docs/api/</link>

-						<link>http://java.sun.com/j2ee/1.4/docs/api/</link>

-						<link>http://logging.apache.org/log4j/docs/api/</link>

-					</links>

-					<source>1.4</source>

-					<target>1.4</target>

-					<verbose>false</verbose>

-					<quiet>true</quiet>

-					<windowtitle>${project.name} v${project.version} API</windowtitle>

-					<!-- additionalJOption>-J-Xms256m -J-Xmx512m</additionalJOption-->

-					<tags>

-						<tag>

-							<name>todo</name>

-							<placement>a</placement>

-							<head>To Do:</head>

-						</tag>

-					</tags>

-					<maxmemory>512m</maxmemory>

-				</configuration>

-			</plugin>

-

-		</plugins>

+		<finalName>pdf-as-${project.version}</finalName>

 

 	</build>

 

 	<dependencies>

 

 		<dependency>

-			<groupId>knowcenter</groupId>

-			<artifactId>pdf-as</artifactId>

-			<version>3.2</version>

+			<groupId>at.gv.egiz</groupId>

+			<artifactId>pdf-as-lib</artifactId>

 		</dependency>

-		

+

 		<dependency>

 			<groupId>javax.servlet</groupId>

 			<artifactId>servlet-api</artifactId>

-			<version>2.4</version>

 			<scope>provided</scope>

 		</dependency>

 

 		<dependency>

 			<groupId>commons-fileupload</groupId>

 			<artifactId>commons-fileupload</artifactId>

-			<version>1.1</version>

 		</dependency>

 

 		<!-- fuer Integration in andere Web-Seiten -->

 		<dependency>

 			<groupId>opensymphony</groupId>

 			<artifactId>sitemesh</artifactId>

-			<version>2.3</version>

 		</dependency>

 

 		<!-- multiple languages for web application -->

 		<dependency>

 			<groupId>javax.servlet</groupId>

 			<artifactId>jstl</artifactId>

-			<version>1.1.2</version>

 		</dependency>

+

 		<dependency>

 			<groupId>taglibs</groupId>

 			<artifactId>standard</artifactId>

-			<version>1.1.2</version>

 		</dependency>

+

 		<!-- for parsing the header page -->

 		<dependency>

 			<groupId>net.htmlparser.jericho</groupId>

 			<artifactId>jericho-html</artifactId>

 			<version>3.2</version>

 		</dependency>

+

 	</dependencies>

 

 </project>

diff --git a/pdf-as-web/src/main/assembly/assemble_repository.xml b/pdf-as-web/src/main/assembly/assemble_repository.xml
deleted file mode 100644
index cbfe790..0000000
--- a/pdf-as-web/src/main/assembly/assemble_repository.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- http://maven.apache.org/plugins/maven-assembly-plugin/assembly.html -->

-<assembly>

-	<id>maven2-repository</id>

-	<formats>

-		<format>zip</format>

-	</formats>

-	<includeBaseDirectory>false</includeBaseDirectory>

-	

-	<repositories>

-	

-		<repository>

-			<includeMetadata>false</includeMetadata>

-			<outputDirectory>/</outputDirectory>

-		</repository>

-

-	</repositories>

-	    

-</assembly>