Merge dev-master into cgi-pre-release

Signed-off-by: Indrek Jentson <[email protected]>

.gitignore

@@ -1,11 +1,14 @@
-build
-target
-javadoc
+/build
+/target
 .idea/workspace.xml
 .idea/uiDesigner.xml
 .idea/dictionaries/xp.xml
 .idea/libraries
 *.log
-utility-package-lib
-zip-package-lib
+/utility-package-lib
+/zip-package-lib
 /buildNumber.properties
+/Old*
+/logback.xml
+!/src/main/etc/logback.xml
+/lib

AUTHORS

@@ -6,5 +6,7 @@ Developers:
   Rainer Villido <[email protected]>
   Allan Juhanson <[email protected]>
   Andrei Smirnov <[email protected]>
-                                         Indrek Jentson <[email protected]>
-                                         Margus Kamlat <[email protected]>
+  Indrek Jentson <[email protected]>
+  Margus Kamlat <[email protected]>
+  Priit Serk <[email protected]>
+  Janar Rahumeel <[email protected]>

README.md

@@ -1,4 +1,4 @@
-![EU Regional Development Fund](doc/resources/EL_Regionaalarengu_Fond_horisontaalne-vaike.jpg)
+![EU Regional Development Fund](src/main/doc/resources/EL_Regionaalarengu_Fond_horisontaalne-vaike.jpg)
 
 
 # DigiDoc4j

RELEASE-NOTES.txt

@@ -1,4 +1,43 @@
 DigiDoc4J Java library release notes
+------------------------------------
+Release 2.0.0.RC.1
+------------------
+Summary of the major changes since 1.0.8.beta.2
+------------------------------------------
+* Start of using semantic versioning (1.0.8 --> 2.0.0)
+* Fixed validation of containers where mime type has wrong format.
+* Added check that at least one data file is present before signing.
+* Ensured that SignaturePolicyImplied element is not allowed in TM signatures.
+
+Release 1.0.8.beta.2
+------------------
+Summary of the major changes since 1.0.8.beta.1
+------------------------------------------
+* Fixed signing with ID-card and using PKCS11SignatureToken when encryption algorithm is ECDSA and RSA.
+
+------------------------------------------
+Release 1.0.8.beta.1
+------------------
+Summary of the major changes since 1.0.7.2
+------------------------------------------
+* Started to use DSS version 5.1 (sd-dss.5.1.d4j.5).
+* Added support for removing signature from container.
+* Added support for creating, timestamping and validating the ASiCS containers.
+* Added support for validating PADES containers (PDF-files with signature).
+* Major refactoring of code
+  - classes from package org.digidoc4j.impl.bdoc are now in org.digidoc4j.impl.asic.asice.bdoc;
+  - the common functionality for ASiCE, ASiCS and BDOC are in package org.digidoc4j.impl.asic;
+  - the common functionality for ASiCE and BDOC are in package org.digidoc4j.impl.asic.asice;
+  - method DataToSign.getDigestToSign() is renamed to DataToSign.getDataToSign().
+* Added new API methods for accessing signature validation details.
+* Added support for BDOC validation warning when SHA-1 is used.
+* Documentation (github wiki, javadoc in github) is updated.
+
+Known issues
+------------
+* Signing with ID-card and using PKCS11SignatureToken class have still a problem
+when encryption algorithm is ECDSA. We are working on it.
+
 ------------------------------------
 Release 1.0.7.2
 ------------------

digidoc4j.iml

@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
-    <output url="file://$MODULE_DIR$/build" />
+    <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/conf" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/keystore" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/testFiles" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
-      <excludeFolder url="file://$MODULE_DIR$/utility-package-lib" />
-      <excludeFolder url="file://$MODULE_DIR$/zip-package-lib" />
     </content>
     <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -27,7 +24,7 @@
     <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.santuario:xmlsec:2.0.8" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.santuario:xmlsec:2.0.9" level="project" />
     <orderEntry type="library" name="Maven: org.bouncycastle:bcmail-jdk15on:1.54" level="project" />
     <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.54" level="project" />
     <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.54" level="project" />
@@ -57,31 +54,34 @@
     <orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.8" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.8" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.8" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.pdfbox:pdfbox:2.0.8" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.pdfbox:fontbox:2.0.8" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.json:json:20160810" level="project" />
     <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
-    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-common-validation-jaxb:5.0.d4j.5" level="project" />
-    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-detailed-report-jaxb:5.0.d4j.5" level="project" />
-    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-diagnostic-jaxb:5.0.d4j.5" level="project" />
-    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-document:5.0.d4j.5" level="project" />
-    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-model:5.0.d4j.5" level="project" />
-    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-policy-jaxb:5.0.d4j.5" level="project" />
-    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-reports:5.0.d4j.5" level="project" />
-    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-service:5.0.d4j.5" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.22" level="project" />
-    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-simple-report-jaxb:5.0.d4j.5" level="project" />
-    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-spi:5.0.d4j.5" level="project" />
-    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-token:5.0.d4j.5" level="project" />
-    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-tsl-jaxb:5.0.d4j.5" level="project" />
-    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-tsl-validation:5.0.d4j.5" level="project" />
-    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-xades:5.0.d4j.5" level="project" />
-    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-cades:5.0.d4j.5" level="project" />
-    <orderEntry type="library" name="Maven: org.digidoc4j.dss:validation-policy:5.0.d4j.5" level="project" />
-    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-asic-common:5.0.d4j.5" level="project" />
-    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-asic-cades:5.0.d4j.5" level="project" />
-    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-asic-xades:5.0.d4j.5" level="project" />
-    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-utils:5.0.d4j.5" level="project" />
-    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-utils-apache-commons:5.0.d4j.5" level="project" />
-    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-utils-google-guava:5.0.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-common-validation-jaxb:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-detailed-report-jaxb:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-diagnostic-jaxb:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-document:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-model:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-policy-jaxb:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-reports:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-service:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-simple-report-jaxb:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-spi:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-token:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-tsl-jaxb:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-tsl-validation:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-xades:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-cades:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:validation-policy:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-asic-common:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-asic-cades:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-asic-xades:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-pades:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-utils:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-utils-apache-commons:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-utils-google-guava:5.1.d4j.5" level="project" />
   </component>
 </module>