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/AnyChildrenType.java | 6 +- .../namespace/moa/_20020822/CheckResultType.java | 4 +- .../moa/_20020822/ContentOptionalRefType.java | 4 +- .../_20020822/CreateCMSSignatureRequestType.java | 32 +++ .../_20020822/CreateXMLSignatureResponseType.java | 4 +- .../namespace/moa/_20020822/ObjectFactory.java | 314 ++++++++++----------- .../_20020822/VerifyCMSSignatureResponseType.java | 6 +- .../namespace/moa/_20020822_/MOAFault.java | 2 +- .../moa/_20020822_/SignatureCreationPortType.java | 20 +- .../moa/_20020822_/SignatureCreationService.java | 2 +- .../_20020822_/SignatureVerificationPortType.java | 20 +- .../_20020822_/SignatureVerificationService.java | 2 +- 12 files changed, 224 insertions(+), 192 deletions(-) (limited to 'pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa') diff --git a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/AnyChildrenType.java b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/AnyChildrenType.java index 5304f283..a0acc4b0 100644 --- a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/AnyChildrenType.java +++ b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/AnyChildrenType.java @@ -36,9 +36,9 @@ import org.w3c.dom.Element; "content" }) @XmlSeeAlso({ - ReferencesCheckResultInfoType.class, + ManifestRefsCheckResultInfoType.class, XMLContentType.class, - ManifestRefsCheckResultInfoType.class + ReferencesCheckResultInfoType.class }) public class AnyChildrenType { @@ -64,9 +64,9 @@ public class AnyChildrenType { * *

* Objects of the following type(s) are allowed in the list + * {@link Element } * {@link Object } * {@link String } - * {@link Element } * * */ diff --git a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/CheckResultType.java b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/CheckResultType.java index 266cf4c8..cfcf48d5 100644 --- a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/CheckResultType.java +++ b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/CheckResultType.java @@ -36,8 +36,8 @@ import javax.xml.bind.annotation.XmlType; "info" }) @XmlSeeAlso({ - ManifestRefsCheckResultType.class, - ReferencesCheckResultType.class + ReferencesCheckResultType.class, + ManifestRefsCheckResultType.class }) public class CheckResultType { diff --git a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/ContentOptionalRefType.java b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/ContentOptionalRefType.java index 13195f92..608cc97c 100644 --- a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/ContentOptionalRefType.java +++ b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/ContentOptionalRefType.java @@ -29,9 +29,9 @@ import javax.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "ContentOptionalRefType") @XmlSeeAlso({ + at.gv.e_government.reference.namespace.moa._20020822.DataObjectInfoType.DataObject.class, CMSContentBaseType.class, - ContentRequiredRefType.class, - at.gv.e_government.reference.namespace.moa._20020822.DataObjectInfoType.DataObject.class + ContentRequiredRefType.class }) public class ContentOptionalRefType extends ContentBaseType diff --git a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/CreateCMSSignatureRequestType.java b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/CreateCMSSignatureRequestType.java index 554d097d..92afe7a5 100644 --- a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/CreateCMSSignatureRequestType.java +++ b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/CreateCMSSignatureRequestType.java @@ -37,6 +37,7 @@ import javax.xml.bind.annotation.XmlType; * </element> * </sequence> * <attribute name="SecurityLayerConformity" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /> + * <attribute name="PAdESConformity" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /> * </restriction> * </complexContent> * </complexType> @@ -138,6 +139,7 @@ public class CreateCMSSignatureRequestType { * </element> * </sequence> * <attribute name="SecurityLayerConformity" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /> + * <attribute name="PAdESConformity" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /> * </restriction> * </complexContent> * </complexType> @@ -155,6 +157,8 @@ public class CreateCMSSignatureRequestType { protected CreateCMSSignatureRequestType.SingleSignatureInfo.DataObjectInfo dataObjectInfo; @XmlAttribute(name = "SecurityLayerConformity") protected Boolean securityLayerConformity; + @XmlAttribute(name = "PAdESConformity") + protected Boolean pAdESConformity; /** * Gets the value of the dataObjectInfo property. @@ -208,6 +212,34 @@ public class CreateCMSSignatureRequestType { this.securityLayerConformity = value; } + /** + * Gets the value of the pAdESConformity property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public boolean isPAdESConformity() { + if (pAdESConformity == null) { + return false; + } else { + return pAdESConformity; + } + } + + /** + * Sets the value of the pAdESConformity property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setPAdESConformity(Boolean value) { + this.pAdESConformity = value; + } + /** *

Java class for anonymous complex type. diff --git a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/CreateXMLSignatureResponseType.java b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/CreateXMLSignatureResponseType.java index b0084406..5c313107 100644 --- a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/CreateXMLSignatureResponseType.java +++ b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/CreateXMLSignatureResponseType.java @@ -118,8 +118,8 @@ public class CreateXMLSignatureResponseType { * * @return * possible object is - * {@link Object } * {@link Element } + * {@link Object } * */ public Object getAny() { @@ -131,8 +131,8 @@ public class CreateXMLSignatureResponseType { * * @param value * allowed object is - * {@link Object } * {@link Element } + * {@link Object } * */ public void setAny(Object value) { 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); - } - } diff --git a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/VerifyCMSSignatureResponseType.java b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/VerifyCMSSignatureResponseType.java index 405805b7..0f3d1337 100644 --- a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/VerifyCMSSignatureResponseType.java +++ b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/VerifyCMSSignatureResponseType.java @@ -40,9 +40,9 @@ import org.w3._2000._09.xmldsig.KeyInfoType; public class VerifyCMSSignatureResponseType { @XmlElementRefs({ + @XmlElementRef(name = "CertificateCheck", namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", type = JAXBElement.class), @XmlElementRef(name = "SignerInfo", namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", type = JAXBElement.class), - @XmlElementRef(name = "SignatureCheck", namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", type = JAXBElement.class), - @XmlElementRef(name = "CertificateCheck", namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", type = JAXBElement.class) + @XmlElementRef(name = "SignatureCheck", namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", type = JAXBElement.class) }) protected List> signerInfoAndSignatureCheckAndCertificateCheck; @@ -64,9 +64,9 @@ public class VerifyCMSSignatureResponseType { * *

* Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >} * {@link JAXBElement }{@code <}{@link CheckResultType }{@code >} * {@link JAXBElement }{@code <}{@link CheckResultType }{@code >} + * {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >} * * */ diff --git a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/MOAFault.java b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/MOAFault.java index 0add2565..1596c7df 100644 --- a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/MOAFault.java +++ b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/MOAFault.java @@ -6,7 +6,7 @@ import javax.xml.ws.WebFault; /** * This class was generated by Apache CXF 3.0.1 - * 2014-11-28T08:32:27.729+01:00 + * 2017-08-08T09:15:33.051+02:00 * Generated source version: 3.0.1 */ diff --git a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureCreationPortType.java b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureCreationPortType.java index e682e0d6..e998392a 100644 --- a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureCreationPortType.java +++ b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureCreationPortType.java @@ -9,26 +9,26 @@ import javax.xml.bind.annotation.XmlSeeAlso; /** * This class was generated by Apache CXF 3.0.1 - * 2014-11-28T08:32:27.738+01:00 + * 2017-08-08T09:15:33.051+02:00 * Generated source version: 3.0.1 * */ @WebService(targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "SignatureCreationPortType") -@XmlSeeAlso({at.gv.e_government.reference.namespace.moa._20020822.ObjectFactory.class, org.w3._2000._09.xmldsig.ObjectFactory.class}) +@XmlSeeAlso({org.w3._2000._09.xmldsig.ObjectFactory.class, at.gv.e_government.reference.namespace.moa._20020822.ObjectFactory.class}) @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) public interface SignatureCreationPortType { - @WebResult(name = "CreateXMLSignatureResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", partName = "body") - @WebMethod(action = "urn:CreateXMLSignatureAction") - public at.gv.e_government.reference.namespace.moa._20020822.CreateXMLSignatureResponseType createXMLSignature( - @WebParam(partName = "body", name = "CreateXMLSignatureRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#") - at.gv.e_government.reference.namespace.moa._20020822.CreateXMLSignatureRequest body - ) throws MOAFault; - - @WebResult(name = "CreateCMSSignatureResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", partName = "body") @WebMethod(action = "urn:CreateCMSSignatureAction") + @WebResult(name = "CreateCMSSignatureResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", partName = "body") public at.gv.e_government.reference.namespace.moa._20020822.CreateCMSSignatureResponseType createCMSSignature( @WebParam(partName = "body", name = "CreateCMSSignatureRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#") at.gv.e_government.reference.namespace.moa._20020822.CreateCMSSignatureRequest body ) throws MOAFault; + + @WebMethod(action = "urn:CreateXMLSignatureAction") + @WebResult(name = "CreateXMLSignatureResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", partName = "body") + public at.gv.e_government.reference.namespace.moa._20020822.CreateXMLSignatureResponseType createXMLSignature( + @WebParam(partName = "body", name = "CreateXMLSignatureRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#") + at.gv.e_government.reference.namespace.moa._20020822.CreateXMLSignatureRequest body + ) throws MOAFault; } diff --git a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureCreationService.java b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureCreationService.java index c88833e5..67ad0fc0 100644 --- a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureCreationService.java +++ b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureCreationService.java @@ -9,7 +9,7 @@ import javax.xml.ws.Service; /** * This class was generated by Apache CXF 3.0.1 - * 2014-11-28T08:32:27.775+01:00 + * 2017-08-08T09:15:33.082+02:00 * Generated source version: 3.0.1 * */ diff --git a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureVerificationPortType.java b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureVerificationPortType.java index 446276c6..128044f1 100644 --- a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureVerificationPortType.java +++ b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureVerificationPortType.java @@ -9,26 +9,26 @@ import javax.xml.bind.annotation.XmlSeeAlso; /** * This class was generated by Apache CXF 3.0.1 - * 2014-11-28T08:32:27.767+01:00 + * 2017-08-08T09:15:33.067+02:00 * Generated source version: 3.0.1 * */ @WebService(targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "SignatureVerificationPortType") -@XmlSeeAlso({at.gv.e_government.reference.namespace.moa._20020822.ObjectFactory.class, org.w3._2000._09.xmldsig.ObjectFactory.class}) +@XmlSeeAlso({org.w3._2000._09.xmldsig.ObjectFactory.class, at.gv.e_government.reference.namespace.moa._20020822.ObjectFactory.class}) @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) public interface SignatureVerificationPortType { - @WebResult(name = "VerifyXMLSignatureResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", partName = "body") - @WebMethod(action = "urn:VerifyXMLSignatureAction") - public at.gv.e_government.reference.namespace.moa._20020822.VerifyXMLSignatureResponseType verifyXMLSignature( - @WebParam(partName = "body", name = "VerifyXMLSignatureRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#") - at.gv.e_government.reference.namespace.moa._20020822.VerifyXMLSignatureRequestType body - ) throws MOAFault; - - @WebResult(name = "VerifyCMSSignatureResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", partName = "body") @WebMethod(action = "urn:VerifyCMSSignatureAction") + @WebResult(name = "VerifyCMSSignatureResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", partName = "body") public at.gv.e_government.reference.namespace.moa._20020822.VerifyCMSSignatureResponseType verifyCMSSignature( @WebParam(partName = "body", name = "VerifyCMSSignatureRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#") at.gv.e_government.reference.namespace.moa._20020822.VerifyCMSSignatureRequest body ) throws MOAFault; + + @WebMethod(action = "urn:VerifyXMLSignatureAction") + @WebResult(name = "VerifyXMLSignatureResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", partName = "body") + public at.gv.e_government.reference.namespace.moa._20020822.VerifyXMLSignatureResponseType verifyXMLSignature( + @WebParam(partName = "body", name = "VerifyXMLSignatureRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#") + at.gv.e_government.reference.namespace.moa._20020822.VerifyXMLSignatureRequestType body + ) throws MOAFault; } diff --git a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureVerificationService.java b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureVerificationService.java index c242d913..2de494b7 100644 --- a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureVerificationService.java +++ b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureVerificationService.java @@ -9,7 +9,7 @@ import javax.xml.ws.Service; /** * This class was generated by Apache CXF 3.0.1 - * 2014-11-28T08:32:27.797+01:00 + * 2017-08-08T09:15:33.098+02:00 * Generated source version: 3.0.1 * */ -- cgit v1.2.3