From f9850d02d8559b7e7f3555d0e2c7cfe746257958 Mon Sep 17 00:00:00 2001 From: tknall Date: Thu, 10 Jan 2013 16:24:59 +0000 Subject: 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 --- .classpath | 18 -- .project | 42 --- .settings/org.eclipse.jdt.core.prefs | 13 - .settings/org.eclipse.wst.common.component | 7 - .../org.eclipse.wst.common.project.facet.core.xml | 7 - .settings/org.maven.ide.eclipse.prefs | 9 - maven2-repository/maven2-repository.zip | Bin 26057826 -> 26056597 bytes pdf-as-cli/pom.xml | 57 ++++ pdf-as-cli/src/main/assembly/cli.xml | 100 ++++++ pdf-as-cli/src/main/resources/pdf-as.bat | 8 + pdf-as-cli/src/main/resources/pdf-as.sh | 8 + pdf-as-cli/src/main/resources/sign.bat | 1 + pdf-as-cli/src/main/resources/sign.sh | 3 + pdf-as-lib/pom.xml | 226 ++----------- .../main/assembly/assemble_distribution_brz.xml | 44 --- .../src/main/assembly/assemble_distribution_cl.xml | 66 ---- .../src/main/assembly/assemble_distribution_ws.xml | 203 ------------ .../src/main/assembly/assemble_libraries.xml | 16 - .../src/main/assembly/assemble_repository.xml | 19 -- pdf-as-lib/src/main/distribution/brz/pdf-as.bat | 8 - pdf-as-lib/src/main/distribution/cl/pdf-as.bat | 8 - pdf-as-lib/src/main/distribution/cl/pdf-as.sh | 8 - pdf-as-lib/src/main/distribution/cl/sign.bat | 1 - pdf-as-lib/src/main/distribution/cl/sign.sh | 3 - pdf-as-lib/src/site/changes.xml | 252 --------------- pdf-as-lib/src/site/checkstyle.xml | 109 ------- pdf-as-release/pom.xml | 66 ++++ pdf-as-release/src/main/assembly/release.xml | 43 +++ pdf-as-web/maven2-repository/maven2-repository.zip | Bin 31895009 -> 0 bytes pdf-as-web/pom.xml | 181 +---------- .../src/main/assembly/assemble_repository.xml | 19 -- pom.xml | 355 +++++++++++++++++++++ readme.txt | 4 - 33 files changed, 681 insertions(+), 1223 deletions(-) delete mode 100644 .classpath delete mode 100644 .project delete mode 100644 .settings/org.eclipse.jdt.core.prefs delete mode 100644 .settings/org.eclipse.wst.common.component delete mode 100644 .settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 .settings/org.maven.ide.eclipse.prefs create mode 100644 pdf-as-cli/pom.xml create mode 100644 pdf-as-cli/src/main/assembly/cli.xml create mode 100644 pdf-as-cli/src/main/resources/pdf-as.bat create mode 100644 pdf-as-cli/src/main/resources/pdf-as.sh create mode 100644 pdf-as-cli/src/main/resources/sign.bat create mode 100644 pdf-as-cli/src/main/resources/sign.sh delete mode 100644 pdf-as-lib/src/main/assembly/assemble_distribution_brz.xml delete mode 100644 pdf-as-lib/src/main/assembly/assemble_distribution_cl.xml delete mode 100644 pdf-as-lib/src/main/assembly/assemble_distribution_ws.xml delete mode 100644 pdf-as-lib/src/main/assembly/assemble_libraries.xml delete mode 100644 pdf-as-lib/src/main/assembly/assemble_repository.xml delete mode 100644 pdf-as-lib/src/main/distribution/brz/pdf-as.bat delete mode 100644 pdf-as-lib/src/main/distribution/cl/pdf-as.bat delete mode 100644 pdf-as-lib/src/main/distribution/cl/pdf-as.sh delete mode 100644 pdf-as-lib/src/main/distribution/cl/sign.bat delete mode 100644 pdf-as-lib/src/main/distribution/cl/sign.sh delete mode 100644 pdf-as-lib/src/site/changes.xml delete mode 100644 pdf-as-lib/src/site/checkstyle.xml create mode 100644 pdf-as-release/pom.xml create mode 100644 pdf-as-release/src/main/assembly/release.xml delete mode 100644 pdf-as-web/maven2-repository/maven2-repository.zip delete mode 100644 pdf-as-web/src/main/assembly/assemble_repository.xml create mode 100644 pom.xml diff --git a/.classpath b/.classpath deleted file mode 100644 index b38606e..0000000 --- a/.classpath +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/.project b/.project deleted file mode 100644 index 6993c2c..0000000 --- a/.project +++ /dev/null @@ -1,42 +0,0 @@ - - - pdf-as - - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.maven.ide.eclipse.maven2Builder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature - org.maven.ide.eclipse.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jem.workbench.JavaEMFNature - - 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 @@ - - - - - - - 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 @@ - - - - - - - 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 Binary files a/maven2-repository/maven2-repository.zip and b/maven2-repository/maven2-repository.zip 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 @@ + + + + 4.0.0 + + + at.gv.egiz + pdf-as + 3.3-SNAPSHOT + + + pom + + pdf-as-cli + PDF-AS CLI + Commandline Distribution zur Amtssignatur fuer elektronische Aktenfuehrung + + + + ${project.artifactId}-${project.version} + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + make-assembly + package + + single + + + + + + src/main/assembly/cli.xml + + false + + + + + + + + + + + at.gv.egiz + pdf-as-lib + + + + + 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 @@ + + + + + cli + + + zip + + + pdf-as-cli + true + + + + + + true + + at.gv.egiz:pdf-as-lib:jar + + + + false + ${module.build.finalName}.${module.extension} + + + + + + + + + + false + runtime + lib + + at.gv.egiz:pdf-as-lib:jar + + + + + + + + + + src/main/resources + true + + + *.bat + *.sh + + + + + + ../dok/Anwendungsbeschreibung + doc + + PDF-AS-${project.version}-Anwendungsbeschreibung.pdf + + PDF-AS-3.2-Anwendungsbeschreibung.pdf + + + + + + ../dok/Anwendungsbeschreibung/Platzhalter-Beispiele + doc/Platzhalter-Beispiele + + *.jpg + + + + + + ../dok/Konfiguration + doc + + *.pdf + + + + + + ../dok/Spezifikation/Spezifikation-Layout-Amtssignatur-las-v1.4.0 + doc + + Spezifikation-Layout-Amtssignatur-las-v1.4.0.pdf + + + + + diff --git a/pdf-as-cli/src/main/resources/pdf-as.bat b/pdf-as-cli/src/main/resources/pdf-as.bat new file mode 100644 index 0000000..0cadb9a --- /dev/null +++ b/pdf-as-cli/src/main/resources/pdf-as.bat @@ -0,0 +1,8 @@ +@echo off + +rem Deploys embedded default configuration to USER_HOME/PDF-AS. +rem Note: Configuration is not deployed if it already exists. +java -jar ${project.build.finalName}.jar -ddc + +rem Start commandline +java -Xms128m -Xmx786m -XX:MaxPermSize=256m -jar ${project.build.finalName}.jar %* diff --git a/pdf-as-cli/src/main/resources/pdf-as.sh b/pdf-as-cli/src/main/resources/pdf-as.sh new file mode 100644 index 0000000..f47bc5f --- /dev/null +++ b/pdf-as-cli/src/main/resources/pdf-as.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +# Deploys embedded default configuration to USER_HOME/PDF-AS. +# Note: Configuration is not deployed if it already exists. +java -jar ${project.build.finalName}.jar -ddc + +# Start commandline +java -Xms128m -Xmx786m -XX:MaxPermSize=256m -jar ${project.build.finalName}.jar $@ diff --git a/pdf-as-cli/src/main/resources/sign.bat b/pdf-as-cli/src/main/resources/sign.bat new file mode 100644 index 0000000..e25213b --- /dev/null +++ b/pdf-as-cli/src/main/resources/sign.bat @@ -0,0 +1 @@ +call pdf-as.bat -mode sign -sigmode textual -connector bku %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/pdf-as-cli/src/main/resources/sign.sh b/pdf-as-cli/src/main/resources/sign.sh new file mode 100644 index 0000000..410b3fe --- /dev/null +++ b/pdf-as-cli/src/main/resources/sign.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +./pdf-as.sh -mode sign -sigmode textual -connector bku $@ 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 @@ + 4.0.0 + + at.gv.egiz + pdf-as + 3.3-SNAPSHOT + + jar - knowcenter - pdf-as - PDF-AS - 3.2 - - - Amtssignatur fuer elektronische Aktenfuehrung - http://egovlabs.gv.at/projects/pdf-as - 2006 - - - - - wlackner - Wilfried Lackner - wlackner@iicm.edu - KnowCenter - - developer - - +1 - - - - wprinz - Wolfgang Prinz - w.prinz@netconomy.net - Netconomy - - developer - - +1 - - - - tknall - Thomas Knall - t.knall@datentechnik-innovation.com - Datentechnik Innovation GmbH - - developer - - +1 - - - - tzefferer - Thomas Zefferer - thomas.zefferer@egiz.gv.at - EGIZ - - developer - - +1 - - - - gfliess - Gerhard Fliess - XiCrypt - - developer - - +1 - - - - amavriqi - Arian Mavriqi - amavriqi@iicm.edu - KnowCenter - - developer - - +1 - - - - rpiazzi - Roland Piazzi - roland.piazzi@iaik.tugraz.at - EGIZ - - developer - - +1 - - - + pdf-as-lib + PDF-AS Library + Library zur Amtssignatur fuer elektronische Aktenfuehrung - - - - false - src/main/resources - - **/package.html - - - - - ${project.artifactId}-${project.version} + pdf-as-${project.version} - - maven-resources-plugin - - UTF-8 - - - - - maven-site-plugin - - en - - - maven-compiler-plugin - 1.4 - 1.4 at/gv/egiz/pdfas/test/*/ demo/*/ @@ -139,23 +33,6 @@ - - maven-assembly-plugin - - - - src/main/assembly/assemble_distribution_cl.xml - src/main/assembly/assemble_repository.xml - - - - maven-jar-plugin @@ -176,33 +53,6 @@ - - maven-javadoc-plugin - - true - true - true - - http://download.oracle.com/javase/1.4.2/docs/api/ - http://logging.apache.org/log4j/docs/api/ - - 1.4 - 1.4 - false - true - ${project.name} v${project.version} API - - - - todo - a - To Do: - - - 512m - - - @@ -212,151 +62,125 @@ commons-codec commons-codec - 1.3 log4j log4j - 1.2.13 lucene lucene - 1.4.3 lucene lucene-demos - 1.4.3 junit junit - 3.8 xerces xercesImpl - 2.7.1 commons-io commons-io - 1.1 axis axis - 1.0 axis axis-saaj - 1.0 axis axis-wsdl4j - 1.0 axis axis-jaxrpc - 1.0 commons-httpclient commons-httpclient - 3.0 commons-discovery commons-discovery - 0.2 - + iaik iaik_jce_eval_signed - 4.0 iaik iaik_ecc_eval_signed - 2.19 - + commons-lang commons-lang - 2.3 + com.lowagie itext-2.1.5-rev3628-pdfas - 1.1 - - + + pdfbox pdfbox-0.7.2-pdfas - 1.1 - + - org.apache.pdfbox - pdfbox - 0.8.0-incubating + org.apache.pdfbox + pdfbox - + ognl ognl - 2.6.9 - - - - javax.servlet - servlet-api - 2.4 - runtime com.google.zxing core - 1.6-SNAPSHOT + jdk14 - + com.google.zxing javase - 1.6-SNAPSHOT + jdk14 - + 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 @@ - - - - distribution_brz - - zip - - true - - - - false - runtime - lib - - *:${project.artifactId}:jar - - - - - - - src/main/distribution/brz/pdf-as.bat - - true - - - - - target - - - ${project.build.finalName}.jar - - - - dok - doc - - *.pdf - - - - 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 @@ - - - - distribution_cl - - zip - - pdf-as - true - - - false - runtime - lib - - *:${project.artifactId}:jar - - - - - - src/main/distribution/cl - true - - - *.bat - *.sh - - - - target - - - ${project.build.finalName}.jar - - - - dok/Anwendungsbeschreibung - doc - - PDF-AS-${project.version}-Anwendungsbeschreibung.pdf - - - - dok/Anwendungsbeschreibung/Platzhalter-Beispiele - doc/Platzhalter-Beispiele - - *.jpg - - - - dok/Konfiguration - doc - - *.pdf - - - - dok/Spezifikation/Spezifikation-Layout-Amtssignatur-las-v1.4.0 - doc - - Spezifikation-Layout-Amtssignatur-las-v1.4.0.pdf - - - - 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 @@ - - - - distribution-ws - - zip - - false - - - distribution/tomcat/tomcat-5.5.20-standalone - /pdf-as-ws/tomcat - - **/* - - - .svn - - - - distribution/jdk/1.5.0_06/ - /pdf-as-ws/jsdk - - **/* - - - .svn - - - - webapp - /pdf-as-ws/tomcat/webapps/pdf-as - - **/* - - - .svn - - - - target - /pdf-as-ws/tomcat/webapps/pdf-as/WEB-INF/lib - - pdf-as*.jar - - - .svn - - - - distribution/cfg - /pdf-as-ws/tomcat/conf/pdf-as/cfg - - *.properties - - - .svn - - - - distribution/tomcat - /pdf-as-ws/tomcat/conf/catalina/localhost - - pdf-as.xml - - - .svn - - - - - distribution/certificates - /pdf-as-ws/tomcat/conf/pdf-as/certificates - - **/* - - - .svn - - - - distribution/pdfastmp - /pdf-as-ws/tomcat/conf/pdf-as/pdfastmp - - **/* - - - .svn - - - - distribution/images - /pdf-as-ws/tomcat/conf/pdf-as/images - - **/* - - - .svn - - - - work/templates - /pdf-as-ws/tomcat/conf/pdf-as/templates - - **/* - - - .svn - - - - work/licenses - /pdf-as-ws/tomcat/conf/pdf-as/licenses - - **/* - - - .svn - - - - - distribution/moaspss/moa-spss-1.4.2beta1 - /pdf-as-ws/tomcat/webapps - - moa-spss.war - - - .svn - - - - distribution/moaspss/moa-spss-1.4.2beta1/conf - /pdf-as-ws/tomcat/conf - - **/* - - - .svn - - - - distribution/moaspss/moa-spss-1.4.2beta1/endorsed - /pdf-as-ws/tomcat/common/endorsed - - **/* - - - .svn - - - - distribution/moaspss/moa-spss-1.4.2beta1/ext - /pdf-as-ws/tomcat/common/lib - - **/* - - - .svn - - - - - - distribution/tomcat - /pdf-as-ws/tomcat - - startTomcat.bat - stopTomcat.bat - favicon.ico - - - - distribution/ - /pdf-as-ws/tomcat - - Starten PDF-Amtssignatur.bat - Beenden PDF-Amtssignatur.bat - - - - - - - - false - runtime - /pdf-as-ws/tomcat/webapps/pdf-as/WEB-INF/lib - - - 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 @@ - - - - libraries - - dir - - false - - - false - compile - / - - - 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 @@ - - - - maven2-repository - - zip - - false - - - - - false - / - - - - - 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/main/distribution/cl/pdf-as.bat b/pdf-as-lib/src/main/distribution/cl/pdf-as.bat deleted file mode 100644 index 0cadb9a..0000000 --- a/pdf-as-lib/src/main/distribution/cl/pdf-as.bat +++ /dev/null @@ -1,8 +0,0 @@ -@echo off - -rem Deploys embedded default configuration to USER_HOME/PDF-AS. -rem Note: Configuration is not deployed if it already exists. -java -jar ${project.build.finalName}.jar -ddc - -rem Start commandline -java -Xms128m -Xmx786m -XX:MaxPermSize=256m -jar ${project.build.finalName}.jar %* diff --git a/pdf-as-lib/src/main/distribution/cl/pdf-as.sh b/pdf-as-lib/src/main/distribution/cl/pdf-as.sh deleted file mode 100644 index f47bc5f..0000000 --- a/pdf-as-lib/src/main/distribution/cl/pdf-as.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -# Deploys embedded default configuration to USER_HOME/PDF-AS. -# Note: Configuration is not deployed if it already exists. -java -jar ${project.build.finalName}.jar -ddc - -# Start commandline -java -Xms128m -Xmx786m -XX:MaxPermSize=256m -jar ${project.build.finalName}.jar $@ diff --git a/pdf-as-lib/src/main/distribution/cl/sign.bat b/pdf-as-lib/src/main/distribution/cl/sign.bat deleted file mode 100644 index e25213b..0000000 --- a/pdf-as-lib/src/main/distribution/cl/sign.bat +++ /dev/null @@ -1 +0,0 @@ -call pdf-as.bat -mode sign -sigmode textual -connector bku %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/pdf-as-lib/src/main/distribution/cl/sign.sh b/pdf-as-lib/src/main/distribution/cl/sign.sh deleted file mode 100644 index 410b3fe..0000000 --- a/pdf-as-lib/src/main/distribution/cl/sign.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -./pdf-as.sh -mode sign -sigmode textual -connector bku $@ 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 @@ - - - - - Release History - - - - - - - - Catching OutOfMemory exceptions, returning appropriate error message/code - Binary signature: bug concerning indirect pdf objects fixed - Maven2-repository updated - pdfbox/itext projects converted to maven2 projects - pdfbox/itext maven2 artifact renamed and version added (see .pom) - old pdfbox/itext libraries removed - SignaturePositioning improved (Signature position can be declared by String which is parsed) - Some more error codes (Out of memory, Invalid signature position) - iText utility for creation of pdf files added - ConfigUtils updated (destination of configuration to be extracted can now be chosen) - PDFASUtils updated (more tools) - WebApplication: Freetext pdf creation implemented - WebApplication: XSS security updates - - - - Support for PDF signature handler. - Protection of signed documents against inadvertently modification. - Revision of configuration (backwards compatibility assured). - Minor bug concerning table format configuration fixed. - Support of arbitrary signature/hash algorithms (ACOS04/G3). - Evaluation of pdf documents for non-textual objects added. - Support for BAIK signatures. - Many minor bugfixes. - - - - WebApplication: Incompatibility to Tomcat 6.x removed. (Now quoting taglib expressions with nested scriptlets.) - - - - Bug concerning text matching algorithm fixed. - - - - Web application bug concerning text reconstruction from form fixed. - - - - New signature layout for new MOCCA bku integrated (etsi-moc-1.1). - New architecture implemented that allows different signature layouts for single types of bkus. - - - - Layout for webapplication adjusted for IE. - - - - Build script for command line version updated. - JavaDoc fixes. - Some updates for debugging messages. - Parser for MOCCA-CreateXMLSignatureResponses enhanced. - Many updates and fixes for the external web app interface. - New profile for invisible signatures added. - - - - Examples for the help screen of the commandline version corrected. - - - - Minor updates for commandline invokation. - Restored compatibility for old PdfAS.commandline(...) method invokation. This method is used by external tools (Open Office plugin for instance.) - Some more log messages (e.g. encoding related issues). - Updating web application (in external invocation mode) enhancing support for being used within an iframe. - - 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"). - - Formatter for mocca signature params enhanced. - - - - Added signatureKeyIdentifier to SignParameters in the API, which allows to override the one specified in the profile (MOA Connector only). - Added maven assembly and batch file for BRZ distribution. - Corrected faulty mime-type argument checking in SignResult constructor. - - - - Switching to itext-2.1.5-rev3628. (itext-1.4.x is regarded as deprecated.) - itext library: minor adjustments for pdf-as - Adding new error code (103) for invalid pdfa/1b font configuration. - Minor updates for PDF/A support. - Support for local MOCCA CCS added. - - - - Multi language for web application. - Encoding issue for web application fixed by implementing an EncodingFilter. - Dynamic sign upload form implemented. - Order of input fields for dynamic upload form changed. - MOCCA logo added to sign upload form. - - - - lib-folder removed. - Maven2-repository updated. - Adding external patched itext (1.4.2 and 2.1.5) and pdfbox libraries. - Removing iText and pdfbox from sources. - Cleaning up certstore removing all certificates except MOA-certificates. - Removing deprecated templates. - Correcting default.bku.sign.detached.xml according to Security Layer spec. - - Adding DejaVuFont. - Adding DejaVuFont license. - Adding test file for PDF/A. Removing issues.txt. - Preparation for multilingual support for web application. - Minor updates of configuration. - Sitemesh updates. - Minor support for TrueType fonts in preparation for PDF/A added. - - - - Deprecated webapp-folder removed from svn repository. - New DefaultConfiguration.zip integrated in order to allow mocca signatures. - Minor bug concerning choice of cce within the web application fixed. - - - - Signature with new online bku MOCCA integrated (new signature device "moc" created). - Configuration keys for mocca added. - New error codes (371 = signature verification not supported by this connector, 372 = invalid signing time) introduced. - 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. - Bugfix: Correct extraction of signatures with wrong signing times implemented. (The order of the signatures is still invalid in case of false signing times.) - 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. - Download of signed pdf-file for external application interface adjusted. - Verification of mocca signed documents implemented. - Retrieval of xml response via multipart implemented (mocca strictly follows security layer spec) - - - - Parsing of PublicAuthority-Flag and PublicAuthority-Code from MOA-VerifyXMLSignatureResponses implemented. - - - - APIDemo updated. - (default) configuration updated regarding new configuration keys. - Many printStackTraces replaces with logger-messages. - Update concerting exclusion of minimal layout profiles for verification. - - 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. - - - - - Configurable line break tolerance for binary signatures (line_break_tolerance). - The reserved space for a certificate withing the egiz dictionary can be configured (...phlength.certificate=xxxx). - imagescaletofit configuration parameter introduced. - - - - Detection of incremental updates updated. - Bug fixed. There was an error concerning empty HashInputData parsing a MOA CreateXMLSignatureResponse. - Demo source for API usage created. - Issue resolved: Prevent signature of empty document which leads to a meaningless error message from the bku. - - - - 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. - - - - 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!!! - - - - Manual deployment of pdf-as configuration (commandline parameter -ddc) considers the system property pdf-as.work-dir. - Internal default configuration updated. - log4.properties within the workdir is now being considered using the api. - - - - - Support of a minimal signature mark layout for binary signatures added. - - - Web-Application: Every hardcoded context "pdf-as" has been replaced. - - - Web-Application: Session is now being invalidated after download of the signed pdf file. - - - Web-Application: Configuration may be declared via system property "pdf-as.work-dir" or via Servlet-Init-Parameter "work-dir". - - - Bug fixed in RetrieveSignatureDataServlet: Response header didn't contain a content length attribute. The ITS Mac BKU rejects those requests. - - - 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). - - - 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. - - - If the configuration is explicitely given than the temporary folder is located within the given directory otherwise within the user's temporary directory. - - - Declaring the configuration folder, replacements for system properties like "${catalina.base}/conf/pdfas" may be used. - - - - - - 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. - - - 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. - - - PDF-AS library version is logged in order to lighten - bugfixing. - - - - - - 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ + + + + 4.0.0 + + + at.gv.egiz + pdf-as + 3.3-SNAPSHOT + + + pom + + pdf-as-release + PDF-AS Release + Release zur Amtssignatur fuer elektronische Aktenfuehrung + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + make-assembly + package + + single + + + + + + src/main/assembly/release.xml + + false + + + + + + + + + + + at.gv.egiz + pdf-as-lib + + + + at.gv.egiz + pdf-as-web + + + + at.gv.egiz + pdf-as-cli + + + + + 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 @@ + + + + + release + + + dir + + + false + + + + true + + at.gv.egiz:pdf-as-lib + at.gv.egiz:pdf-as-web + + + false + + false + + + + + + + + ../pdf-as-cli/target + + *.zip + + + + + + + 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 Binary files a/pdf-as-web/maven2-repository/maven2-repository.zip and /dev/null 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 @@ + 4.0.0 + + at.gv.egiz + pdf-as + 3.3-SNAPSHOT + + war - at.gv.egiz pdf-as-web - PDF-AS-WEB - 3.2 - + PDF-AS Web Webapplikation zur Amtssignatur fuer elektronische Aktenfuehrung - http://egovlabs.gv.at/projects/pdf-as - 2006 - - - - - wlackner - Wilfried Lackner - wlackner@iicm.edu - KnowCenter - - developer - - +1 - - - - wprinz - Wolfgang Prinz - w.prinz@netconomy.net - Netconomy - - developer - - +1 - - - - tknall - Thomas Knall - thomas.knall@egiz.gv.at - EGIZ - - developer - - +1 - - - - tzefferer - Thomas Zefferer - thomas.zefferer@egiz.gv.at - EGIZ - - developer - - +1 - - - - gfliess - Gerhard Fliess - XiCrypt - - developer - - +1 - - - - amavriqi - Arian Mavriqi - amavriqi@iicm.edu - KnowCenter - - developer - - +1 - - - - - - - false - src/main/resources - - **/package.html - - - - - - pdf-as - - - - - maven-resources-plugin - - UTF-8 - - - - - maven-site-plugin - - en - - - - - maven-compiler-plugin - - 1.4 - 1.4 - - at/gv/egiz/pdfas/test/*/ - demo/*/ - - - - - - maven-assembly-plugin - - - src/main/assembly/assemble_repository.xml - - - - - - maven-javadoc-plugin - - true - true - true - - http://java.sun.com/j2se/1.4.2/docs/api/ - http://java.sun.com/j2ee/1.4/docs/api/ - http://logging.apache.org/log4j/docs/api/ - - 1.4 - 1.4 - false - true - ${project.name} v${project.version} API - - - - todo - a - To Do: - - - 512m - - - - + pdf-as-${project.version} - knowcenter - pdf-as - 3.2 + at.gv.egiz + pdf-as-lib - + javax.servlet servlet-api - 2.4 provided commons-fileupload commons-fileupload - 1.1 opensymphony sitemesh - 2.3 javax.servlet jstl - 1.1.2 + taglibs standard - 1.1.2 + net.htmlparser.jericho jericho-html 3.2 + 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 @@ - - - - maven2-repository - - zip - - false - - - - - false - / - - - - - diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..337d41f --- /dev/null +++ b/pom.xml @@ -0,0 +1,355 @@ + + + + 4.0.0 + + at.gv.egiz + pdf-as + 3.3-SNAPSHOT + + pom + + PDF-AS + Amtssignatur fuer elektronische Aktenfuehrung + https://joinup.ec.europa.eu/software/pdf-as/description + + + + + + + UTF-8 + UTF-8 + + + 1.5 + 1.5 + + + + + pdf-as-lib + pdf-as-web + pdf-as-cli + pdf-as-release + + + + + + + + + + maven-javadoc-plugin + 2.9 + + true + true + true + + http://docs.oracle.com/javase/1.5.0/docs/api/ + http://logging.apache.org/log4j/docs/api/ + + ${java.compiler.source} + ${java.compiler.target} + false + true + ${project.build.sourceEncoding} + ${project.name} v${project.version} + + + todo + a + To do: + + + 512m + + + + + maven-resources-plugin + 2.6 + + ${project.build.sourceEncoding} + + + + + maven-assembly-plugin + 2.4 + + + + maven-source-plugin + 2.2.1 + + + + maven-compiler-plugin + 3.0 + + ${project.build.sourceEncoding} + ${java.compiler.source} + ${java.compiler.target} + + + false + + + + + maven-jar-plugin + 2.4 + + + + maven-surefire-plugin + 2.13 + + true + + + + + maven-war-plugin + 2.3 + + + + + + + + + + + + + + at.gv.egiz + pdf-as-lib + ${project.version} + + + + at.gv.egiz + pdf-as-web + ${project.version} + + + + at.gv.egiz + pdf-as-cli + ${project.version} + + + + commons-codec + commons-codec + 1.3 + + + + log4j + log4j + 1.2.13 + + + + lucene + lucene + 1.4.3 + + + + lucene + lucene-demos + 1.4.3 + + + + junit + junit + 4.11 + test + + + + xerces + xercesImpl + 2.7.1 + + + + commons-io + commons-io + 1.1 + + + + axis + axis + 1.0 + + + + axis + axis-saaj + 1.0 + + + + axis + axis-wsdl4j + 1.0 + + + + axis + axis-jaxrpc + 1.0 + + + + commons-httpclient + commons-httpclient + 3.0 + + + + commons-discovery + commons-discovery + 0.2 + + + + iaik + iaik_jce_eval_signed + 4.0 + + + + iaik + iaik_ecc_eval_signed + 2.19 + + + + commons-lang + commons-lang + 2.3 + + + + + xml-apis + xml-apis + 1.3.02 + + + + + com.lowagie + itext-2.1.5-rev3628-pdfas + 1.1 + + + + + pdfbox + pdfbox-0.7.2-pdfas + 1.1 + + + + org.apache.pdfbox + pdfbox + 0.8.0-incubating + + + + ognl + ognl + 2.6.9 + + + + javax.servlet + servlet-api + 2.4 + provided + + + + com.google.zxing + core + 1.6 + jdk14 + + + + com.google.zxing + javase + 1.6 + jdk14 + + + + commons-fileupload + commons-fileupload + 1.1 + + + + + opensymphony + sitemesh + 2.3 + + + + + javax.servlet + jstl + 1.1.2 + + + + taglibs + standard + 1.1.2 + + + + + net.htmlparser.jericho + jericho-html + 3.2 + + + + + + + + + + + junit + junit + test + + + + + 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. - -- cgit v1.2.3