diff options
38 files changed, 303 insertions, 71 deletions
diff --git a/BKUCertificates/pom.xml b/BKUCertificates/pom.xml index 2241b587..2866dcb6 100644 --- a/BKUCertificates/pom.xml +++ b/BKUCertificates/pom.xml @@ -3,14 +3,14 @@ <parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<artifactId>BKUCertificates</artifactId>
<!-- DON'T CHANGE VERSION UNLESS THE INCLUDED CERTIFICATES CHANGED
| PLEASE COMMIT CHANGES to src/main/changes/changes.txt
| and don't forget to update version in main pom
|-->
- <version>1.1.17-SNAPSHOT</version>
+ <version>1.1.18-SNAPSHOT</version>
<name>BKU Certificates</name>
<description>Trusted certificates for TLS/SSL authentication</description>
diff --git a/BKUCertificates/src/main/changes/changes.txt b/BKUCertificates/src/main/changes/changes.txt index a64980d3..31abe0d5 100644 --- a/BKUCertificates/src/main/changes/changes.txt +++ b/BKUCertificates/src/main/changes/changes.txt @@ -4,6 +4,31 @@ Tags: * ''ADDED'' ... certificate newly added in this release * ''REMOVED'' ... certificate removed in this release * TRUSTED ... certificate included in truststore + +------------------- +'''BKUCertificates-1.18 (mocca-1.4.3)''' +------------------- +Entrust G2 CA (''ADDED'', TRUSTED) +* Serial Number: 4a538c28 +* Issuer: CN = Entrust Root Certification Authority - G2 +* Subject: CN = Entrust Root Certification Authority - G2 +* Not Before: Dienstag, 7. Juli 2009 19:25:54 +* Not After: Samstag, 7. Dezember 2030 19:55:54 + +Entrust L1K (''ADDED'') +* Serial Number: 0ee94cc30000000051d37785 +* Issuer: CN = Entrust Root Certification Authority - G2 +* Subject: CN = Entrust Certification Authoritiy - L1K +* Not Before: Montag, 5. Oktober 2015 21:13:56 +* Not After: Donnerstag, 5. Dezember 2030 21:43:56 + +Entrust L1M (''ADDED'') +* Serial Number: 61a1e7d20000000051d366a6 +* Issuer: CN = Entrust Root Certification Authority - G2 +* Subject: CN = Entrust Certification Authoritiy - L1M +* Not Before: Montag, 15. Dezember 2014 17:25:03 +* Not After: Dienstag, 15. Oktober 2030 17:55:03 + ------------------- '''BKUCertificates-1.16 (mocca-1.4.1)''' ------------------- diff --git a/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/certStore/toBeAdded/entrust_g2_ca.cer b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/certStore/toBeAdded/entrust_g2_ca.cer new file mode 100644 index 00000000..2e23a605 --- /dev/null +++ b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/certStore/toBeAdded/entrust_g2_ca.cer @@ -0,0 +1,25 @@ +-----BEGIN CERTIFICATE----- +MIIEPjCCAyagAwIBAgIESlOMKDANBgkqhkiG9w0BAQsFADCBvjELMAkGA1UEBhMC +VVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50 +cnVzdC5uZXQvbGVnYWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3Qs +IEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25seTEyMDAGA1UEAxMpRW50cnVz +dCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIwHhcNMDkwNzA3MTcy +NTU0WhcNMzAxMjA3MTc1NTU0WjCBvjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUVu +dHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwt +dGVybXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0 +aG9yaXplZCB1c2Ugb25seTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmlj +YXRpb24gQXV0aG9yaXR5IC0gRzIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK +AoIBAQC6hLZy254Ma+KZ6TABp3bqMriVQRrJ2mFOWHLP/vaCeb9zYQYKpSfYs1/T +RU4cctZOMvJyig/3gxnQaoCAAEUesMfnmr8SVycco2gvCoe9amsOXmXzHHfV1IWN +cCG0szLni6LVhjkCsbjSR87kyUnEO6fe+1R9V77w6G7CebI6C1XiUJgWMhNcL3hW +wcKUs/Ja5CeanyTXxuzQmyWC48zCxEXFjJd6BmsqEZ+pCm5IO2/b1BEZQvePB7/1 +U1+cPvQXLOZprE4yTGJ36rfo5bs0vBmLrpxR57d+tVOxMyLlbc9wPBr64ptntoP0 +jaWvYkxN4FisZDQSA/i2jZRjJKRxAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAP +BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqciZ60B7vfec7aVHUbI2fkBJmqzAN +BgkqhkiG9w0BAQsFAAOCAQEAeZ8dlsa2eT8ijYfThwMEYGprmi5ZiXMRrEPR9RP/ +jTkrwPK9T3CMqS/qF8QLVJ7UG5aYMzyorWKiAHarWWluBh1+xLlEjZivEtRh2woZ +Rkfz6/djwUAFQKXSt/S1mja/qYh2iARVBCuch38aNzx+LaUa2NSJXsq9rD1s2G2v +1fN2D807iDginWyTmsQ9v4IbZT+mD12q/OWyFcq1rca8PdCE6OoGcrBNOTJ4vz4R +nAuknZoh8/CbCzB428Hch0P+vGOaysXCHMnHjf87ElgI5rY97HosTvuDls4MPGmH +VHOkc8KT/1EQrBVUAdj8BbGJoX90g5pJ19xOe4pIb4tF9g== +-----END CERTIFICATE----- diff --git a/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/certStore/toBeAdded/entrust_l1k.cer b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/certStore/toBeAdded/entrust_l1k.cer new file mode 100644 index 00000000..5586a64e --- /dev/null +++ b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/certStore/toBeAdded/entrust_l1k.cer @@ -0,0 +1,30 @@ +-----BEGIN CERTIFICATE----- +MIIFDjCCA/agAwIBAgIMDulMwwAAAABR03eFMA0GCSqGSIb3DQEBCwUAMIG+MQsw +CQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2Vl +IHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMDkg +RW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MTIwMAYDVQQD +EylFbnRydXN0IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjAeFw0x +NTEwMDUxOTEzNTZaFw0zMDEyMDUxOTQzNTZaMIG6MQswCQYDVQQGEwJVUzEWMBQG +A1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5l +dC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTIgRW50cnVzdCwgSW5jLiAt +IGZvciBhdXRob3JpemVkIHVzZSBvbmx5MS4wLAYDVQQDEyVFbnRydXN0IENlcnRp +ZmljYXRpb24gQXV0aG9yaXR5IC0gTDFLMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEA2j+W0E25L0Tn2zlem1DuXKVh2kFnUwmqAJqOV38pa9vH4SEkqjrQ +jUcj0u1yFvCRIdJdt7hLqIOPt5EyaM/OJZMssn2XyP7BtBe6CZ4DkJN7fEmDImiK +m95HwzGYei59QAvS7z7Tsoyqj0ip/wDoKVgG97aTWpRzJiatWA7lQrjV6nN5ZGhT +JbiEz5R6rgZFDKNrTdDGvuoYpDbwkrK6HIiPOlJ/915tgxyd8B/lw9bdpXiSPbBt +LOrJz5RBGXFEaLpHPATpXbo+8DX3Fbae8i4VHj9HyMg4p3NFXU2wO7GOFyk36t0F +ASK7lDYqjVs1/lMZLwhGwSqzGmIdTivZGwIDAQABo4IBDDCCAQgwDgYDVR0PAQH/ +BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQAwMwYIKwYBBQUHAQEEJzAlMCMGCCsG +AQUFBzABhhdodHRwOi8vb2NzcC5lbnRydXN0Lm5ldDAwBgNVHR8EKTAnMCWgI6Ah +hh9odHRwOi8vY3JsLmVudHJ1c3QubmV0L2cyY2EuY3JsMDsGA1UdIAQ0MDIwMAYE +VR0gADAoMCYGCCsGAQUFBwIBFhpodHRwOi8vd3d3LmVudHJ1c3QubmV0L3JwYTAd +BgNVHQ4EFgQUgqJwdN28Uz/Pe9T3zX+nYMYKTL8wHwYDVR0jBBgwFoAUanImetAe +733nO2lR1GyNn5ASZqswDQYJKoZIhvcNAQELBQADggEBADnVjpiDYcgsY9NwHRkw +y/YJrMxp1cncN0HyMg/vdMNY9ngnCTQIlZIv19+4o/0OgemknNM/TWgrFTEKFcxS +BJPok1DD2bHi4Wi3Ogl08TRYCj93mEC45mj/XeTIRsXsgdfJghhcg85x2Ly/rJkC +k9uUmITSnKa1/ly78EqvIazCP0kkZ9Yujs+szGQVGHLlbHfTUqi53Y2sAEo1GdRv +c6N172tkw+CNgxKhiucOhk3YtCAbvmqljEtoZuMrx1gL+1YQ1JH7HdMxWBCMRON1 +exCdtTix9qrKgWRs6PLigVWXUX/hwidQosk8WwBD9lu51aX8/wdQQGcHsFXwt35u +Lcw= +-----END CERTIFICATE----- diff --git a/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/certStore/toBeAdded/entrust_l1m_sha2.cer b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/certStore/toBeAdded/entrust_l1m_sha2.cer new file mode 100644 index 00000000..d25ad440 --- /dev/null +++ b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/certStore/toBeAdded/entrust_l1m_sha2.cer @@ -0,0 +1,30 @@ +-----BEGIN CERTIFICATE----- +MIIFLTCCBBWgAwIBAgIMYaHn0gAAAABR02amMA0GCSqGSIb3DQEBCwUAMIG+MQsw +CQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2Vl +IHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMDkg +RW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MTIwMAYDVQQD +EylFbnRydXN0IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjAeFw0x +NDEyMTUxNTI1MDNaFw0zMDEwMTUxNTU1MDNaMIG6MQswCQYDVQQGEwJVUzEWMBQG +A1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5l +dC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTQgRW50cnVzdCwgSW5jLiAt +IGZvciBhdXRob3JpemVkIHVzZSBvbmx5MS4wLAYDVQQDEyVFbnRydXN0IENlcnRp +ZmljYXRpb24gQXV0aG9yaXR5IC0gTDFNMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEA0IHBOSPCsdHs91fdVSQ2kSAiSPf8ylIKsKs/M7WwhAf23056sPuY +Ij0BrFb7cW2y7rmgD1J3q5iTvjOK64dex6qwymmPQwhqPyK/MzlG1ZTy4kwFItln +gJHxBEoOm3yiydJs/TwJhL39axSagR3nioPvYRZ1R5gTOw2QFpi/iuInMlOZmcP7 +lhw192LtjL1JcdJDQ6Gh4yEqI3CodT2ybEYGYW8YZ+QpfrI8wcVfCR5uRE7sIZlY +FUj0VUgqtzS0BeN8SYwAWN46lsw53GEzVc4qLj/RmWLoquY0djGqr3kplnjLgRSv +adr7BLlZg0SqCU+01CwBnZuUMWstoc/B5QIDAQABo4IBKzCCAScwDgYDVR0PAQH/ +BAQDAgEGMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATASBgNVHRMBAf8E +CDAGAQH/AgEAMDMGCCsGAQUFBwEBBCcwJTAjBggrBgEFBQcwAYYXaHR0cDovL29j +c3AuZW50cnVzdC5uZXQwMAYDVR0fBCkwJzAloCOgIYYfaHR0cDovL2NybC5lbnRy +dXN0Lm5ldC9nMmNhLmNybDA7BgNVHSAENDAyMDAGBFUdIAAwKDAmBggrBgEFBQcC +ARYaaHR0cDovL3d3dy5lbnRydXN0Lm5ldC9ycGEwHQYDVR0OBBYEFMP30LUqMK2v +DZEhcDlU3byJcMc6MB8GA1UdIwQYMBaAFGpyJnrQHu995ztpUdRsjZ+QEmarMA0G +CSqGSIb3DQEBCwUAA4IBAQC0h8eEIhopwKR47PVPG7SEl2937tTPWa+oQ5YvHVje +pvMVWy7ZQ5xMQrkXFxGttLFBx2YMIoYFp7Qi+8VoaIqIMthx1hGOjlJ+Qgld2dnA +DizvRGsf2yS89byxqsGK5Wbb0CTz34mmi/5e0FC6m3UAyQhKS3Q/WFOv9rihbISY +Jnz8/DVRZZgeO2x28JkPxLkJ1YXYJKd/KsLak0tkuHB8VCnTglTVz6WUwzOeTTRn +4Dh2ZgCN0C/GqwmqcvrOLzWJ/MDtBgO334wlV/H77yiI2YIowAQPlIFpI+CRKMVe +1QzX1CA778n4wI+nQc1XRG5sZ2L+hN/nYNjvv9QiHg3n +-----END CERTIFICATE-----
\ No newline at end of file diff --git a/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/DigiCert EV RSA CA G2.cer b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/DigiCert EV RSA CA G2.cer Binary files differnew file mode 100644 index 00000000..63764422 --- /dev/null +++ b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/DigiCert EV RSA CA G2.cer diff --git a/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/GEANT_OV_RSA_CA_USERTrust_RSA_Certification_Authority.pem b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/GEANT_OV_RSA_CA_USERTrust_RSA_Certification_Authority.pem new file mode 100644 index 00000000..43cf9898 --- /dev/null +++ b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/GEANT_OV_RSA_CA_USERTrust_RSA_Certification_Authority.pem @@ -0,0 +1,39 @@ +-----BEGIN CERTIFICATE----- +MIIG5TCCBM2gAwIBAgIRANpDvROb0li7TdYcrMTz2+AwDQYJKoZIhvcNAQEMBQAw +gYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5MRQwEgYDVQQHEwtK +ZXJzZXkgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMS4wLAYD +VQQDEyVVU0VSVHJ1c3QgUlNBIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTIw +MDIxODAwMDAwMFoXDTMzMDUwMTIzNTk1OVowRDELMAkGA1UEBhMCTkwxGTAXBgNV +BAoTEEdFQU5UIFZlcmVuaWdpbmcxGjAYBgNVBAMTEUdFQU5UIE9WIFJTQSBDQSA0 +MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEApYhi1aEiPsg9ZKRMAw9Q +r8Mthsr6R20VSfFeh7TgwtLQi6RSRLOh4or4EMG/1th8lijv7xnBMVZkTysFiPmT +PiLOfvz+QwO1NwjvgY+Jrs7fSoVA/TQkXzcxu4Tl3WHi+qJmKLJVu/JOuHud6mOp +LWkIbhODSzOxANJ24IGPx9h4OXDyy6/342eE6UPXCtJ8AzeumTG6Dfv5KVx24lCF +TGUzHUB+j+g0lSKg/Sf1OzgCajJV9enmZ/84ydh48wPp6vbWf1H0O3Rd3LhpMSVn +TqFTLKZSbQeLcx/l9DOKZfBCC9ghWxsgTqW9gQ7v3T3aIfSaVC9rnwVxO0VjmDdP +FNbdoxnh0zYwf45nV1QQgpRwZJ93yWedhp4ch1a6Ajwqs+wv4mZzmBSjovtV0mKw +d+CQbSToalEUP4QeJq4Udz5WNmNMI4OYP6cgrnlJ50aa0DZPlJqrKQPGL69KQQz1 +2WgxvhCuVU70y6ZWAPopBa1ykbsttpLxADZre5cH573lIuLHdjx7NjpYIXRx2+QJ +URnX2qx37eZIxYXz8ggM+wXH6RDbU3V2o5DP67hXPHSAbA+p0orjAocpk2osxHKo +NSE3LCjNx8WVdxnXvuQ28tKdaK69knfm3bB7xpdfsNNTPH9ElcjscWZxpeZ5Iij8 +lyrCG1z0vSWtSBsgSnUyG/sCAwEAAaOCAYswggGHMB8GA1UdIwQYMBaAFFN5v1qq +K0rPVIDh2JvAnfKyA2bLMB0GA1UdDgQWBBRvHTVJEGwy+lmgnryK6B+VvnF6DDAO +BgNVHQ8BAf8EBAMCAYYwEgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHSUEFjAUBggr +BgEFBQcDAQYIKwYBBQUHAwIwOAYDVR0gBDEwLzAtBgRVHSAAMCUwIwYIKwYBBQUH +AgEWF2h0dHBzOi8vc2VjdGlnby5jb20vQ1BTMFAGA1UdHwRJMEcwRaBDoEGGP2h0 +dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VU0VSVHJ1c3RSU0FDZXJ0aWZpY2F0aW9u +QXV0aG9yaXR5LmNybDB2BggrBgEFBQcBAQRqMGgwPwYIKwYBBQUHMAKGM2h0dHA6 +Ly9jcnQudXNlcnRydXN0LmNvbS9VU0VSVHJ1c3RSU0FBZGRUcnVzdENBLmNydDAl +BggrBgEFBQcwAYYZaHR0cDovL29jc3AudXNlcnRydXN0LmNvbTANBgkqhkiG9w0B +AQwFAAOCAgEAUtlC3e0xj/1BMfPhdQhUXeLjb0xp8UE28kzWE5xDzGKbfGgnrT2R +lw5gLIx+/cNVrad//+MrpTppMlxq59AsXYZW3xRasrvkjGfNR3vt/1RAl8iI31lG +hIg6dfIX5N4esLkrQeN8HiyHKH6khm4966IkVVtnxz5CgUPqEYn4eQ+4eeESrWBh +AqXaiv7HRvpsdwLYekAhnrlGpioZ/CJIT2PTTxf+GHM6cuUnNqdUzfvrQgA8kt1/ +ASXx2od/M+c8nlJqrGz29lrJveJOSEMX0c/ts02WhsfMhkYa6XujUZLmvR1Eq08r +48/EZ4l+t5L4wt0DV8VaPbsEBF1EOFpz/YS2H6mSwcFaNJbnYqqJHIvm3PLJHkFm +EoLXRVrQXdCT+3wgBfgU6heCV5CYBz/YkrdWES7tiiT8sVUDqXmVlTsbiRNiyLs2 +bmEWWFUl76jViIJog5fongEqN3jLIGTG/mXrJT1UyymIcobnIGrbwwRVz/mpFQo0 +vBYIi1k2ThVh0Dx88BbF9YiP84dd8Fkn5wbE6FxXYJ287qfRTgmhePecPc73Yrzt +apdRcsKVGkOpaTIJP/l+lAHRLZxk/dUtyN95G++bOSQqnOCpVPabUGl2E/OEyFrp +Ipwgu2L/WJclvd6g+ZA/iWkLSMcpnFb+uX6QBqvD6+RNxul1FaB5iHY= +-----END CERTIFICATE----- diff --git a/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/GeoTrust EV RSA CA G2.cer b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/GeoTrust EV RSA CA G2.cer Binary files differnew file mode 100644 index 00000000..815c92d1 --- /dev/null +++ b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/GeoTrust EV RSA CA G2.cer diff --git a/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/Thawte EV RSA CA G2.cer b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/Thawte EV RSA CA G2.cer Binary files differnew file mode 100644 index 00000000..6b2654c5 --- /dev/null +++ b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/Thawte EV RSA CA G2.cer diff --git a/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/USERTrust_RSA_Certification_Authority_AAA_Certificate_Services.pem b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/USERTrust_RSA_Certification_Authority_AAA_Certificate_Services.pem new file mode 100644 index 00000000..cc2d08bd --- /dev/null +++ b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/USERTrust_RSA_Certification_Authority_AAA_Certificate_Services.pem @@ -0,0 +1,32 @@ +-----BEGIN CERTIFICATE----- +MIIFgTCCBGmgAwIBAgIQOXJEOvkit1HX02wQ3TE1lTANBgkqhkiG9w0BAQwFADB7 +MQswCQYDVQQGEwJHQjEbMBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYD +VQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UE +AwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTE5MDMxMjAwMDAwMFoXDTI4 +MTIzMTIzNTk1OVowgYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5 +MRQwEgYDVQQHEwtKZXJzZXkgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBO +ZXR3b3JrMS4wLAYDVQQDEyVVU0VSVHJ1c3QgUlNBIENlcnRpZmljYXRpb24gQXV0 +aG9yaXR5MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAgBJlFzYOw9sI +s9CsVw127c0n00ytUINh4qogTQktZAnczomfzD2p7PbPwdzx07HWezcoEStH2jnG +vDoZtF+mvX2do2NCtnbyqTsrkfjib9DsFiCQCT7i6HTJGLSR1GJk23+jBvGIGGqQ +Ijy8/hPwhxR79uQfjtTkUcYRZ0YIUcuGFFQ/vDP+fmyc/xadGL1RjjWmp2bIcmfb +IWax1Jt4A8BQOujM8Ny8nkz+rwWWNR9XWrf/zvk9tyy29lTdyOcSOk2uTIq3XJq0 +tyA9yn8iNK5+O2hmAUTnAU5GU5szYPeUvlM3kHND8zLDU+/bqv50TmnHa4xgk97E +xwzf4TKuzJM7UXiVZ4vuPVb+DNBpDxsP8yUmazNt925H+nND5X4OpWaxKXwyhGNV +icQNwZNUMBkTrNN9N6frXTpsNVzbQdcS2qlJC9/YgIoJk2KOtWbPJYjNhLixP6Q5 +D9kCnusSTJV882sFqV4Wg8y4Z+LoE53MW4LTTLPtW//e5XOsIzstAL81VXQJSdhJ +WBp/kjbmUZIO8yZ9HE0XvMnsQybQv0FfQKlERPSZ51eHnlAfV1SoPv10Yy+xUGUJ +5lhCLkMaTLTwJUdZ+gQek9QmRkpQgbLevni3/GcV4clXhB4PY9bpYrrWX1Uu6lzG +KAgEJTm4Diup8kyXHAc/DVL17e8vgg8CAwEAAaOB8jCB7zAfBgNVHSMEGDAWgBSg +EQojPpbxB+zirynvgqV/0DCktDAdBgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rID +ZsswDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0gBAowCDAG +BgRVHSAAMEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9jcmwuY29tb2RvY2EuY29t +L0FBQUNlcnRpZmljYXRlU2VydmljZXMuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr +BgEFBQcwAYYYaHR0cDovL29jc3AuY29tb2RvY2EuY29tMA0GCSqGSIb3DQEBDAUA +A4IBAQAYh1HcdCE9nIrgJ7cz0C7M7PDmy14R3iJvm3WOnnL+5Nb+qh+cli3vA0p+ +rvSNb3I8QzvAP+u431yqqcau8vzY7qN7Q/aGNnwU4M309z/+3ri0ivCRlv79Q2R+ +/czSAaF9ffgZGclCKxO/WIu6pKJmBHaIkU4MiRTOok3JMrO66BQavHHxW/BBC5gA +CiIDEOUMsfnNkjcZ7Tvx5Dq2+UUTJnWvu6rvP3t3O9LEApE9GQDTF1w52z97GA1F +zZOFli9d31kWTz9RvdVFGD/tSo7oBmF0Ixa1DVBzJ0RHfxBdiSprhTEUxOipakyA +vGp4z7h/jnZymQyd/teRCBaho1+V +-----END CERTIFICATE----- diff --git a/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/entrust_g2_ca.cer b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/entrust_g2_ca.cer new file mode 100644 index 00000000..2e23a605 --- /dev/null +++ b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/entrust_g2_ca.cer @@ -0,0 +1,25 @@ +-----BEGIN CERTIFICATE----- +MIIEPjCCAyagAwIBAgIESlOMKDANBgkqhkiG9w0BAQsFADCBvjELMAkGA1UEBhMC +VVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50 +cnVzdC5uZXQvbGVnYWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3Qs +IEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25seTEyMDAGA1UEAxMpRW50cnVz +dCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIwHhcNMDkwNzA3MTcy +NTU0WhcNMzAxMjA3MTc1NTU0WjCBvjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUVu +dHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwt +dGVybXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0 +aG9yaXplZCB1c2Ugb25seTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmlj +YXRpb24gQXV0aG9yaXR5IC0gRzIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK +AoIBAQC6hLZy254Ma+KZ6TABp3bqMriVQRrJ2mFOWHLP/vaCeb9zYQYKpSfYs1/T +RU4cctZOMvJyig/3gxnQaoCAAEUesMfnmr8SVycco2gvCoe9amsOXmXzHHfV1IWN +cCG0szLni6LVhjkCsbjSR87kyUnEO6fe+1R9V77w6G7CebI6C1XiUJgWMhNcL3hW +wcKUs/Ja5CeanyTXxuzQmyWC48zCxEXFjJd6BmsqEZ+pCm5IO2/b1BEZQvePB7/1 +U1+cPvQXLOZprE4yTGJ36rfo5bs0vBmLrpxR57d+tVOxMyLlbc9wPBr64ptntoP0 +jaWvYkxN4FisZDQSA/i2jZRjJKRxAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAP +BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqciZ60B7vfec7aVHUbI2fkBJmqzAN +BgkqhkiG9w0BAQsFAAOCAQEAeZ8dlsa2eT8ijYfThwMEYGprmi5ZiXMRrEPR9RP/ +jTkrwPK9T3CMqS/qF8QLVJ7UG5aYMzyorWKiAHarWWluBh1+xLlEjZivEtRh2woZ +Rkfz6/djwUAFQKXSt/S1mja/qYh2iARVBCuch38aNzx+LaUa2NSJXsq9rD1s2G2v +1fN2D807iDginWyTmsQ9v4IbZT+mD12q/OWyFcq1rca8PdCE6OoGcrBNOTJ4vz4R +nAuknZoh8/CbCzB428Hch0P+vGOaysXCHMnHjf87ElgI5rY97HosTvuDls4MPGmH +VHOkc8KT/1EQrBVUAdj8BbGJoX90g5pJ19xOe4pIb4tF9g== +-----END CERTIFICATE----- diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml index 6b4d6cad..e394114f 100644 --- a/BKUCommonGUI/pom.xml +++ b/BKUCommonGUI/pom.xml @@ -2,7 +2,7 @@ <parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>BKUCommonGUI</artifactId>
diff --git a/BKUFonts/pom.xml b/BKUFonts/pom.xml index 65972ed4..d82a119e 100644 --- a/BKUFonts/pom.xml +++ b/BKUFonts/pom.xml @@ -3,10 +3,10 @@ <parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<artifactId>BKUFonts</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
<name>BKU Fonts</name>
<description>
<!--
diff --git a/BKUGuiExt/pom.xml b/BKUGuiExt/pom.xml index 4abd0b15..8c448313 100644 --- a/BKUGuiExt/pom.xml +++ b/BKUGuiExt/pom.xml @@ -3,7 +3,7 @@ <parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<artifactId>BKUGuiExt</artifactId>
<name>BKU GUI Ext</name>
diff --git a/BKUHelp/pom.xml b/BKUHelp/pom.xml index 376868ed..3b49b1e8 100644 --- a/BKUHelp/pom.xml +++ b/BKUHelp/pom.xml @@ -3,7 +3,7 @@ <parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<artifactId>BKUHelp</artifactId>
<name>BKU Help</name>
diff --git a/BKUHelpWebStart/pom.xml b/BKUHelpWebStart/pom.xml index 6c0e12e3..621e0eff 100644 --- a/BKUHelpWebStart/pom.xml +++ b/BKUHelpWebStart/pom.xml @@ -3,7 +3,7 @@ <parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<artifactId>BKUHelpWebStart</artifactId>
<name>BKU Help WebStart</name>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml index e02ae67a..c4af3809 100644 --- a/BKULocal/pom.xml +++ b/BKULocal/pom.xml @@ -2,7 +2,7 @@ <parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>BKULocal</artifactId>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml index 268b7b41..8059fcdf 100644 --- a/BKUViewer/pom.xml +++ b/BKUViewer/pom.xml @@ -2,7 +2,7 @@ <parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>BKUViewer</artifactId>
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml index 728666e1..783dc40d 100644 --- a/BKUWebStart/pom.xml +++ b/BKUWebStart/pom.xml @@ -2,7 +2,7 @@ <parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>BKUWebStart</artifactId>
@@ -103,7 +103,7 @@ <pack200><enabled>false</enabled></pack200>
<jnlp>
<inputTemplateResourcePath>${project.basedir}/src/main/jnlp</inputTemplateResourcePath>
- <inputTemplate>template-unstable.xml</inputTemplate>
+ <inputTemplate>template.xml</inputTemplate>
<outputFile>mocca.jnlp</outputFile>
<mainClass>at.gv.egiz.bku.webstart.Launcher</mainClass>
</jnlp>
@@ -374,7 +374,7 @@ <dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>6.1.19</version>
+ <version>6.1.26</version>
</dependency>
<!-- JSP support
| http://jira.codehaus.org/browse/JETTY-827
diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java index ee951a4b..026a947f 100644 --- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java +++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java @@ -135,7 +135,6 @@ public class Launcher implements BKUControllerInterface { } private Configurator config; private Container server; -// private BasicService basicService; private StatusNotifier status; private Autostart autostart; diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/TLSServerCA.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/TLSServerCA.java index 4b817ae1..379b9711 100644 --- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/TLSServerCA.java +++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/TLSServerCA.java @@ -56,7 +56,8 @@ import org.slf4j.LoggerFactory; public class TLSServerCA {
public static final int CA_VALIDITY_Y = 3;
public static final String MOCCA_TLS_SERVER_ALIAS = "server";
- public static final int SERVER_VALIDITY_Y = 3;
+ public static final int SERVER_VALIDITY_Y = 3; + public static final int SERVER_VALIDITY_Y_MAC = 2;
private final static Logger log = LoggerFactory.getLogger(TLSServerCA.class);
private KeyPair caKeyPair;
@@ -139,14 +140,26 @@ public class TLSServerCA { GregorianCalendar date = new GregorianCalendar();
date.add(Calendar.HOUR_OF_DAY, -1);
- serverCert.setValidNotBefore(date.getTime());
- date.add(Calendar.YEAR,SERVER_VALIDITY_Y);
+ serverCert.setValidNotBefore(date.getTime()); + if (isMacOs()) { + date.add(Calendar.YEAR,SERVER_VALIDITY_Y_MAC); + } else {
+ date.add(Calendar.YEAR,SERVER_VALIDITY_Y); + }
date.add(Calendar.HOUR_OF_DAY, -1);
serverCert.setValidNotAfter(date.getTime());
serverCert.sign(AlgorithmID.sha256WithRSAEncryption, caKeyPair.getPrivate());
log.debug("successfully generated MOCCA TLS Server certificate " + serverCert.getSubjectDN());
caKeyPair = null;
+ } + + private boolean isMacOs() { + String os = System.getProperty("os.name").toLowerCase(); + if (os.contains("mac")) { + return true; + } + return false; }
public KeyStore generateKeyStore(char[] password) throws GeneralSecurityException, IOException, CodingException {
diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/MOCCAIcon.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/MOCCAIcon.java index 1b9996fc..c12ffde0 100644 --- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/MOCCAIcon.java +++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/MOCCAIcon.java @@ -152,14 +152,17 @@ public class MOCCAIcon implements StatusNotifier, ActionListener, ItemListener { Menu settingsMenu = new Menu(messages.getString(LABEL_SETTINGS)); menu.add(settingsMenu); - CheckboxMenuItem autostartItem = new CheckboxMenuItem( - messages.getString(LABEL_AUTOSTART)); - autostartItem.addItemListener(this); - autostartItem.setActionCommand(COMMANDS.AUTOSTART_COMMAND.name()); - autostartItem.setState(controller.isAutostartEnabled()); - autostartItem.setEnabled(controller.isAutostartPossible()); - settingsMenu.add(autostartItem); - + // only add autostart for older java versions + String version = System.getProperty("java.version"); + if (version.startsWith("1.")) { + CheckboxMenuItem autostartItem = new CheckboxMenuItem( + messages.getString(LABEL_AUTOSTART)); + autostartItem.addItemListener(this); + autostartItem.setActionCommand(COMMANDS.AUTOSTART_COMMAND.name()); + autostartItem.setState(controller.isAutostartEnabled()); + autostartItem.setEnabled(controller.isAutostartPossible()); + settingsMenu.add(autostartItem); + } menu.addSeparator(); MenuItem shutdownItem = new MenuItem( diff --git a/STAL/pom.xml b/STAL/pom.xml index c2e3ab0c..883b930f 100644 --- a/STAL/pom.xml +++ b/STAL/pom.xml @@ -3,7 +3,7 @@ <parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>STAL</artifactId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml index 9ee07dcf..17c6a7be 100644 --- a/STALExt/pom.xml +++ b/STALExt/pom.xml @@ -2,7 +2,7 @@ <parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>STALExt</artifactId>
diff --git a/STALService/pom.xml b/STALService/pom.xml index de39a53c..4c263abe 100644 --- a/STALService/pom.xml +++ b/STALService/pom.xml @@ -3,7 +3,7 @@ <parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>STALService</artifactId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml index b322bf20..f26a496f 100644 --- a/STALXService/pom.xml +++ b/STALXService/pom.xml @@ -2,7 +2,7 @@ <parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>STALXService</artifactId>
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml index d5dfd232..a4b87e32 100644 --- a/bkucommon/pom.xml +++ b/bkucommon/pom.xml @@ -3,7 +3,7 @@ <parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>bkucommon</artifactId>
@@ -4,7 +4,7 @@ <groupId>at.gv.egiz</groupId>
<artifactId>mocca</artifactId>
<packaging>pom</packaging>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
<name>MOCCA</name>
<description>MOCCA (Modular Open Citizen Card Architecture) project</description>
<url>http://joinup.ec.europa.eu/site/mocca/</url>
@@ -222,16 +222,16 @@ <name>MOCCA JoinUp</name>
<url>https://apps.egiz.gv.at/maven/</url>
</repository>
- <repository>
- <id>maven2-repository.dev.java.net</id>
- <name>Java.net Repository for Maven 2</name>
- <url>http://download.java.net/maven/2/</url>
- </repository>
- <repository>
- <id>maven-central</id>
- <name>Maven Central Repository</name>
- <url>http://repo1.maven.org/maven2/</url>
- </repository>
+<!-- <repository> -->
+<!-- <id>maven2-repository.dev.java.net</id> -->
+<!-- <name>Java.net Repository for Maven 2</name> -->
+<!-- <url>http://download.java.net/maven/2/</url> -->
+<!-- </repository> -->
+<!-- <repository> -->
+<!-- <id>maven-central</id> -->
+<!-- <name>Maven Central Repository</name> -->
+<!-- <url>http://repo1.maven.org/maven2/</url> -->
+<!-- </repository> -->
<repository>
<id>internal-repo</id>
<name>Internal Repository</name>
@@ -239,18 +239,18 @@ </repository>
</repositories>
<pluginRepositories>
- <pluginRepository>
- <id>maven-central</id>
- <name>Maven Central Plugin Repository</name>
- <url>http://repo1.maven.org/maven2</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <updatePolicy>never</updatePolicy>
- </releases>
- </pluginRepository>
+<!-- <pluginRepository> -->
+<!-- <id>maven-central</id> -->
+<!-- <name>Maven Central Plugin Repository</name> -->
+<!-- <url>http://repo1.maven.org/maven2</url> -->
+<!-- <layout>default</layout> -->
+<!-- <snapshots> -->
+<!-- <enabled>false</enabled> -->
+<!-- </snapshots> -->
+<!-- <releases> -->
+<!-- <updatePolicy>never</updatePolicy> -->
+<!-- </releases> -->
+<!-- </pluginRepository> -->
<pluginRepository>
<id>mocca-joinup</id>
<name>MOCCA JoinUp</name>
@@ -426,12 +426,12 @@ <dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>BKUCertificates</artifactId>
- <version>1.1.17-SNAPSHOT</version>
+ <version>1.1.19-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>BKUFonts</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/smcc/pom.xml b/smcc/pom.xml index 2bd69e95..e4024714 100644 --- a/smcc/pom.xml +++ b/smcc/pom.xml @@ -2,7 +2,7 @@ <parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>smcc</artifactId>
diff --git a/smcc/src/main/resources/at/gv/egiz/smcc/osx-pcsc-jni/jre6.libosxj2pcsc.dylib b/smcc/src/main/resources/at/gv/egiz/smcc/osx-pcsc-jni/jre6.libosxj2pcsc.dylib Binary files differdeleted file mode 100644 index 2bc454e3..00000000 --- a/smcc/src/main/resources/at/gv/egiz/smcc/osx-pcsc-jni/jre6.libosxj2pcsc.dylib +++ /dev/null diff --git a/smcc/src/main/resources/at/gv/egiz/smcc/osx-pcsc-jni/jre7.libosxj2pcsc.dylib b/smcc/src/main/resources/at/gv/egiz/smcc/osx-pcsc-jni/jre7.libosxj2pcsc.dylib Binary files differdeleted file mode 100644 index 6228a60c..00000000 --- a/smcc/src/main/resources/at/gv/egiz/smcc/osx-pcsc-jni/jre7.libosxj2pcsc.dylib +++ /dev/null diff --git a/smcc/src/main/resources/at/gv/egiz/smcc/osx-pcsc-jni/jre8.libosxj2pcsc.dylib b/smcc/src/main/resources/at/gv/egiz/smcc/osx-pcsc-jni/jre8.libosxj2pcsc.dylib Binary files differdeleted file mode 100644 index 3a465a69..00000000 --- a/smcc/src/main/resources/at/gv/egiz/smcc/osx-pcsc-jni/jre8.libosxj2pcsc.dylib +++ /dev/null diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml index 1cba28ba..6e02bfe7 100644 --- a/smccSTAL/pom.xml +++ b/smccSTAL/pom.xml @@ -2,7 +2,7 @@ <parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>smccSTAL</artifactId>
diff --git a/smccSTALExt/pom.xml b/smccSTALExt/pom.xml index aea28a1a..9b5f275a 100644 --- a/smccSTALExt/pom.xml +++ b/smccSTALExt/pom.xml @@ -3,7 +3,7 @@ <parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<artifactId>smccSTALExt</artifactId>
<name>smcc STAL Ext</name>
diff --git a/utils/pom.xml b/utils/pom.xml index 3e3c4f5a..ab221f16 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -2,7 +2,7 @@ <parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>utils</artifactId>
diff --git a/utils/src/main/java/at/gv/egiz/updater/Constants.java b/utils/src/main/java/at/gv/egiz/updater/Constants.java index 89a75ee0..60b914c2 100644 --- a/utils/src/main/java/at/gv/egiz/updater/Constants.java +++ b/utils/src/main/java/at/gv/egiz/updater/Constants.java @@ -24,9 +24,13 @@ package at.gv.egiz.updater; public class Constants {
- public static final String WEBSTART_URL = "https://webstart.buergerkarte.at/";
- public static final String MOCCA_STR = "mocca/";
- public static final String VERSION_FILE = "Release.txt";
- public static final String PATH_TO_VERSION_FILE = WEBSTART_URL + MOCCA_STR + VERSION_FILE;
+ //public static final String WEBSTART_URL = "https://webstart.buergerkarte.at/";
+ //public static final String MOCCA_STR = "mocca/";
+ //public static final String VERSION_FILE = "Release.txt";
+ //public static final String PATH_TO_VERSION_FILE = WEBSTART_URL + MOCCA_STR + VERSION_FILE;
+ public static final String DOWNLOAD_URL = "https://technology.a-sit.at/en/mocca/";
+ public static final String VERSION_FILE_URL = "https://updates.a-sit.at/mocca/Release.txt";
+
+
}
diff --git a/utils/src/main/java/at/gv/egiz/updater/MoccaUpdater.java b/utils/src/main/java/at/gv/egiz/updater/MoccaUpdater.java index ad8f8d84..25927900 100644 --- a/utils/src/main/java/at/gv/egiz/updater/MoccaUpdater.java +++ b/utils/src/main/java/at/gv/egiz/updater/MoccaUpdater.java @@ -70,19 +70,24 @@ public class MoccaUpdater { return;
}
- gatherOnlineMoccaVersion();
- boolean isOnlineNewer = isOnlineVersionNewer();
- if (isOnlineNewer) {
- notifyUserNewerVersionOnline();
+ try {
+ gatherOnlineMoccaVersion();
+ boolean isOnlineNewer = isOnlineVersionNewer();
+ if (isOnlineNewer) {
+ notifyUserNewerVersionOnline();
+ }
+ } catch (Exception e) {
+ System.out.println(e.getMessage());
+ log.error(e.getMessage());
}
}
- private void gatherOnlineMoccaVersion() {
+ private void gatherOnlineMoccaVersion() throws Exception {
try {
log.info("Requesting Mocca Online Version");
- URL url = new URL(Constants.PATH_TO_VERSION_FILE);
- log.debug("Going to GET mocca Version from: " + Constants.PATH_TO_VERSION_FILE);
+ URL url = new URL(Constants.VERSION_FILE_URL);
+ log.debug("Going to GET mocca Version from: " + Constants.VERSION_FILE_URL);
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.setRequestMethod("GET");
BufferedReader rd = new BufferedReader(new InputStreamReader(conn.getInputStream()));
@@ -96,6 +101,7 @@ public class MoccaUpdater { log.info("Online Mocca Version: " + result.toString());
} catch (IOException e) {
log.error("Error when gathering Mocca Online Version " + e.getMessage());
+ throw new Exception("Error gathering Mocca Version number from Website ");
}
}
@@ -113,6 +119,7 @@ public class MoccaUpdater { dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
dialog.setVisible(true);
} catch (Exception e) {
+ System.err.print(e.getMessage());
log.error(e.getMessage());
}
diff --git a/utils/src/main/java/at/gv/egiz/updater/NewVersionDialog.java b/utils/src/main/java/at/gv/egiz/updater/NewVersionDialog.java index 674d8339..64cef7f4 100644 --- a/utils/src/main/java/at/gv/egiz/updater/NewVersionDialog.java +++ b/utils/src/main/java/at/gv/egiz/updater/NewVersionDialog.java @@ -165,7 +165,7 @@ public class NewVersionDialog extends JDialog { private void openLink() {
if (Desktop.isDesktopSupported()) {
try {
- Desktop.getDesktop().browse(new URI(Constants.WEBSTART_URL+Constants.MOCCA_STR));
+ Desktop.getDesktop().browse(new URI(Constants.DOWNLOAD_URL));
} catch (IOException | URISyntaxException e) {
log.error(e.getMessage());
}
|