aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortknall <tknall@7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c>2013-01-10 16:24:59 +0000
committertknall <tknall@7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c>2013-01-10 16:24:59 +0000
commitf9850d02d8559b7e7f3555d0e2c7cfe746257958 (patch)
treef6b145a088350478cff52d78fb13660cea7a422d
parent535a04fa05f739ec16dd81666e3b0f82dfbd442d (diff)
downloadpdf-as-3-f9850d02d8559b7e7f3555d0e2c7cfe746257958.tar.gz
pdf-as-3-f9850d02d8559b7e7f3555d0e2c7cfe746257958.tar.bz2
pdf-as-3-f9850d02d8559b7e7f3555d0e2c7cfe746257958.zip
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
-rw-r--r--.classpath18
-rw-r--r--.project42
-rw-r--r--.settings/org.eclipse.jdt.core.prefs13
-rw-r--r--.settings/org.eclipse.wst.common.component7
-rw-r--r--.settings/org.eclipse.wst.common.project.facet.core.xml7
-rw-r--r--.settings/org.maven.ide.eclipse.prefs9
-rw-r--r--maven2-repository/maven2-repository.zipbin26057826 -> 26056597 bytes
-rw-r--r--pdf-as-cli/pom.xml57
-rw-r--r--pdf-as-cli/src/main/assembly/cli.xml100
-rw-r--r--pdf-as-cli/src/main/resources/pdf-as.bat (renamed from pdf-as-lib/src/main/distribution/cl/pdf-as.bat)0
-rw-r--r--pdf-as-cli/src/main/resources/pdf-as.sh (renamed from pdf-as-lib/src/main/distribution/cl/pdf-as.sh)0
-rw-r--r--pdf-as-cli/src/main/resources/sign.bat (renamed from pdf-as-lib/src/main/distribution/cl/sign.bat)0
-rw-r--r--pdf-as-cli/src/main/resources/sign.sh (renamed from pdf-as-lib/src/main/distribution/cl/sign.sh)0
-rw-r--r--pdf-as-lib/pom.xml226
-rw-r--r--pdf-as-lib/src/main/assembly/assemble_distribution_brz.xml44
-rw-r--r--pdf-as-lib/src/main/assembly/assemble_distribution_cl.xml66
-rw-r--r--pdf-as-lib/src/main/assembly/assemble_distribution_ws.xml203
-rw-r--r--pdf-as-lib/src/main/assembly/assemble_libraries.xml16
-rw-r--r--pdf-as-lib/src/main/assembly/assemble_repository.xml19
-rw-r--r--pdf-as-lib/src/main/distribution/brz/pdf-as.bat8
-rw-r--r--pdf-as-lib/src/site/changes.xml252
-rw-r--r--pdf-as-lib/src/site/checkstyle.xml109
-rw-r--r--pdf-as-release/pom.xml66
-rw-r--r--pdf-as-release/src/main/assembly/release.xml43
-rw-r--r--pdf-as-web/maven2-repository/maven2-repository.zipbin31895009 -> 0 bytes
-rw-r--r--pdf-as-web/pom.xml181
-rw-r--r--pdf-as-web/src/main/assembly/assemble_repository.xml19
-rw-r--r--pom.xml355
-rw-r--r--readme.txt4
29 files changed, 661 insertions, 1203 deletions
diff --git a/.classpath b/.classpath
deleted file mode 100644
index b38606e..0000000
--- a/.classpath
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry excluding="at/gv/egiz/pdfas/test/*/|demo/*/" kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
- <attributes>
- <attribute name="org.eclipse.jst.component.nondependency" value=""/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
- <attributes>
- <attribute name="org.eclipse.jst.component.nondependency" value=""/>
- </attributes>
- </classpathentry>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/.project b/.project
deleted file mode 100644
index 6993c2c..0000000
--- a/.project
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>pdf-as</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- </natures>
-</projectDescription>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0fb1f21..0000000
--- a/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,13 +0,0 @@
-#Wed Jan 19 14:11:01 CET 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.4
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index b50497a..0000000
--- a/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
- <wb-module deploy-name="pdf-as">
-<wb-resource deploy-path="/" source-path="/src/main/java"/>
-<wb-resource deploy-path="/" source-path="/src/main/resources"/>
- </wb-module>
-</project-modules>
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 093d2aa..0000000
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
- <fixed facet="jst.utility"/>
- <fixed facet="jst.java"/>
- <installed facet="jst.utility" version="1.0"/>
- <installed facet="jst.java" version="1.4"/>
-</faceted-project>
diff --git a/.settings/org.maven.ide.eclipse.prefs b/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 2ec84fe..0000000
--- a/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Tue Mar 16 10:45:29 CET 2010
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/maven2-repository/maven2-repository.zip b/maven2-repository/maven2-repository.zip
index 284f4bf..faf0c91 100644
--- a/maven2-repository/maven2-repository.zip
+++ b/maven2-repository/maven2-repository.zip
Binary files differ
diff --git a/pdf-as-cli/pom.xml b/pdf-as-cli/pom.xml
new file mode 100644
index 0000000..a2a89c4
--- /dev/null
+++ b/pdf-as-cli/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<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/xsd/maven-4.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>pom</packaging>
+
+ <artifactId>pdf-as-cli</artifactId>
+ <name>PDF-AS CLI</name>
+ <description>Commandline Distribution zur Amtssignatur fuer elektronische Aktenfuehrung</description>
+
+ <build>
+
+ <finalName>${project.artifactId}-${project.version}</finalName>
+
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/cli.xml</descriptor>
+ </descriptors>
+ <appendAssemblyId>false</appendAssemblyId>
+ </configuration>
+ </plugin>
+
+ </plugins>
+
+ </build>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>pdf-as-lib</artifactId>
+ </dependency>
+
+ </dependencies>
+
+</project>
diff --git a/pdf-as-cli/src/main/assembly/cli.xml b/pdf-as-cli/src/main/assembly/cli.xml
new file mode 100644
index 0000000..31abd3d
--- /dev/null
+++ b/pdf-as-cli/src/main/assembly/cli.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- http://maven.apache.org/plugins/maven-assembly-plugin/assembly.html -->
+<assembly
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+
+ <id>cli</id>
+
+ <formats>
+ <format>zip</format>
+ </formats>
+
+ <baseDirectory>pdf-as-cli</baseDirectory>
+ <includeBaseDirectory>true</includeBaseDirectory>
+
+ <moduleSets>
+
+ <!-- Add pdf-as library. -->
+ <moduleSet>
+ <useAllReactorProjects>true</useAllReactorProjects>
+ <includes>
+ <include>at.gv.egiz:pdf-as-lib:jar</include>
+ </includes>
+ <binaries>
+ <outputDirectory/>
+ <unpack>false</unpack>
+ <outputFileNameMapping>${module.build.finalName}.${module.extension}</outputFileNameMapping>
+ </binaries>
+ </moduleSet>
+
+ </moduleSets>
+
+ <dependencySets>
+
+ <!-- Add project dependencies. -->
+ <dependencySet>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <outputDirectory>lib</outputDirectory>
+ <excludes>
+ <exclude>at.gv.egiz:pdf-as-lib:jar</exclude>
+ </excludes>
+ </dependencySet>
+
+ </dependencySets>
+
+ <fileSets>
+
+ <!-- Add scripts. -->
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <filtered>true</filtered>
+ <outputDirectory />
+ <includes>
+ <include>*.bat</include>
+ <include>*.sh</include>
+ </includes>
+ </fileSet>
+
+ <!-- Add user manual. -->
+ <fileSet>
+ <directory>../dok/Anwendungsbeschreibung</directory>
+ <outputDirectory>doc</outputDirectory>
+ <includes>
+ <include>PDF-AS-${project.version}-Anwendungsbeschreibung.pdf</include>
+ <!-- Fallback, if latest version not yet available. -->
+ <include>PDF-AS-3.2-Anwendungsbeschreibung.pdf</include>
+ </includes>
+ </fileSet>
+
+ <!-- Add exampled. -->
+ <fileSet>
+ <directory>../dok/Anwendungsbeschreibung/Platzhalter-Beispiele</directory>
+ <outputDirectory>doc/Platzhalter-Beispiele</outputDirectory>
+ <includes>
+ <include>*.jpg</include>
+ </includes>
+ </fileSet>
+
+ <!-- Add configuration documentation. -->
+ <fileSet>
+ <directory>../dok/Konfiguration</directory>
+ <outputDirectory>doc</outputDirectory>
+ <includes>
+ <include>*.pdf</include>
+ </includes>
+ </fileSet>
+
+ <!-- Add specification. -->
+ <fileSet>
+ <directory>../dok/Spezifikation/Spezifikation-Layout-Amtssignatur-las-v1.4.0</directory>
+ <outputDirectory>doc</outputDirectory>
+ <includes>
+ <include>Spezifikation-Layout-Amtssignatur-las-v1.4.0.pdf</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+</assembly>
diff --git a/pdf-as-lib/src/main/distribution/cl/pdf-as.bat b/pdf-as-cli/src/main/resources/pdf-as.bat
index 0cadb9a..0cadb9a 100644
--- a/pdf-as-lib/src/main/distribution/cl/pdf-as.bat
+++ b/pdf-as-cli/src/main/resources/pdf-as.bat
diff --git a/pdf-as-lib/src/main/distribution/cl/pdf-as.sh b/pdf-as-cli/src/main/resources/pdf-as.sh
index f47bc5f..f47bc5f 100644
--- a/pdf-as-lib/src/main/distribution/cl/pdf-as.sh
+++ b/pdf-as-cli/src/main/resources/pdf-as.sh
diff --git a/pdf-as-lib/src/main/distribution/cl/sign.bat b/pdf-as-cli/src/main/resources/sign.bat
index e25213b..e25213b 100644
--- a/pdf-as-lib/src/main/distribution/cl/sign.bat
+++ b/pdf-as-cli/src/main/resources/sign.bat
diff --git a/pdf-as-lib/src/main/distribution/cl/sign.sh b/pdf-as-cli/src/main/resources/sign.sh
index 410b3fe..410b3fe 100644
--- a/pdf-as-lib/src/main/distribution/cl/sign.sh
+++ b/pdf-as-cli/src/main/resources/sign.sh
diff --git a/pdf-as-lib/pom.xml b/pdf-as-lib/pom.xml
index dba3bf3..01b2279 100644
--- a/pdf-as-lib/pom.xml
+++ b/pdf-as-lib/pom.xml
@@ -2,136 +2,30 @@
<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>jar</packaging>
- <groupId>knowcenter</groupId>
- <artifactId>pdf-as</artifactId>
- <name>PDF-AS</name>
- <version>3.2</version>
- <!-- don't forget to set the version string at.knowcenter.wag.egov.egiz.PdfAS.PDFAS_VERSION accordingly -->
-
- <description>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>t.knall@datentechnik-innovation.com</email>
- <organization>Datentechnik Innovation GmbH</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>
-
- <developer>
- <id>rpiazzi</id>
- <name>Roland Piazzi</name>
- <email>roland.piazzi@iaik.tugraz.at</email>
- <organization>EGIZ</organization>
- <roles>
- <role>developer</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
-
- </developers>
+ <artifactId>pdf-as-lib</artifactId>
+ <name>PDF-AS Library</name>
+ <description>Library zur Amtssignatur fuer elektronische Aktenfuehrung</description>
<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-${project.version}</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>
@@ -140,23 +34,6 @@
</plugin>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <!--
- <descriptor>src/main/assembly/assemble_libraries.xml</descriptor>
- <descriptor>src/main/assembly/assemble_distribution_ws.xml</descriptor>
- <descriptor>src/main/assembly/assemble_repository.xml</descriptor>
- <descriptor>src/main/assembly/assemble_distribution_brz.xml</descriptor>
- <descriptor>src/main/assembly/assemble_distribution_cl.xml</descriptor>
- -->
- <descriptor>src/main/assembly/assemble_distribution_cl.xml</descriptor>
- <descriptor>src/main/assembly/assemble_repository.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
-
- <plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
@@ -176,33 +53,6 @@
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <public>true</public>
- <package>true</package>
- <private>true</private>
- <links>
- <link>http://download.oracle.com/javase/1.4.2/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>
</build>
@@ -212,151 +62,125 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.3</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.13</version>
</dependency>
<dependency>
<groupId>lucene</groupId>
<artifactId>lucene</artifactId>
- <version>1.4.3</version>
</dependency>
<dependency>
<groupId>lucene</groupId>
<artifactId>lucene-demos</artifactId>
- <version>1.4.3</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.7.1</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.1</version>
</dependency>
<dependency>
<groupId>axis</groupId>
<artifactId>axis</artifactId>
- <version>1.0</version>
</dependency>
<dependency>
<groupId>axis</groupId>
<artifactId>axis-saaj</artifactId>
- <version>1.0</version>
</dependency>
<dependency>
<groupId>axis</groupId>
<artifactId>axis-wsdl4j</artifactId>
- <version>1.0</version>
</dependency>
<dependency>
<groupId>axis</groupId>
<artifactId>axis-jaxrpc</artifactId>
- <version>1.0</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>3.0</version>
</dependency>
<dependency>
<groupId>commons-discovery</groupId>
<artifactId>commons-discovery</artifactId>
- <version>0.2</version>
</dependency>
-
+
<dependency>
<groupId>iaik</groupId>
<artifactId>iaik_jce_eval_signed</artifactId>
- <version>4.0</version>
</dependency>
<dependency>
<groupId>iaik</groupId>
<artifactId>iaik_ecc_eval_signed</artifactId>
- <version>2.19</version>
</dependency>
-
+
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.3</version>
</dependency>
<!-- nur falls jdk < 1.5 verwendet wird -->
+ <!--
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
- <version>1.3.02</version>
</dependency>
+ -->
<!-- iText -->
<dependency>
<groupId>com.lowagie</groupId>
<artifactId>itext-2.1.5-rev3628-pdfas</artifactId>
- <version>1.1</version>
- </dependency>
-
+ </dependency>
+
<!-- pdfbox -->
<dependency>
<groupId>pdfbox</groupId>
<artifactId>pdfbox-0.7.2-pdfas</artifactId>
- <version>1.1</version>
</dependency>
-
+
<dependency>
- <groupId>org.apache.pdfbox</groupId>
- <artifactId>pdfbox</artifactId>
- <version>0.8.0-incubating</version>
+ <groupId>org.apache.pdfbox</groupId>
+ <artifactId>pdfbox</artifactId>
</dependency>
-
+
<dependency>
<groupId>ognl</groupId>
<artifactId>ognl</artifactId>
- <version>2.6.9</version>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>core</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <classifier>jdk14</classifier>
</dependency>
-
+
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>javase</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <classifier>jdk14</classifier>
</dependency>
-
+
</dependencies>
</project>
diff --git a/pdf-as-lib/src/main/assembly/assemble_distribution_brz.xml b/pdf-as-lib/src/main/assembly/assemble_distribution_brz.xml
deleted file mode 100644
index 76ae2b5..0000000
--- a/pdf-as-lib/src/main/assembly/assemble_distribution_brz.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <!-- http://maven.apache.org/plugins/maven-assembly-plugin/assembly.html -->
-<assembly 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/xsd/assembly-1.0.0.xsd">
- <id>distribution_brz</id>
- <formats>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>true</includeBaseDirectory>
-
- <dependencySets>
- <dependencySet>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <outputDirectory>lib</outputDirectory>
- <excludes>
- <exclude>*:${project.artifactId}:jar</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
-
- <files>
- <file>
- <source>src/main/distribution/brz/pdf-as.bat</source>
- <outputDirectory />
- <filtered>true</filtered>
- </file>
- </files>
- <fileSets>
- <fileSet>
- <directory>target</directory>
- <outputDirectory />
- <includes>
- <include>${project.build.finalName}.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>dok</directory>
- <outputDirectory>doc</outputDirectory>
- <includes>
- <include>*.pdf</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/pdf-as-lib/src/main/assembly/assemble_distribution_cl.xml b/pdf-as-lib/src/main/assembly/assemble_distribution_cl.xml
deleted file mode 100644
index e33a6e3..0000000
--- a/pdf-as-lib/src/main/assembly/assemble_distribution_cl.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- http://maven.apache.org/plugins/maven-assembly-plugin/assembly.html -->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
- <id>distribution_cl</id>
- <formats>
- <format>zip</format>
- </formats>
- <baseDirectory>pdf-as</baseDirectory>
- <includeBaseDirectory>true</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <outputDirectory>lib</outputDirectory>
- <excludes>
- <exclude>*:${project.artifactId}:jar</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
- <fileSets>
- <fileSet>
- <directory>src/main/distribution/cl</directory>
- <filtered>true</filtered>
- <outputDirectory/>
- <includes>
- <include>*.bat</include>
- <include>*.sh</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>target</directory>
- <outputDirectory/>
- <includes>
- <include>${project.build.finalName}.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>dok/Anwendungsbeschreibung</directory>
- <outputDirectory>doc</outputDirectory>
- <includes>
- <include>PDF-AS-${project.version}-Anwendungsbeschreibung.pdf</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>dok/Anwendungsbeschreibung/Platzhalter-Beispiele</directory>
- <outputDirectory>doc/Platzhalter-Beispiele</outputDirectory>
- <includes>
- <include>*.jpg</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>dok/Konfiguration</directory>
- <outputDirectory>doc</outputDirectory>
- <includes>
- <include>*.pdf</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>dok/Spezifikation/Spezifikation-Layout-Amtssignatur-las-v1.4.0</directory>
- <outputDirectory>doc</outputDirectory>
- <includes>
- <include>Spezifikation-Layout-Amtssignatur-las-v1.4.0.pdf</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/pdf-as-lib/src/main/assembly/assemble_distribution_ws.xml b/pdf-as-lib/src/main/assembly/assemble_distribution_ws.xml
deleted file mode 100644
index ff73f9d..0000000
--- a/pdf-as-lib/src/main/assembly/assemble_distribution_ws.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- http://maven.apache.org/plugins/maven-assembly-plugin/assembly.html -->
-<assembly>
- <id>distribution-ws</id>
- <formats>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>distribution/tomcat/tomcat-5.5.20-standalone</directory>
- <outputDirectory>/pdf-as-ws/tomcat</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
- <excludes>
- <exclude>.svn</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>distribution/jdk/1.5.0_06/</directory>
- <outputDirectory>/pdf-as-ws/jsdk</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
- <excludes>
- <exclude>.svn</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>webapp</directory>
- <outputDirectory>/pdf-as-ws/tomcat/webapps/pdf-as</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
- <excludes>
- <exclude>.svn</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>target</directory>
- <outputDirectory>/pdf-as-ws/tomcat/webapps/pdf-as/WEB-INF/lib</outputDirectory>
- <includes>
- <include>pdf-as*.jar</include>
- </includes>
- <excludes>
- <exclude>.svn</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>distribution/cfg</directory>
- <outputDirectory>/pdf-as-ws/tomcat/conf/pdf-as/cfg</outputDirectory>
- <includes>
- <include>*.properties</include>
- </includes>
- <excludes>
- <exclude>.svn</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>distribution/tomcat</directory>
- <outputDirectory>/pdf-as-ws/tomcat/conf/catalina/localhost</outputDirectory>
- <includes>
- <include>pdf-as.xml</include>
- </includes>
- <excludes>
- <exclude>.svn</exclude>
- </excludes>
- </fileSet>
-
- <fileSet>
- <directory>distribution/certificates</directory>
- <outputDirectory>/pdf-as-ws/tomcat/conf/pdf-as/certificates</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
- <excludes>
- <exclude>.svn</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>distribution/pdfastmp</directory>
- <outputDirectory>/pdf-as-ws/tomcat/conf/pdf-as/pdfastmp</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
- <excludes>
- <exclude>.svn</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>distribution/images</directory>
- <outputDirectory>/pdf-as-ws/tomcat/conf/pdf-as/images</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
- <excludes>
- <exclude>.svn</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>work/templates</directory>
- <outputDirectory>/pdf-as-ws/tomcat/conf/pdf-as/templates</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
- <excludes>
- <exclude>.svn</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>work/licenses</directory>
- <outputDirectory>/pdf-as-ws/tomcat/conf/pdf-as/licenses</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
- <excludes>
- <exclude>.svn</exclude>
- </excludes>
- </fileSet>
-
- <fileSet>
- <directory>distribution/moaspss/moa-spss-1.4.2beta1</directory>
- <outputDirectory>/pdf-as-ws/tomcat/webapps</outputDirectory>
- <includes>
- <include>moa-spss.war</include>
- </includes>
- <excludes>
- <exclude>.svn</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>distribution/moaspss/moa-spss-1.4.2beta1/conf</directory>
- <outputDirectory>/pdf-as-ws/tomcat/conf</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
- <excludes>
- <exclude>.svn</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>distribution/moaspss/moa-spss-1.4.2beta1/endorsed</directory>
- <outputDirectory>/pdf-as-ws/tomcat/common/endorsed</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
- <excludes>
- <exclude>.svn</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>distribution/moaspss/moa-spss-1.4.2beta1/ext</directory>
- <outputDirectory>/pdf-as-ws/tomcat/common/lib</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
- <excludes>
- <exclude>.svn</exclude>
- </excludes>
- </fileSet>
-
-
- <fileSet>
- <directory>distribution/tomcat</directory>
- <outputDirectory>/pdf-as-ws/tomcat</outputDirectory>
- <includes>
- <include>startTomcat.bat</include>
- <include>stopTomcat.bat</include>
- <include>favicon.ico</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>distribution/</directory>
- <outputDirectory>/pdf-as-ws/tomcat</outputDirectory>
- <includes>
- <include>Starten PDF-Amtssignatur.bat</include>
- <include>Beenden PDF-Amtssignatur.bat</include>
- </includes>
- </fileSet>
- <!--fileSet>
- <directory>distribution/doc</directory>
- <outputDirectory>/pdf-as-cl</outputDirectory>
- <includes>
- <include>Demotext.pdf</include>
- </includes>
- </fileSet-->
- </fileSets>
- <!--files>
- <file>
- <source>distribution/scripts/pdf-as.bat</source>
- <outputDirectory>/pdf-as-cl</outputDirectory>
- <filtered>true</filtered>
- </file>
- </files-->
- <dependencySets>
- <dependencySet>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <outputDirectory>/pdf-as-ws/tomcat/webapps/pdf-as/WEB-INF/lib</outputDirectory>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/pdf-as-lib/src/main/assembly/assemble_libraries.xml b/pdf-as-lib/src/main/assembly/assemble_libraries.xml
deleted file mode 100644
index 446e9ba..0000000
--- a/pdf-as-lib/src/main/assembly/assemble_libraries.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- http://maven.apache.org/plugins/maven-assembly-plugin/assembly.html -->
-<assembly>
- <id>libraries</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <unpack>false</unpack>
- <scope>compile</scope>
- <outputDirectory>/</outputDirectory>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/pdf-as-lib/src/main/assembly/assemble_repository.xml b/pdf-as-lib/src/main/assembly/assemble_repository.xml
deleted file mode 100644
index cbfe790..0000000
--- a/pdf-as-lib/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>
diff --git a/pdf-as-lib/src/main/distribution/brz/pdf-as.bat b/pdf-as-lib/src/main/distribution/brz/pdf-as.bat
deleted file mode 100644
index 059b977..0000000
--- a/pdf-as-lib/src/main/distribution/brz/pdf-as.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-@echo off
-
-rem Deploy embedded default configuration to current folder
-rem Note: Configuration is not deployed if it already exists.
-rem java -Dpdf-as.work-dir=. -jar ${project.build.finalName}.jar -ddc
-
-rem Start commandline
-java -Xms128m -Xmx786m -XX:MaxPermSize=256m -Dpdf-as.work-dir=. -jar ${project.build.finalName}.jar %*
diff --git a/pdf-as-lib/src/site/changes.xml b/pdf-as-lib/src/site/changes.xml
deleted file mode 100644
index 4c19e8b..0000000
--- a/pdf-as-lib/src/site/changes.xml
+++ /dev/null
@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-
- <properties>
- <title>Release History</title>
- </properties>
-
- <body>
-
- <!--
- <release version="major.minor" date="yyyy-MM-dd" description="foo">
- <action dev="foo" type="add|update|fix|remove">foo</action>
- </release>
- -->
-
- <release version="3.1.1-snapshot" date="2010-03-16" description="add">
- <action dev="tknall" type="add">Catching OutOfMemory exceptions, returning appropriate error message/code</action>
- <action dev="tknall" type="fix">Binary signature: bug concerning indirect pdf objects fixed</action>
- <action dev="tknall" type="update">Maven2-repository updated</action>
- <action dev="tknall" type="update">pdfbox/itext projects converted to maven2 projects</action>
- <action dev="tknall" type="update">pdfbox/itext maven2 artifact renamed and version added (see .pom)</action>
- <action dev="tknall" type="remove">old pdfbox/itext libraries removed</action>
- <action dev="tknall" type="add">SignaturePositioning improved (Signature position can be declared by String which is parsed)</action>
- <action dev="tknall" type="add">Some more error codes (Out of memory, Invalid signature position)</action>
- <action dev="tknall" type="add">iText utility for creation of pdf files added</action>
- <action dev="tknall" type="update">ConfigUtils updated (destination of configuration to be extracted can now be chosen)</action>
- <action dev="tknall" type="update">PDFASUtils updated (more tools)</action>
- <action dev="tknall" type="add">WebApplication: Freetext pdf creation implemented</action>
- <action dev="tknall" type="fix">WebApplication: XSS security updates</action>
- </release>
-
- <release version="3.1" date="2010-01-18" description="add">
- <action dev="tknall" type="add">Support for PDF signature handler.</action>
- <action dev="tknall" type="add">Protection of signed documents against inadvertently modification.</action>
- <action dev="tknall" type="update">Revision of configuration (backwards compatibility assured).</action>
- <action dev="tknall" type="fix">Minor bug concerning table format configuration fixed.</action>
- <action dev="tknall" type="add">Support of arbitrary signature/hash algorithms (ACOS04/G3).</action>
- <action dev="tknall" type="add">Evaluation of pdf documents for non-textual objects added.</action>
- <action dev="tknall" type="add">Support for BAIK signatures.</action>
- <action dev="tknall" type="fix">Many minor bugfixes.</action>
- </release>
-
- <release version="3.0.9-20090929" date="2009-10-01" description="bugfix">
- <action dev="tknall" type="fix">WebApplication: Incompatibility to Tomcat 6.x removed. (Now quoting taglib expressions with nested scriptlets.)</action>
- </release>
-
- <release version="3.0.9-20090929" date="2009-09-29" description="bugfix">
- <action dev="tknall" type="fix">Bug concerning text matching algorithm fixed.</action>
- </release>
-
- <release version="3.0.9-20090417" date="2009-05-08" description="subsequent release">
- <action dev="tknall" type="fix">Web application bug concerning text reconstruction from form fixed.</action>
- </release>
-
- <release version="3.0.9-20090417" date="2009-04-17" description="subsequent release">
- <action dev="tknall" type="add">New signature layout for new MOCCA bku integrated (etsi-moc-1.1).</action>
- <action dev="tknall" type="add">New architecture implemented that allows different signature layouts for single types of bkus.</action>
- </release>
-
- <release version="3.0.9-20090319" date="2009-03-26" description="subsequent release">
- <action dev="tknall" type="update">Layout for webapplication adjusted for IE.</action>
- </release>
-
- <release version="3.0.9-20090319" date="2009-03-19" description="subsequent release">
- <action dev="tknall" type="update">Build script for command line version updated.</action>
- <action dev="tknall" type="fix">JavaDoc fixes.</action>
- <action dev="tknall" type="update">Some updates for debugging messages.</action>
- <action dev="tknall" type="update">Parser for MOCCA-CreateXMLSignatureResponses enhanced.</action>
- <action dev="tknall" type="update">Many updates and fixes for the external web app interface.</action>
- <action dev="tknall" type="add">New profile for invisible signatures added.</action>
- </release>
-
- <release version="3.0.9-20090206" date="2009-02-04" description="subsequent release">
- <action dev="tknall" type="fix">Examples for the help screen of the commandline version corrected.</action>
- </release>
-
- <release version="3.0.9-20090203" date="2009-02-04" description="subsequent release">
- <action dev="tknall" type="fix">Minor updates for commandline invokation.</action>
- <action dev="tknall" type="fix">Restored compatibility for old PdfAS.commandline(...) method invokation. This method is used by external tools (Open Office plugin for instance.)</action>
- <action dev="tknall" type="add">Some more log messages (e.g. encoding related issues).</action>
- <action dev="tknall" type="update">Updating web application (in external invocation mode) enhancing support for being used within an iframe.</action>
- <action dev="tknall" type="add">
- Two new (optional) parameters for external invocation mode:
- locale: defines the locale being used for webapp (e.g. locale=de or locale=de_DE),
- invoke-app-error-url: can be used to declare a callback url to the calling web application in order to transfer error messages from pdf-as.
- In case of error pdf-as redirects the user to the error-page-url (if given) providing the error and the cause in url encoded parameters ("error", "cause").
- </action>
- <action dev="tknall" type="update">Formatter for mocca signature params enhanced.</action>
- </release>
-
- <release version="3.0.9-20090129" date="2009-01-29" description="BRZ release">
- <action dev="wprinz" type="add">Added signatureKeyIdentifier to SignParameters in the API, which allows to override the one specified in the profile (MOA Connector only).</action>
- <action dev="wprinz" type="add">Added maven assembly and batch file for BRZ distribution.</action>
- <action dev="wprinz" type="fix">Corrected faulty mime-type argument checking in SignResult constructor.</action>
- </release>
-
- <release version="3.0.8-20090113" date="2009-01-13" description="subsequent release">
- <action dev="tknall" type="update">Switching to itext-2.1.5-rev3628. (itext-1.4.x is regarded as deprecated.)</action>
- <action dev="gfliess" type="update">itext library: minor adjustments for pdf-as</action>
- <action dev="tknall" type="add">Adding new error code (103) for invalid pdfa/1b font configuration.</action>
- <action dev="gfliess" type="update">Minor updates for PDF/A support.</action>
- <action dev="tknall" type="add">Support for local MOCCA CCS added.</action>
- </release>
-
- <release version="3.0.8-20081126" date="2008-11-26" description="subsequent release">
- <action dev="tknall" type="add">Multi language for web application.</action>
- <action dev="tknall" type="fix">Encoding issue for web application fixed by implementing an EncodingFilter.</action>
- <action dev="tknall" type="update">Dynamic sign upload form implemented.</action>
- <action dev="tknall" type="update">Order of input fields for dynamic upload form changed.</action>
- <action dev="tknall" type="add">MOCCA logo added to sign upload form.</action>
- </release>
-
- <release version="3.0.8-20081119" date="2008-09-19" description="subsequent release">
- <action dev="tknall" type="remove">lib-folder removed.</action>
- <action dev="tknall" type="update">Maven2-repository updated.</action>
- <action dev="tknall" type="add">Adding external patched itext (1.4.2 and 2.1.5) and pdfbox libraries.</action>
- <action dev="tknall" type="remove">Removing iText and pdfbox from sources.</action>
- <action dev="tknall" type="remove">Cleaning up certstore removing all certificates except MOA-certificates.</action>
- <action dev="tknall" type="remove">Removing deprecated templates.</action>
- <action dev="tknall" type="update">Correcting default.bku.sign.detached.xml according to Security Layer spec.</action>
- <action dev="tknall" type="update"></action>
- <action dev="tknall" type="add">Adding DejaVuFont.</action>
- <action dev="tknall" type="add">Adding DejaVuFont license.</action>
- <action dev="tknall" type="update">Adding test file for PDF/A. Removing issues.txt.</action>
- <action dev="tknall" type="add">Preparation for multilingual support for web application.</action>
- <action dev="tknall" type="update">Minor updates of configuration.</action>
- <action dev="tknall" type="update">Sitemesh updates.</action>
- <action dev="tknall" type="add">Minor support for TrueType fonts in preparation for PDF/A added.</action>
- </release>
-
- <release version="3.0.7-20080923" date="2008-09-23" description="subsequent release">
- <action dev="tknall" type="remove">Deprecated webapp-folder removed from svn repository.</action>
- <action dev="tknall" type="add">New DefaultConfiguration.zip integrated in order to allow mocca signatures.</action>
- <action dev="tknall" type="fix">Minor bug concerning choice of cce within the web application fixed.</action>
- </release>
-
- <release version="3.0.7-20080916" date="2008-09-16" description="subsequent release">
- <action dev="tknall" type="add">Signature with new online bku MOCCA integrated (new signature device "moc" created).</action>
- <action dev="tknall" type="add">Configuration keys for mocca added.</action>
- <action dev="tknall" type="add">New error codes (371 = signature verification not supported by this connector, 372 = invalid signing time) introduced.</action>
- <action dev="tknall" type="add">Optional check of the signing time for the web application implemented. At signature creation time the signing time is checked for plausibility. This is a workaround for the ITS:mac-linux signing time bug. New configuration key ("signing_time_tolerance") added (applies to web application only) to overcome invalid signing times. A signature is only accepted if its signing time is within a time frame of [current time - signing_time_tolerance, current time + signing_time_tolerance] where signing_time_tolerance is interpreted as seconds.</action>
- <action dev="tzefferer" type="fix">Bugfix: Correct extraction of signatures with wrong signing times implemented. (The order of the signatures is still invalid in case of false signing times.)</action>
- <action dev="tknall" type="add">Optional override of the dynamic creation of the signature retrieval url (locrefcontent) implemented in order to overcome ssl problems (retrieve_signature_data_url_override). Note: Assure that this URL is accessible from the citizen card environment.</action>
- <action dev="tknall" type="fix">Download of signed pdf-file for external application interface adjusted.</action>
- <action dev="tknall" type="add">Verification of mocca signed documents implemented.</action>
- <action dev="tknall" type="add">Retrieval of xml response via multipart implemented (mocca strictly follows security layer spec)</action>
- </release>
-
- <release version="3.0.6-20080715" date="2008-07-15" description="subsequent release">
- <action dev="tknall" type="update">Parsing of PublicAuthority-Flag and PublicAuthority-Code from MOA-VerifyXMLSignatureResponses implemented.</action>
- </release>
-
- <release version="3.0.6-20080616" date="2008-06-16" description="subsequent release">
- <action dev="tknall" type="update">APIDemo updated.</action>
- <action dev="tknall" type="update">(default) configuration updated regarding new configuration keys.</action>
- <action dev="tknall" type="update">Many printStackTraces replaces with logger-messages.</action>
- <action dev="tknall" type="update">Update concerting exclusion of minimal layout profiles for verification.</action>
- <action dev="tknall" type="update">
- Web-Application: New error code (251) introduced: Textual signature of files with no
- extractable textual content (e.g. files that solely contain images) is prevented.
- </action>
- </release>
-
- <release version="3.0.6" date="2008-06-16" description="subsequent release">
- <action dev="wprinz" type="add">Configurable line break tolerance for binary signatures (line_break_tolerance).</action>
- <action dev="wprinz" type="add">The reserved space for a certificate withing the egiz dictionary can be configured (...phlength.certificate=xxxx).</action>
- <action dev="wprinz" type="add">imagescaletofit configuration parameter introduced.</action>
- </release>
-
- <release version="3.0.5" date="2008-06-13" description="subsequent release">
- <action dev="tzefferer" type="update">Detection of incremental updates updated.</action>
- <action dev="tknall" type="fix">Bug fixed. There was an error concerning empty HashInputData parsing a MOA CreateXMLSignatureResponse.</action>
- <action dev="tknall" type="add">Demo source for API usage created.</action>
- <action dev="tknall" type="update">Issue resolved: Prevent signature of empty document which leads to a meaningless error message from the bku.</action>
- </release>
-
- <release version="3.0.5" date="2008-06-12" description="subsequent release">
- <action dev="tknall" type="update">A new check for the existence of a configuration has been implemented. The extraction is skipped if any files or folders would be overwritten. Files like log- or temp-files may exist and do not prevent the deployment of the default configuration.</action>
- </release>
-
- <release version="3.0.5" date="2008-06-11" description="subsequent release">
- <action dev="tknall" type="fix">Serious bug solved. Method storeCertificate tried to fetch a certificate from store before storing it. If not found (within the store resp. via ldap) the certificate was not stored!!!</action>
- </release>
-
- <release version="3.0.5" date="2008-06-10" description="subsequent release">
- <action dev="tknall" type="update">Manual deployment of pdf-as configuration (commandline parameter -ddc) considers the system property pdf-as.work-dir.</action>
- <action dev="tknall" type="update">Internal default configuration updated.</action>
- <action dev="tknall" type="fix">log4.properties within the workdir is now being considered using the api.</action>
- </release>
-
- <release version="3.0.5" date="2008-06-03" description="subsequent release">
- <action dev="wprinz" type="add">
- Support of a minimal signature mark layout for binary signatures added.
- </action>
- <action dev="tknall" type="add">
- Web-Application: Every hardcoded context "pdf-as" has been replaced.
- </action>
- <action dev="tknall" type="add">
- Web-Application: Session is now being invalidated after download of the signed pdf file.
- </action>
- <action dev="tknall" type="add">
- Web-Application: Configuration may be declared via system property "pdf-as.work-dir" or via Servlet-Init-Parameter "work-dir".
- </action>
- <action dev="tknall" type="fix">
- Bug fixed in RetrieveSignatureDataServlet: Response header didn't contain a content length attribute. The ITS Mac BKU rejects those requests.
- </action>
- <action dev="tknall" type="fix">
- Workaround for ITS Mac BKU integrated. A redirect via response does only work if the response contains a valid SL request (e.g. a NullOperationRequest).
- </action>
- <action dev="tknall" type="add">
- API: The configuration folder may be omitted at instantiating the api. Configuration may be set via system property "pdf-as.work-dir". If no configuration is given at all, the current user's home directory is searched for a folder "PDF-AS". If not found a default configuration is created.
- </action>
- <action dev="tknall" type="add">
- If the configuration is explicitely given than the temporary folder is located within the given directory otherwise within the user's temporary directory.
- </action>
- <action dev="tknall" type="add">
- Declaring the configuration folder, replacements for system properties like "${catalina.base}/conf/pdfas" may be used.
- </action>
- </release>
-
- <release version="3.0.4" date="2008-04-24"
- description="first release">
- <action dev="tknall" type="fix">
- Bug fixed: If we have a binary signature, the
- certificate is embedded. So there should be no serial
- number needed within the signature block. PDF-AS stores
- the certificate in the certstore but tries to load the
- certificate via serialnumber and issuername from
- certstore, which fails because of the missing serial
- number.
- </action>
- <action dev="tknall" type="fix">
- Bug fixed: For storage of the certificate in the
- certstore the issuername is taken from the certificate,
- normalized and hashed. The base64 value of the hash is
- used as the directory name. Loading the certificate from
- the certstore, the issuername is taken from the
- signature block, normalized and hashed. Some issuernames
- (with rdns that are not registered) lead to two
- different hash values (one at storage, another at
- retrieval), which leads to a certificate not found
- exception.
- </action>
- <action dev="tknall" type="add">
- PDF-AS library version is logged in order to lighten
- bugfixing.
- </action>
- </release>
-
- </body>
-
-</document>
diff --git a/pdf-as-lib/src/site/checkstyle.xml b/pdf-as-lib/src/site/checkstyle.xml
deleted file mode 100644
index 00ae4c9..0000000
--- a/pdf-as-lib/src/site/checkstyle.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- This configuration file was written by the eclipse-cs plugin configuration editor
--->
-<!--
-Checkstyle-Configuration: Sun Checks (Eclipse) brontes
-Description:
-
--->
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-<module name="Checker">
- <property name="severity" value="warning"/>
- <module name="TreeWalker">
- <property name="tabWidth" value="4"/>
- <module name="JavadocMethod">
- <property name="severity" value="ignore"/>
- </module>
- <module name="JavadocType">
- <property name="severity" value="ignore"/>
- </module>
- <module name="JavadocVariable">
- <property name="severity" value="ignore"/>
- </module>
- <module name="JavadocStyle"/>
- <module name="ConstantName"/>
- <module name="LocalFinalVariableName"/>
- <module name="LocalVariableName"/>
- <module name="MemberName"/>
- <module name="MethodName"/>
- <module name="PackageName"/>
- <module name="ParameterName"/>
- <module name="StaticVariableName"/>
- <module name="TypeName"/>
- <module name="AvoidStarImport"/>
- <module name="IllegalImport"/>
- <module name="RedundantImport"/>
- <module name="UnusedImports"/>
- <module name="FileLength"/>
- <module name="MethodLength"/>
- <module name="ParameterNumber"/>
- <module name="EmptyForIteratorPad"/>
- <module name="MethodParamPad"/>
- <module name="NoWhitespaceAfter">
- <property name="tokens" value="BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS"/>
- </module>
- <module name="NoWhitespaceBefore"/>
- <module name="OperatorWrap"/>
- <module name="ParenPad"/>
- <module name="TypecastParenPad"/>
- <module name="TabCharacter">
- <property name="severity" value="ignore"/>
- </module>
- <module name="WhitespaceAfter"/>
- <module name="WhitespaceAround">
- <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LCURLY,LE,LITERAL_ASSERT,LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_RETURN,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,RCURLY,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND,WILDCARD_TYPE"/>
- </module>
- <module name="ModifierOrder"/>
- <module name="RedundantModifier"/>
- <module name="AvoidNestedBlocks"/>
- <module name="EmptyBlock"/>
- <module name="LeftCurly"/>
- <module name="NeedBraces"/>
- <module name="RightCurly"/>
- <module name="AvoidInlineConditionals">
- <property name="severity" value="ignore"/>
- </module>
- <module name="DoubleCheckedLocking"/>
- <module name="EmptyStatement"/>
- <module name="EqualsHashCode"/>
- <module name="HiddenField">
- <property name="severity" value="ignore"/>
- </module>
- <module name="IllegalInstantiation"/>
- <module name="InnerAssignment"/>
- <module name="MagicNumber"/>
- <module name="MissingSwitchDefault"/>
- <module name="RedundantThrows"/>
- <module name="SimplifyBooleanExpression"/>
- <module name="SimplifyBooleanReturn"/>
- <module name="DesignForExtension">
- <property name="severity" value="ignore"/>
- </module>
- <module name="FinalClass"/>
- <module name="HideUtilityClassConstructor"/>
- <module name="InterfaceIsType"/>
- <module name="VisibilityModifier"/>
- <module name="ArrayTypeStyle"/>
- <module name="FinalParameters">
- <property name="severity" value="ignore"/>
- </module>
- <module name="GenericIllegalRegexp">
- <property name="severity" value="ignore"/>
- <property name="format" value="\s+$"/>
- <property name="message" value="Line has trailing spaces."/>
- </module>
- <module name="TodoComment">
- <property name="severity" value="ignore"/>
- </module>
- <module name="UpperEll"/>
- <module name="LineLength">
- <property name="severity" value="ignore"/>
- <property name="max" value="100"/>
- <property name="tabWidth" value="3"/>
- </module>
- </module>
- <module name="PackageHtml"/>
- <module name="NewlineAtEndOfFile"/>
- <module name="Translation"/>
-</module>
diff --git a/pdf-as-release/pom.xml b/pdf-as-release/pom.xml
new file mode 100644
index 0000000..7892ba4
--- /dev/null
+++ b/pdf-as-release/pom.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<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/xsd/maven-4.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>pom</packaging>
+
+ <artifactId>pdf-as-release</artifactId>
+ <name>PDF-AS Release</name>
+ <description>Release zur Amtssignatur fuer elektronische Aktenfuehrung</description>
+
+ <build>
+
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/release.xml</descriptor>
+ </descriptors>
+ <appendAssemblyId>false</appendAssemblyId>
+ </configuration>
+ </plugin>
+
+ </plugins>
+
+ </build>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>pdf-as-lib</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>pdf-as-web</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>pdf-as-cli</artifactId>
+ </dependency>
+
+ </dependencies>
+
+</project>
diff --git a/pdf-as-release/src/main/assembly/release.xml b/pdf-as-release/src/main/assembly/release.xml
new file mode 100644
index 0000000..cc63cca
--- /dev/null
+++ b/pdf-as-release/src/main/assembly/release.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- http://maven.apache.org/plugins/maven-assembly-plugin/assembly.html -->
+<assembly
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+
+ <id>release</id>
+
+ <formats>
+ <format>dir</format>
+ </formats>
+
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <moduleSets>
+ <moduleSet>
+ <useAllReactorProjects>true</useAllReactorProjects>
+ <includes>
+ <include>at.gv.egiz:pdf-as-lib</include>
+ <include>at.gv.egiz:pdf-as-web</include>
+ </includes>
+ <binaries>
+ <includeDependencies>false</includeDependencies>
+ <outputDirectory />
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+
+ <fileSets>
+
+ <fileSet>
+ <directory>../pdf-as-cli/target</directory>
+ <includes>
+ <include>*.zip</include>
+ </includes>
+ <outputDirectory />
+ </fileSet>
+
+ </fileSets>
+
+</assembly>
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
Binary files differ
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>
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..337d41f
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,355 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>pdf-as</artifactId>
+ <version>3.3-SNAPSHOT</version>
+
+ <packaging>pom</packaging>
+
+ <name>PDF-AS</name>
+ <description>Amtssignatur fuer elektronische Aktenfuehrung</description>
+ <url>https://joinup.ec.europa.eu/software/pdf-as/description</url>
+
+ <!--
+ <repositories>
+ <repository>
+ <id>egovlabs</id>
+ <name>egovlabs repository</name>
+ <url>https://joinup.ec.europa.eu/nexus/content/repositories/egovlabs</url>
+ </repository>
+ </repositories>
+ -->
+
+ <properties>
+
+ <!-- Encoding -->
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.build.outputEncoding>UTF-8</project.build.outputEncoding>
+
+ <!-- Java compiler -->
+ <java.compiler.source>1.5</java.compiler.source>
+ <java.compiler.target>1.5</java.compiler.target>
+
+ </properties>
+
+ <modules>
+ <module>pdf-as-lib</module>
+ <module>pdf-as-web</module>
+ <module>pdf-as-cli</module>
+ <module>pdf-as-release</module>
+ </modules>
+
+ <build>
+
+ <pluginManagement>
+
+ <plugins>
+
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <public>true</public>
+ <package>true</package>
+ <private>true</private>
+ <links>
+ <link>http://docs.oracle.com/javase/1.5.0/docs/api/</link>
+ <link>http://logging.apache.org/log4j/docs/api/</link>
+ </links>
+ <source>${java.compiler.source}</source>
+ <target>${java.compiler.target}</target>
+ <verbose>false</verbose>
+ <quiet>true</quiet>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ <windowtitle>${project.name} v${project.version}</windowtitle>
+ <tags>
+ <tag>
+ <name>todo</name>
+ <placement>a</placement>
+ <head>To do:</head>
+ </tag>
+ </tags>
+ <maxmemory>512m</maxmemory>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.6</version>
+ <configuration>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.2.1</version>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.0</version>
+ <configuration>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ <source>${java.compiler.source}</source>
+ <target>${java.compiler.target}</target>
+ <!-- showWarnings set to true shows issues that are classified as warnings, like non mappable characters within source code -->
+ <!-- should be set true as soon as these character encoding issues are fixed -->
+ <showWarnings>false</showWarnings>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.13</version>
+ <configuration>
+ <showsuccess>true</showsuccess>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+
+ </plugins>
+
+ </pluginManagement>
+
+ </build>
+
+ <dependencyManagement>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>pdf-as-lib</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>pdf-as-web</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>pdf-as-cli</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ </dependency>
+
+ <dependency>
+ <groupId>lucene</groupId>
+ <artifactId>lucene</artifactId>
+ <version>1.4.3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>lucene</groupId>
+ <artifactId>lucene-demos</artifactId>
+ <version>1.4.3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.7.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis-saaj</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis-wsdl4j</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis-jaxrpc</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-discovery</groupId>
+ <artifactId>commons-discovery</artifactId>
+ <version>0.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>iaik</groupId>
+ <artifactId>iaik_jce_eval_signed</artifactId>
+ <version>4.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>iaik</groupId>
+ <artifactId>iaik_ecc_eval_signed</artifactId>
+ <version>2.19</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+
+ <!-- nur falls jdk < 1.5 verwendet wird -->
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.3.02</version>
+ </dependency>
+
+ <!-- iText -->
+ <dependency>
+ <groupId>com.lowagie</groupId>
+ <artifactId>itext-2.1.5-rev3628-pdfas</artifactId>
+ <version>1.1</version>
+ </dependency>
+
+ <!-- pdfbox -->
+ <dependency>
+ <groupId>pdfbox</groupId>
+ <artifactId>pdfbox-0.7.2-pdfas</artifactId>
+ <version>1.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.pdfbox</groupId>
+ <artifactId>pdfbox</artifactId>
+ <version>0.8.0-incubating</version>
+ </dependency>
+
+ <dependency>
+ <groupId>ognl</groupId>
+ <artifactId>ognl</artifactId>
+ <version>2.6.9</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.zxing</groupId>
+ <artifactId>core</artifactId>
+ <version>1.6</version>
+ <classifier>jdk14</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.zxing</groupId>
+ <artifactId>javase</artifactId>
+ <version>1.6</version>
+ <classifier>jdk14</classifier>
+ </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>
+
+ </dependencyManagement>
+
+ <dependencies>
+
+ <!-- tests -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
diff --git a/readme.txt b/readme.txt
index 7ffd0cd..afa604f 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,7 +1,3 @@
Use the following working directory:
${project_loc}/work
-
-Note that ${project_loc}/src/site/changes.xml serves as release history.
-Refer to http://maven.apache.org/plugins/maven-changes-plugin/usage.html for further information.
-