Commit 4f5d961e authored by Lukas HAMEURY's avatar Lukas HAMEURY
Browse files

Merge branch '32-regression-v4-7-controles-ca-et-crl' into 'develop'

Resolve "Regression v4.7 - contrôles CA et CRL"

See merge request libriciel/pole-signature/signature/libersign!47
parents 9800f6c9 041715b7
......@@ -93,3 +93,6 @@ fabric.properties
/.nb-gradle/
.DS_Store
SplittedSignatureApplet/SplittedSignatureApplet/dist/*
SplittedSignatureApplet/SplittedSignatureApplet/build/*
SplittedSignatureApplet/SplittedSignatureApplet/intellij-out/*
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/SplittedSignatureApplet/SplittedSignatureApplet/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/SplittedSignatureApplet/SplittedSignatureApplet/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/SplittedSignatureApplet/SplittedSignatureApplet/test/resources" type="java-test-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library" scope="TEST">
<library name="JUnit4">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" name="commons-lang-2.6" level="project" />
<orderEntry type="library" name="bcpkix-jdk15on-150" level="project" />
<orderEntry type="library" name="iaik_xsect" level="project" />
<orderEntry type="library" name="iaik_jce_full" level="project" />
<orderEntry type="library" name="iaikPkcs11Provider" level="project" />
<orderEntry type="library" name="iaikPkcs11Wrapper" level="project" />
<orderEntry type="library" name="bcprov-jdk15on-150" level="project" />
<orderEntry type="library" name="commons-httpclient-3.1" level="project" />
<orderEntry type="library" name="commons-ssl-0.3.0" level="project" />
<orderEntry type="library" name="xmlsec-1.4.6" level="project" />
<orderEntry type="library" name="xom-1.2.10" level="project" />
<orderEntry type="library" name="json-20140107" level="project" />
</component>
</module>
\ No newline at end of file
<component name="libraryTable">
<library name="bcpkix-jdk15on-150">
<CLASSES>
<root url="jar://$PROJECT_DIR$/SplittedSignatureApplet/SplittedSignatureApplet/lib/bcpkix-jdk15on-150.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="bcprov-jdk15on-150">
<CLASSES>
<root url="jar://$PROJECT_DIR$/SplittedSignatureApplet/SplittedSignatureApplet/lib/bcprov-jdk15on-150.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="commons-httpclient-3.1">
<CLASSES>
<root url="jar://$PROJECT_DIR$/SplittedSignatureApplet/SplittedSignatureApplet/lib/commons-httpclient-3.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="commons-lang-2.6">
<CLASSES>
<root url="jar://$PROJECT_DIR$/SplittedSignatureApplet/SplittedSignatureApplet/lib/commons-lang-2.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="commons-ssl-0.3.0">
<CLASSES>
<root url="jar://$PROJECT_DIR$/SplittedSignatureApplet/SplittedSignatureApplet/lib/commons-ssl-0.3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="iaikPkcs11Provider">
<CLASSES>
<root url="jar://$PROJECT_DIR$/SplittedSignatureApplet/SplittedSignatureApplet/lib/iaikPkcs11Provider.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="iaikPkcs11Wrapper">
<CLASSES>
<root url="jar://$PROJECT_DIR$/SplittedSignatureApplet/SplittedSignatureApplet/lib/iaikPkcs11Wrapper.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="iaik_jce_full">
<CLASSES>
<root url="jar://$PROJECT_DIR$/SplittedSignatureApplet/SplittedSignatureApplet/lib/iaik_jce_full.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="iaik_xsect">
<CLASSES>
<root url="jar://$PROJECT_DIR$/SplittedSignatureApplet/SplittedSignatureApplet/lib/iaik_xsect.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="json-20140107">
<CLASSES>
<root url="jar://$PROJECT_DIR$/SplittedSignatureApplet/SplittedSignatureApplet/lib/json-20140107.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="xmlsec-1.4.6">
<CLASSES>
<root url="jar://$PROJECT_DIR$/SplittedSignatureApplet/SplittedSignatureApplet/lib/xmlsec-1.4.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="xom-1.2.10">
<CLASSES>
<root url="jar://$PROJECT_DIR$/SplittedSignatureApplet/SplittedSignatureApplet/lib/xom-1.2.10.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/SplittedSignatureApplet/SplittedSignatureApplet/intellij-out" />
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/libersign.iml" filepath="$PROJECT_DIR$/.idea/libersign.iml" />
</modules>
</component>
</project>
\ No newline at end of file
......@@ -19,7 +19,9 @@ is divided into following sections:
- cleanup
-->
<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="SplittedSignatureApplet-impl">
<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1"
xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3"
basedir=".." default="default" name="SplittedSignatureApplet-impl">
<import file="jnlp-impl.xml"/>
<fail message="Please build using Ant 1.8.0 or higher.">
<condition>
......@@ -29,9 +31,9 @@ is divided into following sections:
</condition>
</fail>
<target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
<!--
<!--
======================
INITIALIZATION SECTION
INITIALIZATION SECTION
======================
-->
<target name="-pre-init">
......@@ -382,7 +384,7 @@ is divided into following sections:
<element name="customize" optional="true"/>
<sequential>
<property name="junit.forkmode" value="perTest"/>
<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
<junit dir="${build.test.classes.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
<test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
<syspropertyset>
<propertyref prefix="test-sys-prop."/>
......@@ -405,7 +407,7 @@ is divided into following sections:
<element name="customize" optional="true"/>
<sequential>
<property name="junit.forkmode" value="perTest"/>
<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
<junit dir="${build.test.classes.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
<batchtest todir="${build.test.results.dir}">
<fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
......@@ -524,7 +526,7 @@ is divided into following sections:
<element name="customize" optional="true"/>
<sequential>
<property name="junit.forkmode" value="perTest"/>
<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
<junit dir="${build.test.classes.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
<test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
<syspropertyset>
<propertyref prefix="test-sys-prop."/>
......@@ -549,7 +551,7 @@ is divided into following sections:
<element name="customize" optional="true"/>
<sequential>
<property name="junit.forkmode" value="perTest"/>
<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
<junit dir="${build.test.classes.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
<batchtest todir="${build.test.results.dir}">
<fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
......@@ -1251,6 +1253,7 @@ is divided into following sections:
<j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/>
<copy todir="${build.test.classes.dir}">
<fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.resources.dir}" excludes="" includes="${includes}"/>
</copy>
</target>
<target name="-post-compile-test">
......@@ -1268,6 +1271,7 @@ is divided into following sections:
<j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
<copy todir="${build.test.classes.dir}">
<fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.resources.dir}" excludes="" includes="${includes}"/>
</copy>
</target>
<target name="-post-compile-test-single">
......@@ -1285,6 +1289,7 @@ is divided into following sections:
</target>
<target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
<j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
</target>
<target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
<fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
......@@ -1312,6 +1317,7 @@ is divided into following sections:
<fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
</target>
<target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
<!--
=======================
TEST DEBUGGING SECTION
......
......@@ -41,6 +41,7 @@ file.reference.libpkcs11wrapper.jnilib.jar=lib/libpkcs11wrapper.jnilib.jar
file.reference.xmlsec-1.4.6.jar=lib/xmlsec-1.4.6.jar
file.reference.xom-1.2.10.jar=lib/xom-1.2.10.jar
file.reference.commons-lang-2.6.jar=lib/commons-lang-2.6.jar
file.reference.junit4-4.8.2.jar=lib/junit4-4.8.2.jar
includes=**
jar.archive.disabled=${jnlp.enabled}
jar.compress=true
......@@ -57,14 +58,15 @@ javac.classpath=\
${file.reference.iaik_jce_full.jar}:\
${file.reference.libpkcs11wrapper.jnilib.jar}:\
${file.reference.iaik_xsect.jar}:\
${file.reference.iaikPkcs11Provider.jar}
${file.reference.iaikPkcs11Provider.jar}:\
${file.reference.junit4-4.8.2.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
javac.processorpath=\
${javac.classpath}
javac.source=1.6
javac.target=1.6
javac.source=1.7
javac.target=1.7
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}:\
......@@ -124,4 +126,5 @@ source.reference.bcprov-jdk15on-150.jar=../../bcprov-jdk15on-150.zip
source.reference.iaikPkcs11Wrapper.jar=/home/svast/Bureau/mac os sign/iaikPkcs11Wrapper_1_3.zip!/src/java/src/
source.reference.xom-1.2.10.jar=/home/svast/src/xom-1.2.10.zip!/XOM/src/
src.dir=src
test.src.dir=test
test.src.dir=test/java
test.resources.dir=test/resources
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment