aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2016-06-07 13:08:53 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2016-06-07 13:08:53 +0200
commit81f86fc319e98469cc4ae65f8c4a3c8a4636ac00 (patch)
tree9d84863de90ac831a55c521cbc96749a9fcb727c
parentcadf8aeca12cb25c84db6a740bc5587363191f1d (diff)
parentaa4f6b8a17400e6ebbe83d92e26b25413deb9aa1 (diff)
downloadmoa-id-spss-81f86fc319e98469cc4ae65f8c4a3c8a4636ac00.tar.gz
moa-id-spss-81f86fc319e98469cc4ae65f8c4a3c8a4636ac00.tar.bz2
moa-id-spss-81f86fc319e98469cc4ae65f8c4a3c8a4636ac00.zip
Merge branch 'moa-id_with_moa-sig_and_eccelerate' into eIDAS_node_implementation
-rw-r--r--id/moa-spss-container/pom.xml237
-rw-r--r--id/server/auth-edu/pom.xml10
-rw-r--r--id/server/auth-final/pom.xml10
-rw-r--r--id/server/idserverlib/pom.xml7
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java15
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/PVPMetadataBuilder.java28
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/AbstractCredentialProvider.java3
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ECDSAKeyValueConverter.java122
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/SSLUtils.java8
-rw-r--r--id/server/moa-id-commons/pom.xml12
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/MOAHttpProtocolSocketFactory.java7
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/CertStoreConfigurationImpl.java20
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/MOAIDTrustManager.java11
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/PKIConfigurationImpl.java20
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/PKIProfileImpl.java25
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/RevocationConfigurationImpl.java44
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/SSLUtils.java81
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/logging/LogMsg.java67
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/logging/LoggingContext.java70
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/logging/LoggingContextManager.java80
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/util/MOAEntityResolver.java3
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/util/MOAErrorHandler.java2
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/util/SSLUtils.java244
-rw-r--r--id/server/moa-id-commons/src/test/java/test/at/gv/egovernment/moa/AllTests.java2
-rw-r--r--id/server/moa-id-commons/src/test/java/test/at/gv/egovernment/moa/util/SSLUtilsTest.java181
-rw-r--r--id/server/modules/moa-id-modul-citizencard_authentication/pom.xml7
-rw-r--r--id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java2
-rw-r--r--id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/validator/VerifyXMLSignatureResponseValidator.java16
-rw-r--r--id/server/modules/moa-id-modules-saml1/pom.xml7
-rw-r--r--pom.xml109
-rw-r--r--repository/MOA/spss/common/3.0.0-RC1/common-3.0.0-RC1.jarbin0 -> 192309 bytes
-rw-r--r--repository/MOA/spss/server/moa-sig-lib/3.0.0-RC1/moa-sig-lib-3.0.0-RC1.jarbin0 -> 384648 bytes
-rw-r--r--repository/iaik/asit/1.3.4/asit-1.3.4.jarbin550695 -> 0 bytes
-rw-r--r--repository/iaik/asit/1.3.4/asit-1.3.4.jar.md51
-rw-r--r--repository/iaik/asit/1.3.4/asit-1.3.4.jar.sha11
-rw-r--r--repository/iaik/asit/1.3.4/asit-1.3.4.pom390
-rw-r--r--repository/iaik/asit/1.3.4/asit-1.3.4.pom.md51
-rw-r--r--repository/iaik/asit/1.3.4/asit-1.3.4.pom.sha11
-rw-r--r--repository/iaik/asit/1.3.5/asit-1.3.5.jarbin551218 -> 0 bytes
-rw-r--r--repository/iaik/asit/1.3.5/asit-1.3.5.jar.sha11
-rw-r--r--repository/iaik/asit/1.3.5/asit-1.3.5.pom9
-rw-r--r--repository/iaik/asit/1.3.5/asit-1.3.5.pom.sha11
-rw-r--r--repository/iaik/asit/1.3.6/asit-1.3.6-javadoc.jarbin1166091 -> 0 bytes
-rw-r--r--repository/iaik/asit/1.3.6/asit-1.3.6-sources.jarbin231674 -> 0 bytes
-rw-r--r--repository/iaik/asit/1.3.6/asit-1.3.6.jarbin551232 -> 0 bytes
-rw-r--r--repository/iaik/asit/1.3.6/asit-1.3.6.pom390
-rw-r--r--repository/iaik/bescheide/2007-09-13/bescheide-2007-09-13.jarbin107994 -> 0 bytes
-rw-r--r--repository/iaik/bescheide/2007-09-13/bescheide-2007-09-13.jar.sha11
-rw-r--r--repository/iaik/bescheide/2007-09-13/bescheide-2007-09-13.pom6
-rw-r--r--repository/iaik/bescheide/2007-09-13/bescheide-2007-09-13.pom.sha11
-rw-r--r--repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.jarbin449160 -> 0 bytes
-rw-r--r--repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.jar.md51
-rw-r--r--repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.jar.sha11
-rw-r--r--repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.pom633
-rw-r--r--repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.pom.md51
-rw-r--r--repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.pom.sha11
-rw-r--r--repository/iaik/commons-iaik/0.6.2/commons-iaik-0.6.2.jarbin470399 -> 0 bytes
-rw-r--r--repository/iaik/commons-iaik/0.7.1/commons-iaik-0.7.1.jarbin518553 -> 0 bytes
-rw-r--r--repository/iaik/commons-iaik/0.7.1/commons-iaik-0.7.1.jar.md51
-rw-r--r--repository/iaik/commons-iaik/0.7.1/commons-iaik-0.7.1.jar.sha11
-rw-r--r--repository/iaik/commons-iaik/0.7.1/commons-iaik-0.7.1.pom508
-rw-r--r--repository/iaik/commons-iaik/0.7.1/commons-iaik-0.7.1.pom.md51
-rw-r--r--repository/iaik/commons-iaik/0.7.1/commons-iaik-0.7.1.pom.sha11
-rw-r--r--repository/iaik/commons-iaik/0.7.1/m2e-lastUpdated.properties3
-rw-r--r--repository/iaik/ecc/3.18/ecc-3.18.jarbin111446 -> 0 bytes
-rw-r--r--repository/iaik/ecc/3.18/ecc-3.18.pom7
-rw-r--r--repository/iaik/iaikPkcs11Provider/1.3/iaikPkcs11Provider-1.3.jarbin294725 -> 0 bytes
-rw-r--r--repository/iaik/iaik_ecc/2.19/iaik_ecc-2.19.jarbin105735 -> 0 bytes
-rw-r--r--repository/iaik/iaik_ecc/2.19/iaik_ecc-2.19.pom9
-rw-r--r--repository/iaik/iaik_ecc_eval_signed/2.15/iaik_ecc_eval_signed-2.15.jarbin134778 -> 0 bytes
-rw-r--r--repository/iaik/iaik_ecc_signed/2.15/iaik_ecc_signed-2.15.jarbin107890 -> 0 bytes
-rw-r--r--repository/iaik/iaik_ecc_signed/2.15/iaik_ecc_signed-2.15.pom7
-rw-r--r--repository/iaik/iaik_ecc_signed/2.19/iaik_ecc.jarbin111446 -> 0 bytes
-rw-r--r--repository/iaik/iaik_ecc_signed/2.19/iaik_ecc_signed-2.19.jarbin111446 -> 0 bytes
-rw-r--r--repository/iaik/iaik_ecc_signed/2.19/iaik_ecc_signed-2.19.jar.sha11
-rw-r--r--repository/iaik/iaik_ecc_signed/2.19/iaik_ecc_signed-2.19.pom9
-rw-r--r--repository/iaik/iaik_ecc_signed/2.19/iaik_ecc_signed-2.19.pom.sha11
-rw-r--r--repository/iaik/iaik_eccelerate/2.51/iaik_eccelerate-2.51.jarbin232486 -> 0 bytes
-rw-r--r--repository/iaik/iaik_eccelerate/2.51/iaik_eccelerate-2.51.pom8
-rw-r--r--repository/iaik/iaik_ixsil/1.2.0/iaik_ixsil-1.2.0-eval.jarbin167965 -> 0 bytes
-rw-r--r--repository/iaik/iaik_ixsil/1.2.0/iaik_ixsil-1.2.0.pom9
-rw-r--r--repository/iaik/iaik_ixsil_eval/1.2.2/iaik_ixsil_eval-1.2.2-javadoc.jarbin568449 -> 0 bytes
-rw-r--r--repository/iaik/iaik_ixsil_eval/1.2.2/iaik_ixsil_eval-1.2.2-javadoc.jar.sha11
-rw-r--r--repository/iaik/iaik_ixsil_eval/1.2.2/iaik_ixsil_eval-1.2.2.jarbin197953 -> 0 bytes
-rw-r--r--repository/iaik/iaik_ixsil_eval/1.2.2/iaik_ixsil_eval-1.2.2.jar.sha11
-rw-r--r--repository/iaik/iaik_ixsil_eval/1.2.2/iaik_ixsil_eval-1.2.2.pom6
-rw-r--r--repository/iaik/iaik_ixsil_eval/1.2.2/iaik_ixsil_eval-1.2.2.pom.sha11
-rw-r--r--repository/iaik/iaik_javax_crypto/1.0/iaik_javax_crypto-1.0.jarbin28512 -> 0 bytes
-rw-r--r--repository/iaik/iaik_javax_crypto/1.0/iaik_javax_crypto-1.0.pom9
-rw-r--r--repository/iaik/iaik_jce_eval_signed/3.16/iaik_jce_eval_signed-3.16.jarbin854896 -> 0 bytes
-rw-r--r--repository/iaik/iaik_jce_eval_signed/3.181/iaik_jce_eval_signed-3.181.jarbin921338 -> 0 bytes
-rw-r--r--repository/iaik/iaik_jce_eval_signed/3.181/iaik_jce_eval_signed-3.181.pom9
-rw-r--r--repository/iaik/iaik_jce_full/5.01/iaik_jce_full-5.01.jarbin1059043 -> 0 bytes
-rw-r--r--repository/iaik/iaik_jce_full/5.01/iaik_jce_full-5.01.pom9
-rw-r--r--repository/iaik/iaik_jce_full_signed/3.16/iaik_jce_full_signed-3.16.jarbin875901 -> 0 bytes
-rw-r--r--repository/iaik/iaik_jce_full_signed/3.16/iaik_jce_full_signed-3.16.pom7
-rw-r--r--repository/iaik/iaik_jce_me4se/3.04/iaik_jce_me4se-3.04.jarbin99575 -> 0 bytes
-rw-r--r--repository/iaik/iaik_jce_me4se/3.04/iaik_jce_me4se-3.04.pom7
-rw-r--r--repository/iaik/iaik_jsse/4.4/iaik_jsse-4.4.jarbin34853 -> 0 bytes
-rw-r--r--repository/iaik/iaik_jsse/4.4/iaik_jsse-4.4.pom9
-rw-r--r--repository/iaik/iaik_pki/1.0-MOCCA/iaik_pki-1.0-MOCCA.jarbin375286 -> 0 bytes
-rw-r--r--repository/iaik/iaik_pki/1.0-MOCCA/iaik_pki-1.0-MOCCA.pom7
-rw-r--r--repository/iaik/iaik_pki_module/1.0/iaik_pki_module-1.0.jarbin462362 -> 0 bytes
-rw-r--r--repository/iaik/iaik_pki_module/1.0/iaik_pki_module-1.0.pom9
-rw-r--r--repository/iaik/iaik_ssl/4.4/iaik_ssl-4.4.jarbin219889 -> 0 bytes
-rw-r--r--repository/iaik/iaik_ssl/4.4/iaik_ssl-4.4.pom9
-rw-r--r--repository/iaik/iaik_tsl/0.0.1-SNAPSHOT/iaik_tsl-0.0.1-SNAPSHOT.jarbin542887 -> 0 bytes
-rw-r--r--repository/iaik/iaik_tsl/0.0.1-SNAPSHOT/iaik_tsl-0.0.1-SNAPSHOT.pom135
-rw-r--r--repository/iaik/iaik_tsl/0.0.1-SNAPSHOT/maven-metadata-local.xml24
-rw-r--r--repository/iaik/iaik_tsl/0.5/iaik_tsl-0.5.jarbin559971 -> 0 bytes
-rw-r--r--repository/iaik/iaik_tsl/0.5/iaik_tsl-0.5.pom250
-rw-r--r--repository/iaik/iaik_tsl/1.0/iaik_tsl-1.0.jarbin549794 -> 0 bytes
-rw-r--r--repository/iaik/iaik_tsl/1.0/iaik_tsl-1.0.pom251
-rw-r--r--repository/iaik/iaik_tsl/1.1/iaik_tsl-1.1.jarbin605175 -> 0 bytes
-rw-r--r--repository/iaik/iaik_tsl/1.1/iaik_tsl-1.1.pom276
-rw-r--r--repository/iaik/iaik_tsl/maven-metadata-local.xml14
-rw-r--r--repository/iaik/iaik_util/0.23/iaik_util-0.23.jarbin39372 -> 0 bytes
-rw-r--r--repository/iaik/iaik_util/0.23/iaik_util-0.23.pom9
-rw-r--r--repository/iaik/iaik_xsect/1.17/iaik_xsect-1.17.jarbin374890 -> 0 bytes
-rw-r--r--repository/iaik/iaik_xsect/1.17/iaik_xsect-1.17.jar.sha11
-rw-r--r--repository/iaik/iaik_xsect/1.17/iaik_xsect-1.17.pom9
-rw-r--r--repository/iaik/iaik_xsect/1.17/iaik_xsect-1.17.pom.sha11
-rw-r--r--repository/iaik/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jarbin401150 -> 0 bytes
-rw-r--r--repository/iaik/iaik_xsect_eval/1.11build48/iaik_xsect_eval-1.11build48.jarbin321478 -> 0 bytes
-rw-r--r--repository/iaik/iaik_xsect_eval/1.11build48/iaik_xsect_eval-1.11build48.jar.sha11
-rw-r--r--repository/iaik/iaik_xsect_eval/1.11build48/iaik_xsect_eval-1.11build48.pom32
-rw-r--r--repository/iaik/iaik_xsect_eval/1.11build48/iaik_xsect_eval-1.11build48.pom.sha11
-rw-r--r--repository/iaik/iaik_xsect_eval/1.17/iaik_xsect_eval-1.17.jarbin572245 -> 0 bytes
-rw-r--r--repository/iaik/iaik_xsect_eval/1.1709142/iaik_xsect_eval-1.1709142.jarbin419996 -> 0 bytes
-rw-r--r--repository/iaik/iaik_xsect_eval/1.1709142/iaik_xsect_eval-1.1709142.pom9
-rw-r--r--repository/iaik/ixsil/1.2.2.4/ixsil-1.2.2.4.jarbin205197 -> 0 bytes
-rw-r--r--repository/iaik/ixsil/1.2.2.4/ixsil-1.2.2.4.pom7
-rw-r--r--repository/iaik/jce/3.18/jce-3.18.jarbin919238 -> 0 bytes
-rw-r--r--repository/iaik/jce/3.18/jce-3.18.pom7
-rw-r--r--repository/iaik/moa/1.28/m2e-lastUpdated.properties10
-rw-r--r--repository/iaik/moa/1.28/moa-1.28.jarbin711652 -> 0 bytes
-rw-r--r--repository/iaik/moa/1.28/moa-1.28.pom7
-rw-r--r--repository/iaik/moa_common/2006-03-20/moa_common-2006-03-20.jarbin100788 -> 0 bytes
-rw-r--r--repository/iaik/prod/iaik_cms/5.1/iaik_cms-5.1.jarbin0 -> 459859 bytes
-rw-r--r--repository/iaik/prod/iaik_cpades/2.2b3_tmp/iaik_cpades-2.2b3_tmp.jarbin0 -> 120778 bytes
-rw-r--r--repository/iaik/prod/iaik_ecc/2.16/iaik_ecc-2.16.jarbin146013 -> 0 bytes
-rw-r--r--repository/iaik/prod/iaik_ecc/2.16/iaik_ecc-2.16.jar.md51
-rw-r--r--repository/iaik/prod/iaik_ecc/2.16/iaik_ecc-2.16.jar.sha11
-rw-r--r--repository/iaik/prod/iaik_ecc/2.16/iaik_ecc-2.16.pom6
-rw-r--r--repository/iaik/prod/iaik_ecc/2.16/iaik_ecc-2.16.pom.md51
-rw-r--r--repository/iaik/prod/iaik_ecc/2.16/iaik_ecc-2.16.pom.sha11
-rw-r--r--repository/iaik/prod/iaik_ecc/2.19/iaik_ecc-2.19.jarbin111446 -> 0 bytes
-rw-r--r--repository/iaik/prod/iaik_ecc/2.19/iaik_ecc-2.19.jar.md51
-rw-r--r--repository/iaik/prod/iaik_ecc/2.19/iaik_ecc-2.19.jar.sha11
-rw-r--r--repository/iaik/prod/iaik_ecc/2.19/iaik_ecc-2.19.pom6
-rw-r--r--repository/iaik/prod/iaik_ecc/2.19/iaik_ecc-2.19.pom.md51
-rw-r--r--repository/iaik/prod/iaik_ecc/2.19/iaik_ecc-2.19.pom.sha11
-rw-r--r--repository/iaik/prod/iaik_ecc/maven-metadata.xml12
-rw-r--r--repository/iaik/prod/iaik_ecc/maven-metadata.xml.md51
-rw-r--r--repository/iaik/prod/iaik_ecc/maven-metadata.xml.sha11
-rw-r--r--repository/iaik/prod/iaik_ecc_signed/2.19/iaik_ecc_signed-2.19.jarbin111446 -> 0 bytes
-rw-r--r--repository/iaik/prod/iaik_ecc_signed/2.19/iaik_ecc_signed-2.19.pom6
-rw-r--r--repository/iaik/prod/iaik_eccelerate/3.1_eval/iaik_eccelerate-3.1_eval.jarbin0 -> 359608 bytes
-rw-r--r--repository/iaik/prod/iaik_eccelerate_addon/3.01_eval/iaik_eccelerate_addon-3.01_eval.jarbin0 -> 77097 bytes
-rw-r--r--repository/iaik/prod/iaik_eccelerate_cms/3.01/iaik_eccelerate_cms-3.01.jarbin0 -> 4501 bytes
-rw-r--r--repository/iaik/prod/iaik_ixsil/1.2.2.3/iaik_ixsil-1.2.2.3.jarbin205081 -> 0 bytes
-rw-r--r--repository/iaik/prod/iaik_ixsil/1.2.2.3/iaik_ixsil-1.2.2.3.jar.md51
-rw-r--r--repository/iaik/prod/iaik_ixsil/1.2.2.3/iaik_ixsil-1.2.2.3.jar.sha11
-rw-r--r--repository/iaik/prod/iaik_ixsil/1.2.2.3/iaik_ixsil-1.2.2.3.pom7
-rw-r--r--repository/iaik/prod/iaik_ixsil/1.2.2.3/iaik_ixsil-1.2.2.3.pom.md51
-rw-r--r--repository/iaik/prod/iaik_ixsil/1.2.2.3/iaik_ixsil-1.2.2.3.pom.sha11
-rw-r--r--repository/iaik/prod/iaik_ixsil/1.2.2.4/iaik_ixsil-1.2.2.4.jarbin205197 -> 0 bytes
-rw-r--r--repository/iaik/prod/iaik_ixsil/1.2.2.4/iaik_ixsil-1.2.2.4.jar.md51
-rw-r--r--repository/iaik/prod/iaik_ixsil/1.2.2.4/iaik_ixsil-1.2.2.4.jar.sha11
-rw-r--r--repository/iaik/prod/iaik_ixsil/1.2.2.4/iaik_ixsil-1.2.2.4.pom7
-rw-r--r--repository/iaik/prod/iaik_ixsil/1.2.2.4/iaik_ixsil-1.2.2.4.pom.md51
-rw-r--r--repository/iaik/prod/iaik_ixsil/1.2.2.4/iaik_ixsil-1.2.2.4.pom.sha11
-rw-r--r--repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jarbin201276 -> 0 bytes
-rw-r--r--repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar.md51
-rw-r--r--repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar.sha11
-rw-r--r--repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.pom9
-rw-r--r--repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.pom.md51
-rw-r--r--repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.pom.sha11
-rw-r--r--repository/iaik/prod/iaik_ixsil/maven-metadata-MOA.xml12
-rw-r--r--repository/iaik/prod/iaik_jce_full/5.3_MOA/iaik_jce_full-5.3_MOA.jar (renamed from repository/iaik/iaik_jce_full/5.101/iaik_jce_full-5.101.jar)bin1115849 -> 1160539 bytes
-rw-r--r--repository/iaik/prod/iaik_moa/2.00/iaik_moa-2.00.jarbin0 -> 513660 bytes
-rw-r--r--repository/iaik/prod/iaik_pki_module/1.1_moa/iaik_pki_module-1.1_moa.jarbin0 -> 587551 bytes
-rw-r--r--repository/iaik/prod/iaik_sva/1.0_moa/iaik_sva-1.0_moa.jarbin0 -> 126179 bytes
-rw-r--r--repository/iaik/prod/iaik_tsl/1.1_moa/iaik_tsl-1.1_moa.jarbin0 -> 558558 bytes
-rw-r--r--repository/iaik/prod/iaik_tsp/2.31_eval/iaik_tsp-2.31_eval.jarbin0 -> 40487 bytes
-rw-r--r--repository/iaik/prod/iaik_util/0.23/iaik_util-0.23.jarbin39372 -> 39377 bytes
-rw-r--r--repository/iaik/prod/iaik_xades/20160408_eval/iaik_xades-20160408_eval.jarbin0 -> 312190 bytes
-rw-r--r--repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jarbin401150 -> 0 bytes
-rw-r--r--repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jar.md51
-rw-r--r--repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jar.sha11
-rw-r--r--repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.pom9
-rw-r--r--repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.pom.md51
-rw-r--r--repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.pom.sha11
-rw-r--r--repository/iaik/prod/iaik_xsect/2.10_20160408_eval/iaik_xsect-2.10_20160408_eval.jarbin0 -> 422263 bytes
-rw-r--r--repository/iaik/xsect/1.02/xsect-1.02.jarbin327071 -> 0 bytes
195 files changed, 410 insertions, 4274 deletions
diff --git a/id/moa-spss-container/pom.xml b/id/moa-spss-container/pom.xml
index 49557d83e..bddc25f71 100644
--- a/id/moa-spss-container/pom.xml
+++ b/id/moa-spss-container/pom.xml
@@ -8,165 +8,155 @@
<groupId>MOA.id</groupId>
<artifactId>moa-spss-container</artifactId>
<version>${moa-id-version}</version>
- <packaging>pom</packaging>
<name>MOA-SPSS-Container-for-MOA-ID</name>
<description>This module holds MOA-SPSS and all required library</description>
<properties>
- <repositoryPath>${basedir}/../../repository</repositoryPath>
+ <repositoryPath>${basedir}/../../../repository</repositoryPath>
</properties>
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <repositories>
- <repository>
- <id>local</id>
- <name>local</name>
- <url>file:${basedir}/../../repository</url>
- </repository>
- <repository>
- <id>egiz-commons</id>
- <url>https://demo.egiz.gv.at/int-repo/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
- </profile>
- </profiles>
+ <repositories>
+ <repository>
+ <id>MOA</id>
+ <name>MOA Dependencies</name>
+ <releases>
+ <enabled>true</enabled>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <layout>default</layout>
+ <url>file://${repositoryPath}</url>
+ </repository>
+ </repositories>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>${basedir}/../../../repository/MOA/spss/ext_libs/*.jar</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ </build>
<dependencies>
- <!-- we need Axis 1.1 here, 1.0 is included in SPSS -->
<dependency>
<groupId>MOA.spss.server</groupId>
- <artifactId>moa-spss-lib</artifactId>
+ <artifactId>moa-sig-lib</artifactId>
<exclusions>
<exclusion>
- <artifactId>iaik_pki_module</artifactId>
- <groupId>iaik</groupId>
- </exclusion>
- <exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
- <artifactId>axis-wsdl4j</artifactId>
+ <artifactId>*</artifactId>
<groupId>axis</groupId>
</exclusion>
</exclusions>
</dependency>
-
+
+
+<!-- MOA-SPSS 3.x -->
<dependency>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_ixsil</artifactId>
- </dependency>
+ <groupId>MOA.spss</groupId>
+ <artifactId>common</artifactId>
+ </dependency>
<dependency>
<groupId>iaik.prod</groupId>
- <artifactId>iaik_X509TrustManager</artifactId>
- </dependency>
-
-<!-- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis</artifactId>
- </dependency> -->
-
-<!-- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.axis</groupId>
- <artifactId>axis-jaxrpc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.axis</groupId>
- <artifactId>axis-saaj</artifactId>
- </dependency> -->
+ <artifactId>iaik_cms</artifactId>
+ <version>5.1</version>
+ </dependency>
<dependency>
- <groupId>commons-discovery</groupId>
- <artifactId>commons-discovery</artifactId>
- </dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_cpades</artifactId>
+ <version>2.2b3_tmp</version>
+ </dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_eccelerate</artifactId>
+ <version>3.1_eval</version>
+ </dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_eccelerate_addon</artifactId>
+ <version>3.01_eval</version>
+ </dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_eccelerate_cms</artifactId>
+ <version>3.01</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
-
-<!-- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency> -->
-<!-- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </dependency> -->
-
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_jce_full</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
- <groupId>org.postgresql</groupId>
- <artifactId>postgresql</artifactId>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_jsse</artifactId>
+ <version>4.4</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_moa</artifactId>
+ <version>2.00</version>
+ </dependency>
<dependency>
- <groupId>xalan-bin-dist</groupId>
- <artifactId>xalan</artifactId>
- <!-- <scope>provided</scope> -->
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_pki_module</artifactId>
+ <version>1.1_moa</version>
</dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <!-- <scope>provided</scope> -->
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_sva</artifactId>
+ <version>1.0_moa</version>
</dependency>
<dependency>
- <groupId>xalan-bin-dist</groupId>
- <artifactId>xml-apis</artifactId>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_tsl</artifactId>
+ <version>1.1_moa</version>
</dependency>
<dependency>
- <groupId>xalan-bin-dist</groupId>
- <artifactId>serializer</artifactId>
- <!-- <scope>provided</scope> -->
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_tsp</artifactId>
+ <version>2.31_eval</version>
</dependency>
<dependency>
<groupId>iaik.prod</groupId>
- <artifactId>iaik_moa</artifactId>
- </dependency>
+ <artifactId>iaik_util</artifactId>
+ <version>0.23</version>
+ </dependency>
<dependency>
<groupId>iaik.prod</groupId>
- <artifactId>iaik_ixsil</artifactId>
+ <artifactId>iaik_xades</artifactId>
+ <version>20160408_eval</version>
</dependency>
<dependency>
<groupId>iaik.prod</groupId>
- <artifactId>iaik_jce_full</artifactId>
- <scope>compile</scope>
+ <artifactId>iaik_xsect</artifactId>
+ <version>2.10_20160408_eval</version>
+ </dependency>
+
+
+
+
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</dependency>
<dependency>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_ecc</artifactId>
- <scope>compile</scope>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_cms</artifactId>
- <scope>runtime</scope>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
</dependency>
+
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_Pkcs11Provider</artifactId>
@@ -228,38 +218,7 @@
<!-- should be provided by the container or jre -->
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_jce_full</artifactId>
- <!-- should be in the ext directory of the jre -->
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_ecc</artifactId>
- <!-- should be in the ext directory of the jre -->
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_tsl</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>iaik_pki_module</artifactId>
- <groupId>iaik</groupId>
- </exclusion>
- <exclusion>
- <artifactId>iaik_ecc_signed</artifactId>
- <groupId>iaik</groupId>
- </exclusion>
- <exclusion>
- <artifactId>iaik_jce_eval_signed</artifactId>
- <groupId>iaik</groupId>
- </exclusion>
- </exclusions>
- </dependency>
-
+
</dependencies>
</project> \ No newline at end of file
diff --git a/id/server/auth-edu/pom.xml b/id/server/auth-edu/pom.xml
index 43e87f2ab..b550249e9 100644
--- a/id/server/auth-edu/pom.xml
+++ b/id/server/auth-edu/pom.xml
@@ -96,10 +96,6 @@
<type>pom</type>
<exclusions>
<exclusion>
- <artifactId>iaik_pki_module</artifactId>
- <groupId>iaik</groupId>
- </exclusion>
- <exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
@@ -219,12 +215,12 @@
<!-- should be in the ext directory of the jre -->
<scope>provided</scope>
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_ecc</artifactId>
- <!-- should be in the ext directory of the jre -->
+ should be in the ext directory of the jre
<scope>provided</scope>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_Pkcs11Provider</artifactId>
diff --git a/id/server/auth-final/pom.xml b/id/server/auth-final/pom.xml
index 0c42c9deb..b2f542880 100644
--- a/id/server/auth-final/pom.xml
+++ b/id/server/auth-final/pom.xml
@@ -80,10 +80,6 @@
<type>pom</type>
<exclusions>
<exclusion>
- <artifactId>iaik_pki_module</artifactId>
- <groupId>iaik</groupId>
- </exclusion>
- <exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
@@ -187,12 +183,12 @@
<!-- should be in the ext directory of the jre -->
<scope>provided</scope>
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_ecc</artifactId>
- <!-- should be in the ext directory of the jre -->
+ should be in the ext directory of the jre
<scope>provided</scope>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_Pkcs11Provider</artifactId>
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index fb6ba1bc6..a203fb7a5 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -315,6 +315,13 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_ixsil</artifactId>
+ <version>1.2.2.5</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java
index d1cf3338a..90aa5d3ac 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java
@@ -40,14 +40,14 @@ import at.gv.egovernment.moa.id.config.auth.MOAGarbageCollector;
import at.gv.egovernment.moa.id.util.Random;
import at.gv.egovernment.moa.id.util.SSLUtils;
import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.logging.LoggingContext;
-import at.gv.egovernment.moa.logging.LoggingContextManager;
import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
import at.gv.egovernment.moa.spss.server.iaik.config.IaikConfigurator;
import at.gv.egovernment.moa.util.Constants;
import at.gv.egovernment.moa.util.MiscUtil;
+import at.gv.egovernment.moaspss.logging.LoggingContext;
+import at.gv.egovernment.moaspss.logging.LoggingContextManager;
import iaik.pki.PKIException;
-import iaik.security.ecc.provider.ECCProvider;
+import iaik.security.ec.provider.ECCelerate;
import iaik.security.provider.IAIK;
/**
@@ -104,7 +104,7 @@ public class MOAIDAuthInitializer {
Logger.info("Loading Java security providers.");
IAIK.addAsProvider();
- ECCProvider.addAsProvider();
+ ECCelerate.addAsProvider();
// Initializes SSLSocketFactory store
SSLUtils.initialize();
@@ -147,7 +147,12 @@ public class MOAIDAuthInitializer {
//ECCProvider.addAsProvider();
Security.insertProviderAt(IAIK.getInstance(), 0);
- Security.addProvider(new ECCProvider());
+
+ ECCelerate eccProvider = ECCelerate.getInstance();
+ if (Security.getProvider(eccProvider.getName()) != null)
+ Security.removeProvider(eccProvider.getName());
+
+ Security.addProvider(new ECCelerate());
if (Logger.isDebugEnabled()) {
Logger.debug("Loaded Security Provider:");
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/PVPMetadataBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/PVPMetadataBuilder.java
index 855925272..e2f8664d8 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/PVPMetadataBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/PVPMetadataBuilder.java
@@ -24,8 +24,6 @@ package at.gv.egovernment.moa.id.protocols.pvp2x.builder;
import java.io.IOException;
import java.io.StringWriter;
-import java.security.PrivateKey;
-import java.security.interfaces.RSAPrivateKey;
import java.util.List;
import javax.xml.parsers.DocumentBuilder;
@@ -66,7 +64,6 @@ import org.opensaml.xml.security.credential.UsageType;
import org.opensaml.xml.security.keyinfo.KeyInfoGenerator;
import org.opensaml.xml.security.x509.X509KeyInfoGeneratorFactory;
import org.opensaml.xml.signature.Signature;
-import org.opensaml.xml.signature.SignatureConstants;
import org.opensaml.xml.signature.SignatureException;
import org.opensaml.xml.signature.Signer;
import org.springframework.stereotype.Service;
@@ -74,6 +71,7 @@ import org.w3c.dom.Document;
import at.gv.egovernment.moa.id.commons.api.exceptions.ConfigurationException;
import at.gv.egovernment.moa.id.protocols.pvp2x.config.IPVPMetadataBuilderConfiguration;
+import at.gv.egovernment.moa.id.protocols.pvp2x.signer.AbstractCredentialProvider;
import at.gv.egovernment.moa.id.protocols.pvp2x.signer.CredentialsNotAvailableException;
import at.gv.egovernment.moa.id.protocols.pvp2x.utils.SAML2Utils;
import at.gv.egovernment.moa.logging.Logger;
@@ -153,7 +151,7 @@ public class PVPMetadataBuilder {
//set metadata signature parameters
Credential metadataSignCred = config.getMetadataSigningCredentials();
- Signature signature = getIDPSignature(metadataSignCred);
+ Signature signature = AbstractCredentialProvider.getIDPSignature(metadataSignCred);
SecurityHelper.prepareSignatureParams(signature, metadataSignCred, null, null);
@@ -437,27 +435,5 @@ public class PVPMetadataBuilder {
return idpSSODescriptor;
}
-
- private Signature getIDPSignature(Credential credentials) {
- PrivateKey privatekey = credentials.getPrivateKey();
- Signature signer = SAML2Utils.createSAMLObject(Signature.class);
- if (privatekey instanceof RSAPrivateKey) {
- signer.setSignatureAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256);
-
- } else if (privatekey instanceof iaik.security.ecc.ecdsa.ECPrivateKey) {
- signer.setSignatureAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_ECDSA_SHA1);
-
- } else {
- Logger.warn("Could NOT evaluate the Private-Key type from " + credentials.getEntityId() + " credential.");
-
-
- }
-
- signer.setCanonicalizationAlgorithm(SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS);
- signer.setSigningCredential(credentials);
- return signer;
-
- }
-
}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/AbstractCredentialProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/AbstractCredentialProvider.java
index bf4cfd480..77cc7228b 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/AbstractCredentialProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/AbstractCredentialProvider.java
@@ -24,6 +24,7 @@ package at.gv.egovernment.moa.id.protocols.pvp2x.signer;
import java.security.KeyStore;
import java.security.PrivateKey;
+import java.security.interfaces.ECPrivateKey;
import java.security.interfaces.RSAPrivateKey;
import org.opensaml.xml.security.credential.Credential;
@@ -198,7 +199,7 @@ public abstract class AbstractCredentialProvider {
if (privatekey instanceof RSAPrivateKey) {
signer.setSignatureAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256);
- } else if (privatekey instanceof iaik.security.ecc.ecdsa.ECPrivateKey) {
+ } else if (privatekey instanceof ECPrivateKey) {
signer.setSignatureAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_ECDSA_SHA1);
} else {
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ECDSAKeyValueConverter.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ECDSAKeyValueConverter.java
index 2c0a82708..f37ae0b0b 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ECDSAKeyValueConverter.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ECDSAKeyValueConverter.java
@@ -20,48 +20,15 @@
* The "NOTICE" text file is part of the distribution. Any derivative works
* that you distribute must include a readable copy of the "NOTICE" text file.
******************************************************************************/
-/*
- * Copyright 2003 Federal Chancellery Austria
- * MOA-ID has been developed in a cooperation between BRZ, the Federal
- * Chancellery Austria - ICT staff unit, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- * http://www.osor.eu/eupl/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- */
-
package at.gv.egovernment.moa.id.util;
-import iaik.security.ecc.ecdsa.ECDSAParameter;
-import iaik.security.ecc.ecdsa.ECPublicKey;
-import iaik.security.ecc.math.ecgroup.AffineCoordinate;
-import iaik.security.ecc.math.ecgroup.Coordinate;
-import iaik.security.ecc.math.ecgroup.CoordinateTypes;
-import iaik.security.ecc.math.ecgroup.ECGroupFactory;
-import iaik.security.ecc.math.ecgroup.ECPoint;
-import iaik.security.ecc.math.ecgroup.EllipticCurve;
-import iaik.security.ecc.math.field.Field;
-import iaik.security.ecc.math.field.FieldElement;
-import iaik.security.ecc.math.field.PrimeField;
-import iaik.security.ecc.parameter.ECCParameterFactory;
-import iaik.security.ecc.spec.ECCParameterSpec;
-
import java.math.BigInteger;
import java.security.PublicKey;
+import java.security.spec.ECField;
+import java.security.spec.ECFieldF2m;
+import java.security.spec.ECFieldFp;
+import java.security.spec.ECPoint;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Vector;
@@ -72,6 +39,15 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import at.gv.egovernment.moa.logging.Logger;
+import iaik.security.ec.common.ECParameterSpec;
+import iaik.security.ec.common.ECPublicKey;
+import iaik.security.ec.common.ECStandardizedParameterFactory;
+import iaik.security.ec.common.EllipticCurve;
+import iaik.security.ec.math.field.Field;
+import iaik.security.ec.math.field.FieldElement;
+import iaik.security.ec.math.field.PrimeField;
+
public class ECDSAKeyValueConverter
{
@@ -94,15 +70,13 @@ public class ECDSAKeyValueConverter
if (domainParams == null) throw new Exception("Domain parameters must not be implicit.");
Element namedCurve = getChildElement(domainParams, ecdsaNS, "NamedCurve", 1);
- ECCParameterSpec eccParameterSpec;
+ ECParameterSpec eccParameterSpec;
if (namedCurve != null)
{
// URL curveNameURN = new URL(namedCurve.getAttributeNS(null, "URN"));
String curveNameOID = namedCurve.getAttributeNS(null, "URN").substring(8);
- ECCParameterFactory eccParamFactory = ECCParameterFactory.getInstance();
- // eccParameterSpec = eccParamFactory.getParameterByOID(curveNameURN.getPath().substring(4));
- eccParameterSpec = eccParamFactory.getParameterByOID(curveNameOID);
+ eccParameterSpec = ECStandardizedParameterFactory.getParametersByOID(curveNameOID);
}
else
{
@@ -167,14 +141,21 @@ public class ECDSAKeyValueConverter
String cofactorStr = getChildElementText(basePointParams, ecdsaNS, "Cofactor", 1);
BigInteger cofactor = (cofactorStr != null) ? new BigInteger(cofactorStr, 10) : null;
+ BigInteger a = new BigInteger(aStr, 10);
+ BigInteger b = new BigInteger(bStr, 10);
+ BigInteger basePointX = new BigInteger(basePointXStr, 10);
+ BigInteger basePointY = new BigInteger(basePointYStr, 10);
+
if (fieldParamsType == FIELD_TYPE_PRIME)
- {
- BigInteger a = new BigInteger(aStr, 10);
- BigInteger b = new BigInteger(bStr, 10);
- BigInteger basePointX = new BigInteger(basePointXStr, 10);
- BigInteger basePointY = new BigInteger(basePointYStr, 10);
- eccParameterSpec = new ECCParameterSpec(p, cofactor, order, seed, null, a, b, basePointX,
- basePointY, null);
+ {
+ ECField javaECField = new ECFieldFp(p);
+ java.security.spec.EllipticCurve curve =
+ new java.security.spec.EllipticCurve(javaECField, a, b, seed.toByteArray());
+ java.security.spec.ECPoint javaECbasePoint =
+ new java.security.spec.ECPoint(basePointX, basePointY);
+ java.security.spec.ECParameterSpec javaECSpec =
+ new java.security.spec.ECParameterSpec(curve, javaECbasePoint, order, cofactor.intValue());
+ eccParameterSpec = ECParameterSpec.getParameterSpec(javaECSpec);
}
else
{
@@ -193,9 +174,19 @@ public class ECDSAKeyValueConverter
irreducible[k1/32] += 1 << k1 % 32;
irreducible[0] += 1;
}
- eccParameterSpec = new ECCParameterSpec(irreducible, cofactor, order, octetString2IntArray(aStr),
- octetString2IntArray(bStr), octetString2IntArray(basePointXStr),
- octetString2IntArray(basePointYStr), null);
+
+ ECField javaECField = new ECFieldF2m(m, irreducible);
+ java.security.spec.EllipticCurve curve =
+ new java.security.spec.EllipticCurve(javaECField, a, b, seed.toByteArray());
+ java.security.spec.ECPoint javaECbasePoint =
+ new java.security.spec.ECPoint(basePointX, basePointY);
+ java.security.spec.ECParameterSpec javaECSpec =
+ new java.security.spec.ECParameterSpec(curve, javaECbasePoint, order, cofactor.intValue());
+ eccParameterSpec = ECParameterSpec.getParameterSpec(javaECSpec);
+
+// eccParameterSpec = new ECCParameterSpec(irreducible, cofactor, order, octetString2IntArray(aStr),
+// octetString2IntArray(bStr), octetString2IntArray(basePointXStr),
+// octetString2IntArray(basePointYStr), null);
}
}
@@ -206,10 +197,14 @@ public class ECDSAKeyValueConverter
Element publicKeyYElem = getChildElement(publicKeyElem, ecdsaNS, "Y", 1);
String publicKeyYStr = publicKeyYElem.getAttributeNS(null, "Value");
- ECDSAParameter ecdsaParams = new ECDSAParameter(eccParameterSpec, CoordinateTypes.PROJECTIVE_COORDINATES);
- ECGroupFactory ecGroupFactory = ECGroupFactory.getInstance();
- EllipticCurve eCurve = ecGroupFactory.getCurve(eccParameterSpec.getA(),
- eccParameterSpec.getB(), eccParameterSpec.getR(), CoordinateTypes.PROJECTIVE_COORDINATES);
+ //ECParameterSpec ecdsaParams = new ECParameterSpec(eccParameterSpec, CoordinateTypes.PROJECTIVE_COORDINATES);
+ //ECGroupFactory ecGroupFactory = ECGroupFactory.getInstance();
+
+ EllipticCurve eCurve = eccParameterSpec.getCurve();
+
+// EllipticCurve eCurve = ecGroupFactory.getCurve(eccParameterSpec.getA(),
+// eccParameterSpec.getB(), eccParameterSpec.getR(), CoordinateTypes.PROJECTIVE_COORDINATES);
+
Field field = eCurve.getField();
// Detect type of public key field elements
@@ -239,10 +234,19 @@ public class ECDSAKeyValueConverter
}
// ProjectiveCoordinate publicKeyPointCoordinate = new ProjectiveCoordinate(publicKeyPointX,
// publicKeyPointY, field.getONEelement());
- Coordinate publicKeyPointCoordinate = new AffineCoordinate(publicKeyPointX,
- publicKeyPointY).toProjective();
- ECPoint publicKeyPoint = eCurve.newPoint(publicKeyPointCoordinate);
- ECPublicKey publicKey = new ECPublicKey(ecdsaParams, publicKeyPoint);
+// Coordinate publicKeyPointCoordinate = new AffineCoordinate(publicKeyPointX,
+// publicKeyPointY).toProjective();
+
+ ECPoint publicKeyPointECPoint = new ECPoint(publicKeyPointX.toBigInteger(),
+ publicKeyPointY.toBigInteger());
+
+ if (!eCurve.containsPoint(publicKeyPointECPoint)) {
+ Logger.error("IDL ECC parameter extraction FAILED! Public-Key ECPoint is not on the curve!");
+ throw new Exception("IDL ECC parameter extraction FAILED! Public-Key ECPoint is not on the curve!");
+
+ }
+
+ ECPublicKey publicKey = new ECPublicKey(eccParameterSpec, publicKeyPointECPoint);
return publicKey;
}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/SSLUtils.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/SSLUtils.java
index f0cec1d61..891d01e09 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/SSLUtils.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/SSLUtils.java
@@ -46,9 +46,6 @@
package at.gv.egovernment.moa.id.util;
-import iaik.pki.PKIException;
-import iaik.security.provider.IAIK;
-
import java.io.BufferedInputStream;
import java.io.BufferedReader;
import java.io.IOException;
@@ -71,6 +68,8 @@ import at.gv.egovernment.moa.id.commons.api.exceptions.ConfigurationException;
import at.gv.egovernment.moa.id.commons.utils.ssl.SSLConfigurationException;
import at.gv.egovernment.moa.id.config.ConnectionParameter;
import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProviderFactory;
+import iaik.pki.PKIException;
+import iaik.security.provider.IAIK;
/**
@@ -126,8 +125,7 @@ public class SSLUtils {
//INFO: MOA-ID 2.x always use defaultChainingMode
try {
- SSLSocketFactory ssf =
- at.gv.egovernment.moa.id.commons.utils.ssl.SSLUtils.getSSLSocketFactory(
+ SSLSocketFactory ssf = at.gv.egovernment.moa.id.commons.utils.ssl.SSLUtils.getSSLSocketFactory(
connParam.getUrl(),
conf.getCertstoreDirectory(),
trustStoreURL,
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index ea9e06fd6..01f5913fa 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -97,16 +97,18 @@
<groupId>iaik.prod</groupId>
<artifactId>iaik_jce_full</artifactId>
</dependency>
- <dependency>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_moa</artifactId>
- </dependency>
+ <dependency>
+ <groupId>MOA.id</groupId>
+ <artifactId>moa-spss-container</artifactId>
+ <version>${moa-id-version}</version>
+ </dependency>
+
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_X509TrustManager</artifactId>
</dependency>
-
+
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/MOAHttpProtocolSocketFactory.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/MOAHttpProtocolSocketFactory.java
index 2ade63c1c..142e9a23a 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/MOAHttpProtocolSocketFactory.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/MOAHttpProtocolSocketFactory.java
@@ -22,15 +22,12 @@
*/
package at.gv.egovernment.moa.id.commons.utils;
-import iaik.pki.PKIException;
-
import java.io.IOException;
import java.net.InetAddress;
import java.net.Socket;
import java.net.UnknownHostException;
import java.security.GeneralSecurityException;
-import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocketFactory;
import org.apache.commons.httpclient.ConnectTimeoutException;
@@ -39,7 +36,7 @@ import org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory;
import at.gv.egovernment.moa.id.commons.ex.MOAHttpProtocolSocketFactoryException;
import at.gv.egovernment.moa.id.commons.utils.ssl.SSLConfigurationException;
-import at.gv.egovernment.moa.id.commons.utils.ssl.SSLUtils;
+import iaik.pki.PKIException;
/**
* @author tlenz
@@ -62,7 +59,7 @@ public class MOAHttpProtocolSocketFactory implements SecureProtocolSocketFactory
super();
try {
- this.sslfactory = SSLUtils.getSSLSocketFactory(
+ this.sslfactory = at.gv.egovernment.moa.id.commons.utils.ssl.SSLUtils.getSSLSocketFactory(
url,
certStoreRootDirParam,
trustStoreURL,
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/CertStoreConfigurationImpl.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/CertStoreConfigurationImpl.java
index 00e750f58..dcbec6bf6 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/CertStoreConfigurationImpl.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/CertStoreConfigurationImpl.java
@@ -46,13 +46,17 @@
package at.gv.egovernment.moa.id.commons.utils.ssl;
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
import at.gv.egovernment.moa.logging.Logger;
import iaik.pki.store.certstore.CertStoreConfiguration;
import iaik.pki.store.certstore.CertStoreParameters;
import iaik.pki.store.certstore.CertStoreTypes;
import iaik.pki.store.certstore.directory.DirectoryCertStoreParameters;
-
-import java.io.File;
+import iaik.pki.store.certstore.directory.VirtualCertStore;
/**
* Implementation of interface needed to initialize an IAIK JSSE <code>TrustManager</code>
@@ -153,4 +157,16 @@ public class CertStoreConfigurationImpl extends ObservableImpl
return CertStoreTypes.DIRECTORY;
}
+ /* (non-Javadoc)
+ * @see iaik.pki.store.certstore.directory.DirectoryCertStoreParameters#getVirtualStores()
+ */
+ @Override
+ public Set getVirtualStores() {
+ //TODO: only for Testing and not complete !!!Ask Harald !!!!
+
+ Map<String, VirtualCertStore> vCertStore = new HashMap<String, VirtualCertStore>();
+ return vCertStore.keySet();
+
+ }
+
}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/MOAIDTrustManager.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/MOAIDTrustManager.java
index eaef3f1d4..bcd38c638 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/MOAIDTrustManager.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/MOAIDTrustManager.java
@@ -57,9 +57,8 @@ import java.util.ArrayList;
import java.util.List;
import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.logging.LoggingContext;
-import at.gv.egovernment.moa.logging.LoggingContextManager;
-
+import at.gv.egovernment.moaspss.logging.LoggingContext;
+import at.gv.egovernment.moaspss.logging.LoggingContextManager;
import iaik.pki.jsse.IAIKX509TrustManager;
/**
@@ -95,14 +94,14 @@ public class MOAIDTrustManager extends IAIKX509TrustManager {
* Fixes a bug occuring in the case MOA-SP is called by API.
* In this case, IAIKX509TrustManager uses the LogginConfig of MOA-SP.
* This method must be called before a MOAIDTrustManager is constructed,
- * from every thread.
- */
+ * from every thread.
+ */
public static void initializeLoggingContext() {
if (LoggingContextManager.getInstance().getLoggingContext() == null)
LoggingContextManager.getInstance().setLoggingContext(
new LoggingContext(Thread.currentThread().getName()));
}
-
+
/**
* Builds an Array of accepted server certificates from an URL,
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/PKIConfigurationImpl.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/PKIConfigurationImpl.java
index 5d8c7a54e..3eb4707c8 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/PKIConfigurationImpl.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/PKIConfigurationImpl.java
@@ -60,6 +60,10 @@ import iaik.pki.store.revocation.archive.ArchiveConfiguration;
* @version $Id$
*/
public class PKIConfigurationImpl implements PKIConfiguration {
+
+ private static final int TIMEOUT_READ = 60; //[sec]
+ private static final int TIMEOUT_CONNECTION = 60; //[sec]
+
/** The configuration for the CertStore */
private CertStoreConfiguration certStoreConfiguration;
/** The configuration for the RevocationChecks */
@@ -108,11 +112,19 @@ public class PKIConfigurationImpl implements PKIConfiguration {
}
/* (non-Javadoc)
- * @see iaik.pki.PKIConfiguration#getTimeout()
+ * @see iaik.pki.PKIConfiguration#getConnectTimeout()
*/
- public int getTimeout() {
- // TODO Auto-generated method stub
- return 0;
+@Override
+public int getConnectTimeout() {
+ return TIMEOUT_CONNECTION * 1000;
+}
+
+/* (non-Javadoc)
+ * @see iaik.pki.PKIConfiguration#getReadTimeout()
+ */
+@Override
+public int getReadTimeout() {
+ return TIMEOUT_READ * 1000;
}
}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/PKIProfileImpl.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/PKIProfileImpl.java
index 59994a257..a34fa9b8b 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/PKIProfileImpl.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/PKIProfileImpl.java
@@ -96,13 +96,6 @@ public class PKIProfileImpl extends ObservableImpl
}
/**
- * @see iaik.pki.PKIProfile#autoAddCertificates()
- */
- public boolean autoAddCertificates() {
- return true;
- }
-
- /**
* @see iaik.pki.PKIProfile#getRevocationProfile()
*/
public RevocationProfile getRevocationProfile() {
@@ -227,4 +220,22 @@ public class PKIProfileImpl extends ObservableImpl
public void setId(String id) {
this.id = id;
}
+
+/* (non-Javadoc)
+ * @see iaik.pki.PKIProfile#autoAddCertificates()
+ */
+@Override
+public int autoAddCertificates() {
+ //TODO: ask harald!!!!!
+ return 1;
+}
+
+/* (non-Javadoc)
+ * @see iaik.pki.PKIProfile#getIndirectRevocationTrustStoreProfile()
+ */
+@Override
+public TrustStoreProfile getIndirectRevocationTrustStoreProfile() {
+ //TODO: ask harald!!!!!
+ return null;
+}
}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/RevocationConfigurationImpl.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/RevocationConfigurationImpl.java
index b5e0543db..40d081ea4 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/RevocationConfigurationImpl.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/RevocationConfigurationImpl.java
@@ -46,13 +46,16 @@
package at.gv.egovernment.moa.id.commons.utils.ssl;
-import iaik.pki.revocation.RevocationConfiguration;
-
import java.security.cert.X509Certificate;
import java.util.Collections;
import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
import java.util.Set;
+import iaik.pki.revocation.RevocationConfiguration;
+import iaik.pki.revocation.dbcrl.config.DBCrlConfig;
+
/**
* Implementation of interface needed to initialize an IAIK JSSE <code>TrustManager</code>
* @author Paul Ivancsics
@@ -81,4 +84,41 @@ public class RevocationConfigurationImpl extends ObservableImpl implements Revoc
return null;
}
+/* (non-Javadoc)
+ * @see iaik.pki.revocation.RevocationConfiguration#getKeepRevocationInfo()
+ */
+@Override
+public boolean getKeepRevocationInfo() {
+ return false;
+}
+
+/* (non-Javadoc)
+ * @see iaik.pki.revocation.RevocationConfiguration#getPositiveOCSPResponders()
+ */
+@Override
+public Set getPositiveOCSPResponders() {
+
+ //TODO: !!!!! ASK Harald !!!!!
+ Map<String, String> test = new HashMap<String, String>();
+ test.put("ALL", "ALL");
+ return test.keySet();
+}
+
+/* (non-Javadoc)
+ * @see iaik.pki.revocation.RevocationConfiguration#skipIndirectCRLCheckForAlternativeDistributionPoints()
+ */
+@Override
+public boolean skipIndirectCRLCheckForAlternativeDistributionPoints() {
+ //TODO: !!!!! ASK Harald !!!!!
+ return false;
+}
+
+/* (non-Javadoc)
+ * @see iaik.pki.revocation.RevocationConfiguration#getDataBaseCRLConfig()
+ */
+@Override
+public DBCrlConfig getDataBaseCRLConfig() {
+ return null;
+}
+
}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/SSLUtils.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/SSLUtils.java
index 68437a04d..503e0bfc4 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/SSLUtils.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/SSLUtils.java
@@ -46,25 +46,28 @@
package at.gv.egovernment.moa.id.commons.utils.ssl;
-import iaik.pki.PKIConfiguration;
-import iaik.pki.PKIException;
-import iaik.pki.PKIFactory;
-import iaik.pki.PKIProfile;
-import iaik.pki.jsse.IAIKX509TrustManager;
-import iaik.security.provider.IAIK;
-
import java.io.IOException;
import java.security.GeneralSecurityException;
+import java.security.KeyStore;
import java.security.Security;
import java.util.HashMap;
import java.util.Map;
import javax.net.ssl.KeyManager;
+import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager;
import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moa.util.KeyStoreUtils;
+import iaik.pki.PKIConfiguration;
+import iaik.pki.PKIException;
+import iaik.pki.PKIFactory;
+import iaik.pki.PKIProfile;
+import iaik.pki.jsse.IAIKX509TrustManager;
+//import iaik.pki.jsse.IAIKX509TrustManager;
+import iaik.security.provider.IAIK;
/**
@@ -136,7 +139,7 @@ public class SSLUtils {
acceptedServerCertURL,
checkRevocation);
- KeyManager[] kms = at.gv.egovernment.moa.util.SSLUtils.getKeyManagers(
+ KeyManager[] kms = getKeyManagers(
clientKeyStoreType, clientKeyStoreURL, clientKeyStorePassword);
SSLContext ctx = SSLContext.getInstance("TLS");
ctx.init(kms, tms, null);
@@ -154,6 +157,68 @@ public class SSLUtils {
}
/**
+ * Loads the client key store from file and gets the
+ * <code>KeyManager</code>s from a default <code>KeyManagerFactory</code>,
+ * initialized from the given client key store.
+ * @param clientKeyStoreType key store type of <code>clientKeyStore</code>
+ * @param clientKeyStoreURL URL of key store containing keys to be used for
+ * client authentication; if <code>null</code>, the default key store will be utilized
+ * @param clientKeyStorePassword password used to check the integrity of the client key store;
+ * if <code>null</code>, it will not be checked
+ * @return <code>KeyManager</code>s to be used for creating an
+ * <code>SSLSocketFactory</code> utilizing the given client key store
+ * @throws IOException thrown while reading from the key store file
+ * @throws GeneralSecurityException thrown while initializing the
+ * default <code>KeyManagerFactory</code>
+ */
+ public static KeyManager[] getKeyManagers (
+ String clientKeyStoreType,
+ String clientKeyStoreURL,
+ String clientKeyStorePassword)
+ throws IOException, GeneralSecurityException {
+
+ if (clientKeyStoreURL == null)
+ return null;
+
+ // Set up the KeyStore to use. We need to load the file into
+ // a KeyStore instance.
+ KeyStore clientKeyStore = KeyStoreUtils.loadKeyStore(
+ clientKeyStoreType, clientKeyStoreURL, clientKeyStorePassword);
+ return getKeyManagers(clientKeyStore, clientKeyStorePassword);
+ }
+ /**
+ * Gets the <code>KeyManager</code>s from a default <code>KeyManagerFactory</code>,
+ * initialized from the given client key store.
+ * @param clientKeyStore client key store
+ * @param clientKeyStorePassword if provided, it will be used to check
+ * the integrity of the client key store; if omitted, it will not be checked
+ * @return <code>KeyManager</code>s to be used for creating an
+ * <code>SSLSocketFactory</code> utilizing the given client key store
+ * @throws GeneralSecurityException thrown while initializing the
+ * default <code>KeyManagerFactory</code>
+ */
+ public static KeyManager[] getKeyManagers (
+ KeyStore clientKeyStore,
+ String clientKeyStorePassword)
+ throws GeneralSecurityException {
+
+ if (clientKeyStore == null)
+ return null;
+
+ // Now we initialize the default KeyManagerFactory with this KeyStore
+ String alg=KeyManagerFactory.getDefaultAlgorithm();
+ KeyManagerFactory kmFact=KeyManagerFactory.getInstance(alg);
+ char[] password = null;
+ if (clientKeyStorePassword != null)
+ password = clientKeyStorePassword.toCharArray();
+ kmFact.init(clientKeyStore, password);
+
+ // And now get the KeyManagers
+ KeyManager[] kms=kmFact.getKeyManagers();
+ return kms;
+ }
+
+ /**
* Initializes an <code>IAIKX509TrustManager</code> for a given trust store,
* using configuration data.
*
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/logging/LogMsg.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/logging/LogMsg.java
deleted file mode 100644
index 51667f010..000000000
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/logging/LogMsg.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2003 Federal Chancellery Austria
- * MOA-ID has been developed in a cooperation between BRZ, the Federal
- * Chancellery Austria - ICT staff unit, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- * http://www.osor.eu/eupl/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- */
-
-
-package at.gv.egovernment.moa.logging;
-
-/**
- * A unified message type to log messages from inside the MOA subsystem.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class LogMsg {
- /** The message to log. */
- private Object message;
-
- /**
- * Create a <code>LogMsg</code> object.
- *
- * @param message The actual message to log. May be <code>null</code>.
- */
- public LogMsg(Object message) {
- this.message = message;
- }
-
- /**
- * Convert this log message to a <code>String</code>.
- *
- * @return The <code>String</code> representation of this log message.
- */
- public String toString() {
- StringBuffer msg = new StringBuffer();
- LoggingContext ctx =
- LoggingContextManager.getInstance().getLoggingContext();
- String tid = ctx != null ? ctx.getTransactionID() : null;
- String nodeId = ctx != null ? ctx.getNodeID() : null;
-
- msg.append("TID=");
- msg.append(tid != null ? tid : "<null>");
- msg.append(" NID=");
- msg.append(nodeId != null ? nodeId : "<null>");
- msg.append(" MSG=");
- msg.append(message != null ? message.toString() : "<null>");
-
- return msg.toString();
- }
-}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/logging/LoggingContext.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/logging/LoggingContext.java
deleted file mode 100644
index db4b93a0b..000000000
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/logging/LoggingContext.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2003 Federal Chancellery Austria
- * MOA-ID has been developed in a cooperation between BRZ, the Federal
- * Chancellery Austria - ICT staff unit, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- * http://www.osor.eu/eupl/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- */
-
-
-package at.gv.egovernment.moa.logging;
-
-/**
- * Encapsulates contextual information (i.e. per request information) for
- * logging purposes.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class LoggingContext {
- /** The name of the node ID system property. */
- public static final String NODE_ID_PROPERTY = "moa.node-id";
-
- /** The current transaction ID. */
- private String transactionID;
- /** The node ID. */
- private String nodeID;
-
- /**
- * Create a new <code>LoggingContext</code>.
- *
- * @param transactionID The transaction ID. May be <code>null</code>.
- */
- public LoggingContext(String transactionID) {
- this.transactionID = transactionID;
- this.nodeID = System.getProperty(NODE_ID_PROPERTY);
- }
-
- /**
- * Return the transaction ID.
- *
- * @return The transaction ID.
- */
- public String getTransactionID() {
- return transactionID;
- }
-
- /**
- * Return the node ID.
- *
- * @return The node ID.
- */
- public String getNodeID() {
- return nodeID;
- }
-}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/logging/LoggingContextManager.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/logging/LoggingContextManager.java
deleted file mode 100644
index f0d7b4c07..000000000
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/logging/LoggingContextManager.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2003 Federal Chancellery Austria
- * MOA-ID has been developed in a cooperation between BRZ, the Federal
- * Chancellery Austria - ICT staff unit, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- * http://www.osor.eu/eupl/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- */
-
-
-package at.gv.egovernment.moa.logging;
-
-/**
- * Provides each thread with a single instance of <code>LoggingContext</code>.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class LoggingContextManager {
- /** The single instance of this class. */
- private static LoggingContextManager instance = null;
-
- /** The <code>LoggingContext</code> for each thread. */
- private ThreadLocal context;
-
- /**
- * Get the single instance of the <code>LoggingContextManager</code> class.
- *
- * @return LoggingContextManager The single instance.
- */
- public static synchronized LoggingContextManager getInstance() {
- if (instance == null) {
- instance = new LoggingContextManager();
- }
- return instance;
- }
-
- /**
- * Creates a new <code>LoggingContextManager</code>.
- *
- * Protected to disallow direct instantiation.
- */
- protected LoggingContextManager() {
- context = new ThreadLocal();
- }
-
- /**
- * Set the <code>LoggingContext</code> context for the current thread.
- *
- * @param ctx The <code>LoggingContext</code> for the current thread.
- */
- public void setLoggingContext(LoggingContext ctx) {
- context.set(ctx);
- }
-
- /**
- * Return the <code>LoggingContext</code> for the current thread.
- *
- * @return LoggingContext The <code>LoggingContext</code> for the current
- * thread, or <code>null</code> if none has been set.
- */
- public LoggingContext getLoggingContext() {
- return (LoggingContext) context.get();
- }
-
-}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/util/MOAEntityResolver.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/util/MOAEntityResolver.java
index 8f3ffd4c6..b1a3f8446 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/util/MOAEntityResolver.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/util/MOAEntityResolver.java
@@ -31,7 +31,6 @@ import org.apache.xerces.util.URI.MalformedURIException;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
-import at.gv.egovernment.moa.logging.LogMsg;
import at.gv.egovernment.moa.logging.Logger;
/**
@@ -72,7 +71,7 @@ public class MOAEntityResolver implements EntityResolver {
if (Logger.isDebugEnabled()) {
Logger.debug(
- new LogMsg("resolveEntity: p=" + publicId + " s=" + systemId));
+ new at.gv.egovernment.moaspss.logging.LogMsg("resolveEntity: p=" + publicId + " s=" + systemId));
}
if (publicId != null) {
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/util/MOAErrorHandler.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/util/MOAErrorHandler.java
index 3769b264d..ea71a677f 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/util/MOAErrorHandler.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/util/MOAErrorHandler.java
@@ -28,8 +28,8 @@ import org.apache.xml.utils.DefaultErrorHandler;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
-import at.gv.egovernment.moa.logging.LogMsg;
import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moaspss.logging.LogMsg;
/**
* An <code>ErrorHandler</code> that logs a message and throws a
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/util/SSLUtils.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/util/SSLUtils.java
deleted file mode 100644
index c2c67ec58..000000000
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/util/SSLUtils.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * Copyright 2003 Federal Chancellery Austria
- * MOA-ID has been developed in a cooperation between BRZ, the Federal
- * Chancellery Austria - ICT staff unit, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- * http://www.osor.eu/eupl/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- */
-
-
-package at.gv.egovernment.moa.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.GeneralSecurityException;
-import java.security.KeyStore;
-
-import javax.net.ssl.KeyManager;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
-
-/**
- * Utility for connecting to server applications via SSL.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class SSLUtils {
-
- /**
- * Creates an <code>SSLSocketFactory</code> which utilizes the given trust store.
- *
- * @param trustStoreType key store type of trust store
- * @param trustStoreInputStream input stream for reading JKS trust store containing
- * trusted server certificates; if <code>null</code>, the default
- * trust store will be utilized
- * @param trustStorePassword if provided, it will be used to check
- * the integrity of the trust store; if omitted, it will not be checked
- * @return <code>SSLSocketFactory</code> to be used by an <code>HttpsURLConnection</code>
- * @throws IOException thrown while reading from the input stream
- * @throws GeneralSecurityException thrown while creating the socket factory
- */
- public static SSLSocketFactory getSSLSocketFactory(
- String trustStoreType,
- InputStream trustStoreInputStream,
- String trustStorePassword)
- throws IOException, GeneralSecurityException {
-
- TrustManager[] tms = getTrustManagers(trustStoreType, trustStoreInputStream, trustStorePassword);
- SSLContext ctx = SSLContext.getInstance("TLS");
- ctx.init(null, tms, null);
-
- SSLSocketFactory sf = ctx.getSocketFactory();
- return sf;
- }
- /**
- * Creates an <code>SSLSocketFactory</code> which utilizes the
- * given trust store and keystore.
- *
- * @param trustStore trust store containing trusted server certificates;
- * if <code>null</code>, the default trust store will be utilized
- * @param clientKeyStoreType key store type of <code>clientKeyStore</code>
- * @param clientKeyStoreURL URL of key store containing keys to be used for
- * client authentication; if <code>null</code>, the default key store will be utilized
- * @param clientKeyStorePassword if provided, it will be used to check
- * the integrity of the client key store; if omitted, it will not be checked
- * @return <code>SSLSocketFactory</code> to be used by an <code>HttpsURLConnection</code>
- * @throws IOException thrown while reading key store file
- * @throws GeneralSecurityException thrown while creating the socket factory
- */
- public static SSLSocketFactory getSSLSocketFactory(
- KeyStore trustStore,
- String clientKeyStoreType,
- String clientKeyStoreURL,
- String clientKeyStorePassword)
- throws IOException, GeneralSecurityException {
-
- SSLContext ctx = getSSLContext(
- trustStore, clientKeyStoreType, clientKeyStoreURL, clientKeyStorePassword);
- SSLSocketFactory sf = ctx.getSocketFactory();
- return sf;
- }
- /**
- * Creates an <code>SSLContext</code> initialized for the
- * given trust store and keystore.
- *
- * @param trustStore trust store containing trusted server certificates;
- * if <code>null</code>, the default trust store will be utilized
- * @param clientKeyStoreType key store type of <code>clientKeyStore</code>
- * @param clientKeyStoreURL URL of key store containing keys to be used for
- * client authentication; if <code>null</code>, the default key store will be utilized
- * @param clientKeyStorePassword if provided, it will be used to check
- * the integrity of the client key store; if omitted, it will not be checked
- * @return <code>SSLContext</code> to be used for creating an <code>SSLSocketFactory</code>
- * @throws IOException thrown while reading key store file
- * @throws GeneralSecurityException thrown while creating the SSL context
- */
- public static SSLContext getSSLContext(
- KeyStore trustStore,
- String clientKeyStoreType,
- String clientKeyStoreURL,
- String clientKeyStorePassword)
- throws IOException, GeneralSecurityException {
-
- TrustManager[] tms = getTrustManagers(trustStore);
- KeyManager[] kms = getKeyManagers(clientKeyStoreType, clientKeyStoreURL, clientKeyStorePassword);
- SSLContext ctx = SSLContext.getInstance("TLS");
- ctx.init(kms, tms, null);
- return ctx;
- }
- /**
- * Loads the trust store from an input stream and gets the
- * <code>TrustManager</code>s from a default <code>TrustManagerFactory</code>,
- * initialized from the given trust store.
- * @param trustStoreType key store type of trust store
- * @param trustStoreInputStream input stream for reading JKS trust store containing
- * trusted server certificates; if <code>null</code>, the default
- * trust store will be utilized
- * @param trustStorePassword if provided, it will be used to check
- * the integrity of the trust store; if omitted, it will not be checked
- * @return <code>TrustManager</code>s to be used for creating an
- * <code>SSLSocketFactory</code> utilizing the given trust store
- * @throws IOException thrown while reading from the input stream
- * @throws GeneralSecurityException thrown while initializing the
- * default <code>TrustManagerFactory</code>
- */
- protected static TrustManager[] getTrustManagers(
- String trustStoreType,
- InputStream trustStoreInputStream,
- String trustStorePassword)
- throws IOException, GeneralSecurityException {
-
- if (trustStoreInputStream == null)
- return null;
-
- // Set up the TrustStore to use. We need to load the file into
- // a KeyStore instance.
- KeyStore trustStore = KeyStoreUtils.loadKeyStore(trustStoreType, trustStoreInputStream, trustStorePassword);
- return getTrustManagers(trustStore);
- }
- /**
- * Gets the <code>TrustManager</code>s from a default <code>TrustManagerFactory</code>,
- * initialized from the given trust store.
- *
- * @param trustStore the trust store to use
- * @return <code>TrustManager</code>s to be used for creating an
- * <code>SSLSocketFactory</code> utilizing the given trust store
- * @throws GeneralSecurityException thrown while initializing the
- * default <code>TrustManagerFactory</code>
- */
- protected static TrustManager[] getTrustManagers(KeyStore trustStore)
- throws GeneralSecurityException {
-
- if (trustStore == null)
- return null;
-
- // Initialize the default TrustManagerFactory with this KeyStore
- String alg=TrustManagerFactory.getDefaultAlgorithm();
- TrustManagerFactory tmFact=TrustManagerFactory.getInstance(alg);
- tmFact.init(trustStore);
-
- // And now get the TrustManagers
- TrustManager[] tms=tmFact.getTrustManagers();
- return tms;
- }
- /**
- * Loads the client key store from file and gets the
- * <code>KeyManager</code>s from a default <code>KeyManagerFactory</code>,
- * initialized from the given client key store.
- * @param clientKeyStoreType key store type of <code>clientKeyStore</code>
- * @param clientKeyStoreURL URL of key store containing keys to be used for
- * client authentication; if <code>null</code>, the default key store will be utilized
- * @param clientKeyStorePassword password used to check the integrity of the client key store;
- * if <code>null</code>, it will not be checked
- * @return <code>KeyManager</code>s to be used for creating an
- * <code>SSLSocketFactory</code> utilizing the given client key store
- * @throws IOException thrown while reading from the key store file
- * @throws GeneralSecurityException thrown while initializing the
- * default <code>KeyManagerFactory</code>
- */
- public static KeyManager[] getKeyManagers (
- String clientKeyStoreType,
- String clientKeyStoreURL,
- String clientKeyStorePassword)
- throws IOException, GeneralSecurityException {
-
- if (clientKeyStoreURL == null)
- return null;
-
- // Set up the KeyStore to use. We need to load the file into
- // a KeyStore instance.
- KeyStore clientKeyStore = KeyStoreUtils.loadKeyStore(
- clientKeyStoreType, clientKeyStoreURL, clientKeyStorePassword);
- return getKeyManagers(clientKeyStore, clientKeyStorePassword);
- }
- /**
- * Gets the <code>KeyManager</code>s from a default <code>KeyManagerFactory</code>,
- * initialized from the given client key store.
- * @param clientKeyStore client key store
- * @param clientKeyStorePassword if provided, it will be used to check
- * the integrity of the client key store; if omitted, it will not be checked
- * @return <code>KeyManager</code>s to be used for creating an
- * <code>SSLSocketFactory</code> utilizing the given client key store
- * @throws GeneralSecurityException thrown while initializing the
- * default <code>KeyManagerFactory</code>
- */
- public static KeyManager[] getKeyManagers (
- KeyStore clientKeyStore,
- String clientKeyStorePassword)
- throws GeneralSecurityException {
-
- if (clientKeyStore == null)
- return null;
-
- // Now we initialize the default KeyManagerFactory with this KeyStore
- String alg=KeyManagerFactory.getDefaultAlgorithm();
- KeyManagerFactory kmFact=KeyManagerFactory.getInstance(alg);
- char[] password = null;
- if (clientKeyStorePassword != null)
- password = clientKeyStorePassword.toCharArray();
- kmFact.init(clientKeyStore, password);
-
- // And now get the KeyManagers
- KeyManager[] kms=kmFact.getKeyManagers();
- return kms;
- }
-}
diff --git a/id/server/moa-id-commons/src/test/java/test/at/gv/egovernment/moa/AllTests.java b/id/server/moa-id-commons/src/test/java/test/at/gv/egovernment/moa/AllTests.java
index c0a93bf03..df4fe807f 100644
--- a/id/server/moa-id-commons/src/test/java/test/at/gv/egovernment/moa/AllTests.java
+++ b/id/server/moa-id-commons/src/test/java/test/at/gv/egovernment/moa/AllTests.java
@@ -34,7 +34,7 @@ import junit.framework.TestSuite;
*/
public class AllTests {
- public static Test suite() {
+ public static Test suite() {
TestSuite suite = new TestSuite();
// suite.addTestSuite(DOMUtilsTest.class);
diff --git a/id/server/moa-id-commons/src/test/java/test/at/gv/egovernment/moa/util/SSLUtilsTest.java b/id/server/moa-id-commons/src/test/java/test/at/gv/egovernment/moa/util/SSLUtilsTest.java
deleted file mode 100644
index 2b5094fb8..000000000
--- a/id/server/moa-id-commons/src/test/java/test/at/gv/egovernment/moa/util/SSLUtilsTest.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Copyright 2003 Federal Chancellery Austria
- * MOA-ID has been developed in a cooperation between BRZ, the Federal
- * Chancellery Austria - ICT staff unit, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- * http://www.osor.eu/eupl/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- */
-
-
-package test.at.gv.egovernment.moa.util;
-
-import java.net.URL;
-import java.security.KeyStore;
-import java.security.Security;
-
-import javax.net.ssl.SSLException;
-import javax.net.ssl.SSLSocketFactory;
-
-import junit.framework.TestCase;
-import at.gv.egovernment.moa.util.KeyStoreUtils;
-import at.gv.egovernment.moa.util.SSLUtils;
-
-import com.sun.net.ssl.HostnameVerifier;
-import com.sun.net.ssl.HttpsURLConnection;
-
-/**
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class SSLUtilsTest extends TestCase {
-
- public SSLUtilsTest(String arg0) {
- super(arg0);
- }
-
-
- protected void setUp() throws Exception {
- //System.setProperty("javax.net.debug", "all");
- Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider());
- System.setProperty("java.protocol.handler.pkgs", "com.sun.net.ssl.internal.www.protocol");
- System.setProperty("https.cipherSuites", "SSL_DHE_DSS_WITH_DES_CBC_SHA,SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA,SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA,SSL_RSA_WITH_DES_CBC_SHA,SSL_RSA_WITH_3DES_EDE_CBC_SHA,SSL_RSA_EXPORT_WITH_RC4_40_MD5");
- }
-
- public void testGetSSLSocketFactoryBaltimoreOK() throws Exception {
- doTestGetSSLSocketFactory(
- "GET",
- "https://www.baltimore.com/",
- false,
- "file:data/test/security/cacerts+gt_cybertrust_root",
- "changeit",
- true);
- }
- public void testGetSSLSocketFactoryBaltimoreNOK() throws Exception {
- doTestGetSSLSocketFactory(
- "GET",
- "https://www.baltimore.com/",
- false,
- "file:data/test/security/cacerts",
- "changeit",
- false);
- }
- public void testGetSSLSocketFactoryVerisignOK() throws Exception {
- doTestGetSSLSocketFactory(
- "GET",
- "https://www.verisign.com/",
- false,
- "file:data/test/security/cacerts",
- "changeit",
- true);
- }
- public void testGetSSLSocketFactoryVerisignNoTruststoreOK() throws Exception {
- doTestGetSSLSocketFactory(
- "GET",
- "https://www.verisign.com/",
- false,
- null,
- null,
- true);
- }
- public void testGetSSLSocketFactoryLocalhostOK() throws Exception {
- String urlString = "https://localhost:8443/moa-id-auth/index.jsp";
- doTestGetSSLSocketFactory(
- "GET",
- urlString,
- true,
- "file:data/test/security/server.keystore.tomcat",
- "changeit",
- true);
- }
- public void testGetSSLSocketFactoryLocalhostNOK() throws Exception {
- String urlString = "https://localhost:8443/moa-id-auth/index.jsp";
- doTestGetSSLSocketFactory(
- "GET",
- urlString,
- true,
- null,
- null,
- false);
- }
-
- public void doTestGetSSLSocketFactory(
- String requestMethod,
- String urlString,
- boolean useHostnameVerifierHack,
- String truststoreurl,
- String trustpassword,
- boolean shouldOk
- ) throws Exception {
-
- doTestGetSSLSocketFactory(
- requestMethod, urlString, useHostnameVerifierHack, truststoreurl, trustpassword, null, null, null, shouldOk);
- }
- public void doTestGetSSLSocketFactory(
- String requestMethod,
- String urlString,
- boolean useHostnameVerifierHack,
- String truststoreurl,
- String trustpassword,
- String keystoretype,
- String keystoreurl,
- String keypassword,
- boolean shouldOk
- ) throws Exception {
-
- KeyStore truststore = null;
- if (truststoreurl != null)
- truststore = KeyStoreUtils.loadKeyStore("jks", truststoreurl, trustpassword);
- SSLSocketFactory sf = SSLUtils.getSSLSocketFactory(
- truststore, keystoretype, keystoreurl, keypassword);
- System.out.println(requestMethod + " " + urlString);
-
- URL url = new URL(urlString);
- HttpsURLConnection conn = (HttpsURLConnection)url.openConnection();
- conn.setRequestMethod(requestMethod);
- conn.setDoInput(true);
- conn.setDoOutput(true);
- conn.setUseCaches(false);
- conn.setAllowUserInteraction(false);
- conn.setSSLSocketFactory(sf);
- if (useHostnameVerifierHack)
- conn.setHostnameVerifier(new HostnameVerifierHack());
- try {
- conn.connect();
- assertTrue(shouldOk);
- assertEquals(200, conn.getResponseCode());
- conn.disconnect();
- }
- catch (SSLException ex) {
- assertFalse(shouldOk);
- }
- }
-// private byte[] readTruststore(String filename) throws IOException {
-// if (filename == null)
-// return null;
-// FileInputStream in = new FileInputStream(filename);
-// byte[] buffer = new byte[in.available()];
-// in.read(buffer);
-// in.close();
-// return buffer;
-// }
- private class HostnameVerifierHack implements HostnameVerifier {
- public boolean verify(String arg0, String arg1) {
- return true;
- }
- }
-}
diff --git a/id/server/modules/moa-id-modul-citizencard_authentication/pom.xml b/id/server/modules/moa-id-modul-citizencard_authentication/pom.xml
index f2403a62e..e5b38f9b6 100644
--- a/id/server/modules/moa-id-modul-citizencard_authentication/pom.xml
+++ b/id/server/modules/moa-id-modul-citizencard_authentication/pom.xml
@@ -23,6 +23,13 @@
</dependency>
<dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_ixsil</artifactId>
+ <version>1.2.2.5</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>MOA.id.server</groupId>
<artifactId>moa-id-commons</artifactId>
<type>test-jar</type>
diff --git a/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java b/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
index f5000581c..90ed1c886 100644
--- a/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
+++ b/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
@@ -65,7 +65,6 @@ import at.gv.egovernment.moa.id.commons.api.exceptions.MOAIDException;
import at.gv.egovernment.moa.id.data.MISMandate;
import at.gv.egovernment.moa.id.protocols.pvp2x.PVPConstants;
import at.gv.egovernment.moa.id.util.XMLUtil;
-import at.gv.egovernment.moa.logging.LogMsg;
import at.gv.egovernment.moa.logging.Logger;
import at.gv.egovernment.moa.util.Constants;
import at.gv.egovernment.moa.util.DOMUtils;
@@ -73,6 +72,7 @@ import at.gv.egovernment.moa.util.DateTimeUtils;
import at.gv.egovernment.moa.util.FileUtils;
import at.gv.egovernment.moa.util.MiscUtil;
import at.gv.egovernment.moa.util.StringUtils;
+import at.gv.egovernment.moaspss.logging.LogMsg;
import iaik.asn1.ObjectID;
import iaik.x509.X509Certificate;
import iaik.x509.X509ExtensionInitException;
diff --git a/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/validator/VerifyXMLSignatureResponseValidator.java b/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/validator/VerifyXMLSignatureResponseValidator.java
index df101f5b7..4e591ada2 100644
--- a/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/validator/VerifyXMLSignatureResponseValidator.java
+++ b/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/validator/VerifyXMLSignatureResponseValidator.java
@@ -46,13 +46,6 @@
package at.gv.egovernment.moa.id.auth.validator;
-import iaik.asn1.ObjectID;
-import iaik.asn1.structures.Name;
-import iaik.security.ecc.ecdsa.ECPublicKey;
-import iaik.utils.RFC2253NameParserException;
-import iaik.x509.X509Certificate;
-import iaik.x509.X509ExtensionInitException;
-
import java.security.InvalidKeyException;
import java.security.PublicKey;
import java.security.interfaces.RSAPublicKey;
@@ -70,6 +63,11 @@ import at.gv.egovernment.moa.id.commons.api.exceptions.ConfigurationException;
import at.gv.egovernment.moa.id.commons.utils.MOAIDMessageProvider;
import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProviderFactory;
import at.gv.egovernment.moa.logging.Logger;
+import iaik.asn1.structures.Name;
+import iaik.security.ec.common.ECPublicKey;
+import iaik.utils.RFC2253NameParserException;
+import iaik.x509.X509Certificate;
+import iaik.x509.X509ExtensionInitException;
/**
* This class is used to validate an {@link VerifyXMLSignatureResponse}
@@ -268,9 +266,9 @@ public class VerifyXMLSignatureResponseValidator {
//compare ECDSAPublicKeys
if( ( (idl.getPublicKey()[i] instanceof java.security.interfaces.ECPublicKey) ||
- (idl.getPublicKey()[i] instanceof iaik.security.ecc.ecdsa.ECPublicKey)) &&
+ (idl.getPublicKey()[i] instanceof ECPublicKey)) &&
( (pubKeySignature instanceof java.security.interfaces.ECPublicKey) ||
- (pubKeySignature instanceof iaik.security.ecc.ecdsa.ECPublicKey) ) ) {
+ (pubKeySignature instanceof ECPublicKey) ) ) {
try {
ECPublicKey ecdsaPubKeySignature = new ECPublicKey(pubKeySignature.getEncoded());
diff --git a/id/server/modules/moa-id-modules-saml1/pom.xml b/id/server/modules/moa-id-modules-saml1/pom.xml
index 323edee8d..0463bf8d9 100644
--- a/id/server/modules/moa-id-modules-saml1/pom.xml
+++ b/id/server/modules/moa-id-modules-saml1/pom.xml
@@ -26,6 +26,13 @@
</dependency>
<dependency>
+ <groupId>MOA.id.server</groupId>
+ <artifactId>moa-id-commons</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>MOA.id.server</groupId>
<artifactId>moa-id-lib</artifactId>
</dependency>
diff --git a/pom.xml b/pom.xml
index c256118e2..a46494aa2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,9 +34,8 @@
<moa-id-module-elga_mandate_client>1.0</moa-id-module-elga_mandate_client>
-
<!-- Library Versions -->
- <moa-spss-version>2.0.5</moa-spss-version>
+ <moa-spss-version>3.0.0-RC1</moa-spss-version>
<org.springframework.version>4.2.6.RELEASE</org.springframework.version>
<surefire.version>2.19.1</surefire.version>
@@ -348,33 +347,7 @@
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
</dependency>
-
-
-<!-- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis</artifactId>
- <version>1.0_IAIK_1.2</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.axis</groupId>
- <artifactId>axis-jaxrpc</artifactId>
- <version>1.4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.axis</groupId>
- <artifactId>axis-saaj</artifactId>
- <version>1.4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-wsdl4j</artifactId>
- <version>1.5.1</version>
- <scope>compile</scope>
- </dependency> -->
-
+
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
@@ -387,12 +360,6 @@
<scope>compile</scope>
</dependency>
- <!-- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- <scope>compile</scope>
- </dependency> -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
@@ -541,7 +508,14 @@
<dependency>
<groupId>MOA.spss.server</groupId>
- <artifactId>moa-spss-lib</artifactId>
+ <artifactId>moa-sig-lib</artifactId>
+ <version>${moa-spss-version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>MOA.spss</groupId>
+ <artifactId>common</artifactId>
<version>${moa-spss-version}</version>
<scope>compile</scope>
</dependency>
@@ -595,34 +569,10 @@
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_jce_full</artifactId>
- <!-- <version>4.0_MOA</version>-->
- <version>5.2</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_moa</artifactId>
- <version>1.51</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_cms</artifactId>
- <version>5.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_ecc</artifactId>
- <version>2.19</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_ixsil</artifactId>
- <version>1.2.2.5</version>
+ <version>5.3_MOA</version>
<scope>compile</scope>
</dependency>
+
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_X509TrustManager</artifactId>
@@ -695,40 +645,7 @@
<artifactId>jaxb-api</artifactId>
<version>2.2.12</version>
</dependency>
-
- <!-- TSL -->
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_tsl</artifactId>
- <version>1.1</version>
- </dependency>
-
-<!-- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_util</artifactId>
- <version>0.23</version>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_xsect_eval</artifactId>
- <version>1.1709142</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.2.7</version>
- </dependency>
- <dependency>
- <groupId>org.xerial</groupId>
- <artifactId>sqlite-jdbc</artifactId>
- <version>3.7.8-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_jsse</artifactId>
- <version>4.4</version>
- </dependency> -->
-
+
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
diff --git a/repository/MOA/spss/common/3.0.0-RC1/common-3.0.0-RC1.jar b/repository/MOA/spss/common/3.0.0-RC1/common-3.0.0-RC1.jar
new file mode 100644
index 000000000..46b4118cd
--- /dev/null
+++ b/repository/MOA/spss/common/3.0.0-RC1/common-3.0.0-RC1.jar
Binary files differ
diff --git a/repository/MOA/spss/server/moa-sig-lib/3.0.0-RC1/moa-sig-lib-3.0.0-RC1.jar b/repository/MOA/spss/server/moa-sig-lib/3.0.0-RC1/moa-sig-lib-3.0.0-RC1.jar
new file mode 100644
index 000000000..6ed6a8c44
--- /dev/null
+++ b/repository/MOA/spss/server/moa-sig-lib/3.0.0-RC1/moa-sig-lib-3.0.0-RC1.jar
Binary files differ
diff --git a/repository/iaik/asit/1.3.4/asit-1.3.4.jar b/repository/iaik/asit/1.3.4/asit-1.3.4.jar
deleted file mode 100644
index e331f467c..000000000
--- a/repository/iaik/asit/1.3.4/asit-1.3.4.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/asit/1.3.4/asit-1.3.4.jar.md5 b/repository/iaik/asit/1.3.4/asit-1.3.4.jar.md5
deleted file mode 100644
index b34c0523d..000000000
--- a/repository/iaik/asit/1.3.4/asit-1.3.4.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-b7224977a72089a9d5e78af0b402c56d \ No newline at end of file
diff --git a/repository/iaik/asit/1.3.4/asit-1.3.4.jar.sha1 b/repository/iaik/asit/1.3.4/asit-1.3.4.jar.sha1
deleted file mode 100644
index c7a57ac50..000000000
--- a/repository/iaik/asit/1.3.4/asit-1.3.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d3d60e9f28392c28c8a8ece918281bce5358dd59 \ No newline at end of file
diff --git a/repository/iaik/asit/1.3.4/asit-1.3.4.pom b/repository/iaik/asit/1.3.4/asit-1.3.4.pom
deleted file mode 100644
index 93ca1f600..000000000
--- a/repository/iaik/asit/1.3.4/asit-1.3.4.pom
+++ /dev/null
@@ -1,390 +0,0 @@
-<?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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>iaik</groupId>
- <artifactId>asit</artifactId>
- <version>1.3.4</version>
-
- <packaging>jar</packaging>
-
- <name>A-SIT framework</name>
- <description>Framework fuer A-SIT Anwendungen</description>
- <url>http://www.iaik.tugraz.at</url>
- <inceptionYear>2007</inceptionYear>
-
- <developers>
- <developer>
- <id>atauber</id>
- <name>Arne Tauber</name>
- <organization>IAIK</organization>
- <email>arne.tauber@iaik.tugraz.at</email>
- <timezone>+1</timezone>
- <roles>
- <role>developer</role>
- </roles>
- </developer>
- <developer>
- <id>tknall</id>
- <name>Thomas Knall</name>
- <organization>IAIK</organization>
- <email>thomas.knall@iaik.tugraz.at</email>
- <timezone>+1</timezone>
- <roles>
- <role>developer</role>
- </roles>
- </developer>
- <developer>
- <id>troessler</id>
- <name>Thomas Roessler</name>
- <organization>IAIK</organization>
- <email>thomas.roessler@iaik.tugraz.at</email>
- <timezone>+1</timezone>
- <roles>
- <role>developer</role>
- </roles>
- </developer>
- </developers>
-
- <ciManagement>
- <system>continuum</system>
- <url>http://development:8088/continuum</url>
- <notifiers>
- <notifier>
- <type>mail</type>
- <configuration>
- <address>tknall</address>
- </configuration>
- </notifier>
- <notifier>
- <type>mail</type>
- <configuration>
- <address>atauber</address>
- </configuration>
- </notifier>
- </notifiers>
- </ciManagement>
-
- <scm>
- <connection>scm:svn:http://bugzilla.iaik.tugraz.at/svn/egiz/prj/current/framework/asit/trunk</connection>
- <developerConnection>scm:svn:http://bugzilla.iaik.tugraz.at/svn/egiz/prj/current/framework/asit/trunk</developerConnection>
- <url>http://bugzilla.iaik.tugraz.at/svn/egiz/prj/current/framework/asit/trunk</url>
- </scm>
-
- <organization>
- <name>Institut fuer Angewandte Informationsverarbeitung und Kommunikationstechnologie</name>
- <url>http://www.iaik.tugraz.at/</url>
- </organization>
-
- <distributionManagement>
- <site>
- <id>website</id>
- <url>
- file://development/c:/data/public/websites/PROJECTS/${pom.artifactId}/${pom.version}
- </url>
- </site>
- </distributionManagement>
-
- <build>
-
- <resources>
- <resource>
- <filtering>true</filtering>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>**/package.html</exclude>
- <exclude>**/.svn</exclude>
- </excludes>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <excludes>
- <exclude>**/package.html</exclude>
- <exclude>**/.svn</exclude>
- </excludes>
- </resource>
- </resources>
-
- <finalName>${artifactId}-${version}</finalName>
-
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- skip>true</skip-->
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <locales>en</locales>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <compilerArguments>
- <verbose />
- </compilerArguments>
- <excludes>
- <exclude>asit/test/*/</exclude>
- </excludes>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <!--mainClass>resource_uri_to_main_class</mainClass-->
- <addClasspath>true</addClasspath>
- </manifest>
- </archive>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptor>src/main/assembly/assemble_libraries.xml</descriptor>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam></additionalparam>
- <public>true</public>
- <package>true</package>
- <private>true</private>
- <links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- <link>http://java.sun.com/j2ee/1.4/docs/api/</link>
- <link>http://struts.apache.org/1.2.4/api/</link>
- <link>http://logging.apache.org/log4j/docs/api/</link>
- </links>
- <source>1.4</source>
- <target>1.4</target>
- <windowtitle>${pom.name} v${pom.version}:${build.date} API</windowtitle>
- <bottom>Copyright ${pom.inceptionYear} &lt;a href="${pom.organization.url}" target="_blank"&gt;${pom.organization.name}&lt;/a&gt;. All Rights Reserved.</bottom>
- </configuration>
- </plugin>
-
- </plugins>
-
- </build>
-
- <reporting>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>dependencies</report>
- <report>project-team</report>
- <!-- report>mailing-list</report -->
- <!-- report>cim</report -->
- <!-- report>issue-tracking</report -->
- <!-- >report>license</report -->
- <!-- >report>scm</report -->
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
-
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam></additionalparam>
- <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://struts.apache.org/1.2.4/api/</link>
- <link>http://logging.apache.org/log4j/docs/api/</link>
- </links>
- <source>1.4</source>
- <target>1.4</target>
- <windowtitle>${pom.name} v${pom.version}:${build.date} API</windowtitle>
- <bottom>Copyright ${pom.inceptionYear} &lt;a href="${pom.organization.url}" target="_blank"&gt;${pom.organization.name}&lt;/a&gt;. All Rights Reserved.</bottom>
- </configuration>
- </plugin>
-
- <!--
- <plugin>
- <groupId>www.ibiblio.org</groupId>
- <artifactId>maven-jcoverage-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-docck-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>changes-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-doap-plugin</artifactId>
- <plugin>
- </plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clover-plugin</artifactId>
- </plugin>
- -->
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <configuration>
- <xmlPath>${basedir}/src/site/changes.xml</xmlPath>
- </configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>changes-report</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
- <showSuccess>true</showSuccess>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <targetJdk>1.5</targetJdk>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>${basedir}/src/site/checkstyle.xml</configLocation>
- </configuration>
- </plugin>
-
- </plugins>
- </reporting>
-
- <dependencies>
- <!-- see http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version> <!-- was: 2.3.1 -->
- <scope>provided</scope>
- <!--
- available scopes: compile, provided, runtime, test, system
- -->
- <!--
- projects that are libraries should declare dependencies as optional
- see: http://maven.apache.org/guides/introduction/introduction-to-optional-and-excludes-dependencies.html
- -->
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>struts</groupId>
- <artifactId>struts</artifactId>
- <version>1.2.4</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_jce_eval_signed</artifactId>
- <version>3.142</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_ixsil_eval</artifactId>
- <version>1.2.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4</version> <!-- was: 1.3.1 -->
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.3</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.8</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_ecc_eval_signed</artifactId>
- <version>2.15</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>net.sf.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>2.1.7c</version> <!-- was: 2.1.7 -->
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>fop</groupId>
- <artifactId>fop</artifactId>
- <version>0.20.5</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-jaxrpc</artifactId>
- <version>1.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>catalina</artifactId>
- <version>4.1.31</version> <!-- was: unknown -->
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.1</version>
- <scope>test</scope>
- <optional>true</optional>
- </dependency>
- </dependencies>
-</project>
diff --git a/repository/iaik/asit/1.3.4/asit-1.3.4.pom.md5 b/repository/iaik/asit/1.3.4/asit-1.3.4.pom.md5
deleted file mode 100644
index 3bfb19649..000000000
--- a/repository/iaik/asit/1.3.4/asit-1.3.4.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-f42cef68752c2b2c0d6de5a6fb1a9d7c \ No newline at end of file
diff --git a/repository/iaik/asit/1.3.4/asit-1.3.4.pom.sha1 b/repository/iaik/asit/1.3.4/asit-1.3.4.pom.sha1
deleted file mode 100644
index 9253d46cf..000000000
--- a/repository/iaik/asit/1.3.4/asit-1.3.4.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dd7966e311b2b719ecabe6bb7b6bde3f80d7ce01 \ No newline at end of file
diff --git a/repository/iaik/asit/1.3.5/asit-1.3.5.jar b/repository/iaik/asit/1.3.5/asit-1.3.5.jar
deleted file mode 100644
index f04ec1e6f..000000000
--- a/repository/iaik/asit/1.3.5/asit-1.3.5.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/asit/1.3.5/asit-1.3.5.jar.sha1 b/repository/iaik/asit/1.3.5/asit-1.3.5.jar.sha1
deleted file mode 100644
index 564da72b0..000000000
--- a/repository/iaik/asit/1.3.5/asit-1.3.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-56ef339009e19c81b9ead9262c43a84371e2aa73 \ No newline at end of file
diff --git a/repository/iaik/asit/1.3.5/asit-1.3.5.pom b/repository/iaik/asit/1.3.5/asit-1.3.5.pom
deleted file mode 100644
index 58a6e5a09..000000000
--- a/repository/iaik/asit/1.3.5/asit-1.3.5.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>iaik</groupId>
- <artifactId>asit</artifactId>
- <version>1.3.5</version>
- <description>POM was created from install:install-file</description>
-</project>
diff --git a/repository/iaik/asit/1.3.5/asit-1.3.5.pom.sha1 b/repository/iaik/asit/1.3.5/asit-1.3.5.pom.sha1
deleted file mode 100644
index 0fa712339..000000000
--- a/repository/iaik/asit/1.3.5/asit-1.3.5.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-72c48087cb86db39f62d955159710f6cb8dc5d04 \ No newline at end of file
diff --git a/repository/iaik/asit/1.3.6/asit-1.3.6-javadoc.jar b/repository/iaik/asit/1.3.6/asit-1.3.6-javadoc.jar
deleted file mode 100644
index 1ba8dc308..000000000
--- a/repository/iaik/asit/1.3.6/asit-1.3.6-javadoc.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/asit/1.3.6/asit-1.3.6-sources.jar b/repository/iaik/asit/1.3.6/asit-1.3.6-sources.jar
deleted file mode 100644
index ae38e3336..000000000
--- a/repository/iaik/asit/1.3.6/asit-1.3.6-sources.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/asit/1.3.6/asit-1.3.6.jar b/repository/iaik/asit/1.3.6/asit-1.3.6.jar
deleted file mode 100644
index 8a754fe81..000000000
--- a/repository/iaik/asit/1.3.6/asit-1.3.6.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/asit/1.3.6/asit-1.3.6.pom b/repository/iaik/asit/1.3.6/asit-1.3.6.pom
deleted file mode 100644
index 7770aef52..000000000
--- a/repository/iaik/asit/1.3.6/asit-1.3.6.pom
+++ /dev/null
@@ -1,390 +0,0 @@
-<?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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>iaik</groupId>
- <artifactId>asit</artifactId>
- <version>1.3.6</version>
-
- <packaging>jar</packaging>
-
- <name>A-SIT framework</name>
- <description>Framework fuer A-SIT Anwendungen</description>
- <url>http://www.iaik.tugraz.at</url>
- <inceptionYear>2007</inceptionYear>
-
- <developers>
- <developer>
- <id>atauber</id>
- <name>Arne Tauber</name>
- <organization>IAIK</organization>
- <email>arne.tauber@iaik.tugraz.at</email>
- <timezone>+1</timezone>
- <roles>
- <role>developer</role>
- </roles>
- </developer>
- <developer>
- <id>tknall</id>
- <name>Thomas Knall</name>
- <organization>IAIK</organization>
- <email>thomas.knall@iaik.tugraz.at</email>
- <timezone>+1</timezone>
- <roles>
- <role>developer</role>
- </roles>
- </developer>
- <developer>
- <id>troessler</id>
- <name>Thomas Roessler</name>
- <organization>IAIK</organization>
- <email>thomas.roessler@iaik.tugraz.at</email>
- <timezone>+1</timezone>
- <roles>
- <role>developer</role>
- </roles>
- </developer>
- </developers>
-
- <ciManagement>
- <system>continuum</system>
- <url>http://development:8088/continuum</url>
- <notifiers>
- <notifier>
- <type>mail</type>
- <configuration>
- <address>tknall</address>
- </configuration>
- </notifier>
- <notifier>
- <type>mail</type>
- <configuration>
- <address>atauber</address>
- </configuration>
- </notifier>
- </notifiers>
- </ciManagement>
-
- <scm>
- <connection>scm:svn:http://bugzilla.iaik.tugraz.at/svn/egiz/prj/current/framework/asit/trunk</connection>
- <developerConnection>scm:svn:http://bugzilla.iaik.tugraz.at/svn/egiz/prj/current/framework/asit/trunk</developerConnection>
- <url>http://bugzilla.iaik.tugraz.at/svn/egiz/prj/current/framework/asit/trunk</url>
- </scm>
-
- <organization>
- <name>Institut fuer Angewandte Informationsverarbeitung und Kommunikationstechnologie</name>
- <url>http://www.iaik.tugraz.at/</url>
- </organization>
-
- <distributionManagement>
- <site>
- <id>website</id>
- <url>
- file://development/c:/data/public/websites/PROJECTS/${pom.artifactId}/${pom.version}
- </url>
- </site>
- </distributionManagement>
-
- <build>
-
- <resources>
- <resource>
- <filtering>true</filtering>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>**/package.html</exclude>
- <exclude>**/.svn</exclude>
- </excludes>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <excludes>
- <exclude>**/package.html</exclude>
- <exclude>**/.svn</exclude>
- </excludes>
- </resource>
- </resources>
-
- <finalName>${artifactId}-${version}</finalName>
-
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- skip>true</skip-->
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <locales>en</locales>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <compilerArguments>
- <verbose />
- </compilerArguments>
- <excludes>
- <exclude>asit/test/*/</exclude>
- </excludes>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <!--mainClass>resource_uri_to_main_class</mainClass-->
- <addClasspath>true</addClasspath>
- </manifest>
- </archive>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptor>src/main/assembly/assemble_libraries.xml</descriptor>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam></additionalparam>
- <public>true</public>
- <package>true</package>
- <private>true</private>
- <links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- <link>http://java.sun.com/j2ee/1.4/docs/api/</link>
- <link>http://struts.apache.org/1.2.4/api/</link>
- <link>http://logging.apache.org/log4j/docs/api/</link>
- </links>
- <source>1.4</source>
- <target>1.4</target>
- <windowtitle>${pom.name} v${pom.version}:${build.date} API</windowtitle>
- <bottom>Copyright ${pom.inceptionYear} &lt;a href="${pom.organization.url}" target="_blank"&gt;${pom.organization.name}&lt;/a&gt;. All Rights Reserved.</bottom>
- </configuration>
- </plugin>
-
- </plugins>
-
- </build>
-
- <reporting>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>dependencies</report>
- <report>project-team</report>
- <!-- report>mailing-list</report -->
- <!-- report>cim</report -->
- <!-- report>issue-tracking</report -->
- <!-- >report>license</report -->
- <!-- >report>scm</report -->
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
-
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam></additionalparam>
- <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://struts.apache.org/1.2.4/api/</link>
- <link>http://logging.apache.org/log4j/docs/api/</link>
- </links>
- <source>1.4</source>
- <target>1.4</target>
- <windowtitle>${pom.name} v${pom.version}:${build.date} API</windowtitle>
- <bottom>Copyright ${pom.inceptionYear} &lt;a href="${pom.organization.url}" target="_blank"&gt;${pom.organization.name}&lt;/a&gt;. All Rights Reserved.</bottom>
- </configuration>
- </plugin>
-
- <!--
- <plugin>
- <groupId>www.ibiblio.org</groupId>
- <artifactId>maven-jcoverage-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-docck-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>changes-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-doap-plugin</artifactId>
- <plugin>
- </plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clover-plugin</artifactId>
- </plugin>
- -->
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <configuration>
- <xmlPath>${basedir}/src/site/changes.xml</xmlPath>
- </configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>changes-report</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
- <showSuccess>true</showSuccess>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <targetJdk>1.5</targetJdk>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>${basedir}/src/site/checkstyle.xml</configLocation>
- </configuration>
- </plugin>
-
- </plugins>
- </reporting>
-
- <dependencies>
- <!-- see http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version> <!-- was: 2.3.1 -->
- <scope>provided</scope>
- <!--
- available scopes: compile, provided, runtime, test, system
- -->
- <!--
- projects that are libraries should declare dependencies as optional
- see: http://maven.apache.org/guides/introduction/introduction-to-optional-and-excludes-dependencies.html
- -->
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>struts</groupId>
- <artifactId>struts</artifactId>
- <version>1.2.4</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_jce_eval_signed</artifactId>
- <version>3.142</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_ixsil_eval</artifactId>
- <version>1.2.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4</version> <!-- was: 1.3.1 -->
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.3</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.8</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_ecc_eval_signed</artifactId>
- <version>2.15</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>net.sf.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>2.1.7c</version> <!-- was: 2.1.7 -->
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>fop</groupId>
- <artifactId>fop</artifactId>
- <version>0.20.5</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-jaxrpc</artifactId>
- <version>1.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>catalina</artifactId>
- <version>4.1.31</version> <!-- was: unknown -->
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.1</version>
- <scope>test</scope>
- <optional>true</optional>
- </dependency>
- </dependencies>
-</project>
diff --git a/repository/iaik/bescheide/2007-09-13/bescheide-2007-09-13.jar b/repository/iaik/bescheide/2007-09-13/bescheide-2007-09-13.jar
deleted file mode 100644
index 78bdc2f58..000000000
--- a/repository/iaik/bescheide/2007-09-13/bescheide-2007-09-13.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/bescheide/2007-09-13/bescheide-2007-09-13.jar.sha1 b/repository/iaik/bescheide/2007-09-13/bescheide-2007-09-13.jar.sha1
deleted file mode 100644
index 2f7b99a43..000000000
--- a/repository/iaik/bescheide/2007-09-13/bescheide-2007-09-13.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3cd8e2702cc2706dca2cd68e675e96b115edca6c
diff --git a/repository/iaik/bescheide/2007-09-13/bescheide-2007-09-13.pom b/repository/iaik/bescheide/2007-09-13/bescheide-2007-09-13.pom
deleted file mode 100644
index 20666ba88..000000000
--- a/repository/iaik/bescheide/2007-09-13/bescheide-2007-09-13.pom
+++ /dev/null
@@ -1,6 +0,0 @@
-<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>iaik</groupId>
- <artifactId>bescheide</artifactId>
- <version>2007-09-13</version>
-</project>
diff --git a/repository/iaik/bescheide/2007-09-13/bescheide-2007-09-13.pom.sha1 b/repository/iaik/bescheide/2007-09-13/bescheide-2007-09-13.pom.sha1
deleted file mode 100644
index 44af41359..000000000
--- a/repository/iaik/bescheide/2007-09-13/bescheide-2007-09-13.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0ae1ab9cc1b907d2c6dfcc227637dc72faca95fa
diff --git a/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.jar b/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.jar
deleted file mode 100644
index b9b08856c..000000000
--- a/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.jar.md5 b/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.jar.md5
deleted file mode 100644
index 1b409ac45..000000000
--- a/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-a9ebe33840edea5854f3e8b8c0c03cab \ No newline at end of file
diff --git a/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.jar.sha1 b/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.jar.sha1
deleted file mode 100644
index c7e599b34..000000000
--- a/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b999d8a518efa41bdf67bd9fd964e9b09affe5dd \ No newline at end of file
diff --git a/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.pom b/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.pom
deleted file mode 100644
index 3f6ccf7e5..000000000
--- a/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.pom
+++ /dev/null
@@ -1,633 +0,0 @@
-<?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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>iaik</groupId>
- <artifactId>commons-iaik</artifactId>
- <name>COMMONS IAIK Library</name>
- <version>0.5.5</version>
-
- <description>Sammlung haeufig verwendeter Klassen und Methoden</description>
- <url>http://www.iaik.tugraz.at</url>
- <inceptionYear>2006</inceptionYear>
- <developers>
- <developer>
- <id>tknall</id>
- <name>Thomas Knall</name>
- <email>thomas.knall@iaik.tugraz.at</email>
- <organization>IAIK</organization>
- <roles>
- <role>developer</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- </developers>
-
- <organization>
- <name>IAIK - Institute for Applied Information Processing and Communications</name>
- <url>http://www.iaik.tugraz.at</url>
- </organization>
-
- <pluginRepositories>
- <!--
- <pluginRepository>
- <id>tlc</id>
- <name>TLC Repository</name>
- <url>http://commons.ucalgary.ca/pub/m2</url>
- </pluginRepository>
- -->
- <!--
- <pluginRepository>
- <id>apache.org</id>
- <name>Maven Plugin Snapshots</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- -->
- </pluginRepositories>
-
- <scm>
- <connection>scm:svn:http://bugzilla.iaik.tugraz.at/asit/prj/commons-iaik/trunk/</connection>
- <url>http://bugzilla.iaik.tugraz.at/asit/prj/commons-iaik/trunk/</url>
- </scm>
-
- <distributionManagement>
- <site>
- <id>website</id>
- <url>
- file://development/c:/data/public/websites/PROJECTS/${artifactId}/${project.version}
- </url>
- </site>
- </distributionManagement>
-
- <build>
-
- <resources>
-
- <resource>
- <filtering>true</filtering>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/CommonsIAIK.properties</include>
- </includes>
- <excludes>
- <exclude>srgb.profile</exclude>
- </excludes>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- <includes>
- <!-- needed for ITextText only -->
- <include>**/taglib.tld</include>
- </includes>
- <excludes>
- <exclude>srgb.profile</exclude>
- </excludes>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.xsd</include>
- </includes>
- <excludes>
- <exclude>**/application_config.xml</exclude>
- <exclude>**/application_default_config.xml</exclude>
- </excludes>
- </resource>
-
- </resources>
-
- <finalName>${artifactId}-${version}</finalName>
-
- <plugins>
- <!--
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>maven-buildnumber-plugin</artifactId>
- <version>0.9.6</version>
- <configuration>
- <format>{0,date,yyyy-MM-dd'T'HH:mm:ssZ}</format>
- <items>
- <item>timestamp</item>
- </items>
- </configuration>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>create</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <showsuccess>true</showsuccess>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <locales>en</locales>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <excludes>
- <exclude>at/iaik/commons/test/*/</exclude>
- </excludes>
- </configuration>
- </plugin>
- <!-- plugin>
- <groupId>com.pyx4me</groupId>
- <artifactId>proguard-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals><goal>proguard</goal></goals>
- </execution>
- </executions>
- <configuration>
- <obfuscate>true</obfuscate>
- <libs>
- <lib>${java.home}/lib/rt.jar</lib>
- <lib>${java.home}/lib/jsse.jar</lib>
- </libs>
- </configuration>
- </plugin-->
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <mainClass>at.iaik.commons.metadata.CommonsIAIK</mainClass>
- <!--
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- -->
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- <addClasspath>true</addClasspath>
- </manifest>
- <manifestEntries>
- <!--
- <Implementation-Build>${buildNumber}</Implementation-Build>
- -->
- <Implementation-Build>${build.date}</Implementation-Build>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
- <configuration>
- <descriptors>
- <!--
- <descriptor>src/main/assembly/assemble_libraries.xml</descriptor>
- <descriptor>src/main/assembly/assemble_repository.xml</descriptor>
- -->
- <descriptor>src/main/assembly/assemble_libraries.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam></additionalparam>
- <show>public</show>
- <links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- <link>http://java.sun.com/j2ee/1.4/docs/api/</link>
- <!--
- <link>http://struts.apache.org/1.2.9/api/</link>
- -->
- <link>http://struts.apache.org/1.3.10/apidocs/</link>
- <link>http://logging.apache.org/log4j/docs/api/</link>
- <link>http://www.jconfig.org/javadoc/</link>
- <link>http://www.hibernate.org/hib_docs/v3/api/</link>
- <link>http://tomcat.apache.org/tomcat-5.5-doc/catalina/docs/api/</link>
- <link>http://www.saxproject.org/apidoc/</link>
- </links>
- <source>1.5</source>
- <target>1.5</target>
- <verbose>false</verbose>
- <windowtitle>${pom.name} v${pom.version}:${build.date} API</windowtitle>
- <bottom>Copyright ${pom.inceptionYear} &lt;a href="${pom.organization.url}" target="_blank">${pom.organization.name}&lt;/a>. All Rights Reserved.</bottom>
- </configuration>
- </plugin>
-
- </plugins>
-
- </build>
-
- <dependencies>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <optional>true</optional>
- </dependency>
-
- <!-- apache struts upgraded to 1.3.x: see http://wiki.apache.org/struts/StrutsUpgradeNotes12to13 -->
- <!--
- <dependency>
- <groupId>struts</groupId>
- <artifactId>struts</artifactId>
- <version>1.2.9</version>
- <optional>true</optional>
- </dependency>
- -->
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts-core</artifactId>
- <version>1.3.10</version>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts-taglib</artifactId>
- <version>1.3.10</version>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>3.1.3</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.jconfig</groupId>
- <artifactId>jconfig</artifactId>
- <version>2.9</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis</artifactId>
- <version>1.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-saaj</artifactId>
- <version>1.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-wsdl4j</artifactId>
- <version>1.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-jaxrpc</artifactId>
- <version>1.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-discovery</groupId>
- <artifactId>commons-discovery</artifactId>
- <version>0.2</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>catalina</artifactId>
- <version>5.0.28</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.3.02</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.4</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.serializer</groupId>
- <artifactId>serializer</artifactId>
- <version>2.7.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlgraphics</groupId>
- <artifactId>xmlgraphics-commons</artifactId>
- <version>1.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.7.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.1</version>
- <scope>test</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_jce_eval_signed</artifactId>
- <version>3.16</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_ixsil_eval</artifactId>
- <version>1.2.2</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>asit</artifactId>
- <version>1.3.4</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>zsproxy</artifactId>
- <version>2007-03-02</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>batik</groupId>
- <artifactId>batik-all</artifactId>
- <version>1.6</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>fop</groupId>
- <artifactId>fop</artifactId>
- <version>0.92beta</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>knowcenter</groupId>
- <artifactId>pdf-as</artifactId>
- <version>3.0.9-20090203</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_xsect_eval</artifactId>
- <version>1.11build48</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_ecc_eval_signed</artifactId>
- <version>2.15</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_cms_eval</artifactId>
- <version>4.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>at.gv.bmi</groupId>
- <artifactId>szr-client</artifactId>
- <version>3.71</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>com.lowagie</groupId>
- <artifactId>itext</artifactId>
- <!--
- <version>2.0.7</version>
- -->
- <version>2.1.3</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.xml</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.1.6</version>
- <optional>true</optional>
- </dependency>
-
- </dependencies>
-
- <properties>
- <build.date>2009-02-05</build.date>
- </properties>
-
- <reporting>
-
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>
- maven-project-info-reports-plugin
- </artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>dependencies</report>
- <report>project-team</report>
- <!-- report>mailing-list</report -->
- <report>cim</report>
- <!-- report>issue-tracking</report -->
- <report>license</report>
- <report>scm</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
-
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam></additionalparam>
- <public>true</public>
- <package>true</package>
- <private>true</private>
- <links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- <link>http://java.sun.com/j2ee/1.4/docs/api/</link>
- <!--
- <link>http://struts.apache.org/1.2.9/api/</link>
- -->
- <link>http://struts.apache.org/1.3.10/apidocs/</link>
- <link>http://logging.apache.org/log4j/docs/api/</link>
- </links>
- <source>1.5</source>
- <target>1.5</target>
- <windowtitle>${pom.name} v${pom.version}:${build.date} API</windowtitle>
- <bottom>Copyright ${pom.inceptionYear} &lt;a href="${pom.organization.url}" target="_blank"&gt;${pom.organization.name}&lt;/a&gt;. All Rights Reserved.</bottom>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
- <showSuccess>true</showSuccess>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <targetJdk>1.5</targetJdk>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <configuration>
- <xmlPath>${basedir}/src/site/changes.xml</xmlPath>
- </configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>changes-report</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clover-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>changelog-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
- <configuration>
- <type>range</type>
- <range>30</range>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-docck-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>
- ${basedir}/src/site/checkstyle/sun_checks_modified.xml
- </configLocation>
- </configuration>
- </plugin>
-
- </plugins>
-
- </reporting>
-
-</project>
diff --git a/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.pom.md5 b/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.pom.md5
deleted file mode 100644
index 11fa5b7a1..000000000
--- a/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-e0ba073d10f5a19f62322fc171971ff0 \ No newline at end of file
diff --git a/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.pom.sha1 b/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.pom.sha1
deleted file mode 100644
index 24cc66dfb..000000000
--- a/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ecb2fcf08eb6f8a89ec587edd908fbb7d312a5ca \ No newline at end of file
diff --git a/repository/iaik/commons-iaik/0.6.2/commons-iaik-0.6.2.jar b/repository/iaik/commons-iaik/0.6.2/commons-iaik-0.6.2.jar
deleted file mode 100644
index c6ed59d02..000000000
--- a/repository/iaik/commons-iaik/0.6.2/commons-iaik-0.6.2.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/commons-iaik/0.7.1/commons-iaik-0.7.1.jar b/repository/iaik/commons-iaik/0.7.1/commons-iaik-0.7.1.jar
deleted file mode 100644
index afb15c02a..000000000
--- a/repository/iaik/commons-iaik/0.7.1/commons-iaik-0.7.1.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/commons-iaik/0.7.1/commons-iaik-0.7.1.jar.md5 b/repository/iaik/commons-iaik/0.7.1/commons-iaik-0.7.1.jar.md5
deleted file mode 100644
index f2d00d34a..000000000
--- a/repository/iaik/commons-iaik/0.7.1/commons-iaik-0.7.1.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-fc0104930f152e891ee26d6e7c494959 \ No newline at end of file
diff --git a/repository/iaik/commons-iaik/0.7.1/commons-iaik-0.7.1.jar.sha1 b/repository/iaik/commons-iaik/0.7.1/commons-iaik-0.7.1.jar.sha1
deleted file mode 100644
index b6bf33e23..000000000
--- a/repository/iaik/commons-iaik/0.7.1/commons-iaik-0.7.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ba2377c57bd8d1000ccd825d0f1276e2111e19dd \ No newline at end of file
diff --git a/repository/iaik/commons-iaik/0.7.1/commons-iaik-0.7.1.pom b/repository/iaik/commons-iaik/0.7.1/commons-iaik-0.7.1.pom
deleted file mode 100644
index f7d5274ef..000000000
--- a/repository/iaik/commons-iaik/0.7.1/commons-iaik-0.7.1.pom
+++ /dev/null
@@ -1,508 +0,0 @@
-<?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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>iaik</groupId>
- <artifactId>commons-iaik</artifactId>
- <name>COMMONS IAIK Library</name>
- <version>0.7.1</version>
-
- <description>Sammlung haeufig verwendeter Klassen und Methoden</description>
- <url>http://www.iaik.tugraz.at</url>
- <inceptionYear>2006</inceptionYear>
- <developers>
- <developer>
- <id>tknall</id>
- <name>Thomas Knall</name>
- <email>thomas.knall@iaik.tugraz.at</email>
- <organization>IAIK</organization>
- <roles>
- <role>developer</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- </developers>
-
- <organization>
- <name>IAIK - Institute for Applied Information Processing and Communications</name>
- <url>http://www.iaik.tugraz.at</url>
- </organization>
-
- <build>
-
- <resources>
-
- <resource>
- <filtering>true</filtering>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/CommonsIAIK.properties</include>
- </includes>
- <excludes>
- <exclude>srgb.profile</exclude>
- </excludes>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- <includes>
- <!-- needed for ITextText only -->
- <include>**/taglib.tld</include>
- </includes>
- <excludes>
- <exclude>srgb.profile</exclude>
- </excludes>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.xsd</include>
- </includes>
- <excludes>
- <exclude>**/application_config.xml</exclude>
- <exclude>**/application_default_config.xml</exclude>
- </excludes>
- </resource>
-
- </resources>
-
- <finalName>${project.artifactId}-${project.version}</finalName>
-
- <plugins>
- <!--
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>maven-buildnumber-plugin</artifactId>
- <version>0.9.6</version>
- <configuration>
- <format>{0,date,yyyy-MM-dd'T'HH:mm:ssZ}</format>
- <items>
- <item>timestamp</item>
- </items>
- </configuration>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>create</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <showsuccess>true</showsuccess>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <locales>en</locales>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <excludes>
- <exclude>at/iaik/commons/test/*/</exclude>
- </excludes>
- <!--
- <encoding>UTF-8</encoding>
- -->
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <!-- plugin>
- <groupId>com.pyx4me</groupId>
- <artifactId>proguard-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals><goal>proguard</goal></goals>
- </execution>
- </executions>
- <configuration>
- <obfuscate>true</obfuscate>
- <libs>
- <lib>${java.home}/lib/rt.jar</lib>
- <lib>${java.home}/lib/jsse.jar</lib>
- </libs>
- </configuration>
- </plugin-->
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <mainClass>at.iaik.commons.metadata.CommonsIAIK</mainClass>
- <!--
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- -->
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- <addClasspath>true</addClasspath>
- </manifest>
- <manifestEntries>
- <!--
- <Implementation-Build>${buildNumber}</Implementation-Build>
- -->
- <Implementation-Build>${build.date}</Implementation-Build>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
- <configuration>
- <descriptors>
- <!--
- <descriptor>src/main/assembly/assemble_libraries.xml</descriptor>
- <descriptor>src/main/assembly/assemble_repository.xml</descriptor>
- -->
- <descriptor>src/main/assembly/assemble_libraries.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam></additionalparam>
- <show>public</show>
- <links>
- <link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
- <link>http://download.oracle.com/javase/1.4.2/docs/api/</link>
- <!--
- <link>http://struts.apache.org/1.2.9/api/</link>
- -->
- <link>http://struts.apache.org/1.3.10/apidocs/</link>
- <link>http://logging.apache.org/log4j/docs/api/</link>
- <link>http://www.jconfig.org/javadoc/</link>
- <link>http://www.hibernate.org/hib_docs/v3/api/</link>
- <link>http://tomcat.apache.org/tomcat-5.5-doc/catalina/docs/api/</link>
- <link>http://www.saxproject.org/apidoc/</link>
- <link>http://commons.apache.org/lang/api-release/</link>
- <link>http://commons.apache.org/io/api-release/</link>
- </links>
- <source>1.5</source>
- <target>1.5</target>
- <verbose>false</verbose>
- <windowtitle>${project.name} v${project.version}:${build.date} API</windowtitle>
- <bottom>Copyright ${project.inceptionYear} &lt;a href="${project.organization.url}" target="_blank">${project.organization.name}&lt;/a>. All Rights Reserved.</bottom>
- <!--
- <encoding>UTF-8</encoding>
- -->
- </configuration>
- </plugin>
-
- </plugins>
-
- </build>
-
- <dependencies>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <optional>true</optional>
- </dependency>
-
- <!-- apache struts upgraded to 1.3.x: see http://wiki.apache.org/struts/StrutsUpgradeNotes12to13 -->
- <!--
- <dependency>
- <groupId>struts</groupId>
- <artifactId>struts</artifactId>
- <version>1.2.9</version>
- <optional>true</optional>
- </dependency>
- -->
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts-core</artifactId>
- <version>1.3.10</version>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts-taglib</artifactId>
- <version>1.3.10</version>
- <optional>true</optional>
- </dependency>
-
- <!--
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>3.1.3</version>
- <optional>true</optional>
- </dependency>
- -->
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>3.3.0.SP1</version>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
- <dependency>
- <groupId>org.jconfig</groupId>
- <artifactId>jconfig</artifactId>
- <version>2.9</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis</artifactId>
- <version>1.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-saaj</artifactId>
- <version>1.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-wsdl4j</artifactId>
- <version>1.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-jaxrpc</artifactId>
- <version>1.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-discovery</groupId>
- <artifactId>commons-discovery</artifactId>
- <version>0.2</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>catalina</artifactId>
- <version>5.0.28</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.3.02</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.4</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.serializer</groupId>
- <artifactId>serializer</artifactId>
- <version>2.7.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlgraphics</groupId>
- <artifactId>xmlgraphics-commons</artifactId>
- <version>1.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.7.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.1</version>
- <scope>test</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.5</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_jce_eval_signed</artifactId>
- <version>4.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_ixsil_eval</artifactId>
- <version>1.2.2</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>asit</artifactId>
- <version>1.3.6</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>zsproxy</artifactId>
- <version>2007-03-02</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>batik</groupId>
- <artifactId>batik-all</artifactId>
- <version>1.6</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>fop</groupId>
- <artifactId>fop</artifactId>
- <version>0.92beta</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>knowcenter</groupId>
- <artifactId>pdf-as</artifactId>
- <!--
- <version>3.1.1-snapshot</version>
- -->
- <version>3.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_xsect_eval</artifactId>
- <version>1.11build48</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_ecc_eval_signed</artifactId>
- <version>2.19</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_cms_eval</artifactId>
- <version>4.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>at.gv.bmi</groupId>
- <artifactId>szr-client</artifactId>
- <version>3.71</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>com.lowagie</groupId>
- <artifactId>itext</artifactId>
- <!--
- <version>2.0.7</version>
- -->
- <version>2.1.3</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.xml</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.1.6</version>
- <optional>true</optional>
- </dependency>
-
- </dependencies>
-
- <properties>
- <build.date>2011-01-16</build.date>
- </properties>
-
-</project>
diff --git a/repository/iaik/commons-iaik/0.7.1/commons-iaik-0.7.1.pom.md5 b/repository/iaik/commons-iaik/0.7.1/commons-iaik-0.7.1.pom.md5
deleted file mode 100644
index fac84458d..000000000
--- a/repository/iaik/commons-iaik/0.7.1/commons-iaik-0.7.1.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-8fce1151c5036c1d834f0374f05b9482 \ No newline at end of file
diff --git a/repository/iaik/commons-iaik/0.7.1/commons-iaik-0.7.1.pom.sha1 b/repository/iaik/commons-iaik/0.7.1/commons-iaik-0.7.1.pom.sha1
deleted file mode 100644
index 313186a5e..000000000
--- a/repository/iaik/commons-iaik/0.7.1/commons-iaik-0.7.1.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dbbc777d5bf8d49d61febfda94fa67d3e12f081f \ No newline at end of file
diff --git a/repository/iaik/commons-iaik/0.7.1/m2e-lastUpdated.properties b/repository/iaik/commons-iaik/0.7.1/m2e-lastUpdated.properties
deleted file mode 100644
index 439757873..000000000
--- a/repository/iaik/commons-iaik/0.7.1/m2e-lastUpdated.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Jan 09 10:07:25 CET 2012
-*|http\://nexus.iaik.tugraz.at/nexus/content/groups/internal|sources=1326100045570
-central|http\://repo1.maven.org/maven2|sources=1326100045570
diff --git a/repository/iaik/ecc/3.18/ecc-3.18.jar b/repository/iaik/ecc/3.18/ecc-3.18.jar
deleted file mode 100644
index abe38aea9..000000000
--- a/repository/iaik/ecc/3.18/ecc-3.18.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/ecc/3.18/ecc-3.18.pom b/repository/iaik/ecc/3.18/ecc-3.18.pom
deleted file mode 100644
index 266ef0cf8..000000000
--- a/repository/iaik/ecc/3.18/ecc-3.18.pom
+++ /dev/null
@@ -1,7 +0,0 @@
-<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>iaik</groupId>
- <artifactId>ecc</artifactId>
- <name>IAIK ECC</name>
- <version>3.18</version>
-</project> \ No newline at end of file
diff --git a/repository/iaik/iaikPkcs11Provider/1.3/iaikPkcs11Provider-1.3.jar b/repository/iaik/iaikPkcs11Provider/1.3/iaikPkcs11Provider-1.3.jar
deleted file mode 100644
index de1364ee9..000000000
--- a/repository/iaik/iaikPkcs11Provider/1.3/iaikPkcs11Provider-1.3.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/iaik_ecc/2.19/iaik_ecc-2.19.jar b/repository/iaik/iaik_ecc/2.19/iaik_ecc-2.19.jar
deleted file mode 100644
index 4a5fca3d7..000000000
--- a/repository/iaik/iaik_ecc/2.19/iaik_ecc-2.19.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/iaik_ecc/2.19/iaik_ecc-2.19.pom b/repository/iaik/iaik_ecc/2.19/iaik_ecc-2.19.pom
deleted file mode 100644
index 0594f8ef9..000000000
--- a/repository/iaik/iaik_ecc/2.19/iaik_ecc-2.19.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>iaik</groupId>
- <artifactId>iaik_ecc</artifactId>
- <version>2.19</version>
- <description>POM was created from install:install-file</description>
-</project>
diff --git a/repository/iaik/iaik_ecc_eval_signed/2.15/iaik_ecc_eval_signed-2.15.jar b/repository/iaik/iaik_ecc_eval_signed/2.15/iaik_ecc_eval_signed-2.15.jar
deleted file mode 100644
index dbed40bcd..000000000
--- a/repository/iaik/iaik_ecc_eval_signed/2.15/iaik_ecc_eval_signed-2.15.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/iaik_ecc_signed/2.15/iaik_ecc_signed-2.15.jar b/repository/iaik/iaik_ecc_signed/2.15/iaik_ecc_signed-2.15.jar
deleted file mode 100644
index 740f04a85..000000000
--- a/repository/iaik/iaik_ecc_signed/2.15/iaik_ecc_signed-2.15.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/iaik_ecc_signed/2.15/iaik_ecc_signed-2.15.pom b/repository/iaik/iaik_ecc_signed/2.15/iaik_ecc_signed-2.15.pom
deleted file mode 100644
index 7fb88a18f..000000000
--- a/repository/iaik/iaik_ecc_signed/2.15/iaik_ecc_signed-2.15.pom
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>iaik</groupId>
- <artifactId>iaik_ecc_signed</artifactId>
- <version>2.15</version>
- <description>POM was created from install:install-file</description>
-</project> \ No newline at end of file
diff --git a/repository/iaik/iaik_ecc_signed/2.19/iaik_ecc.jar b/repository/iaik/iaik_ecc_signed/2.19/iaik_ecc.jar
deleted file mode 100644
index abe38aea9..000000000
--- a/repository/iaik/iaik_ecc_signed/2.19/iaik_ecc.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/iaik_ecc_signed/2.19/iaik_ecc_signed-2.19.jar b/repository/iaik/iaik_ecc_signed/2.19/iaik_ecc_signed-2.19.jar
deleted file mode 100644
index abe38aea9..000000000
--- a/repository/iaik/iaik_ecc_signed/2.19/iaik_ecc_signed-2.19.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/iaik_ecc_signed/2.19/iaik_ecc_signed-2.19.jar.sha1 b/repository/iaik/iaik_ecc_signed/2.19/iaik_ecc_signed-2.19.jar.sha1
deleted file mode 100644
index c1f515b9e..000000000
--- a/repository/iaik/iaik_ecc_signed/2.19/iaik_ecc_signed-2.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9bc26b101cf5ea86e060039e6df16f2df0c2fee1 \ No newline at end of file
diff --git a/repository/iaik/iaik_ecc_signed/2.19/iaik_ecc_signed-2.19.pom b/repository/iaik/iaik_ecc_signed/2.19/iaik_ecc_signed-2.19.pom
deleted file mode 100644
index a3f6474bf..000000000
--- a/repository/iaik/iaik_ecc_signed/2.19/iaik_ecc_signed-2.19.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>iaik</groupId>
- <artifactId>iaik_ecc_signed</artifactId>
- <version>2.19</version>
- <description>POM was created from install:install-file</description>
-</project>
diff --git a/repository/iaik/iaik_ecc_signed/2.19/iaik_ecc_signed-2.19.pom.sha1 b/repository/iaik/iaik_ecc_signed/2.19/iaik_ecc_signed-2.19.pom.sha1
deleted file mode 100644
index 40428a2b8..000000000
--- a/repository/iaik/iaik_ecc_signed/2.19/iaik_ecc_signed-2.19.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-40c799da1addc280c4f04cfe65cab2b35cdf90b7 \ No newline at end of file
diff --git a/repository/iaik/iaik_eccelerate/2.51/iaik_eccelerate-2.51.jar b/repository/iaik/iaik_eccelerate/2.51/iaik_eccelerate-2.51.jar
deleted file mode 100644
index d53fcb398..000000000
--- a/repository/iaik/iaik_eccelerate/2.51/iaik_eccelerate-2.51.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/iaik_eccelerate/2.51/iaik_eccelerate-2.51.pom b/repository/iaik/iaik_eccelerate/2.51/iaik_eccelerate-2.51.pom
deleted file mode 100644
index 21a800dd7..000000000
--- a/repository/iaik/iaik_eccelerate/2.51/iaik_eccelerate-2.51.pom
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>iaik</groupId>
- <artifactId>iaik_eccelerate</artifactId>
- <version>2.51</version>
- <description>POM was created by Sonatype Nexus</description>
-</project> \ No newline at end of file
diff --git a/repository/iaik/iaik_ixsil/1.2.0/iaik_ixsil-1.2.0-eval.jar b/repository/iaik/iaik_ixsil/1.2.0/iaik_ixsil-1.2.0-eval.jar
deleted file mode 100644
index ada154483..000000000
--- a/repository/iaik/iaik_ixsil/1.2.0/iaik_ixsil-1.2.0-eval.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/iaik_ixsil/1.2.0/iaik_ixsil-1.2.0.pom b/repository/iaik/iaik_ixsil/1.2.0/iaik_ixsil-1.2.0.pom
deleted file mode 100644
index 0626c9021..000000000
--- a/repository/iaik/iaik_ixsil/1.2.0/iaik_ixsil-1.2.0.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>iaik</groupId>
- <artifactId>iaik_ixsil</artifactId>
- <version>1.2.0</version>
- <description>Artifactory auto generated POM</description>
-</project> \ No newline at end of file
diff --git a/repository/iaik/iaik_ixsil_eval/1.2.2/iaik_ixsil_eval-1.2.2-javadoc.jar b/repository/iaik/iaik_ixsil_eval/1.2.2/iaik_ixsil_eval-1.2.2-javadoc.jar
deleted file mode 100644
index 95cc68e85..000000000
--- a/repository/iaik/iaik_ixsil_eval/1.2.2/iaik_ixsil_eval-1.2.2-javadoc.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/iaik_ixsil_eval/1.2.2/iaik_ixsil_eval-1.2.2-javadoc.jar.sha1 b/repository/iaik/iaik_ixsil_eval/1.2.2/iaik_ixsil_eval-1.2.2-javadoc.jar.sha1
deleted file mode 100644
index aca85e0e9..000000000
--- a/repository/iaik/iaik_ixsil_eval/1.2.2/iaik_ixsil_eval-1.2.2-javadoc.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-eacf3e640ba6d84a2b57c65542522b6d4e5de5aa
diff --git a/repository/iaik/iaik_ixsil_eval/1.2.2/iaik_ixsil_eval-1.2.2.jar b/repository/iaik/iaik_ixsil_eval/1.2.2/iaik_ixsil_eval-1.2.2.jar
deleted file mode 100644
index 99b77eeef..000000000
--- a/repository/iaik/iaik_ixsil_eval/1.2.2/iaik_ixsil_eval-1.2.2.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/iaik_ixsil_eval/1.2.2/iaik_ixsil_eval-1.2.2.jar.sha1 b/repository/iaik/iaik_ixsil_eval/1.2.2/iaik_ixsil_eval-1.2.2.jar.sha1
deleted file mode 100644
index b2419ec9d..000000000
--- a/repository/iaik/iaik_ixsil_eval/1.2.2/iaik_ixsil_eval-1.2.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-324132b942f7b1120f65c6ef7bede0e0fd9d918c
diff --git a/repository/iaik/iaik_ixsil_eval/1.2.2/iaik_ixsil_eval-1.2.2.pom b/repository/iaik/iaik_ixsil_eval/1.2.2/iaik_ixsil_eval-1.2.2.pom
deleted file mode 100644
index 54b44ad19..000000000
--- a/repository/iaik/iaik_ixsil_eval/1.2.2/iaik_ixsil_eval-1.2.2.pom
+++ /dev/null
@@ -1,6 +0,0 @@
-<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>iaik</groupId>
- <artifactId>iaik_ixsil_eval</artifactId>
- <version>1.2.2</version>
-</project>
diff --git a/repository/iaik/iaik_ixsil_eval/1.2.2/iaik_ixsil_eval-1.2.2.pom.sha1 b/repository/iaik/iaik_ixsil_eval/1.2.2/iaik_ixsil_eval-1.2.2.pom.sha1
deleted file mode 100644
index 4ecc2e613..000000000
--- a/repository/iaik/iaik_ixsil_eval/1.2.2/iaik_ixsil_eval-1.2.2.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-91c3b7dfbe45e151de8ba51e8f433fb8ea3dc7d4
diff --git a/repository/iaik/iaik_javax_crypto/1.0/iaik_javax_crypto-1.0.jar b/repository/iaik/iaik_javax_crypto/1.0/iaik_javax_crypto-1.0.jar
deleted file mode 100644
index e4531328b..000000000
--- a/repository/iaik/iaik_javax_crypto/1.0/iaik_javax_crypto-1.0.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/iaik_javax_crypto/1.0/iaik_javax_crypto-1.0.pom b/repository/iaik/iaik_javax_crypto/1.0/iaik_javax_crypto-1.0.pom
deleted file mode 100644
index b4ff61576..000000000
--- a/repository/iaik/iaik_javax_crypto/1.0/iaik_javax_crypto-1.0.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>iaik</groupId>
- <artifactId>iaik_javax_crypto</artifactId>
- <version>1.0</version>
- <description>POM was created from install:install-file</description>
-</project>
diff --git a/repository/iaik/iaik_jce_eval_signed/3.16/iaik_jce_eval_signed-3.16.jar b/repository/iaik/iaik_jce_eval_signed/3.16/iaik_jce_eval_signed-3.16.jar
deleted file mode 100644
index 5687b9106..000000000
--- a/repository/iaik/iaik_jce_eval_signed/3.16/iaik_jce_eval_signed-3.16.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/iaik_jce_eval_signed/3.181/iaik_jce_eval_signed-3.181.jar b/repository/iaik/iaik_jce_eval_signed/3.181/iaik_jce_eval_signed-3.181.jar
deleted file mode 100644
index 932e4310f..000000000
--- a/repository/iaik/iaik_jce_eval_signed/3.181/iaik_jce_eval_signed-3.181.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/iaik_jce_eval_signed/3.181/iaik_jce_eval_signed-3.181.pom b/repository/iaik/iaik_jce_eval_signed/3.181/iaik_jce_eval_signed-3.181.pom
deleted file mode 100644
index 9bcbb93a5..000000000
--- a/repository/iaik/iaik_jce_eval_signed/3.181/iaik_jce_eval_signed-3.181.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>iaik</groupId>
- <artifactId>iaik_jce_eval_signed</artifactId>
- <version>3.181</version>
- <description>POM was created from install:install-file</description>
-</project>
diff --git a/repository/iaik/iaik_jce_full/5.01/iaik_jce_full-5.01.jar b/repository/iaik/iaik_jce_full/5.01/iaik_jce_full-5.01.jar
deleted file mode 100644
index 825bd2573..000000000
--- a/repository/iaik/iaik_jce_full/5.01/iaik_jce_full-5.01.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/iaik_jce_full/5.01/iaik_jce_full-5.01.pom b/repository/iaik/iaik_jce_full/5.01/iaik_jce_full-5.01.pom
deleted file mode 100644
index b9a480933..000000000
--- a/repository/iaik/iaik_jce_full/5.01/iaik_jce_full-5.01.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>iaik</groupId>
- <artifactId>iaik_jce_full</artifactId>
- <version>5.01</version>
- <description>POM was created from install:install-file</description>
-</project>
diff --git a/repository/iaik/iaik_jce_full_signed/3.16/iaik_jce_full_signed-3.16.jar b/repository/iaik/iaik_jce_full_signed/3.16/iaik_jce_full_signed-3.16.jar
deleted file mode 100644
index 0e6ca6fce..000000000
--- a/repository/iaik/iaik_jce_full_signed/3.16/iaik_jce_full_signed-3.16.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/iaik_jce_full_signed/3.16/iaik_jce_full_signed-3.16.pom b/repository/iaik/iaik_jce_full_signed/3.16/iaik_jce_full_signed-3.16.pom
deleted file mode 100644
index ab1026dac..000000000
--- a/repository/iaik/iaik_jce_full_signed/3.16/iaik_jce_full_signed-3.16.pom
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>iaik</groupId>
- <artifactId>iaik_jce_full_signed</artifactId>
- <version>3.16</version>
- <description>POM was created from install:install-file</description>
-</project> \ No newline at end of file
diff --git a/repository/iaik/iaik_jce_me4se/3.04/iaik_jce_me4se-3.04.jar b/repository/iaik/iaik_jce_me4se/3.04/iaik_jce_me4se-3.04.jar
deleted file mode 100644
index d55a1d279..000000000
--- a/repository/iaik/iaik_jce_me4se/3.04/iaik_jce_me4se-3.04.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/iaik_jce_me4se/3.04/iaik_jce_me4se-3.04.pom b/repository/iaik/iaik_jce_me4se/3.04/iaik_jce_me4se-3.04.pom
deleted file mode 100644
index e6909b2ac..000000000
--- a/repository/iaik/iaik_jce_me4se/3.04/iaik_jce_me4se-3.04.pom
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>iaik</groupId>
- <artifactId>iaik_jce_me4se</artifactId>
- <version>3.04</version>
- <description>POM was created from install:install-file</description>
-</project> \ No newline at end of file
diff --git a/repository/iaik/iaik_jsse/4.4/iaik_jsse-4.4.jar b/repository/iaik/iaik_jsse/4.4/iaik_jsse-4.4.jar
deleted file mode 100644
index 15b320422..000000000
--- a/repository/iaik/iaik_jsse/4.4/iaik_jsse-4.4.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/iaik_jsse/4.4/iaik_jsse-4.4.pom b/repository/iaik/iaik_jsse/4.4/iaik_jsse-4.4.pom
deleted file mode 100644
index 382c12003..000000000
--- a/repository/iaik/iaik_jsse/4.4/iaik_jsse-4.4.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>iaik</groupId>
- <artifactId>iaik_jsse</artifactId>
- <version>4.4</version>
- <description>POM was created from install:install-file</description>
-</project>
diff --git a/repository/iaik/iaik_pki/1.0-MOCCA/iaik_pki-1.0-MOCCA.jar b/repository/iaik/iaik_pki/1.0-MOCCA/iaik_pki-1.0-MOCCA.jar
deleted file mode 100644
index e911f1f15..000000000
--- a/repository/iaik/iaik_pki/1.0-MOCCA/iaik_pki-1.0-MOCCA.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/iaik_pki/1.0-MOCCA/iaik_pki-1.0-MOCCA.pom b/repository/iaik/iaik_pki/1.0-MOCCA/iaik_pki-1.0-MOCCA.pom
deleted file mode 100644
index dd50132a3..000000000
--- a/repository/iaik/iaik_pki/1.0-MOCCA/iaik_pki-1.0-MOCCA.pom
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>iaik</groupId>
- <artifactId>iaik_pki</artifactId>
- <version>1.0-MOCCA</version>
- <description>POM was created from install:install-file</description>
-</project>
diff --git a/repository/iaik/iaik_pki_module/1.0/iaik_pki_module-1.0.jar b/repository/iaik/iaik_pki_module/1.0/iaik_pki_module-1.0.jar
deleted file mode 100644
index 43c882876..000000000
--- a/repository/iaik/iaik_pki_module/1.0/iaik_pki_module-1.0.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/iaik_pki_module/1.0/iaik_pki_module-1.0.pom b/repository/iaik/iaik_pki_module/1.0/iaik_pki_module-1.0.pom
deleted file mode 100644
index e78656647..000000000
--- a/repository/iaik/iaik_pki_module/1.0/iaik_pki_module-1.0.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>iaik</groupId>
- <artifactId>iaik_pki_module</artifactId>
- <version>1.0</version>
- <description>POM was created from install:install-file</description>
-</project>
diff --git a/repository/iaik/iaik_ssl/4.4/iaik_ssl-4.4.jar b/repository/iaik/iaik_ssl/4.4/iaik_ssl-4.4.jar
deleted file mode 100644
index 2a875c833..000000000
--- a/repository/iaik/iaik_ssl/4.4/iaik_ssl-4.4.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/iaik_ssl/4.4/iaik_ssl-4.4.pom b/repository/iaik/iaik_ssl/4.4/iaik_ssl-4.4.pom
deleted file mode 100644
index 32c610268..000000000
--- a/repository/iaik/iaik_ssl/4.4/iaik_ssl-4.4.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>iaik</groupId>
- <artifactId>iaik_ssl</artifactId>
- <version>4.4</version>
- <description>POM was created from install:install-file</description>
-</project>
diff --git a/repository/iaik/iaik_tsl/0.0.1-SNAPSHOT/iaik_tsl-0.0.1-SNAPSHOT.jar b/repository/iaik/iaik_tsl/0.0.1-SNAPSHOT/iaik_tsl-0.0.1-SNAPSHOT.jar
deleted file mode 100644
index cc461be04..000000000
--- a/repository/iaik/iaik_tsl/0.0.1-SNAPSHOT/iaik_tsl-0.0.1-SNAPSHOT.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/iaik_tsl/0.0.1-SNAPSHOT/iaik_tsl-0.0.1-SNAPSHOT.pom b/repository/iaik/iaik_tsl/0.0.1-SNAPSHOT/iaik_tsl-0.0.1-SNAPSHOT.pom
deleted file mode 100644
index e7fe82da2..000000000
--- a/repository/iaik/iaik_tsl/0.0.1-SNAPSHOT/iaik_tsl-0.0.1-SNAPSHOT.pom
+++ /dev/null
@@ -1,135 +0,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>
- <groupId>iaik</groupId>
- <artifactId>iaik_tsl</artifactId>
- <packaging>jar</packaging>
- <version>0.0.1-SNAPSHOT</version>
- <name>TSL_library</name>
-
- <build>
- <resources>
- <resource>
- <filtering>true</filtering>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
-
- <finalName>${project.artifactId}</finalName>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-versions</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireJavaVersion>
- <version>1.5</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
- <configuration>
- <compilerArguments>
- <verbose />
- </compilerArguments>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_xsect_eval</artifactId>
- <version>1.17</version>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_ecc_signed</artifactId>
- <version>2.19</version>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_jce_eval_signed</artifactId>
- <version>3.181</version>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_pki_module</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_javax_crypto</artifactId>
- <version>1.0</version>
- </dependency>
-<!-- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_util</artifactId>
- <version>0.23</version>
- </dependency> -->
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_jsse</artifactId>
- <version>4.4</version>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_ssl</artifactId>
- <version>4.4</version>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>w3c_http</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.xerial</groupId>
- <artifactId>sqlite-jdbc</artifactId>
- <version>3.7.2</version>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.2.6</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.2.6</version>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.7.1</version>
- </dependency>
-
- </dependencies>
-
-</project> \ No newline at end of file
diff --git a/repository/iaik/iaik_tsl/0.0.1-SNAPSHOT/maven-metadata-local.xml b/repository/iaik/iaik_tsl/0.0.1-SNAPSHOT/maven-metadata-local.xml
deleted file mode 100644
index 64ac0d4ca..000000000
--- a/repository/iaik/iaik_tsl/0.0.1-SNAPSHOT/maven-metadata-local.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
- <groupId>iaik</groupId>
- <artifactId>iaik_tsl</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <versioning>
- <snapshot>
- <localCopy>true</localCopy>
- </snapshot>
- <lastUpdated>20130308070150</lastUpdated>
- <snapshotVersions>
- <snapshotVersion>
- <extension>jar</extension>
- <value>0.0.1-SNAPSHOT</value>
- <updated>20130308070150</updated>
- </snapshotVersion>
- <snapshotVersion>
- <extension>pom</extension>
- <value>0.0.1-SNAPSHOT</value>
- <updated>20130308070150</updated>
- </snapshotVersion>
- </snapshotVersions>
- </versioning>
-</metadata>
diff --git a/repository/iaik/iaik_tsl/0.5/iaik_tsl-0.5.jar b/repository/iaik/iaik_tsl/0.5/iaik_tsl-0.5.jar
deleted file mode 100644
index 7a05fa705..000000000
--- a/repository/iaik/iaik_tsl/0.5/iaik_tsl-0.5.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/iaik_tsl/0.5/iaik_tsl-0.5.pom b/repository/iaik/iaik_tsl/0.5/iaik_tsl-0.5.pom
deleted file mode 100644
index aebc1b74e..000000000
--- a/repository/iaik/iaik_tsl/0.5/iaik_tsl-0.5.pom
+++ /dev/null
@@ -1,250 +0,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>
- <groupId>iaik</groupId>
- <artifactId>iaik_tsl</artifactId>
- <packaging>jar</packaging>
- <version>0.5</version>
- <name>TSL_library</name>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
- </properties>
-
-
- <build>
- <resources>
- <resource>
- <filtering>true</filtering>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
-
- <finalName>${project.artifactId}</finalName>
-
- <plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>validate</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>${endorsed.dir}</outputDirectory>
- <excludeTransitive>true</excludeTransitive>
- <includeArtifactIds>jaxb-api,jaxb-impl</includeArtifactIds>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
- <configuration>
- <compilerArguments>
- <verbose />
- <endorseddirs>${endorsed.dir}</endorseddirs>
- </compilerArguments>
- <source>${java.version}</source>
- <target>${java.version}</target>
- <fork>true</fork>
- <compilerVersion>${java.version}</compilerVersion>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <id>enforce-versions</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireJavaVersion>
- <version>1.5</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <versionRange>[2.0,)</versionRange>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <profiles>
- <profile>
- <id>profile-for-jdk1.6</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- <jdk>[1.6,)</jdk>
- </activation>
- <properties>
- <java.version>1.6</java.version>
- <envClassifier>jdk${java.version}</envClassifier>
- </properties>
- <build>
- <finalName>${project.artifactId}-${project.version}-${envClassifier}</finalName>
- </build>
- <dependencies>
- <!-- Requires JAVA 1.6 -->
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.2.6</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.2.6</version>
- </dependency>
-
- </dependencies>
- </profile>
- <profile>
- <id>profile-for-jdk1.5</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- <jdk>(,1.5]</jdk>
- </activation>
- <properties>
- <java.version>1.5</java.version>
- <envClassifier>jdk${java.version}</envClassifier>
- </properties>
- <build>
- <finalName>${project.artifactId}-${project.version}-${envClassifier}</finalName>
- </build>
- <dependencies>
- <!-- Last Version with JAVA 1.5 -->
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.2.4</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.2.4-1</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
- <dependencies>
-
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_xsect_eval</artifactId>
- <version>1.1709142</version>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_ecc_signed</artifactId>
- <version>2.19</version>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_jce_eval_signed</artifactId>
- <version>3.181</version>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_pki_module</artifactId>
- <version>1.0</version>
- </dependency>
-<!-- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_javax_crypto</artifactId>
- <version>1.0</version>
- </dependency> -->
-<!-- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_util</artifactId>
- <version>0.23 (snapshot 20121011-125127 eval)</version>
- </dependency> -->
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_jsse</artifactId>
- <version>4.4</version>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_ssl</artifactId>
- <version>4.4</version>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>w3c_http</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.xerial</groupId>
- <artifactId>sqlite-jdbc</artifactId>
- <version>3.7.2</version>
- </dependency>
-
-
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.7.1</version>
- </dependency>
- </dependencies>
-
-</project> \ No newline at end of file
diff --git a/repository/iaik/iaik_tsl/1.0/iaik_tsl-1.0.jar b/repository/iaik/iaik_tsl/1.0/iaik_tsl-1.0.jar
deleted file mode 100644
index 596ec60ea..000000000
--- a/repository/iaik/iaik_tsl/1.0/iaik_tsl-1.0.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/iaik_tsl/1.0/iaik_tsl-1.0.pom b/repository/iaik/iaik_tsl/1.0/iaik_tsl-1.0.pom
deleted file mode 100644
index 2ffb92b70..000000000
--- a/repository/iaik/iaik_tsl/1.0/iaik_tsl-1.0.pom
+++ /dev/null
@@ -1,251 +0,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>
- <groupId>iaik</groupId>
- <artifactId>iaik_tsl</artifactId>
- <packaging>jar</packaging>
- <version>1.0</version>
- <name>TSL_library</name>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
- </properties>
-
-
- <build>
- <resources>
- <resource>
- <filtering>true</filtering>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
-
- <finalName>${project.artifactId}</finalName>
-
- <plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>validate</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>${endorsed.dir}</outputDirectory>
- <excludeTransitive>true</excludeTransitive>
- <includeArtifactIds>jaxb-api,jaxb-impl</includeArtifactIds>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
- <configuration>
- <compilerArguments>
- <verbose />
- <endorseddirs>${endorsed.dir}</endorseddirs>
- </compilerArguments>
- <source>${java.version}</source>
- <target>${java.version}</target>
- <fork>true</fork>
- <compilerVersion>${java.version}</compilerVersion>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <id>enforce-versions</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireJavaVersion>
- <version>1.5</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <versionRange>[2.0,)</versionRange>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <profiles>
- <profile>
- <id>profile-for-jdk1.6</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- <jdk>[1.6,)</jdk>
- </activation>
- <properties>
- <java.version>1.6</java.version>
- <envClassifier>jdk${java.version}</envClassifier>
- </properties>
- <build>
- <finalName>${project.artifactId}-${project.version}-${envClassifier}</finalName>
- </build>
- <dependencies>
- <!-- Requires JAVA 1.6 -->
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.2.6</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.2.6</version>
- </dependency>
-
- </dependencies>
- </profile>
- <profile>
- <id>profile-for-jdk1.5</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- <jdk>(,1.5]</jdk>
- </activation>
- <properties>
- <java.version>1.5</java.version>
- <envClassifier>jdk${java.version}</envClassifier>
- </properties>
- <build>
- <finalName>${project.artifactId}-${project.version}-${envClassifier}</finalName>
- </build>
- <dependencies>
- <!-- Last Version with JAVA 1.5 -->
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.2.4</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.2.4-1</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
- <dependencies>
-
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_xsect_eval</artifactId>
- <version>1.1709142</version>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_ecc_signed</artifactId>
- <version>2.19</version>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_jce_eval_signed</artifactId>
- <version>3.181</version>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_pki_module</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_javax_crypto</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_util</artifactId>
- <!-- <version>0.23 (snapshot 20121011-125127 eval)</version>-->
- <version>0.23</version>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_jsse</artifactId>
- <version>4.4</version>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_ssl</artifactId>
- <version>4.4</version>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>w3c_http</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.xerial</groupId>
- <artifactId>sqlite-jdbc</artifactId>
- <version>3.7.2</version>
- </dependency>
-
-
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.7.1</version>
- </dependency>
- </dependencies>
-
-</project> \ No newline at end of file
diff --git a/repository/iaik/iaik_tsl/1.1/iaik_tsl-1.1.jar b/repository/iaik/iaik_tsl/1.1/iaik_tsl-1.1.jar
deleted file mode 100644
index 6fa0fef7c..000000000
--- a/repository/iaik/iaik_tsl/1.1/iaik_tsl-1.1.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/iaik_tsl/1.1/iaik_tsl-1.1.pom b/repository/iaik/iaik_tsl/1.1/iaik_tsl-1.1.pom
deleted file mode 100644
index 52244bf1c..000000000
--- a/repository/iaik/iaik_tsl/1.1/iaik_tsl-1.1.pom
+++ /dev/null
@@ -1,276 +0,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>
- <groupId>iaik</groupId>
- <artifactId>iaik_tsl</artifactId>
- <packaging>jar</packaging>
- <version>1.1</version>
- <name>TSL_library</name>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
- </properties>
-
-
- <build>
- <resources>
- <resource>
- <filtering>true</filtering>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
-
- <finalName>${project.artifactId}</finalName>
-
- <plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>validate</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>${endorsed.dir}</outputDirectory>
- <excludeTransitive>true</excludeTransitive>
- <includeArtifactIds>jaxb-api,jaxb-impl</includeArtifactIds>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
- <configuration>
- <compilerArguments>
- <verbose />
- <endorseddirs>${endorsed.dir}</endorseddirs>
- </compilerArguments>
- <source>${java.version}</source>
- <target>${java.version}</target>
- <fork>true</fork>
- <compilerVersion>${java.version}</compilerVersion>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <id>enforce-versions</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireJavaVersion>
- <version>1.6</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
-
- <!-- if maven should be used to build jaxb classes -->
-<!-- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId>
- <version>1.5</version>
- <executions>
- <execution>
- <id>xjc</id>
- <goals>
- <goal>xjc</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <outputDirectory>${project.basedir}/src/main/xjc</outputDirectory>
- <bindingDirectory>${project.basedir}/src/main/resources/spec/jaxb/</bindingDirectory>
- <bindingFiles>ts_119612v010201_sie_xsd_local.xsd.binding.xml</bindingFiles>
- <schemaDirectory>${project.basedir}/src/main/resources/spec/jaxb/</schemaDirectory>
- <schemaFiles>ts_119612v010201_sie_xsd_local.xsd</schemaFiles>
- <extension>true</extension>
- </configuration>
- </plugin> -->
-
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <versionRange>[2.0,)</versionRange>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <profiles>
- <profile>
- <id>profile-for-jdk1.6</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- <jdk>[1.6,)</jdk>
- </activation>
- <properties>
- <java.version>1.6</java.version>
- <envClassifier>jdk${java.version}</envClassifier>
- </properties>
- <build>
- <finalName>${project.artifactId}-${project.version}-${envClassifier}</finalName>
- </build>
- <dependencies>
- <!-- Requires JAVA 1.6 -->
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.2.11</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.2.7</version>
- </dependency>
-
- </dependencies>
- </profile>
- <profile>
- <id>profile-for-jdk1.5</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- <jdk>(,1.5]</jdk>
- </activation>
- <properties>
- <java.version>1.5</java.version>
- <envClassifier>jdk${java.version}</envClassifier>
- </properties>
- <build>
- <finalName>${project.artifactId}-${project.version}-${envClassifier}</finalName>
- </build>
- <dependencies>
- <!-- Last Version with JAVA 1.5 -->
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.2.7</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.2.7</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
- <dependencies>
-
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_xsect_eval</artifactId>
- <version>1.1709142</version>
- </dependency>
- <dependency>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_ecc</artifactId>
- <version>2.19</version>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_jce_eval_signed</artifactId>
- <version>3.181</version>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_pki_module</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_javax_crypto</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_util</artifactId>
- <!-- <version>0.23 (snapshot 20121011-125127 eval)</version>-->
- <version>0.23</version>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_jsse</artifactId>
- <version>4.4</version>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_ssl</artifactId>
- <version>4.4</version>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>w3c_http</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.xerial</groupId>
- <artifactId>sqlite-jdbc</artifactId>
- <version>3.7.2</version>
- </dependency>
-
-
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1.1</version>
- </dependency>
-<!-- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0.1</version>
- </dependency> -->
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.11.0</version>
- </dependency>
- </dependencies>
-
-</project> \ No newline at end of file
diff --git a/repository/iaik/iaik_tsl/maven-metadata-local.xml b/repository/iaik/iaik_tsl/maven-metadata-local.xml
deleted file mode 100644
index 9b36d1a39..000000000
--- a/repository/iaik/iaik_tsl/maven-metadata-local.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
- <groupId>iaik</groupId>
- <artifactId>iaik_tsl</artifactId>
- <versioning>
- <release>1.0</release>
- <versions>
- <version>0.0.1-SNAPSHOT</version>
- <version>0.5</version>
- <version>1.0</version>
- </versions>
- <lastUpdated>20140130172750</lastUpdated>
- </versioning>
-</metadata>
diff --git a/repository/iaik/iaik_util/0.23/iaik_util-0.23.jar b/repository/iaik/iaik_util/0.23/iaik_util-0.23.jar
deleted file mode 100644
index 78370c31e..000000000
--- a/repository/iaik/iaik_util/0.23/iaik_util-0.23.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/iaik_util/0.23/iaik_util-0.23.pom b/repository/iaik/iaik_util/0.23/iaik_util-0.23.pom
deleted file mode 100644
index 75fdc3692..000000000
--- a/repository/iaik/iaik_util/0.23/iaik_util-0.23.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>iaik</groupId>
- <artifactId>iaik_util</artifactId>
- <version>0.23</version>
- <description>POM was created from install:install-file</description>
-</project>
diff --git a/repository/iaik/iaik_xsect/1.17/iaik_xsect-1.17.jar b/repository/iaik/iaik_xsect/1.17/iaik_xsect-1.17.jar
deleted file mode 100644
index 143721433..000000000
--- a/repository/iaik/iaik_xsect/1.17/iaik_xsect-1.17.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/iaik_xsect/1.17/iaik_xsect-1.17.jar.sha1 b/repository/iaik/iaik_xsect/1.17/iaik_xsect-1.17.jar.sha1
deleted file mode 100644
index d94a0d2e1..000000000
--- a/repository/iaik/iaik_xsect/1.17/iaik_xsect-1.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a7229772fae682b3e0fb36c1ca99c7863b67183d \ No newline at end of file
diff --git a/repository/iaik/iaik_xsect/1.17/iaik_xsect-1.17.pom b/repository/iaik/iaik_xsect/1.17/iaik_xsect-1.17.pom
deleted file mode 100644
index 53a1a1c69..000000000
--- a/repository/iaik/iaik_xsect/1.17/iaik_xsect-1.17.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>iaik</groupId>
- <artifactId>iaik_xsect</artifactId>
- <version>1.17</version>
- <description>POM was created from install:install-file</description>
-</project>
diff --git a/repository/iaik/iaik_xsect/1.17/iaik_xsect-1.17.pom.sha1 b/repository/iaik/iaik_xsect/1.17/iaik_xsect-1.17.pom.sha1
deleted file mode 100644
index ae1a98d0d..000000000
--- a/repository/iaik/iaik_xsect/1.17/iaik_xsect-1.17.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-89ab4d09c9e7c6c635333fdd4bba4fe83eda17ed \ No newline at end of file
diff --git a/repository/iaik/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jar b/repository/iaik/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jar
deleted file mode 100644
index 96732584e..000000000
--- a/repository/iaik/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/iaik_xsect_eval/1.11build48/iaik_xsect_eval-1.11build48.jar b/repository/iaik/iaik_xsect_eval/1.11build48/iaik_xsect_eval-1.11build48.jar
deleted file mode 100644
index 75cc08ac9..000000000
--- a/repository/iaik/iaik_xsect_eval/1.11build48/iaik_xsect_eval-1.11build48.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/iaik_xsect_eval/1.11build48/iaik_xsect_eval-1.11build48.jar.sha1 b/repository/iaik/iaik_xsect_eval/1.11build48/iaik_xsect_eval-1.11build48.jar.sha1
deleted file mode 100644
index 9342639d0..000000000
--- a/repository/iaik/iaik_xsect_eval/1.11build48/iaik_xsect_eval-1.11build48.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0f4ae4f842abc37209af659998de0d475401b47c
diff --git a/repository/iaik/iaik_xsect_eval/1.11build48/iaik_xsect_eval-1.11build48.pom b/repository/iaik/iaik_xsect_eval/1.11build48/iaik_xsect_eval-1.11build48.pom
deleted file mode 100644
index af1ce91ff..000000000
--- a/repository/iaik/iaik_xsect_eval/1.11build48/iaik_xsect_eval-1.11build48.pom
+++ /dev/null
@@ -1,32 +0,0 @@
-<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>iaik</groupId>
- <artifactId>iaik_xsect_eval</artifactId>
- <version>1.11build48</version>
- <dependencies>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_jce_eval_signed</artifactId>
- <version>3.142</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.7.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.7.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.0.b2</version>
- <optional>true</optional>
- </dependency>
- </dependencies>
-</project>
diff --git a/repository/iaik/iaik_xsect_eval/1.11build48/iaik_xsect_eval-1.11build48.pom.sha1 b/repository/iaik/iaik_xsect_eval/1.11build48/iaik_xsect_eval-1.11build48.pom.sha1
deleted file mode 100644
index 1d18f50a4..000000000
--- a/repository/iaik/iaik_xsect_eval/1.11build48/iaik_xsect_eval-1.11build48.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2f1a7377b98d831ae4d854f3158221e142d95d77
diff --git a/repository/iaik/iaik_xsect_eval/1.17/iaik_xsect_eval-1.17.jar b/repository/iaik/iaik_xsect_eval/1.17/iaik_xsect_eval-1.17.jar
deleted file mode 100644
index d8ddf1925..000000000
--- a/repository/iaik/iaik_xsect_eval/1.17/iaik_xsect_eval-1.17.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/iaik_xsect_eval/1.1709142/iaik_xsect_eval-1.1709142.jar b/repository/iaik/iaik_xsect_eval/1.1709142/iaik_xsect_eval-1.1709142.jar
deleted file mode 100644
index 420d8c2ff..000000000
--- a/repository/iaik/iaik_xsect_eval/1.1709142/iaik_xsect_eval-1.1709142.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/iaik_xsect_eval/1.1709142/iaik_xsect_eval-1.1709142.pom b/repository/iaik/iaik_xsect_eval/1.1709142/iaik_xsect_eval-1.1709142.pom
deleted file mode 100644
index 2697348bd..000000000
--- a/repository/iaik/iaik_xsect_eval/1.1709142/iaik_xsect_eval-1.1709142.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>iaik</groupId>
- <artifactId>iaik_xsect_eval</artifactId>
- <version>1.1709142</version>
- <description>POM was created from install:install-file</description>
-</project>
diff --git a/repository/iaik/ixsil/1.2.2.4/ixsil-1.2.2.4.jar b/repository/iaik/ixsil/1.2.2.4/ixsil-1.2.2.4.jar
deleted file mode 100644
index bda9f05bd..000000000
--- a/repository/iaik/ixsil/1.2.2.4/ixsil-1.2.2.4.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/ixsil/1.2.2.4/ixsil-1.2.2.4.pom b/repository/iaik/ixsil/1.2.2.4/ixsil-1.2.2.4.pom
deleted file mode 100644
index 49a09d2df..000000000
--- a/repository/iaik/ixsil/1.2.2.4/ixsil-1.2.2.4.pom
+++ /dev/null
@@ -1,7 +0,0 @@
-<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>iaik</groupId>
- <artifactId>ixsil</artifactId>
- <name>IAIK IXSIL</name>
- <version>1.2.2.4</version>
-</project> \ No newline at end of file
diff --git a/repository/iaik/jce/3.18/jce-3.18.jar b/repository/iaik/jce/3.18/jce-3.18.jar
deleted file mode 100644
index 4a0aa89c7..000000000
--- a/repository/iaik/jce/3.18/jce-3.18.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/jce/3.18/jce-3.18.pom b/repository/iaik/jce/3.18/jce-3.18.pom
deleted file mode 100644
index 621aaca48..000000000
--- a/repository/iaik/jce/3.18/jce-3.18.pom
+++ /dev/null
@@ -1,7 +0,0 @@
-<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>iaik</groupId>
- <artifactId>jce</artifactId>
- <name>IAIK JCE</name>
- <version>3.18</version>
-</project> \ No newline at end of file
diff --git a/repository/iaik/moa/1.28/m2e-lastUpdated.properties b/repository/iaik/moa/1.28/m2e-lastUpdated.properties
deleted file mode 100644
index 325865860..000000000
--- a/repository/iaik/moa/1.28/m2e-lastUpdated.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-#Wed Sep 04 11:22:13 CEST 2013
-iaikInternal|tlenz|http\://nexus.iaik.tugraz.at/nexus/content/groups/internal|sources=1378286533334
-central|http\://repo1.maven.org/maven2/|sources=1378286533334
-MOA|file\://D\:\\Projekte\\svn\\moa-id\\moa-idspss\\id\\server\\idserverlib/../../../repository|sources=1378286533334
-shibboleth.internet2.edu|https\://build.shibboleth.net/nexus/content/groups/public/|sources=1378286533334
-iaik3rd\ Party|tlenz|http\://nexus/nexus/content/repositories/thirdparty|sources=1378286533334
-iaikPublic|tlenz|http\://nexus.iaik.tugraz.at/nexus/content/groups/public|sources=1378286533334
-java.net-Public|https\://maven.java.net/content/groups/public/|sources=1378286533334
-hyberjaxb|http\://repository.highsource.org/maven2/releases/|sources=1378286533334
-iaikLibs|tlenz|http\://nexus/nexus/content/repositories/iaik|sources=1378286533334
diff --git a/repository/iaik/moa/1.28/moa-1.28.jar b/repository/iaik/moa/1.28/moa-1.28.jar
deleted file mode 100644
index 15d117873..000000000
--- a/repository/iaik/moa/1.28/moa-1.28.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/moa/1.28/moa-1.28.pom b/repository/iaik/moa/1.28/moa-1.28.pom
deleted file mode 100644
index 4f974d207..000000000
--- a/repository/iaik/moa/1.28/moa-1.28.pom
+++ /dev/null
@@ -1,7 +0,0 @@
-<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>iaik</groupId>
- <artifactId>moa</artifactId>
- <name>IAIK MOA</name>
- <version>1.28</version>
-</project> \ No newline at end of file
diff --git a/repository/iaik/moa_common/2006-03-20/moa_common-2006-03-20.jar b/repository/iaik/moa_common/2006-03-20/moa_common-2006-03-20.jar
deleted file mode 100644
index cb13672ac..000000000
--- a/repository/iaik/moa_common/2006-03-20/moa_common-2006-03-20.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/prod/iaik_cms/5.1/iaik_cms-5.1.jar b/repository/iaik/prod/iaik_cms/5.1/iaik_cms-5.1.jar
new file mode 100644
index 000000000..6aff9745d
--- /dev/null
+++ b/repository/iaik/prod/iaik_cms/5.1/iaik_cms-5.1.jar
Binary files differ
diff --git a/repository/iaik/prod/iaik_cpades/2.2b3_tmp/iaik_cpades-2.2b3_tmp.jar b/repository/iaik/prod/iaik_cpades/2.2b3_tmp/iaik_cpades-2.2b3_tmp.jar
new file mode 100644
index 000000000..914bc5426
--- /dev/null
+++ b/repository/iaik/prod/iaik_cpades/2.2b3_tmp/iaik_cpades-2.2b3_tmp.jar
Binary files differ
diff --git a/repository/iaik/prod/iaik_ecc/2.16/iaik_ecc-2.16.jar b/repository/iaik/prod/iaik_ecc/2.16/iaik_ecc-2.16.jar
deleted file mode 100644
index 3c44d1860..000000000
--- a/repository/iaik/prod/iaik_ecc/2.16/iaik_ecc-2.16.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/prod/iaik_ecc/2.16/iaik_ecc-2.16.jar.md5 b/repository/iaik/prod/iaik_ecc/2.16/iaik_ecc-2.16.jar.md5
deleted file mode 100644
index e2100d240..000000000
--- a/repository/iaik/prod/iaik_ecc/2.16/iaik_ecc-2.16.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-23cce9b0aab94023b41e4b35a384950f \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ecc/2.16/iaik_ecc-2.16.jar.sha1 b/repository/iaik/prod/iaik_ecc/2.16/iaik_ecc-2.16.jar.sha1
deleted file mode 100644
index dedf4fc96..000000000
--- a/repository/iaik/prod/iaik_ecc/2.16/iaik_ecc-2.16.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7ae072416c4aaf58d409776109e5391fa80f8b0f \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ecc/2.16/iaik_ecc-2.16.pom b/repository/iaik/prod/iaik_ecc/2.16/iaik_ecc-2.16.pom
deleted file mode 100644
index 8d663a505..000000000
--- a/repository/iaik/prod/iaik_ecc/2.16/iaik_ecc-2.16.pom
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_ecc</artifactId>
- <version>2.16</version>
-</project> \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ecc/2.16/iaik_ecc-2.16.pom.md5 b/repository/iaik/prod/iaik_ecc/2.16/iaik_ecc-2.16.pom.md5
deleted file mode 100644
index 0acca79de..000000000
--- a/repository/iaik/prod/iaik_ecc/2.16/iaik_ecc-2.16.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-7103828b2e03b16490af4e732e5c1fe1 \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ecc/2.16/iaik_ecc-2.16.pom.sha1 b/repository/iaik/prod/iaik_ecc/2.16/iaik_ecc-2.16.pom.sha1
deleted file mode 100644
index 6261a8b4b..000000000
--- a/repository/iaik/prod/iaik_ecc/2.16/iaik_ecc-2.16.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8fd2d71d9861c9967f00fefaee43e0dd667bf973 \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ecc/2.19/iaik_ecc-2.19.jar b/repository/iaik/prod/iaik_ecc/2.19/iaik_ecc-2.19.jar
deleted file mode 100644
index abe38aea9..000000000
--- a/repository/iaik/prod/iaik_ecc/2.19/iaik_ecc-2.19.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/prod/iaik_ecc/2.19/iaik_ecc-2.19.jar.md5 b/repository/iaik/prod/iaik_ecc/2.19/iaik_ecc-2.19.jar.md5
deleted file mode 100644
index c19d0dc21..000000000
--- a/repository/iaik/prod/iaik_ecc/2.19/iaik_ecc-2.19.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-49E8F35B0F97BDAC499A974D4C0FEF60 \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ecc/2.19/iaik_ecc-2.19.jar.sha1 b/repository/iaik/prod/iaik_ecc/2.19/iaik_ecc-2.19.jar.sha1
deleted file mode 100644
index 301e53e3b..000000000
--- a/repository/iaik/prod/iaik_ecc/2.19/iaik_ecc-2.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9BC26B101CF5EA86E060039E6DF16F2DF0C2FEE1 \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ecc/2.19/iaik_ecc-2.19.pom b/repository/iaik/prod/iaik_ecc/2.19/iaik_ecc-2.19.pom
deleted file mode 100644
index c8036e4e5..000000000
--- a/repository/iaik/prod/iaik_ecc/2.19/iaik_ecc-2.19.pom
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_ecc</artifactId>
- <version>2.19</version>
-</project> \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ecc/2.19/iaik_ecc-2.19.pom.md5 b/repository/iaik/prod/iaik_ecc/2.19/iaik_ecc-2.19.pom.md5
deleted file mode 100644
index c9eef1446..000000000
--- a/repository/iaik/prod/iaik_ecc/2.19/iaik_ecc-2.19.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-9A65E9A0DD6A3F4A60C0150097BA7A5A \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ecc/2.19/iaik_ecc-2.19.pom.sha1 b/repository/iaik/prod/iaik_ecc/2.19/iaik_ecc-2.19.pom.sha1
deleted file mode 100644
index 77924b025..000000000
--- a/repository/iaik/prod/iaik_ecc/2.19/iaik_ecc-2.19.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8B852574CD8BF31023E398B8E3B3FE868DF9AD85 \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ecc/maven-metadata.xml b/repository/iaik/prod/iaik_ecc/maven-metadata.xml
deleted file mode 100644
index 282aef69f..000000000
--- a/repository/iaik/prod/iaik_ecc/maven-metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><metadata>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_ecc</artifactId>
- <version>2.19</version>
- <versioning>
- <versions>
- <version>2.16</version>
- <version>2.19</version>
- </versions>
- <lastUpdated>20090810102119</lastUpdated>
- </versioning>
-</metadata> \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ecc/maven-metadata.xml.md5 b/repository/iaik/prod/iaik_ecc/maven-metadata.xml.md5
deleted file mode 100644
index 656260f63..000000000
--- a/repository/iaik/prod/iaik_ecc/maven-metadata.xml.md5
+++ /dev/null
@@ -1 +0,0 @@
-B8CD86C18E600501E61BF894541B7586 \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ecc/maven-metadata.xml.sha1 b/repository/iaik/prod/iaik_ecc/maven-metadata.xml.sha1
deleted file mode 100644
index 249da60ef..000000000
--- a/repository/iaik/prod/iaik_ecc/maven-metadata.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-91186D742AC2B54960AD0C6A9293DBCAD5CE7D47 \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ecc_signed/2.19/iaik_ecc_signed-2.19.jar b/repository/iaik/prod/iaik_ecc_signed/2.19/iaik_ecc_signed-2.19.jar
deleted file mode 100644
index abe38aea9..000000000
--- a/repository/iaik/prod/iaik_ecc_signed/2.19/iaik_ecc_signed-2.19.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/prod/iaik_ecc_signed/2.19/iaik_ecc_signed-2.19.pom b/repository/iaik/prod/iaik_ecc_signed/2.19/iaik_ecc_signed-2.19.pom
deleted file mode 100644
index ad3b0b202..000000000
--- a/repository/iaik/prod/iaik_ecc_signed/2.19/iaik_ecc_signed-2.19.pom
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_ecc_signed</artifactId>
- <version>2.19</version>
-</project>
diff --git a/repository/iaik/prod/iaik_eccelerate/3.1_eval/iaik_eccelerate-3.1_eval.jar b/repository/iaik/prod/iaik_eccelerate/3.1_eval/iaik_eccelerate-3.1_eval.jar
new file mode 100644
index 000000000..0ec311030
--- /dev/null
+++ b/repository/iaik/prod/iaik_eccelerate/3.1_eval/iaik_eccelerate-3.1_eval.jar
Binary files differ
diff --git a/repository/iaik/prod/iaik_eccelerate_addon/3.01_eval/iaik_eccelerate_addon-3.01_eval.jar b/repository/iaik/prod/iaik_eccelerate_addon/3.01_eval/iaik_eccelerate_addon-3.01_eval.jar
new file mode 100644
index 000000000..bd57ff24c
--- /dev/null
+++ b/repository/iaik/prod/iaik_eccelerate_addon/3.01_eval/iaik_eccelerate_addon-3.01_eval.jar
Binary files differ
diff --git a/repository/iaik/prod/iaik_eccelerate_cms/3.01/iaik_eccelerate_cms-3.01.jar b/repository/iaik/prod/iaik_eccelerate_cms/3.01/iaik_eccelerate_cms-3.01.jar
new file mode 100644
index 000000000..3c9ac8325
--- /dev/null
+++ b/repository/iaik/prod/iaik_eccelerate_cms/3.01/iaik_eccelerate_cms-3.01.jar
Binary files differ
diff --git a/repository/iaik/prod/iaik_ixsil/1.2.2.3/iaik_ixsil-1.2.2.3.jar b/repository/iaik/prod/iaik_ixsil/1.2.2.3/iaik_ixsil-1.2.2.3.jar
deleted file mode 100644
index 58f082dfb..000000000
--- a/repository/iaik/prod/iaik_ixsil/1.2.2.3/iaik_ixsil-1.2.2.3.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/prod/iaik_ixsil/1.2.2.3/iaik_ixsil-1.2.2.3.jar.md5 b/repository/iaik/prod/iaik_ixsil/1.2.2.3/iaik_ixsil-1.2.2.3.jar.md5
deleted file mode 100644
index f32005a5c..000000000
--- a/repository/iaik/prod/iaik_ixsil/1.2.2.3/iaik_ixsil-1.2.2.3.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-96685dec785418dfce238865f660d5d8 *iaik_ixsil-1.2.2.3.jar
diff --git a/repository/iaik/prod/iaik_ixsil/1.2.2.3/iaik_ixsil-1.2.2.3.jar.sha1 b/repository/iaik/prod/iaik_ixsil/1.2.2.3/iaik_ixsil-1.2.2.3.jar.sha1
deleted file mode 100644
index bf504fdea..000000000
--- a/repository/iaik/prod/iaik_ixsil/1.2.2.3/iaik_ixsil-1.2.2.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b8917856afa3013a6cfd46d2f228c87fad337b61
diff --git a/repository/iaik/prod/iaik_ixsil/1.2.2.3/iaik_ixsil-1.2.2.3.pom b/repository/iaik/prod/iaik_ixsil/1.2.2.3/iaik_ixsil-1.2.2.3.pom
deleted file mode 100644
index dc7922545..000000000
--- a/repository/iaik/prod/iaik_ixsil/1.2.2.3/iaik_ixsil-1.2.2.3.pom
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_ixsil</artifactId>
- <version>1.2.2.3</version>
- <description>POM was created from install:install-file</description>
-</project> \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ixsil/1.2.2.3/iaik_ixsil-1.2.2.3.pom.md5 b/repository/iaik/prod/iaik_ixsil/1.2.2.3/iaik_ixsil-1.2.2.3.pom.md5
deleted file mode 100644
index 820509786..000000000
--- a/repository/iaik/prod/iaik_ixsil/1.2.2.3/iaik_ixsil-1.2.2.3.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-9ca977ce70b35388fba69bddae7c2f6b \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ixsil/1.2.2.3/iaik_ixsil-1.2.2.3.pom.sha1 b/repository/iaik/prod/iaik_ixsil/1.2.2.3/iaik_ixsil-1.2.2.3.pom.sha1
deleted file mode 100644
index 90e7e8781..000000000
--- a/repository/iaik/prod/iaik_ixsil/1.2.2.3/iaik_ixsil-1.2.2.3.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-16a7b5564a57458af2b469a8f38d161bd403d34c \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ixsil/1.2.2.4/iaik_ixsil-1.2.2.4.jar b/repository/iaik/prod/iaik_ixsil/1.2.2.4/iaik_ixsil-1.2.2.4.jar
deleted file mode 100644
index bda9f05bd..000000000
--- a/repository/iaik/prod/iaik_ixsil/1.2.2.4/iaik_ixsil-1.2.2.4.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/prod/iaik_ixsil/1.2.2.4/iaik_ixsil-1.2.2.4.jar.md5 b/repository/iaik/prod/iaik_ixsil/1.2.2.4/iaik_ixsil-1.2.2.4.jar.md5
deleted file mode 100644
index a9e0071d8..000000000
--- a/repository/iaik/prod/iaik_ixsil/1.2.2.4/iaik_ixsil-1.2.2.4.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-a14e509ffd1336f5428943c1a4600915 \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ixsil/1.2.2.4/iaik_ixsil-1.2.2.4.jar.sha1 b/repository/iaik/prod/iaik_ixsil/1.2.2.4/iaik_ixsil-1.2.2.4.jar.sha1
deleted file mode 100644
index 514dbcde4..000000000
--- a/repository/iaik/prod/iaik_ixsil/1.2.2.4/iaik_ixsil-1.2.2.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-46d39b070e41a410ab42463815f4a93b028bd6f2 \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ixsil/1.2.2.4/iaik_ixsil-1.2.2.4.pom b/repository/iaik/prod/iaik_ixsil/1.2.2.4/iaik_ixsil-1.2.2.4.pom
deleted file mode 100644
index f4791bd3e..000000000
--- a/repository/iaik/prod/iaik_ixsil/1.2.2.4/iaik_ixsil-1.2.2.4.pom
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_ixsil</artifactId>
- <version>1.2.2.4</version>
- <description>POM was created from install:install-file</description>
-</project> \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ixsil/1.2.2.4/iaik_ixsil-1.2.2.4.pom.md5 b/repository/iaik/prod/iaik_ixsil/1.2.2.4/iaik_ixsil-1.2.2.4.pom.md5
deleted file mode 100644
index 95c95a01e..000000000
--- a/repository/iaik/prod/iaik_ixsil/1.2.2.4/iaik_ixsil-1.2.2.4.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-88c888e60510bddbe74e5741c74927bb \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ixsil/1.2.2.4/iaik_ixsil-1.2.2.4.pom.sha1 b/repository/iaik/prod/iaik_ixsil/1.2.2.4/iaik_ixsil-1.2.2.4.pom.sha1
deleted file mode 100644
index 9867a2ea2..000000000
--- a/repository/iaik/prod/iaik_ixsil/1.2.2.4/iaik_ixsil-1.2.2.4.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3f376fb5988f665e099e3364567654df766d1a6c \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar b/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar
deleted file mode 100644
index 9ac61d5c2..000000000
--- a/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar.md5 b/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar.md5
deleted file mode 100644
index 0fb8ee312..000000000
--- a/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-87b8c21a7ad94ba59e315b2d2b432357 \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar.sha1 b/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar.sha1
deleted file mode 100644
index 8cdb3d78c..000000000
--- a/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-294e73c4de7c6ee14ec5b6313a854727a52bec52 \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.pom b/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.pom
deleted file mode 100644
index af6c78766..000000000
--- a/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_ixsil</artifactId>
- <version>1.2.2.5</version>
- <description>POM was created from install:install-file</description>
-</project>
diff --git a/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.pom.md5 b/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.pom.md5
deleted file mode 100644
index 65bea702c..000000000
--- a/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-00b5d4be9a715b6f408acc5690af5141 \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.pom.sha1 b/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.pom.sha1
deleted file mode 100644
index 5b58b5eee..000000000
--- a/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ea0a95ac98300815bf2242da6b2738ba53d02fe9 \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ixsil/maven-metadata-MOA.xml b/repository/iaik/prod/iaik_ixsil/maven-metadata-MOA.xml
deleted file mode 100644
index f33956525..000000000
--- a/repository/iaik/prod/iaik_ixsil/maven-metadata-MOA.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><metadata>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_ixsil</artifactId>
- <version>1.2.2.4</version>
- <versioning>
- <versions>
- <version>1.2.2.3</version>
- <version>1.2.2.4</version>
- </versions>
- <lastUpdated>20080911074320</lastUpdated>
- </versioning>
-</metadata> \ No newline at end of file
diff --git a/repository/iaik/iaik_jce_full/5.101/iaik_jce_full-5.101.jar b/repository/iaik/prod/iaik_jce_full/5.3_MOA/iaik_jce_full-5.3_MOA.jar
index fd0457332..736981acc 100644
--- a/repository/iaik/iaik_jce_full/5.101/iaik_jce_full-5.101.jar
+++ b/repository/iaik/prod/iaik_jce_full/5.3_MOA/iaik_jce_full-5.3_MOA.jar
Binary files differ
diff --git a/repository/iaik/prod/iaik_moa/2.00/iaik_moa-2.00.jar b/repository/iaik/prod/iaik_moa/2.00/iaik_moa-2.00.jar
new file mode 100644
index 000000000..7cd630564
--- /dev/null
+++ b/repository/iaik/prod/iaik_moa/2.00/iaik_moa-2.00.jar
Binary files differ
diff --git a/repository/iaik/prod/iaik_pki_module/1.1_moa/iaik_pki_module-1.1_moa.jar b/repository/iaik/prod/iaik_pki_module/1.1_moa/iaik_pki_module-1.1_moa.jar
new file mode 100644
index 000000000..6e13efa81
--- /dev/null
+++ b/repository/iaik/prod/iaik_pki_module/1.1_moa/iaik_pki_module-1.1_moa.jar
Binary files differ
diff --git a/repository/iaik/prod/iaik_sva/1.0_moa/iaik_sva-1.0_moa.jar b/repository/iaik/prod/iaik_sva/1.0_moa/iaik_sva-1.0_moa.jar
new file mode 100644
index 000000000..7e0b64d09
--- /dev/null
+++ b/repository/iaik/prod/iaik_sva/1.0_moa/iaik_sva-1.0_moa.jar
Binary files differ
diff --git a/repository/iaik/prod/iaik_tsl/1.1_moa/iaik_tsl-1.1_moa.jar b/repository/iaik/prod/iaik_tsl/1.1_moa/iaik_tsl-1.1_moa.jar
new file mode 100644
index 000000000..b4eb067cf
--- /dev/null
+++ b/repository/iaik/prod/iaik_tsl/1.1_moa/iaik_tsl-1.1_moa.jar
Binary files differ
diff --git a/repository/iaik/prod/iaik_tsp/2.31_eval/iaik_tsp-2.31_eval.jar b/repository/iaik/prod/iaik_tsp/2.31_eval/iaik_tsp-2.31_eval.jar
new file mode 100644
index 000000000..5e1936bf8
--- /dev/null
+++ b/repository/iaik/prod/iaik_tsp/2.31_eval/iaik_tsp-2.31_eval.jar
Binary files differ
diff --git a/repository/iaik/prod/iaik_util/0.23/iaik_util-0.23.jar b/repository/iaik/prod/iaik_util/0.23/iaik_util-0.23.jar
index 78370c31e..1bc0cde7c 100644
--- a/repository/iaik/prod/iaik_util/0.23/iaik_util-0.23.jar
+++ b/repository/iaik/prod/iaik_util/0.23/iaik_util-0.23.jar
Binary files differ
diff --git a/repository/iaik/prod/iaik_xades/20160408_eval/iaik_xades-20160408_eval.jar b/repository/iaik/prod/iaik_xades/20160408_eval/iaik_xades-20160408_eval.jar
new file mode 100644
index 000000000..2ac459ce1
--- /dev/null
+++ b/repository/iaik/prod/iaik_xades/20160408_eval/iaik_xades-20160408_eval.jar
Binary files differ
diff --git a/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jar b/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jar
deleted file mode 100644
index 96732584e..000000000
--- a/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jar
+++ /dev/null
Binary files differ
diff --git a/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jar.md5 b/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jar.md5
deleted file mode 100644
index 3a8da6efa..000000000
--- a/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-89b44f2bb7af33e0d64c44d7e29bf44f \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jar.sha1 b/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jar.sha1
deleted file mode 100644
index 75ba4775e..000000000
--- a/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-05f1f36dc4236378636b3729aee8c3c06833e1fa \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.pom b/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.pom
deleted file mode 100644
index ee8f8bc32..000000000
--- a/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_xsect</artifactId>
- <version>1.1709142</version>
- <description>POM was created from install:install-file</description>
-</project>
diff --git a/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.pom.md5 b/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.pom.md5
deleted file mode 100644
index bd6040e63..000000000
--- a/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-aa4706972500d34752b02a3742be0b7c \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.pom.sha1 b/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.pom.sha1
deleted file mode 100644
index 65a5f1f18..000000000
--- a/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8433f3cc273a6ed6f507a7ee15918f80872d6b61 \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_xsect/2.10_20160408_eval/iaik_xsect-2.10_20160408_eval.jar b/repository/iaik/prod/iaik_xsect/2.10_20160408_eval/iaik_xsect-2.10_20160408_eval.jar
new file mode 100644
index 000000000..1f93b7c2d
--- /dev/null
+++ b/repository/iaik/prod/iaik_xsect/2.10_20160408_eval/iaik_xsect-2.10_20160408_eval.jar
Binary files differ
diff --git a/repository/iaik/xsect/1.02/xsect-1.02.jar b/repository/iaik/xsect/1.02/xsect-1.02.jar
deleted file mode 100644
index 9b2e4cc41..000000000
--- a/repository/iaik/xsect/1.02/xsect-1.02.jar
+++ /dev/null
Binary files differ