Permalink
Browse files

Nortal Digidoc4J fixes

Updated readme and authors files. Added .idea directory to ignored files list

cleaned up project

changed file name

Changed revison for sd-dss

Merged nortal/sk changes into publish

Project files clean up

Update travis setup

Changed branch for submodules

Added before script to run

Changed script to install

Updated travis build to update dss libs

Fixed ant test task build path

Bring down unit test log output verbosity

Added missing file to test-tsl

Added more missing files and renamed one

Added open JDK to build

Removed unwanted files
  • Loading branch information...
mihkels committed Feb 26, 2015
1 parent 5828226 commit b8a5de4c2a6a6a5cfa7077fbb1d115d514083729
Showing with 17,913 additions and 1,218 deletions.
  1. +17 −0 .classpath
  2. +11 −2 .gitignore
  3. +1 −1 .gitmodules
  4. +0 −11 .idea/ant.xml
  5. +8 −0 .idea/artifacts/dss_demo_webapp_war.xml
  6. +104 −0 .idea/artifacts/dss_demo_webapp_war_exploded.xml
  7. +1 −8 .idea/checkstyle-idea.xml
  8. +0 −14 .idea/codeStyleSettings.xml
  9. +15 −2 .idea/compiler.xml
  10. +0 −21 .idea/dictionaries/ahoa.xml
  11. +255 −0 .idea/digidoc4j.iml
  12. +9 −2 .idea/encodings.xml
  13. +0 −13 .idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_1_13.xml
  14. +0 −13 .idea/libraries/Maven__javax_activation_activation_1_1.xml
  15. +0 −13 .idea/libraries/Maven__javax_xml_bind_jaxb_api_2_1.xml
  16. +13 −0 .idea/libraries/Maven__junit_junit_4_12.xml
  17. +0 −13 .idea/libraries/Maven__org_apache_directory_api_api_ldap_client_all_1_0_0_M22.xml
  18. +0 −13 .idea/libraries/Maven__org_apache_pdfbox_fontbox_1_8_7.xml
  19. +0 −13 .idea/libraries/Maven__org_apache_pdfbox_jempbox_1_8_7.xml
  20. +0 −13 .idea/libraries/Maven__org_apache_pdfbox_pdfbox_1_8_7.xml
  21. +0 −13 .idea/libraries/Maven__org_apache_santuario_xmlsec_2_0_1.xml
  22. +0 −13 .idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_asl_4_4_0.xml
  23. +13 −0 .idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
  24. +0 −11 .idea/libraries/commons_compress_1_3.xml
  25. +0 −9 .idea/libraries/commons_compress_1_3__2_.xml
  26. +0 −9 .idea/libraries/commons_io_2_4.xml
  27. +0 −13 .idea/libraries/hamcrest_core_1_3.xml
  28. +0 −9 .idea/libraries/jdigidoc_3_10_1424_BETA.xml
  29. +0 −13 .idea/libraries/slf4j_api_1_7_7.xml
  30. +0 −9 .idea/libraries/system_rules_1_5_0.xml
  31. +0 −9 .idea/libraries/testcerts.xml
  32. +78 −51 .idea/misc.xml
  33. +7 −8 .idea/modules.xml
  34. +0 −433 .idea/qaplug_profiles.xml
  35. +7 −0 .idea/rebel_project.xml
  36. +0 −5 .idea/scopes/scope_settings.xml
  37. +0 −125 .idea/uiDesigner.xml
  38. +1 −4 .idea/vcs.xml
  39. +24 −0 .project
  40. +2 −0 .settings/org.apache.ivyde.eclipse.prefs
  41. +2 −0 .settings/org.eclipse.core.resources.prefs
  42. +306 −0 .settings/org.eclipse.jdt.core.prefs
  43. +7 −0 .settings/org.eclipse.jdt.ui.prefs
  44. +4 −0 .settings/org.eclipse.wst.common.project.facet.core.xml
  45. +28 −0 .travis.yml
  46. +3 −1 AUTHORS
  47. +58 −0 README.md
  48. +0 −13 README.txt
  49. +106 −0 build-ivy.xml
  50. +12 −4 build.xml
  51. +14 −14 conf/constraint.xml
  52. +4 −4 conf/test_constraint.xml
  53. +4 −4 conf/test_constraint_SigningTimeCreationTimeDeltaIs27H.xml
  54. 0 create_release.sh
  55. +205 −58 digidoc4j.iml
  56. 0 digidoc4j.sh
  57. +4 −6 dss-common.iml
  58. +3 −36 dss-document.iml
  59. +0 −48 dss-service.iml
  60. +2 −38 dss-spi.iml
  61. +7 −0 lib/.gitignore
  62. BIN lib/{dss-common-4.3.0-RC.jar → dss-common-4.3.0.w09-2-SNAPSHOT.jar}
  63. BIN lib/dss-document-4.3.0-RC.jar
  64. BIN lib/dss-document-4.3.0.w09-2-SNAPSHOT.jar
  65. BIN lib/dss-service-4.3.0-RC.jar
  66. BIN lib/dss-service-4.3.0.w09-2-SNAPSHOT.jar
  67. BIN lib/dss-spi-4.3.0-RC.jar
  68. BIN lib/dss-spi-4.3.0.w09-2-SNAPSHOT.jar
  69. 0 make_util.sh
  70. +0 −40 resources/logback.xml
  71. +4 −4 resources/moved_constraint.xml
  72. +1 −1 sd-dss
  73. +2 −7 src/eu/europa/ec/markt/dss/validation102853/ocsp/BDocTMOcspSource.java
  74. +5 −9 src/eu/europa/ec/markt/dss/validation102853/ocsp/BDocTSOcspSource.java
  75. +25 −10 src/eu/europa/ec/markt/dss/validation102853/ocsp/SKOnlineOCSPSource.java
  76. +16 −0 src/org/digidoc4j/Container.java
  77. +9 −0 src/org/digidoc4j/exceptions/CertificateRevokedException.java
  78. +13 −0 src/org/digidoc4j/exceptions/DigiDoc4JException.java
  79. +4 −0 src/org/digidoc4j/exceptions/OCSPRequestFailedException.java
  80. +21 −7 src/org/digidoc4j/impl/BDocContainer.java
  81. +13 −0 src/org/digidoc4j/impl/DDocContainer.java
  82. +31 −4 src/org/digidoc4j/impl/ManifestValidator.java
  83. +1 −0 test-tsl/EE_T.sha2
  84. +1 −0 test-tsl/trusted-test-mp.sha2
  85. 0 test-tsl/trusted-test-mp.xml
  86. +22 −0 test/log4j.xml
  87. +3 −5 test/org/digidoc4j/ConfigurationTest.java
  88. +76 −18 test/org/digidoc4j/impl/BDocContainerTest.java
  89. +35 −0 test/org/digidoc4j/impl/UriEncodingTest.java
  90. +1 −0 test/org/digidoc4j/main/DigiDoc4JTest.java
  91. +113 −0 test/org/digidoc4j/testutils/ApacheWireDecoder.java
  92. +114 −0 test/org/digidoc4j/testutils/ApacheWireDecoderTest.java
  93. +72 −0 test/org/digidoc4j/utils/AbstractSigningTests.java
  94. +15,921 −0 test/org/digidoc4j/utils/CertificatesForTests.java
  95. +29 −0 test/org/digidoc4j/utils/MultiSignatureThreadSafetyTest.java
  96. BIN testFiles/20167000013.p12
  97. BIN testFiles/ValidHashcode.bdoc
  98. BIN testFiles/ValidHashcodeUnsigned.bdoc
  99. BIN testFiles/expired_signer.p12
  100. BIN testFiles/hashcode.bdoc
  101. BIN testFiles/hashcodeUnsigned.bdoc
  102. +14 −0 testFiles/logback.xml
  103. BIN testFiles/ocsp_juurdepaasutoend.p12d
  104. BIN testFiles/special-char-files/dds_SK.jpg
  105. BIN testFiles/special-char-files/dds_acrobat.pdf
  106. +32 −0 testFiles/special-char-files/dds_dds_JÜRIÖÖ € žŠ päev.txt
  107. BIN testFiles/special-char-files/dds_pakitud.zip
  108. BIN testFiles/special-char-files/dds_колючей стерне.docx
  109. +0 −1 testFiles/test_õäöü.txt
View
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="resources"/>
<classpathentry kind="src" path="test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=digidoc4j_development_codeborne&amp;ivyXmlPath=ivy.xml&amp;confs=*"/>
<classpathentry kind="lib" path="lib/dss-common-4.3.0-RC.jar"/>
<classpathentry kind="lib" path="lib/dss-document-4.3.0-RC.jar" sourcepath="/dss-document"/>
<classpathentry kind="lib" path="lib/dss-service-4.3.0-RC.jar"/>
<classpathentry kind="lib" path="lib/dss-spi-4.3.0-RC.jar"/>
<classpathentry kind="lib" path="lib/jacocoagent.jar"/>
<classpathentry kind="lib" path="lib/jacocoant.jar"/>
<classpathentry kind="lib" path="lib/jdigidoc-3.10.1424.BETA.jar"/>
<classpathentry kind="lib" path="lib/testcerts.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
View
@@ -5,11 +5,20 @@
/coverage
/dist
/.idea/workspace.xml
/.idea/uiDesigner.xml
/tmp
/.idea/dictionaries/xp.xml
digidoc4j.iml
*.log
password.properties
copy-dss-jars.sh
/util
token
token
/bin
container.bin
createsECCSignature.bdoc
extractSignatureThrowsErrorWhenSignatureIsNotFound.zip
packaging_jar/
setsSignatureId.bdoc
setsSignatureId.ddoc
View
@@ -1,4 +1,4 @@
[submodule "sd-dss"]
path = sd-dss
url = ../sd-dss.git
branch = publish
View

This file was deleted.

Oops, something went wrong.
@@ -0,0 +1,8 @@
<component name="ArtifactManager">
<artifact type="war" name="dss-demo-webapp:war">
<output-path>$PROJECT_DIR$/sd-dss/apps/dss/demo/dss-demo-webapp/target</output-path>
<root id="archive" name="dss-demo-webapp-4.3.0.w09-2-SNAPSHOT.war">
<element id="artifact" artifact-name="dss-demo-webapp:war exploded" />
</root>
</artifact>
</component>
@@ -0,0 +1,104 @@
<component name="ArtifactManager">
<artifact type="exploded-war" name="dss-demo-webapp:war exploded">
<output-path>$PROJECT_DIR$/sd-dss/apps/dss/demo/dss-demo-webapp/target/dss-demo-webapp-4.3.0.w09-2-SNAPSHOT</output-path>
<root id="root">
<element id="directory" name="WEB-INF">
<element id="directory" name="classes">
<element id="module-output" name="dss-demo-webapp" />
</element>
<element id="directory" name="lib">
<element id="library" level="project" name="Maven: org.springframework:spring-beans:4.1.4.RELEASE" />
<element id="library" level="project" name="Maven: org.springframework:spring-core:4.1.4.RELEASE" />
<element id="library" level="project" name="Maven: org.springframework:spring-web:4.1.4.RELEASE" />
<element id="library" level="project" name="Maven: org.springframework:spring-context:4.1.4.RELEASE" />
<element id="library" level="project" name="Maven: org.springframework:spring-webmvc:4.1.4.RELEASE" />
<element id="library" level="project" name="Maven: org.springframework:spring-expression:4.1.4.RELEASE" />
<element id="library" level="project" name="Maven: org.springframework:spring-orm:4.1.4.RELEASE" />
<element id="library" level="project" name="Maven: org.springframework:spring-tx:4.1.4.RELEASE" />
<element id="library" level="project" name="Maven: org.springframework:spring-aop:4.1.4.RELEASE" />
<element id="library" level="project" name="Maven: aopalliance:aopalliance:1.0" />
<element id="archive" name="dss-document-4.3.0.w09-2-SNAPSHOT.jar">
<element id="module-output" name="dss-document" />
</element>
<element id="archive" name="dss-spi-4.3.0.w09-2-SNAPSHOT.jar">
<element id="module-output" name="dss-spi" />
</element>
<element id="archive" name="dss-common-4.3.0.w09-2-SNAPSHOT.jar">
<element id="module-output" name="dss-common" />
</element>
<element id="library" level="project" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.10-b140310.1920" />
<element id="library" level="project" name="Maven: org.bouncycastle:bcprov-jdk15on:1.51" />
<element id="library" level="project" name="Maven: org.bouncycastle:bcmail-jdk15on:1.51" />
<element id="library" level="project" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.51" />
<element id="library" level="project" name="Maven: org.apache.santuario:xmlsec:2.0.2" />
<element id="library" level="project" name="Maven: org.codehaus.woodstox:woodstox-core-asl:4.4.1" />
<element id="library" level="project" name="Maven: javax.xml.stream:stax-api:1.0-2" />
<element id="library" level="project" name="Maven: org.codehaus.woodstox:stax2-api:3.1.4" />
<element id="library" level="project" name="Maven: commons-codec:commons-codec:1.9" />
<element id="library" level="project" name="Maven: xerces:xercesImpl:2.11.0" />
<element id="library" level="project" name="Maven: xml-apis:xml-apis:1.4.01" />
<element id="library" level="project" name="Maven: org.apache.pdfbox:pdfbox:1.8.8" />
<element id="library" level="project" name="Maven: org.apache.pdfbox:fontbox:1.8.8" />
<element id="library" level="project" name="Maven: org.apache.pdfbox:jempbox:1.8.8" />
<element id="library" level="project" name="Maven: commons-lang:commons-lang:2.6" />
<element id="archive" name="dss-service-4.3.0.w09-2-SNAPSHOT.jar">
<element id="module-output" name="dss-service" />
</element>
<element id="library" level="project" name="Maven: xalan:xalan:2.7.1" />
<element id="library" level="project" name="Maven: xalan:serializer:2.7.1" />
<element id="library" level="project" name="Maven: org.springframework:spring-context-support:4.1.4.RELEASE" />
<element id="library" level="project" name="Maven: org.quartz-scheduler:quartz:2.2.1" />
<element id="library" level="project" name="Maven: c3p0:c3p0:0.9.1.1" />
<element id="library" level="project" name="Maven: org.hsqldb:hsqldb:1.8.0.10" />
<element id="library" level="project" name="Maven: org.springframework:spring-jdbc:4.1.4.RELEASE" />
<element id="archive" name="dss-webservices-4.3.0.w09-2-SNAPSHOT.jar">
<element id="module-output" name="dss-webservices" />
</element>
<element id="library" level="project" name="Maven: org.apache.cxf:cxf-rt-transports-http:3.0.3" />
<element id="library" level="project" name="Maven: org.apache.cxf:cxf-core:3.0.3" />
<element id="library" level="project" name="Maven: org.apache.ws.xmlschema:xmlschema-core:2.1.0" />
<element id="library" level="project" name="Maven: org.apache.cxf:cxf-rt-bindings-soap:3.0.3" />
<element id="library" level="project" name="Maven: org.apache.cxf:cxf-rt-wsdl:3.0.3" />
<element id="library" level="project" name="Maven: wsdl4j:wsdl4j:1.6.3" />
<element id="library" level="project" name="Maven: org.apache.cxf:cxf-rt-databinding-jaxb:3.0.3" />
<element id="library" level="project" name="Maven: com.sun.xml.bind:jaxb-core:2.1.14" />
<element id="library" level="project" name="Maven: javax.xml.bind:jaxb-api:2.1" />
<element id="library" level="project" name="Maven: javax.activation:activation:1.1" />
<element id="library" level="project" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxws:3.0.3" />
<element id="library" level="project" name="Maven: xml-resolver:xml-resolver:1.2" />
<element id="library" level="project" name="Maven: asm:asm:3.3.1" />
<element id="library" level="project" name="Maven: org.apache.cxf:cxf-rt-bindings-xml:3.0.3" />
<element id="library" level="project" name="Maven: org.apache.cxf:cxf-rt-frontend-simple:3.0.3" />
<element id="library" level="project" name="Maven: org.apache.cxf:cxf-rt-ws-addr:3.0.3" />
<element id="library" level="project" name="Maven: org.apache.cxf:cxf-rt-ws-policy:3.0.3" />
<element id="library" level="project" name="Maven: org.apache.neethi:neethi:3.0.3" />
<element id="library" level="project" name="Maven: javax.servlet:jstl:1.2" />
<element id="library" level="project" name="Maven: org.apache.tiles:tiles-api:2.2.2" />
<element id="library" level="project" name="Maven: org.apache.tiles:tiles-core:2.2.2" />
<element id="library" level="project" name="Maven: commons-digester:commons-digester:2.0" />
<element id="library" level="project" name="Maven: commons-beanutils:commons-beanutils:1.8.0" />
<element id="library" level="project" name="Maven: org.apache.tiles:tiles-jsp:2.2.2" />
<element id="library" level="project" name="Maven: org.apache.tiles:tiles-servlet:2.2.2" />
<element id="library" level="project" name="Maven: org.apache.tiles:tiles-template:2.2.2" />
<element id="library" level="project" name="Maven: log4j:log4j:1.2.17" />
<element id="library" level="project" name="Maven: org.slf4j:slf4j-api:1.6.6" />
<element id="library" level="project" name="Maven: org.slf4j:slf4j-log4j12:1.6.6" />
<element id="library" level="project" name="Maven: org.slf4j:jcl-over-slf4j:1.6.6" />
<element id="library" level="project" name="Maven: commons-dbcp:commons-dbcp:1.4" />
<element id="library" level="project" name="Maven: commons-pool:commons-pool:1.5.4" />
<element id="library" level="project" name="Maven: org.apache.httpcomponents:httpclient:4.3.5" />
<element id="library" level="project" name="Maven: org.apache.httpcomponents:httpcore:4.3.2" />
<element id="library" level="project" name="Maven: commons-logging:commons-logging:1.1.3" />
<element id="library" level="project" name="Maven: org.hibernate:hibernate-validator:5.0.1.Final" />
<element id="library" level="project" name="Maven: javax.validation:validation-api:1.1.0.Final" />
<element id="library" level="project" name="Maven: org.jboss.logging:jboss-logging:3.1.1.GA" />
<element id="library" level="project" name="Maven: com.fasterxml:classmate:0.8.0" />
</element>
</element>
<element id="directory" name="META-INF">
<element id="file-copy" path="$PROJECT_DIR$/sd-dss/apps/dss/demo/dss-demo-webapp/target/MANIFEST.MF" />
</element>
<element id="javaee-facet-resources" facet="dss-demo-webapp/web/Web" />
</root>
</artifact>
</component>
@@ -3,15 +3,8 @@
<component name="CheckStyle-IDEA">
<option name="configuration">
<map>
<entry key="active-configuration" value="PROJECT_RELATIVE:$PRJ_DIR$/checkstyle.xml:RIA" />
<entry key="check-nonjava-files" value="false" />
<entry key="check-test-classes" value="false" />
<entry key="location-0" value="CLASSPATH:/sun_checks.xml:The default CheckStyle rules" />
<entry key="location-1" value="PROJECT_RELATIVE:$PRJ_DIR$/checkstyle.xml:RIA" />
<entry key="suppress-errors" value="false" />
<entry key="thirdparty-classpath" value="" />
</map>
</option>
</component>
</project>
</project>

This file was deleted.

Oops, something went wrong.
View
@@ -12,6 +12,8 @@
<entry name="!?*.flex" />
<entry name="!?*.kt" />
<entry name="!?*.clj" />
<entry name="*.yaml" />
<entry name="*.xml" />
</wildcardResourcePatterns>
<annotationProcessing>
<profile default="true" name="Default" enabled="false">
@@ -23,18 +25,29 @@
<outputRelativeToContentRoot value="true" />
<processorPath useClasspath="true" />
<module name="dss-common" />
<module name="dss-demo-applet" />
<module name="dss-demo-webapp" />
<module name="dss-document" />
<module name="dss-service" />
<module name="dss-spi" />
<module name="dss-webservices" />
<module name="dss-webservices-client" />
</profile>
</annotationProcessing>
<bytecodeTargetLevel>
<module name="dss-common" target="1.6" />
<module name="dss-core" target="1.6" />
<module name="dss-demo" target="1.6" />
<module name="dss-demo-applet" target="1.6" />
<module name="dss-demo-applet-package" target="1.6" />
<module name="dss-demo-webapp" target="1.6" />
<module name="dss-document" target="1.6" />
<module name="dss-service" target="1.6" />
<module name="dss-spi" target="1.6" />
<module name="dss-webservices" target="1.6" />
<module name="dss-webservices-client" target="1.6" />
<module name="sd-dss" target="1.6" />
<module name="sd-dss-app" target="1.6" />
</bytecodeTargetLevel>
</component>
</project>
</project>

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit b8a5de4

Please sign in to comment.