diff options
Diffstat (limited to 'moaSig/moa-sig')
97 files changed, 1483 insertions, 3683 deletions
diff --git a/moaSig/moa-sig/build.gradle b/moaSig/moa-sig/build.gradle index 9cd34a9..0ddd479 100644 --- a/moaSig/moa-sig/build.gradle +++ b/moaSig/moa-sig/build.gradle @@ -10,6 +10,7 @@ repositories { dependencies { compile project(':moa-sig-lib') + compile project(':moa-asic') compile fileTree(dir: 'libs', include: '*.jar') providedCompile 'javax.servlet:servlet-api:2.4' compile 'commons-discovery:commons-discovery:0.5' @@ -57,6 +58,7 @@ gretty { '-Dlog4j.configuration=/home/afitzek/server/moa-spss/apache-tomcat-8.0.0-RC3/conf/moa-spss/log4j.properties' ] loggingLevel = "TRACE" + servletContainer = 'tomcat8' } task jaxb () { @@ -75,11 +77,16 @@ task jaxb () { ant.xjc( destdir: jaxbTargetDir.path, package: 'at.gv.egiz.moasig', - schema: 'src/main/resources/resources/schemas/MOA-SIG-3.0.0.xsd' + schema: 'src/main/resources/resources/schemas/MOA-SPSS-2.0.0.xsd' ) } } +task releases(type: Copy) { + from war.outputs + into rootDir.toString() + "/releases/" + version +} + //compileJava.dependsOn jaxb // context where tomcat is deployed, by defautl localhost:8080/ diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/AllSignatoriesType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/AllSignatoriesType.java index f15b8c6..c6c62c0 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/AllSignatoriesType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/AllSignatoriesType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/AnyChildrenType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/AnyChildrenType.java index 13ca6a0..6a5bce4 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/AnyChildrenType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/AnyChildrenType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -43,8 +43,9 @@ import org.w3c.dom.Element; "content" }) @XmlSeeAlso({ - ReferencesCheckResultInfoType.class, - ManifestRefsCheckResultInfoType.class + ManifestRefsCheckResultInfoType.class, + XMLContentType.class, + ReferencesCheckResultInfoType.class }) public class AnyChildrenType { @@ -70,9 +71,9 @@ public class AnyChildrenType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link Element } - * {@link Object } * {@link String } + * {@link Object } + * {@link Element } * * */ diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSContentBaseType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSContentBaseType.java index 5eec1e8..7f46296 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSContentBaseType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSContentBaseType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -21,7 +21,7 @@ import javax.xml.bind.annotation.XmlType; * <pre> * <complexType name="CMSContentBaseType"> * <complexContent> - * <restriction base="{http://reference.e-government.gv.at/namespace/moa/20151109#}ContentOptionalRefType"> + * <restriction base="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentOptionalRefType"> * <choice minOccurs="0"> * <element name="Base64Content" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/> * </choice> diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectInfoType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectInfoType.java index cd118f2..7104ad8 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectInfoType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectInfoType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -26,7 +26,14 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="DataObject" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}CMSDataObjectRequiredMetaType"/> + * <element name="DataObject"> + * <complexType> + * <complexContent> + * <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}CMSDataObjectRequiredMetaType"> + * </extension> + * </complexContent> + * </complexType> + * </element> * </sequence> * <attribute name="Structure" use="required"> * <simpleType> @@ -53,7 +60,7 @@ import javax.xml.bind.annotation.XmlType; public class CMSDataObjectInfoType { @XmlElement(name = "DataObject", required = true) - protected CMSDataObjectRequiredMetaType dataObject; + protected CMSDataObjectInfoType.DataObject dataObject; @XmlAttribute(name = "Structure", required = true) protected String structure; @@ -62,10 +69,10 @@ public class CMSDataObjectInfoType { * * @return * possible object is - * {@link CMSDataObjectRequiredMetaType } + * {@link CMSDataObjectInfoType.DataObject } * */ - public CMSDataObjectRequiredMetaType getDataObject() { + public CMSDataObjectInfoType.DataObject getDataObject() { return dataObject; } @@ -74,10 +81,10 @@ public class CMSDataObjectInfoType { * * @param value * allowed object is - * {@link CMSDataObjectRequiredMetaType } + * {@link CMSDataObjectInfoType.DataObject } * */ - public void setDataObject(CMSDataObjectRequiredMetaType value) { + public void setDataObject(CMSDataObjectInfoType.DataObject value) { this.dataObject = value; } @@ -105,4 +112,30 @@ public class CMSDataObjectInfoType { this.structure = value; } + + /** + * <p>Java class for anonymous complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType> + * <complexContent> + * <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}CMSDataObjectRequiredMetaType"> + * </extension> + * </complexContent> + * </complexType> + * </pre> + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class DataObject + extends CMSDataObjectRequiredMetaType + { + + + } + } diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectOptionalMetaType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectOptionalMetaType.java index 2c0cc35..d96a6cd 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectOptionalMetaType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectOptionalMetaType.java @@ -2,17 +2,15 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // package at.gv.egiz.moasig; -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; @@ -26,10 +24,8 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="MetaInfo" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}MetaInfoType" minOccurs="0"/> - * <element name="Content" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}CMSContentBaseType"/> - * <element name="From" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" minOccurs="0"/> - * <element name="To" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" minOccurs="0"/> + * <element name="MetaInfo" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}MetaInfoType" minOccurs="0"/> + * <element name="Content" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}CMSContentBaseType"/> * </sequence> * </restriction> * </complexContent> @@ -41,9 +37,7 @@ import javax.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "CMSDataObjectOptionalMetaType", propOrder = { "metaInfo", - "content", - "from", - "to" + "content" }) public class CMSDataObjectOptionalMetaType { @@ -51,12 +45,6 @@ public class CMSDataObjectOptionalMetaType { protected MetaInfoType metaInfo; @XmlElement(name = "Content", required = true) protected CMSContentBaseType content; - @XmlElement(name = "From") - @XmlSchemaType(name = "nonNegativeInteger") - protected BigInteger from; - @XmlElement(name = "To") - @XmlSchemaType(name = "nonNegativeInteger") - protected BigInteger to; /** * Gets the value of the metaInfo property. @@ -106,52 +94,4 @@ public class CMSDataObjectOptionalMetaType { this.content = value; } - /** - * Gets the value of the from property. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getFrom() { - return from; - } - - /** - * Sets the value of the from property. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setFrom(BigInteger value) { - this.from = value; - } - - /** - * Gets the value of the to property. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getTo() { - return to; - } - - /** - * Sets the value of the to property. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setTo(BigInteger value) { - this.to = value; - } - } diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectRequiredMetaType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectRequiredMetaType.java index 7ee94a0..46cb047 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectRequiredMetaType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectRequiredMetaType.java @@ -2,17 +2,16 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // package at.gv.egiz.moasig; -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.XmlSeeAlso; import javax.xml.bind.annotation.XmlType; @@ -26,10 +25,8 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="MetaInfo" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}MetaInfoType"/> - * <element name="Content" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}CMSContentBaseType"/> - * <element name="From" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" minOccurs="0"/> - * <element name="To" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" minOccurs="0"/> + * <element name="MetaInfo" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}MetaInfoType"/> + * <element name="Content" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}CMSContentBaseType"/> * </sequence> * </restriction> * </complexContent> @@ -41,9 +38,10 @@ import javax.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "CMSDataObjectRequiredMetaType", propOrder = { "metaInfo", - "content", - "from", - "to" + "content" +}) +@XmlSeeAlso({ + at.gv.egiz.moasig.CMSDataObjectInfoType.DataObject.class }) public class CMSDataObjectRequiredMetaType { @@ -51,12 +49,6 @@ public class CMSDataObjectRequiredMetaType { protected MetaInfoType metaInfo; @XmlElement(name = "Content", required = true) protected CMSContentBaseType content; - @XmlElement(name = "From") - @XmlSchemaType(name = "nonNegativeInteger") - protected BigInteger from; - @XmlElement(name = "To") - @XmlSchemaType(name = "nonNegativeInteger") - protected BigInteger to; /** * Gets the value of the metaInfo property. @@ -106,52 +98,4 @@ public class CMSDataObjectRequiredMetaType { this.content = value; } - /** - * Gets the value of the from property. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getFrom() { - return from; - } - - /** - * Sets the value of the from property. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setFrom(BigInteger value) { - this.from = value; - } - - /** - * Gets the value of the to property. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getTo() { - return to; - } - - /** - * Sets the value of the to property. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setTo(BigInteger value) { - this.to = value; - } - } diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CanonicalizationMethodType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CanonicalizationMethodType.java index 909f3ae..6215e3c 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CanonicalizationMethodType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CanonicalizationMethodType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CheckResultType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CheckResultType.java index 9a66392..d38c2ed 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CheckResultType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CheckResultType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlType; * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> * <element name="Code" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger"/> - * <element name="Info" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}AnyChildrenType" minOccurs="0"/> + * <element name="Info" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}AnyChildrenType" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -43,8 +43,8 @@ import javax.xml.bind.annotation.XmlType; "info" }) @XmlSeeAlso({ - ManifestRefsCheckResultType.class, - ReferencesCheckResultType.class + ReferencesCheckResultType.class, + ManifestRefsCheckResultType.class }) public class CheckResultType { diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentBaseType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentBaseType.java index 35de827..dd1469c 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentBaseType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentBaseType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -27,6 +27,7 @@ import javax.xml.bind.annotation.XmlType; * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <choice minOccurs="0"> * <element name="Base64Content" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/> + * <element name="XMLContent" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}XMLContentType"/> * <element name="LocRefContent" type="{http://www.w3.org/2001/XMLSchema}anyURI"/> * </choice> * </restriction> @@ -39,6 +40,7 @@ import javax.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "ContentBaseType", propOrder = { "base64Content", + "xmlContent", "locRefContent" }) @XmlSeeAlso({ @@ -49,6 +51,8 @@ public class ContentBaseType { @XmlElement(name = "Base64Content") protected byte[] base64Content; + @XmlElement(name = "XMLContent") + protected XMLContentType xmlContent; @XmlElement(name = "LocRefContent") @XmlSchemaType(name = "anyURI") protected String locRefContent; @@ -76,6 +80,30 @@ public class ContentBaseType { } /** + * Gets the value of the xmlContent property. + * + * @return + * possible object is + * {@link XMLContentType } + * + */ + public XMLContentType getXMLContent() { + return xmlContent; + } + + /** + * Sets the value of the xmlContent property. + * + * @param value + * allowed object is + * {@link XMLContentType } + * + */ + public void setXMLContent(XMLContentType value) { + this.xmlContent = value; + } + + /** * Gets the value of the locRefContent property. * * @return diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentExLocRefBaseType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentExLocRefBaseType.java index c14ebec..0f29db0 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentExLocRefBaseType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentExLocRefBaseType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -22,9 +22,10 @@ import javax.xml.bind.annotation.XmlType; * <pre> * <complexType name="ContentExLocRefBaseType"> * <complexContent> - * <restriction base="{http://reference.e-government.gv.at/namespace/moa/20151109#}ContentBaseType"> + * <restriction base="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentBaseType"> * <choice minOccurs="0"> * <element name="Base64Content" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/> + * <element name="XMLContent" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}XMLContentType"/> * </choice> * </restriction> * </complexContent> diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentOptionalRefType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentOptionalRefType.java index b6d9109..49dfb3d 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentOptionalRefType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentOptionalRefType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlType; * <pre> * <complexType name="ContentOptionalRefType"> * <complexContent> - * <extension base="{http://reference.e-government.gv.at/namespace/moa/20151109#}ContentBaseType"> + * <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentBaseType"> * <attribute name="Reference" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> * </extension> * </complexContent> @@ -36,9 +36,9 @@ import javax.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "ContentOptionalRefType") @XmlSeeAlso({ - ContentRequiredRefType.class, CMSContentBaseType.class, - at.gv.egiz.moasig.DataObjectInfoType.DataObject.class + at.gv.egiz.moasig.DataObjectInfoType.DataObject.class, + ContentRequiredRefType.class }) public class ContentOptionalRefType extends ContentBaseType diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentRequiredRefType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentRequiredRefType.java index 933c352..e4757fd 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentRequiredRefType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentRequiredRefType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -21,9 +21,10 @@ import javax.xml.bind.annotation.XmlType; * <pre> * <complexType name="ContentRequiredRefType"> * <complexContent> - * <restriction base="{http://reference.e-government.gv.at/namespace/moa/20151109#}ContentOptionalRefType"> + * <restriction base="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentOptionalRefType"> * <choice minOccurs="0"> * <element name="Base64Content" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/> + * <element name="XMLContent" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}XMLContentType"/> * <element name="LocRefContent" type="{http://www.w3.org/2001/XMLSchema}anyURI"/> * </choice> * <attribute name="Reference" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureRequest.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureRequest.java index 129cc35..c7ce333 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureRequest.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureRequest.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -22,7 +22,7 @@ import javax.xml.bind.annotation.XmlType; * <pre> * <complexType> * <complexContent> - * <extension base="{http://reference.e-government.gv.at/namespace/moa/20151109#}CreateCMSSignatureRequestType"> + * <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}CreateCMSSignatureRequestType"> * </extension> * </complexContent> * </complexType> diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureRequestType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureRequestType.java index 088dd74..6839d44 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureRequestType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureRequestType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="KeyIdentifier" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}KeyIdentifierType"/> + * <element name="KeyIdentifier" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}KeyIdentifierType"/> * <element name="SingleSignatureInfo" maxOccurs="unbounded"> * <complexType> * <complexContent> @@ -37,7 +37,7 @@ import javax.xml.bind.annotation.XmlType; * <element name="DataObjectInfo"> * <complexType> * <complexContent> - * <extension base="{http://reference.e-government.gv.at/namespace/moa/20151109#}CMSDataObjectInfoType"> + * <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}CMSDataObjectInfoType"> * </extension> * </complexContent> * </complexType> @@ -138,7 +138,7 @@ public class CreateCMSSignatureRequestType { * <element name="DataObjectInfo"> * <complexType> * <complexContent> - * <extension base="{http://reference.e-government.gv.at/namespace/moa/20151109#}CMSDataObjectInfoType"> + * <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}CMSDataObjectInfoType"> * </extension> * </complexContent> * </complexType> @@ -224,7 +224,7 @@ public class CreateCMSSignatureRequestType { * <pre> * <complexType> * <complexContent> - * <extension base="{http://reference.e-government.gv.at/namespace/moa/20151109#}CMSDataObjectInfoType"> + * <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}CMSDataObjectInfoType"> * </extension> * </complexContent> * </complexType> diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureResponseType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureResponseType.java index 7423e89..dc693bb 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureResponseType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureResponseType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlType; * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <choice maxOccurs="unbounded"> * <element name="CMSSignature" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/> - * <element ref="{http://reference.e-government.gv.at/namespace/moa/20151109#}ErrorResponse"/> + * <element ref="{http://reference.e-government.gv.at/namespace/moa/20020822#}ErrorResponse"/> * </choice> * </restriction> * </complexContent> diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureRequest.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureRequest.java index c66580d..4e50dd3 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureRequest.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureRequest.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.12.09 at 08:47:56 AM CET +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -22,7 +22,7 @@ import javax.xml.bind.annotation.XmlType; * <pre> * <complexType> * <complexContent> - * <extension base="{http://reference.e-government.gv.at/namespace/moa/20151109#}CreatePDFSignatureRequestType"> + * <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}CreatePDFSignatureRequestType"> * </extension> * </complexContent> * </complexType> diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureRequestType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureRequestType.java index b6b4b2c..bfa050f 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureRequestType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureRequestType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.12.09 at 08:47:56 AM CET +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="KeyIdentifier" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}KeyIdentifierType"/> + * <element name="KeyIdentifier" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}KeyIdentifierType"/> * <element name="SingleSignatureInfo" maxOccurs="unbounded"> * <complexType> * <complexContent> diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureResponseType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureResponseType.java index 5bd70ac..c0ed6a7 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureResponseType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureResponseType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.12.09 at 08:47:56 AM CET +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="PDFSignature" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}PDFSignedRepsonse" maxOccurs="unbounded"/> + * <element name="PDFSignature" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}PDFSignedRepsonse" maxOccurs="unbounded"/> * </sequence> * </restriction> * </complexContent> diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateSignatureEnvironmentProfile.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateSignatureEnvironmentProfile.java index 030a112..7d88143 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateSignatureEnvironmentProfile.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateSignatureEnvironmentProfile.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -27,8 +27,8 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="CreateSignatureLocation" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}CreateSignatureLocationType"/> - * <element name="Supplement" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}XMLDataObjectAssociationType" maxOccurs="unbounded" minOccurs="0"/> + * <element name="CreateSignatureLocation" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}CreateSignatureLocationType"/> + * <element name="Supplement" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}XMLDataObjectAssociationType" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateSignatureLocationType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateSignatureLocationType.java index 8c60d7a..fa1a38b 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateSignatureLocationType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateSignatureLocationType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateTransformsInfoProfile.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateTransformsInfoProfile.java index e99caca..d75c0dc 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateTransformsInfoProfile.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateTransformsInfoProfile.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -27,8 +27,8 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="CreateTransformsInfo" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}TransformsInfoType"/> - * <element ref="{http://reference.e-government.gv.at/namespace/moa/20151109#}Supplement" maxOccurs="unbounded" minOccurs="0"/> + * <element name="CreateTransformsInfo" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}TransformsInfoType"/> + * <element ref="{http://reference.e-government.gv.at/namespace/moa/20020822#}Supplement" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureRequest.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureRequest.java index c141926..2cb4b17 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureRequest.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureRequest.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -22,7 +22,7 @@ import javax.xml.bind.annotation.XmlType; * <pre> * <complexType> * <complexContent> - * <extension base="{http://reference.e-government.gv.at/namespace/moa/20151109#}CreateXMLSignatureRequestType"> + * <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}CreateXMLSignatureRequestType"> * </extension> * </complexContent> * </complexType> diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureRequestType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureRequestType.java index d5d131e..ffe6afe 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureRequestType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureRequestType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -30,7 +30,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="KeyIdentifier" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}KeyIdentifierType"/> + * <element name="KeyIdentifier" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}KeyIdentifierType"/> * <element name="SingleSignatureInfo" maxOccurs="unbounded"> * <complexType> * <complexContent> @@ -39,7 +39,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; * <element name="DataObjectInfo" maxOccurs="unbounded"> * <complexType> * <complexContent> - * <extension base="{http://reference.e-government.gv.at/namespace/moa/20151109#}DataObjectInfoType"> + * <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}DataObjectInfoType"> * <attribute name="ChildOfManifest" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /> * </extension> * </complexContent> @@ -50,10 +50,10 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="CreateSignatureEnvironment" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}ContentOptionalRefType"/> + * <element name="CreateSignatureEnvironment" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentOptionalRefType"/> * <choice> - * <element ref="{http://reference.e-government.gv.at/namespace/moa/20151109#}CreateSignatureEnvironmentProfile"/> - * <element name="CreateSignatureEnvironmentProfileID" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}ProfileIdentifierType"/> + * <element ref="{http://reference.e-government.gv.at/namespace/moa/20020822#}CreateSignatureEnvironmentProfile"/> + * <element name="CreateSignatureEnvironmentProfileID" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ProfileIdentifierType"/> * </choice> * </sequence> * </restriction> @@ -156,7 +156,7 @@ public class CreateXMLSignatureRequestType { * <element name="DataObjectInfo" maxOccurs="unbounded"> * <complexType> * <complexContent> - * <extension base="{http://reference.e-government.gv.at/namespace/moa/20151109#}DataObjectInfoType"> + * <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}DataObjectInfoType"> * <attribute name="ChildOfManifest" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /> * </extension> * </complexContent> @@ -167,10 +167,10 @@ public class CreateXMLSignatureRequestType { * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="CreateSignatureEnvironment" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}ContentOptionalRefType"/> + * <element name="CreateSignatureEnvironment" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentOptionalRefType"/> * <choice> - * <element ref="{http://reference.e-government.gv.at/namespace/moa/20151109#}CreateSignatureEnvironmentProfile"/> - * <element name="CreateSignatureEnvironmentProfileID" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}ProfileIdentifierType"/> + * <element ref="{http://reference.e-government.gv.at/namespace/moa/20020822#}CreateSignatureEnvironmentProfile"/> + * <element name="CreateSignatureEnvironmentProfileID" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ProfileIdentifierType"/> * </choice> * </sequence> * </restriction> @@ -292,10 +292,10 @@ public class CreateXMLSignatureRequestType { * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="CreateSignatureEnvironment" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}ContentOptionalRefType"/> + * <element name="CreateSignatureEnvironment" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentOptionalRefType"/> * <choice> - * <element ref="{http://reference.e-government.gv.at/namespace/moa/20151109#}CreateSignatureEnvironmentProfile"/> - * <element name="CreateSignatureEnvironmentProfileID" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}ProfileIdentifierType"/> + * <element ref="{http://reference.e-government.gv.at/namespace/moa/20020822#}CreateSignatureEnvironmentProfile"/> + * <element name="CreateSignatureEnvironmentProfileID" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ProfileIdentifierType"/> * </choice> * </sequence> * </restriction> @@ -404,7 +404,7 @@ public class CreateXMLSignatureRequestType { * <pre> * <complexType> * <complexContent> - * <extension base="{http://reference.e-government.gv.at/namespace/moa/20151109#}DataObjectInfoType"> + * <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}DataObjectInfoType"> * <attribute name="ChildOfManifest" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /> * </extension> * </complexContent> diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureResponseType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureResponseType.java index da52b65..0949d87 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureResponseType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureResponseType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -12,9 +12,11 @@ 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.XmlElements; import javax.xml.bind.annotation.XmlType; +import org.w3c.dom.Element; /** @@ -27,8 +29,18 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <choice maxOccurs="unbounded"> - * <element name="SignatureEnvironment" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/> - * <element ref="{http://reference.e-government.gv.at/namespace/moa/20151109#}ErrorResponse"/> + * <element name="SignatureEnvironment"> + * <complexType> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <any processContents='lax'/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </element> + * <element ref="{http://reference.e-government.gv.at/namespace/moa/20020822#}ErrorResponse"/> * </choice> * </restriction> * </complexContent> @@ -44,7 +56,7 @@ import javax.xml.bind.annotation.XmlType; public class CreateXMLSignatureResponseType { @XmlElements({ - @XmlElement(name = "SignatureEnvironment", type = byte[].class), + @XmlElement(name = "SignatureEnvironment", type = CreateXMLSignatureResponseType.SignatureEnvironment.class), @XmlElement(name = "ErrorResponse", type = ErrorResponseType.class) }) protected List<Object> signatureEnvironmentOrErrorResponse; @@ -67,7 +79,8 @@ public class CreateXMLSignatureResponseType { * * <p> * Objects of the following type(s) are allowed in the list - * byte[] {@link ErrorResponseType } + * {@link CreateXMLSignatureResponseType.SignatureEnvironment } + * {@link ErrorResponseType } * * */ @@ -78,4 +91,61 @@ public class CreateXMLSignatureResponseType { return this.signatureEnvironmentOrErrorResponse; } + + /** + * <p>Java class for anonymous complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <any processContents='lax'/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "any" + }) + public static class SignatureEnvironment { + + @XmlAnyElement(lax = true) + protected Object any; + + /** + * Gets the value of the any property. + * + * @return + * possible object is + * {@link Object } + * {@link Element } + * + */ + public Object getAny() { + return any; + } + + /** + * Sets the value of the any property. + * + * @param value + * allowed object is + * {@link Object } + * {@link Element } + * + */ + public void setAny(Object value) { + this.any = value; + } + + } + } diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DSAKeyValueType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DSAKeyValueType.java index e0586c9..8ede63c 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DSAKeyValueType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DSAKeyValueType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DataObjectInfoType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DataObjectInfoType.java index 16fc1e4..f2b6f0d 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DataObjectInfoType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DataObjectInfoType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -31,14 +31,14 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; * <element name="DataObject"> * <complexType> * <complexContent> - * <extension base="{http://reference.e-government.gv.at/namespace/moa/20151109#}ContentOptionalRefType"> + * <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentOptionalRefType"> * </extension> * </complexContent> * </complexType> * </element> * <choice> - * <element ref="{http://reference.e-government.gv.at/namespace/moa/20151109#}CreateTransformsInfoProfile"/> - * <element name="CreateTransformsInfoProfileID" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}ProfileIdentifierType"/> + * <element ref="{http://reference.e-government.gv.at/namespace/moa/20020822#}CreateTransformsInfoProfile"/> + * <element name="CreateTransformsInfoProfileID" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ProfileIdentifierType"/> * </choice> * </sequence> * <attribute name="Structure" use="required"> @@ -182,7 +182,7 @@ public class DataObjectInfoType { * <pre> * <complexType> * <complexContent> - * <extension base="{http://reference.e-government.gv.at/namespace/moa/20151109#}ContentOptionalRefType"> + * <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentOptionalRefType"> * </extension> * </complexContent> * </complexType> diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DigestMethodType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DigestMethodType.java index 647ac8f..ebea4f0 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DigestMethodType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DigestMethodType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -71,9 +71,9 @@ public class DigestMethodType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link Element } - * {@link Object } * {@link String } + * {@link Object } + * {@link Element } * * */ diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ErrorResponseType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ErrorResponseType.java index 48728a7..e9f52c0 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ErrorResponseType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ErrorResponseType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ExtendedCertificateCheckResultType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ExtendedCertificateCheckResultType.java index 7f5929b..a4d9383 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ExtendedCertificateCheckResultType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ExtendedCertificateCheckResultType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -24,8 +24,8 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="Major" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}IndicationResultType"/> - * <element name="Minor" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}IndicationResultType" minOccurs="0"/> + * <element name="Major" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}IndicationResultType"/> + * <element name="Minor" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}IndicationResultType" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/FinalDataMetaInfoType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/FinalDataMetaInfoType.java index d353f07..412b0b0 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/FinalDataMetaInfoType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/FinalDataMetaInfoType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlType; * <pre> * <complexType name="FinalDataMetaInfoType"> * <complexContent> - * <extension base="{http://reference.e-government.gv.at/namespace/moa/20151109#}MetaInfoType"> + * <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}MetaInfoType"> * <sequence> * <element name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/> * </sequence> diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/FormResultType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/FormResultType.java index 8661a78..dc0ed43 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/FormResultType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/FormResultType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/IndicationResultType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/IndicationResultType.java index d297898..0faa9e2 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/IndicationResultType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/IndicationResultType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/InputDataType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/InputDataType.java index 55daace..f65fd08 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/InputDataType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/InputDataType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -26,7 +26,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; * <pre> * <complexType name="InputDataType"> * <complexContent> - * <extension base="{http://reference.e-government.gv.at/namespace/moa/20151109#}ContentExLocRefBaseType"> + * <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentExLocRefBaseType"> * <attribute name="PartOf" default="SignedInfo"> * <simpleType> * <restriction base="{http://www.w3.org/2001/XMLSchema}token"> diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyInfoType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyInfoType.java index 3d0a2db..1477677 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyInfoType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyInfoType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -60,13 +60,13 @@ import org.w3c.dom.Element; public class KeyInfoType { @XmlElementRefs({ - @XmlElementRef(name = "KeyName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "MgmtData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "SPKIData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), @XmlElementRef(name = "PGPData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), @XmlElementRef(name = "KeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), + @XmlElementRef(name = "MgmtData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), @XmlElementRef(name = "X509Data", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "RetrievalMethod", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) + @XmlElementRef(name = "SPKIData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), + @XmlElementRef(name = "RetrievalMethod", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), + @XmlElementRef(name = "KeyName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) }) @XmlMixed @XmlAnyElement(lax = true) @@ -96,15 +96,15 @@ public class KeyInfoType { * <p> * Objects of the following type(s) are allowed in the list * {@link Object } - * {@link JAXBElement }{@code <}{@link String }{@code >} - * {@link JAXBElement }{@code <}{@link String }{@code >} - * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >} * {@link JAXBElement }{@code <}{@link PGPDataType }{@code >} - * {@link JAXBElement }{@code <}{@link KeyValueType }{@code >} * {@link String } + * {@link JAXBElement }{@code <}{@link KeyValueType }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link X509DataType }{@code >} + * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >} * {@link Element } * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >} - * {@link JAXBElement }{@code <}{@link X509DataType }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} * * */ diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyStorageType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyStorageType.java index 5bab822..794177d 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyStorageType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyStorageType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyValueType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyValueType.java index f2368dd..0816a93 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyValueType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyValueType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -74,10 +74,10 @@ public class KeyValueType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link Object } * {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >} - * {@link Element } * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >} + * {@link Object } + * {@link Element } * {@link String } * * diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestRefsCheckResultInfoType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestRefsCheckResultInfoType.java index 3ecbcee..33f8591 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestRefsCheckResultInfoType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestRefsCheckResultInfoType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -21,11 +21,11 @@ import javax.xml.bind.annotation.XmlType; * <pre> * <complexType name="ManifestRefsCheckResultInfoType"> * <complexContent> - * <restriction base="{http://reference.e-government.gv.at/namespace/moa/20151109#}AnyChildrenType"> + * <restriction base="{http://reference.e-government.gv.at/namespace/moa/20020822#}AnyChildrenType"> * <sequence> * <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/> - * <element ref="{http://reference.e-government.gv.at/namespace/moa/20151109#}FailedReference" maxOccurs="unbounded" minOccurs="0"/> - * <element ref="{http://reference.e-government.gv.at/namespace/moa/20151109#}ReferringSigReference"/> + * <element name="FailedReference" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" maxOccurs="unbounded" minOccurs="0"/> + * <element name="ReferringSigReference" type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/> * </sequence> * </restriction> * </complexContent> diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestRefsCheckResultType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestRefsCheckResultType.java index 98b0b63..36f46f0 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestRefsCheckResultType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestRefsCheckResultType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -21,10 +21,10 @@ import javax.xml.bind.annotation.XmlType; * <pre> * <complexType name="ManifestRefsCheckResultType"> * <complexContent> - * <restriction base="{http://reference.e-government.gv.at/namespace/moa/20151109#}CheckResultType"> + * <restriction base="{http://reference.e-government.gv.at/namespace/moa/20020822#}CheckResultType"> * <sequence> * <element name="Code" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger"/> - * <element name="Info" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}ManifestRefsCheckResultInfoType"/> + * <element name="Info" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ManifestRefsCheckResultInfoType"/> * </sequence> * </restriction> * </complexContent> diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestType.java index 1ebead3..3158144 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MetaInfoType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MetaInfoType.java index 75b927c..9e8a00c 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MetaInfoType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MetaInfoType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -31,7 +31,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="MimeType" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}MimeTypeType"/> + * <element name="MimeType" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}MimeTypeType"/> * <element name="Description" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/> * <any namespace='##other' maxOccurs="unbounded" minOccurs="0"/> * </sequence> diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ObjectFactory.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ObjectFactory.java index a0436fe..0de1aad 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ObjectFactory.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ObjectFactory.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -34,61 +34,58 @@ import javax.xml.namespace.QName; @XmlRegistry public class ObjectFactory { - private final static QName _PGPData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPData"); - private final static QName _Signature_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Signature"); - private final static QName _DSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DSAKeyValue"); + private final static QName _IssuingCountry_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "IssuingCountry"); private final static QName _SPKIData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKIData"); - private final static QName _ErrorResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "ErrorResponse"); - private final static QName _SignedInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignedInfo"); - private final static QName _RetrievalMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RetrievalMethod"); - private final static QName _VerifyXMLSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "VerifyXMLSignatureResponse"); - private final static QName _CanonicalizationMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "CanonicalizationMethod"); - private final static QName _Object_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Object"); - private final static QName _VerifyPDFSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "VerifyPDFSignatureResponse"); - private final static QName _FailedReference_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "FailedReference"); - private final static QName _Supplement_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "Supplement"); - private final static QName _SignatureProperty_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperty"); - private final static QName _Transforms_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transforms"); - private final static QName _SignatureValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureValue"); - private final static QName _Manifest_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Manifest"); - private final static QName _Transform_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transform"); - private final static QName _X509Data_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Data"); - private final static QName _IssuingCountry_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "IssuingCountry"); - private final static QName _CreateXMLSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "CreateXMLSignatureResponse"); - private final static QName _SignatureMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureMethod"); private final static QName _KeyInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyInfo"); - private final static QName _SupplementProfile_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "SupplementProfile"); - private final static QName _CreateCMSSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "CreateCMSSignatureResponse"); - private final static QName _VerifyCMSSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "VerifyCMSSignatureResponse"); + private final static QName _PublicAuthority_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "PublicAuthority"); + private final static QName _SignatureValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureValue"); + private final static QName _VerifyXMLSignatureRequest_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "VerifyXMLSignatureRequest"); + private final static QName _VerifyPDFSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "VerifyPDFSignatureResponse"); + private final static QName _KeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyValue"); + private final static QName _Transforms_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transforms"); + private final static QName _VerifyCMSSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "VerifyCMSSignatureResponse"); private final static QName _DigestMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestMethod"); - private final static QName _DigestValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestValue"); + private final static QName _CreateCMSSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "CreateCMSSignatureResponse"); + private final static QName _X509Data_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Data"); + private final static QName _SignatureProperty_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperty"); + private final static QName _KeyName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyName"); + private final static QName _RSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RSAKeyValue"); + private final static QName _Signature_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Signature"); + private final static QName _Supplement_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "Supplement"); private final static QName _MgmtData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "MgmtData"); + private final static QName _SignatureMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureMethod"); + private final static QName _Object_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Object"); private final static QName _SignatureProperties_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperties"); - private final static QName _KeyName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyName"); - private final static QName _KeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyValue"); + private final static QName _VerifyXMLSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "VerifyXMLSignatureResponse"); + private final static QName _Transform_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transform"); + private final static QName _ErrorResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "ErrorResponse"); + private final static QName _PGPData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPData"); private final static QName _Reference_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Reference"); - private final static QName _PublicAuthority_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "PublicAuthority"); - private final static QName _MoaTransform_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "MoaTransform"); - private final static QName _ReferringSigReference_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "ReferringSigReference"); - private final static QName _RSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RSAKeyValue"); - private final static QName _MoaTransforms_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "MoaTransforms"); + private final static QName _RetrievalMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RetrievalMethod"); + private final static QName _DSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DSAKeyValue"); + private final static QName _DigestValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestValue"); + private final static QName _CreateXMLSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "CreateXMLSignatureResponse"); + private final static QName _CanonicalizationMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "CanonicalizationMethod"); + private final static QName _CreatePDFSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "CreatePDFSignatureResponse"); + private final static QName _SignedInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignedInfo"); + private final static QName _VerifyASICSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "VerifyASICSignatureResponse"); + private final static QName _SupplementProfile_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "SupplementProfile"); + private final static QName _Manifest_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Manifest"); + private final static QName _TransformTypeXPath_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "XPath"); private final static QName _SPKIDataTypeSPKISexp_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKISexp"); private final static QName _X509DataTypeX509IssuerSerial_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509IssuerSerial"); - private final static QName _X509DataTypeX509Certificate_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Certificate"); - private final static QName _X509DataTypeX509SKI_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SKI"); - private final static QName _X509DataTypeX509SubjectName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SubjectName"); private final static QName _X509DataTypeX509CRL_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509CRL"); + private final static QName _X509DataTypeX509SubjectName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SubjectName"); + private final static QName _X509DataTypeX509SKI_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SKI"); + private final static QName _X509DataTypeX509Certificate_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Certificate"); private final static QName _PGPDataTypePGPKeyID_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyID"); private final static QName _PGPDataTypePGPKeyPacket_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyPacket"); - private final static QName _TransformTypeXPath_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "XPath"); private final static QName _SignatureMethodTypeHMACOutputLength_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "HMACOutputLength"); - private final static QName _MoaTransformTypeTransformData_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "transformData"); - private final static QName _MoaTransformTypeXPath_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "XPath"); - private final static QName _VerifyCMSSignatureResponseTypeSignatureCheck_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "SignatureCheck"); - private final static QName _VerifyCMSSignatureResponseTypeCertificateCheck_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "CertificateCheck"); - private final static QName _VerifyCMSSignatureResponseTypeSignerInfo_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "SignerInfo"); - private final static QName _VerifyCMSSignatureResponseTypeExtendedCertificateCheck_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "ExtendedCertificateCheck"); - private final static QName _VerifyCMSSignatureResponseTypeFormCheckResult_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "FormCheckResult"); + private final static QName _VerifyCMSSignatureResponseTypeExtendedCertificateCheck_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "ExtendedCertificateCheck"); + private final static QName _VerifyCMSSignatureResponseTypeFormCheckResult_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "FormCheckResult"); + 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"); /** * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.gv.egiz.moasig @@ -106,19 +103,19 @@ public class ObjectFactory { } /** - * Create an instance of {@link CreateCMSSignatureRequestType } + * Create an instance of {@link CreatePDFSignatureRequestType } * */ - public CreateCMSSignatureRequestType createCreateCMSSignatureRequestType() { - return new CreateCMSSignatureRequestType(); + public CreatePDFSignatureRequestType createCreatePDFSignatureRequestType() { + return new CreatePDFSignatureRequestType(); } /** - * Create an instance of {@link VerifyXMLSignatureRequestType } + * Create an instance of {@link CreateCMSSignatureRequestType } * */ - public VerifyXMLSignatureRequestType createVerifyXMLSignatureRequestType() { - return new VerifyXMLSignatureRequestType(); + public CreateCMSSignatureRequestType createCreateCMSSignatureRequestType() { + return new CreateCMSSignatureRequestType(); } /** @@ -130,19 +127,27 @@ public class ObjectFactory { } /** - * Create an instance of {@link CreateCMSSignatureRequestType.SingleSignatureInfo } + * Create an instance of {@link CMSDataObjectInfoType } * */ - public CreateCMSSignatureRequestType.SingleSignatureInfo createCreateCMSSignatureRequestTypeSingleSignatureInfo() { - return new CreateCMSSignatureRequestType.SingleSignatureInfo(); + public CMSDataObjectInfoType createCMSDataObjectInfoType() { + return new CMSDataObjectInfoType(); } /** - * Create an instance of {@link TransformParameterType } + * Create an instance of {@link VerifyXMLSignatureRequestType } * */ - public TransformParameterType createTransformParameterType() { - return new TransformParameterType(); + public VerifyXMLSignatureRequestType createVerifyXMLSignatureRequestType() { + return new VerifyXMLSignatureRequestType(); + } + + /** + * Create an instance of {@link CreateCMSSignatureRequestType.SingleSignatureInfo } + * + */ + public CreateCMSSignatureRequestType.SingleSignatureInfo createCreateCMSSignatureRequestTypeSingleSignatureInfo() { + return new CreateCMSSignatureRequestType.SingleSignatureInfo(); } /** @@ -154,51 +159,51 @@ public class ObjectFactory { } /** - * Create an instance of {@link VerifyXMLSignatureResponseType } + * Create an instance of {@link TransformParameterType } * */ - public VerifyXMLSignatureResponseType createVerifyXMLSignatureResponseType() { - return new VerifyXMLSignatureResponseType(); + public TransformParameterType createTransformParameterType() { + return new TransformParameterType(); } /** - * Create an instance of {@link VerifyPDFSignatureResponseType } + * Create an instance of {@link CreateXMLSignatureResponseType } * */ - public VerifyPDFSignatureResponseType createVerifyPDFSignatureResponseType() { - return new VerifyPDFSignatureResponseType(); + public CreateXMLSignatureResponseType createCreateXMLSignatureResponseType() { + return new CreateXMLSignatureResponseType(); } /** - * Create an instance of {@link PublicAuthorityType } + * Create an instance of {@link VerifyASICSignatureRequest } * */ - public PublicAuthorityType createPublicAuthorityType() { - return new PublicAuthorityType(); + public VerifyASICSignatureRequest createVerifyASICSignatureRequest() { + return new VerifyASICSignatureRequest(); } /** - * Create an instance of {@link VerifyCMSSignatureRequest } + * Create an instance of {@link VerifyASICSignatureRequestType } * */ - public VerifyCMSSignatureRequest createVerifyCMSSignatureRequest() { - return new VerifyCMSSignatureRequest(); + public VerifyASICSignatureRequestType createVerifyASICSignatureRequestType() { + return new VerifyASICSignatureRequestType(); } /** - * Create an instance of {@link VerifyCMSSignatureRequestType } + * Create an instance of {@link VerifyASICSignatureResponseType } * */ - public VerifyCMSSignatureRequestType createVerifyCMSSignatureRequestType() { - return new VerifyCMSSignatureRequestType(); + public VerifyASICSignatureResponseType createVerifyASICSignatureResponseType() { + return new VerifyASICSignatureResponseType(); } /** - * Create an instance of {@link CMSDataObjectOptionalMetaType } + * Create an instance of {@link QualifiedCertificate } * */ - public CMSDataObjectOptionalMetaType createCMSDataObjectOptionalMetaType() { - return new CMSDataObjectOptionalMetaType(); + public QualifiedCertificate createQualifiedCertificate() { + return new QualifiedCertificate(); } /** @@ -210,203 +215,195 @@ public class ObjectFactory { } /** - * Create an instance of {@link MoaTransformType } - * - */ - public MoaTransformType createMoaTransformType() { - return new MoaTransformType(); - } - - /** - * Create an instance of {@link QualifiedCertificate } + * Create an instance of {@link CreateCMSSignatureResponseType } * */ - public QualifiedCertificate createQualifiedCertificate() { - return new QualifiedCertificate(); + public CreateCMSSignatureResponseType createCreateCMSSignatureResponseType() { + return new CreateCMSSignatureResponseType(); } /** - * Create an instance of {@link MoaTransformsType } + * Create an instance of {@link CreatePDFSignatureResponseType } * */ - public MoaTransformsType createMoaTransformsType() { - return new MoaTransformsType(); + public CreatePDFSignatureResponseType createCreatePDFSignatureResponseType() { + return new CreatePDFSignatureResponseType(); } /** - * Create an instance of {@link CreateXMLSignatureRequest } + * Create an instance of {@link VerifyPDFSignatureRequest } * */ - public CreateXMLSignatureRequest createCreateXMLSignatureRequest() { - return new CreateXMLSignatureRequest(); + public VerifyPDFSignatureRequest createVerifyPDFSignatureRequest() { + return new VerifyPDFSignatureRequest(); } /** - * Create an instance of {@link VerifyTransformsInfoProfile } + * Create an instance of {@link VerifyPDFSignatureRequestType } * */ - public VerifyTransformsInfoProfile createVerifyTransformsInfoProfile() { - return new VerifyTransformsInfoProfile(); + public VerifyPDFSignatureRequestType createVerifyPDFSignatureRequestType() { + return new VerifyPDFSignatureRequestType(); } /** - * Create an instance of {@link VerifyPDFSignatureRequest } + * Create an instance of {@link CreateTransformsInfoProfile } * */ - public VerifyPDFSignatureRequest createVerifyPDFSignatureRequest() { - return new VerifyPDFSignatureRequest(); + public CreateTransformsInfoProfile createCreateTransformsInfoProfile() { + return new CreateTransformsInfoProfile(); } /** - * Create an instance of {@link VerifyPDFSignatureRequestType } + * Create an instance of {@link TransformsInfoType } * */ - public VerifyPDFSignatureRequestType createVerifyPDFSignatureRequestType() { - return new VerifyPDFSignatureRequestType(); + public TransformsInfoType createTransformsInfoType() { + return new TransformsInfoType(); } /** - * Create an instance of {@link CreateXMLSignatureResponseType } + * Create an instance of {@link VerifyCMSSignatureRequest } * */ - public CreateXMLSignatureResponseType createCreateXMLSignatureResponseType() { - return new CreateXMLSignatureResponseType(); + public VerifyCMSSignatureRequest createVerifyCMSSignatureRequest() { + return new VerifyCMSSignatureRequest(); } /** - * Create an instance of {@link CreateCMSSignatureRequest } + * Create an instance of {@link VerifyCMSSignatureRequestType } * */ - public CreateCMSSignatureRequest createCreateCMSSignatureRequest() { - return new CreateCMSSignatureRequest(); + public VerifyCMSSignatureRequestType createVerifyCMSSignatureRequestType() { + return new VerifyCMSSignatureRequestType(); } /** - * Create an instance of {@link ErrorResponseType } + * Create an instance of {@link CMSDataObjectOptionalMetaType } * */ - public ErrorResponseType createErrorResponseType() { - return new ErrorResponseType(); + public CMSDataObjectOptionalMetaType createCMSDataObjectOptionalMetaType() { + return new CMSDataObjectOptionalMetaType(); } /** - * Create an instance of {@link VerifyXMLSignatureRequest } + * Create an instance of {@link VerifyCMSSignatureResponseType } * */ - public VerifyXMLSignatureRequest createVerifyXMLSignatureRequest() { - return new VerifyXMLSignatureRequest(); + public VerifyCMSSignatureResponseType createVerifyCMSSignatureResponseType() { + return new VerifyCMSSignatureResponseType(); } /** - * Create an instance of {@link VerifyXMLSignatureRequestType.VerifySignatureInfo } + * Create an instance of {@link SecureSignatureCreationDevice } * */ - public VerifyXMLSignatureRequestType.VerifySignatureInfo createVerifyXMLSignatureRequestTypeVerifySignatureInfo() { - return new VerifyXMLSignatureRequestType.VerifySignatureInfo(); + public SecureSignatureCreationDevice createSecureSignatureCreationDevice() { + return new SecureSignatureCreationDevice(); } /** - * Create an instance of {@link VerifyXMLSignatureRequestType.SignatureManifestCheckParams } + * Create an instance of {@link VerifyTransformsInfoProfile } * */ - public VerifyXMLSignatureRequestType.SignatureManifestCheckParams createVerifyXMLSignatureRequestTypeSignatureManifestCheckParams() { - return new VerifyXMLSignatureRequestType.SignatureManifestCheckParams(); + public VerifyTransformsInfoProfile createVerifyTransformsInfoProfile() { + return new VerifyTransformsInfoProfile(); } /** - * Create an instance of {@link CreateSignatureEnvironmentProfile } + * Create an instance of {@link TransformsType } * */ - public CreateSignatureEnvironmentProfile createCreateSignatureEnvironmentProfile() { - return new CreateSignatureEnvironmentProfile(); + public TransformsType createTransformsType() { + return new TransformsType(); } /** - * Create an instance of {@link CreateSignatureLocationType } + * Create an instance of {@link ErrorResponseType } * */ - public CreateSignatureLocationType createCreateSignatureLocationType() { - return new CreateSignatureLocationType(); + public ErrorResponseType createErrorResponseType() { + return new ErrorResponseType(); } /** - * Create an instance of {@link SecureSignatureCreationDevice } + * Create an instance of {@link VerifyPDFSignatureResponseType } * */ - public SecureSignatureCreationDevice createSecureSignatureCreationDevice() { - return new SecureSignatureCreationDevice(); + public VerifyPDFSignatureResponseType createVerifyPDFSignatureResponseType() { + return new VerifyPDFSignatureResponseType(); } /** - * Create an instance of {@link CreateCMSSignatureResponseType } + * Create an instance of {@link VerifyXMLSignatureResponseType } * */ - public CreateCMSSignatureResponseType createCreateCMSSignatureResponseType() { - return new CreateCMSSignatureResponseType(); + public VerifyXMLSignatureResponseType createVerifyXMLSignatureResponseType() { + return new VerifyXMLSignatureResponseType(); } /** - * Create an instance of {@link VerifyCMSSignatureResponseType } + * Create an instance of {@link CreateSignatureEnvironmentProfile } * */ - public VerifyCMSSignatureResponseType createVerifyCMSSignatureResponseType() { - return new VerifyCMSSignatureResponseType(); + public CreateSignatureEnvironmentProfile createCreateSignatureEnvironmentProfile() { + return new CreateSignatureEnvironmentProfile(); } /** - * Create an instance of {@link CreateTransformsInfoProfile } + * Create an instance of {@link CreateSignatureLocationType } * */ - public CreateTransformsInfoProfile createCreateTransformsInfoProfile() { - return new CreateTransformsInfoProfile(); + public CreateSignatureLocationType createCreateSignatureLocationType() { + return new CreateSignatureLocationType(); } /** - * Create an instance of {@link TransformsInfoType } + * Create an instance of {@link CreateXMLSignatureRequest } * */ - public TransformsInfoType createTransformsInfoType() { - return new TransformsInfoType(); + public CreateXMLSignatureRequest createCreateXMLSignatureRequest() { + return new CreateXMLSignatureRequest(); } /** - * Create an instance of {@link ManifestRefsCheckResultType } + * Create an instance of {@link CreatePDFSignatureRequest } * */ - public ManifestRefsCheckResultType createManifestRefsCheckResultType() { - return new ManifestRefsCheckResultType(); + public CreatePDFSignatureRequest createCreatePDFSignatureRequest() { + return new CreatePDFSignatureRequest(); } /** - * Create an instance of {@link CheckResultType } + * Create an instance of {@link CreatePDFSignatureRequestType.SingleSignatureInfo } * */ - public CheckResultType createCheckResultType() { - return new CheckResultType(); + public CreatePDFSignatureRequestType.SingleSignatureInfo createCreatePDFSignatureRequestTypeSingleSignatureInfo() { + return new CreatePDFSignatureRequestType.SingleSignatureInfo(); } /** - * Create an instance of {@link IndicationResultType } + * Create an instance of {@link CreateCMSSignatureRequest } * */ - public IndicationResultType createIndicationResultType() { - return new IndicationResultType(); + public CreateCMSSignatureRequest createCreateCMSSignatureRequest() { + return new CreateCMSSignatureRequest(); } /** - * Create an instance of {@link ExtendedCertificateCheckResultType } + * Create an instance of {@link PublicAuthorityType } * */ - public ExtendedCertificateCheckResultType createExtendedCertificateCheckResultType() { - return new ExtendedCertificateCheckResultType(); + public PublicAuthorityType createPublicAuthorityType() { + return new PublicAuthorityType(); } /** - * Create an instance of {@link ContentExLocRefBaseType } + * Create an instance of {@link ManifestRefsCheckResultInfoType } * */ - public ContentExLocRefBaseType createContentExLocRefBaseType() { - return new ContentExLocRefBaseType(); + public ManifestRefsCheckResultInfoType createManifestRefsCheckResultInfoType() { + return new ManifestRefsCheckResultInfoType(); } /** @@ -418,67 +415,67 @@ public class ObjectFactory { } /** - * Create an instance of {@link ContentRequiredRefType } + * Create an instance of {@link MetaInfoType } * */ - public ContentRequiredRefType createContentRequiredRefType() { - return new ContentRequiredRefType(); + public MetaInfoType createMetaInfoType() { + return new MetaInfoType(); } /** - * Create an instance of {@link NamespaceDeclarationType } + * Create an instance of {@link PDFSignedRepsonse } * */ - public NamespaceDeclarationType createNamespaceDeclarationType() { - return new NamespaceDeclarationType(); + public PDFSignedRepsonse createPDFSignedRepsonse() { + return new PDFSignedRepsonse(); } /** - * Create an instance of {@link CMSContentBaseType } + * Create an instance of {@link InputDataType } * */ - public CMSContentBaseType createCMSContentBaseType() { - return new CMSContentBaseType(); + public InputDataType createInputDataType() { + return new InputDataType(); } /** - * Create an instance of {@link FormResultType } + * Create an instance of {@link ContentExLocRefBaseType } * */ - public FormResultType createFormResultType() { - return new FormResultType(); + public ContentExLocRefBaseType createContentExLocRefBaseType() { + return new ContentExLocRefBaseType(); } /** - * Create an instance of {@link XMLSignatureLocationType } + * Create an instance of {@link AnyChildrenType } * */ - public XMLSignatureLocationType createXMLSignatureLocationType() { - return new XMLSignatureLocationType(); + public AnyChildrenType createAnyChildrenType() { + return new AnyChildrenType(); } /** - * Create an instance of {@link InputDataType } + * Create an instance of {@link CMSContentBaseType } * */ - public InputDataType createInputDataType() { - return new InputDataType(); + public CMSContentBaseType createCMSContentBaseType() { + return new CMSContentBaseType(); } /** - * Create an instance of {@link ContentBaseType } + * Create an instance of {@link ReferencesCheckResultType } * */ - public ContentBaseType createContentBaseType() { - return new ContentBaseType(); + public ReferencesCheckResultType createReferencesCheckResultType() { + return new ReferencesCheckResultType(); } /** - * Create an instance of {@link FinalDataMetaInfoType } + * Create an instance of {@link ManifestRefsCheckResultType } * */ - public FinalDataMetaInfoType createFinalDataMetaInfoType() { - return new FinalDataMetaInfoType(); + public ManifestRefsCheckResultType createManifestRefsCheckResultType() { + return new ManifestRefsCheckResultType(); } /** @@ -490,179 +487,179 @@ public class ObjectFactory { } /** - * Create an instance of {@link PDFSignedRepsonse } + * Create an instance of {@link CheckResultType } * */ - public PDFSignedRepsonse createPDFSignedRepsonse() { - return new PDFSignedRepsonse(); + public CheckResultType createCheckResultType() { + return new CheckResultType(); } /** - * Create an instance of {@link ReferencesCheckResultInfoType } + * Create an instance of {@link IndicationResultType } * */ - public ReferencesCheckResultInfoType createReferencesCheckResultInfoType() { - return new ReferencesCheckResultInfoType(); + public IndicationResultType createIndicationResultType() { + return new IndicationResultType(); } /** - * Create an instance of {@link CMSDataObjectRequiredMetaType } + * Create an instance of {@link XMLContentType } * */ - public CMSDataObjectRequiredMetaType createCMSDataObjectRequiredMetaType() { - return new CMSDataObjectRequiredMetaType(); + public XMLContentType createXMLContentType() { + return new XMLContentType(); } /** - * Create an instance of {@link MetaInfoType } + * Create an instance of {@link ContentBaseType } * */ - public MetaInfoType createMetaInfoType() { - return new MetaInfoType(); + public ContentBaseType createContentBaseType() { + return new ContentBaseType(); } /** - * Create an instance of {@link ReferencesCheckResultType } + * Create an instance of {@link CMSDataObjectRequiredMetaType } * */ - public ReferencesCheckResultType createReferencesCheckResultType() { - return new ReferencesCheckResultType(); + public CMSDataObjectRequiredMetaType createCMSDataObjectRequiredMetaType() { + return new CMSDataObjectRequiredMetaType(); } /** - * Create an instance of {@link ManifestRefsCheckResultInfoType } + * Create an instance of {@link FormResultType } * */ - public ManifestRefsCheckResultInfoType createManifestRefsCheckResultInfoType() { - return new ManifestRefsCheckResultInfoType(); + public FormResultType createFormResultType() { + return new FormResultType(); } /** - * Create an instance of {@link AnyChildrenType } + * Create an instance of {@link FinalDataMetaInfoType } * */ - public AnyChildrenType createAnyChildrenType() { - return new AnyChildrenType(); + public FinalDataMetaInfoType createFinalDataMetaInfoType() { + return new FinalDataMetaInfoType(); } /** - * Create an instance of {@link ContentOptionalRefType } + * Create an instance of {@link ExtendedCertificateCheckResultType } * */ - public ContentOptionalRefType createContentOptionalRefType() { - return new ContentOptionalRefType(); + public ExtendedCertificateCheckResultType createExtendedCertificateCheckResultType() { + return new ExtendedCertificateCheckResultType(); } /** - * Create an instance of {@link CMSDataObjectInfoType } + * Create an instance of {@link ContentOptionalRefType } * */ - public CMSDataObjectInfoType createCMSDataObjectInfoType() { - return new CMSDataObjectInfoType(); + public ContentOptionalRefType createContentOptionalRefType() { + return new ContentOptionalRefType(); } /** - * Create an instance of {@link KeyInfoType } + * Create an instance of {@link ReferencesCheckResultInfoType } * */ - public KeyInfoType createKeyInfoType() { - return new KeyInfoType(); + public ReferencesCheckResultInfoType createReferencesCheckResultInfoType() { + return new ReferencesCheckResultInfoType(); } /** - * Create an instance of {@link SignedInfoType } + * Create an instance of {@link ContentRequiredRefType } * */ - public SignedInfoType createSignedInfoType() { - return new SignedInfoType(); + public ContentRequiredRefType createContentRequiredRefType() { + return new ContentRequiredRefType(); } /** - * Create an instance of {@link RetrievalMethodType } + * Create an instance of {@link PGPDataType } * */ - public RetrievalMethodType createRetrievalMethodType() { - return new RetrievalMethodType(); + public PGPDataType createPGPDataType() { + return new PGPDataType(); } /** - * Create an instance of {@link DigestMethodType } + * Create an instance of {@link KeyValueType } * */ - public DigestMethodType createDigestMethodType() { - return new DigestMethodType(); + public KeyValueType createKeyValueType() { + return new KeyValueType(); } /** - * Create an instance of {@link SignatureMethodType } + * Create an instance of {@link DSAKeyValueType } * */ - public SignatureMethodType createSignatureMethodType() { - return new SignatureMethodType(); + public DSAKeyValueType createDSAKeyValueType() { + return new DSAKeyValueType(); } /** - * Create an instance of {@link SPKIDataType } + * Create an instance of {@link ReferenceType } * */ - public SPKIDataType createSPKIDataType() { - return new SPKIDataType(); + public ReferenceType createReferenceType() { + return new ReferenceType(); } /** - * Create an instance of {@link X509DataType } + * Create an instance of {@link RetrievalMethodType } * */ - public X509DataType createX509DataType() { - return new X509DataType(); + public RetrievalMethodType createRetrievalMethodType() { + return new RetrievalMethodType(); } /** - * Create an instance of {@link PGPDataType } + * Create an instance of {@link CanonicalizationMethodType } * */ - public PGPDataType createPGPDataType() { - return new PGPDataType(); + public CanonicalizationMethodType createCanonicalizationMethodType() { + return new CanonicalizationMethodType(); } /** - * Create an instance of {@link SignatureType } + * Create an instance of {@link DigestMethodType } * */ - public SignatureType createSignatureType() { - return new SignatureType(); + public DigestMethodType createDigestMethodType() { + return new DigestMethodType(); } /** - * Create an instance of {@link DSAKeyValueType } + * Create an instance of {@link ManifestType } * */ - public DSAKeyValueType createDSAKeyValueType() { - return new DSAKeyValueType(); + public ManifestType createManifestType() { + return new ManifestType(); } /** - * Create an instance of {@link ManifestType } + * Create an instance of {@link SignaturePropertyType } * */ - public ManifestType createManifestType() { - return new ManifestType(); + public SignaturePropertyType createSignaturePropertyType() { + return new SignaturePropertyType(); } /** - * Create an instance of {@link SignatureValueType } + * Create an instance of {@link X509DataType } * */ - public SignatureValueType createSignatureValueType() { - return new SignatureValueType(); + public X509DataType createX509DataType() { + return new X509DataType(); } /** - * Create an instance of {@link TransformsType } + * Create an instance of {@link SignedInfoType } * */ - public TransformsType createTransformsType() { - return new TransformsType(); + public SignedInfoType createSignedInfoType() { + return new SignedInfoType(); } /** @@ -674,51 +671,51 @@ public class ObjectFactory { } /** - * Create an instance of {@link TransformType } + * Create an instance of {@link SPKIDataType } * */ - public TransformType createTransformType() { - return new TransformType(); + public SPKIDataType createSPKIDataType() { + return new SPKIDataType(); } /** - * Create an instance of {@link SignaturePropertyType } + * Create an instance of {@link SignatureValueType } * */ - public SignaturePropertyType createSignaturePropertyType() { - return new SignaturePropertyType(); + public SignatureValueType createSignatureValueType() { + return new SignatureValueType(); } /** - * Create an instance of {@link KeyValueType } + * Create an instance of {@link KeyInfoType } * */ - public KeyValueType createKeyValueType() { - return new KeyValueType(); + public KeyInfoType createKeyInfoType() { + return new KeyInfoType(); } /** - * Create an instance of {@link ReferenceType } + * Create an instance of {@link SignatureType } * */ - public ReferenceType createReferenceType() { - return new ReferenceType(); + public SignatureType createSignatureType() { + return new SignatureType(); } /** - * Create an instance of {@link CanonicalizationMethodType } + * Create an instance of {@link SignaturePropertiesType } * */ - public CanonicalizationMethodType createCanonicalizationMethodType() { - return new CanonicalizationMethodType(); + public SignaturePropertiesType createSignaturePropertiesType() { + return new SignaturePropertiesType(); } /** - * Create an instance of {@link SignaturePropertiesType } + * Create an instance of {@link SignatureMethodType } * */ - public SignaturePropertiesType createSignaturePropertiesType() { - return new SignaturePropertiesType(); + public SignatureMethodType createSignatureMethodType() { + return new SignatureMethodType(); } /** @@ -730,6 +727,14 @@ public class ObjectFactory { } /** + * Create an instance of {@link TransformType } + * + */ + public TransformType createTransformType() { + return new TransformType(); + } + + /** * Create an instance of {@link X509IssuerSerialType } * */ @@ -746,19 +751,35 @@ public class ObjectFactory { } /** - * Create an instance of {@link CreateCMSSignatureRequestType.SingleSignatureInfo.DataObjectInfo } + * Create an instance of {@link CMSDataObjectInfoType.DataObject } * */ - public CreateCMSSignatureRequestType.SingleSignatureInfo.DataObjectInfo createCreateCMSSignatureRequestTypeSingleSignatureInfoDataObjectInfo() { - return new CreateCMSSignatureRequestType.SingleSignatureInfo.DataObjectInfo(); + public CMSDataObjectInfoType.DataObject createCMSDataObjectInfoTypeDataObject() { + return new CMSDataObjectInfoType.DataObject(); } /** - * Create an instance of {@link TransformParameterType.Hash } + * Create an instance of {@link VerifyXMLSignatureRequestType.VerifySignatureInfo } * */ - public TransformParameterType.Hash createTransformParameterTypeHash() { - return new TransformParameterType.Hash(); + public VerifyXMLSignatureRequestType.VerifySignatureInfo createVerifyXMLSignatureRequestTypeVerifySignatureInfo() { + return new VerifyXMLSignatureRequestType.VerifySignatureInfo(); + } + + /** + * Create an instance of {@link VerifyXMLSignatureRequestType.SignatureManifestCheckParams } + * + */ + public VerifyXMLSignatureRequestType.SignatureManifestCheckParams createVerifyXMLSignatureRequestTypeSignatureManifestCheckParams() { + return new VerifyXMLSignatureRequestType.SignatureManifestCheckParams(); + } + + /** + * Create an instance of {@link CreateCMSSignatureRequestType.SingleSignatureInfo.DataObjectInfo } + * + */ + public CreateCMSSignatureRequestType.SingleSignatureInfo.DataObjectInfo createCreateCMSSignatureRequestTypeSingleSignatureInfoDataObjectInfo() { + return new CreateCMSSignatureRequestType.SingleSignatureInfo.DataObjectInfo(); } /** @@ -778,30 +799,29 @@ public class ObjectFactory { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}} + * Create an instance of {@link TransformParameterType.Hash } * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPData") - public JAXBElement<PGPDataType> createPGPData(PGPDataType value) { - return new JAXBElement<PGPDataType>(_PGPData_QNAME, PGPDataType.class, null, value); + public TransformParameterType.Hash createTransformParameterTypeHash() { + return new TransformParameterType.Hash(); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link SignatureType }{@code >}} + * Create an instance of {@link CreateXMLSignatureResponseType.SignatureEnvironment } * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Signature") - public JAXBElement<SignatureType> createSignature(SignatureType value) { - return new JAXBElement<SignatureType>(_Signature_QNAME, SignatureType.class, null, value); + public CreateXMLSignatureResponseType.SignatureEnvironment createCreateXMLSignatureResponseTypeSignatureEnvironment() { + return new CreateXMLSignatureResponseType.SignatureEnvironment(); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DSAKeyValue") - public JAXBElement<DSAKeyValueType> createDSAKeyValue(DSAKeyValueType value) { - return new JAXBElement<DSAKeyValueType>(_DSAKeyValue_QNAME, DSAKeyValueType.class, null, value); + @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "IssuingCountry") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + public JAXBElement<String> createIssuingCountry(String value) { + return new JAXBElement<String>(_IssuingCountry_QNAME, String.class, null, value); } /** @@ -814,157 +834,156 @@ public class ObjectFactory { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link ErrorResponseType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >}} * */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "ErrorResponse") - public JAXBElement<ErrorResponseType> createErrorResponse(ErrorResponseType value) { - return new JAXBElement<ErrorResponseType>(_ErrorResponse_QNAME, ErrorResponseType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyInfo") + public JAXBElement<KeyInfoType> createKeyInfo(KeyInfoType value) { + return new JAXBElement<KeyInfoType>(_KeyInfo_QNAME, KeyInfoType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link SignedInfoType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link PublicAuthorityType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignedInfo") - public JAXBElement<SignedInfoType> createSignedInfo(SignedInfoType value) { - return new JAXBElement<SignedInfoType>(_SignedInfo_QNAME, SignedInfoType.class, null, value); + @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "PublicAuthority") + public JAXBElement<PublicAuthorityType> createPublicAuthority(PublicAuthorityType value) { + return new JAXBElement<PublicAuthorityType>(_PublicAuthority_QNAME, PublicAuthorityType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link SignatureValueType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RetrievalMethod") - public JAXBElement<RetrievalMethodType> createRetrievalMethod(RetrievalMethodType value) { - return new JAXBElement<RetrievalMethodType>(_RetrievalMethod_QNAME, RetrievalMethodType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureValue") + public JAXBElement<SignatureValueType> createSignatureValue(SignatureValueType value) { + return new JAXBElement<SignatureValueType>(_SignatureValue_QNAME, SignatureValueType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link VerifyXMLSignatureResponseType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link VerifyXMLSignatureRequestType }{@code >}} * */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "VerifyXMLSignatureResponse") - public JAXBElement<VerifyXMLSignatureResponseType> createVerifyXMLSignatureResponse(VerifyXMLSignatureResponseType value) { - return new JAXBElement<VerifyXMLSignatureResponseType>(_VerifyXMLSignatureResponse_QNAME, VerifyXMLSignatureResponseType.class, null, value); + @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "VerifyXMLSignatureRequest") + public JAXBElement<VerifyXMLSignatureRequestType> createVerifyXMLSignatureRequest(VerifyXMLSignatureRequestType value) { + return new JAXBElement<VerifyXMLSignatureRequestType>(_VerifyXMLSignatureRequest_QNAME, VerifyXMLSignatureRequestType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link CanonicalizationMethodType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link VerifyPDFSignatureResponseType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "CanonicalizationMethod") - public JAXBElement<CanonicalizationMethodType> createCanonicalizationMethod(CanonicalizationMethodType value) { - return new JAXBElement<CanonicalizationMethodType>(_CanonicalizationMethod_QNAME, CanonicalizationMethodType.class, null, value); + @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "VerifyPDFSignatureResponse") + public JAXBElement<VerifyPDFSignatureResponseType> createVerifyPDFSignatureResponse(VerifyPDFSignatureResponseType value) { + return new JAXBElement<VerifyPDFSignatureResponseType>(_VerifyPDFSignatureResponse_QNAME, VerifyPDFSignatureResponseType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link ObjectType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Object") - public JAXBElement<ObjectType> createObject(ObjectType value) { - return new JAXBElement<ObjectType>(_Object_QNAME, ObjectType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyValue") + public JAXBElement<KeyValueType> createKeyValue(KeyValueType value) { + return new JAXBElement<KeyValueType>(_KeyValue_QNAME, KeyValueType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link VerifyPDFSignatureResponseType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link TransformsType }{@code >}} * */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "VerifyPDFSignatureResponse") - public JAXBElement<VerifyPDFSignatureResponseType> createVerifyPDFSignatureResponse(VerifyPDFSignatureResponseType value) { - return new JAXBElement<VerifyPDFSignatureResponseType>(_VerifyPDFSignatureResponse_QNAME, VerifyPDFSignatureResponseType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Transforms") + public JAXBElement<TransformsType> createTransforms(TransformsType value) { + return new JAXBElement<TransformsType>(_Transforms_QNAME, TransformsType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link VerifyCMSSignatureResponseType }{@code >}} * */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "FailedReference") - public JAXBElement<BigInteger> createFailedReference(BigInteger value) { - return new JAXBElement<BigInteger>(_FailedReference_QNAME, BigInteger.class, null, value); + @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "VerifyCMSSignatureResponse") + public JAXBElement<VerifyCMSSignatureResponseType> createVerifyCMSSignatureResponse(VerifyCMSSignatureResponseType value) { + return new JAXBElement<VerifyCMSSignatureResponseType>(_VerifyCMSSignatureResponse_QNAME, VerifyCMSSignatureResponseType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link XMLDataObjectAssociationType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link DigestMethodType }{@code >}} * */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "Supplement") - public JAXBElement<XMLDataObjectAssociationType> createSupplement(XMLDataObjectAssociationType value) { - return new JAXBElement<XMLDataObjectAssociationType>(_Supplement_QNAME, XMLDataObjectAssociationType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestMethod") + public JAXBElement<DigestMethodType> createDigestMethod(DigestMethodType value) { + return new JAXBElement<DigestMethodType>(_DigestMethod_QNAME, DigestMethodType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertyType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link CreateCMSSignatureResponseType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperty") - public JAXBElement<SignaturePropertyType> createSignatureProperty(SignaturePropertyType value) { - return new JAXBElement<SignaturePropertyType>(_SignatureProperty_QNAME, SignaturePropertyType.class, null, value); + @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "CreateCMSSignatureResponse") + public JAXBElement<CreateCMSSignatureResponseType> createCreateCMSSignatureResponse(CreateCMSSignatureResponseType value) { + return new JAXBElement<CreateCMSSignatureResponseType>(_CreateCMSSignatureResponse_QNAME, CreateCMSSignatureResponseType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link TransformsType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link X509DataType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Transforms") - public JAXBElement<TransformsType> createTransforms(TransformsType value) { - return new JAXBElement<TransformsType>(_Transforms_QNAME, TransformsType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Data") + public JAXBElement<X509DataType> createX509Data(X509DataType value) { + return new JAXBElement<X509DataType>(_X509Data_QNAME, X509DataType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link SignatureValueType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertyType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureValue") - public JAXBElement<SignatureValueType> createSignatureValue(SignatureValueType value) { - return new JAXBElement<SignatureValueType>(_SignatureValue_QNAME, SignatureValueType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperty") + public JAXBElement<SignaturePropertyType> createSignatureProperty(SignaturePropertyType value) { + return new JAXBElement<SignaturePropertyType>(_SignatureProperty_QNAME, SignaturePropertyType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link ManifestType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Manifest") - public JAXBElement<ManifestType> createManifest(ManifestType value) { - return new JAXBElement<ManifestType>(_Manifest_QNAME, ManifestType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyName") + public JAXBElement<String> createKeyName(String value) { + return new JAXBElement<String>(_KeyName_QNAME, String.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link TransformType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Transform") - public JAXBElement<TransformType> createTransform(TransformType value) { - return new JAXBElement<TransformType>(_Transform_QNAME, TransformType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RSAKeyValue") + public JAXBElement<RSAKeyValueType> createRSAKeyValue(RSAKeyValueType value) { + return new JAXBElement<RSAKeyValueType>(_RSAKeyValue_QNAME, RSAKeyValueType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link X509DataType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link SignatureType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Data") - public JAXBElement<X509DataType> createX509Data(X509DataType value) { - return new JAXBElement<X509DataType>(_X509Data_QNAME, X509DataType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Signature") + public JAXBElement<SignatureType> createSignature(SignatureType value) { + return new JAXBElement<SignatureType>(_Signature_QNAME, SignatureType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link XMLDataObjectAssociationType }{@code >}} * */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "IssuingCountry") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - public JAXBElement<String> createIssuingCountry(String value) { - return new JAXBElement<String>(_IssuingCountry_QNAME, String.class, null, value); + @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "Supplement") + public JAXBElement<XMLDataObjectAssociationType> createSupplement(XMLDataObjectAssociationType value) { + return new JAXBElement<XMLDataObjectAssociationType>(_Supplement_QNAME, XMLDataObjectAssociationType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link CreateXMLSignatureResponseType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} * */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "CreateXMLSignatureResponse") - public JAXBElement<CreateXMLSignatureResponseType> createCreateXMLSignatureResponse(CreateXMLSignatureResponseType value) { - return new JAXBElement<CreateXMLSignatureResponseType>(_CreateXMLSignatureResponse_QNAME, CreateXMLSignatureResponseType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "MgmtData") + public JAXBElement<String> createMgmtData(String value) { + return new JAXBElement<String>(_MgmtData_QNAME, String.class, null, value); } /** @@ -977,147 +996,165 @@ public class ObjectFactory { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link ObjectType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyInfo") - public JAXBElement<KeyInfoType> createKeyInfo(KeyInfoType value) { - return new JAXBElement<KeyInfoType>(_KeyInfo_QNAME, KeyInfoType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Object") + public JAXBElement<ObjectType> createObject(ObjectType value) { + return new JAXBElement<ObjectType>(_Object_QNAME, ObjectType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link XMLDataObjectAssociationType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertiesType }{@code >}} * */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "SupplementProfile") - public JAXBElement<XMLDataObjectAssociationType> createSupplementProfile(XMLDataObjectAssociationType value) { - return new JAXBElement<XMLDataObjectAssociationType>(_SupplementProfile_QNAME, XMLDataObjectAssociationType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperties") + public JAXBElement<SignaturePropertiesType> createSignatureProperties(SignaturePropertiesType value) { + return new JAXBElement<SignaturePropertiesType>(_SignatureProperties_QNAME, SignaturePropertiesType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link CreateCMSSignatureResponseType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link VerifyXMLSignatureResponseType }{@code >}} * */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "CreateCMSSignatureResponse") - public JAXBElement<CreateCMSSignatureResponseType> createCreateCMSSignatureResponse(CreateCMSSignatureResponseType value) { - return new JAXBElement<CreateCMSSignatureResponseType>(_CreateCMSSignatureResponse_QNAME, CreateCMSSignatureResponseType.class, null, value); + @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "VerifyXMLSignatureResponse") + public JAXBElement<VerifyXMLSignatureResponseType> createVerifyXMLSignatureResponse(VerifyXMLSignatureResponseType value) { + return new JAXBElement<VerifyXMLSignatureResponseType>(_VerifyXMLSignatureResponse_QNAME, VerifyXMLSignatureResponseType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link VerifyCMSSignatureResponseType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link TransformType }{@code >}} * */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "VerifyCMSSignatureResponse") - public JAXBElement<VerifyCMSSignatureResponseType> createVerifyCMSSignatureResponse(VerifyCMSSignatureResponseType value) { - return new JAXBElement<VerifyCMSSignatureResponseType>(_VerifyCMSSignatureResponse_QNAME, VerifyCMSSignatureResponseType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Transform") + public JAXBElement<TransformType> createTransform(TransformType value) { + return new JAXBElement<TransformType>(_Transform_QNAME, TransformType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link DigestMethodType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link ErrorResponseType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestMethod") - public JAXBElement<DigestMethodType> createDigestMethod(DigestMethodType value) { - return new JAXBElement<DigestMethodType>(_DigestMethod_QNAME, DigestMethodType.class, null, value); + @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "ErrorResponse") + public JAXBElement<ErrorResponseType> createErrorResponse(ErrorResponseType value) { + return new JAXBElement<ErrorResponseType>(_ErrorResponse_QNAME, ErrorResponseType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestValue") - public JAXBElement<byte[]> createDigestValue(byte[] value) { - return new JAXBElement<byte[]>(_DigestValue_QNAME, byte[].class, null, ((byte[]) value)); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPData") + public JAXBElement<PGPDataType> createPGPData(PGPDataType value) { + return new JAXBElement<PGPDataType>(_PGPData_QNAME, PGPDataType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link ReferenceType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "MgmtData") - public JAXBElement<String> createMgmtData(String value) { - return new JAXBElement<String>(_MgmtData_QNAME, String.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Reference") + public JAXBElement<ReferenceType> createReference(ReferenceType value) { + return new JAXBElement<ReferenceType>(_Reference_QNAME, ReferenceType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertiesType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperties") - public JAXBElement<SignaturePropertiesType> createSignatureProperties(SignaturePropertiesType value) { - return new JAXBElement<SignaturePropertiesType>(_SignatureProperties_QNAME, SignaturePropertiesType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RetrievalMethod") + public JAXBElement<RetrievalMethodType> createRetrievalMethod(RetrievalMethodType value) { + return new JAXBElement<RetrievalMethodType>(_RetrievalMethod_QNAME, RetrievalMethodType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyName") - public JAXBElement<String> createKeyName(String value) { - return new JAXBElement<String>(_KeyName_QNAME, String.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DSAKeyValue") + public JAXBElement<DSAKeyValueType> createDSAKeyValue(DSAKeyValueType value) { + return new JAXBElement<DSAKeyValueType>(_DSAKeyValue_QNAME, DSAKeyValueType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyValue") - public JAXBElement<KeyValueType> createKeyValue(KeyValueType value) { - return new JAXBElement<KeyValueType>(_KeyValue_QNAME, KeyValueType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestValue") + public JAXBElement<byte[]> createDigestValue(byte[] value) { + return new JAXBElement<byte[]>(_DigestValue_QNAME, byte[].class, null, ((byte[]) value)); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link ReferenceType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link CreateXMLSignatureResponseType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Reference") - public JAXBElement<ReferenceType> createReference(ReferenceType value) { - return new JAXBElement<ReferenceType>(_Reference_QNAME, ReferenceType.class, null, value); + @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "CreateXMLSignatureResponse") + public JAXBElement<CreateXMLSignatureResponseType> createCreateXMLSignatureResponse(CreateXMLSignatureResponseType value) { + return new JAXBElement<CreateXMLSignatureResponseType>(_CreateXMLSignatureResponse_QNAME, CreateXMLSignatureResponseType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link PublicAuthorityType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link CanonicalizationMethodType }{@code >}} * */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "PublicAuthority") - public JAXBElement<PublicAuthorityType> createPublicAuthority(PublicAuthorityType value) { - return new JAXBElement<PublicAuthorityType>(_PublicAuthority_QNAME, PublicAuthorityType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "CanonicalizationMethod") + public JAXBElement<CanonicalizationMethodType> createCanonicalizationMethod(CanonicalizationMethodType value) { + return new JAXBElement<CanonicalizationMethodType>(_CanonicalizationMethod_QNAME, CanonicalizationMethodType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link MoaTransformType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link CreatePDFSignatureResponseType }{@code >}} * */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "MoaTransform") - public JAXBElement<MoaTransformType> createMoaTransform(MoaTransformType value) { - return new JAXBElement<MoaTransformType>(_MoaTransform_QNAME, MoaTransformType.class, null, value); + @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "CreatePDFSignatureResponse") + public JAXBElement<CreatePDFSignatureResponseType> createCreatePDFSignatureResponse(CreatePDFSignatureResponseType value) { + return new JAXBElement<CreatePDFSignatureResponseType>(_CreatePDFSignatureResponse_QNAME, CreatePDFSignatureResponseType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link SignedInfoType }{@code >}} * */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "ReferringSigReference") - public JAXBElement<BigInteger> createReferringSigReference(BigInteger value) { - return new JAXBElement<BigInteger>(_ReferringSigReference_QNAME, BigInteger.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignedInfo") + public JAXBElement<SignedInfoType> createSignedInfo(SignedInfoType value) { + return new JAXBElement<SignedInfoType>(_SignedInfo_QNAME, SignedInfoType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link VerifyASICSignatureResponseType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RSAKeyValue") - public JAXBElement<RSAKeyValueType> createRSAKeyValue(RSAKeyValueType value) { - return new JAXBElement<RSAKeyValueType>(_RSAKeyValue_QNAME, RSAKeyValueType.class, null, value); + @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "VerifyASICSignatureResponse") + public JAXBElement<VerifyASICSignatureResponseType> createVerifyASICSignatureResponse(VerifyASICSignatureResponseType value) { + return new JAXBElement<VerifyASICSignatureResponseType>(_VerifyASICSignatureResponse_QNAME, VerifyASICSignatureResponseType.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 = "SupplementProfile") + public JAXBElement<XMLDataObjectAssociationType> createSupplementProfile(XMLDataObjectAssociationType value) { + return new JAXBElement<XMLDataObjectAssociationType>(_SupplementProfile_QNAME, XMLDataObjectAssociationType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link MoaTransformsType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link ManifestType }{@code >}} * */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "MoaTransforms") - public JAXBElement<MoaTransformsType> createMoaTransforms(MoaTransformsType value) { - return new JAXBElement<MoaTransformsType>(_MoaTransforms_QNAME, MoaTransformsType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Manifest") + public JAXBElement<ManifestType> createManifest(ManifestType value) { + return new JAXBElement<ManifestType>(_Manifest_QNAME, ManifestType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "XPath", scope = TransformType.class) + public JAXBElement<String> createTransformTypeXPath(String value) { + return new JAXBElement<String>(_TransformTypeXPath_QNAME, String.class, TransformType.class, value); } /** @@ -1142,36 +1179,36 @@ public class ObjectFactory { * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Certificate", scope = X509DataType.class) - public JAXBElement<byte[]> createX509DataTypeX509Certificate(byte[] value) { - return new JAXBElement<byte[]>(_X509DataTypeX509Certificate_QNAME, byte[].class, X509DataType.class, ((byte[]) value)); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509CRL", scope = X509DataType.class) + public JAXBElement<byte[]> createX509DataTypeX509CRL(byte[] value) { + return new JAXBElement<byte[]>(_X509DataTypeX509CRL_QNAME, byte[].class, X509DataType.class, ((byte[]) value)); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509SKI", scope = X509DataType.class) - public JAXBElement<byte[]> createX509DataTypeX509SKI(byte[] value) { - return new JAXBElement<byte[]>(_X509DataTypeX509SKI_QNAME, byte[].class, X509DataType.class, ((byte[]) value)); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509SubjectName", scope = X509DataType.class) + public JAXBElement<String> createX509DataTypeX509SubjectName(String value) { + return new JAXBElement<String>(_X509DataTypeX509SubjectName_QNAME, String.class, X509DataType.class, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509SubjectName", scope = X509DataType.class) - public JAXBElement<String> createX509DataTypeX509SubjectName(String value) { - return new JAXBElement<String>(_X509DataTypeX509SubjectName_QNAME, String.class, X509DataType.class, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509SKI", scope = X509DataType.class) + public JAXBElement<byte[]> createX509DataTypeX509SKI(byte[] value) { + return new JAXBElement<byte[]>(_X509DataTypeX509SKI_QNAME, byte[].class, X509DataType.class, ((byte[]) value)); } /** * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509CRL", scope = X509DataType.class) - public JAXBElement<byte[]> createX509DataTypeX509CRL(byte[] value) { - return new JAXBElement<byte[]>(_X509DataTypeX509CRL_QNAME, byte[].class, X509DataType.class, ((byte[]) value)); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Certificate", scope = X509DataType.class) + public JAXBElement<byte[]> createX509DataTypeX509Certificate(byte[] value) { + return new JAXBElement<byte[]>(_X509DataTypeX509Certificate_QNAME, byte[].class, X509DataType.class, ((byte[]) value)); } /** @@ -1193,15 +1230,6 @@ public class ObjectFactory { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "XPath", scope = TransformType.class) - public JAXBElement<String> createTransformTypeXPath(String value) { - return new JAXBElement<String>(_TransformTypeXPath_QNAME, String.class, TransformType.class, value); - } - - /** * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}} * */ @@ -1211,28 +1239,28 @@ public class ObjectFactory { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link ExtendedCertificateCheckResultType }{@code >}} * */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "transformData", scope = MoaTransformType.class) - public JAXBElement<byte[]> createMoaTransformTypeTransformData(byte[] value) { - return new JAXBElement<byte[]>(_MoaTransformTypeTransformData_QNAME, byte[].class, MoaTransformType.class, ((byte[]) value)); + @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "ExtendedCertificateCheck", scope = VerifyCMSSignatureResponseType.class) + public JAXBElement<ExtendedCertificateCheckResultType> createVerifyCMSSignatureResponseTypeExtendedCertificateCheck(ExtendedCertificateCheckResultType value) { + return new JAXBElement<ExtendedCertificateCheckResultType>(_VerifyCMSSignatureResponseTypeExtendedCertificateCheck_QNAME, ExtendedCertificateCheckResultType.class, VerifyCMSSignatureResponseType.class, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link FormResultType }{@code >}} * */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "XPath", scope = MoaTransformType.class) - public JAXBElement<String> createMoaTransformTypeXPath(String value) { - return new JAXBElement<String>(_MoaTransformTypeXPath_QNAME, String.class, MoaTransformType.class, value); + @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "FormCheckResult", scope = VerifyCMSSignatureResponseType.class) + public JAXBElement<FormResultType> createVerifyCMSSignatureResponseTypeFormCheckResult(FormResultType value) { + return new JAXBElement<FormResultType>(_VerifyCMSSignatureResponseTypeFormCheckResult_QNAME, FormResultType.class, VerifyCMSSignatureResponseType.class, value); } /** * Create an instance of {@link JAXBElement }{@code <}{@link CheckResultType }{@code >}} * */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "SignatureCheck", scope = VerifyCMSSignatureResponseType.class) + @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "SignatureCheck", scope = VerifyCMSSignatureResponseType.class) public JAXBElement<CheckResultType> createVerifyCMSSignatureResponseTypeSignatureCheck(CheckResultType value) { return new JAXBElement<CheckResultType>(_VerifyCMSSignatureResponseTypeSignatureCheck_QNAME, CheckResultType.class, VerifyCMSSignatureResponseType.class, value); } @@ -1241,7 +1269,7 @@ public class ObjectFactory { * Create an instance of {@link JAXBElement }{@code <}{@link CheckResultType }{@code >}} * */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "CertificateCheck", scope = VerifyCMSSignatureResponseType.class) + @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "CertificateCheck", scope = VerifyCMSSignatureResponseType.class) public JAXBElement<CheckResultType> createVerifyCMSSignatureResponseTypeCertificateCheck(CheckResultType value) { return new JAXBElement<CheckResultType>(_VerifyCMSSignatureResponseTypeCertificateCheck_QNAME, CheckResultType.class, VerifyCMSSignatureResponseType.class, value); } @@ -1250,27 +1278,9 @@ public class ObjectFactory { * Create an instance of {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >}} * */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "SignerInfo", scope = VerifyCMSSignatureResponseType.class) + @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "SignerInfo", scope = VerifyCMSSignatureResponseType.class) public JAXBElement<KeyInfoType> createVerifyCMSSignatureResponseTypeSignerInfo(KeyInfoType value) { return new JAXBElement<KeyInfoType>(_VerifyCMSSignatureResponseTypeSignerInfo_QNAME, KeyInfoType.class, VerifyCMSSignatureResponseType.class, value); } - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ExtendedCertificateCheckResultType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "ExtendedCertificateCheck", scope = VerifyCMSSignatureResponseType.class) - public JAXBElement<ExtendedCertificateCheckResultType> createVerifyCMSSignatureResponseTypeExtendedCertificateCheck(ExtendedCertificateCheckResultType value) { - return new JAXBElement<ExtendedCertificateCheckResultType>(_VerifyCMSSignatureResponseTypeExtendedCertificateCheck_QNAME, ExtendedCertificateCheckResultType.class, VerifyCMSSignatureResponseType.class, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link FormResultType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "FormCheckResult", scope = VerifyCMSSignatureResponseType.class) - public JAXBElement<FormResultType> createVerifyCMSSignatureResponseTypeFormCheckResult(FormResultType value) { - return new JAXBElement<FormResultType>(_VerifyCMSSignatureResponseTypeFormCheckResult_QNAME, FormResultType.class, VerifyCMSSignatureResponseType.class, value); - } - } diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ObjectType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ObjectType.java index d9d6f39..10db581 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ObjectType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ObjectType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -83,9 +83,9 @@ public class ObjectType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link Element } - * {@link Object } * {@link String } + * {@link Object } + * {@link Element } * * */ diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PDFSignatureResultType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PDFSignatureResultType.java index 8fadbe0..79e888e 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PDFSignatureResultType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PDFSignatureResultType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -27,10 +27,10 @@ import javax.xml.bind.annotation.XmlType; * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> * <element name="SignerInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType"/> - * <element name="SignatureCheck" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}CheckResultType"/> - * <element name="CertificateCheck" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}CheckResultType"/> - * <element name="FormCheckResult" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}FormResultType" maxOccurs="unbounded" minOccurs="0"/> - * <element name="ExtendedCertificateCheck" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}ExtendedCertificateCheckResultType" minOccurs="0"/> + * <element name="SignatureCheck" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}CheckResultType"/> + * <element name="CertificateCheck" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}CheckResultType"/> + * <element name="FormCheckResult" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}FormResultType" maxOccurs="unbounded" minOccurs="0"/> + * <element name="ExtendedCertificateCheck" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ExtendedCertificateCheckResultType" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PDFSignedRepsonse.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PDFSignedRepsonse.java index c3f27e3..1c512b9 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PDFSignedRepsonse.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PDFSignedRepsonse.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlType; * <element name="SignatureID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <choice> * <element name="PDFSignature" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/> - * <element ref="{http://reference.e-government.gv.at/namespace/moa/20151109#}ErrorResponse"/> + * <element ref="{http://reference.e-government.gv.at/namespace/moa/20020822#}ErrorResponse"/> * </choice> * </sequence> * </restriction> diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PGPDataType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PGPDataType.java index 826fc28..732b1c4 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PGPDataType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PGPDataType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -54,8 +54,8 @@ import org.w3c.dom.Element; public class PGPDataType { @XmlElementRefs({ - @XmlElementRef(name = "PGPKeyID", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "PGPKeyPacket", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) + @XmlElementRef(name = "PGPKeyPacket", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), + @XmlElementRef(name = "PGPKeyID", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) }) @XmlAnyElement(lax = true) protected List<Object> content; @@ -88,8 +88,8 @@ public class PGPDataType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link Object } * {@link JAXBElement }{@code <}{@link byte[]}{@code >} + * {@link Object } * {@link Element } * {@link JAXBElement }{@code <}{@link byte[]}{@code >} * diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PublicAuthorityType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PublicAuthorityType.java index c1cc02e..84df672 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PublicAuthorityType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PublicAuthorityType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/QualifiedCertificate.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/QualifiedCertificate.java index efb4eea..b17bb9e 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/QualifiedCertificate.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/QualifiedCertificate.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/RSAKeyValueType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/RSAKeyValueType.java index 338de95..1593475 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/RSAKeyValueType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/RSAKeyValueType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferenceType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferenceType.java index cd501c3..f6da73f 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferenceType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferenceType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferencesCheckResultInfoType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferencesCheckResultInfoType.java index 11cef97..8664c1a 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferencesCheckResultInfoType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferencesCheckResultInfoType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -21,10 +21,10 @@ import javax.xml.bind.annotation.XmlType; * <pre> * <complexType name="ReferencesCheckResultInfoType"> * <complexContent> - * <restriction base="{http://reference.e-government.gv.at/namespace/moa/20151109#}AnyChildrenType"> + * <restriction base="{http://reference.e-government.gv.at/namespace/moa/20020822#}AnyChildrenType"> * <sequence> * <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/> - * <element ref="{http://reference.e-government.gv.at/namespace/moa/20151109#}FailedReference" maxOccurs="unbounded" minOccurs="0"/> + * <element name="FailedReference" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferencesCheckResultType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferencesCheckResultType.java index bf50314..c6c355a 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferencesCheckResultType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferencesCheckResultType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -21,10 +21,10 @@ import javax.xml.bind.annotation.XmlType; * <pre> * <complexType name="ReferencesCheckResultType"> * <complexContent> - * <restriction base="{http://reference.e-government.gv.at/namespace/moa/20151109#}CheckResultType"> + * <restriction base="{http://reference.e-government.gv.at/namespace/moa/20020822#}CheckResultType"> * <sequence> * <element name="Code" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger"/> - * <element name="Info" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}ReferencesCheckResultInfoType" minOccurs="0"/> + * <element name="Info" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ReferencesCheckResultInfoType" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/RetrievalMethodType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/RetrievalMethodType.java index 837c2e7..2592dba 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/RetrievalMethodType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/RetrievalMethodType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SPKIDataType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SPKIDataType.java index 472b9ee..700485a 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SPKIDataType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SPKIDataType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SecureSignatureCreationDevice.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SecureSignatureCreationDevice.java index 3577910..cdb5f2d 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SecureSignatureCreationDevice.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SecureSignatureCreationDevice.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureMethodType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureMethodType.java index 3645163..23cc92d 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureMethodType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureMethodType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -75,8 +75,8 @@ public class SignatureMethodType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link Object } * {@link String } + * {@link Object } * {@link JAXBElement }{@code <}{@link BigInteger }{@code >} * * diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignaturePropertiesType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignaturePropertiesType.java index 666ea81..e4cf48c 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignaturePropertiesType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignaturePropertiesType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignaturePropertyType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignaturePropertyType.java index b252649..cd37b0f 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignaturePropertyType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignaturePropertyType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -80,9 +80,9 @@ public class SignaturePropertyType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link Element } - * {@link Object } * {@link String } + * {@link Object } + * {@link Element } * * */ diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureType.java index 804a1d5..b3763d9 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureValueType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureValueType.java index 5201ee6..7525c25 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureValueType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureValueType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignedInfoType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignedInfoType.java index af29580..d37c054 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignedInfoType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignedInfoType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformParameterType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformParameterType.java index 3b94f4b..5188e9e 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformParameterType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformParameterType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformType.java index d270580..ec607a0 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -75,10 +75,10 @@ public class TransformType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link String }{@code >} * {@link Object } * {@link Element } * {@link String } + * {@link JAXBElement }{@code <}{@link String }{@code >} * * */ diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformsInfoType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformsInfoType.java index 583858d..f06754f 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformsInfoType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformsInfoType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -24,8 +24,8 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://reference.e-government.gv.at/namespace/moa/20151109#}MoaTransforms" minOccurs="0"/> - * <element name="FinalDataMetaInfo" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}FinalDataMetaInfoType"/> + * <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/> + * <element name="FinalDataMetaInfo" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}FinalDataMetaInfoType"/> * </sequence> * </restriction> * </complexContent> @@ -36,38 +36,38 @@ import javax.xml.bind.annotation.XmlType; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "TransformsInfoType", propOrder = { - "moaTransforms", + "transforms", "finalDataMetaInfo" }) public class TransformsInfoType { - @XmlElement(name = "MoaTransforms") - protected MoaTransformsType moaTransforms; + @XmlElement(name = "Transforms", namespace = "http://www.w3.org/2000/09/xmldsig#") + protected TransformsType transforms; @XmlElement(name = "FinalDataMetaInfo", required = true) protected FinalDataMetaInfoType finalDataMetaInfo; /** - * Gets the value of the moaTransforms property. + * Gets the value of the transforms property. * * @return * possible object is - * {@link MoaTransformsType } + * {@link TransformsType } * */ - public MoaTransformsType getMoaTransforms() { - return moaTransforms; + public TransformsType getTransforms() { + return transforms; } /** - * Sets the value of the moaTransforms property. + * Sets the value of the transforms property. * * @param value * allowed object is - * {@link MoaTransformsType } + * {@link TransformsType } * */ - public void setMoaTransforms(MoaTransformsType value) { - this.moaTransforms = value; + public void setTransforms(TransformsType value) { + this.transforms = value; } /** diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformsType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformsType.java index 8c035a4..2a43891 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformsType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformsType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyASICSignatureRequest.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyASICSignatureRequest.java new file mode 100644 index 0000000..3640444 --- /dev/null +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyASICSignatureRequest.java @@ -0,0 +1,41 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2016.06.15 at 04:11:53 PM CEST +// + + +package at.gv.egiz.moasig; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for anonymous complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType> + * <complexContent> + * <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}VerifyASICSignatureRequestType"> + * </extension> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "") +@XmlRootElement(name = "VerifyASICSignatureRequest") +public class VerifyASICSignatureRequest + extends VerifyASICSignatureRequestType +{ + + +} diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyASICSignatureRequestType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyASICSignatureRequestType.java new file mode 100644 index 0000000..fc35a9a --- /dev/null +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyASICSignatureRequestType.java @@ -0,0 +1,190 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2016.06.15 at 04:11:53 PM CEST +// + + +package at.gv.egiz.moasig; + +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 javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import javax.xml.datatype.XMLGregorianCalendar; + + +/** + * <p>Java class for VerifyASICSignatureRequestType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="VerifyASICSignatureRequestType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="DateTime" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/> + * <element name="ExtendedValidation" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> + * <element name="ASICSignature" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/> + * <element name="ASICExtension" type="{http://www.w3.org/2001/XMLSchema}string"/> + * <element name="TrustProfileID" type="{http://www.w3.org/2001/XMLSchema}token"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "VerifyASICSignatureRequestType", propOrder = { + "dateTime", + "extendedValidation", + "asicSignature", + "asicExtension", + "trustProfileID" +}) +@XmlSeeAlso({ + VerifyASICSignatureRequest.class +}) +public class VerifyASICSignatureRequestType { + + @XmlElement(name = "DateTime") + @XmlSchemaType(name = "dateTime") + protected XMLGregorianCalendar dateTime; + @XmlElement(name = "ExtendedValidation", defaultValue = "false") + protected Boolean extendedValidation; + @XmlElement(name = "ASICSignature", required = true) + protected byte[] asicSignature; + @XmlElement(name = "ASICExtension", required = true) + protected String asicExtension; + @XmlElement(name = "TrustProfileID", required = true) + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlSchemaType(name = "token") + protected String trustProfileID; + + /** + * Gets the value of the dateTime property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getDateTime() { + return dateTime; + } + + /** + * Sets the value of the dateTime property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setDateTime(XMLGregorianCalendar value) { + this.dateTime = value; + } + + /** + * Gets the value of the extendedValidation property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public Boolean isExtendedValidation() { + return extendedValidation; + } + + /** + * Sets the value of the extendedValidation property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setExtendedValidation(Boolean value) { + this.extendedValidation = value; + } + + /** + * Gets the value of the asicSignature property. + * + * @return + * possible object is + * byte[] + */ + public byte[] getASICSignature() { + return asicSignature; + } + + /** + * Sets the value of the asicSignature property. + * + * @param value + * allowed object is + * byte[] + */ + public void setASICSignature(byte[] value) { + this.asicSignature = value; + } + + /** + * Gets the value of the asicExtension property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getASICExtension() { + return asicExtension; + } + + /** + * Sets the value of the asicExtension property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setASICExtension(String value) { + this.asicExtension = value; + } + + /** + * Gets the value of the trustProfileID property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTrustProfileID() { + return trustProfileID; + } + + /** + * Sets the value of the trustProfileID property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTrustProfileID(String value) { + this.trustProfileID = value; + } + +} diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyASICSignatureResponseType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyASICSignatureResponseType.java new file mode 100644 index 0000000..c58900b --- /dev/null +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyASICSignatureResponseType.java @@ -0,0 +1,82 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2016.06.15 at 04:11:53 PM CEST +// + + +package at.gv.egiz.moasig; + +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; + + +/** + * <p>Java class for VerifyASICSignatureResponseType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="VerifyASICSignatureResponseType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence maxOccurs="unbounded"> + * <element name="XMLSignatureResult" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}VerifyXMLSignatureResponseType" maxOccurs="unbounded" minOccurs="0"/> + * <element name="CMSSignatureResult" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}VerifyCMSSignatureResponseType" maxOccurs="unbounded" minOccurs="0"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "VerifyASICSignatureResponseType", propOrder = { + "xmlSignatureResultAndCMSSignatureResult" +}) +public class VerifyASICSignatureResponseType { + + @XmlElements({ + @XmlElement(name = "XMLSignatureResult", type = VerifyXMLSignatureResponseType.class), + @XmlElement(name = "CMSSignatureResult", type = VerifyCMSSignatureResponseType.class) + }) + protected List<Object> xmlSignatureResultAndCMSSignatureResult; + + /** + * Gets the value of the xmlSignatureResultAndCMSSignatureResult property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the xmlSignatureResultAndCMSSignatureResult property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getXMLSignatureResultAndCMSSignatureResult().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link VerifyXMLSignatureResponseType } + * {@link VerifyCMSSignatureResponseType } + * + * + */ + public List<Object> getXMLSignatureResultAndCMSSignatureResult() { + if (xmlSignatureResultAndCMSSignatureResult == null) { + xmlSignatureResultAndCMSSignatureResult = new ArrayList<Object>(); + } + return this.xmlSignatureResultAndCMSSignatureResult; + } + +} diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureRequest.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureRequest.java index 4294b6f..32a378e 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureRequest.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureRequest.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -25,8 +25,8 @@ import javax.xml.bind.annotation.XmlType; * <pre> * <complexType> * <complexContent> - * <extension base="{http://reference.e-government.gv.at/namespace/moa/20151109#}VerifyCMSSignatureRequestType"> - * <attribute name="Signatories" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}SignatoriesType" default="1" /> + * <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}VerifyCMSSignatureRequestType"> + * <attribute name="Signatories" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}SignatoriesType" default="1" /> * </extension> * </complexContent> * </complexType> diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureRequestType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureRequestType.java index a8f1eda..bb23fad 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureRequestType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureRequestType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -32,7 +32,7 @@ import javax.xml.datatype.XMLGregorianCalendar; * <element name="DateTime" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/> * <element name="ExtendedValidation" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> * <element name="CMSSignature" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/> - * <element name="DataObject" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}CMSDataObjectOptionalMetaType" minOccurs="0"/> + * <element name="DataObject" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}CMSDataObjectOptionalMetaType" minOccurs="0"/> * <element name="TrustProfileID" type="{http://www.w3.org/2001/XMLSchema}token"/> * </sequence> * </restriction> diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureResponseType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureResponseType.java index 9068808..8911c42 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureResponseType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureResponseType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -29,10 +29,10 @@ import javax.xml.bind.annotation.XmlType; * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence maxOccurs="unbounded"> * <element name="SignerInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType"/> - * <element name="SignatureCheck" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}CheckResultType"/> - * <element name="CertificateCheck" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}CheckResultType"/> - * <element name="FormCheckResult" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}FormResultType" maxOccurs="unbounded" minOccurs="0"/> - * <element name="ExtendedCertificateCheck" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}ExtendedCertificateCheckResultType" minOccurs="0"/> + * <element name="SignatureCheck" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}CheckResultType"/> + * <element name="CertificateCheck" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}CheckResultType"/> + * <element name="FormCheckResult" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}FormResultType" maxOccurs="unbounded" minOccurs="0"/> + * <element name="ExtendedCertificateCheck" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ExtendedCertificateCheckResultType" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -48,11 +48,11 @@ import javax.xml.bind.annotation.XmlType; public class VerifyCMSSignatureResponseType { @XmlElementRefs({ - @XmlElementRef(name = "SignerInfo", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class), - @XmlElementRef(name = "SignatureCheck", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class), - @XmlElementRef(name = "ExtendedCertificateCheck", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class), - @XmlElementRef(name = "FormCheckResult", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class), - @XmlElementRef(name = "CertificateCheck", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", 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 = "SignerInfo", namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", type = JAXBElement.class), + @XmlElementRef(name = "FormCheckResult", namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", type = JAXBElement.class), + @XmlElementRef(name = "ExtendedCertificateCheck", namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", type = JAXBElement.class) }) protected List<JAXBElement<?>> signerInfoAndSignatureCheckAndCertificateCheck; @@ -74,11 +74,11 @@ public class VerifyCMSSignatureResponseType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link ExtendedCertificateCheckResultType }{@code >} - * {@link JAXBElement }{@code <}{@link FormResultType }{@code >} * {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >} * {@link JAXBElement }{@code <}{@link CheckResultType }{@code >} * {@link JAXBElement }{@code <}{@link CheckResultType }{@code >} + * {@link JAXBElement }{@code <}{@link FormResultType }{@code >} + * {@link JAXBElement }{@code <}{@link ExtendedCertificateCheckResultType }{@code >} * * */ diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureRequest.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureRequest.java index bb06824..2dd2130 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureRequest.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureRequest.java @@ -2,14 +2,17 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // package at.gv.egiz.moasig; +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.XmlRootElement; import javax.xml.bind.annotation.XmlType; @@ -22,7 +25,8 @@ import javax.xml.bind.annotation.XmlType; * <pre> * <complexType> * <complexContent> - * <extension base="{http://reference.e-government.gv.at/namespace/moa/20151109#}VerifyPDFSignatureRequestType"> + * <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}VerifyPDFSignatureRequestType"> + * <attribute name="Signatories" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}SignatoriesType" default="1" /> * </extension> * </complexContent> * </complexType> @@ -37,5 +41,36 @@ public class VerifyPDFSignatureRequest extends VerifyPDFSignatureRequestType { + @XmlAttribute(name = "Signatories") + protected List<String> signatories; + + /** + * Gets the value of the signatories property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the signatories property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getSignatories().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link String } + * + * + */ + public List<String> getSignatories() { + if (signatories == null) { + signatories = new ArrayList<String>(); + } + return this.signatories; + } } diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureRequestType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureRequestType.java index 6cb4858..53caa2e 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureRequestType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureRequestType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureResponseType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureResponseType.java index 1ab3ef2..34582b4 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureResponseType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureResponseType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence maxOccurs="unbounded"> - * <element name="SignatureResult" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}PDFSignatureResultType"/> + * <element name="SignatureResult" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}PDFSignatureResultType"/> * </sequence> * </restriction> * </complexContent> diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyTransformsDataType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyTransformsDataType.java index 0c10bef..33f0307 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyTransformsDataType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyTransformsDataType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <choice maxOccurs="unbounded"> - * <element ref="{http://reference.e-government.gv.at/namespace/moa/20151109#}VerifyTransformsInfoProfile"/> + * <element ref="{http://reference.e-government.gv.at/namespace/moa/20020822#}VerifyTransformsInfoProfile"/> * <element name="VerifyTransformsInfoProfileID" type="{http://www.w3.org/2001/XMLSchema}string"/> * </choice> * </restriction> diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyTransformsInfoProfile.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyTransformsInfoProfile.java index 43c29bb..4b02e16 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyTransformsInfoProfile.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyTransformsInfoProfile.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -27,8 +27,8 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://reference.e-government.gv.at/namespace/moa/20151109#}MoaTransforms" minOccurs="0"/> - * <element name="TransformParameter" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}TransformParameterType" maxOccurs="unbounded" minOccurs="0"/> + * <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/> + * <element name="TransformParameter" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}TransformParameterType" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -39,39 +39,39 @@ import javax.xml.bind.annotation.XmlType; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { - "moaTransforms", + "transforms", "transformParameter" }) @XmlRootElement(name = "VerifyTransformsInfoProfile") public class VerifyTransformsInfoProfile { - @XmlElement(name = "MoaTransforms") - protected MoaTransformsType moaTransforms; + @XmlElement(name = "Transforms", namespace = "http://www.w3.org/2000/09/xmldsig#") + protected TransformsType transforms; @XmlElement(name = "TransformParameter") protected List<TransformParameterType> transformParameter; /** - * Gets the value of the moaTransforms property. + * Gets the value of the transforms property. * * @return * possible object is - * {@link MoaTransformsType } + * {@link TransformsType } * */ - public MoaTransformsType getMoaTransforms() { - return moaTransforms; + public TransformsType getTransforms() { + return transforms; } /** - * Sets the value of the moaTransforms property. + * Sets the value of the transforms property. * * @param value * allowed object is - * {@link MoaTransformsType } + * {@link TransformsType } * */ - public void setMoaTransforms(MoaTransformsType value) { - this.moaTransforms = value; + public void setTransforms(TransformsType value) { + this.transforms = value; } /** diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureRequestType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureRequestType.java index 9a1427c..96e5a64 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureRequestType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureRequestType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -16,7 +16,6 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElements; import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; @@ -40,15 +39,15 @@ import javax.xml.datatype.XMLGregorianCalendar; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="VerifySignatureEnvironment" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}ContentOptionalRefType"/> - * <element name="VerifySignatureLocation" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}XMLSignatureLocationType"/> + * <element name="VerifySignatureEnvironment" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentOptionalRefType"/> + * <element name="VerifySignatureLocation" type="{http://www.w3.org/2001/XMLSchema}token"/> * </sequence> * </restriction> * </complexContent> * </complexType> * </element> * <choice maxOccurs="unbounded" minOccurs="0"> - * <element ref="{http://reference.e-government.gv.at/namespace/moa/20151109#}SupplementProfile"/> + * <element ref="{http://reference.e-government.gv.at/namespace/moa/20020822#}SupplementProfile"/> * <element name="SupplementProfileID" type="{http://www.w3.org/2001/XMLSchema}string"/> * </choice> * <element name="SignatureManifestCheckParams" minOccurs="0"> @@ -56,7 +55,7 @@ import javax.xml.datatype.XMLGregorianCalendar; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="ReferenceInfo" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}VerifyTransformsDataType" maxOccurs="unbounded"/> + * <element name="ReferenceInfo" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}VerifyTransformsDataType" maxOccurs="unbounded"/> * </sequence> * <attribute name="ReturnReferenceInputData" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /> * </restriction> @@ -83,9 +82,6 @@ import javax.xml.datatype.XMLGregorianCalendar; "returnHashInputData", "trustProfileID" }) -@XmlSeeAlso({ - VerifyXMLSignatureRequest.class -}) public class VerifyXMLSignatureRequestType { @XmlElement(name = "DateTime") @@ -294,7 +290,7 @@ public class VerifyXMLSignatureRequestType { * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="ReferenceInfo" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}VerifyTransformsDataType" maxOccurs="unbounded"/> + * <element name="ReferenceInfo" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}VerifyTransformsDataType" maxOccurs="unbounded"/> * </sequence> * <attribute name="ReturnReferenceInputData" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /> * </restriction> @@ -385,8 +381,8 @@ public class VerifyXMLSignatureRequestType { * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="VerifySignatureEnvironment" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}ContentOptionalRefType"/> - * <element name="VerifySignatureLocation" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}XMLSignatureLocationType"/> + * <element name="VerifySignatureEnvironment" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentOptionalRefType"/> + * <element name="VerifySignatureLocation" type="{http://www.w3.org/2001/XMLSchema}token"/> * </sequence> * </restriction> * </complexContent> @@ -405,7 +401,9 @@ public class VerifyXMLSignatureRequestType { @XmlElement(name = "VerifySignatureEnvironment", required = true) protected ContentOptionalRefType verifySignatureEnvironment; @XmlElement(name = "VerifySignatureLocation", required = true) - protected XMLSignatureLocationType verifySignatureLocation; + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlSchemaType(name = "token") + protected String verifySignatureLocation; /** * Gets the value of the verifySignatureEnvironment property. @@ -436,10 +434,10 @@ public class VerifyXMLSignatureRequestType { * * @return * possible object is - * {@link XMLSignatureLocationType } + * {@link String } * */ - public XMLSignatureLocationType getVerifySignatureLocation() { + public String getVerifySignatureLocation() { return verifySignatureLocation; } @@ -448,10 +446,10 @@ public class VerifyXMLSignatureRequestType { * * @param value * allowed object is - * {@link XMLSignatureLocationType } + * {@link String } * */ - public void setVerifySignatureLocation(XMLSignatureLocationType value) { + public void setVerifySignatureLocation(String value) { this.verifySignatureLocation = value; } diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureResponseType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureResponseType.java index 622b90f..38842ae 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureResponseType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureResponseType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -27,14 +27,14 @@ import javax.xml.bind.annotation.XmlType; * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> * <element name="SignerInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType"/> - * <element name="HashInputData" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}InputDataType" maxOccurs="unbounded" minOccurs="0"/> - * <element name="ReferenceInputData" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}InputDataType" maxOccurs="unbounded" minOccurs="0"/> - * <element name="SignatureCheck" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}ReferencesCheckResultType"/> - * <element name="SignatureManifestCheck" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}ReferencesCheckResultType" minOccurs="0"/> - * <element name="XMLDSIGManifestCheck" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}ManifestRefsCheckResultType" maxOccurs="unbounded" minOccurs="0"/> - * <element name="CertificateCheck" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}CheckResultType"/> - * <element name="FormCheckResult" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}FormResultType" maxOccurs="unbounded" minOccurs="0"/> - * <element name="ExtendedCertificateCheck" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}ExtendedCertificateCheckResultType" minOccurs="0"/> + * <element name="HashInputData" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}InputDataType" maxOccurs="unbounded" minOccurs="0"/> + * <element name="ReferenceInputData" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}InputDataType" maxOccurs="unbounded" minOccurs="0"/> + * <element name="SignatureCheck" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ReferencesCheckResultType"/> + * <element name="SignatureManifestCheck" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ReferencesCheckResultType" minOccurs="0"/> + * <element name="XMLDSIGManifestCheck" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ManifestRefsCheckResultType" maxOccurs="unbounded" minOccurs="0"/> + * <element name="CertificateCheck" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}CheckResultType"/> + * <element name="FormCheckResult" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}FormResultType" maxOccurs="unbounded" minOccurs="0"/> + * <element name="ExtendedCertificateCheck" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ExtendedCertificateCheckResultType" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/X509DataType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/X509DataType.java index 76ad845..e653d0c 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/X509DataType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/X509DataType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -53,11 +53,11 @@ import org.w3c.dom.Element; public class X509DataType { @XmlElementRefs({ - @XmlElementRef(name = "X509CRL", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "X509SubjectName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "X509IssuerSerial", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), @XmlElementRef(name = "X509Certificate", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "X509SKI", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) + @XmlElementRef(name = "X509SKI", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), + @XmlElementRef(name = "X509IssuerSerial", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), + @XmlElementRef(name = "X509SubjectName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), + @XmlElementRef(name = "X509CRL", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) }) @XmlAnyElement(lax = true) protected List<Object> x509IssuerSerialOrX509SKIOrX509SubjectName; @@ -82,9 +82,9 @@ public class X509DataType { * Objects of the following type(s) are allowed in the list * {@link Object } * {@link JAXBElement }{@code <}{@link byte[]}{@code >} - * {@link JAXBElement }{@code <}{@link String }{@code >} - * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >} * {@link JAXBElement }{@code <}{@link byte[]}{@code >} + * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} * {@link Element } * {@link JAXBElement }{@code <}{@link byte[]}{@code >} * diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/X509IssuerSerialType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/X509IssuerSerialType.java index 684ade3..18507b9 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/X509IssuerSerialType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/X509IssuerSerialType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/XMLContentType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/XMLContentType.java new file mode 100644 index 0000000..b486c4b --- /dev/null +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/XMLContentType.java @@ -0,0 +1,70 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2016.06.15 at 04:11:53 PM CEST +// + + +package at.gv.egiz.moasig; + +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; + + +/** + * <p>Java class for XMLContentType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="XMLContentType"> + * <complexContent> + * <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}AnyChildrenType"> + * <attribute ref="{http://www.w3.org/XML/1998/namespace}space"/> + * </extension> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "XMLContentType") +public class XMLContentType + extends AnyChildrenType +{ + + @XmlAttribute(name = "space", namespace = "http://www.w3.org/XML/1998/namespace") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + protected String space; + + /** + * Gets the value of the space property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSpace() { + return space; + } + + /** + * Sets the value of the space property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSpace(String value) { + this.space = value; + } + +} diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/XMLDataObjectAssociationType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/XMLDataObjectAssociationType.java index f0c8a59..a15226a 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/XMLDataObjectAssociationType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/XMLDataObjectAssociationType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // @@ -24,8 +24,8 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="MetaInfo" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}MetaInfoType" minOccurs="0"/> - * <element name="Content" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}ContentRequiredRefType"/> + * <element name="MetaInfo" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}MetaInfoType" minOccurs="0"/> + * <element name="Content" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentRequiredRefType"/> * </sequence> * </restriction> * </complexContent> diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/package-info.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/package-info.java index cb3fb6c..d01d79c 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/package-info.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/package-info.java @@ -2,8 +2,8 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.06.09 at 06:28:21 AM CEST +// Generated on: 2016.06.15 at 04:11:53 PM CEST // -@javax.xml.bind.annotation.XmlSchema(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@javax.xml.bind.annotation.XmlSchema(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) package at.gv.egiz.moasig; diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureVerificationService.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureVerificationService.java index 8278399..e4d93a7 100644 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureVerificationService.java +++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureVerificationService.java @@ -24,6 +24,15 @@ package at.gv.egovernment.moa.spss.server.service; +import at.gv.egiz.asic.api.ASiC; +import at.gv.egiz.asic.api.ASiCFactory; +import at.gv.egiz.asic.api.ASiCFormat; +import at.gv.egiz.asic.api.ASiCVerificationResult; +import at.gv.egiz.asic.impl.ASiCMOAVerifier; +import at.gv.egiz.asic.xmlbind.VerifyASICSignatureRequestParser; +import at.gv.egiz.asic.xmlbind.VerifyASICSignatureResponseBuilder; +import at.gv.egiz.asic.xmlbind.VerifyASiCRequest; +import at.gv.egovernment.moa.spss.MOAApplicationException; import org.apache.axis.AxisFault; import org.w3c.dom.Element; @@ -45,6 +54,9 @@ import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager; import at.gv.egovernment.moaspss.logging.Logger; import at.gv.egovernment.moaspss.util.StreamUtils; +import java.io.FileInputStream; +import java.util.List; + /** * The service endpoint for the <code>SignatureVerification</code> web service. * @@ -122,6 +134,80 @@ public class SignatureVerificationService { return response; } + + + /** + * Handle a <code>VerifyPDFSignatureRequest</code>. + * + * @param request The <code>VerifyPDFSignatureRequest</code> to work on + * (contained in the 0th element of the array). + * @return A <code>VerifyPDFSignatureResponse</code> as the only element of + * the <code>Element</code> array. + * @throws AxisFault An error occurred during handling of the message. + */ + public Element[] VerifyASICSignatureRequest(Element[] request) + throws AxisFault { + CMSSignatureVerificationInvoker invoker = + CMSSignatureVerificationInvoker.getInstance(); + Element[] response = new Element[1]; + + try { + + // create a parser and builder for binding API objects to/from XML + VerifyASICSignatureRequestParser requestParser = + new VerifyASICSignatureRequestParser(); + VerifyASICSignatureResponseBuilder responseBuilder = + new VerifyASICSignatureResponseBuilder(); + Element reparsedReq; + VerifyASiCRequest requestObj; + VerifyCMSSignatureResponse responseObj; + // create a parser and builder for binding API objects to/from XML + + //since Axis (1.1 ff) has problem with namespaces we take the raw request stored by the Axishandler. + TransactionContext context = TransactionContextManager.getInstance().getTransactionContext(); + // validate the request + reparsedReq = ServiceUtils.reparseRequest(request[0]);//context.getRequest()); + + // convert to API objects + requestObj = requestParser.parseASIC(reparsedReq); + + if(requestObj.getFormat() == null) { + throw new MOAApplicationException("asic.0006", null); + } + + ASiC aSiC = ASiCFactory.parseASiC(requestObj.getAsicInput(), + requestObj.getFormat()); + + Logger.debug("Got ASiC " + aSiC); + + // invoke the core logic + ASiCMOAVerifier v = new ASiCMOAVerifier(); + List<ASiCVerificationResult> results = v.verify(aSiC, + requestObj.getTrustProfile(), requestObj.getDate()); + + // map back to XML + response[0] = responseBuilder.build(results).getDocumentElement(); + + // save response in transaction + context.setResponse(response[0]); + + } catch (MOAException e) { + AxisFault fault = AxisFault.makeFault(e); + fault.setFaultDetail(new Element[] { e.toErrorResponse()}); + Logger.debug("Anfrage zur Signaturpruefung wurde nicht erfolgreich beendet:" + + System.getProperty("line.separator") + StreamUtils.getStackTraceAsString(e)); + throw fault; + } catch (Throwable t) { + MOASystemException e = new MOASystemException("2900", null, t); + AxisFault fault = AxisFault.makeFault(e); + fault.setFaultDetail(new Element[] { e.toErrorResponse()}); + Logger.debug("Anfrage zur Signaturpruefung wurde nicht erfolgreich beendet:" + + System.getProperty("line.separator") + StreamUtils.getStackTraceAsString(e)); + throw fault; + } + + return response; + } /** * Handle a <code>VerifyCMSSignatureRequest</code>. diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/CMSCreateSignatureBindingImpl.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/CMSCreateSignatureBindingImpl.java deleted file mode 100644 index 31302d3..0000000 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/CMSCreateSignatureBindingImpl.java +++ /dev/null @@ -1,72 +0,0 @@ -package at.gv.egovernment.moa.spss.server.webservice.binding; - -import java.util.Iterator; -import java.util.List; - -import at.gv.egiz.moasig.CreateCMSSignatureResponseType; -import at.gv.egovernment.moa.spss.MOAApplicationException; -import at.gv.egovernment.moa.spss.api.SPSSFactory; -import at.gv.egovernment.moa.spss.api.cmssign.CMSSignatureResponse; -import at.gv.egovernment.moa.spss.api.cmssign.CreateCMSSignatureRequest; -import at.gv.egovernment.moa.spss.api.cmssign.CreateCMSSignatureResponse; -import at.gv.egovernment.moa.spss.api.cmssign.CreateCMSSignatureResponseElement; -import at.gv.egovernment.moa.spss.api.xmlsign.ErrorResponse; -import at.gv.egovernment.moa.spss.server.webservice.CMSCreateSignatureBinding; - -public class CMSCreateSignatureBindingImpl implements CMSCreateSignatureBinding { - - private TransformerUtils transformerUtils = new TransformerUtils(); - - /** The factory to create API objects. */ - private SPSSFactory factory; - - private CMSParserUtils cmsParserUtils; - - public CMSCreateSignatureBindingImpl() { - this.factory = SPSSFactory.getInstance(); - this.cmsParserUtils = new CMSParserUtils(); - } - - @Override - public CreateCMSSignatureRequest buildCMSRequest( - at.gv.egiz.moasig.CreateCMSSignatureRequest createCMSSignatureRequest) throws MOAApplicationException { - - String keyIdentifier = createCMSSignatureRequest.getKeyIdentifier(); - List singleSignatureInfos = this.cmsParserUtils.parseSingleSignatureInfos( - createCMSSignatureRequest.getSingleSignatureInfo()); - - return this.factory.createCreateCMSSignatureRequest(keyIdentifier, singleSignatureInfos); - } - - @Override - public CreateCMSSignatureResponseType buildCMSResponse(CreateCMSSignatureResponse response) - throws MOAApplicationException { - - Iterator iter = response.getResponseElements().iterator(); - - CreateCMSSignatureResponseType createCMSSignatureResponseType = new CreateCMSSignatureResponseType(); - - while (iter.hasNext()) { - CreateCMSSignatureResponseElement responseElement = (CreateCMSSignatureResponseElement) iter.next(); - - switch (responseElement.getResponseType()) { - case CreateCMSSignatureResponseElement.CMS_SIGNATURE: - CMSSignatureResponse cmsSignatureResponse = (CMSSignatureResponse) responseElement; - createCMSSignatureResponseType.getCMSSignatureOrErrorResponse() - .add( - this.cmsParserUtils.addCMSSignature(cmsSignatureResponse)); - break; - - case CreateCMSSignatureResponseElement.ERROR_RESPONSE: - ErrorResponse errorResponse = (ErrorResponse) responseElement; - createCMSSignatureResponseType.getCMSSignatureOrErrorResponse().add( - this.cmsParserUtils.addErrorResponse(errorResponse)); - break; - } - } - - return createCMSSignatureResponseType; - } - - -} diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/CMSParserUtils.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/CMSParserUtils.java deleted file mode 100644 index 3bfe2f5..0000000 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/CMSParserUtils.java +++ /dev/null @@ -1,141 +0,0 @@ -package at.gv.egovernment.moa.spss.server.webservice.binding; - -import java.io.IOException; -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import at.gv.egovernment.moa.spss.MOAApplicationException; -import at.gv.egovernment.moa.spss.api.SPSSFactory; -import at.gv.egovernment.moa.spss.api.cmssign.CMSSignatureResponse; -import at.gv.egovernment.moa.spss.api.cmssign.DataObjectInfo; -import at.gv.egovernment.moa.spss.api.cmssign.SingleSignatureInfo; -import at.gv.egovernment.moa.spss.api.cmsverify.CMSDataObject; -import at.gv.egovernment.moa.spss.api.xmlsign.ErrorResponse; -import at.gv.egovernment.moaspss.util.Base64Utils; - -public class CMSParserUtils { - - private TransformerUtils transformerUtils = new TransformerUtils(); - - /** The factory to create API objects. */ - private SPSSFactory factory; - - public CMSParserUtils() { - this.factory = SPSSFactory.getInstance(); - } - - /** - * Add a <code>CMSSignature</code> element to the response. - * - * @param cmsSignatureResponse - * The content to put under the <code>CMSSignature</code> - * element. - * @throws IOException - */ - public byte[] addCMSSignature(CMSSignatureResponse cmsSignatureResponse) throws MOAApplicationException { - String base64Value = cmsSignatureResponse.getCMSSignature(); - - try { - return Base64Utils.decode(base64Value, true); - } catch (IOException e) { - throw new MOAApplicationException("Base64 decoding failed", null); - } - } - - /** - * Add a <code>ErrorResponse</code> element to the response. - * - * @param errorResponse - * The API object containing the information to put into the - * <code>ErrorResponse</code> DOM element. - */ - public at.gv.egiz.moasig.ErrorResponseType addErrorResponse(ErrorResponse errorResponse) { - at.gv.egiz.moasig.ErrorResponseType errorResponseType = new at.gv.egiz.moasig.ErrorResponseType(); - - errorResponseType.setErrorCode(BigInteger.valueOf(errorResponse.getErrorCode())); - errorResponseType.setInfo(errorResponse.getInfo()); - - return errorResponseType; - } - - /** - * Parse all <code>SingleSignatureInfo</code> elements of the - * <code>CreateCMSSignatureRequest</code>. - * - * @param requestElem - * The <code>CreateCMSSignatureRequest</code> to parse. - * @return A <code>List</code> of <code>SingleSignatureInfo</code> API - * objects. - * @throws MOAApplicationException - * An error occurred parsing on of the - * <code>SingleSignatureInfo</code> elements. - */ - public List parseSingleSignatureInfos( - List<at.gv.egiz.moasig.CreateCMSSignatureRequestType.SingleSignatureInfo> singleInfos) - throws MOAApplicationException { - - List singleSignatureInfos = new ArrayList(); - - Iterator<at.gv.egiz.moasig.CreateCMSSignatureRequestType.SingleSignatureInfo> singleInfoIterator = singleInfos - .iterator(); - - while (singleInfoIterator.hasNext()) { - at.gv.egiz.moasig.CreateCMSSignatureRequestType.SingleSignatureInfo singleSignatureInfo = singleInfoIterator - .next(); - - singleSignatureInfos.add(parseSingleSignatureInfo(singleSignatureInfo)); - } - - return singleSignatureInfos; - } - - /** - * Parse a <code>SingleSignatureInfo</code> DOM element. - * - * @param sigInfoElem - * The <code>SingleSignatureInfo</code> DOM element to parse. - * @return A <code>SingleSignatureInfo</code> API object containing the - * information of <code>sigInfoElem</code>. - * @throws MOAApplicationException - * An error occurred parsing the - * <code>SingleSignatureInfo</code>. - */ - public SingleSignatureInfo parseSingleSignatureInfo( - at.gv.egiz.moasig.CreateCMSSignatureRequestType.SingleSignatureInfo singleSignatureInfo) - throws MOAApplicationException { - - DataObjectInfo dataObjectInfo = parseDataObjectInfo(singleSignatureInfo.getDataObjectInfo()); - boolean securityLayerConform = singleSignatureInfo.isSecurityLayerConformity(); - - return factory.createSingleSignatureInfoCMS(dataObjectInfo, securityLayerConform); - } - - /** - * Parse the <code>DataObjectInfo</code> DOM elements contained in the given - * <code>SingleSignatureInfo</code> DOM element. - * - * @param sigInfoElem - * The <code>SingleSignatureInfo</code> DOM element whose - * <code>DataObjectInfo</code>s to parse. - * @return A <code>List</code> of <code>DataObjectInfo</code> API objects - * containing the data from the <code>DataObjectInfo</code> DOM - * elements. - * @throws MOAApplicationException - * An error occurred parsing one of the - * <code>DataObjectInfo</code>s. - */ - public DataObjectInfo parseDataObjectInfo( - at.gv.egiz.moasig.CreateCMSSignatureRequestType.SingleSignatureInfo.DataObjectInfo dataObjectInfo) - throws MOAApplicationException { - - String structure = dataObjectInfo.getStructure(); - - CMSDataObject dataObject = this.transformerUtils.parseDataObject(dataObjectInfo.getDataObject()); - - return factory.createDataObjectInfo(structure, dataObject); - - } - -} diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/CMSVerifySignatureBindingImpl.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/CMSVerifySignatureBindingImpl.java deleted file mode 100644 index 1cfa806..0000000 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/CMSVerifySignatureBindingImpl.java +++ /dev/null @@ -1,244 +0,0 @@ -package at.gv.egovernment.moa.spss.server.webservice.binding; - -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.Date; -import java.util.Iterator; -import java.util.List; -import java.util.StringTokenizer; - -import at.gv.egiz.moasig.FormResultType; -import at.gv.egiz.moasig.ObjectFactory; -import at.gv.egiz.moasig.PDFSignatureResultType; -import at.gv.egiz.moasig.VerifyCMSSignatureResponseType; -import at.gv.egiz.moasig.VerifyPDFSignatureRequest; -import at.gv.egiz.moasig.VerifyPDFSignatureResponseType; -import at.gv.egovernment.moa.spss.MOAApplicationException; -import at.gv.egovernment.moa.spss.api.SPSSFactory; -import at.gv.egovernment.moa.spss.api.cmsverify.CMSDataObject; -import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest; -import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse; -import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponseElement; -import at.gv.egovernment.moa.spss.api.common.CheckResult; -import at.gv.egovernment.moa.spss.api.common.SignerInfo; -import at.gv.egovernment.moa.spss.api.xmlverify.AdESFormResults; -import at.gv.egovernment.moa.spss.server.webservice.CMSVerifySignatureBinding; -import at.gv.egovernment.moaspss.util.CollectionUtils; - -public class CMSVerifySignatureBindingImpl implements CMSVerifySignatureBinding { - - private TransformerUtils transformerUtils = new TransformerUtils(); - - /** The factory to create API objects. */ - private SPSSFactory factory = SPSSFactory.getInstance(); - - @Override - public VerifyCMSSignatureRequest buildCMSRequest( - at.gv.egiz.moasig.VerifyCMSSignatureRequest verifyCMSSignatureRequest) throws MOAApplicationException { - - Date dateTime = null; - if (verifyCMSSignatureRequest.getDateTime() != null) { - dateTime = verifyCMSSignatureRequest.getDateTime().toGregorianCalendar().getTime(); - } - - int[] signatories = parseSignatories(verifyCMSSignatureRequest); - - CMSDataObject dataObject = this.transformerUtils.parseDataObject(verifyCMSSignatureRequest.getDataObject()); - - String trustProfileID = null; - - if (verifyCMSSignatureRequest.getTrustProfileID() != null) { - trustProfileID = verifyCMSSignatureRequest.getTrustProfileID(); - } - - InputStream cmsSignature = new ByteArrayInputStream(verifyCMSSignatureRequest.getCMSSignature()); - - return factory.createVerifyCMSSignatureRequest(signatories, dateTime, cmsSignature, dataObject, trustProfileID, false); - } - - /** - * Parse the <code>Signatories</code> attribute contained in the - * <code>VerifyCMSSignatureRequest</code> DOM element. - * - * @param requestElem - * The <code>VerifyCMSSignatureRequest</code> DOM element. - * @return The signatories contained in the given - * <code>VerifyCMSSignatureRequest</code> DOM element. - */ - private int[] parseSignatories(at.gv.egiz.moasig.VerifyCMSSignatureRequest verifyCMSSignatureRequest) { - if(verifyCMSSignatureRequest.getSignatories().isEmpty()) { - return VerifyCMSSignatureRequest.ALL_SIGNATORIES; - } - - Iterator<String> signatoriesIterator = verifyCMSSignatureRequest.getSignatories().iterator(); - List signatoriesList = new ArrayList(); - - int[] signatories; - while (signatoriesIterator.hasNext()) { - String signatorie = signatoriesIterator.next(); - - if ("all".equals(signatorie)) { - return VerifyCMSSignatureRequest.ALL_SIGNATORIES; - } else { - StringTokenizer tokenizer = new StringTokenizer(signatorie); - // put the signatories into a List - while (tokenizer.hasMoreTokens()) { - try { - signatoriesList.add(new Integer(tokenizer.nextToken())); - } catch (NumberFormatException e) { - // this cannot occur if the request has been validated - } - } - } - - } - - // convert the List into an int array - signatories = CollectionUtils.toIntArray(signatoriesList); - - return signatories; - } - - @Override - public VerifyCMSSignatureResponseType buildCMSResponse(VerifyCMSSignatureResponse response) - throws MOAApplicationException { - - VerifyCMSSignatureResponseType verifyCMSSignatureResponseType = new VerifyCMSSignatureResponseType(); - - Iterator iter; - - for (iter = response.getResponseElements().iterator(); iter.hasNext();) { - VerifyCMSSignatureResponseElement responseElement = (VerifyCMSSignatureResponseElement) iter.next(); - addResponseElement(verifyCMSSignatureResponseType, responseElement); - } - - return verifyCMSSignatureResponseType; - } - - /** - * Add an element to the response. - * - * @param responseElement - * The element to add to the response. - * @throws MOAApplicationException - * An error occurred adding the element. - */ - private void addResponseElement(VerifyCMSSignatureResponseType verifyCMSSignatureResponseType, - VerifyCMSSignatureResponseElement responseElement) throws MOAApplicationException { - - ObjectFactory of = new ObjectFactory(); - SignerInfo signerInfo = responseElement.getSignerInfo(); - CheckResult signatureCheck = responseElement.getSignatureCheck(); - CheckResult certCheck = responseElement.getCertificateCheck(); - - verifyCMSSignatureResponseType.getSignerInfoAndSignatureCheckAndCertificateCheck().add( - of.createVerifyCMSSignatureResponseTypeSignerInfo(this.transformerUtils.buildSignerInfo(signerInfo))); - verifyCMSSignatureResponseType.getSignerInfoAndSignatureCheckAndCertificateCheck() - .add(of.createVerifyCMSSignatureResponseTypeSignatureCheck( - this.transformerUtils.buildCheckResult(signatureCheck))); - - verifyCMSSignatureResponseType.getSignerInfoAndSignatureCheckAndCertificateCheck() - .add(of.createVerifyCMSSignatureResponseTypeCertificateCheck( - this.transformerUtils.buildCheckResult(certCheck))); - - if (responseElement.getAdESFormResults() != null) { - Iterator adesIterator = responseElement.getAdESFormResults().iterator(); - while (adesIterator.hasNext()) { - AdESFormResults adesResult = (AdESFormResults) adesIterator.next(); - FormResultType formResultType = new FormResultType(); - formResultType.setCode(BigInteger.valueOf(adesResult.getCode())); - formResultType.setName(adesResult.getName()); - - verifyCMSSignatureResponseType.getSignerInfoAndSignatureCheckAndCertificateCheck().add( - of.createVerifyCMSSignatureResponseTypeFormCheckResult(formResultType)); - } - } - } - - /** - * Add an element to the response. - * - * @param responseElement - * The element to add to the response. - * @throws MOAApplicationException - * An error occurred adding the element. - */ - private void addResponseElement(VerifyPDFSignatureResponseType verifyPDFSignatureResponseType, - VerifyCMSSignatureResponseElement responseElement) throws MOAApplicationException { - - SignerInfo signerInfo = responseElement.getSignerInfo(); - CheckResult signatureCheck = responseElement.getSignatureCheck(); - CheckResult certCheck = responseElement.getCertificateCheck(); - - PDFSignatureResultType resultType = new PDFSignatureResultType(); - - if (responseElement.getAdESFormResults() != null) { - Iterator adesIterator = responseElement.getAdESFormResults().iterator(); - while (adesIterator.hasNext()) { - AdESFormResults adesResult = (AdESFormResults) adesIterator.next(); - FormResultType formResultType = new FormResultType(); - formResultType.setCode(BigInteger.valueOf(adesResult.getCode())); - formResultType.setName(adesResult.getName()); - resultType.getFormCheckResult().add(formResultType); - } - } - - resultType.setSignerInfo(this.transformerUtils.buildSignerInfo(signerInfo)); - resultType.setSignatureCheck(this.transformerUtils.buildCheckResult(signatureCheck)); - resultType.setCertificateCheck(this.transformerUtils.buildCheckResult(certCheck)); - - verifyPDFSignatureResponseType.getSignatureResult().add(resultType); - } - - /** - * Parse the <code>Signatories</code> attribute contained in the - * <code>VerifyCMSSignatureRequest</code> DOM element. - * - * @param requestElem - * The <code>VerifyCMSSignatureRequest</code> DOM element. - * @return The signatories contained in the given - * <code>VerifyCMSSignatureRequest</code> DOM element. - */ - private int[] parseSignatories(VerifyPDFSignatureRequest verifyPDFSignatureRequest) { - return VerifyCMSSignatureRequest.ALL_SIGNATORIES; - } - - @Override - public VerifyCMSSignatureRequest buildPDFRequest(VerifyPDFSignatureRequest verifyPDFSignatureRequest) - throws MOAApplicationException { - Date dateTime = null; - if (verifyPDFSignatureRequest.getDateTime() != null) { - dateTime = verifyPDFSignatureRequest.getDateTime().toGregorianCalendar().getTime(); - } - - int[] signatories = parseSignatories(verifyPDFSignatureRequest); - - String trustProfileID = null; - - if (verifyPDFSignatureRequest.getTrustProfileID() != null) { - trustProfileID = verifyPDFSignatureRequest.getTrustProfileID(); - } - - InputStream cmsSignature = new ByteArrayInputStream(verifyPDFSignatureRequest.getPDFSignature()); - - return factory.createVerifyCMSSignatureRequest(signatories, dateTime, cmsSignature, null, trustProfileID, true); - } - - @Override - public VerifyPDFSignatureResponseType buildPDFResponse(VerifyCMSSignatureResponse response) - throws MOAApplicationException { - VerifyPDFSignatureResponseType verifyPDFSignatureResponseType = new VerifyPDFSignatureResponseType(); - - Iterator iter; - - for (iter = response.getResponseElements().iterator(); iter.hasNext();) { - VerifyCMSSignatureResponseElement responseElement = (VerifyCMSSignatureResponseElement) iter.next(); - addResponseElement(verifyPDFSignatureResponseType, responseElement); - } - - return verifyPDFSignatureResponseType; - } - -} diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/PDFCreateSignatureBindingImpl.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/PDFCreateSignatureBindingImpl.java deleted file mode 100644 index b16cce7..0000000 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/PDFCreateSignatureBindingImpl.java +++ /dev/null @@ -1,85 +0,0 @@ -package at.gv.egovernment.moa.spss.server.webservice.binding; - -import java.math.BigInteger; -import java.util.Iterator; - -import at.gv.egiz.moasig.CreatePDFSignatureRequest; -import at.gv.egiz.moasig.CreatePDFSignatureResponseType; -import at.gv.egiz.moasig.ErrorResponseType; -import at.gv.egovernment.moa.spss.MOAApplicationException; -import at.gv.egovernment.moa.spss.server.webservice.PDFCreateSignatureBinding; -import at.gv.egovernment.moa.spss.server.xmlbind.CreatePDFRequest; -import at.gv.egovernment.moa.spss.server.xmlbind.CreatePDFRespone; -import at.gv.egovernment.moa.spss.server.xmlbind.PDFSignatureInfo; -import at.gv.egovernment.moa.spss.server.xmlbind.SignedPDFInfo; - -public class PDFCreateSignatureBindingImpl implements PDFCreateSignatureBinding { - - public PDFCreateSignatureBindingImpl() { - } - - @Override - public CreatePDFRequest buildPDFRequest(CreatePDFSignatureRequest createCMSSignatureRequest) - throws MOAApplicationException { - String keyIdentifier = createCMSSignatureRequest.getKeyIdentifier(); - CreatePDFRequest createPDFRequest = new CreatePDFRequest(keyIdentifier); - Iterator<at.gv.egiz.moasig.CreatePDFSignatureRequest.SingleSignatureInfo> iter = - createCMSSignatureRequest.getSingleSignatureInfo().iterator(); - - while(iter.hasNext()) { - at.gv.egiz.moasig.CreatePDFSignatureRequest.SingleSignatureInfo singleSignatureInfo = iter.next(); - createPDFRequest.getSignatureInfoList().add(parseSingleSignatureInfo(singleSignatureInfo)); - } - - return createPDFRequest; - } - - @Override - public CreatePDFSignatureResponseType buildPDFResponse(CreatePDFRespone response) throws MOAApplicationException { - - CreatePDFSignatureResponseType createPDFSignatureResponseType = new CreatePDFSignatureResponseType(); - - Iterator<SignedPDFInfo> iter = response.getSignatureInfoList().iterator(); - - while(iter.hasNext()) { - SignedPDFInfo signedPDFInfo = iter.next(); - - createPDFSignatureResponseType.getPDFSignature().add(buildPDFSignedResponse(signedPDFInfo)); - } - return createPDFSignatureResponseType; - } - - public PDFSignatureInfo parseSingleSignatureInfo( - at.gv.egiz.moasig.CreatePDFSignatureRequest.SingleSignatureInfo singleSignatureInfo) - throws MOAApplicationException { - String signatureProfile = singleSignatureInfo.getSignatureProfile(); - String signaturePosition = singleSignatureInfo.getSignaturePosition(); - String signatureID = singleSignatureInfo.getSignatureID(); - byte[] inputPDF = singleSignatureInfo.getPDFDocument(); - PDFSignatureInfo PDFSignatureInfo = new PDFSignatureInfo(inputPDF, - signatureProfile, signaturePosition, signatureID); - - return PDFSignatureInfo; - } - - public at.gv.egiz.moasig.PDFSignedRepsonse buildPDFSignedResponse(SignedPDFInfo signedPDFInfo) { - at.gv.egiz.moasig.PDFSignedRepsonse response = new at.gv.egiz.moasig.PDFSignedRepsonse(); - - response.setSignatureID(signedPDFInfo.getSignatureID()); - - switch (signedPDFInfo.getResponseType()) { - case SignedPDFInfo.SUCCESS_SIGNATURE: - response.setPDFSignature(signedPDFInfo.getPdfDocument()); - break; - - default: - ErrorResponseType errorResponseType = new ErrorResponseType(); - errorResponseType.setErrorCode(BigInteger.valueOf(signedPDFInfo.getErrorCode())); - errorResponseType.setInfo(signedPDFInfo.getErrorInfo()); - response.setErrorResponse(errorResponseType); - break; - } - - return response; - } -} diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/TransformParser.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/TransformParser.java deleted file mode 100644 index 1d05f22..0000000 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/TransformParser.java +++ /dev/null @@ -1,363 +0,0 @@ -/* - * Copyright 2003 Federal Chancellery Austria - * MOA-SPSS has been developed in a cooperation between BRZ, the Federal - * Chancellery Austria - ICT staff unit, and Graz University of Technology. - * - * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by - * the European Commission - subsequent versions of the EUPL (the "Licence"); - * You may not use this work except in compliance with the Licence. - * You may obtain a copy of the Licence at: - * http://www.osor.eu/eupl/ - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the Licence is distributed on an "AS IS" basis, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the Licence for the specific language governing permissions and - * limitations under the Licence. - * - * This product combines work with different licenses. See the "NOTICE" text - * file for details on the various modules and licenses. - * The "NOTICE" text file is part of the distribution. Any derivative works - * that you distribute must include a readable copy of the "NOTICE" text file. - */ - -package at.gv.egovernment.moa.spss.server.webservice.binding; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.Serializable; -import java.io.StringBufferInputStream; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.StringTokenizer; - -import javax.xml.bind.JAXBElement; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; - -import org.w3c.dom.Element; -import org.w3c.dom.traversal.NodeIterator; -import org.xml.sax.SAXException; - -import at.gv.egiz.moasig.MoaTransformType; -import at.gv.egiz.moasig.MoaTransformsType; -import at.gv.egovernment.moa.spss.MOAApplicationException; -import at.gv.egovernment.moa.spss.api.SPSSFactory; -import at.gv.egovernment.moa.spss.api.common.Base64Transform; -import at.gv.egovernment.moa.spss.api.common.CanonicalizationTransform; -import at.gv.egovernment.moa.spss.api.common.EnvelopedSignatureTransform; -import at.gv.egovernment.moa.spss.api.common.ExclusiveCanonicalizationTransform; -import at.gv.egovernment.moa.spss.api.common.Transform; -import at.gv.egovernment.moa.spss.api.common.XPathFilter; -import at.gv.egovernment.moa.spss.api.common.XPathFilter2Transform; -import at.gv.egovernment.moa.spss.api.common.XPathTransform; -import at.gv.egovernment.moa.spss.api.common.XSLTTransform; -import at.gv.egovernment.moaspss.util.Constants; -import at.gv.egovernment.moaspss.util.DOMUtils; -import at.gv.egovernment.moaspss.util.XPathUtils; - -/** - * A parser to parse XMLDsig <code>Transform</code> DOM elements into their MOA - * SPSS API representation. - * - * @author Patrick Peck - * @version $Id$ - */ -public class TransformParser { - // - // XPath expressions for selecting information from the DOM tree - // - private static final String DSIG = Constants.DSIG_PREFIX + ":"; - private static final String DSIG_FILTER2 = Constants.DSIG_FILTER2_PREFIX + ":"; - private static final String XSLT = Constants.XSLT_PREFIX + ":"; - private static final String EC = Constants.DSIG_EC_PREFIX + ":"; - private static final String TRANSFORM_XPATH = DSIG + "Transform"; - private static final String XPATH_XPATH = DSIG + "XPath"; - private static final String XSLT_ELEMENT_XPATH = XSLT + "stylesheet"; - private static final String XPATH2_XPATH = (DSIG_FILTER2 + "XPath[@Filter=\"intersect\"] | ") - + (DSIG_FILTER2 + "XPath[@Filter=\"subtract\"] | ") + (DSIG_FILTER2 + "XPath[@Filter=\"union\"]"); - private static final String INCLUSIVE_NAMESPACES_XPATH = EC + "InclusiveNamespaces"; - - /** - * The <code>SPSSFactory</code> to use for creating new API objects. - */ - private SPSSFactory factory = SPSSFactory.getInstance(); - - /** - * Parse an XMLDsig <code>Transforms</code> DOM element. - * - * @param transformsElem - * The <code>Transforms</code> DOM element to parse. - * @return A <code>List</code> of <code>Transform</code> API objects - * containing the data from the individual <code>Transform</code> - * DOM elements. - * @throws MOAApplicationException - * An error occurred parsing the <code>Transforms</code> DOM - * element. - */ - public List parseTransforms(MoaTransformsType moaTransformsType) throws MOAApplicationException { - List transforms = new ArrayList(); - if (moaTransformsType.getMoaTransform() != null) { - Iterator<MoaTransformType> transformIterator = moaTransformsType.getMoaTransform().iterator(); - - while (transformIterator.hasNext()) { - MoaTransformType transformType = transformIterator.next(); - Transform transform = parseTransform(transformType); - transforms.add(transform); - } - } - return transforms; - } - - /** - * Parse an XMLDsig <code>Transform</code> DOM element. - * - * @param transformElem - * <code>Transform</code> DOM element to parse. - * @return The <code>Transform</code> API object containing the data from - * the <code>Transform</code> DOM element. - * @throws MOAApplicationException - * An error occurred parsing the <code>Transform</code> DOM - * element. - */ - public Transform parseTransform(MoaTransformType transformType) throws MOAApplicationException { - - String algorithmUri = transformType.getAlgorithm();// transformElem.getAttribute("Algorithm"); - - if (CanonicalizationTransform.CANONICAL_XML.equals(algorithmUri) - || CanonicalizationTransform.CANONICAL_XML_WITH_COMMENTS.equals(algorithmUri)) { - return factory.createCanonicalizationTransform(algorithmUri); - } else if (ExclusiveCanonicalizationTransform.EXCLUSIVE_CANONICAL_XML.equals(algorithmUri) - || ExclusiveCanonicalizationTransform.EXCLUSIVE_CANONICAL_XML_WITH_COMMENTS.equals(algorithmUri)) { - return parseExclusiveC14nTransform(algorithmUri, transformType); - } else if (Base64Transform.BASE64_DECODING.equals(algorithmUri)) { - return factory.createBase64Transform(); - } else if (EnvelopedSignatureTransform.ENVELOPED_SIGNATURE.equals(algorithmUri)) { - return factory.createEnvelopedSignatureTransform(); - } else if (XPathTransform.XPATH.equals(algorithmUri)) { - return parseXPathTransform(transformType); - } else if (XPathFilter2Transform.XPATH_FILTER2.equals(algorithmUri)) { - return parseXPathFilter2Transform(transformType); - } else if (XSLTTransform.XSLT.equals(algorithmUri)) { - return parseXSLTTransform(transformType); - } else { - throw new MOAApplicationException("1108", new Object[] { algorithmUri }); - } - } - - private List<byte[]> getDataObjectFromMoaTransform(MoaTransformType transformType) { - Iterator<Serializable> objectsIterator = transformType.getContent().iterator(); - List<byte[]> dataObjects = new ArrayList<byte[]>(); - while (objectsIterator.hasNext()) { - Serializable serializable = objectsIterator.next(); - if (serializable instanceof JAXBElement<?>) { - JAXBElement<?> jaxb = (JAXBElement<?>) serializable; - if (jaxb.getDeclaredType() == byte[].class) { - JAXBElement<byte[]> jaxbString = (JAXBElement<byte[]>) serializable; - dataObjects.add(jaxbString.getValue()); - } - } - } - return dataObjects; - } - - private List<String> getStringFromMoaTransform(MoaTransformType transformType) { - Iterator<Serializable> objectsIterator = transformType.getContent().iterator(); - List<String> dataObjects = new ArrayList<String>(); - while (objectsIterator.hasNext()) { - Serializable serializable = objectsIterator.next(); - if (serializable instanceof JAXBElement<?>) { - JAXBElement<?> jaxb = (JAXBElement<?>) serializable; - if (jaxb.getDeclaredType() == String.class) { - JAXBElement<String> jaxbString = (JAXBElement<String>) serializable; - dataObjects.add(jaxbString.getValue()); - } - } else if (serializable instanceof String) { - dataObjects.add((String) serializable); - } - } - return dataObjects; - } - - /** - * Parse an exclusive canonicalization type of transform. - * - * @param algorithmUri - * The algorithm URI of the canonicalization algorithm. - * @param transformElem - * The <code>Transform</code> DOM element to parse. - * @return An <code>ExclusiveCanonicalizationTransform</code> API object - * containing the data from the <code>transformElem</code>. - * @throws MOAApplicationException - */ - private Transform parseExclusiveC14nTransform(String algorithmUri, MoaTransformType transformType) - throws MOAApplicationException { - List<byte[]> data = getDataObjectFromMoaTransform(transformType); - List inclusiveNamespaces = new ArrayList(); - Iterator<byte[]> dataIterator = data.iterator(); - while (dataIterator.hasNext()) { - byte[] dataObject = dataIterator.next(); - Element transform; - try { - transform = DOMUtils.parseXmlNonValidating(new ByteArrayInputStream(dataObject)); - } catch (ParserConfigurationException e) { - throw new MOAApplicationException("failed to parse transform element", null, e); - } catch (SAXException e) { - throw new MOAApplicationException("failed to parse transform element", null, e); - } catch (IOException e) { - throw new MOAApplicationException("failed to parse transform element", null, e); - } - - Element inclusiveNamespacesElem = (Element) XPathUtils.selectSingleNode(transform, - INCLUSIVE_NAMESPACES_XPATH); - - if (inclusiveNamespacesElem != null) { - StringTokenizer tokenizer = new StringTokenizer(inclusiveNamespacesElem.getAttribute("PrefixList")); - while (tokenizer.hasMoreTokens()) { - inclusiveNamespaces.add(tokenizer.nextToken()); - } - } - } - return factory.createExclusiveCanonicalizationTransform(algorithmUri, inclusiveNamespaces); - } - - /** - * Parse an <code>XPath</code> type of <code>Transform</code>. - * - * @param transformElem - * The <code>Transform</code> DOM element to parse. - * @return The <code>Transform</code> API object representation of the - * <code>Transform</code> DOM element. - * @throws MOAApplicationException - * An error occurred parsing the <code>Transform</code> DOM - * element. - */ - private Transform parseXPathTransform(MoaTransformType transformType) throws MOAApplicationException { - // TODO: XPATH Namespace Declarations - List<String> xPathTransforms = getStringFromMoaTransform(transformType); - Map nsDecls; - if (xPathTransforms.isEmpty()) { - throw new MOAApplicationException("2202", null); - } - nsDecls = new HashMap(); - return factory.createXPathTransform(xPathTransforms.get(0), nsDecls); - /* - * Element xPathElem = (Element) - * XPathUtils.selectSingleNode(transformElem, XPATH_XPATH); - * - * - * if (xPathElem == null) { throw new MOAApplicationException("2202", - * null); } - * - * nsDecls = DOMUtils.getNamespaceDeclarations(xPathElem); - * nsDecls.remove(""); - * - * return factory.createXPathTransform(DOMUtils.getText(xPathElem), - * nsDecls); - */ - } - - /** - * Parse an <code>XPathFilter2</code> type of <code>Transform</code>. - * - * @param transformElem - * The <code>Transform</code> DOM element to parse. - * @return The <code>Transform</code> API object representation of the - * <code>Transform</code> DOM element. - * @throws MOAApplicationException - * An error occurred parsing the <code>Transform</code> DOM - * element. - */ - private Transform parseXPathFilter2Transform(MoaTransformType transformType) throws MOAApplicationException { - - List<byte[]> data = getDataObjectFromMoaTransform(transformType); - - List filters = new ArrayList(); - Iterator<byte[]> dataIterator = data.iterator(); - while (dataIterator.hasNext()) { - byte[] dataObject = dataIterator.next(); - Element transform; - try { - transform = DOMUtils.parseXmlNonValidating(new ByteArrayInputStream(dataObject)); - } catch (ParserConfigurationException e) { - throw new MOAApplicationException("failed to parse transform element", null, e); - } catch (SAXException e) { - throw new MOAApplicationException("failed to parse transform element", null, e); - } catch (IOException e) { - throw new MOAApplicationException("failed to parse transform element", null, e); - } - - NodeIterator iter = XPathUtils.selectNodeIterator(transform, XPATH2_XPATH); - Element filterElem; - - while ((filterElem = (Element) iter.nextNode()) != null) { - String filterAttr = filterElem.getAttribute("Filter"); - String filterType; - String expression; - Map nsDecls; - - if (filterAttr.equals("intersect")) { - filterType = XPathFilter.INTERSECT_TYPE; - } else if (filterAttr.equals("subtract")) { - filterType = XPathFilter.SUBTRACT_TYPE; - } else { - filterType = XPathFilter.UNION_TYPE; - } - - expression = DOMUtils.getText(filterElem); - nsDecls = DOMUtils.getNamespaceDeclarations(filterElem); - nsDecls.remove(""); - filters.add(factory.createXPathFilter(filterType, expression, nsDecls)); - } - } - if (filters.size() == 0) { - throw new MOAApplicationException("2216", null); - } - - return factory.createXPathFilter2Transform(filters); - } - - /** - * Parse an <code>XSLT</code> type of <code>Transform</code>. - * - * @param transformElem - * The <code>Transform</code> DOM element to parse. - * @return The <code>Transform</code> API object representation of the - * <code>Transform</code> DOM element. - * @throws MOAApplicationException - * An error occurred parsing the <code>Transform</code> DOM - * element. - */ - private Transform parseXSLTTransform(MoaTransformType transformType) throws MOAApplicationException { - List<byte[]> data = getDataObjectFromMoaTransform(transformType); - - if (data.isEmpty()) { - throw new MOAApplicationException("2215", null); - } - - byte[] dataObject = data.get(0); - Element transform; - try { - transform = DOMUtils.parseXmlNonValidating(new ByteArrayInputStream(dataObject)); - } catch (ParserConfigurationException e) { - throw new MOAApplicationException("failed to parse transform element", null, e); - } catch (SAXException e) { - throw new MOAApplicationException("failed to parse transform element", null, e); - } catch (IOException e) { - throw new MOAApplicationException("failed to parse transform element", null, e); - } - - Element xsltElem = (Element) XPathUtils.selectSingleNode(transform, XSLT_ELEMENT_XPATH); - - if (xsltElem == null) { - - } - - return factory.createXSLTTransform(xsltElem); - } - -} diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/TransformerUtils.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/TransformerUtils.java deleted file mode 100644 index 676c95c..0000000 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/TransformerUtils.java +++ /dev/null @@ -1,521 +0,0 @@ -package at.gv.egovernment.moa.spss.server.webservice.binding; - -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.security.cert.CertificateEncodingException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import javax.xml.bind.JAXBElement; - -import org.w3c.dom.Element; -import org.w3c.dom.Node; - -import at.gv.egiz.moasig.MetaInfoType; -import at.gv.egiz.moasig.PublicAuthorityType; -import at.gv.egiz.moasig.QualifiedCertificate; -import at.gv.egiz.moasig.SecureSignatureCreationDevice; -import at.gv.egovernment.moa.spss.MOAApplicationException; -import at.gv.egovernment.moa.spss.api.SPSSFactory; -import at.gv.egovernment.moa.spss.api.cmsverify.CMSContent; -import at.gv.egovernment.moa.spss.api.cmsverify.CMSDataObject; -import at.gv.egovernment.moa.spss.api.common.Content; -import at.gv.egovernment.moa.spss.api.common.MetaInfo; -import at.gv.egovernment.moa.spss.api.common.XMLDataObjectAssociation; -import at.gv.egovernment.moa.spss.api.xmlsign.CreateSignatureEnvironmentProfile; -import at.gv.egovernment.moa.spss.api.xmlsign.CreateSignatureInfo; -import at.gv.egovernment.moa.spss.api.xmlsign.CreateSignatureLocation; -import at.gv.egovernment.moa.spss.api.xmlsign.CreateTransformsInfo; -import at.gv.egovernment.moa.spss.api.xmlsign.CreateTransformsInfoProfile; -import at.gv.egovernment.moa.spss.api.xmlsign.DataObjectInfo; -import at.gv.egovernment.moa.spss.api.xmlsign.SingleSignatureInfo; -import iaik.utils.RFC2253NameParser; -import iaik.utils.RFC2253NameParserException; - -public class TransformerUtils { - - /** The factory to create API objects. */ - private SPSSFactory factory; - - /** - * Create a new <code>CreateXMLSignatureRequestParser</code>. - */ - public TransformerUtils() { - this.factory = SPSSFactory.getInstance(); - } - - public SingleSignatureInfo buildSingleSignatureInfo( - at.gv.egiz.moasig.CreateXMLSignatureRequestType.SingleSignatureInfo singleSignatureInfo) - throws MOAApplicationException { - - List dataObjectInfos = new ArrayList(); - - Iterator<at.gv.egiz.moasig.CreateXMLSignatureRequestType.SingleSignatureInfo.DataObjectInfo> dataObjectInfoIterator = singleSignatureInfo - .getDataObjectInfo().iterator(); - - while (dataObjectInfoIterator.hasNext()) { - dataObjectInfos.add(buildDataObjectInfo(dataObjectInfoIterator.next())); - } - - at.gv.egiz.moasig.CreateXMLSignatureRequestType.SingleSignatureInfo.CreateSignatureInfo createSignatureInfoWeb = singleSignatureInfo - .getCreateSignatureInfo(); - - CreateSignatureInfo createSignatureInfo = buildCreateSignatureInfo(createSignatureInfoWeb); - - boolean securityLayerConform = singleSignatureInfo.isSecurityLayerConformity(); - - return factory.createSingleSignatureInfo(dataObjectInfos, createSignatureInfo, securityLayerConform); - } - - public DataObjectInfo buildDataObjectInfo( - at.gv.egiz.moasig.CreateXMLSignatureRequestType.SingleSignatureInfo.DataObjectInfo dataObjectInfo) - throws MOAApplicationException { - String structure = dataObjectInfo.getStructure(); - boolean childOfManifest = dataObjectInfo.isChildOfManifest(); - - Content dataObject = buildContent(dataObjectInfo.getDataObject()); - - CreateTransformsInfoProfile createTransformsInfoProfile = parseCreateTransformsInfoProfile( - dataObjectInfo.getCreateTransformsInfoProfile()); - - return factory.createDataObjectInfo(structure, childOfManifest, dataObject, createTransformsInfoProfile); - } - - public CreateSignatureInfo buildCreateSignatureInfo( - at.gv.egiz.moasig.CreateXMLSignatureRequestType.SingleSignatureInfo.CreateSignatureInfo createSignatureInfo) - throws MOAApplicationException { - if (createSignatureInfo == null) { - return null; - } else { - Content environment = buildContent(createSignatureInfo.getCreateSignatureEnvironment()); - CreateSignatureEnvironmentProfile environmentProfile = parseCreateSignatureEnvironmentProfile( - createSignatureInfo); - return factory.createCreateSignatureInfo(environment, environmentProfile); - } - } - - public CreateSignatureEnvironmentProfile parseCreateSignatureEnvironmentProfile( - at.gv.egiz.moasig.CreateXMLSignatureRequestType.SingleSignatureInfo.CreateSignatureInfo createSignatureInfo) - throws MOAApplicationException { - if (createSignatureInfo.getCreateSignatureEnvironmentProfile() != null) { - return parseCreateSignatureEnvironmentProfile(createSignatureInfo.getCreateSignatureEnvironmentProfile()); - } else { - String profileID = createSignatureInfo.getCreateSignatureEnvironmentProfileID(); - return factory.createCreateSignatureEnvironmentProfile(profileID); - } - } - - public CreateTransformsInfoProfile parseCreateTransformsInfoProfile( - at.gv.egiz.moasig.CreateXMLSignatureRequestType.SingleSignatureInfo.DataObjectInfo dataObjectInfo) - throws MOAApplicationException { - if (dataObjectInfo.getCreateTransformsInfoProfile() != null) { - at.gv.egiz.moasig.CreateTransformsInfoProfile createTransformsInfoProfile = dataObjectInfo - .getCreateTransformsInfoProfile(); - return parseCreateTransformsInfoProfile(createTransformsInfoProfile); - } else { - String profileID = dataObjectInfo.getCreateTransformsInfoProfileID(); - return factory.createCreateTransformsInfoProfile(profileID); - } - } - - /** - * Parse a <code>CreateTransformsInfoProfile</code> DOM element. - * - * @param profileElem - * The <code>CreateTransformsInfoProfile</code> element to parse. - * @return The <code>CreateTransformsInfoProfile</code> API object - * containing the data from the <code>profileElem</code>. - * @throws MOAApplicationException - * An error occurred parsing the DOM element. - */ - public CreateTransformsInfoProfile parseCreateTransformsInfoProfile( - at.gv.egiz.moasig.CreateTransformsInfoProfile createTransformsInfoProfile) throws MOAApplicationException { - if(createTransformsInfoProfile == null) { - return null; - } - - CreateTransformsInfo createTransformsInfo = parseCreateTransformsInfo( - createTransformsInfoProfile.getCreateTransformsInfo()); - List supplements = parseSupplements(createTransformsInfoProfile.getSupplement()); - return factory.createCreateTransformsInfoProfile(createTransformsInfo, supplements); - } - - /** - * Parse a <code>XMLDataObjectAssociationType</code> kind of DOM element. - * - * @param assocElem - * The <code>XMLDataObjectAssociationType</code> kind of DOM - * elmeent to parse. - * @return The <code>XMLDataObjectAssociation</code> API object containing - * the data from the <code>XMLDataObjectAssociationType</code> DOM - * element. - * @throws MOAApplicationException - */ - public XMLDataObjectAssociation parseXMLDataObjectAssociation( - at.gv.egiz.moasig.XMLDataObjectAssociationType xmlDataObjectAssociationType) - throws MOAApplicationException { - - MetaInfo metaInfo = parseMetaInfo(xmlDataObjectAssociationType.getMetaInfo()); - - Content content = buildContent(xmlDataObjectAssociationType.getContent()); - - return factory.createXMLDataObjectAssociation(metaInfo, content); - } - - /** - * Parse a <code>CreateSignatureEnvironmentProfile</code> DOM element. - * - * @param profileElem - * The <code>CreateSignatureEnvironmentProfile</code> DOM element - * to parse. - * @return The <code>CreateSignatureEnvironmentProfile</code> API object - * containing the data from the <code>profileElem</code>. - * @throws MOAApplicationException - */ - public CreateSignatureEnvironmentProfile parseCreateSignatureEnvironmentProfile( - at.gv.egiz.moasig.CreateSignatureEnvironmentProfile createSignatureEnvironmentProfile) - throws MOAApplicationException { - - CreateSignatureLocation createSignatureLocation = parseCreateSignatureLocation( - createSignatureEnvironmentProfile.getCreateSignatureLocation()); - List supplements = parseSupplements(createSignatureEnvironmentProfile.getSupplement()); - - return factory.createCreateSignatureEnvironmentProfile(createSignatureLocation, supplements); - } - - /** - * Parse a <code>CreateSignatureLocation</code> DOM element contained in a - * <code>CreateSignatureEnvironmentProfile</code>. - * - * @param profileElem - * The <code>CreateSignatureEnvironmentProfile</code> DOM element - * containing the <code>CreateSignatureLocation</code>. - * @return The <code>CreateSignatureLocation</code> API object containing - * the data from the <code>CreateSignatureLocation</code> DOM - * element. - */ - private CreateSignatureLocation parseCreateSignatureLocation( - at.gv.egiz.moasig.CreateSignatureLocationType createSignatureLocationType) { - - String xPathExpression = createSignatureLocationType.getValue(); - Map namespaceDeclarations = new HashMap();// DOMUtils.getNamespaceDeclarations(locationElem); - int index = createSignatureLocationType.getIndex().intValue(); - // Integer.parseInt(indexStr); - - return factory.createCreateSignatureLocation(xPathExpression, index, namespaceDeclarations); - } - - /** - * Parse all <code>Supplement</code> DOM elements contained in a given - * parent DOM element. - * - * @param supplementsParentElem - * The DOM element being the parent of the - * <code>Supplement</code>s. - * @return A <code>List</code> of <code>Supplement</code> API objects - * containing the data from the <code>Supplement</code> DOM - * elements. - * @throws MOAApplicationException - */ - private List parseSupplements(List<at.gv.egiz.moasig.XMLDataObjectAssociationType> supplementsList) - throws MOAApplicationException { - List supplements = new ArrayList(); - Iterator<at.gv.egiz.moasig.XMLDataObjectAssociationType> supplementsIterator = supplementsList.iterator(); - - while (supplementsIterator.hasNext()) { - at.gv.egiz.moasig.XMLDataObjectAssociationType xmlDataObjectAssociationType = supplementsIterator.next(); - XMLDataObjectAssociation supplement = parseXMLDataObjectAssociation(xmlDataObjectAssociationType); - supplements.add(supplement); - } - return supplements; - } - - /** - * Parse the <code>CreateTransformsInfo</code> DOM element contained in a - * <code>CreateTransformsInfoProfile</code>. - * - * @param profileElem - * The <code>CreateTransformsInfoProfile</code> DOM element - * containing the <code>CreateTransformsInfo</code>. - * @return The <code>CreateTransformsInfo</code> API object containinig the - * data from the <code>CreateTransformsInfo</code> DOM element. - * @throws MOAApplicationException - * An error occurred parsing the - * <code>CreateTransformsInfo</code> DOM element. - */ - public CreateTransformsInfo parseCreateTransformsInfo(at.gv.egiz.moasig.TransformsInfoType transformsInfoType) - throws MOAApplicationException { - MetaInfo finalDataMetaInfo = null; - List transforms = null; - if (transformsInfoType != null) { - if (transformsInfoType.getMoaTransforms() != null) { - if (transformsInfoType.getMoaTransforms() != null) { - // Transform Parser with MoaTransformsType - at.gv.egovernment.moa.spss.server.webservice.binding.TransformParser parser = new at.gv.egovernment.moa.spss.server.webservice.binding.TransformParser(); - transforms = parser.parseTransforms(transformsInfoType.getMoaTransforms()); - } - } - - finalDataMetaInfo = parseMetaInfo(transformsInfoType.getFinalDataMetaInfo()); - } - return factory.createCreateTransformsInfo(transforms, finalDataMetaInfo); - } - - public Content buildContent(at.gv.egiz.moasig.DataObjectInfoType.DataObject dataObject) - throws MOAApplicationException { - String referenceURI = dataObject.getReference(); - if (dataObject.getBase64Content() != null) { - return factory.createContent(new ByteArrayInputStream(dataObject.getBase64Content()), referenceURI); - } else if (dataObject.getLocRefContent() != null) { - String locationReferenceURI = dataObject.getLocRefContent(); - return factory.createContent(locationReferenceURI, referenceURI); - } else { - return factory.createContent(referenceURI); - } - } - - public Content buildContent(at.gv.egiz.moasig.ContentOptionalRefType contentBaseType) - throws MOAApplicationException { - - String referenceURI = contentBaseType.getReference(); - - if (contentBaseType.getBase64Content() != null) { - return factory.createContent(new ByteArrayInputStream(contentBaseType.getBase64Content()), referenceURI); - } else if (contentBaseType.getLocRefContent() != null) { - String locationReferenceURI = contentBaseType.getLocRefContent(); - return factory.createContent(locationReferenceURI, referenceURI); - } else { - return factory.createContent(referenceURI); - } - } - - public MetaInfo parseMetaInfo(at.gv.egiz.moasig.FinalDataMetaInfoType metaInfoElem) { - SPSSFactory factory = SPSSFactory.getInstance(); - - String mimeType = metaInfoElem.getMimeType(); - String description = metaInfoElem.getDescription(); - String type = metaInfoElem.getType(); - // TODO: any type not supported - - return factory.createMetaInfo(mimeType, description, null, type); - } - - public MetaInfo parseMetaInfo(at.gv.egiz.moasig.MetaInfoType metaInfoElem) { - SPSSFactory factory = SPSSFactory.getInstance(); - - String mimeType = metaInfoElem.getMimeType(); - String description = metaInfoElem.getDescription(); - // TODO: any and type not supported - - return factory.createMetaInfo(mimeType, description, null, null); - } - - public at.gv.egiz.moasig.KeyInfoType buildSignerInfo(at.gv.egovernment.moa.spss.api.common.SignerInfo signerInfo) - throws MOAApplicationException { - at.gv.egiz.moasig.KeyInfoType infoType = new at.gv.egiz.moasig.KeyInfoType(); - - at.gv.egiz.moasig.X509DataType x509DataType = new at.gv.egiz.moasig.X509DataType(); - - at.gv.egiz.moasig.ObjectFactory of = new at.gv.egiz.moasig.ObjectFactory(); - - // Set Issuer - - at.gv.egiz.moasig.X509IssuerSerialType x509IssuerSerialType = new at.gv.egiz.moasig.X509IssuerSerialType(); - - x509IssuerSerialType.setX509IssuerName(signerInfo.getSignerCertificate().getIssuerDN().getName()); - x509IssuerSerialType.setX509SerialNumber(signerInfo.getSignerCertificate().getSerialNumber()); - - x509DataType.getX509IssuerSerialOrX509SKIOrX509SubjectName() - .add(of.createX509DataTypeX509IssuerSerial(x509IssuerSerialType)); - - // Set Subject - try { - RFC2253NameParser parser = new RFC2253NameParser( - signerInfo.getSignerCertificate().getSubjectDN().getName()); - String subjectRfc2253 = parser.parse().getRFC2253String(); - x509DataType.getX509IssuerSerialOrX509SKIOrX509SubjectName() - .add(of.createX509DataTypeX509SubjectName(subjectRfc2253)); - } catch (RFC2253NameParserException e) { - x509DataType.getX509IssuerSerialOrX509SKIOrX509SubjectName().add( - of.createX509DataTypeX509SubjectName(signerInfo.getSignerCertificate().getSubjectDN().getName())); - } - - // Set Certificate - try { - x509DataType.getX509IssuerSerialOrX509SKIOrX509SubjectName() - .add(of.createX509DataTypeX509Certificate(signerInfo.getSignerCertificate().getEncoded())); - } catch (CertificateEncodingException e) { - throw new MOAApplicationException("2245", null, e); - } - - // Qualified Cert - - if (signerInfo.isQualifiedCertificate()) { - QualifiedCertificate qualifiedCertificate = of.createQualifiedCertificate(); - if ("TLS".compareToIgnoreCase(signerInfo.getQCSource()) == 0) { - qualifiedCertificate.setSource(signerInfo.getQCSource()); - } - x509DataType.getX509IssuerSerialOrX509SKIOrX509SubjectName().add(qualifiedCertificate); - } - - // Public Authority - - if (signerInfo.isPublicAuthority()) { - PublicAuthorityType publicAuthorityType = of.createPublicAuthorityType(); - - if (signerInfo.getPublicAuhtorityID() != null) { - publicAuthorityType.setCode(signerInfo.getPublicAuhtorityID()); - } - - JAXBElement<PublicAuthorityType> publicAuthority = of.createPublicAuthority(publicAuthorityType); - x509DataType.getX509IssuerSerialOrX509SKIOrX509SubjectName().add(publicAuthority); - } - - // ssCD - - if (signerInfo.isSSCD()) { - SecureSignatureCreationDevice sscd = of.createSecureSignatureCreationDevice(); - sscd.setSource(signerInfo.getSSCDSource()); - x509DataType.getX509IssuerSerialOrX509SKIOrX509SubjectName().add(sscd); - } - - if (signerInfo.getIssuerCountryCode() != null) { - x509DataType.getX509IssuerSerialOrX509SKIOrX509SubjectName() - .add(of.createIssuingCountry(signerInfo.getIssuerCountryCode())); - } - - return infoType; - } - - public at.gv.egiz.moasig.CheckResultType buildCheckResult( - at.gv.egovernment.moa.spss.api.common.CheckResult checkResult) { - at.gv.egiz.moasig.CheckResultType checkResultType = new at.gv.egiz.moasig.CheckResultType(); - checkResultType.setCode(BigInteger.valueOf(checkResult.getCode())); - - if (checkResult.getInfo() != null) { - at.gv.egiz.moasig.AnyChildrenType anyInfos = new at.gv.egiz.moasig.AnyChildrenType(); - - for (int idx = 0; idx < checkResult.getInfo().getLength(); idx++) { - Node node = checkResult.getInfo().item(idx); - if (node instanceof Element) { - anyInfos.getContent().add((Element) node); - } - } - - checkResultType.setInfo(anyInfos); - } - return checkResultType; - } - - /** - * Parse a the <code>DataObject</code> DOM element contained in a given - * <code>VerifyCMSSignatureRequest</code> DOM element. - * - * @param requestElem - * The <code>VerifyCMSSignatureRequest</code> DOM element to - * parse. - * @return The <code>CMSDataObject</code> API object containing the data - * from the <code>DataObject</code> DOM element. - */ - public CMSDataObject parseDataObject(at.gv.egiz.moasig.CMSDataObjectRequiredMetaType cmsDataObject) { - - if (cmsDataObject != null) { - MetaInfo metaInfo = null; - - MetaInfoType metaInfoType = cmsDataObject.getMetaInfo(); - - if (metaInfoType != null) { - metaInfo = this.parseMetaInfo(metaInfoType); - } - - at.gv.egiz.moasig.CMSContentBaseType cmsContent = cmsDataObject.getContent(); - - CMSContent content = parseContent(cmsContent); - - BigDecimal excludeByteRangeFrom = null; - - if (cmsDataObject.getFrom() != null) { - excludeByteRangeFrom = new BigDecimal(cmsDataObject.getFrom()); - } - - BigDecimal excludeByteRangeTo = null; - if (cmsDataObject.getTo() != null) { - excludeByteRangeTo = new BigDecimal(cmsDataObject.getTo()); - } - - return factory.createCMSDataObject(metaInfo, content, excludeByteRangeFrom, excludeByteRangeTo); - - } else { - return null; - } - - } - - /** - * Parse a the <code>DataObject</code> DOM element contained in a given - * <code>VerifyCMSSignatureRequest</code> DOM element. - * - * @param requestElem - * The <code>VerifyCMSSignatureRequest</code> DOM element to - * parse. - * @return The <code>CMSDataObject</code> API object containing the data - * from the <code>DataObject</code> DOM element. - */ - public CMSDataObject parseDataObject(at.gv.egiz.moasig.CMSDataObjectOptionalMetaType cmsDataObject) { - - if (cmsDataObject != null) { - MetaInfo metaInfo = null; - - MetaInfoType metaInfoType = cmsDataObject.getMetaInfo(); - - if (metaInfoType != null) { - metaInfo = this.parseMetaInfo(metaInfoType); - } - - at.gv.egiz.moasig.CMSContentBaseType cmsContent = cmsDataObject.getContent(); - - CMSContent content = parseContent(cmsContent); - - BigDecimal excludeByteRangeFrom = null; - - if (cmsDataObject.getFrom() != null) { - excludeByteRangeFrom = new BigDecimal(cmsDataObject.getFrom()); - } - - BigDecimal excludeByteRangeTo = null; - if (cmsDataObject.getTo() != null) { - excludeByteRangeTo = new BigDecimal(cmsDataObject.getTo()); - } - - return factory.createCMSDataObject(metaInfo, content, excludeByteRangeFrom, excludeByteRangeTo); - - } else { - return null; - } - - } - - /** - * Parse the content contained in a <code>CMSContentBaseType</code> kind of - * DOM element. - * - * @param contentElem - * The <code>CMSContentBaseType</code> kind of element to parse. - * @return A <code>CMSDataObject</code> API object containing the data from - * the given DOM element. - */ - public CMSContent parseContent(at.gv.egiz.moasig.CMSContentBaseType cmsContent) { - - if (cmsContent.getBase64Content() != null) { - InputStream binaryContent = new ByteArrayInputStream(cmsContent.getBase64Content()); - return factory.createCMSContent(binaryContent); - } else { - return factory.createCMSContent(cmsContent.getReference()); - } - } -} diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/XMLCreateSignatureBindingImpl.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/XMLCreateSignatureBindingImpl.java deleted file mode 100644 index 6656d51..0000000 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/XMLCreateSignatureBindingImpl.java +++ /dev/null @@ -1,101 +0,0 @@ -package at.gv.egovernment.moa.spss.server.webservice.binding; - -import java.io.IOException; -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import javax.xml.transform.TransformerException; - -import at.gv.egiz.moasig.CreateXMLSignatureRequest; -import at.gv.egiz.moasig.CreateXMLSignatureResponseType; -import at.gv.egovernment.moa.spss.MOAApplicationException; -import at.gv.egovernment.moa.spss.api.SPSSFactory; -import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureResponse; -import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureResponseElement; -import at.gv.egovernment.moa.spss.api.xmlsign.ErrorResponse; -import at.gv.egovernment.moa.spss.api.xmlsign.SignatureEnvironmentResponse; -import at.gv.egovernment.moa.spss.server.webservice.XMLCreateSignatureBinding; -import at.gv.egovernment.moaspss.util.DOMUtils; - -public class XMLCreateSignatureBindingImpl implements XMLCreateSignatureBinding { - - /** The factory to create API objects. */ - private SPSSFactory factory; - - /** - * Create a new <code>CreateXMLSignatureRequestParser</code>. - */ - public XMLCreateSignatureBindingImpl() { - this.factory = SPSSFactory.getInstance(); - } - - @Override - public at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureRequest buildXMLRequest( - CreateXMLSignatureRequest createXMLSignatureRequest) throws MOAApplicationException { - - String keyIdentifier = createXMLSignatureRequest.getKeyIdentifier(); - - TransformerUtils transformerUtils = new TransformerUtils(); - - List singleSignatureInfos = new ArrayList(); - - Iterator<at.gv.egiz.moasig.CreateXMLSignatureRequestType.SingleSignatureInfo> singleSignatureInfoIterator = createXMLSignatureRequest - .getSingleSignatureInfo().iterator(); - - while (singleSignatureInfoIterator.hasNext()) { - at.gv.egiz.moasig.CreateXMLSignatureRequestType.SingleSignatureInfo singleSignatureInfo = singleSignatureInfoIterator - .next(); - singleSignatureInfos.add(transformerUtils.buildSingleSignatureInfo(singleSignatureInfo)); - } - - return factory.createCreateXMLSignatureRequest(keyIdentifier, singleSignatureInfos); - } - - - - @Override - public CreateXMLSignatureResponseType buildXMLResponse(CreateXMLSignatureResponse response) throws MOAApplicationException { - CreateXMLSignatureResponseType createXMLSignatureResponseType = new CreateXMLSignatureResponseType(); - List responseObjects = response.getResponseElements(); - - Iterator responseIterator = responseObjects.iterator(); - - while(responseIterator.hasNext()) { - Object responseObject = responseIterator.next(); - - CreateXMLSignatureResponseElement responseElement = - (CreateXMLSignatureResponseElement) responseObject; - - switch (responseElement.getResponseType()) { - case CreateXMLSignatureResponseElement.SIGNATURE_ENVIRONMENT_RESPONSE : - SignatureEnvironmentResponse envResponse = - (SignatureEnvironmentResponse) responseElement; - byte[] signature; - try { - signature = DOMUtils.serializeNode(envResponse.getSignatureEnvironment(), "UTF-8"); - } catch (TransformerException e) { - throw new MOAApplicationException("Failed to write xml signature to response", null, e); - } catch (IOException e) { - throw new MOAApplicationException("Failed to write xml signature to response", null, e); - } - createXMLSignatureResponseType.getSignatureEnvironmentOrErrorResponse().add(signature); - break; - - case CreateXMLSignatureResponseElement.ERROR_RESPONSE : - ErrorResponse errorResponse = (ErrorResponse) responseElement; - - at.gv.egiz.moasig.ErrorResponseType errorResponseType = new at.gv.egiz.moasig.ErrorResponseType(); - errorResponseType.setErrorCode(BigInteger.valueOf(errorResponse.getErrorCode())); - errorResponseType.setInfo(errorResponse.getInfo()); - - createXMLSignatureResponseType.getSignatureEnvironmentOrErrorResponse().add(errorResponseType); - break; - } - } - - return createXMLSignatureResponseType; - } - -} diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/XMLVerifySignatureBindingImpl.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/XMLVerifySignatureBindingImpl.java deleted file mode 100644 index dcc92f9..0000000 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/XMLVerifySignatureBindingImpl.java +++ /dev/null @@ -1,524 +0,0 @@ -package at.gv.egovernment.moa.spss.server.webservice.binding; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.math.BigInteger; -import java.security.cert.CertificateEncodingException; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import javax.security.auth.login.FailedLoginException; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.transform.TransformerException; -import javax.xml.transform.dom.DOMResult; - -import org.apache.commons.io.IOUtils; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - -import at.gv.egiz.moasig.MoaTransformsType; -import at.gv.egiz.moasig.NamespaceDeclarationType; -import at.gv.egiz.moasig.PublicAuthorityType; -import at.gv.egiz.moasig.QualifiedCertificate; -import at.gv.egiz.moasig.SecureSignatureCreationDevice; -import at.gv.egiz.moasig.TransformParameterType; -import at.gv.egiz.moasig.TransformParameterType.Hash; -import at.gv.egiz.moasig.VerifyXMLSignatureResponseType; -import at.gv.egiz.moasig.XMLDataObjectAssociationType; -import at.gv.egiz.moasig.XMLSignatureLocationType; -import at.gv.egovernment.moa.spss.MOAApplicationException; -import at.gv.egovernment.moa.spss.api.SPSSFactory; -import at.gv.egovernment.moa.spss.api.common.Content; -import at.gv.egovernment.moa.spss.api.common.ContentBinary; -import at.gv.egovernment.moa.spss.api.common.ContentXML; -import at.gv.egovernment.moa.spss.api.common.InputData; -import at.gv.egovernment.moa.spss.api.common.XMLDataObjectAssociation; -import at.gv.egovernment.moa.spss.api.xmlverify.AdESFormResults; -import at.gv.egovernment.moa.spss.api.xmlverify.ReferenceInfo; -import at.gv.egovernment.moa.spss.api.xmlverify.SignatureManifestCheckParams; -import at.gv.egovernment.moa.spss.api.xmlverify.SupplementProfile; -import at.gv.egovernment.moa.spss.api.xmlverify.TransformParameter; -import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureInfo; -import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureLocation; -import at.gv.egovernment.moa.spss.api.xmlverify.VerifyTransformsInfoProfile; -import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest; -import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse; -import at.gv.egovernment.moa.spss.server.webservice.XMLVerifySignatureBinding; -import at.gv.egovernment.moaspss.util.DOMUtils; -import iaik.utils.RFC2253NameParser; -import iaik.utils.RFC2253NameParserException; - -public class XMLVerifySignatureBindingImpl implements XMLVerifySignatureBinding { - - /** The <code>SPSSFactory</code> for creating new API objects. */ - private SPSSFactory factory = SPSSFactory.getInstance(); - - private TransformerUtils transformerUtils = new TransformerUtils(); - - private TransformParser transformParser = new TransformParser(); - - @Override - public VerifyXMLSignatureRequest buildXMLRequest( - at.gv.egiz.moasig.VerifyXMLSignatureRequest verifyXMLSignatureRequest) throws MOAApplicationException { - Date dateTime = null; - if (verifyXMLSignatureRequest.getDateTime() != null) { - dateTime = verifyXMLSignatureRequest.getDateTime().toGregorianCalendar().getTime(); - } - boolean returnHashInputData = false; - returnHashInputData = (verifyXMLSignatureRequest.getReturnHashInputData() != null); - String trustProfileID = verifyXMLSignatureRequest.getTrustProfileID(); - VerifySignatureInfo verifySignatureInfo = parseVerifySignatureInfo( - verifyXMLSignatureRequest.getVerifySignatureInfo()); - List supplementProfiles = parseSupplementProfiles(verifyXMLSignatureRequest); - - SignatureManifestCheckParams signatureManifestCheckParams = this - .parseSignatureManifestCheckParams(verifyXMLSignatureRequest.getSignatureManifestCheckParams()); - return factory.createVerifyXMLSignatureRequest(dateTime, verifySignatureInfo, supplementProfiles, - signatureManifestCheckParams, returnHashInputData, trustProfileID); - } - - @Override - public VerifyXMLSignatureResponseType buildXMLResponse(VerifyXMLSignatureResponse response) - throws MOAApplicationException { - VerifyXMLSignatureResponseType verifyXMLSignatureResponseType = new VerifyXMLSignatureResponseType(); - - verifyXMLSignatureResponseType.setSignerInfo(this.transformerUtils.buildSignerInfo(response.getSignerInfo())); - - if (response.getHashInputDatas() != null && !response.getHashInputDatas().isEmpty()) { - for (Iterator iter = response.getHashInputDatas().iterator(); iter.hasNext();) { - InputData inputData = (InputData) iter.next(); - verifyXMLSignatureResponseType.getHashInputData().add(buildInputData(inputData)); - } - } - - if (response.getReferenceInputDatas() != null && !response.getReferenceInputDatas().isEmpty()) { - for (Iterator iter = response.getReferenceInputDatas().iterator(); iter.hasNext();) { - InputData inputData = (InputData) iter.next(); - verifyXMLSignatureResponseType.getReferenceInputData().add(buildInputData(inputData)); - } - } - - // add the SignatureCheck - verifyXMLSignatureResponseType.setSignatureCheck(buildReferencesCheckResult(response.getSignatureCheck())); - - // add the SignatureManifestCheck - if (response.getSignatureManifestCheck() != null) { - verifyXMLSignatureResponseType.setSignatureManifestCheck(buildReferencesCheckResult(response.getSignatureManifestCheck())); - } - - // add the XMLDsigManifestChecks - if(response.getXMLDsigManifestChecks() != null) { - List xmlDsigManifestChecks = response.getXMLDsigManifestChecks(); - Iterator iter = xmlDsigManifestChecks.iterator(); - while(iter.hasNext()) { - Object xmlDsigManifestCheck = iter.next(); - verifyXMLSignatureResponseType.getXMLDSIGManifestCheck().add( - buildManifestCheckResult((at.gv.egovernment.moa.spss.api.xmlverify.ManifestRefsCheckResult) - xmlDsigManifestCheck)); - } - } - - // add the CertificateCheck - verifyXMLSignatureResponseType.setCertificateCheck(this.transformerUtils.buildCheckResult(response.getCertificateCheck())); - - if(response.getAdESFormResults() != null) { - Iterator formIterator = response.getAdESFormResults().iterator(); - - while(formIterator.hasNext()) { - AdESFormResults adESFormResult = (AdESFormResults)formIterator.next(); - verifyXMLSignatureResponseType.getFormCheckResult().add( - buildFormResult(adESFormResult)); - } - - } - - return verifyXMLSignatureResponseType; - } - - private at.gv.egiz.moasig.InputDataType buildInputData(InputData inputData) throws MOAApplicationException { - at.gv.egiz.moasig.InputDataType inputDataType = new at.gv.egiz.moasig.InputDataType(); - inputDataType.setPartOf(inputData.getPartOf()); - - if(inputData.getReferringReferenceNumber() != InputData.REFERER_NONE_) { - inputDataType.setReferringSigReference(BigInteger.valueOf(inputData.getReferringReferenceNumber())); - } - - switch(inputData.getContentType()) { - case Content.XML_CONTENT: - ContentXML contentXml = (ContentXML) inputData; - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - try { - iaik.xml.crypto.utils.DOMUtils.serialize(DOMUtils.nodeList2DocumentFragment( - contentXml.getXMLContent()).getOwnerDocument(), - baos); - inputDataType.setBase64Content(baos.toByteArray()); - } catch (TransformerException e) { - throw new MOAApplicationException("2200", null, e); - } catch (ParserConfigurationException e) { - throw new MOAApplicationException("2200", null, e); - } - - break; - case Content.BINARY_CONTENT: - ContentBinary contentBinary = (ContentBinary) inputData; - try { - inputDataType.setBase64Content(IOUtils.toByteArray(contentBinary.getBinaryContent())); - } catch (IOException e) { - throw new MOAApplicationException("2200", null, e); - } - break; - } - return inputDataType; - } - - private at.gv.egiz.moasig.FormResultType buildFormResult(AdESFormResults adESFormResults) { - at.gv.egiz.moasig.FormResultType formResult = new at.gv.egiz.moasig.FormResultType(); - formResult.setCode(BigInteger.valueOf(adESFormResults.getCode())); - formResult.setName(adESFormResults.getName()); - return formResult; - } - - private at.gv.egiz.moasig.ManifestRefsCheckResultType buildManifestCheckResult( - at.gv.egovernment.moa.spss.api.xmlverify.ManifestRefsCheckResult referencesCheckResult) { - at.gv.egiz.moasig.ManifestRefsCheckResultType referencesCheckResultType = new at.gv.egiz.moasig.ManifestRefsCheckResultType(); - - if (referencesCheckResult.getInfo() != null) { - at.gv.egiz.moasig.ObjectFactory of = new at.gv.egiz.moasig.ObjectFactory(); - at.gv.egiz.moasig.AnyChildrenType anyInfos = new at.gv.egiz.moasig.AnyChildrenType(); - - if (referencesCheckResult.getInfo().getFailedReferences() != null) { - for (int idx = 0; idx < referencesCheckResult.getInfo().getFailedReferences().length; idx++) { - anyInfos.getContent().add(of.createFailedReference( - BigInteger.valueOf(referencesCheckResult.getInfo().getFailedReferences()[idx]))); - } - } - - if (referencesCheckResult.getInfo().getAnyOtherInfo() != null) { - for (int idx = 0; idx < referencesCheckResult.getInfo().getAnyOtherInfo().getLength(); idx++) { - Node node = referencesCheckResult.getInfo().getAnyOtherInfo().item(idx); - if (node instanceof Element) { - anyInfos.getContent().add((Element) node); - } - } - } - - anyInfos.getContent().add(of.createReferringSigReference( - BigInteger.valueOf(referencesCheckResult.getInfo().getReferringSignatureReference()))); - - referencesCheckResultType.setInfo(anyInfos); - - } - - referencesCheckResultType.setCode(BigInteger.valueOf(referencesCheckResult.getCode())); - return referencesCheckResultType; - } - - private at.gv.egiz.moasig.ReferencesCheckResultType buildReferencesCheckResult( - at.gv.egovernment.moa.spss.api.xmlverify.ReferencesCheckResult referencesCheckResult) { - at.gv.egiz.moasig.ReferencesCheckResultType referencesCheckResultType = new at.gv.egiz.moasig.ReferencesCheckResultType(); - - if (referencesCheckResult.getInfo() != null) { - at.gv.egiz.moasig.ObjectFactory of = new at.gv.egiz.moasig.ObjectFactory(); - at.gv.egiz.moasig.AnyChildrenType anyInfos = new at.gv.egiz.moasig.AnyChildrenType(); - - if (referencesCheckResult.getInfo().getFailedReferences() != null) { - for (int idx = 0; idx < referencesCheckResult.getInfo().getFailedReferences().length; idx++) { - anyInfos.getContent().add(of.createFailedReference( - BigInteger.valueOf(referencesCheckResult.getInfo().getFailedReferences()[idx]))); - } - } - - if (referencesCheckResult.getInfo().getAnyOtherInfo() != null) { - for (int idx = 0; idx < referencesCheckResult.getInfo().getAnyOtherInfo().getLength(); idx++) { - Node node = referencesCheckResult.getInfo().getAnyOtherInfo().item(idx); - if (node instanceof Element) { - anyInfos.getContent().add((Element) node); - } - } - } - - referencesCheckResultType.setInfo(anyInfos); - } - - referencesCheckResultType.setCode(BigInteger.valueOf(referencesCheckResult.getCode())); - return referencesCheckResultType; - } - - - - /** - * Parse the <code>VerifySignatureInfo</code> DOM element contained in the - * <code>VerifyXMLSignatureRequest</code> DOM element. - * - * @param requestElem - * The <code>VerifyXMLSignatureRequest</code> DOM element - * containing the <code>VerifySignatureInfo</code> DOM element. - * @return The <code>VerifySignatureInfo</code> API object containing the - * data from the DOM element. - * @throws MOAApplicationException - */ - private VerifySignatureInfo parseVerifySignatureInfo( - at.gv.egiz.moasig.VerifyXMLSignatureRequestType.VerifySignatureInfo verifySignatureInfo) - throws MOAApplicationException { - Content verifySignatureEnvironment = transformerUtils - .buildContent(verifySignatureInfo.getVerifySignatureEnvironment()); - - XMLSignatureLocationType xmlSignatureLocationType = verifySignatureInfo.getVerifySignatureLocation(); - - String xPathExpression = xmlSignatureLocationType.getXPathExpression(); - - Iterator<NamespaceDeclarationType> namespaceDelcarationIterator = xmlSignatureLocationType.getNamespaceDeclaration().iterator(); - - Map namespaceMap = new HashMap(); - - while(namespaceDelcarationIterator.hasNext()) { - NamespaceDeclarationType namespaceDelcaration = namespaceDelcarationIterator.next(); - - String prefix = namespaceDelcaration.getPrefix(); - String namespace = namespaceDelcaration.getValue(); - - namespaceMap.put(prefix, namespace); - } - - VerifySignatureLocation verifySignatureLocation = factory.createVerifySignatureLocation(xPathExpression, - namespaceMap); - - return factory.createVerifySignatureInfo(verifySignatureEnvironment, verifySignatureLocation); - } - - /** - * Parse the supplement profiles contained in the given - * <code>VerifyXMLSignatureRequest</code> DOM element. - * - * @param requestElem - * The <code>VerifyXMLSignatureRequest</code> DOM element. - * @return A <code>List</code> of <code>SupplementProfile</code> API objects - * containing the data from the <code>SupplementProfile</code> DOM - * elements. - * @throws MOAApplicationException - */ - private List parseSupplementProfiles(at.gv.egiz.moasig.VerifyXMLSignatureRequest verifyXMLSignatureRequest) - throws MOAApplicationException { - List supplementProfiles = new ArrayList(); - List<Object> supplementElements = verifyXMLSignatureRequest.getSupplementProfileOrSupplementProfileID(); - if (supplementElements != null) { - Iterator<Object> supplementElementsIterator = supplementElements.iterator(); - while (supplementElementsIterator.hasNext()) { - Object object = supplementElementsIterator.next(); - SupplementProfile profile; - if (object instanceof XMLDataObjectAssociationType) { - XMLDataObjectAssociationType xmlDataObjectAssociationType = (XMLDataObjectAssociationType) object; - profile = parseSupplementProfile(xmlDataObjectAssociationType); - } else if (object instanceof String) { - String profileID = (String) object; - profile = factory.createSupplementProfile(profileID); - } else { - throw new MOAApplicationException( - "Invalid object in moa:SupplementProfile | moa:SupplementProfileID", null); - } - - supplementProfiles.add(profile); - } - } - - return supplementProfiles; - } - - public SupplementProfile parseSupplementProfile(XMLDataObjectAssociationType xmlDataObjectAssociationType) - throws MOAApplicationException { - XMLDataObjectAssociation supplementProfile = this.transformerUtils - .parseXMLDataObjectAssociation(xmlDataObjectAssociationType); - - return factory.createSupplementProfile(supplementProfile); - } - - /** - * Parse the <code>SignatureManifestCheckParams</code> DOM element contained - * in the given <code>VerifyXMLSignatureRequest</code> DOM element. - * - * @param requestElem - * The <code>VerifyXMLSignatureRequest</code> DOM element. - * @return The <code>SignatureManifestCheckParams</code> API object - * containing the data from the - * <code>SignatureManifestCheckParams</code> DOM element. - * @throws MOAApplicationException - * An error occurred parsing the - * <code>SignatureManifestCheckParams</code> DOM element. - */ - private SignatureManifestCheckParams parseSignatureManifestCheckParams( - at.gv.egiz.moasig.VerifyXMLSignatureRequestType.SignatureManifestCheckParams signatureManifestCheckParams) - throws MOAApplicationException { - - if (signatureManifestCheckParams == null) { - return null; - } - - boolean returnReferencInputData = signatureManifestCheckParams.isReturnReferenceInputData(); - List<at.gv.egiz.moasig.VerifyTransformsDataType> referenceInfos = signatureManifestCheckParams - .getReferenceInfo(); - List referenceInfosBuild = parseReferenceInfos(referenceInfos); - - return factory.createSignatureManifestCheckParams(referenceInfosBuild, returnReferencInputData); - } - - /** - * Parse the <code>ReferenceInfo</code> DOM elements contained in a - * <code>SignatureManifestCheckParams</code> DOM element. - * - * @param paramsElem - * The <code>SignatureManifestCheckParams</code> DOM element - * containing the <code>ReferenceInfo</code> DOM elements. - * @return A <code>List</code> of <code>RefernceInfo</code> API objects - * containing the data from the <code>ReferenceInfo</code> DOM - * elements. - * @throws MOAApplicationException - * An error occurred parsing the <code>ReferenceInfo</code> DOM - * elements. - */ - private List parseReferenceInfos(List<at.gv.egiz.moasig.VerifyTransformsDataType> referenceInfosWeb) - throws MOAApplicationException { - - List referenceInfos = new ArrayList(); - - if (referenceInfosWeb != null) { - - Iterator<at.gv.egiz.moasig.VerifyTransformsDataType> referenceInfosIterator = referenceInfosWeb.iterator(); - - while (referenceInfosIterator.hasNext()) { - at.gv.egiz.moasig.VerifyTransformsDataType verifyTransformsDataType = referenceInfosIterator.next(); - - ReferenceInfo referenceInfo = parseReferenceInfo(verifyTransformsDataType); - referenceInfos.add(referenceInfo); - } - - } - return referenceInfos; - } - - /** - * Parse a <code>ReferenceInfo</code> DOM element. - * - * @param refInfoElem - * The <code>ReferenceInfo</code> DOM element to parse. - * @return The <code>ReferenceInfo</code> API object containing the data - * from the given <code>ReferenceInfo</code> DOM element. - * @throws MOAApplicationException - * An error occurred parsing the <code>ReferenceInfo</code> DOM - * element. - */ - private ReferenceInfo parseReferenceInfo(at.gv.egiz.moasig.VerifyTransformsDataType verifyTransformsDataType) - throws MOAApplicationException { - List profiles = parseVerifyTransformsInfoProfiles(verifyTransformsDataType); - return factory.createReferenceInfo(profiles); - } - - /** - * Parse the <code>VerifyTransformsInfoProfile</code> DOM elements contained - * in a <code>ReferenceInfo</code> DOM element. - * - * @param refInfoElem - * <code>ReferenceInfo</code> DOM element containing the - * <code>VerifyTransformsInfoProfile</code> DOM elements. - * @return A <code>List</code> of <code>VerifyTransformsInfoProfile</code> - * API objects containing the profile data. - * @throws MOAApplicationException - * An error occurred building the - * <code>VerifyTransformsInfoProfile</code>s. - */ - private List parseVerifyTransformsInfoProfiles(at.gv.egiz.moasig.VerifyTransformsDataType verifyTransformsDataType) - throws MOAApplicationException { - - List profiles = new ArrayList(); - - List<Object> transformsList = verifyTransformsDataType - .getVerifyTransformsInfoProfileOrVerifyTransformsInfoProfileID(); - Iterator<Object> transformsListIterator = transformsList.iterator(); - - while (transformsListIterator.hasNext()) { - Object object = transformsListIterator.next(); - - if (object instanceof at.gv.egiz.moasig.VerifyTransformsInfoProfile) { - at.gv.egiz.moasig.VerifyTransformsInfoProfile verifyTransformsInfoProfile = (at.gv.egiz.moasig.VerifyTransformsInfoProfile) object; - } else if (object instanceof String) { - String profileID = (String) object; - profiles.add(factory.createVerifyTransformsInfoProfile(profileID)); - } else { - throw new MOAApplicationException("Invalid object in VerifyTransformsData", null); - } - } - return profiles; - } - - /** - * Parse a <code>VerifyTransformsInfoProfile</code> DOM element. - * - * @param profileElem - * The <code>VerifyTransformsInfoProfile</code> DOM element to - * parse. - * @return A <code>VerifyTransformsInfoProfile</code> API object containing - * the information from the <code>VerifyTransformsInfoProfile</code> - * DOM element. - * @throws MOAApplicationException - * An error occurred parsing the - * <code>VerifyTransformsInfoProfile</code>. - */ - public VerifyTransformsInfoProfile parseVerifyTransformsInfoProfile( - at.gv.egiz.moasig.VerifyTransformsInfoProfile verifyTransformsInfoProfile) throws MOAApplicationException { - List transforms = null; - List transformParameters = new ArrayList(); - List<TransformParameterType> transformParams = verifyTransformsInfoProfile.getTransformParameter(); - Iterator<TransformParameterType> transformParamIterator = transformParams.iterator(); - - MoaTransformsType moaTransforms = verifyTransformsInfoProfile.getMoaTransforms(); - - if (moaTransforms != null) { - transforms = transformParser.parseTransforms(moaTransforms); - } - - while (transformParamIterator.hasNext()) { - TransformParameterType transformParameter = transformParamIterator.next(); - transformParameters.add(parseTransformParameter(transformParameter)); - } - - return factory.createVerifyTransformsInfoProfile(transforms, transformParameters); - } - - /** - * Parse a <code>TransformParameter</code> DOM element. - * - * @param paramElem - * The <code>TransformParameter</code> DOM element to parse. - * @return The <code>TransformParameter</code> API object containing the - * information from the <code>TransformParameter</code> DOM element. - * @throws MOAApplicationException - * An error occurred parsing the <code>TransformParameter</code> - * DOM element. - */ - private TransformParameter parseTransformParameter(TransformParameterType transformParameter) - throws MOAApplicationException { - String uri = transformParameter.getURI(); - if (transformParameter.getBase64Content() != null) { - InputStream binaryContent = new ByteArrayInputStream(transformParameter.getBase64Content()); - return factory.createTransformParameter(uri, binaryContent); - } else if (transformParameter.getHash() != null) { - Hash hash = transformParameter.getHash(); - String digestMethodStr = ""; - - if (hash.getDigestMethod() != null) { - digestMethodStr = hash.getDigestMethod().getAlgorithm(); - } - byte[] digestValue = hash.getDigestValue(); - return factory.createTransformParameter(uri, digestMethodStr, digestValue); - } else { - return factory.createTransformParameter(uri); - } - } -} diff --git a/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SIG-3.0.0.xsd b/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SIG-3.0.0.xsd deleted file mode 100644 index 3fb11ee..0000000 --- a/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SIG-3.0.0.xsd +++ /dev/null @@ -1,791 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- MOA SIG 3.0.0 Schema --> -<xsd:schema xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://reference.e-government.gv.at/namespace/moa/20151109#" - targetNamespace="http://reference.e-government.gv.at/namespace/moa/20151109#" - elementFormDefault="qualified" attributeFormDefault="unqualified" - version="1.2"> - <xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" - schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd" /> - <xsd:import namespace="http://www.w3.org/XML/1998/namespace" - schemaLocation="http://www.w3.org/2001/xml.xsd" /> - <!--########## Create CMS Signature ### --> - <!--### Create CMS Signature Request ### --> - <xsd:element name="CreateCMSSignatureRequest"> - <xsd:complexType> - <xsd:complexContent> - <xsd:extension base="CreateCMSSignatureRequestType" /> - </xsd:complexContent> - </xsd:complexType> - </xsd:element> - <xsd:complexType name="CreateCMSSignatureRequestType"> - <xsd:sequence> - <xsd:element name="KeyIdentifier" type="KeyIdentifierType" /> - <xsd:element name="SingleSignatureInfo" maxOccurs="unbounded"> - <xsd:annotation> - <xsd:documentation>Ermöglichung der Stapelsignatur durch - wiederholte Angabe dieses Elements</xsd:documentation> - </xsd:annotation> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="DataObjectInfo"> - <xsd:complexType> - <xsd:complexContent> - <xsd:extension base="CMSDataObjectInfoType" /> - </xsd:complexContent> - </xsd:complexType> - </xsd:element> - </xsd:sequence> - <xsd:attribute name="SecurityLayerConformity" type="xsd:boolean" - use="optional" default="true" /> - </xsd:complexType> - </xsd:element> - </xsd:sequence> - </xsd:complexType> - <!--### Create CMS Signature Response ### --> - <xsd:element name="CreateCMSSignatureResponse" type="CreateCMSSignatureResponseType" /> - <xsd:complexType name="CreateCMSSignatureResponseType"> - <xsd:choice maxOccurs="unbounded"> - <xsd:annotation> - <xsd:documentation>Kardinalität 1..oo erlaubt die Antwort auf eine - Stapelsignatur-Anfrage</xsd:documentation> - </xsd:annotation> - <xsd:element name="CMSSignature" type="xsd:base64Binary"> - <xsd:annotation> - <xsd:documentation>Resultat, falls die Signaturerstellung - erfolgreich war</xsd:documentation> - </xsd:annotation> - </xsd:element> - <xsd:element ref="ErrorResponse" /> - </xsd:choice> - </xsd:complexType> - <!--########## Create XML Signature ### --> - <!--### Create XML Signature Request ### --> - <xsd:element name="CreateXMLSignatureRequest"> - <xsd:complexType> - <xsd:complexContent> - <xsd:extension base="CreateXMLSignatureRequestType" /> - </xsd:complexContent> - </xsd:complexType> - </xsd:element> - <xsd:complexType name="CreateXMLSignatureRequestType"> - <xsd:sequence> - <xsd:element name="KeyIdentifier" type="KeyIdentifierType" /> - <xsd:element name="SingleSignatureInfo" maxOccurs="unbounded"> - <xsd:annotation> - <xsd:documentation>Ermöglichung der Stapelsignatur durch - wiederholte Angabe dieses Elements</xsd:documentation> - </xsd:annotation> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="DataObjectInfo" maxOccurs="unbounded"> - <xsd:complexType> - <xsd:complexContent> - <xsd:extension base="DataObjectInfoType"> - <xsd:attribute name="ChildOfManifest" type="xsd:boolean" - use="optional" default="false" /> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - </xsd:element> - <xsd:element name="CreateSignatureInfo" minOccurs="0"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="CreateSignatureEnvironment" - type="ContentOptionalRefType" /> - <xsd:choice> - <xsd:annotation> - <xsd:documentation>Auswahl: Entweder explizite Angabe des - Signaturorts sowie ggf. sinnvoller Supplements im Zshg. mit - der Signaturumgebung, oder Verweis auf ein benanntes Profil - </xsd:documentation> - </xsd:annotation> - <xsd:element ref="CreateSignatureEnvironmentProfile" /> - <xsd:element name="CreateSignatureEnvironmentProfileID" - type="ProfileIdentifierType" /> - </xsd:choice> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - </xsd:sequence> - <xsd:attribute name="SecurityLayerConformity" type="xsd:boolean" - use="optional" default="true" /> - </xsd:complexType> - </xsd:element> - </xsd:sequence> - </xsd:complexType> - <!--### Create XML Signature Response ### --> - <xsd:complexType name="CreateXMLSignatureResponseType"> - <xsd:choice maxOccurs="unbounded"> - <xsd:annotation> - <xsd:documentation>Kardinalität 1..oo erlaubt die Antwort auf eine - Stapelsignatur-Anfrage</xsd:documentation> - </xsd:annotation> - <xsd:element name="SignatureEnvironment" type="xsd:base64Binary"> - <xsd:annotation> - <xsd:documentation>Resultat, falls die Signaturerstellung - erfolgreich war</xsd:documentation> - </xsd:annotation> - </xsd:element> - <xsd:element ref="ErrorResponse" /> - </xsd:choice> - </xsd:complexType> - <xsd:element name="CreateXMLSignatureResponse" type="CreateXMLSignatureResponseType" /> - <!--########## Create PDF Signature ### --> - <!--### Create PDF Signature Request ### --> - <!--xsd:element name="CreatePDFSignatureRequest"> - <xsd:complexType> - <xsd:complexContent> - <xsd:extension base="CreatePDFSignatureRequestType" /> - </xsd:complexContent> - </xsd:complexType> - </xsd:element> - <xsd:complexType name="CreatePDFSignatureRequestType"> - <xsd:sequence> - <xsd:element name="KeyIdentifier" type="KeyIdentifierType" /> - <xsd:element name="SingleSignatureInfo" maxOccurs="unbounded"> - <xsd:annotation> - <xsd:documentation>Ermöglichung der Stapelsignatur durch - wiederholte Angabe dieses Elements</xsd:documentation> - </xsd:annotation> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="PDFDocument" type="xsd:base64Binary" /> - <xsd:element name="SignatureProfile" type="xsd:string" - minOccurs="0" maxOccurs="1" /> - <xsd:element name="SignaturePosition" type="xsd:string" - minOccurs="0" maxOccurs="1" /> - <xsd:element name="SignatureID" type="xsd:string" - minOccurs="0" maxOccurs="1" /> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - </xsd:sequence> - </xsd:complexType--> - <!--### Create PDF Signature Response ### --> - <!--xsd:element name="CreatePDFSignatureResponse" type="CreatePDFSignatureResponseType" /> - <xsd:complexType name="CreatePDFSignatureResponseType"> - <xsd:sequence> - <xsd:element name="PDFSignature" type="PDFSignedRepsonse" - maxOccurs="unbounded" /> - </xsd:sequence> - </xsd:complexType--> - <!--########## Verify CMS Signature ### --> - <!--### Verifiy CMS Signature Request ### --> - <xsd:element name="VerifyCMSSignatureRequest"> - <xsd:complexType> - <xsd:complexContent> - <xsd:extension base="VerifyCMSSignatureRequestType"> - <xsd:attribute name="Signatories" type="SignatoriesType" - use="optional" default="1" /> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - </xsd:element> - <xsd:complexType name="VerifyCMSSignatureRequestType"> - <xsd:sequence> - <xsd:element name="DateTime" type="xsd:dateTime" - minOccurs="0" /> - <xsd:element name="ExtendedValidation" type="xsd:boolean" minOccurs="0" default="false"/> - <xsd:element name="CMSSignature" type="xsd:base64Binary" /> - <xsd:element name="DataObject" type="CMSDataObjectOptionalMetaType" - minOccurs="0" /> - <xsd:element name="TrustProfileID" type="xsd:token"> - <xsd:annotation> - <xsd:documentation>mit diesem Profil wird eine Menge von - vertrauenswürdigen Wurzelzertifikaten spezifiziert - </xsd:documentation> - </xsd:annotation> - </xsd:element> - </xsd:sequence> - </xsd:complexType> - <!--### Verify CMS Signature Response ### --> - <xsd:element name="VerifyCMSSignatureResponse" type="VerifyCMSSignatureResponseType" /> - <xsd:complexType name="VerifyCMSSignatureResponseType"> - <xsd:sequence maxOccurs="unbounded"> - <xsd:element name="SignerInfo" type="dsig:KeyInfoType"> - <xsd:annotation> - <xsd:documentation>only ds:X509Data and RetrievalMethod is - supported; QualifiedCertificate is included as - X509Data/any;publicAuthority is included as X509Data/any; - SecureSignatureCreationDevice is included as X509Data/any, - IssuingCountry is included as X509Data/any</xsd:documentation> - </xsd:annotation> - </xsd:element> - <xsd:element name="SignatureCheck" type="CheckResultType" /> - <xsd:element name="CertificateCheck" type="CheckResultType" /> - <xsd:element name="FormCheckResult" type="FormResultType" - minOccurs="0" maxOccurs="unbounded" /> - <xsd:element name="ExtendedCertificateCheck" type="ExtendedCertificateCheckResultType" minOccurs="0" maxOccurs="1"/> - </xsd:sequence> - </xsd:complexType> - <!--########## Verify PDF Signature ### --> - <!--### Verifiy PDF Signature Request ### --> - <xsd:element name="VerifyPDFSignatureRequest"> - <xsd:complexType> - <xsd:complexContent> - <xsd:extension base="VerifyPDFSignatureRequestType" /> - </xsd:complexContent> - </xsd:complexType> - </xsd:element> - <xsd:complexType name="VerifyPDFSignatureRequestType"> - <xsd:sequence> - <xsd:element name="DateTime" type="xsd:dateTime" - minOccurs="0" /> - <xsd:element name="ExtendedValidation" type="xsd:boolean" minOccurs="0" default="false"/> - <xsd:element name="PDFSignature" type="xsd:base64Binary" /> - <xsd:element name="TrustProfileID" type="xsd:token"> - <xsd:annotation> - <xsd:documentation>mit diesem Profil wird eine Menge von - vertrauenswürdigen Wurzelzertifikaten spezifiziert - </xsd:documentation> - </xsd:annotation> - </xsd:element> - </xsd:sequence> - </xsd:complexType> - <!--### Verify CMS Signature Response ### --> - <xsd:element name="VerifyPDFSignatureResponse" type="VerifyPDFSignatureResponseType" /> - <xsd:complexType name="VerifyPDFSignatureResponseType"> - <xsd:sequence maxOccurs="unbounded"> - <xsd:element name="SignatureResult" type="PDFSignatureResultType" /> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="PDFSignatureResultType"> - <xsd:sequence> - <xsd:element name="SignerInfo" type="dsig:KeyInfoType"> - <xsd:annotation> - <xsd:documentation>only ds:X509Data and RetrievalMethod is - supported; QualifiedCertificate is included as - X509Data/any;publicAuthority is included as X509Data/any; - SecureSignatureCreationDevice is included as X509Data/any, - IssuingCountry is included as X509Data/any</xsd:documentation> - </xsd:annotation> - </xsd:element> - <xsd:element name="SignatureCheck" type="CheckResultType" /> - <xsd:element name="CertificateCheck" type="CheckResultType" /> - <xsd:element name="FormCheckResult" type="FormResultType" - minOccurs="0" maxOccurs="unbounded" /> - <xsd:element name="ExtendedCertificateCheck" type="ExtendedCertificateCheckResultType" minOccurs="0" maxOccurs="1"/> - </xsd:sequence> - </xsd:complexType> - <!--########## Verify XML Signature ### --> - <!--### Verify XML Signature Request ### --> - <xsd:element name="VerifyXMLSignatureRequest"> - <xsd:complexType> - <xsd:complexContent> - <xsd:extension base="VerifyXMLSignatureRequestType" /> - </xsd:complexContent> - </xsd:complexType> - </xsd:element> - <xsd:complexType name="VerifyXMLSignatureRequestType"> - <xsd:sequence> - <xsd:element name="DateTime" type="xsd:dateTime" - minOccurs="0" /> - <xsd:element name="ExtendedValidation" type="xsd:boolean" minOccurs="0" default="false"/> - <xsd:element name="VerifySignatureInfo"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="VerifySignatureEnvironment" type="ContentOptionalRefType" /> - <xsd:element name="VerifySignatureLocation" type="XMLSignatureLocationType" /> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element ref="SupplementProfile" /> - <xsd:element name="SupplementProfileID" type="xsd:string" /> - </xsd:choice> - <xsd:element name="SignatureManifestCheckParams" - minOccurs="0"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="ReferenceInfo" type="VerifyTransformsDataType" - maxOccurs="unbounded"> - <xsd:annotation> - <xsd:documentation>Pro dsig:Reference-Element in der zu - überprüfenden XML-Signatur muss hier ein - ReferenceInfo-Element erscheinen. Die Reihenfolge der einzelnen - ReferenceInfo Elemente entspricht jener der dsig:Reference - Elemente in der XML-Signatur.</xsd:documentation> - </xsd:annotation> - </xsd:element> - </xsd:sequence> - <xsd:attribute name="ReturnReferenceInputData" type="xsd:boolean" - use="optional" default="true" /> - </xsd:complexType> - </xsd:element> - <xsd:element name="ReturnHashInputData" minOccurs="0" /> - <xsd:element name="TrustProfileID" type="xsd:token"> - <xsd:annotation> - <xsd:documentation>mit diesem Profil wird eine Menge von - vertrauenswürdigen Wurzelzertifikaten spezifiziert - </xsd:documentation> - </xsd:annotation> - </xsd:element> - </xsd:sequence> - </xsd:complexType> - <!--### Verify XML Signature Response ### --> - <xsd:element name="VerifyXMLSignatureResponse" type="VerifyXMLSignatureResponseType" /> - <xsd:complexType name="VerifyXMLSignatureResponseType"> - <xsd:sequence> - <xsd:element name="SignerInfo" type="dsig:KeyInfoType"> - <xsd:annotation> - <xsd:documentation>only ds:X509Data and ds:RetrievalMethod is - supported; QualifiedCertificate is included as X509Data/any; - PublicAuthority is included as X509Data/any; - SecureSignatureCreationDevice is included as X509Data/any, - IssuingCountry is included as X509Data/any</xsd:documentation> - </xsd:annotation> - </xsd:element> - <xsd:element name="HashInputData" type="InputDataType" - minOccurs="0" maxOccurs="unbounded" /> - <xsd:element name="ReferenceInputData" type="InputDataType" - minOccurs="0" maxOccurs="unbounded" /> - <xsd:element name="SignatureCheck" type="ReferencesCheckResultType" /> - <xsd:element name="SignatureManifestCheck" type="ReferencesCheckResultType" - minOccurs="0" /> - <xsd:element name="XMLDSIGManifestCheck" type="ManifestRefsCheckResultType" - minOccurs="0" maxOccurs="unbounded" /> - <xsd:element name="CertificateCheck" type="CheckResultType" /> - <xsd:element name="FormCheckResult" type="FormResultType" - minOccurs="0" maxOccurs="unbounded" /> - <xsd:element name="ExtendedCertificateCheck" type="ExtendedCertificateCheckResultType" minOccurs="0" maxOccurs="1"/> - </xsd:sequence> - </xsd:complexType> - <xsd:simpleType name="ProfileIdentifierType"> - <xsd:restriction base="xsd:token" /> - </xsd:simpleType> - <xsd:complexType name="InputDataType"> - <xsd:complexContent> - <xsd:extension base="ContentExLocRefBaseType"> - <xsd:attribute name="PartOf" use="optional" default="SignedInfo"> - <xsd:simpleType> - <xsd:restriction base="xsd:token"> - <xsd:enumeration value="SignedInfo" /> - <xsd:enumeration value="XMLDSIGManifest" /> - </xsd:restriction> - </xsd:simpleType> - </xsd:attribute> - <xsd:attribute name="ReferringSigReference" type="xsd:nonNegativeInteger" - use="optional" /> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - <xsd:complexType name="MetaInfoType"> - <xsd:sequence> - <xsd:element name="MimeType" type="MimeTypeType" /> - <xsd:element name="Description" type="xsd:anyURI" - minOccurs="0" /> - <xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded" /> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="FinalDataMetaInfoType"> - <xsd:complexContent> - <xsd:extension base="MetaInfoType"> - <xsd:sequence> - <xsd:element name="Type" type="xsd:anyURI" minOccurs="0" /> - </xsd:sequence> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - <xsd:complexType name="DataObjectInfoType"> - <xsd:sequence> - <xsd:element name="DataObject"> - <xsd:complexType> - <xsd:complexContent> - <xsd:extension base="ContentOptionalRefType" /> - </xsd:complexContent> - </xsd:complexType> - </xsd:element> - <xsd:choice> - <xsd:annotation> - <xsd:documentation>Auswahl: Entweder explizite Angabe EINER - Transformationskette inklusive ggf. sinnvoller Supplements oder - Verweis auf ein benanntes Profil</xsd:documentation> - </xsd:annotation> - <xsd:element ref="CreateTransformsInfoProfile" /> - <xsd:element name="CreateTransformsInfoProfileID" type="ProfileIdentifierType" /> - </xsd:choice> - </xsd:sequence> - <xsd:attribute name="Structure" use="required"> - <xsd:simpleType> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="detached" /> - <xsd:enumeration value="enveloping" /> - </xsd:restriction> - </xsd:simpleType> - </xsd:attribute> - </xsd:complexType> - <xsd:complexType name="CMSDataObjectInfoType"> - <xsd:sequence> - <xsd:element name="DataObject" type="CMSDataObjectRequiredMetaType" /> - </xsd:sequence> - <xsd:attribute name="Structure" use="required"> - <xsd:simpleType> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="detached" /> - <xsd:enumeration value="enveloping" /> - </xsd:restriction> - </xsd:simpleType> - </xsd:attribute> - </xsd:complexType> - <xsd:complexType name="TransformsInfoType"> - <xsd:sequence> - <xsd:element ref="MoaTransforms" minOccurs="0" /> - <xsd:element name="FinalDataMetaInfo" type="FinalDataMetaInfoType" /> - </xsd:sequence> - </xsd:complexType> - <xsd:element name="MoaTransforms" type="MoaTransformsType" /> - <xsd:complexType name="MoaTransformsType"> - <xsd:sequence> - <xsd:element ref="MoaTransform" maxOccurs="unbounded" /> - </xsd:sequence> - </xsd:complexType> - <xsd:element name="MoaTransform" type="MoaTransformType" /> - <xsd:complexType name="MoaTransformType" mixed="true"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="transformData" type="xsd:base64Binary" /> - <xsd:element name="XPath" type="xsd:string" /> - </xsd:choice> - <xsd:attribute name="Algorithm" type="xsd:anyURI" use="required" /> - </xsd:complexType> - <xsd:complexType name="XMLDataObjectAssociationType"> - <xsd:sequence> - <xsd:element name="MetaInfo" type="MetaInfoType" - minOccurs="0" /> - <xsd:element name="Content" type="ContentRequiredRefType" /> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="PDFSignedRepsonse"> - <xsd:sequence> - <xsd:element name="SignatureID" type="xsd:string" - minOccurs="0" maxOccurs="1" /> - <xsd:choice maxOccurs="1"> - <xsd:element name="PDFSignature" type="xsd:base64Binary"> - <xsd:annotation> - <xsd:documentation>Resultat, falls die Signaturerstellung - erfolgreich war</xsd:documentation> - </xsd:annotation> - </xsd:element> - <xsd:element ref="ErrorResponse" /> - </xsd:choice> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="CMSDataObjectOptionalMetaType"> - <xsd:sequence> - <xsd:element name="MetaInfo" type="MetaInfoType" - minOccurs="0" /> - <xsd:element name="Content" type="CMSContentBaseType" /> - <xsd:element name="From" type="xsd:nonNegativeInteger" minOccurs="0" maxOccurs="1" /> - <xsd:element name="To" type="xsd:nonNegativeInteger" minOccurs="0" maxOccurs="1" /> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="CMSDataObjectRequiredMetaType"> - <xsd:sequence> - <xsd:element name="MetaInfo" type="MetaInfoType" /> - <xsd:element name="Content" type="CMSContentBaseType" /> - <xsd:element name="From" type="xsd:nonNegativeInteger" minOccurs="0" maxOccurs="1" /> - <xsd:element name="To" type="xsd:nonNegativeInteger" minOccurs="0" maxOccurs="1" /> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="CMSContentBaseType"> - <xsd:complexContent> - <xsd:restriction base="ContentOptionalRefType"> - <xsd:choice minOccurs="0"> - <xsd:element name="Base64Content" type="xsd:base64Binary" /> - </xsd:choice> - </xsd:restriction> - </xsd:complexContent> - </xsd:complexType> - <xsd:complexType name="CheckResultType"> - <xsd:sequence> - <xsd:element name="Code" type="xsd:nonNegativeInteger" /> - <xsd:element name="Info" type="AnyChildrenType" - minOccurs="0" /> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="FormResultType"> - <xsd:sequence> - <xsd:element name="Code" type="xsd:nonNegativeInteger" - minOccurs="1" maxOccurs="1" /> - <xsd:element name="Name" type="xsd:string" minOccurs="1" - maxOccurs="1" /> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="IndicationResultType"> - <xsd:sequence> - <xsd:element name="Code" type="xsd:nonNegativeInteger" minOccurs="1" maxOccurs="1"/> - <xsd:element name="Name" type="xsd:string" minOccurs="1" maxOccurs="1"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="ExtendedCertificateCheckResultType"> - <xsd:sequence> - <xsd:element name="Major" type="IndicationResultType" minOccurs="1" maxOccurs="1"/> - <xsd:element name="Minor" type="IndicationResultType" minOccurs="0" maxOccurs="1"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="ReferencesCheckResultType"> - <xsd:complexContent> - <xsd:restriction base="CheckResultType"> - <xsd:sequence> - <xsd:element name="Code" type="xsd:nonNegativeInteger" /> - <xsd:element name="Info" type="ReferencesCheckResultInfoType" - minOccurs="0" /> - </xsd:sequence> - </xsd:restriction> - </xsd:complexContent> - </xsd:complexType> - <xsd:complexType name="ReferencesCheckResultInfoType" - mixed="true"> - <xsd:complexContent> - <xsd:restriction base="AnyChildrenType"> - <xsd:sequence> - <xsd:any namespace="##other" processContents="lax" - minOccurs="0" maxOccurs="unbounded" /> - <xsd:element ref="FailedReference" minOccurs="0" maxOccurs="unbounded"/> - </xsd:sequence> - </xsd:restriction> - </xsd:complexContent> - </xsd:complexType> - <xsd:element name="FailedReference" type="xsd:positiveInteger"/> - <xsd:element name="ReferringSigReference" type="xsd:positiveInteger" /> - <xsd:complexType name="ManifestRefsCheckResultType"> - <xsd:complexContent> - <xsd:restriction base="CheckResultType"> - <xsd:sequence> - <xsd:element name="Code" type="xsd:nonNegativeInteger" /> - <xsd:element name="Info" type="ManifestRefsCheckResultInfoType" /> - </xsd:sequence> - </xsd:restriction> - </xsd:complexContent> - </xsd:complexType> - <xsd:complexType name="ManifestRefsCheckResultInfoType" - mixed="true"> - <xsd:complexContent> - <xsd:restriction base="AnyChildrenType"> - <xsd:sequence> - <xsd:any namespace="##other" processContents="lax" - minOccurs="0" maxOccurs="unbounded" /> - <xsd:element ref="FailedReference" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="ReferringSigReference"/> - </xsd:sequence> - </xsd:restriction> - </xsd:complexContent> - </xsd:complexType> - <!--########## Error Response ### --> - <xsd:element name="ErrorResponse" type="ErrorResponseType"> - <xsd:annotation> - <xsd:documentation>Resultat, falls die Signaturerstellung gescheitert - ist</xsd:documentation> - </xsd:annotation> - </xsd:element> - <xsd:complexType name="ErrorResponseType"> - <xsd:sequence> - <xsd:element name="ErrorCode" type="xsd:integer" /> - <xsd:element name="Info" type="xsd:string" /> - </xsd:sequence> - </xsd:complexType> - <!--########## Auxiliary Types ### --> - <xsd:simpleType name="KeyIdentifierType"> - <xsd:restriction base="xsd:string" /> - </xsd:simpleType> - <xsd:simpleType name="KeyStorageType"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Software" /> - <xsd:enumeration value="Hardware" /> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="MimeTypeType"> - <xsd:restriction base="xsd:token" /> - </xsd:simpleType> - <xsd:complexType name="AnyChildrenType" mixed="true"> - <xsd:sequence> - <xsd:any namespace="##any" processContents="lax" minOccurs="0" - maxOccurs="unbounded" /> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="ContentBaseType"> - <xsd:choice minOccurs="0"> - <xsd:element name="Base64Content" type="xsd:base64Binary" /> - <xsd:element name="LocRefContent" type="xsd:anyURI" /> - </xsd:choice> - </xsd:complexType> - <xsd:complexType name="ContentExLocRefBaseType"> - <xsd:complexContent> - <xsd:restriction base="ContentBaseType"> - <xsd:choice minOccurs="0"> - <xsd:element name="Base64Content" type="xsd:base64Binary" /> - </xsd:choice> - </xsd:restriction> - </xsd:complexContent> - </xsd:complexType> - <xsd:complexType name="ContentOptionalRefType"> - <xsd:complexContent> - <xsd:extension base="ContentBaseType"> - <xsd:attribute name="Reference" type="xsd:anyURI" use="optional" /> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - <xsd:complexType name="ContentRequiredRefType"> - <xsd:complexContent> - <xsd:restriction base="ContentOptionalRefType"> - <xsd:choice minOccurs="0"> - <xsd:element name="Base64Content" type="xsd:base64Binary" /> - <xsd:element name="LocRefContent" type="xsd:anyURI" /> - </xsd:choice> - <xsd:attribute name="Reference" type="xsd:anyURI" use="required" /> - </xsd:restriction> - </xsd:complexContent> - </xsd:complexType> - <xsd:complexType name="VerifyTransformsDataType"> - <xsd:choice maxOccurs="unbounded"> - <xsd:annotation> - <xsd:documentation>Ein oder mehrere Transformationswege können von - der Applikation an MOA mitgeteilt werden. Die zu prüfende Signatur - hat zumindest einem dieser Transformationswege zu entsprechen. Die - Angabe kann explizit oder als Profilbezeichner erfolgen. - </xsd:documentation> - </xsd:annotation> - <xsd:element ref="VerifyTransformsInfoProfile" /> - <xsd:element name="VerifyTransformsInfoProfileID" type="xsd:string"> - <xsd:annotation> - <xsd:documentation>Profilbezeichner für einen Transformationsweg - </xsd:documentation> - </xsd:annotation> - </xsd:element> - </xsd:choice> - </xsd:complexType> - <xsd:element name="QualifiedCertificate"> - <xsd:complexType> - <xsd:attribute name="source" use="optional"> - <xsd:simpleType> - <xsd:restriction base="xsd:token"> - <xsd:enumeration value="TSL" /> - <xsd:enumeration value="Certificate" /> - </xsd:restriction> - </xsd:simpleType> - </xsd:attribute> - </xsd:complexType> - </xsd:element> - <xsd:complexType name="XMLSignatureLocationType"> - <xsd:sequence> - <xsd:element name="NamespaceDeclaration" type="NamespaceDeclarationType" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element name="XPathExpression" type="xsd:token" minOccurs="1" maxOccurs="1"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="NamespaceDeclarationType"> - <xsd:simpleContent> - <xsd:extension base="xsd:token"> - <xsd:attribute name="prefix" use="required" type="xsd:string"/> - </xsd:extension> - </xsd:simpleContent> - </xsd:complexType> - <xsd:element name="SecureSignatureCreationDevice"> - <xsd:complexType> - <xsd:attribute name="source" use="optional"> - <xsd:simpleType> - <xsd:restriction base="xsd:token"> - <xsd:enumeration value="TSL" /> - <xsd:enumeration value="Certificate" /> - </xsd:restriction> - </xsd:simpleType> - </xsd:attribute> - </xsd:complexType> - </xsd:element> - <xsd:element name="IssuingCountry" type="xsd:token" /> - <xsd:element name="PublicAuthority" type="PublicAuthorityType" /> - <xsd:complexType name="PublicAuthorityType"> - <xsd:sequence> - <xsd:element name="Code" type="xsd:string" minOccurs="0" /> - </xsd:sequence> - </xsd:complexType> - <xsd:simpleType name="SignatoriesType"> - <xsd:union memberTypes="AllSignatoriesType"> - <xsd:simpleType> - <xsd:list itemType="xsd:positiveInteger" /> - </xsd:simpleType> - </xsd:union> - </xsd:simpleType> - <xsd:simpleType name="AllSignatoriesType"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="all" /> - </xsd:restriction> - </xsd:simpleType> - <xsd:complexType name="CreateSignatureLocationType"> - <xsd:simpleContent> - <xsd:extension base="xsd:token"> - <xsd:attribute name="Index" type="xsd:integer" use="required" /> - </xsd:extension> - </xsd:simpleContent> - </xsd:complexType> - <xsd:complexType name="TransformParameterType"> - <xsd:choice minOccurs="0"> - <xsd:annotation> - <xsd:documentation>Die Angabe des Transformationsparameters - (explizit oder als Hashwert) kann unterlassen werden, wenn die - Applikation von der Unveränderlichkeit des Inhalts der in - "Transformationsparamter", Attribut "URI" angegebenen URI ausgehen - kann.</xsd:documentation> - </xsd:annotation> - <xsd:element name="Base64Content" type="xsd:base64Binary"> - <xsd:annotation> - <xsd:documentation>Der Transformationsparameter explizit angegeben. - </xsd:documentation> - </xsd:annotation> - </xsd:element> - <xsd:element name="Hash"> - <xsd:annotation> - <xsd:documentation>Der Hashwert des Transformationsparameters. - </xsd:documentation> - </xsd:annotation> - <xsd:complexType> - <xsd:sequence> - <xsd:element ref="dsig:DigestMethod" /> - <xsd:element ref="dsig:DigestValue" /> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - </xsd:choice> - <xsd:attribute name="URI" type="xsd:anyURI" use="required" /> - </xsd:complexType> - <xsd:element name="CreateSignatureEnvironmentProfile"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="CreateSignatureLocation" type="CreateSignatureLocationType" /> - <xsd:element name="Supplement" type="XMLDataObjectAssociationType" - minOccurs="0" maxOccurs="unbounded" /> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - <xsd:element name="VerifyTransformsInfoProfile"> - <xsd:annotation> - <xsd:documentation>Explizite Angabe des Transformationswegs - </xsd:documentation> - </xsd:annotation> - <xsd:complexType> - <xsd:sequence> - <xsd:element ref="MoaTransforms" minOccurs="0" /> - <xsd:element name="TransformParameter" type="TransformParameterType" - minOccurs="0" maxOccurs="unbounded"> - <xsd:annotation> - <xsd:documentation>Alle impliziten Transformationsparameter, die - zum Durchlaufen der oben angeführten Transformationskette - bekannt sein müssen, müssen hier angeführt werden. Das - Attribut "URI" bezeichnet den Transformationsparameter in exakt - jener Weise, wie er in der zu überprüfenden Signatur gebraucht - wird.</xsd:documentation> - </xsd:annotation> - </xsd:element> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - <xsd:element name="Supplement" type="XMLDataObjectAssociationType" /> - <xsd:element name="SupplementProfile" type="XMLDataObjectAssociationType" /> - <xsd:element name="CreateTransformsInfoProfile"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="CreateTransformsInfo" type="TransformsInfoType" /> - <xsd:element ref="Supplement" minOccurs="0" maxOccurs="unbounded" /> - </xsd:sequence> - </xsd:complexType> - </xsd:element> -</xsd:schema>
\ No newline at end of file diff --git a/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SPSS-2.0.0.wsdl b/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SPSS-2.0.0.wsdl index 00bf4c5..c1ba365 100644 --- a/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SPSS-2.0.0.wsdl +++ b/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SPSS-2.0.0.wsdl @@ -34,6 +34,12 @@ <message name="VerifyPDFSignatureOutput">
<part name="body" element="moa:VerifyPDFSignatureResponse"/>
</message>
+ <message name="VerifyASICSignatureInput">
+ <part name="body" element="moa:VerifyASICSignatureRequest"/>
+ </message>
+ <message name="VerifyASICSignatureOutput">
+ <part name="body" element="moa:VerifyASICSignatureResponse"/>
+ </message>
<message name="VerifyXMLSignatureInput">
<part name="body" element="moa:VerifyXMLSignatureRequest"/>
</message>
@@ -76,6 +82,11 @@ <output message="tns:VerifyPDFSignatureOutput"/>
<fault name="MOAFault" message="tns:MOAFault"/>
</operation>
+ <operation name="verifyASICSignature">
+ <input message="tns:VerifyASICSignatureInput"/>
+ <output message="tns:VerifyASICSignatureOutput"/>
+ <fault name="MOAFault" message="tns:MOAFault"/>
+ </operation>
</portType>
<binding name="SignatureCreationBinding" type="tns:SignatureCreationPortType">
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
@@ -154,6 +165,18 @@ <!-- soap:fault name="" use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/-->
</fault>
</operation>
+ <operation name="verifyASICSignature">
+ <soap:operation soapAction="urn:VerifyASICSignatureAction"/>
+ <input>
+ <soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
+ </input>
+ <output>
+ <soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
+ </output>
+ <fault name="MOAFault">
+ <!-- soap:fault name="" use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/-->
+ </fault>
+ </operation>
</binding>
<service name="SignatureCreationService">
<port name="SignatureCreationPort" binding="tns:SignatureCreationBinding">
diff --git a/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SPSS-2.0.0.xsd b/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SPSS-2.0.0.xsd index edd82cb..b786659 100644 --- a/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SPSS-2.0.0.xsd +++ b/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SPSS-2.0.0.xsd @@ -214,6 +214,47 @@ </xsd:element> </xsd:sequence> </xsd:complexType> + <!--########## Verify PDF Signature ###--> + <!--### Verifiy ASIC Signature Request ###--> + <xsd:element name="VerifyASICSignatureRequest"> + <xsd:complexType> + <xsd:complexContent> + <xsd:extension base="VerifyASICSignatureRequestType"> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + </xsd:element> + <xsd:complexType name="VerifyASICSignatureRequestType"> + <xsd:sequence> + <xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/> + <xsd:element name="ExtendedValidation" type="xsd:boolean" minOccurs="0" default="false"/> + <xsd:element name="ASICSignature" type="xsd:base64Binary"/> + <xsd:element name="ASICExtension" type="xsd:string"> + <xsd:annotation> + <xsd:documentation>asics or asice</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="TrustProfileID" type="xsd:token"> + <xsd:annotation> + <xsd:documentation>mit diesem Profil wird eine Menge von vertrauenswürdigen Wurzelzertifikaten spezifiziert</xsd:documentation> + </xsd:annotation> + </xsd:element> + </xsd:sequence> + </xsd:complexType> + <!--### Verify ASIC Signature Response ###--> + <xsd:element name="VerifyASICSignatureResponse" type="VerifyASICSignatureResponseType"/> + <xsd:complexType name="VerifyASICSignatureResponseType"> + <xsd:sequence> + <xsd:element name="ASiCSignatureResult" type="ASICResultType" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + <xsd:complexType name="ASICResultType"> + <xsd:sequence> + <xsd:element name="signedFiles" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="XMLSignatureResult" type="VerifyXMLSignatureResponseType" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="CMSSignatureResult" type="VerifyCMSSignatureResponseType" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> <!--### Verify CMS Signature Response ###--> <xsd:element name="VerifyPDFSignatureResponse" type="VerifyPDFSignatureResponseType"/> <xsd:complexType name="VerifyPDFSignatureResponseType"> diff --git a/moaSig/moa-sig/src/main/webapp/WEB-INF/server-config.wsdd b/moaSig/moa-sig/src/main/webapp/WEB-INF/server-config.wsdd index ef473b1..c956f44 100644 --- a/moaSig/moa-sig/src/main/webapp/WEB-INF/server-config.wsdd +++ b/moaSig/moa-sig/src/main/webapp/WEB-INF/server-config.wsdd @@ -28,7 +28,7 @@ <service name="SignatureVerification" provider="java:MSG">
<namespace>http://reference.e-government.gv.at/namespace/moa/20020822#</namespace>
- <parameter name="allowedMethods" value="VerifyCMSSignatureRequest VerifyXMLSignatureRequest VerifyPDFSignatureRequest"/>
+ <parameter name="allowedMethods" value="VerifyCMSSignatureRequest VerifyXMLSignatureRequest VerifyPDFSignatureRequest VerifyASICSignatureRequest"/>
<parameter name="className" value="at.gv.egovernment.moa.spss.server.service.SignatureVerificationService"/>
<wsdlFile>/resources/schemas/MOA-SPSS-2.0.0.wsdl</wsdlFile>
<requestFlow>
diff --git a/moaSig/moa-sig/src/main/webapp/schemas/MOA-SPSS-2.0.0.xsd b/moaSig/moa-sig/src/main/webapp/schemas/MOA-SPSS-2.0.0.xsd index edd82cb..b786659 100644 --- a/moaSig/moa-sig/src/main/webapp/schemas/MOA-SPSS-2.0.0.xsd +++ b/moaSig/moa-sig/src/main/webapp/schemas/MOA-SPSS-2.0.0.xsd @@ -214,6 +214,47 @@ </xsd:element> </xsd:sequence> </xsd:complexType> + <!--########## Verify PDF Signature ###--> + <!--### Verifiy ASIC Signature Request ###--> + <xsd:element name="VerifyASICSignatureRequest"> + <xsd:complexType> + <xsd:complexContent> + <xsd:extension base="VerifyASICSignatureRequestType"> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + </xsd:element> + <xsd:complexType name="VerifyASICSignatureRequestType"> + <xsd:sequence> + <xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/> + <xsd:element name="ExtendedValidation" type="xsd:boolean" minOccurs="0" default="false"/> + <xsd:element name="ASICSignature" type="xsd:base64Binary"/> + <xsd:element name="ASICExtension" type="xsd:string"> + <xsd:annotation> + <xsd:documentation>asics or asice</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="TrustProfileID" type="xsd:token"> + <xsd:annotation> + <xsd:documentation>mit diesem Profil wird eine Menge von vertrauenswürdigen Wurzelzertifikaten spezifiziert</xsd:documentation> + </xsd:annotation> + </xsd:element> + </xsd:sequence> + </xsd:complexType> + <!--### Verify ASIC Signature Response ###--> + <xsd:element name="VerifyASICSignatureResponse" type="VerifyASICSignatureResponseType"/> + <xsd:complexType name="VerifyASICSignatureResponseType"> + <xsd:sequence> + <xsd:element name="ASiCSignatureResult" type="ASICResultType" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + <xsd:complexType name="ASICResultType"> + <xsd:sequence> + <xsd:element name="signedFiles" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="XMLSignatureResult" type="VerifyXMLSignatureResponseType" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="CMSSignatureResult" type="VerifyCMSSignatureResponseType" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> <!--### Verify CMS Signature Response ###--> <xsd:element name="VerifyPDFSignatureResponse" type="VerifyPDFSignatureResponseType"/> <xsd:complexType name="VerifyPDFSignatureResponseType"> |