diff options
Diffstat (limited to 'pdf-as-lib/src/main/java')
174 files changed, 1150 insertions, 1275 deletions
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/dsig/ObjectFactory.java b/pdf-as-lib/src/main/java/at/gv/egiz/dsig/ObjectFactory.java index b5018435..5e57568f 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/dsig/ObjectFactory.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/dsig/ObjectFactory.java @@ -31,9 +31,9 @@ package at.gv.egiz.dsig; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlElementDecl; +import jakarta.xml.bind.annotation.XmlRegistry; import javax.xml.namespace.QName; diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/dsig/X509DataType.java b/pdf-as-lib/src/main/java/at/gv/egiz/dsig/X509DataType.java index 41be7577..0f28a024 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/dsig/X509DataType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/dsig/X509DataType.java @@ -33,13 +33,13 @@ package at.gv.egiz.dsig; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlType; import org.w3c.dom.Element; diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/dsig/X509IssuerSerialType.java b/pdf-as-lib/src/main/java/at/gv/egiz/dsig/X509IssuerSerialType.java index 6f5366fb..75c3db27 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/dsig/X509IssuerSerialType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/dsig/X509IssuerSerialType.java @@ -32,10 +32,10 @@ package at.gv.egiz.dsig; import java.math.BigInteger; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/dsig/util/DsigMarschaller.java b/pdf-as-lib/src/main/java/at/gv/egiz/dsig/util/DsigMarschaller.java index 3b2308f5..2f0c6437 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/dsig/util/DsigMarschaller.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/dsig/util/DsigMarschaller.java @@ -28,10 +28,10 @@ import java.io.OutputStream; import java.io.StringReader; import java.io.StringWriter; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import javax.xml.namespace.QName; public class DsigMarschaller { diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/ByteArrayDataSource.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/ByteArrayDataSource.java index fa55bcd0..e608a14c 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/ByteArrayDataSource.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/ByteArrayDataSource.java @@ -5,7 +5,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import javax.activation.DataSource; +import jakarta.activation.DataSource; public class ByteArrayDataSource implements DataSource { diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/PdfAs.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/PdfAs.java index 1d23c070..a5625056 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/PdfAs.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/PdfAs.java @@ -63,31 +63,13 @@ public interface PdfAs { /** * Starts a signature process * - * After the process has to be startet the status request has to be services by the user application + * After the process has to be started the status request has to be services by the user application * * @param parameter The sign parameter * @return A status request * @throws PdfAsException */ - public StatusRequest startSign(SignParameter parameter) throws PDFASError; - - /** - * Continues an ongoing signature process - * - * @param statusRequest The current status - * @return A status request - * @throws PdfAsException - */ - public StatusRequest process(StatusRequest statusRequest) throws PDFASError; - - /** - * Finishes a signature process - * - * @param statusRequest The current status - * @return A signature result - * @throws PdfAsException - */ - public SignResult finishSign(StatusRequest statusRequest) throws PDFASError; + public StatusRequest.Stage1 startSign(SignParameter parameter) throws PDFASError; /** * Generates a Image of the visual signatur block as Preview diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/PdfAsFactory.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/PdfAsFactory.java index b2845959..133a90b8 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/PdfAsFactory.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/PdfAsFactory.java @@ -38,7 +38,7 @@ import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.activation.DataSource; +import jakarta.activation.DataSource; import javax.crypto.Cipher; import java.awt.*; import java.awt.image.BufferedImage; @@ -119,7 +119,7 @@ public class PdfAsFactory implements IConfigurationConstants { registerProvider(new IAIK(), 1); // TODO: register ECCelerate in second position when TLS issue is // fixed - registerProvider(new ECCelerate(), -1); + registerProvider(ECCelerate.getInstance(), -1); registerProvider( new BouncyCastleProvider(), -2); @@ -170,7 +170,7 @@ public class PdfAsFactory implements IConfigurationConstants { try { teeInformation("+ IAIK-JCE Version: " + IAIK.getVersionInfo()); teeInformation("+ ECCelerate Version: " - + ECCelerate.getInstance().getVersion()); + + ECCelerate.getInstance().getVersionStr()); } catch (Throwable e) { teeInformation("+ Failed to show security provider informations"); } diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/PdfAsParameter.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/PdfAsParameter.java index 5a646505..1e552769 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/PdfAsParameter.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/PdfAsParameter.java @@ -27,7 +27,7 @@ import at.gv.egiz.pdfas.common.exceptions.PdfAsException; import java.util.Map; -import javax.activation.DataSource; +import jakarta.activation.DataSource; public interface PdfAsParameter { diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/StatusRequest.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/StatusRequest.java index df397733..0e4c76cc 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/StatusRequest.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/StatusRequest.java @@ -25,36 +25,36 @@ package at.gv.egiz.pdfas.lib.api; import java.security.cert.CertificateException; +import at.gv.egiz.pdfas.common.exceptions.PDFASError; import at.gv.egiz.pdfas.lib.api.sign.SignParameter; +import at.gv.egiz.pdfas.lib.api.sign.SignResult; +import at.gv.egiz.pdfas.lib.impl.status.RequestedSignature; /** - * Status of a signture process + * Status of a signature process */ public interface StatusRequest { - - /** - * If true PDF-AS requires the signature certificate - * - * Retrieve the signing certificate and set it via setCertificate - * @return - */ - public boolean needCertificate(); - - /** - * If true PDF-AS requires a the CAdES signature - * - * use getSignatureData() and getSignatureDataByteRange() to retrieve the - * data to be signed and set the signature via setSigature - * - * @return - */ - public boolean needSignature(); - - /** - * If true finishSign in PdfAs can be called to retrieve the signed pdf - * @return - */ - public boolean isReady(); + + public interface Stage1 extends StatusRequest { + /** + * Sets the signing certificate + * @param encodedCertificate + * @throws CertificateException + */ + public Stage2 setCertificate(byte[] encodedCertificate) throws CertificateException, PDFASError; + } + + public interface Stage2 extends StatusRequest { + /** + * Sets the signature + * @param signatureValue + */ + public Stage3 setSignature(byte[] signatureValue) throws PDFASError; + } + + public interface Stage3 extends StatusRequest { + public SignResult finishSign() throws PDFASError; + } /** * Gets the data to be signed @@ -67,19 +67,11 @@ public interface StatusRequest { * @return */ public int[] getSignatureDataByteRange(); - - /** - * Sets the signing certificate - * @param encodedCertificate - * @throws CertificateException - */ - public void setCertificate(byte[] encodedCertificate) throws CertificateException; - - /** - * Sets the signature - * @param signatureValue - */ - public void setSigature(byte[] signatureValue) ; + + /** + * Gets the requested signature metadata + */ + public RequestedSignature getRequestedSignature(); public SignParameter getSignParameter(); diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/sign/SignParameter.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/sign/SignParameter.java index e123d453..64bd5328 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/sign/SignParameter.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/sign/SignParameter.java @@ -100,7 +100,9 @@ public interface SignParameter extends PdfAsParameter { * @return */ public IPlainSigner getPlainSigner(); - + + public void setOutputStream(OutputStream stream); + public default OutputStream getOutputStream() { return getSignatureResult(); } /** * Gets the outputstream, where the signed document will be written to * @return diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/verify/VerifyResult.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/verify/VerifyResult.java index 4b636db0..5fee1c85 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/verify/VerifyResult.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/verify/VerifyResult.java @@ -25,10 +25,11 @@ package at.gv.egiz.pdfas.lib.api.verify; import java.security.cert.X509Certificate; import at.gv.egiz.pdfas.common.exceptions.PdfAsException; +import at.gv.egiz.pdfas.lib.impl.verify.SignatureInputData; public interface VerifyResult { /** - * Returns if the verification was possible or could not even be startet. + * Returns if the verification was possible or could not even be started. * see {@link #getVerificationException()} for details. * * @return @@ -82,5 +83,5 @@ public interface VerifyResult { * Gets the signed data for the signature * @return */ - public byte[] getSignatureData(); + public SignatureInputData getSignatureData(); } diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/backend/PDFASBackend.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/backend/PDFASBackend.java index d601532e..d109cf81 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/backend/PDFASBackend.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/backend/PDFASBackend.java @@ -2,12 +2,13 @@ package at.gv.egiz.pdfas.lib.backend; import at.gv.egiz.pdfas.lib.impl.placeholder.PlaceholderExtractor; import at.gv.egiz.pdfas.lib.impl.signing.IPdfSigner; +import at.gv.egiz.pdfas.lib.impl.status.PDFObject; import at.gv.egiz.pdfas.lib.impl.verify.VerifyBackend; public interface PDFASBackend { public String getName(); public boolean usedAsDefault(); - public IPdfSigner getPdfSigner(); + public IPdfSigner<?, ?> getPdfSigner(); public PlaceholderExtractor getPlaceholderExtractor(); public VerifyBackend getVerifier(); } diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/ErrorExtractor.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/ErrorExtractor.java index bcf04611..660e8cd9 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/ErrorExtractor.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/ErrorExtractor.java @@ -45,7 +45,7 @@ public class ErrorExtractor implements ErrorConstants { } } else if(e instanceof PdfAsException) { - return new PDFASError(11020, e.getMessage(), e); + return new PDFASError(ErrorConstants.ERROR_PDF_PROCESSING_FAILED, e.getMessage(), e); } diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/PdfAsImpl.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/PdfAsImpl.java index 255c76e6..bd9a1669 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/PdfAsImpl.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/PdfAsImpl.java @@ -31,6 +31,8 @@ import java.util.Date; import java.util.Iterator; import java.util.List; +import at.gv.egiz.pdfas.lib.util.TimedFunction; +import lombok.val; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -121,151 +123,21 @@ public class PdfAsImpl implements PdfAs, IConfigurationConstants, @Override public SignResult sign(SignParameter parameter) throws PDFASError { - - logger.trace("sign started"); - - verifySignParameter(parameter); - OperationStatus status = null; + val signer = parameter.getPlainSigner(); + if (signer == null) { + throw new IllegalArgumentException("SignParameter is missing plainSigner for use of sign()"); + } + val state1 = (StatusRequestImpl.Stage1)startSign(parameter); try { - // Status initialization - if (!(parameter.getConfiguration() instanceof ISettings)) { - throw new PdfAsSettingsException("Invalid settings object!"); - } - - // execute pre Processors - signPreProcessing(parameter); - - // allocated Backend - final PDFASBackend backend = BackendLoader.getPDFASBackend(parameter.getConfiguration()); - - if (backend == null) { - throw new PDFASError(ERROR_NO_BACKEND); - } - - final ISettings settings = (ISettings) parameter.getConfiguration(); - status = new OperationStatus(settings, parameter, backend); - - final IPdfSigner signer = backend.getPdfSigner(); - - final PDFObject pdfObject = signer.buildPDFObject(status); - - status.setPdfObject(pdfObject); - - // set Original PDF Document Data - status.getPdfObject() - .setOriginalDocument(parameter.getDataSource()); - - // Check PDF Permissions - signer.checkPDFPermissions(status.getPdfObject()); - - // PlaceholderConfiguration placeholderConfiguration = status - // .getPlaceholderConfiguration(); - - final RequestedSignature requestedSignature = new RequestedSignature( - status); - - status.setRequestedSignature(requestedSignature); - - try { - requestedSignature.setCertificate(getValidCertificate( - status.getSignParamter().getPlainSigner().getCertificate(parameter))); - - } finally { - if (parameter instanceof BKUHeaderHolder) { - final BKUHeaderHolder holder = (BKUHeaderHolder) parameter; - - final Iterator<BKUHeader> bkuHeaderIt = holder.getProcessInfo() - .iterator(); - - while (bkuHeaderIt.hasNext()) { - final BKUHeader header = bkuHeaderIt.next(); - if ("Server".equalsIgnoreCase(header.getName())) { - requestedSignature - .getStatus() - .getMetaInformations() - .put(ErrorConstants.STATUS_INFO_SIGDEVICEVERSION, - header.getValue()); - } else if (ErrorConstants.STATUS_INFO_SIGDEVICE.equalsIgnoreCase(header.getName())) { - requestedSignature - .getStatus() - .getMetaInformations() - .put(ErrorConstants.STATUS_INFO_SIGDEVICE, - header.getValue()); - } - } - } - } - // Only use this profileID because validation was done in - // RequestedSignature - final String signatureProfileID = requestedSignature - .getSignatureProfileID(); - - logger.info("Selected signature Profile: " + signatureProfileID); - - // SignatureProfileConfiguration signatureProfileConfiguration = - // status - // .getSignatureProfileConfiguration(signatureProfileID); - - // this.stampPdf(status); - - // Create signature - try { - signer.signPDF(status.getPdfObject(), requestedSignature, - signer.buildSignaturInterface(status.getSignParamter().getPlainSigner(), - parameter, requestedSignature)); - - } finally { - if (parameter instanceof BKUHeaderHolder) { - final BKUHeaderHolder holder = (BKUHeaderHolder) parameter; - - final Iterator<BKUHeader> bkuHeaderIt = holder.getProcessInfo() - .iterator(); - - while (bkuHeaderIt.hasNext()) { - final BKUHeader header = bkuHeaderIt.next(); - if ("Server".equalsIgnoreCase(header.getName())) { - requestedSignature - .getStatus() - .getMetaInformations() - .put(ErrorConstants.STATUS_INFO_SIGDEVICEVERSION, - header.getValue()); - } else if (ErrorConstants.STATUS_INFO_SIGDEVICE.equalsIgnoreCase(header.getName())) { - requestedSignature - .getStatus() - .getMetaInformations() - .put(ErrorConstants.STATUS_INFO_SIGDEVICE, - header.getValue()); - } - } - } - } - // ================================================================ - // Create SignResult - final SignResult result = createSignResult(status); - - return result; - - } catch (final SLPdfAsException e) { - if (e.isCriticalError()) { - logger.warn("Failed to create signature [" + e.getMessage() + "]", e); - - } else { - logger.info("Failed to create signature [" + e.getMessage() + "]", e); - - } - throw ErrorExtractor.searchPdfAsError(e, status); - - } catch (final Throwable e) { - logger.warn("Failed to create signature [" + e.getMessage() + "]", e); - throw ErrorExtractor.searchPdfAsError(e, status); - - - } finally { - if (status != null) { - status.clear(); - - } - logger.trace("sign done"); + val state2 = state1.setCertificate( + signer.getCertificate(state1.getSignParameter())); + val state3 = state2.setSignature( + signer.sign( + state2.getSignatureData(), state2.getSignatureDataByteRange(), + state2.getSignParameter(), state2.getRequestedSignature())); + return state3.finishSign(); + } catch (final PdfAsException e) { + throw ErrorExtractor.searchPdfAsError(e, state1.getStatus()); } } @@ -277,7 +149,7 @@ public class PdfAsImpl implements PdfAs, IConfigurationConstants, if (now.after(notAfter) || now.before(notBefore)) { logger.warn("Signer certificate is not valid. notBefore:{} | notAfter:{} | now:{}", notBefore, notAfter, now); - throw new PDFASError(11021); + throw new PDFASError(ErrorConstants.ERROR_SIGNER_CERT_TIMEFRAME_INVALID); } else { return certificate; @@ -285,27 +157,30 @@ public class PdfAsImpl implements PdfAs, IConfigurationConstants, } } + private final TimedFunction verifyTimer = new TimedFunction("pdfas.verify"); @Override public List<VerifyResult> verify(VerifyParameter parameter) throws PDFASError { - verifyVerifyParameter(parameter); + return verifyTimer.timed(() -> { + verifyVerifyParameter(parameter); - // execute pre Processors - verifyPreProcessing(parameter); + // execute pre Processors + verifyPreProcessing(parameter); - // allocated Backend - final PDFASBackend backend = BackendLoader.getPDFASBackend(parameter.getConfiguration()); + // allocated Backend + final PDFASBackend backend = BackendLoader.getPDFASBackend(parameter.getConfiguration()); - if (backend == null) { - throw new PDFASError(ERROR_NO_BACKEND); - } + if (backend == null) { + throw new PDFASError(ERROR_NO_BACKEND); + } - try { - return backend.getVerifier().verify(parameter); - } catch (final Throwable e) { - throw ErrorExtractor.searchPdfAsError(e, null); - } + try { + return backend.getVerifier().verify(parameter); + } catch (final Throwable e) { + throw ErrorExtractor.searchPdfAsError(e, null); + } + }); } @Override @@ -313,12 +188,11 @@ public class PdfAsImpl implements PdfAs, IConfigurationConstants, return new ConfigurationImpl(this.settings); } + private final TimedFunction signTimer = new TimedFunction("pdfas.sign"); @Override - public StatusRequest startSign(SignParameter parameter) throws PDFASError { + public StatusRequest.Stage1 startSign(SignParameter parameter) throws PDFASError { verifySignParameter(parameter); - - final StatusRequestImpl request = new StatusRequestImpl(); OperationStatus status = null; try { // Status initialization @@ -338,138 +212,136 @@ public class PdfAsImpl implements PdfAs, IConfigurationConstants, final ISettings settings = (ISettings) parameter.getConfiguration(); status = new OperationStatus(settings, parameter, - backend); + backend, signTimer.start()); final IPdfSigner signer = backend.getPdfSigner(); status.setPdfObject(signer.buildPDFObject(status)); + status.getPdfObject().setOriginalDocument(parameter.getDataSource()); + signer.checkPDFPermissions(status.getPdfObject()); - final RequestedSignature requestedSignature = new RequestedSignature( + val requestedSignature = new RequestedSignature( status); status.setRequestedSignature(requestedSignature); - request.setStatus(status); - - request.setNeedCertificate(true); - - return request; + return StatusRequestImpl.create(this, status); } catch (final Throwable e) { + if (status != null) status.getSignTimer().finishFailure(e); logger.warn("startSign", e); throw ErrorExtractor.searchPdfAsError(e, status); } } - @Override - public StatusRequest process(StatusRequest statusRequest) throws PDFASError { - if (!(statusRequest instanceof StatusRequestImpl)) { - throw new PDFASError(ERROR_SIG_INVALID_STATUS); - } - - final StatusRequestImpl request = (StatusRequestImpl) statusRequest; + public void processCertificate(StatusRequestImpl request, X509Certificate certificate) throws PDFASError { final OperationStatus status = request.getStatus(); + try { + status.getRequestedSignature().setCertificate(certificate); + + if (request.getSignParameter() instanceof BKUHeaderHolder holder) { + + for (BKUHeader header : holder.getProcessInfo()) { + if ("Server".equalsIgnoreCase(header.getName())) { + status.getRequestedSignature() + .getStatus() + .getMetaInformations() + .put(ErrorConstants.STATUS_INFO_SIGDEVICEVERSION, + header.getValue()); + } else if (ErrorConstants.STATUS_INFO_SIGDEVICE.equalsIgnoreCase(header.getName())) { + status.getRequestedSignature() + .getStatus() + .getMetaInformations() + .put(ErrorConstants.STATUS_INFO_SIGDEVICE, + header.getValue()); + } + } + } - if (request.needCertificate()) { - try { - status.getRequestedSignature().setCertificate( - request.getCertificate()); - - // set Original PDF Document Data - status.getPdfObject().setOriginalDocument( - status.getSignParamter().getDataSource()); - - // STAMPER! - // stampPdf(status); - request.setNeedCertificate(false); - - status.setSigningDate(Calendar.getInstance()); + status.setSigningDate(Calendar.getInstance()); - // GET Signature DATA - final String pdfFilter = status.getSignParamter().getPlainSigner() - .getPDFFilter(); - final String pdfSubFilter = status.getSignParamter().getPlainSigner() - .getPDFSubFilter(); + // GET Signature DATA + final String pdfFilter = status.getSignParameter().getPlainSigner() + .getPDFFilter(); + final String pdfSubFilter = status.getSignParameter().getPlainSigner() + .getPDFSubFilter(); - final IPdfSigner signer = status.getBackend().getPdfSigner(); + final IPdfSigner signer = status.getBackend().getPdfSigner(); - final PDFASSignatureExtractor signatureDataExtractor = signer - .buildBlindSignaturInterface(request.getCertificate(), - pdfFilter, pdfSubFilter, - status.getSigningDate()); + final PDFASSignatureExtractor signatureDataExtractor = signer + .buildBlindSignaturInterface(certificate, + pdfFilter, pdfSubFilter, + status.getSigningDate()); - signer.signPDF(status.getPdfObject(), - status.getRequestedSignature(), signatureDataExtractor); + signer.signPDF(status.getPdfObject(), + status.getRequestedSignature(), signatureDataExtractor); - final StringBuilder sb = new StringBuilder(); + final StringBuilder sb = new StringBuilder(); - final int[] byteRange = PDFUtils - .extractSignatureByteRange(signatureDataExtractor - .getSignatureData()); + final int[] byteRange = PDFUtils + .extractSignatureByteRange(signatureDataExtractor + .getSignatureData()); + if (logger.isDebugEnabled()) { for (final int element : byteRange) { - sb.append(" " + element); + sb.append(" ").append(element); } - logger.debug("ByteRange: " + sb.toString()); + logger.debug("ByteRange: {}", sb); + } - request.setSignatureData(signatureDataExtractor - .getSignatureData()); - request.setByteRange(byteRange); - request.setNeedSignature(true); + request.setSignatureData(signatureDataExtractor + .getSignatureData()); + request.setByteRange(byteRange); - } catch (final Throwable e) { + } catch (final Throwable e) { + status.getSignTimer().finishFailure(e); logger.warn("process", e); throw ErrorExtractor.searchPdfAsError(e, status); - - } - } else if (request.needSignature()) { - request.setNeedSignature(false); + + } + } + + public void processSignature(StatusRequestImpl request, byte[] signatureValue) throws PDFASError { + final OperationStatus status = request.getStatus(); + try { // Inject signature byte[] into signedDocument final int offset = request.getSignatureDataByteRange()[1] + 1; final byte[] pdfSignature = status.getBackend().getPdfSigner() - .rewritePlainSignature(request.getSignature()); + .rewritePlainSignature(signatureValue); // byte[] input = // PDFUtils.blackOutSignature(status.getPdfObject().getSignedDocument(), // request.getSignatureDataByteRange()); final VerifyResult verifyResult = SignatureUtils.verifySignature( - request.getSignature(), request.getSignatureData()); + signatureValue, request.getSignatureData()); final RequestedSignature requestedSignature = request.getStatus() .getRequestedSignature(); - if (!StreamUtils.dataCompare(requestedSignature.getCertificate() - .getFingerprintSHA(), ((X509Certificate) verifyResult - .getSignerCertificate()).getFingerprintSHA())) { + if (!StreamUtils.dataCompare( + requestedSignature.getCertificate().getFingerprintSHA(), + ((X509Certificate) verifyResult.getSignerCertificate()).getFingerprintSHA() + )) { throw new PDFASError(ERROR_SIG_CERTIFICATE_MISSMATCH); } for (int i = 0; i < pdfSignature.length; i++) { status.getPdfObject().getSignedDocument()[offset + i] = pdfSignature[i]; } - request.setIsReady(true); - } else { - throw new PDFASError(ERROR_SIG_INVALID_STATUS); + } catch (final Throwable e) { + status.getSignTimer().finishFailure(e); + throw e; } - - return request; } - @Override - public SignResult finishSign(StatusRequest statusRequest) throws PDFASError { - if (!(statusRequest instanceof StatusRequestImpl)) { - throw new PDFASError(ERROR_SIG_INVALID_STATUS); - } - - final StatusRequestImpl request = (StatusRequestImpl) statusRequest; + public SignResult finishSign(StatusRequestImpl request) throws PDFASError { final OperationStatus status = request.getStatus(); - if (!request.isReady()) { - throw new PDFASError(ERROR_SIG_INVALID_STATUS); - } - try { - return createSignResult(status); + val signResult = createSignResult(status); + status.getSignTimer().finishSuccess(); + return signResult; } catch (final IOException e) { // new PdfAsException("error.pdf.sig.06", e); + status.getSignTimer().finishFailure(e); throw ErrorExtractor.searchPdfAsError(e, status); } finally { if (status != null) { @@ -549,8 +421,8 @@ public class PdfAsImpl implements PdfAs, IConfigurationConstants, // ================================================================ // Create SignResult final SignResultImpl result = new SignResultImpl(); - status.getSignParamter().getSignatureResult().write(status.getPdfObject().getSignedDocument()); - status.getSignParamter().getSignatureResult().flush(); + status.getSignParameter().getSignatureResult().write(status.getPdfObject().getSignedDocument()); + status.getSignParameter().getSignatureResult().flush(); result.setSignerCertificate(status.getRequestedSignature() .getCertificate()); result.setSignaturePosition(status.getRequestedSignature() @@ -580,7 +452,7 @@ public class PdfAsImpl implements PdfAs, IConfigurationConstants, final PDFASBackend backend = BackendLoader.getPDFASBackend(parameter.getConfiguration()); final ISettings settings = (ISettings) parameter.getConfiguration(); - status = new OperationStatus(settings, parameter, backend); + status = new OperationStatus(settings, parameter, backend, null); final IPdfSigner signer = backend.getPdfSigner(); diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/PdfAsParameterImpl.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/PdfAsParameterImpl.java index 1929f95e..eca361d0 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/PdfAsParameterImpl.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/PdfAsParameterImpl.java @@ -27,7 +27,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import javax.activation.DataSource; +import jakarta.activation.DataSource; import at.gv.egiz.pdfas.common.exceptions.PdfAsException; import at.gv.egiz.pdfas.common.utils.CheckSignatureBlockParameters; diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/SignParameterImpl.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/SignParameterImpl.java index 06b1b34f..4a47e45b 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/SignParameterImpl.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/SignParameterImpl.java @@ -27,7 +27,7 @@ import java.io.OutputStream; import java.util.ArrayList; import java.util.List; -import javax.activation.DataSource; +import jakarta.activation.DataSource; import at.gv.egiz.pdfas.lib.api.Configuration; import at.gv.egiz.pdfas.lib.api.sign.IPlainSigner; @@ -48,7 +48,6 @@ public class SignParameterImpl extends PdfAsParameterImpl implements SignParamet @Setter protected boolean placeHolderSearchEnabled; - protected DataSource output = null; protected IPlainSigner signer = null; protected OutputStream outputStream = null; protected List<BKUHeader> processInfo = new ArrayList<BKUHeader>(); @@ -85,10 +84,9 @@ public class SignParameterImpl extends PdfAsParameterImpl implements SignParamet return this.signer; } - @Override - public OutputStream getSignatureResult() { - return outputStream; - } + @Override public void setOutputStream(OutputStream stream) { this.outputStream = stream; } + + @Override public OutputStream getSignatureResult() { return outputStream; } public List<BKUHeader> getProcessInfo() { return processInfo; diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/StatusRequestImpl.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/StatusRequestImpl.java index 49b78659..c435e193 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/StatusRequestImpl.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/StatusRequestImpl.java @@ -23,6 +23,9 @@ ******************************************************************************/ package at.gv.egiz.pdfas.lib.impl; +import at.gv.egiz.pdfas.common.exceptions.PDFASError; +import at.gv.egiz.pdfas.lib.api.sign.SignResult; +import at.gv.egiz.pdfas.lib.impl.status.RequestedSignature; import iaik.x509.X509Certificate; import java.security.cert.CertificateException; @@ -30,86 +33,67 @@ import java.security.cert.CertificateException; import at.gv.egiz.pdfas.lib.api.StatusRequest; import at.gv.egiz.pdfas.lib.api.sign.SignParameter; import at.gv.egiz.pdfas.lib.impl.status.OperationStatus; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.Setter; public class StatusRequestImpl implements StatusRequest { - private boolean needCertificate = false; - private boolean needSignature = false; - private boolean isReady = false; - private X509Certificate certificate; - private byte[] encodedSignature; - private byte[] signatureData; - private int[] byteRange; - - private OperationStatus status; - - public OperationStatus getStatus() { - return status; - } - - public void setStatus(OperationStatus status) { - this.status = status; - } - - public void setSignatureData(byte[] signatureData) { - this.signatureData = signatureData; - } - - public void setByteRange(int[] byteRange) { - this.byteRange = byteRange; - } - - public X509Certificate getCertificate() { - return this.certificate; - } - - public byte[] getSignature() { - return this.encodedSignature; - } - - public void setNeedSignature(boolean value) { - this.needSignature = value; - } - - public void setNeedCertificate(boolean value) { - this.needCertificate = value; - } - - public boolean needCertificate() { - return needCertificate; - } - - public boolean needSignature() { - return needSignature; - } - - public boolean isReady() { - return isReady; - } - - public void setIsReady(boolean value) { - this.isReady = value; - } - - public byte[] getSignatureData() { - return signatureData; - } - - public int[] getSignatureDataByteRange() { - return byteRange; - } - - public void setCertificate(byte[] encodedCertificate) throws CertificateException { - this.certificate = new X509Certificate(encodedCertificate); - } - - public void setSigature(byte[] signatureValue) { - this.encodedSignature = signatureValue; - } - - public SignParameter getSignParameter() { - return this.status.getSignParamter(); - } - - + private final PdfAsImpl pdfAs; + @Getter + private final OperationStatus status; + + private StatusRequestImpl(PdfAsImpl pdfAs, OperationStatus status ) { this.pdfAs = pdfAs; this.status = status; } + static StatusRequestImpl.Stage1 create(PdfAsImpl pdfAs, OperationStatus status) { + return new StatusRequestImpl(pdfAs, status).new Stage1(); + } + + @Setter @Getter + private byte[] signatureData; + @Setter + private int[] byteRange; + + @Override public int[] getSignatureDataByteRange() { + return byteRange; + } + + @Override public SignParameter getSignParameter() { + return this.status.getSignParameter(); + } + + @Override public RequestedSignature getRequestedSignature() { return this.status.getRequestedSignature(); } + + class StageBase implements StatusRequest { + public OperationStatus getStatus() { return status; } + @Override public byte[] getSignatureData() { return signatureData; } + @Override public int[] getSignatureDataByteRange() { return byteRange; } + @Override public SignParameter getSignParameter() { return status.getSignParameter(); } + @Override public RequestedSignature getRequestedSignature() { return status.getRequestedSignature(); } + } + + class Stage1 extends StageBase implements StatusRequest.Stage1 { + public StatusRequestImpl.Stage2 setCertificate(X509Certificate certificate) throws PDFASError { + pdfAs.processCertificate(StatusRequestImpl.this, certificate); + return new StatusRequestImpl.Stage2(); + } + @Override + public StatusRequestImpl.Stage2 setCertificate(byte[] encodedCertificate) throws CertificateException, PDFASError { + return setCertificate(new X509Certificate(encodedCertificate)); + } + } + + class Stage2 extends StageBase implements StatusRequest.Stage2 { + @Override + public StatusRequestImpl.Stage3 setSignature(byte[] signatureValue) throws PDFASError { + pdfAs.processSignature(StatusRequestImpl.this, signatureValue); + return new StatusRequestImpl.Stage3(); + } + } + + class Stage3 extends StageBase implements StatusRequest.Stage3 { + @Override + public SignResult finishSign() throws PDFASError { + return pdfAs.finishSign(StatusRequestImpl.this); + } + } } diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/VerifyParameterImpl.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/VerifyParameterImpl.java index ea1da9e7..04356cfb 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/VerifyParameterImpl.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/VerifyParameterImpl.java @@ -25,7 +25,7 @@ package at.gv.egiz.pdfas.lib.impl; import java.util.Date; -import javax.activation.DataSource; +import jakarta.activation.DataSource; import at.gv.egiz.pdfas.lib.api.Configuration; import at.gv.egiz.pdfas.lib.api.verify.VerifyParameter; diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/backend/BackendLoader.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/backend/BackendLoader.java index 4e00209a..d76166ed 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/backend/BackendLoader.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/backend/BackendLoader.java @@ -32,7 +32,7 @@ public class BackendLoader implements ErrorConstants { public static final String BACKEND_CONFIG = "runtime.backend"; /** The default backend. */ - private static PDFASBackend defaultBackend = null; + private static PDFASBackend defaultBackend = null; static { logger.debug("building PDF-AS Backends"); diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/placeholder/PlaceholderFilter.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/placeholder/PlaceholderFilter.java index 1615482f..665153a4 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/placeholder/PlaceholderFilter.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/placeholder/PlaceholderFilter.java @@ -44,7 +44,7 @@ public class PlaceholderFilter implements IConfigurationConstants, String signingProfile = status.getRequestedSignature().getSignatureProfileID(); - if (status.getSignParamter().isPlaceHolderSearchEnabled()) { + if (status.getSignParameter().isPlaceHolderSearchEnabled()) { if (status.getPlaceholderConfiguration().isGlobalPlaceholderEnabled()) { String defaultPlaceHolderId = settings.getValue(PLACEHOLDER_ID); return status.getBackend().getPlaceholderExtractor().extract( diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/IPdfSigner.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/IPdfSigner.java index 6a249041..774e879e 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/IPdfSigner.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/IPdfSigner.java @@ -36,21 +36,18 @@ import at.gv.egiz.pdfas.lib.impl.status.OperationStatus; import at.gv.egiz.pdfas.lib.impl.status.PDFObject; import at.gv.egiz.pdfas.lib.impl.status.RequestedSignature; -public interface IPdfSigner { +public interface IPdfSigner<PDFObjectT extends PDFObject, SignerT extends PDFASSignatureExtractor> { - PDFASSignatureInterface buildSignaturInterface(IPlainSigner signer, - SignParameter parameters, RequestedSignature requestedSignature); - - PDFASSignatureExtractor buildBlindSignaturInterface( + SignerT buildBlindSignaturInterface( X509Certificate certificate, String filter, String subfilter, Calendar date); - PDFObject buildPDFObject(OperationStatus operationStatus); + PDFObjectT buildPDFObject(OperationStatus operationStatus); - void checkPDFPermissions(PDFObject object) throws PdfAsException; + void checkPDFPermissions(PDFObjectT object) throws PdfAsException; - void signPDF(PDFObject pdfObject, RequestedSignature requestedSignature, - PDFASSignatureInterface signer) throws PdfAsException; + void signPDF(PDFObjectT pdfObject, RequestedSignature requestedSignature, + SignerT signer) throws PdfAsException; byte[] rewritePlainSignature(byte[] plainSignature); diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/CertificateAndRequestParameterResolver.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/CertificateAndRequestParameterResolver.java index dd9a396a..c6c65ccc 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/CertificateAndRequestParameterResolver.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/CertificateAndRequestParameterResolver.java @@ -29,7 +29,6 @@ import at.gv.egiz.pdfas.common.utils.DNUtils; import at.gv.egiz.pdfas.common.utils.OgnlUtils; import at.gv.egiz.pdfas.lib.impl.status.OperationStatus; import iaik.x509.X509Certificate; -import ognl.AbstractMemberAccess; import ognl.MemberAccess; import ognl.OgnlContext; import org.slf4j.Logger; @@ -78,7 +77,7 @@ public class CertificateAndRequestParameterResolver implements IResolver { this.ctx = new OgnlContext(null, null, memberAccess); this.ctx = new OgnlContext(null, null, memberAccess); - Map<String, String> map = operationStatus.getSignParamter().getDynamicSignatureBlockArguments(); + Map<String, String> map = operationStatus.getSignParameter().getDynamicSignatureBlockArguments(); if(map == null) map = new HashMap<>(); this.ctx.put(IProfileConstants.SIGNATURE_BLOCK_PARAMETER, map); diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/IPDFStamper.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/IPDFStamper.java index 22e20767..38eaf1aa 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/IPDFStamper.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/IPDFStamper.java @@ -31,10 +31,6 @@ import at.gv.egiz.pdfas.lib.impl.status.PDFObject; import at.knowcenter.wag.egov.egiz.pdf.PositioningInstruction; import at.knowcenter.wag.egov.egiz.table.Table; -public interface IPDFStamper { - public IPDFVisualObject createVisualPDFObject(PDFObject pdf, Table table) throws IOException; - public byte[] writeVisualObject(IPDFVisualObject visualObject, PositioningInstruction positioningInstruction, - byte[] pdfData, String placeholderName) throws PdfAsException; - - public void setSettings(ISettings settings); +public interface IPDFStamper<ObjectT extends PDFObject> { + public IPDFVisualObject createVisualPDFObject(ObjectT pdf, Table table) throws IOException; } diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/OperationStatus.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/OperationStatus.java index 898b7a00..3596884e 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/OperationStatus.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/OperationStatus.java @@ -35,6 +35,9 @@ import at.gv.egiz.pdfas.lib.backend.PDFASBackend; import at.gv.egiz.pdfas.lib.impl.configuration.GlobalConfiguration; import at.gv.egiz.pdfas.lib.impl.configuration.PlaceholderConfiguration; import at.gv.egiz.pdfas.lib.impl.configuration.SignatureProfileConfiguration; +import at.gv.egiz.pdfas.lib.util.TimedFunction; +import lombok.Getter; +import lombok.Setter; public class OperationStatus implements Serializable { @@ -44,24 +47,35 @@ public class OperationStatus implements Serializable { private static final long serialVersionUID = -2985007198666388528L; private SignParameter signParamter; - private PDFObject pdfObject; + @Setter + @Getter + private PDFObject pdfObject; - private ISettings configuration; + private final ISettings configuration; private PlaceholderConfiguration placeholderConfiguration = null; - private GlobalConfiguration gloablConfiguration = null; - private Map<String, SignatureProfileConfiguration> signatureProfiles = new HashMap<String, SignatureProfileConfiguration>(); + private GlobalConfiguration globalConfiguration = null; + private final Map<String, SignatureProfileConfiguration> signatureProfiles = new HashMap<String, SignatureProfileConfiguration>(); private TempFileHelper helper; - private RequestedSignature requestedSignature; - private Calendar signingDate; - private PDFASBackend backend; - private Map<String, String> metaInformations = new HashMap<String, String>(); + @Setter + @Getter + private RequestedSignature requestedSignature; + @Setter + @Getter + private Calendar signingDate; + @Getter + private final PDFASBackend backend; + @Getter + private final Map<String, String> metaInformations = new HashMap<String, String>(); + @Getter + private final TimedFunction.Context signTimer; // private HashMap<String, String> requestParameters = new HashMap<String, String>(); - public OperationStatus(ISettings configuration, SignParameter signParameter, PDFASBackend backend) { + public OperationStatus(ISettings configuration, SignParameter signParameter, PDFASBackend backend, TimedFunction.Context timer) { this.configuration = configuration; this.signParamter = signParameter; this.backend = backend; + this.signTimer = timer; helper = new TempFileHelper(configuration); } @@ -70,7 +84,7 @@ public class OperationStatus implements Serializable { if (this.helper != null) { try { this.helper.clear(); - } catch (Throwable e) { + } catch (Throwable ignored) { } } super.finalize(); @@ -82,40 +96,28 @@ public class OperationStatus implements Serializable { if (this.helper != null) { try { this.helper.clear(); - } catch (Throwable e) { + } catch (Throwable ignored) { } } if(pdfObject != null) { pdfObject.close(); } } - - public PDFASBackend getBackend() { - return backend; - } - - public RequestedSignature getRequestedSignature() { - return requestedSignature; - } - public void setRequestedSignature(RequestedSignature requestedSignature) { - this.requestedSignature = requestedSignature; - } - - public PlaceholderConfiguration getPlaceholderConfiguration() { - if (this.placeholderConfiguration == null) { - this.placeholderConfiguration = new PlaceholderConfiguration( - this.configuration); - } - return this.placeholderConfiguration; + public PlaceholderConfiguration getPlaceholderConfiguration() { + if (this.placeholderConfiguration == null) { + this.placeholderConfiguration = new PlaceholderConfiguration( + this.configuration); + } + return this.placeholderConfiguration; } public GlobalConfiguration getGlobalConfiguration() { - if (this.gloablConfiguration == null) { - this.gloablConfiguration = new GlobalConfiguration( + if (this.globalConfiguration == null) { + this.globalConfiguration = new GlobalConfiguration( this.configuration); } - return this.gloablConfiguration; + return this.globalConfiguration; } public SignatureProfileConfiguration getSignatureProfileConfiguration( @@ -134,22 +136,10 @@ public class OperationStatus implements Serializable { // ======================================================================== - public PDFObject getPdfObject() { - return pdfObject; - } - - public void setPdfObject(PDFObject pdfObject) { - this.pdfObject = pdfObject; - } - - public SignParameter getSignParamter() { + public SignParameter getSignParameter() { return signParamter; } - public void setSignParamter(SignParameter signParamter) { - this.signParamter = signParamter; - } - public TempFileHelper getTempFileHelper() { return this.helper; } @@ -158,26 +148,10 @@ public class OperationStatus implements Serializable { return this.configuration; } - public Calendar getSigningDate() { - return signingDate; + public String getTransactionId() { + if(this.signParamter != null) { + return this.signParamter.getTransactionId(); + } + return null; } - - public void setSigningDate(Calendar signingDate) { - this.signingDate = signingDate; - } - - public String getTransactionId() { - if(this.signParamter != null) { - return this.signParamter.getTransactionId(); - } - return null; - } - - public Map<String, String> getMetaInformations() { - return metaInformations; - } - -// public HashMap<String, String> getRequestParameters() { -// return requestParameters; -// } } diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/PDFObject.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/PDFObject.java index 6ba7251c..bfbb337f 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/PDFObject.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/PDFObject.java @@ -24,10 +24,9 @@ package at.gv.egiz.pdfas.lib.impl.status; import java.io.IOException; -import java.util.HashMap; import java.util.Map; -import javax.activation.DataSource; +import jakarta.activation.DataSource; public abstract class PDFObject { @@ -73,6 +72,6 @@ public abstract class PDFObject { public abstract String getPDFVersion(); public Map<String, String> getRequestParameters() { - return status.getSignParamter().getDynamicSignatureBlockArguments(); + return status.getSignParameter().getDynamicSignatureBlockArguments(); } } diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/RequestedSignature.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/RequestedSignature.java index 8226d7e9..75633f8e 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/RequestedSignature.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/RequestedSignature.java @@ -42,7 +42,7 @@ public class RequestedSignature implements ICertificateProvider { this.status = status; - String profileID = status.getSignParamter().getSignatureProfileId(); + String profileID = status.getSignParameter().getSignatureProfileId(); if(profileID == null) { profileID = status.getGlobalConfiguration().getDefaultSignatureProfile(); @@ -54,10 +54,10 @@ public class RequestedSignature implements ICertificateProvider { this.signatureProfile = profileID; - if(status.getSignParamter().getSignaturePosition() == null) { + if(status.getSignParameter().getSignaturePosition() == null) { this.tablePosition = new TablePos(); } else { - this.tablePosition = new TablePos(status.getSignParamter().getSignaturePosition()); + this.tablePosition = new TablePos(status.getSignParameter().getSignaturePosition()); } } diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/IVerifier.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/IVerifier.java index ab39f060..c1ed23e4 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/IVerifier.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/IVerifier.java @@ -10,7 +10,7 @@ import at.gv.egiz.pdfas.lib.api.verify.VerifyResult; public interface IVerifier { public List<VerifyResult> verify(byte[] signature, - byte[] signatureContent, Date verificationTime) throws PdfAsException; + SignatureInputData signedData, Date verificationTime) throws PdfAsException; public void setConfiguration(Configuration config); diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/IVerifyFilter.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/IVerifyFilter.java index 1bc56162..39756c5c 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/IVerifyFilter.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/IVerifyFilter.java @@ -31,9 +31,8 @@ import at.gv.egiz.pdfas.lib.api.Configuration; import at.gv.egiz.pdfas.lib.api.verify.VerifyResult; public interface IVerifyFilter { - public void setConfiguration(Configuration config); - public List<VerifyResult> verify(byte[] contentData, - byte[] signatureContent, Date verificationTime, - int[] byteRange, IVerifier verifier) throws PdfAsException; + public List<VerifyResult> verify(SignatureInputData signedData, + byte[] signature, Date verificationTime, + IVerifier verifier) throws PdfAsException; public List<FilterEntry> getFiters(); } diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/IntegrityVerifier.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/IntegrityVerifier.java index 3bb326fb..355de536 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/IntegrityVerifier.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/IntegrityVerifier.java @@ -29,12 +29,12 @@ public class IntegrityVerifier implements IVerifier { private static final Logger logger = LoggerFactory .getLogger(IntegrityVerifier.class); - public List<VerifyResult> verify(byte[] signature, byte[] signatureContent, + public List<VerifyResult> verify(byte[] signature, SignatureInputData inputData, Date verificationTime) throws PdfAsException { try { List<VerifyResult> result = new ArrayList<VerifyResult>(); - SignedData signedData = new SignedData(signatureContent, + SignedData signedData = new SignedData(inputData.getSignatureInputBytes(), new AlgorithmID[] { AlgorithmID.sha512, AlgorithmID.sha384, AlgorithmID.sha256, diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/SignatureInputData.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/SignatureInputData.java new file mode 100644 index 00000000..e709b506 --- /dev/null +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/SignatureInputData.java @@ -0,0 +1,26 @@ +package at.gv.egiz.pdfas.lib.impl.verify; + +import lombok.Getter; +import lombok.NonNull; +import lombok.Value; +import lombok.val; + +import java.io.ByteArrayOutputStream; + +@Value +public class SignatureInputData { + byte[] baseData; + int[] signedByteRanges; + + @Getter(lazy = true) + byte[] signatureInputBytes = buildSignatureInputBytes(); + + private byte[] buildSignatureInputBytes() { + assert(signedByteRanges.length % 2 == 0); + val builder = new ByteArrayOutputStream(); + for (int i = 0; i < signedByteRanges.length; i += 2) { + builder.write(baseData, signedByteRanges[i], signedByteRanges[i+1]); + } + return builder.toByteArray(); + } +} diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/VerifierDispatcher.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/VerifierDispatcher.java index 26065adf..24bfb129 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/VerifierDispatcher.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/VerifierDispatcher.java @@ -128,11 +128,10 @@ public class VerifierDispatcher { for (int i = 0; i < currentClasses.length; i++) { String clsName = currentClasses[i]; Class<?> cls = Class.forName(clsName); - Object f = cls.newInstance(); + Object f = cls.getDeclaredConstructor().newInstance(); if (!(f instanceof IVerifyFilter)) throw new ClassCastException(); IVerifyFilter filter = (IVerifyFilter) f; - filter.setConfiguration((Configuration) settings); List<FilterEntry> entries = filter.getFiters(); Iterator<FilterEntry> it = entries.iterator(); while (it.hasNext()) { diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/VerifyResultImpl.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/VerifyResultImpl.java index 5eb40662..a4a22fda 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/VerifyResultImpl.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/VerifyResultImpl.java @@ -27,6 +27,8 @@ import iaik.x509.X509Certificate; import at.gv.egiz.pdfas.common.exceptions.PdfAsException; import at.gv.egiz.pdfas.lib.api.verify.SignatureCheck; import at.gv.egiz.pdfas.lib.api.verify.VerifyResult; +import lombok.Getter; +import lombok.Setter; public class VerifyResultImpl implements VerifyResult { @@ -36,7 +38,8 @@ public class VerifyResultImpl implements VerifyResult { private SignatureCheck certificateCheck; private SignatureCheck valueCheck; private SignatureCheck manifestCheck; - private byte[] signatureData; + @Setter @Getter + private SignatureInputData signatureData; private X509Certificate signerCertificate; public boolean isVerificationDone() { @@ -95,12 +98,4 @@ public class VerifyResultImpl implements VerifyResult { this.signerCertificate = signerCertificate; } - public void setSignatureData(byte[] signaturData) { - this.signatureData = signaturData; - } - - public byte[] getSignatureData() { - return signatureData; - } - } diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/settings/Settings.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/settings/Settings.java index 8138f061..68c150a0 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/settings/Settings.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/settings/Settings.java @@ -89,8 +89,9 @@ public class Settings implements ISettings, IProfileConstants { contextFolder = includeInstruction.getParentFile(); final String includeName = includeInstruction.getName(); - final WildcardFileFilter fileFilter = new WildcardFileFilter( - includeName, IOCase.SENSITIVE); + + final WildcardFileFilter fileFilter = WildcardFileFilter.builder() + .setWildcards(includeName).setIoCase(IOCase.SENSITIVE).get(); Collection<File> includeFiles = null; if (contextFolder != null && contextFolder.exists() diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/util/SignatureUtils.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/util/SignatureUtils.java index 6282d9c1..09879071 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/util/SignatureUtils.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/util/SignatureUtils.java @@ -23,6 +23,10 @@ import iaik.x509.X509Certificate; public class SignatureUtils implements ErrorConstants { private static final Logger logger = LoggerFactory.getLogger(SignatureUtils.class); + /** + * Verifies the CMS signature for the given input. + * Throws if the signature is invalid. + */ public static VerifyResult verifySignature(byte[] signature, byte[] input) throws PDFASError { // List<VerifyResult> results = new ArrayList<VerifyResult>(); diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/util/TimedFunction.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/util/TimedFunction.java new file mode 100644 index 00000000..243b2ce2 --- /dev/null +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/util/TimedFunction.java @@ -0,0 +1,44 @@ +package at.gv.egiz.pdfas.lib.util; + +import at.gv.egiz.pdfas.common.exceptions.PDFASError; +import io.micrometer.core.instrument.Metrics; +import io.micrometer.core.instrument.Timer; +import lombok.val; + +public class TimedFunction { + public interface ThrowingCallable<S, T extends Throwable> { + S invoke() throws T; + } + + private final String timerName; + private final Timer successTimer; + public TimedFunction(String timerName) { + this.timerName = timerName; + this.successTimer = Metrics.timer(timerName, "status", "success"); + } + + public <S,T extends Throwable> S timed(ThrowingCallable<S, T> fn) throws T { + val timer = start(); + try { + S result = fn.invoke(); + timer.finishSuccess(); + return result; + } catch (final Throwable ex) { + timer.finishFailure(ex); + throw ex; + } + } + + public class Context { + final Timer.Sample timer = Timer.start(); + public void finishSuccess() { timer.stop(successTimer); } + public void finishFailure(Throwable ex) { + if (ex instanceof PDFASError e) { + Metrics.timer(timerName, "status", "failure", "exception", e.getClass().getName(), "errorCode", Long.toString(e.getCode())); + } else { + Metrics.timer(timerName, "status", "failure", "exception", ex.getClass().getName()); + } + } + } + public Context start() { return new Context(); } +} diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/APDUATRType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/APDUATRType.java index fc83b5c9..84554fa8 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/APDUATRType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/APDUATRType.java @@ -32,11 +32,11 @@ package at.gv.egiz.sl.schema; import java.math.BigInteger; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/APDUResponseElement.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/APDUResponseElement.java index 34c459db..a0bf6ef6 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/APDUResponseElement.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/APDUResponseElement.java @@ -33,11 +33,11 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElements; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElements; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/AccessAuthorizationType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/AccessAuthorizationType.java index 38b9a5cd..4e98fe07 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/AccessAuthorizationType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/AccessAuthorizationType.java @@ -33,11 +33,11 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/AllSignatoriesType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/AllSignatoriesType.java index c510bf11..4d3c1f55 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/AllSignatoriesType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/AllSignatoriesType.java @@ -31,9 +31,9 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/AnyChildrenType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/AnyChildrenType.java index fe49bac5..2097c4fc 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/AnyChildrenType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/AnyChildrenType.java @@ -33,11 +33,11 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; import org.w3c.dom.Element; diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/AnyMixedChildrenType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/AnyMixedChildrenType.java index 50397562..8369aabd 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/AnyMixedChildrenType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/AnyMixedChildrenType.java @@ -33,12 +33,12 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; import org.w3c.dom.Element; diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ApplicationIdentifierType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ApplicationIdentifierType.java index 30dfc4aa..953ed2e0 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ApplicationIdentifierType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ApplicationIdentifierType.java @@ -31,9 +31,9 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/AuthenticationClassType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/AuthenticationClassType.java index a3090758..cad11c0a 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/AuthenticationClassType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/AuthenticationClassType.java @@ -31,9 +31,9 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/Base64ContentType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/Base64ContentType.java index 9cb483c9..8bc49a4d 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/Base64ContentType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/Base64ContentType.java @@ -31,11 +31,11 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/Base64OptRefContentType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/Base64OptRefContentType.java index 640baa4f..b5c59e3c 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/Base64OptRefContentType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/Base64OptRefContentType.java @@ -31,11 +31,11 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/Base64XMLContentType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/Base64XMLContentType.java index b9e109fa..445ee5c5 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/Base64XMLContentType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/Base64XMLContentType.java @@ -31,11 +31,11 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/Base64XMLLocRefContentType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/Base64XMLLocRefContentType.java index d24ed6eb..025c154d 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/Base64XMLLocRefContentType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/Base64XMLLocRefContentType.java @@ -31,12 +31,12 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/Base64XMLLocRefOptRefContentType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/Base64XMLLocRefOptRefContentType.java index 076021c9..4e1eabca 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/Base64XMLLocRefOptRefContentType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/Base64XMLLocRefOptRefContentType.java @@ -31,11 +31,11 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/Base64XMLLocRefReqRefContentType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/Base64XMLLocRefReqRefContentType.java index c0493535..bedc07d4 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/Base64XMLLocRefReqRefContentType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/Base64XMLLocRefReqRefContentType.java @@ -31,11 +31,11 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/Base64XMLOptRefContentType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/Base64XMLOptRefContentType.java index 473216ee..46a7a71e 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/Base64XMLOptRefContentType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/Base64XMLOptRefContentType.java @@ -31,11 +31,11 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/BindingType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/BindingType.java index 0a71c0ec..47bb8664 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/BindingType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/BindingType.java @@ -31,13 +31,13 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CMSDataObjectOptionalMetaType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CMSDataObjectOptionalMetaType.java index cd5c1247..9c45be51 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CMSDataObjectOptionalMetaType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CMSDataObjectOptionalMetaType.java @@ -31,11 +31,11 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CMSDataObjectRequiredMetaType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CMSDataObjectRequiredMetaType.java index 9e3bd7b3..8cffd03f 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CMSDataObjectRequiredMetaType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CMSDataObjectRequiredMetaType.java @@ -31,9 +31,9 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CMSEncryptedContentType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CMSEncryptedContentType.java index d747c06c..09f244aa 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CMSEncryptedContentType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CMSEncryptedContentType.java @@ -31,10 +31,10 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CMSRecipientPublicKeyType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CMSRecipientPublicKeyType.java index 642d908d..c7c0b6c4 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CMSRecipientPublicKeyType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CMSRecipientPublicKeyType.java @@ -31,10 +31,10 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CMSToBeEncryptedType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CMSToBeEncryptedType.java index 6471fb0f..afb45a10 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CMSToBeEncryptedType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CMSToBeEncryptedType.java @@ -31,10 +31,10 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CanonicalizationMethodType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CanonicalizationMethodType.java index 6da5fa4e..ee4db831 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CanonicalizationMethodType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CanonicalizationMethodType.java @@ -33,13 +33,13 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CardActionElement.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CardActionElement.java index 7158b1f6..74fb6633 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CardActionElement.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CardActionElement.java @@ -31,11 +31,11 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CardActionResponseType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CardActionResponseType.java index b9d01e6a..6c9b09fa 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CardActionResponseType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CardActionResponseType.java @@ -31,9 +31,9 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CardActionType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CardActionType.java index d7f1799b..9c13e144 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CardActionType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CardActionType.java @@ -31,9 +31,9 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CardChannelRequest.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CardChannelRequest.java index 4402c3e3..254890d5 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CardChannelRequest.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CardChannelRequest.java @@ -31,11 +31,11 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CardChannelResponse.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CardChannelResponse.java index 428413c6..11dffa71 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CardChannelResponse.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CardChannelResponse.java @@ -31,11 +31,11 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CardManagementRequest.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CardManagementRequest.java index 4ed90e80..5c3fe7c2 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CardManagementRequest.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CardManagementRequest.java @@ -33,11 +33,11 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CardManagementResponse.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CardManagementResponse.java index e75c0c34..c286e660 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CardManagementResponse.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CardManagementResponse.java @@ -33,11 +33,11 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CheckResultType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CheckResultType.java index ae21e390..55228892 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CheckResultType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CheckResultType.java @@ -32,11 +32,11 @@ package at.gv.egiz.sl.schema; import java.math.BigInteger; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CommandAPDUType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CommandAPDUType.java index cbdbf0ff..7afb4374 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CommandAPDUType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CommandAPDUType.java @@ -32,11 +32,11 @@ package at.gv.egiz.sl.schema; import java.math.BigInteger; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateCMSSignatureRequestType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateCMSSignatureRequestType.java index 3046b109..955d36bb 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateCMSSignatureRequestType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateCMSSignatureRequestType.java @@ -33,13 +33,13 @@ package at.gv.egiz.sl.schema; //import com.sun.org.apache.xpath.internal.operations.Bool; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateCMSSignatureResponseType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateCMSSignatureResponseType.java index 24963850..38fb3f6a 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateCMSSignatureResponseType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateCMSSignatureResponseType.java @@ -31,10 +31,10 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateHashInfoRequestType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateHashInfoRequestType.java index 4e424562..81000279 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateHashInfoRequestType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateHashInfoRequestType.java @@ -31,12 +31,12 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateHashInfoResponseType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateHashInfoResponseType.java index 4b4100db..1c814fc5 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateHashInfoResponseType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateHashInfoResponseType.java @@ -31,11 +31,11 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateHashRequestType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateHashRequestType.java index 602beec0..0f8325a8 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateHashRequestType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateHashRequestType.java @@ -33,10 +33,10 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateHashResponseType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateHashResponseType.java index da447791..a818db30 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateHashResponseType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateHashResponseType.java @@ -33,10 +33,10 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateXMLSignatureRequestType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateXMLSignatureRequestType.java index eec48374..3a1e610c 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateXMLSignatureRequestType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateXMLSignatureRequestType.java @@ -33,12 +33,12 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateXMLSignatureResponseType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateXMLSignatureResponseType.java index 92927be8..8b0be71d 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateXMLSignatureResponseType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateXMLSignatureResponseType.java @@ -31,10 +31,10 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlType; import org.w3c.dom.Element; diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/DSAKeyValueType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/DSAKeyValueType.java index 68ac3965..e9716da0 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/DSAKeyValueType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/DSAKeyValueType.java @@ -31,10 +31,10 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/DataObjectAssociationType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/DataObjectAssociationType.java index 336553ec..7587e8b1 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/DataObjectAssociationType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/DataObjectAssociationType.java @@ -31,10 +31,10 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/DataObjectInfoType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/DataObjectInfoType.java index 77be232c..a9003118 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/DataObjectInfoType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/DataObjectInfoType.java @@ -33,11 +33,11 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/DecryptCMSRequestType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/DecryptCMSRequestType.java index f28fb647..0947fba5 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/DecryptCMSRequestType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/DecryptCMSRequestType.java @@ -31,11 +31,11 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/DecryptCMSResponseType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/DecryptCMSResponseType.java index ddc5b491..c54c5514 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/DecryptCMSResponseType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/DecryptCMSResponseType.java @@ -31,10 +31,10 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/DecryptXMLRequestType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/DecryptXMLRequestType.java index f923cb73..ee0f881a 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/DecryptXMLRequestType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/DecryptXMLRequestType.java @@ -33,11 +33,11 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/DecryptXMLResponseType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/DecryptXMLResponseType.java index de1a8101..8629bd9b 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/DecryptXMLResponseType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/DecryptXMLResponseType.java @@ -33,13 +33,13 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/DigestMethodType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/DigestMethodType.java index 6f179c0b..2cfb8baf 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/DigestMethodType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/DigestMethodType.java @@ -33,13 +33,13 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; import org.w3c.dom.Element; diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/EncryptCMSRequestType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/EncryptCMSRequestType.java index 88acd2ee..64da724f 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/EncryptCMSRequestType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/EncryptCMSRequestType.java @@ -33,11 +33,11 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/EncryptCMSResponseType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/EncryptCMSResponseType.java index 2d42b287..e0f65ead 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/EncryptCMSResponseType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/EncryptCMSResponseType.java @@ -31,10 +31,10 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/EncryptXMLRequest.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/EncryptXMLRequest.java index 20f23949..50789a72 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/EncryptXMLRequest.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/EncryptXMLRequest.java @@ -31,10 +31,10 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/EncryptXMLRequestType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/EncryptXMLRequestType.java index a4e8c5d6..6c853a81 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/EncryptXMLRequestType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/EncryptXMLRequestType.java @@ -33,11 +33,11 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/EncryptXMLResponseType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/EncryptXMLResponseType.java index 2376126b..1ceb5862 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/EncryptXMLResponseType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/EncryptXMLResponseType.java @@ -33,11 +33,11 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; import org.w3c.dom.Element; diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/EncryptedDataType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/EncryptedDataType.java index b7057d23..042a2854 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/EncryptedDataType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/EncryptedDataType.java @@ -31,12 +31,12 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/EncryptionInfoType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/EncryptionInfoType.java index 903f839e..826c6788 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/EncryptionInfoType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/EncryptionInfoType.java @@ -34,14 +34,14 @@ package at.gv.egiz.sl.schema; import java.math.BigInteger; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ErrorResponseType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ErrorResponseType.java index f3fa78f6..6073c1cf 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ErrorResponseType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ErrorResponseType.java @@ -31,10 +31,10 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ExcludedByteRangeType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ExcludedByteRangeType.java index 25dc41d2..26b1ab2a 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ExcludedByteRangeType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ExcludedByteRangeType.java @@ -32,11 +32,11 @@ package at.gv.egiz.sl.schema; import java.math.BigInteger; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/GetPropertiesRequest.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/GetPropertiesRequest.java index 8e3f420b..f63bc2cb 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/GetPropertiesRequest.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/GetPropertiesRequest.java @@ -31,10 +31,10 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/GetPropertiesRequestType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/GetPropertiesRequestType.java index 7d934df0..c4ad0ad3 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/GetPropertiesRequestType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/GetPropertiesRequestType.java @@ -31,10 +31,10 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/GetPropertiesResponseType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/GetPropertiesResponseType.java index b2ee79a4..5b7cccef 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/GetPropertiesResponseType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/GetPropertiesResponseType.java @@ -33,14 +33,14 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/GetStatusRequestType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/GetStatusRequestType.java index 1a9f04e8..2c843064 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/GetStatusRequestType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/GetStatusRequestType.java @@ -32,11 +32,11 @@ package at.gv.egiz.sl.schema; import java.math.BigInteger; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/GetStatusResponseType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/GetStatusResponseType.java index af624747..65816a85 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/GetStatusResponseType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/GetStatusResponseType.java @@ -31,10 +31,10 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/HashDataType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/HashDataType.java index 8e35bc85..e7f56396 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/HashDataType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/HashDataType.java @@ -31,10 +31,10 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxAssocArrayPairType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxAssocArrayPairType.java index 49dbf602..54c90e00 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxAssocArrayPairType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxAssocArrayPairType.java @@ -31,10 +31,10 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxAvailableRequestType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxAvailableRequestType.java index f6836868..ef23802e 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxAvailableRequestType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxAvailableRequestType.java @@ -31,9 +31,9 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxAvailableResponseType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxAvailableResponseType.java index f09ce092..ee88693d 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxAvailableResponseType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxAvailableResponseType.java @@ -33,12 +33,12 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxCreateRequestType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxCreateRequestType.java index 8cc8e2ae..ec4909cb 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxCreateRequestType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxCreateRequestType.java @@ -31,12 +31,12 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxCreateResponseType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxCreateResponseType.java index 07288073..93e43102 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxCreateResponseType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxCreateResponseType.java @@ -31,9 +31,9 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxDeleteRequestType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxDeleteRequestType.java index abcc10a8..e87da554 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxDeleteRequestType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxDeleteRequestType.java @@ -31,12 +31,12 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxDeleteResponseType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxDeleteResponseType.java index 7fed6cb8..0352412a 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxDeleteResponseType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxDeleteResponseType.java @@ -31,9 +31,9 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxReadDataAssocArrayType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxReadDataAssocArrayType.java index 9fa35c96..99d21369 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxReadDataAssocArrayType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxReadDataAssocArrayType.java @@ -33,12 +33,12 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxReadParamsAssocArrayType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxReadParamsAssocArrayType.java index ac1bd406..a9c9c565 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxReadParamsAssocArrayType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxReadParamsAssocArrayType.java @@ -31,13 +31,13 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxReadParamsBinaryFileType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxReadParamsBinaryFileType.java index d3a1789e..c9ece684 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxReadParamsBinaryFileType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxReadParamsBinaryFileType.java @@ -31,10 +31,10 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxReadRequestType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxReadRequestType.java index c7fb5432..b0ddfe99 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxReadRequestType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxReadRequestType.java @@ -31,12 +31,12 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxReadResponseType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxReadResponseType.java index a96acfe1..066895c8 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxReadResponseType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxReadResponseType.java @@ -31,10 +31,10 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxTypeType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxTypeType.java index ef12e13f..dd72b95d 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxTypeType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxTypeType.java @@ -31,9 +31,9 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxUpdateParamsAssocArrayType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxUpdateParamsAssocArrayType.java index 99c46ada..755f8ef6 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxUpdateParamsAssocArrayType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxUpdateParamsAssocArrayType.java @@ -31,14 +31,14 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxUpdateRequestType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxUpdateRequestType.java index e3303fdc..0b3165cd 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxUpdateRequestType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxUpdateRequestType.java @@ -31,12 +31,12 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxUpdateResponseType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxUpdateResponseType.java index 3311a767..b404692b 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxUpdateResponseType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/InfoboxUpdateResponseType.java @@ -31,9 +31,9 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/KeyInfoType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/KeyInfoType.java index 65b749be..0ab02abb 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/KeyInfoType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/KeyInfoType.java @@ -33,19 +33,19 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.w3c.dom.Element; diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/KeyValueType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/KeyValueType.java index 8d23b6c4..fa9ddefa 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/KeyValueType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/KeyValueType.java @@ -33,14 +33,14 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlType; import org.w3c.dom.Element; diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ManifestRefsCheckResultInfoType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ManifestRefsCheckResultInfoType.java index 692adecb..358cb9c1 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ManifestRefsCheckResultInfoType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ManifestRefsCheckResultInfoType.java @@ -34,14 +34,14 @@ package at.gv.egiz.sl.schema; import java.math.BigInteger; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlType; import org.w3c.dom.Element; diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ManifestRefsCheckResultType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ManifestRefsCheckResultType.java index 1093de97..5ec2c548 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ManifestRefsCheckResultType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ManifestRefsCheckResultType.java @@ -32,11 +32,11 @@ package at.gv.egiz.sl.schema; import java.math.BigInteger; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ManifestType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ManifestType.java index d2bfa862..2755d80b 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ManifestType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ManifestType.java @@ -33,15 +33,15 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/MetaInfoType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/MetaInfoType.java index 662626ec..7fab33ad 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/MetaInfoType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/MetaInfoType.java @@ -33,13 +33,13 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/NullOperationRequestType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/NullOperationRequestType.java index 6d594ce1..35013073 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/NullOperationRequestType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/NullOperationRequestType.java @@ -31,9 +31,9 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/NullOperationResponseType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/NullOperationResponseType.java index bb8dfbb8..85137bf3 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/NullOperationResponseType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/NullOperationResponseType.java @@ -31,9 +31,9 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ObjectFactory.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ObjectFactory.java index 6c40088b..6ea7aaf1 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ObjectFactory.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ObjectFactory.java @@ -32,9 +32,9 @@ package at.gv.egiz.sl.schema; import java.math.BigInteger; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlElementDecl; +import jakarta.xml.bind.annotation.XmlRegistry; import javax.xml.namespace.QName; diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ObjectType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ObjectType.java index de7cb503..00be46eb 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ObjectType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ObjectType.java @@ -33,16 +33,16 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.w3c.dom.Element; diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/PGPDataType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/PGPDataType.java index 6a33f3f8..131393e9 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/PGPDataType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/PGPDataType.java @@ -33,13 +33,13 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlType; import org.w3c.dom.Element; diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/QualifiedBoxIdentifierType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/QualifiedBoxIdentifierType.java index 65d1cffb..07c4a772 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/QualifiedBoxIdentifierType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/QualifiedBoxIdentifierType.java @@ -31,13 +31,13 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/RSAKeyValueType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/RSAKeyValueType.java index 11fced4b..d01ebc2f 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/RSAKeyValueType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/RSAKeyValueType.java @@ -31,10 +31,10 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ReferenceType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ReferenceType.java index 576a4e12..1bc14106 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ReferenceType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ReferenceType.java @@ -31,15 +31,15 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ReferencesCheckResultInfoType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ReferencesCheckResultInfoType.java index 53847b71..3c4eada6 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ReferencesCheckResultInfoType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ReferencesCheckResultInfoType.java @@ -34,13 +34,13 @@ package at.gv.egiz.sl.schema; import java.math.BigInteger; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlType; import org.w3c.dom.Element; diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ReferencesCheckResultType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ReferencesCheckResultType.java index e98e9a58..7942f1fd 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ReferencesCheckResultType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ReferencesCheckResultType.java @@ -32,11 +32,11 @@ package at.gv.egiz.sl.schema; import java.math.BigInteger; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/RequesterIDType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/RequesterIDType.java index 23b15d7c..1850b625 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/RequesterIDType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/RequesterIDType.java @@ -31,11 +31,11 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ResetColdType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ResetColdType.java index 19368057..315d7089 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ResetColdType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ResetColdType.java @@ -31,9 +31,9 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ResetType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ResetType.java index 25571cb7..2c799a26 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ResetType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ResetType.java @@ -31,10 +31,10 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ResponseAPDUType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ResponseAPDUType.java index 748c086d..f6bd7a74 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ResponseAPDUType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ResponseAPDUType.java @@ -32,11 +32,11 @@ package at.gv.egiz.sl.schema; import java.math.BigInteger; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ResultApplElement.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ResultApplElement.java index f7071ce4..9f899179 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ResultApplElement.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ResultApplElement.java @@ -32,10 +32,10 @@ package at.gv.egiz.sl.schema; import java.math.BigInteger; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ResultElement.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ResultElement.java index 0d511989..a43b07cd 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ResultElement.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ResultElement.java @@ -32,10 +32,10 @@ package at.gv.egiz.sl.schema; import java.math.BigInteger; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/RetrievalMethodType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/RetrievalMethodType.java index 1210281b..b67441a1 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/RetrievalMethodType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/RetrievalMethodType.java @@ -31,12 +31,12 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ReturnResultType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ReturnResultType.java index bb44dd60..aae69173 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ReturnResultType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ReturnResultType.java @@ -31,9 +31,9 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SPKIDataType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SPKIDataType.java index 95ef23d5..bdf6daa6 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SPKIDataType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SPKIDataType.java @@ -33,12 +33,12 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlType; import org.w3c.dom.Element; diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ScriptElement.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ScriptElement.java index 16591576..cc88c43a 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ScriptElement.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ScriptElement.java @@ -33,11 +33,11 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElements; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElements; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignatureInfoCreationType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignatureInfoCreationType.java index f0c0cdc6..f69ce01c 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignatureInfoCreationType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignatureInfoCreationType.java @@ -34,15 +34,15 @@ package at.gv.egiz.sl.schema; import java.math.BigInteger; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignatureInfoVerificationType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignatureInfoVerificationType.java index 6fc8a860..da7f27fd 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignatureInfoVerificationType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignatureInfoVerificationType.java @@ -31,13 +31,13 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignatureMethodType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignatureMethodType.java index abf3db54..14afea57 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignatureMethodType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignatureMethodType.java @@ -34,15 +34,15 @@ package at.gv.egiz.sl.schema; import java.math.BigInteger; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignaturePropertiesType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignaturePropertiesType.java index 749a5308..3eff70fb 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignaturePropertiesType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignaturePropertiesType.java @@ -33,15 +33,15 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignaturePropertyType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignaturePropertyType.java index ec580768..17ab7096 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignaturePropertyType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignaturePropertyType.java @@ -33,16 +33,16 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.w3c.dom.Element; diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignatureType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignatureType.java index 78d98b08..c8d3170c 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignatureType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignatureType.java @@ -33,15 +33,15 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignatureValueType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignatureValueType.java index 27801d15..0254a5c9 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignatureValueType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignatureValueType.java @@ -31,15 +31,15 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignedInfoType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignedInfoType.java index c7c93520..17f7cfc8 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignedInfoType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignedInfoType.java @@ -33,15 +33,15 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ToBeEncryptedType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ToBeEncryptedType.java index ba1b6502..d61b2eac 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ToBeEncryptedType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ToBeEncryptedType.java @@ -31,14 +31,14 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/TokenStatusType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/TokenStatusType.java index 64fcee0d..9281a4c8 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/TokenStatusType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/TokenStatusType.java @@ -31,9 +31,9 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/TransformType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/TransformType.java index dda24b88..16cc8db1 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/TransformType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/TransformType.java @@ -33,15 +33,15 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; import org.w3c.dom.Element; diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/TransformsInfoType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/TransformsInfoType.java index 99bb1207..eb79c520 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/TransformsInfoType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/TransformsInfoType.java @@ -31,10 +31,10 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/TransformsType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/TransformsType.java index 59e1bdb6..37334700 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/TransformsType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/TransformsType.java @@ -33,10 +33,10 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/UserConfirmationSimpleType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/UserConfirmationSimpleType.java index 85d5fed4..d0c10f60 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/UserConfirmationSimpleType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/UserConfirmationSimpleType.java @@ -31,9 +31,9 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/UserConfirmationType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/UserConfirmationType.java index c8a4f706..723f8e69 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/UserConfirmationType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/UserConfirmationType.java @@ -31,11 +31,11 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/VerificationResultType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/VerificationResultType.java index 6d61e1c1..13f6b9c9 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/VerificationResultType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/VerificationResultType.java @@ -31,10 +31,10 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/VerifyCMSSignatureRequestType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/VerifyCMSSignatureRequestType.java index c607c002..140b3766 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/VerifyCMSSignatureRequestType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/VerifyCMSSignatureRequestType.java @@ -33,12 +33,12 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; import javax.xml.datatype.XMLGregorianCalendar; diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/VerifyCMSSignatureResponseType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/VerifyCMSSignatureResponseType.java index 504023fb..bead821f 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/VerifyCMSSignatureResponseType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/VerifyCMSSignatureResponseType.java @@ -33,12 +33,12 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/VerifyHashInfoRequestType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/VerifyHashInfoRequestType.java index d076014a..6c087249 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/VerifyHashInfoRequestType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/VerifyHashInfoRequestType.java @@ -31,11 +31,11 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/VerifyHashRequestType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/VerifyHashRequestType.java index 1ca9b7f7..9dd0fad2 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/VerifyHashRequestType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/VerifyHashRequestType.java @@ -33,10 +33,10 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/VerifyHashResponseType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/VerifyHashResponseType.java index c9dad911..af987cf6 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/VerifyHashResponseType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/VerifyHashResponseType.java @@ -33,10 +33,10 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/VerifyXMLSignatureRequestType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/VerifyXMLSignatureRequestType.java index 799c1628..28d78dcd 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/VerifyXMLSignatureRequestType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/VerifyXMLSignatureRequestType.java @@ -33,11 +33,11 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; import javax.xml.datatype.XMLGregorianCalendar; diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/VerifyXMLSignatureResponseType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/VerifyXMLSignatureResponseType.java index 17121cd7..05ab3dc8 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/VerifyXMLSignatureResponseType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/VerifyXMLSignatureResponseType.java @@ -33,10 +33,10 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/X509DataType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/X509DataType.java index d377fb74..7fbf54ac 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/X509DataType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/X509DataType.java @@ -33,13 +33,13 @@ package at.gv.egiz.sl.schema; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlType; import org.w3c.dom.Element; diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/X509IssuerSerialType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/X509IssuerSerialType.java index c0fec8a2..1b8da46b 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/X509IssuerSerialType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/X509IssuerSerialType.java @@ -32,10 +32,10 @@ package at.gv.egiz.sl.schema; import java.math.BigInteger; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/XMLContentType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/XMLContentType.java index 905109e1..ded3cac0 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/XMLContentType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/XMLContentType.java @@ -31,12 +31,12 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/XMLRecipientPublicKeyType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/XMLRecipientPublicKeyType.java index cf6c2329..9e3fa7de 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/XMLRecipientPublicKeyType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/XMLRecipientPublicKeyType.java @@ -31,10 +31,10 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/XMLToBeEncryptedNewContentType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/XMLToBeEncryptedNewContentType.java index c670b020..f7d2a69f 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/XMLToBeEncryptedNewContentType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/XMLToBeEncryptedNewContentType.java @@ -31,11 +31,11 @@ package at.gv.egiz.sl.schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/XMLToBeEncryptedNewType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/XMLToBeEncryptedNewType.java index 4d61fcb2..93bc55a9 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/XMLToBeEncryptedNewType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/XMLToBeEncryptedNewType.java @@ -32,14 +32,14 @@ package at.gv.egiz.sl.schema; import java.math.BigInteger; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/package-info.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/package-info.java index fde7efcd..5a1cd429 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/package-info.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/package-info.java @@ -28,5 +28,5 @@ // Generated on: 2014.04.22 at 04:01:10 PM CEST // -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.buergerkarte.at/namespaces/securitylayer/1.2#", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.buergerkarte.at/namespaces/securitylayer/1.2#", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package at.gv.egiz.sl.schema; diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/BKUSLConnector.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/BKUSLConnector.java index 2e5c972f..72aa1204 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/BKUSLConnector.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/BKUSLConnector.java @@ -30,8 +30,8 @@ import java.nio.charset.Charset; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; import org.apache.http.Header; import org.apache.http.HttpResponse; diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/SLMarschaller.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/SLMarschaller.java index 8b9991fd..e25dba72 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/SLMarschaller.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/SLMarschaller.java @@ -28,10 +28,10 @@ import java.io.OutputStream; import java.io.StringReader; import java.io.StringWriter; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl20/utils/SL20JSONExtractorUtils.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl20/utils/SL20JSONExtractorUtils.java index 8eb7211f..03c7b0a1 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl20/utils/SL20JSONExtractorUtils.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl20/utils/SL20JSONExtractorUtils.java @@ -231,11 +231,10 @@ public class SL20JSONExtractorUtils { //dummy code try { String[] signedPayload = encryptedResult.toString().split("\\."); - JsonElement payLoad = new JsonParser().parse(new String(Base64Url.decodeToUtf8String(signedPayload[1]))); - return payLoad; + return JsonParser.parseString(Base64Url.decodeToUtf8String(signedPayload[1])); } catch (Exception e1) { - log.debug("DummyCode FAILED, Reason: " + e1.getMessage() + " Ignore it ..."); + log.debug("DummyCode FAILED, Reason: {} Ignore it ...", e1.getMessage()); throw new SL20Exception(e.getMessage(), e); } @@ -290,7 +289,7 @@ public class SL20JSONExtractorUtils { + " Starting backup process ... "); String[] split = sl20SignedPayload.getAsString().split("\\."); if (split.length == 3) { - JsonElement payLoad = new JsonParser().parse(new String(Base64Url.decodeToUtf8String(split[1]))); + JsonElement payLoad = JsonParser.parseString(Base64Url.decodeToUtf8String(split[1])); log.info("Signature verification FAILED with reason: " + e.getMessage() + " Use plain result as it is"); return new VerificationResult(payLoad.getAsJsonObject()); @@ -308,7 +307,7 @@ public class SL20JSONExtractorUtils { log.info("Received signed SL20 response, but verification IS NOT required and NOT CONFIGURATED. Skip signature verification ... "); String[] split = sl20SignedPayload.getAsString().split("\\."); if (split.length == 3) { - JsonElement payLoad = new JsonParser().parse(new String(Base64Url.decodeToUtf8String(split[1]))); + JsonElement payLoad = JsonParser.parseString(Base64Url.decodeToUtf8String(split[1])); return new VerificationResult(payLoad.getAsJsonObject()); } else { @@ -345,7 +344,7 @@ public class SL20JSONExtractorUtils { } String sl20RespString = new URIBuilder(locationHeader[0].getValue()).getQueryParams().get(0).getValue(); - sl20Resp = new JsonParser().parse(Base64Url.encode((sl20RespString.getBytes()))).getAsJsonObject(); + sl20Resp = JsonParser.parseString(Base64Url.encode((sl20RespString.getBytes()))).getAsJsonObject(); } else if (httpResp.getStatusLine().getStatusCode() == 200) { if (!httpResp.getEntity().getContentType().getValue().startsWith("application/json")) { @@ -383,7 +382,7 @@ public class SL20JSONExtractorUtils { if (resp != null && resp.getContent() != null) { String htmlRespBody = EntityUtils.toString(resp); try { - JsonElement sl20Resp = new JsonParser().parse(htmlRespBody); + JsonElement sl20Resp = JsonParser.parseString(htmlRespBody); if (sl20Resp != null && sl20Resp.isJsonObject()) { return sl20Resp.getAsJsonObject(); diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/table/Style.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/table/Style.java index e2fa7062..d575b6bd 100644 --- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/table/Style.java +++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/table/Style.java @@ -54,6 +54,7 @@ import java.awt.color.ICC_ColorSpace; import java.awt.color.ICC_Profile; import java.awt.color.ICC_ProfileRGB; import java.io.Serializable; +import java.util.Set; /** * This class implements an abstract style definiton used in tables or table entrys. Predefined @@ -202,6 +203,20 @@ public class Style implements Serializable { */ public final static String STRIKETHRU = "STRIKETHRU"; + /** + * Valid horizontal alignment values + */ + private static final Set<String> VALID_HALIGN_VALUES = Set.of(LEFT, CENTER, RIGHT); + + /** + * Valid vertical alignment values + */ + private static final Set<String> VALID_VALIGN_VALUES = Set.of(TOP, MIDDLE, BOTTOM); + + /** + * Valid value horizontal alignment values (includes LINECENTER) + */ + private static final Set<String> VALID_VALUE_HALIGN_VALUES = Set.of(LEFT, CENTER, RIGHT, LINECENTER); /** * all paddings initialized with the default padding value (1) @@ -286,33 +301,33 @@ public class Style implements Serializable { } if (HALIGN.equals(id)) { - if (LEFT.equals(value) || CENTER.equals(value) || RIGHT.equals(value)) { + if (VALID_HALIGN_VALUES.contains(value)) { hAlign_ = value; } } if (VALIGN.equals(id)) { - if (TOP.equals(value) || MIDDLE.equals(value) || BOTTOM.equals(value)) { + if (VALID_VALIGN_VALUES.contains(value)) { vAlign_ = value; } } //Set new align for horziontal valign of lineCenter if (VALUEHALIGN.equals(id)) { - if (LEFT.equals(value) || CENTER.equals(value) || RIGHT.equals(value)||LINECENTER.equals(value)) { + if (VALID_VALUE_HALIGN_VALUES.contains(value)) { valueHAlign_ = value; } } if (VALUEVALIGN.equals(id)) { - if (TOP.equals(value) || MIDDLE.equals(value) || BOTTOM.equals(value)) { + if (VALID_VALIGN_VALUES.contains(value)) { valueVAlign_ = value; } } if (IMAGEHALIGN.equals(id)) { - if (LEFT.equals(value) || CENTER.equals(value) || RIGHT.equals(value)) { + if (VALID_HALIGN_VALUES.contains(value)) { imageHAlign_ = value; } } if (IMAGEVALIGN.equals(id)) { - if (TOP.equals(value) || MIDDLE.equals(value) || BOTTOM.equals(value)) { + if (VALID_VALIGN_VALUES.contains(value)) { imageVAlign_ = value; } } diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/table/Table.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/table/Table.java index 12d0e2ee..77266488 100644 --- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/table/Table.java +++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/table/Table.java @@ -51,7 +51,6 @@ package at.knowcenter.wag.egov.egiz.table; import java.io.Serializable; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import at.gv.egiz.pdfas.common.exceptions.PdfAsSettingsException; @@ -81,7 +80,7 @@ public class Table implements Serializable /** * The row definitions. */ - private Map<String, ArrayList<Entry>> rows_ = new HashMap<String, ArrayList<Entry>>(); + private Map<String, ArrayList<Entry>> rows_ = new HashMap<>(); /** * The table width. @@ -197,7 +196,7 @@ public class Table implements Serializable */ public ArrayList<ArrayList<Entry>> getRows() { - ArrayList<ArrayList<Entry>> rows = new ArrayList<ArrayList<Entry>>(); + ArrayList<ArrayList<Entry>> rows = new ArrayList<>(); for (int row_idx = 1; row_idx <= rows_.size(); row_idx++) { ArrayList<Entry> row = rows_.get(String.valueOf(row_idx)); @@ -232,16 +231,14 @@ public class Table implements Serializable private int calculateRowSize(ArrayList<Entry> newrow) { int colCount = 0; - for(int i = 0; i < newrow.size(); i++) { - colCount += newrow.get(i).getColSpan(); + for (Entry entry : newrow) { + colCount += entry.getColSpan(); } return colCount; } private void recalculateMaxCol() { - Iterator<ArrayList<Entry>> rowIt = getRows().iterator(); - while(rowIt.hasNext()) { - ArrayList<Entry> row = rowIt.next(); + for (ArrayList<Entry> row : getRows()) { calculateMaxCols(row); } } @@ -253,9 +250,7 @@ public class Table implements Serializable * @throws PdfAsSettingsException */ public void normalize() throws PdfAsSettingsException { - Iterator<ArrayList<Entry>> rowIt = getRows().iterator(); - while(rowIt.hasNext()) { - ArrayList<Entry> row = rowIt.next(); + for (ArrayList<Entry> row : getRows()) { // This row fits just fine if(row.size() == maxCols_) { @@ -293,20 +288,21 @@ public class Table implements Serializable */ public String toString() { - String the_string = "\n#### TABLE " + name_ + " BEGIN #####"; - the_string += " Width:" + width_ + " max cols:" + maxCols_ + " cols:" + colsRelativeWith_; - the_string += "\nStyle:" + style_; + StringBuilder sb = new StringBuilder(); + sb.append("\n#### TABLE ").append(name_).append(" BEGIN #####"); + sb.append(" Width:").append(width_).append(" max cols:").append(maxCols_).append(" cols:").append(colsRelativeWith_); + sb.append("\nStyle:").append(style_); ArrayList<ArrayList<Entry>> rows = getRows(); for (int row_idx = 0; row_idx < rows.size(); row_idx++) { ArrayList<Entry> row = rows.get(row_idx); String row_prefix = "\n ++ ROW " + row_idx + " ++ "; - for (int entry_idx = 0; entry_idx < row.size(); entry_idx++) + for (Entry entry : row) { - the_string += row_prefix + row.get(entry_idx).toString(); + sb.append(row_prefix).append(entry.toString()); } } - the_string += "\n#### TABLE " + name_ + " END #####"; - return the_string; + sb.append("\n#### TABLE ").append(name_).append(" END #####"); + return sb.toString(); } } |