From 7fe464cc98d714179b907c142bdd2fabfd009aa3 Mon Sep 17 00:00:00 2001 From: bschnalzer Date: Wed, 9 Aug 2017 13:56:12 +0200 Subject: Fixed problem with PAdES Signatures, removed some attributes from CAdES signatures which are not required, minor bug fixes, implemented new style (lineCenter) --- .../namespace/moa/_20020822/ObjectFactory.java | 314 ++++++++++----------- 1 file changed, 157 insertions(+), 157 deletions(-) (limited to 'pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/ObjectFactory.java') diff --git a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/ObjectFactory.java b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/ObjectFactory.java index b3ef1238..0b8b066e 100644 --- a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/ObjectFactory.java +++ b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/ObjectFactory.java @@ -27,19 +27,19 @@ import org.w3._2000._09.xmldsig.KeyInfoType; @XmlRegistry public class ObjectFactory { - private final static QName _CreateXMLSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "CreateXMLSignatureResponse"); private final static QName _IssuingCountry_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "IssuingCountry"); + private final static QName _PublicAuthority_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "PublicAuthority"); + private final static QName _VerifyXMLSignatureRequest_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "VerifyXMLSignatureRequest"); private final static QName _VerifyCMSSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "VerifyCMSSignatureResponse"); private final static QName _CreateCMSSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "CreateCMSSignatureResponse"); - private final static QName _SupplementProfile_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "SupplementProfile"); - private final static QName _VerifyXMLSignatureRequest_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "VerifyXMLSignatureRequest"); - private final static QName _PublicAuthority_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "PublicAuthority"); - private final static QName _ErrorResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "ErrorResponse"); - private final static QName _VerifyXMLSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "VerifyXMLSignatureResponse"); private final static QName _Supplement_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "Supplement"); + private final static QName _VerifyXMLSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "VerifyXMLSignatureResponse"); + private final static QName _ErrorResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "ErrorResponse"); + private final static QName _CreateXMLSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "CreateXMLSignatureResponse"); + private final static QName _SupplementProfile_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "SupplementProfile"); + private final static QName _VerifyCMSSignatureResponseTypeSignatureCheck_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "SignatureCheck"); private final static QName _VerifyCMSSignatureResponseTypeCertificateCheck_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "CertificateCheck"); private final static QName _VerifyCMSSignatureResponseTypeSignerInfo_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "SignerInfo"); - private final static QName _VerifyCMSSignatureResponseTypeSignatureCheck_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "SignatureCheck"); /** * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.gv.e_government.reference.namespace.moa._20020822 @@ -97,11 +97,11 @@ public class ObjectFactory { } /** - * Create an instance of {@link CreateXMLSignatureResponseType } + * Create an instance of {@link CreateXMLSignatureRequestType.SingleSignatureInfo } * */ - public CreateXMLSignatureResponseType createCreateXMLSignatureResponseType() { - return new CreateXMLSignatureResponseType(); + public CreateXMLSignatureRequestType.SingleSignatureInfo createCreateXMLSignatureRequestTypeSingleSignatureInfo() { + return new CreateXMLSignatureRequestType.SingleSignatureInfo(); } /** @@ -113,27 +113,51 @@ public class ObjectFactory { } /** - * Create an instance of {@link CreateXMLSignatureRequestType.SingleSignatureInfo } + * Create an instance of {@link CreateXMLSignatureResponseType } * */ - public CreateXMLSignatureRequestType.SingleSignatureInfo createCreateXMLSignatureRequestTypeSingleSignatureInfo() { - return new CreateXMLSignatureRequestType.SingleSignatureInfo(); + public CreateXMLSignatureResponseType createCreateXMLSignatureResponseType() { + return new CreateXMLSignatureResponseType(); } /** - * Create an instance of {@link VerifyXMLSignatureResponseType } + * Create an instance of {@link QualifiedCertificate } * */ - public VerifyXMLSignatureResponseType createVerifyXMLSignatureResponseType() { - return new VerifyXMLSignatureResponseType(); + public QualifiedCertificate createQualifiedCertificate() { + return new QualifiedCertificate(); } /** - * Create an instance of {@link PublicAuthorityType } + * Create an instance of {@link XMLDataObjectAssociationType } * */ - public PublicAuthorityType createPublicAuthorityType() { - return new PublicAuthorityType(); + public XMLDataObjectAssociationType createXMLDataObjectAssociationType() { + return new XMLDataObjectAssociationType(); + } + + /** + * Create an instance of {@link CreateCMSSignatureResponseType } + * + */ + public CreateCMSSignatureResponseType createCreateCMSSignatureResponseType() { + return new CreateCMSSignatureResponseType(); + } + + /** + * Create an instance of {@link CreateTransformsInfoProfile } + * + */ + public CreateTransformsInfoProfile createCreateTransformsInfoProfile() { + return new CreateTransformsInfoProfile(); + } + + /** + * Create an instance of {@link TransformsInfoType } + * + */ + public TransformsInfoType createTransformsInfoType() { + return new TransformsInfoType(); } /** @@ -161,27 +185,19 @@ public class ObjectFactory { } /** - * Create an instance of {@link XMLDataObjectAssociationType } - * - */ - public XMLDataObjectAssociationType createXMLDataObjectAssociationType() { - return new XMLDataObjectAssociationType(); - } - - /** - * Create an instance of {@link QualifiedCertificate } + * Create an instance of {@link VerifyCMSSignatureResponseType } * */ - public QualifiedCertificate createQualifiedCertificate() { - return new QualifiedCertificate(); + public VerifyCMSSignatureResponseType createVerifyCMSSignatureResponseType() { + return new VerifyCMSSignatureResponseType(); } /** - * Create an instance of {@link CreateXMLSignatureRequest } + * Create an instance of {@link SecureSignatureCreationDevice } * */ - public CreateXMLSignatureRequest createCreateXMLSignatureRequest() { - return new CreateXMLSignatureRequest(); + public SecureSignatureCreationDevice createSecureSignatureCreationDevice() { + return new SecureSignatureCreationDevice(); } /** @@ -193,19 +209,19 @@ public class ObjectFactory { } /** - * Create an instance of {@link CreateCMSSignatureRequest } + * Create an instance of {@link ErrorResponseType } * */ - public CreateCMSSignatureRequest createCreateCMSSignatureRequest() { - return new CreateCMSSignatureRequest(); + public ErrorResponseType createErrorResponseType() { + return new ErrorResponseType(); } /** - * Create an instance of {@link ErrorResponseType } + * Create an instance of {@link VerifyXMLSignatureResponseType } * */ - public ErrorResponseType createErrorResponseType() { - return new ErrorResponseType(); + public VerifyXMLSignatureResponseType createVerifyXMLSignatureResponseType() { + return new VerifyXMLSignatureResponseType(); } /** @@ -225,75 +241,51 @@ public class ObjectFactory { } /** - * Create an instance of {@link CreateCMSSignatureResponseType } - * - */ - public CreateCMSSignatureResponseType createCreateCMSSignatureResponseType() { - return new CreateCMSSignatureResponseType(); - } - - /** - * Create an instance of {@link SecureSignatureCreationDevice } - * - */ - public SecureSignatureCreationDevice createSecureSignatureCreationDevice() { - return new SecureSignatureCreationDevice(); - } - - /** - * Create an instance of {@link VerifyCMSSignatureResponseType } - * - */ - public VerifyCMSSignatureResponseType createVerifyCMSSignatureResponseType() { - return new VerifyCMSSignatureResponseType(); - } - - /** - * Create an instance of {@link CreateTransformsInfoProfile } + * Create an instance of {@link CreateXMLSignatureRequest } * */ - public CreateTransformsInfoProfile createCreateTransformsInfoProfile() { - return new CreateTransformsInfoProfile(); + public CreateXMLSignatureRequest createCreateXMLSignatureRequest() { + return new CreateXMLSignatureRequest(); } /** - * Create an instance of {@link TransformsInfoType } + * Create an instance of {@link CreateCMSSignatureRequest } * */ - public TransformsInfoType createTransformsInfoType() { - return new TransformsInfoType(); + public CreateCMSSignatureRequest createCreateCMSSignatureRequest() { + return new CreateCMSSignatureRequest(); } /** - * Create an instance of {@link CMSContentBaseType } + * Create an instance of {@link PublicAuthorityType } * */ - public CMSContentBaseType createCMSContentBaseType() { - return new CMSContentBaseType(); + public PublicAuthorityType createPublicAuthorityType() { + return new PublicAuthorityType(); } /** - * Create an instance of {@link ManifestRefsCheckResultType } + * Create an instance of {@link CheckResultType } * */ - public ManifestRefsCheckResultType createManifestRefsCheckResultType() { - return new ManifestRefsCheckResultType(); + public CheckResultType createCheckResultType() { + return new CheckResultType(); } /** - * Create an instance of {@link InputDataType } + * Create an instance of {@link ManifestRefsCheckResultInfoType } * */ - public InputDataType createInputDataType() { - return new InputDataType(); + public ManifestRefsCheckResultInfoType createManifestRefsCheckResultInfoType() { + return new ManifestRefsCheckResultInfoType(); } /** - * Create an instance of {@link CheckResultType } + * Create an instance of {@link XMLContentType } * */ - public CheckResultType createCheckResultType() { - return new CheckResultType(); + public XMLContentType createXMLContentType() { + return new XMLContentType(); } /** @@ -305,19 +297,11 @@ public class ObjectFactory { } /** - * Create an instance of {@link FinalDataMetaInfoType } - * - */ - public FinalDataMetaInfoType createFinalDataMetaInfoType() { - return new FinalDataMetaInfoType(); - } - - /** - * Create an instance of {@link ReferencesCheckResultInfoType } + * Create an instance of {@link VerifyTransformsDataType } * */ - public ReferencesCheckResultInfoType createReferencesCheckResultInfoType() { - return new ReferencesCheckResultInfoType(); + public VerifyTransformsDataType createVerifyTransformsDataType() { + return new VerifyTransformsDataType(); } /** @@ -329,11 +313,11 @@ public class ObjectFactory { } /** - * Create an instance of {@link XMLContentType } + * Create an instance of {@link FinalDataMetaInfoType } * */ - public XMLContentType createXMLContentType() { - return new XMLContentType(); + public FinalDataMetaInfoType createFinalDataMetaInfoType() { + return new FinalDataMetaInfoType(); } /** @@ -344,6 +328,14 @@ public class ObjectFactory { return new MetaInfoType(); } + /** + * Create an instance of {@link InputDataType } + * + */ + public InputDataType createInputDataType() { + return new InputDataType(); + } + /** * Create an instance of {@link ContentExLocRefBaseType } * @@ -361,27 +353,35 @@ public class ObjectFactory { } /** - * Create an instance of {@link ReferencesCheckResultType } + * Create an instance of {@link ContentOptionalRefType } * */ - public ReferencesCheckResultType createReferencesCheckResultType() { - return new ReferencesCheckResultType(); + public ContentOptionalRefType createContentOptionalRefType() { + return new ContentOptionalRefType(); } /** - * Create an instance of {@link ManifestRefsCheckResultInfoType } + * Create an instance of {@link CMSContentBaseType } * */ - public ManifestRefsCheckResultInfoType createManifestRefsCheckResultInfoType() { - return new ManifestRefsCheckResultInfoType(); + public CMSContentBaseType createCMSContentBaseType() { + return new CMSContentBaseType(); } /** - * Create an instance of {@link VerifyTransformsDataType } + * Create an instance of {@link ReferencesCheckResultInfoType } * */ - public VerifyTransformsDataType createVerifyTransformsDataType() { - return new VerifyTransformsDataType(); + public ReferencesCheckResultInfoType createReferencesCheckResultInfoType() { + return new ReferencesCheckResultInfoType(); + } + + /** + * Create an instance of {@link ReferencesCheckResultType } + * + */ + public ReferencesCheckResultType createReferencesCheckResultType() { + return new ReferencesCheckResultType(); } /** @@ -393,11 +393,11 @@ public class ObjectFactory { } /** - * Create an instance of {@link ContentOptionalRefType } + * Create an instance of {@link ManifestRefsCheckResultType } * */ - public ContentOptionalRefType createContentOptionalRefType() { - return new ContentOptionalRefType(); + public ManifestRefsCheckResultType createManifestRefsCheckResultType() { + return new ManifestRefsCheckResultType(); } /** @@ -441,11 +441,19 @@ public class ObjectFactory { } /** - * Create an instance of {@link CreateXMLSignatureResponseType.SignatureEnvironment } + * Create an instance of {@link CreateXMLSignatureRequestType.SingleSignatureInfo.DataObjectInfo } * */ - public CreateXMLSignatureResponseType.SignatureEnvironment createCreateXMLSignatureResponseTypeSignatureEnvironment() { - return new CreateXMLSignatureResponseType.SignatureEnvironment(); + public CreateXMLSignatureRequestType.SingleSignatureInfo.DataObjectInfo createCreateXMLSignatureRequestTypeSingleSignatureInfoDataObjectInfo() { + return new CreateXMLSignatureRequestType.SingleSignatureInfo.DataObjectInfo(); + } + + /** + * Create an instance of {@link CreateXMLSignatureRequestType.SingleSignatureInfo.CreateSignatureInfo } + * + */ + public CreateXMLSignatureRequestType.SingleSignatureInfo.CreateSignatureInfo createCreateXMLSignatureRequestTypeSingleSignatureInfoCreateSignatureInfo() { + return new CreateXMLSignatureRequestType.SingleSignatureInfo.CreateSignatureInfo(); } /** @@ -457,38 +465,39 @@ public class ObjectFactory { } /** - * Create an instance of {@link CreateXMLSignatureRequestType.SingleSignatureInfo.DataObjectInfo } + * Create an instance of {@link CreateXMLSignatureResponseType.SignatureEnvironment } * */ - public CreateXMLSignatureRequestType.SingleSignatureInfo.DataObjectInfo createCreateXMLSignatureRequestTypeSingleSignatureInfoDataObjectInfo() { - return new CreateXMLSignatureRequestType.SingleSignatureInfo.DataObjectInfo(); + public CreateXMLSignatureResponseType.SignatureEnvironment createCreateXMLSignatureResponseTypeSignatureEnvironment() { + return new CreateXMLSignatureResponseType.SignatureEnvironment(); } /** - * Create an instance of {@link CreateXMLSignatureRequestType.SingleSignatureInfo.CreateSignatureInfo } + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} * */ - public CreateXMLSignatureRequestType.SingleSignatureInfo.CreateSignatureInfo createCreateXMLSignatureRequestTypeSingleSignatureInfoCreateSignatureInfo() { - return new CreateXMLSignatureRequestType.SingleSignatureInfo.CreateSignatureInfo(); + @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "IssuingCountry") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + public JAXBElement createIssuingCountry(String value) { + return new JAXBElement(_IssuingCountry_QNAME, String.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link CreateXMLSignatureResponseType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link PublicAuthorityType }{@code >}} * */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "CreateXMLSignatureResponse") - public JAXBElement createCreateXMLSignatureResponse(CreateXMLSignatureResponseType value) { - return new JAXBElement(_CreateXMLSignatureResponse_QNAME, CreateXMLSignatureResponseType.class, null, value); + @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "PublicAuthority") + public JAXBElement createPublicAuthority(PublicAuthorityType value) { + return new JAXBElement(_PublicAuthority_QNAME, PublicAuthorityType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link VerifyXMLSignatureRequestType }{@code >}} * */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "IssuingCountry") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - public JAXBElement createIssuingCountry(String value) { - return new JAXBElement(_IssuingCountry_QNAME, String.class, null, value); + @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "VerifyXMLSignatureRequest") + public JAXBElement createVerifyXMLSignatureRequest(VerifyXMLSignatureRequestType value) { + return new JAXBElement(_VerifyXMLSignatureRequest_QNAME, VerifyXMLSignatureRequestType.class, null, value); } /** @@ -513,27 +522,18 @@ public class ObjectFactory { * Create an instance of {@link JAXBElement }{@code <}{@link XMLDataObjectAssociationType }{@code >}} * */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "SupplementProfile") - public JAXBElement createSupplementProfile(XMLDataObjectAssociationType value) { - return new JAXBElement(_SupplementProfile_QNAME, XMLDataObjectAssociationType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link VerifyXMLSignatureRequestType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "VerifyXMLSignatureRequest") - public JAXBElement createVerifyXMLSignatureRequest(VerifyXMLSignatureRequestType value) { - return new JAXBElement(_VerifyXMLSignatureRequest_QNAME, VerifyXMLSignatureRequestType.class, null, value); + @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "Supplement") + public JAXBElement createSupplement(XMLDataObjectAssociationType value) { + return new JAXBElement(_Supplement_QNAME, XMLDataObjectAssociationType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link PublicAuthorityType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link VerifyXMLSignatureResponseType }{@code >}} * */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "PublicAuthority") - public JAXBElement createPublicAuthority(PublicAuthorityType value) { - return new JAXBElement(_PublicAuthority_QNAME, PublicAuthorityType.class, null, value); + @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "VerifyXMLSignatureResponse") + public JAXBElement createVerifyXMLSignatureResponse(VerifyXMLSignatureResponseType value) { + return new JAXBElement(_VerifyXMLSignatureResponse_QNAME, VerifyXMLSignatureResponseType.class, null, value); } /** @@ -546,21 +546,30 @@ public class ObjectFactory { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link VerifyXMLSignatureResponseType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link CreateXMLSignatureResponseType }{@code >}} * */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "VerifyXMLSignatureResponse") - public JAXBElement createVerifyXMLSignatureResponse(VerifyXMLSignatureResponseType value) { - return new JAXBElement(_VerifyXMLSignatureResponse_QNAME, VerifyXMLSignatureResponseType.class, null, value); + @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "CreateXMLSignatureResponse") + public JAXBElement createCreateXMLSignatureResponse(CreateXMLSignatureResponseType value) { + return new JAXBElement(_CreateXMLSignatureResponse_QNAME, CreateXMLSignatureResponseType.class, null, value); } /** * Create an instance of {@link JAXBElement }{@code <}{@link XMLDataObjectAssociationType }{@code >}} * */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "Supplement") - public JAXBElement createSupplement(XMLDataObjectAssociationType value) { - return new JAXBElement(_Supplement_QNAME, XMLDataObjectAssociationType.class, null, value); + @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "SupplementProfile") + public JAXBElement createSupplementProfile(XMLDataObjectAssociationType value) { + return new JAXBElement(_SupplementProfile_QNAME, XMLDataObjectAssociationType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link CheckResultType }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "SignatureCheck", scope = VerifyCMSSignatureResponseType.class) + public JAXBElement createVerifyCMSSignatureResponseTypeSignatureCheck(CheckResultType value) { + return new JAXBElement(_VerifyCMSSignatureResponseTypeSignatureCheck_QNAME, CheckResultType.class, VerifyCMSSignatureResponseType.class, value); } /** @@ -581,13 +590,4 @@ public class ObjectFactory { return new JAXBElement(_VerifyCMSSignatureResponseTypeSignerInfo_QNAME, KeyInfoType.class, VerifyCMSSignatureResponseType.class, value); } - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CheckResultType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "SignatureCheck", scope = VerifyCMSSignatureResponseType.class) - public JAXBElement createVerifyCMSSignatureResponseTypeSignatureCheck(CheckResultType value) { - return new JAXBElement(_VerifyCMSSignatureResponseTypeSignatureCheck_QNAME, CheckResultType.class, VerifyCMSSignatureResponseType.class, value); - } - } -- cgit v1.2.3