From 03cc08be3d99987197cde1e884c0e3d24d870288 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20S=C3=B8rensen-Boll?= Date: Thu, 20 May 2021 11:42:04 +0200 Subject: [PATCH] Fixed pdf-conversion of .adoc documents --- dk.gov.oiosi.library/build.xml | 86 ++++++++++++++++--- dk.gov.oiosi.library/common | 2 +- .../doc/OIORASP_Java_ReleaseNotes.adoc | 54 ++++++------ .../doc/_common-settings.adoc | 2 +- .../revocation/ocsp/OcspLookupTest.java | 9 +- 5 files changed, 106 insertions(+), 47 deletions(-) diff --git a/dk.gov.oiosi.library/build.xml b/dk.gov.oiosi.library/build.xml index 951c31ad..957a6eb4 100644 --- a/dk.gov.oiosi.library/build.xml +++ b/dk.gov.oiosi.library/build.xml @@ -4,6 +4,7 @@ + @@ -21,7 +22,7 @@ - + @@ -31,6 +32,9 @@ + + + @@ -121,18 +125,77 @@ - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -313,6 +376,7 @@ + diff --git a/dk.gov.oiosi.library/common b/dk.gov.oiosi.library/common index eaed24ff..7f4d7cab 160000 --- a/dk.gov.oiosi.library/common +++ b/dk.gov.oiosi.library/common @@ -1 +1 @@ -Subproject commit eaed24ffb8ad46084b3a175021bdb7fb4c2f2dee +Subproject commit 7f4d7cab5118a7094e64b865740a881b3942c992 diff --git a/dk.gov.oiosi.library/doc/OIORASP_Java_ReleaseNotes.adoc b/dk.gov.oiosi.library/doc/OIORASP_Java_ReleaseNotes.adoc index ec28a7b2..212051e9 100644 --- a/dk.gov.oiosi.library/doc/OIORASP_Java_ReleaseNotes.adoc +++ b/dk.gov.oiosi.library/doc/OIORASP_Java_ReleaseNotes.adoc @@ -1,9 +1,5 @@ include::_common-settings.adoc[] -Nemhandel Support -v{versionNumber} - - = OIORASP Java Release Notes == Introduction @@ -24,20 +20,20 @@ Documentation: * OIORASP_Java_InstallationGuide.pdf * OIORASP Library for Java Tutorials.pdf * release-notes-2.1.0_HowToUpgrade.txt -* A number of detailed release-notes related to specific issues – named release-notes-_.txt +* A number of detailed release-notes related to specific issues named release-notes-_.txt Samples in GIT repository: https://rep.erst.dk/git/openebusiness/library/java/-/tree/master/dk.gov.oiosi.examples.client : -* dk.firma.klient.webservice.TestCertificate – Test certificates using RASP functionality -* dk.firma.klient.webservice.OiosiRaspClient – Send a test document -* dk.firma.klient.webservice.TestUddiLookup – Test UDDI lookup +* dk.firma.klient.webservice.TestCertificate Test certificates using RASP functionality +* dk.firma.klient.webservice.OiosiRaspClient Send a test document +* dk.firma.klient.webservice.TestUddiLookup Test UDDI lookup Source code and binary release (jar file). [#what_is_changed] == What is changed? -In the following part of the document, some issue numbers are mentioned – these numbers are internal numbers used by Nemhandel and Danish Business Authority, so please ignore these as external developer. +In the following part of the document, some issue numbers are mentioned these numbers are internal numbers used by Nemhandel and Danish Business Authority, so please ignore these as external developer. include::release-notes-3.0.0.adoc[leveloffset=+1] @@ -46,8 +42,6 @@ include::release-notes-2.1.x.adoc[leveloffset=+1] // include::release-notes-1.x.x.adoc[leveloffset=+1] - - == System Requirements See OIORASP_Java_InstallationGuide.adoc @@ -68,22 +62,22 @@ Some source code is licensed under the Mozilla Public License Version 1.1. The u [source] /* * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this - * file except in compliance with the License. You may obtain - * a copy of the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an - * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express - * or implied. See the License for the specific language governing - * rights and limitations under the License. - * - * - * The Original Code is Java RASP toolkit. - * - * The Initial Developer of the Original Code is Lenio. Portions - * created by Lenio are Copyright (C) 2007 Danish National IT and - * Telecom Agency (http://www.digst.dk). All Rights Reserved. - * */ - - -Licenses for external dependencies distributed with the RASP library can be found under the /lib folder. +* License Version 1.1 (the "License"); you may not use this +* file except in compliance with the License. You may obtain +* a copy of the License at http://www.mozilla.org/MPL/ +* +* Software distributed under the License is distributed on an +* "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express +* or implied. See the License for the specific language governing +* rights and limitations under the License. +* +* +* The Original Code is Java RASP toolkit. +* +* The Initial Developer of the Original Code is Lenio. Portions +* created by Lenio are Copyright (C) 2007 Danish National IT and +* Telecom Agency (http://www.digst.dk). All Rights Reserved. +* */ + + +Licenses for external dependencies distributed with the RASP library can be found under the /lib folder. \ No newline at end of file diff --git a/dk.gov.oiosi.library/doc/_common-settings.adoc b/dk.gov.oiosi.library/doc/_common-settings.adoc index ac327b98..39b51502 100644 --- a/dk.gov.oiosi.library/doc/_common-settings.adoc +++ b/dk.gov.oiosi.library/doc/_common-settings.adoc @@ -15,4 +15,4 @@ // Følgende linje opdateres automatisk af build-script, og variablen {versionNumber} kan benyttes over alt: :versionNumber: 3.0.0.beta2 -:versionNumberTagged: 3.0.0.beta2.f805981d +:versionNumberTagged: 3.0.0.beta2.7e74a67d diff --git a/dk.gov.oiosi.library/test/src/dk/gov/oiosi/security/revocation/ocsp/OcspLookupTest.java b/dk.gov.oiosi.library/test/src/dk/gov/oiosi/security/revocation/ocsp/OcspLookupTest.java index cbead31d..b37e50d8 100644 --- a/dk.gov.oiosi.library/test/src/dk/gov/oiosi/security/revocation/ocsp/OcspLookupTest.java +++ b/dk.gov.oiosi.library/test/src/dk/gov/oiosi/security/revocation/ocsp/OcspLookupTest.java @@ -21,8 +21,10 @@ package dk.gov.oiosi.security.revocation.ocsp; import dk.gov.oiosi.AbstractTestCase; import dk.gov.oiosi.TestConstants; +import dk.gov.oiosi.configuration.ConfigurationException; import dk.gov.oiosi.configuration.ConfigurationHandler; import dk.gov.oiosi.configuration.ConfigurationHandlerCleaner; +import dk.gov.oiosi.security.CertificateHandlingException; import dk.gov.oiosi.security.CertificateSubject; import dk.gov.oiosi.security.ldap.LdapCertificateLookup; import dk.gov.oiosi.security.ldap.LdapCertificateNotFoundException; @@ -34,15 +36,14 @@ import dk.gov.oiosi.security.revocation.RevocationResponse; import org.bouncycastle.cert.ocsp.OCSPReq; import org.junit.Test; +import javax.management.ObjectName; import java.io.FileInputStream; import java.io.InputStream; +import java.net.URISyntaxException; import java.security.KeyStore; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.List; -import java.util.Random; +import java.util.*; /** * Testing certificate revocation against OCSP. -- GitLab