diff options
author | Andreas Fitzek <andreas.fitzek@iaik.tugraz.at> | 2016-03-14 16:29:03 +0100 |
---|---|---|
committer | Andreas Fitzek <andreas.fitzek@iaik.tugraz.at> | 2016-03-14 16:29:03 +0100 |
commit | 84293bd12f63b59852026cab02035fc9ebee626a (patch) | |
tree | 6a118418f618af68f5d884e2eb7eac2fb660a136 /moaSig/moa-sig | |
parent | 7510ab5173001711ecb5d6c8834878e7cce63ff9 (diff) | |
download | moa-sig-84293bd12f63b59852026cab02035fc9ebee626a.tar.gz moa-sig-84293bd12f63b59852026cab02035fc9ebee626a.tar.bz2 moa-sig-84293bd12f63b59852026cab02035fc9ebee626a.zip |
A lot of moa sig stuff
Diffstat (limited to 'moaSig/moa-sig')
118 files changed, 1184 insertions, 1293 deletions
diff --git a/moaSig/moa-sig/build.gradle b/moaSig/moa-sig/build.gradle index c366cf0..cfee94b 100644 --- a/moaSig/moa-sig/build.gradle +++ b/moaSig/moa-sig/build.gradle @@ -1,5 +1,6 @@ apply plugin: 'war' apply plugin: 'eclipse-wtp' +apply from: 'https://raw.github.com/akhikhl/gretty/master/pluginScripts/gretty.plugin' repositories { maven { @@ -14,14 +15,14 @@ dependencies { compile 'commons-discovery:commons-discovery:0.5' compile 'org.slf4j:slf4j-log4j12:1.7.12' - compile 'org.apache.cxf:cxf-rt-frontend-jaxws:3.1.4' - compile 'org.apache.cxf:cxf-rt-transports-http:3.1.4' - compile 'org.aspectj:aspectjrt:1.8.7' - compile 'org.aspectj:aspectjweaver:1.8.7' + //compile 'org.apache.cxf:cxf-rt-frontend-jaxws:3.1.4' + //compile 'org.apache.cxf:cxf-rt-transports-http:3.1.4' + //compile 'org.aspectj:aspectjrt:1.8.7' + //compile 'org.aspectj:aspectjweaver:1.8.7' - compile 'at.gv.egiz.pdfas:pdf-as-lib:4.0.7' - compile 'at.gv.egiz.pdfas:pdf-as-pdfbox:4.0.7' - compile 'at.gv.egiz.pdfas:sigs-pades:4.0.7' + //compile 'at.gv.egiz.pdfas:pdf-as-lib:4.0.7' + //compile 'at.gv.egiz.pdfas:pdf-as-pdfbox:4.0.7' + //compile 'at.gv.egiz.pdfas:sigs-pades:4.0.7' } sourceSets { @@ -38,6 +39,20 @@ configurations { dependencies { jaxb group: 'com.sun.xml.bind', name: 'jaxb-xjc', version: '2.2.4-1' + //compile 'ch.qos.logback:logback-classic:1.1.5' + //compile 'ch.qos.logback:logback-core:1.1.5' + //def tomcatVersion = '7.0.59' + //tomcat "org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}", + // "org.apache.tomcat.embed:tomcat-embed-logging-juli:${tomcatVersion}", + // "org.apache.tomcat.embed:tomcat-embed-jasper:${tomcatVersion}" +} + +gretty { + jvmArgs = [ + '-Dmoa.spss.server.configuration=/home/afitzek/server/moa-spss/apache-tomcat-8.0.0-RC3/conf/moa-spss/spss.config.xml', + '-Dlog4j.configuration=/home/afitzek/server/moa-spss/apache-tomcat-8.0.0-RC3/conf/moa-spss/log4j.properties' + ] + loggingLevel = "TRACE" } task jaxb () { @@ -62,3 +77,14 @@ task jaxb () { } //compileJava.dependsOn jaxb +// context where tomcat is deployed, by defautl localhost:8080/ + +//tomcat { +// stopKey = 'x' + //daemon = true +//} +//System.setProperty('moa.spss.server.configuration', '/home/afitzek/server/moa-spss/apache-tomcat-8.0.0-RC3/conf/moa-spss/spss.config.xml') +// System.setProperty('log4j.configuration', '/home/afitzek/server/moa-spss/apache-tomcat-8.0.0-RC3/conf/moa-spss/log4j.properties') + +//tomcatRun.contextPath = '/' +//tomcatRunWar.contextPath = '/' 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 0faa261..7c355f1 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 c305a51..6c91ce0 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // @@ -43,8 +43,8 @@ import org.w3c.dom.Element; "content" }) @XmlSeeAlso({ - ReferencesCheckResultInfoType.class, - ManifestRefsCheckResultInfoType.class + ManifestRefsCheckResultInfoType.class, + ReferencesCheckResultInfoType.class }) public class AnyChildrenType { @@ -70,9 +70,9 @@ public class AnyChildrenType { * * <p> * Objects of the following type(s) are allowed in the list + * {@link Element } * {@link Object } * {@link String } - * {@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 86b030d..7427e70 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 69a89bb..9def3b2 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 fda13bb..12d377f 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,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.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 b3155c2..2b756d5 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,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.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 196446d..14b7625 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // @@ -70,8 +70,8 @@ public class CanonicalizationMethodType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link String } * {@link Object } + * {@link String } * * */ 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 93e4362..aaa6c0e 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // @@ -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 692110e..e5b064e 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 7c0dd25..1b660d8 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 aa09c98..46db140 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // @@ -36,9 +36,9 @@ import javax.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "ContentOptionalRefType") @XmlSeeAlso({ + at.gv.egiz.moasig.DataObjectInfoType.DataObject.class, CMSContentBaseType.class, - ContentRequiredRefType.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 09e8af8..6a57050 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 4d166e7..89c8944 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 b74132f..14b54c3 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 7e4d9a5..ef473ce 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 3ee7507..c66580d 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.11.30 at 11:32:30 AM CET +// Generated on: 2015.12.09 at 08:47:56 AM CET // 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 c69738c..b6b4b2c 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.11.30 at 11:32:30 AM CET +// Generated on: 2015.12.09 at 08:47:56 AM CET // 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 eace92c..5bd70ac 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.11.30 at 11:32:30 AM CET +// Generated on: 2015.12.09 at 08:47:56 AM CET // 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 e3ee7fd..3a6f743 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 f5e40af..5a1bd95 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 74f0ad1..5277571 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 3953720..1b4755e 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 c19c1fa..0dd5bc0 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 fb00cd5..f7f38a4 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 e3ee203..241cbe9 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 f5853e5..068751c 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 2fc5bc8..038ce1c 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // @@ -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 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 29e36c8..6bed498 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 829ba47..70afe1d 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 dd6b787..0d61c08 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 6c24b40..477927d 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 ea2b0a8..4663f48 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // @@ -60,13 +60,13 @@ import org.w3c.dom.Element; public class KeyInfoType { @XmlElementRefs({ - @XmlElementRef(name = "KeyValue", 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 = "PGPData", 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), @XmlElementRef(name = "X509Data", 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 = "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 = "KeyName", 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 = "PGPData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) }) @XmlMixed @XmlAnyElement(lax = true) @@ -95,16 +95,16 @@ public class KeyInfoType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link KeyValueType }{@code >} - * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link X509DataType }{@code >} * {@link Element } + * {@link JAXBElement }{@code <}{@link KeyValueType }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} * {@link Object } + * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >} * {@link String } + * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >} * {@link JAXBElement }{@code <}{@link PGPDataType }{@code >} - * {@link JAXBElement }{@code <}{@link X509DataType }{@code >} - * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >} - * {@link JAXBElement }{@code <}{@link String }{@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 de9229e..0968c74 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 962acfd..993d15c 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // @@ -74,11 +74,11 @@ public class KeyValueType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >} * {@link Element } + * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >} + * {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >} * {@link Object } * {@link String } - * {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >} * * */ 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 802500b..64cba47 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 6cb8b6e..3a61f4d 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 00b879c..3cf35aa 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 5f7f52a..321d5d6 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MoaTransformType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MoaTransformType.java index 36797df..3874e8a 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MoaTransformType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MoaTransformType.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.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // @@ -50,8 +50,8 @@ import javax.xml.bind.annotation.XmlType; public class MoaTransformType { @XmlElementRefs({ - @XmlElementRef(name = "transformData", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "XPath", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class, required = false) + @XmlElementRef(name = "XPath", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class, required = false), + @XmlElementRef(name = "transformData", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class, required = false) }) @XmlMixed protected List<Serializable> content; @@ -78,8 +78,8 @@ public class MoaTransformType { * <p> * Objects of the following type(s) are allowed in the list * {@link JAXBElement }{@code <}{@link String }{@code >} - * {@link JAXBElement }{@code <}{@link byte[]}{@code >} * {@link String } + * {@link JAXBElement }{@code <}{@link byte[]}{@code >} * * */ diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MoaTransformsType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MoaTransformsType.java index e262b9c..1deb142 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MoaTransformsType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MoaTransformsType.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.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/NamespaceDeclarationType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/NamespaceDeclarationType.java new file mode 100644 index 0000000..751ba8c --- /dev/null +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/NamespaceDeclarationType.java @@ -0,0 +1,99 @@ +// +// 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.03.14 at 12:02:35 PM CET +// + + +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.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlValue; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + * <p>Java class for NamespaceDeclarationType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="NamespaceDeclarationType"> + * <simpleContent> + * <extension base="<http://www.w3.org/2001/XMLSchema>token"> + * <attribute name="prefix" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * </extension> + * </simpleContent> + * </complexType> + * </pre> + * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "NamespaceDeclarationType", propOrder = { + "value" +}) +public class NamespaceDeclarationType { + + @XmlValue + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlSchemaType(name = "token") + protected String value; + @XmlAttribute(name = "prefix", required = true) + protected String prefix; + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the prefix property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPrefix() { + return prefix; + } + + /** + * Sets the value of the prefix property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPrefix(String value) { + this.prefix = value; + } + +} 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 5fcafb9..beae6d9 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // @@ -34,61 +34,60 @@ import javax.xml.namespace.QName; @XmlRegistry public class ObjectFactory { - private final static QName _TransformTypeXPath_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "XPath"); - private final static QName _Signature_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Signature"); - private final static QName _PGPData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPData"); - private final static QName _DSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DSAKeyValue"); + private final static QName _SupplementProfile_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "SupplementProfile"); private final static QName _SPKIData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKIData"); + private final static QName _CreateXMLSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "CreateXMLSignatureResponse"); + private final static QName _KeyInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyInfo"); + private final static QName _SignatureValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureValue"); 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 _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/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 _DigestMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestMethod"); + private final static QName _Supplement_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "Supplement"); + private final static QName _MoaTransforms_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "MoaTransforms"); 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 _SignatureProperty_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperty"); 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 _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 _FailedReference_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "FailedReference"); + 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 _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 _VerifyCMSSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "VerifyCMSSignatureResponse"); 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 _ReferringSigReference_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "ReferringSigReference"); + private final static QName _Transform_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transform"); + private final static QName _VerifyPDFSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "VerifyPDFSignatureResponse"); + private final static QName _MoaTransform_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "MoaTransform"); + 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 _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 _PublicAuthority_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "PublicAuthority"); - private final static QName _CreatePDFSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "CreatePDFSignatureResponse"); - 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 _CanonicalizationMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "CanonicalizationMethod"); + private final static QName _SignedInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignedInfo"); + private final static QName _IssuingCountry_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "IssuingCountry"); + private final static QName _Manifest_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Manifest"); + private final static QName _MoaTransformTypeXPath_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "XPath"); + private final static QName _MoaTransformTypeTransformData_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "transformData"); + private final static QName _TransformTypeXPath_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "XPath"); + 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 _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 _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 _SignatureMethodTypeHMACOutputLength_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "HMACOutputLength"); - 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 _VerifyCMSSignatureResponseTypeSignatureCheck_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "SignatureCheck"); private final static QName _VerifyCMSSignatureResponseTypeFormCheckResult_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "FormCheckResult"); - 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 _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 _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"); /** * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.gv.egiz.moasig @@ -106,14 +105,6 @@ public class ObjectFactory { } /** - * Create an instance of {@link CreatePDFSignatureRequestType } - * - */ - public CreatePDFSignatureRequestType createCreatePDFSignatureRequestType() { - return new CreatePDFSignatureRequestType(); - } - - /** * Create an instance of {@link CreateCMSSignatureRequestType } * */ @@ -146,14 +137,6 @@ public class ObjectFactory { } /** - * Create an instance of {@link TransformParameterType } - * - */ - public TransformParameterType createTransformParameterType() { - return new TransformParameterType(); - } - - /** * Create an instance of {@link CreateXMLSignatureRequestType.SingleSignatureInfo } * */ @@ -162,19 +145,19 @@ 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 QualifiedCertificate } * */ - public VerifyPDFSignatureResponseType createVerifyPDFSignatureResponseType() { - return new VerifyPDFSignatureResponseType(); + public QualifiedCertificate createQualifiedCertificate() { + return new QualifiedCertificate(); } /** @@ -186,155 +169,163 @@ public class ObjectFactory { } /** - * 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 CreateXMLSignatureRequest } + * Create an instance of {@link VerifyPDFSignatureRequest } * */ - public CreateXMLSignatureRequest createCreateXMLSignatureRequest() { - return new CreateXMLSignatureRequest(); + public VerifyPDFSignatureRequest createVerifyPDFSignatureRequest() { + return new VerifyPDFSignatureRequest(); } /** - * Create an instance of {@link CreatePDFSignatureRequest } + * Create an instance of {@link VerifyPDFSignatureRequestType } * */ - public CreatePDFSignatureRequest createCreatePDFSignatureRequest() { - return new CreatePDFSignatureRequest(); + public VerifyPDFSignatureRequestType createVerifyPDFSignatureRequestType() { + return new VerifyPDFSignatureRequestType(); } /** - * Create an instance of {@link CreatePDFSignatureRequestType.SingleSignatureInfo } + * Create an instance of {@link CreateXMLSignatureResponseType } * */ - public CreatePDFSignatureRequestType.SingleSignatureInfo createCreatePDFSignatureRequestTypeSingleSignatureInfo() { - return new CreatePDFSignatureRequestType.SingleSignatureInfo(); + public CreateXMLSignatureResponseType createCreateXMLSignatureResponseType() { + return new CreateXMLSignatureResponseType(); } /** - * Create an instance of {@link VerifyTransformsInfoProfile } + * Create an instance of {@link CreateTransformsInfoProfile } * */ - public VerifyTransformsInfoProfile createVerifyTransformsInfoProfile() { - return new VerifyTransformsInfoProfile(); + public CreateTransformsInfoProfile createCreateTransformsInfoProfile() { + return new CreateTransformsInfoProfile(); } /** - * Create an instance of {@link MoaTransformsType } + * Create an instance of {@link TransformsInfoType } * */ - public MoaTransformsType createMoaTransformsType() { - return new MoaTransformsType(); + public TransformsInfoType createTransformsInfoType() { + return new TransformsInfoType(); } /** - * Create an instance of {@link ErrorResponseType } + * Create an instance of {@link VerifyCMSSignatureRequest } * */ - public ErrorResponseType createErrorResponseType() { - return new ErrorResponseType(); + public VerifyCMSSignatureRequest createVerifyCMSSignatureRequest() { + return new VerifyCMSSignatureRequest(); } /** - * Create an instance of {@link SecureSignatureCreationDevice } + * Create an instance of {@link VerifyCMSSignatureRequestType } * */ - public SecureSignatureCreationDevice createSecureSignatureCreationDevice() { - return new SecureSignatureCreationDevice(); + public VerifyCMSSignatureRequestType createVerifyCMSSignatureRequestType() { + return new VerifyCMSSignatureRequestType(); } /** - * Create an instance of {@link CreateSignatureEnvironmentProfile } + * Create an instance of {@link CMSDataObjectOptionalMetaType } * */ - public CreateSignatureEnvironmentProfile createCreateSignatureEnvironmentProfile() { - return new CreateSignatureEnvironmentProfile(); + public CMSDataObjectOptionalMetaType createCMSDataObjectOptionalMetaType() { + return new CMSDataObjectOptionalMetaType(); } /** - * Create an instance of {@link CreateSignatureLocationType } + * Create an instance of {@link VerifyCMSSignatureResponseType } * */ - public CreateSignatureLocationType createCreateSignatureLocationType() { - return new CreateSignatureLocationType(); + public VerifyCMSSignatureResponseType createVerifyCMSSignatureResponseType() { + return new VerifyCMSSignatureResponseType(); } /** - * Create an instance of {@link PublicAuthorityType } + * Create an instance of {@link SecureSignatureCreationDevice } * */ - public PublicAuthorityType createPublicAuthorityType() { - return new PublicAuthorityType(); + public SecureSignatureCreationDevice createSecureSignatureCreationDevice() { + return new SecureSignatureCreationDevice(); } /** - * Create an instance of {@link VerifyCMSSignatureRequest } + * Create an instance of {@link VerifyTransformsInfoProfile } * */ - public VerifyCMSSignatureRequest createVerifyCMSSignatureRequest() { - return new VerifyCMSSignatureRequest(); + public VerifyTransformsInfoProfile createVerifyTransformsInfoProfile() { + return new VerifyTransformsInfoProfile(); } /** - * Create an instance of {@link VerifyCMSSignatureRequestType } + * Create an instance of {@link MoaTransformsType } * */ - public VerifyCMSSignatureRequestType createVerifyCMSSignatureRequestType() { - return new VerifyCMSSignatureRequestType(); + public MoaTransformsType createMoaTransformsType() { + return new MoaTransformsType(); } /** - * Create an instance of {@link CMSDataObjectOptionalMetaType } + * Create an instance of {@link ErrorResponseType } * */ - public CMSDataObjectOptionalMetaType createCMSDataObjectOptionalMetaType() { - return new CMSDataObjectOptionalMetaType(); + public ErrorResponseType createErrorResponseType() { + return new ErrorResponseType(); } /** - * Create an instance of {@link CreatePDFSignatureResponseType } + * Create an instance of {@link MoaTransformType } * */ - public CreatePDFSignatureResponseType createCreatePDFSignatureResponseType() { - return new CreatePDFSignatureResponseType(); + public MoaTransformType createMoaTransformType() { + return new MoaTransformType(); } /** - * Create an instance of {@link MoaTransformType } + * Create an instance of {@link VerifyPDFSignatureResponseType } * */ - public MoaTransformType createMoaTransformType() { - return new MoaTransformType(); + public VerifyPDFSignatureResponseType createVerifyPDFSignatureResponseType() { + return new VerifyPDFSignatureResponseType(); } /** - * Create an instance of {@link VerifyPDFSignatureRequest } + * Create an instance of {@link VerifyXMLSignatureResponseType } * */ - public VerifyPDFSignatureRequest createVerifyPDFSignatureRequest() { - return new VerifyPDFSignatureRequest(); + public VerifyXMLSignatureResponseType createVerifyXMLSignatureResponseType() { + return new VerifyXMLSignatureResponseType(); } /** - * Create an instance of {@link VerifyPDFSignatureRequestType } + * Create an instance of {@link CreateSignatureEnvironmentProfile } * */ - public VerifyPDFSignatureRequestType createVerifyPDFSignatureRequestType() { - return new VerifyPDFSignatureRequestType(); + public CreateSignatureEnvironmentProfile createCreateSignatureEnvironmentProfile() { + return new CreateSignatureEnvironmentProfile(); } /** - * Create an instance of {@link CreateXMLSignatureResponseType } + * Create an instance of {@link CreateSignatureLocationType } * */ - public CreateXMLSignatureResponseType createCreateXMLSignatureResponseType() { - return new CreateXMLSignatureResponseType(); + public CreateSignatureLocationType createCreateSignatureLocationType() { + return new CreateSignatureLocationType(); + } + + /** + * Create an instance of {@link CreateXMLSignatureRequest } + * + */ + public CreateXMLSignatureRequest createCreateXMLSignatureRequest() { + return new CreateXMLSignatureRequest(); } /** @@ -370,99 +361,99 @@ public class ObjectFactory { } /** - * Create an instance of {@link CreateCMSSignatureResponseType } + * Create an instance of {@link PublicAuthorityType } * */ - public CreateCMSSignatureResponseType createCreateCMSSignatureResponseType() { - return new CreateCMSSignatureResponseType(); + public PublicAuthorityType createPublicAuthorityType() { + return new PublicAuthorityType(); } /** - * Create an instance of {@link VerifyCMSSignatureResponseType } + * Create an instance of {@link PDFSignatureResultType } * */ - public VerifyCMSSignatureResponseType createVerifyCMSSignatureResponseType() { - return new VerifyCMSSignatureResponseType(); + public PDFSignatureResultType createPDFSignatureResultType() { + return new PDFSignatureResultType(); } /** - * Create an instance of {@link CreateTransformsInfoProfile } + * Create an instance of {@link CheckResultType } * */ - public CreateTransformsInfoProfile createCreateTransformsInfoProfile() { - return new CreateTransformsInfoProfile(); + public CheckResultType createCheckResultType() { + return new CheckResultType(); } /** - * Create an instance of {@link TransformsInfoType } + * Create an instance of {@link ManifestRefsCheckResultInfoType } * */ - public TransformsInfoType createTransformsInfoType() { - return new TransformsInfoType(); + public ManifestRefsCheckResultInfoType createManifestRefsCheckResultInfoType() { + return new ManifestRefsCheckResultInfoType(); } /** - * Create an instance of {@link FormResultType } + * Create an instance of {@link ContentBaseType } * */ - public FormResultType createFormResultType() { - return new FormResultType(); + public ContentBaseType createContentBaseType() { + return new ContentBaseType(); } /** - * Create an instance of {@link CMSContentBaseType } + * Create an instance of {@link VerifyTransformsDataType } * */ - public CMSContentBaseType createCMSContentBaseType() { - return new CMSContentBaseType(); + public VerifyTransformsDataType createVerifyTransformsDataType() { + return new VerifyTransformsDataType(); } /** - * Create an instance of {@link ManifestRefsCheckResultType } + * Create an instance of {@link NamespaceDeclarationType } * */ - public ManifestRefsCheckResultType createManifestRefsCheckResultType() { - return new ManifestRefsCheckResultType(); + public NamespaceDeclarationType createNamespaceDeclarationType() { + return new NamespaceDeclarationType(); } /** - * Create an instance of {@link InputDataType } + * Create an instance of {@link XMLSignatureLocationType } * */ - public InputDataType createInputDataType() { - return new InputDataType(); + public XMLSignatureLocationType createXMLSignatureLocationType() { + return new XMLSignatureLocationType(); } /** - * Create an instance of {@link CheckResultType } + * Create an instance of {@link CMSDataObjectRequiredMetaType } * */ - public CheckResultType createCheckResultType() { - return new CheckResultType(); + public CMSDataObjectRequiredMetaType createCMSDataObjectRequiredMetaType() { + return new CMSDataObjectRequiredMetaType(); } /** - * Create an instance of {@link ContentBaseType } + * Create an instance of {@link FormResultType } * */ - public ContentBaseType createContentBaseType() { - return new ContentBaseType(); + public FormResultType createFormResultType() { + return new FormResultType(); } /** - * Create an instance of {@link PDFSignatureResultType } + * Create an instance of {@link FinalDataMetaInfoType } * */ - public PDFSignatureResultType createPDFSignatureResultType() { - return new PDFSignatureResultType(); + public FinalDataMetaInfoType createFinalDataMetaInfoType() { + return new FinalDataMetaInfoType(); } /** - * Create an instance of {@link FinalDataMetaInfoType } + * Create an instance of {@link MetaInfoType } * */ - public FinalDataMetaInfoType createFinalDataMetaInfoType() { - return new FinalDataMetaInfoType(); + public MetaInfoType createMetaInfoType() { + return new MetaInfoType(); } /** @@ -474,51 +465,51 @@ public class ObjectFactory { } /** - * Create an instance of {@link ReferencesCheckResultInfoType } + * Create an instance of {@link InputDataType } * */ - public ReferencesCheckResultInfoType createReferencesCheckResultInfoType() { - return new ReferencesCheckResultInfoType(); + public InputDataType createInputDataType() { + return new InputDataType(); } /** - * Create an instance of {@link CMSDataObjectRequiredMetaType } + * Create an instance of {@link ContentExLocRefBaseType } * */ - public CMSDataObjectRequiredMetaType createCMSDataObjectRequiredMetaType() { - return new CMSDataObjectRequiredMetaType(); + public ContentExLocRefBaseType createContentExLocRefBaseType() { + return new ContentExLocRefBaseType(); } /** - * Create an instance of {@link MetaInfoType } + * Create an instance of {@link AnyChildrenType } * */ - public MetaInfoType createMetaInfoType() { - return new MetaInfoType(); + public AnyChildrenType createAnyChildrenType() { + return new AnyChildrenType(); } /** - * Create an instance of {@link ContentExLocRefBaseType } + * Create an instance of {@link ContentOptionalRefType } * */ - public ContentExLocRefBaseType createContentExLocRefBaseType() { - return new ContentExLocRefBaseType(); + public ContentOptionalRefType createContentOptionalRefType() { + return new ContentOptionalRefType(); } /** - * Create an instance of {@link AnyChildrenType } + * Create an instance of {@link CMSContentBaseType } * */ - public AnyChildrenType createAnyChildrenType() { - return new AnyChildrenType(); + public CMSContentBaseType createCMSContentBaseType() { + return new CMSContentBaseType(); } /** - * Create an instance of {@link ManifestRefsCheckResultInfoType } + * Create an instance of {@link ReferencesCheckResultInfoType } * */ - public ManifestRefsCheckResultInfoType createManifestRefsCheckResultInfoType() { - return new ManifestRefsCheckResultInfoType(); + public ReferencesCheckResultInfoType createReferencesCheckResultInfoType() { + return new ReferencesCheckResultInfoType(); } /** @@ -530,14 +521,6 @@ public class ObjectFactory { } /** - * Create an instance of {@link VerifyTransformsDataType } - * - */ - public VerifyTransformsDataType createVerifyTransformsDataType() { - return new VerifyTransformsDataType(); - } - - /** * Create an instance of {@link ContentRequiredRefType } * */ @@ -546,11 +529,11 @@ public class ObjectFactory { } /** - * Create an instance of {@link ContentOptionalRefType } + * Create an instance of {@link ManifestRefsCheckResultType } * */ - public ContentOptionalRefType createContentOptionalRefType() { - return new ContentOptionalRefType(); + public ManifestRefsCheckResultType createManifestRefsCheckResultType() { + return new ManifestRefsCheckResultType(); } /** @@ -562,107 +545,99 @@ public class ObjectFactory { } /** - * Create an instance of {@link KeyInfoType } - * - */ - public KeyInfoType createKeyInfoType() { - return new KeyInfoType(); - } - - /** - * Create an instance of {@link SignedInfoType } + * Create an instance of {@link PGPDataType } * */ - public SignedInfoType createSignedInfoType() { - return new SignedInfoType(); + public PGPDataType createPGPDataType() { + return new PGPDataType(); } /** - * Create an instance of {@link RetrievalMethodType } + * Create an instance of {@link KeyValueType } * */ - public RetrievalMethodType createRetrievalMethodType() { - return new RetrievalMethodType(); + public KeyValueType createKeyValueType() { + return new KeyValueType(); } /** - * Create an instance of {@link DigestMethodType } + * Create an instance of {@link DSAKeyValueType } * */ - public DigestMethodType createDigestMethodType() { - return new DigestMethodType(); + public DSAKeyValueType createDSAKeyValueType() { + return new DSAKeyValueType(); } /** - * Create an instance of {@link SignatureMethodType } + * Create an instance of {@link ReferenceType } * */ - public SignatureMethodType createSignatureMethodType() { - return new SignatureMethodType(); + public ReferenceType createReferenceType() { + return new ReferenceType(); } /** - * Create an instance of {@link SPKIDataType } + * Create an instance of {@link RetrievalMethodType } * */ - public SPKIDataType createSPKIDataType() { - return new SPKIDataType(); + public RetrievalMethodType createRetrievalMethodType() { + return new RetrievalMethodType(); } /** - * Create an instance of {@link X509DataType } + * Create an instance of {@link TransformsType } * */ - public X509DataType createX509DataType() { - return new X509DataType(); + public TransformsType createTransformsType() { + return new TransformsType(); } /** - * 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 +649,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 +705,14 @@ public class ObjectFactory { } /** + * Create an instance of {@link TransformType } + * + */ + public TransformType createTransformType() { + return new TransformType(); + } + + /** * Create an instance of {@link X509IssuerSerialType } * */ @@ -754,14 +737,6 @@ public class ObjectFactory { } /** - * Create an instance of {@link TransformParameterType.Hash } - * - */ - public TransformParameterType.Hash createTransformParameterTypeHash() { - return new TransformParameterType.Hash(); - } - - /** * Create an instance of {@link CreateXMLSignatureRequestType.SingleSignatureInfo.DataObjectInfo } * */ @@ -778,75 +753,74 @@ public class ObjectFactory { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * Create an instance of {@link TransformParameterType.Hash } * */ - @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); + public TransformParameterType.Hash createTransformParameterTypeHash() { + return new TransformParameterType.Hash(); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link SignatureType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link XMLDataObjectAssociationType }{@code >}} * */ - @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); + @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); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}} * */ - @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); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKIData") + public JAXBElement<SPKIDataType> createSPKIData(SPKIDataType value) { + return new JAXBElement<SPKIDataType>(_SPKIData_QNAME, SPKIDataType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link CreateXMLSignatureResponseType }{@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/20151109#", 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 SPKIDataType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKIData") - public JAXBElement<SPKIDataType> createSPKIData(SPKIDataType value) { - return new JAXBElement<SPKIDataType>(_SPKIData_QNAME, SPKIDataType.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 ErrorResponseType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link SignatureValueType }{@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 = "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 SignedInfoType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link ErrorResponseType }{@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/20151109#", 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 RetrievalMethodType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link KeyValueType }{@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 = "KeyValue") + public JAXBElement<KeyValueType> createKeyValue(KeyValueType value) { + return new JAXBElement<KeyValueType>(_KeyValue_QNAME, KeyValueType.class, null, value); } /** @@ -859,48 +833,48 @@ public class ObjectFactory { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link CanonicalizationMethodType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link TransformsType }{@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://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 ObjectType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link DigestMethodType }{@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 = "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 VerifyPDFSignatureResponseType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link XMLDataObjectAssociationType }{@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://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); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link MoaTransformsType }{@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/20151109#", name = "MoaTransforms") + public JAXBElement<MoaTransformsType> createMoaTransforms(MoaTransformsType value) { + return new JAXBElement<MoaTransformsType>(_MoaTransforms_QNAME, MoaTransformsType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link XMLDataObjectAssociationType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link X509DataType }{@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 = "X509Data") + public JAXBElement<X509DataType> createX509Data(X509DataType value) { + return new JAXBElement<X509DataType>(_X509Data_QNAME, X509DataType.class, null, value); } /** @@ -913,175 +887,174 @@ public class ObjectFactory { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link TransformsType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link CreateCMSSignatureResponseType }{@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://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); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link SignatureValueType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@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://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); } /** - * 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 >}} * */ - @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://www.w3.org/2000/09/xmldsig#", name = "MgmtData") + public JAXBElement<String> createMgmtData(String value) { + return new JAXBElement<String>(_MgmtData_QNAME, String.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link CreateXMLSignatureResponseType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link SignatureMethodType }{@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 = "SignatureMethod") + public JAXBElement<SignatureMethodType> createSignatureMethod(SignatureMethodType value) { + return new JAXBElement<SignatureMethodType>(_SignatureMethod_QNAME, SignatureMethodType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link SignatureMethodType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link ObjectType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureMethod") - public JAXBElement<SignatureMethodType> createSignatureMethod(SignatureMethodType value) { - return new JAXBElement<SignatureMethodType>(_SignatureMethod_QNAME, SignatureMethodType.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 KeyInfoType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link VerifyCMSSignatureResponseType }{@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://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); } /** - * 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 BigInteger }{@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/20151109#", name = "ReferringSigReference") + public JAXBElement<BigInteger> createReferringSigReference(BigInteger value) { + return new JAXBElement<BigInteger>(_ReferringSigReference_QNAME, BigInteger.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 VerifyPDFSignatureResponseType }{@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/20151109#", 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 byte[]}{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link MoaTransformType }{@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://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); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link PGPDataType }{@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 = "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 SignaturePropertiesType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link ReferenceType }{@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 = "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 String }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@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 = "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 KeyValueType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@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 = "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 ReferenceType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@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://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)); } /** @@ -1094,102 +1067,94 @@ public class ObjectFactory { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link CreatePDFSignatureResponseType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link CanonicalizationMethodType }{@code >}} * */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "CreatePDFSignatureResponse") - public JAXBElement<CreatePDFSignatureResponseType> createCreatePDFSignatureResponse(CreatePDFSignatureResponseType value) { - return new JAXBElement<CreatePDFSignatureResponseType>(_CreatePDFSignatureResponse_QNAME, CreatePDFSignatureResponseType.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 SignedInfoType }{@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://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 BigInteger }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@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://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); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link ManifestType }{@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://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 MoaTransformsType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@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://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); } /** * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKISexp", scope = SPKIDataType.class) - public JAXBElement<byte[]> createSPKIDataTypeSPKISexp(byte[] value) { - return new JAXBElement<byte[]>(_SPKIDataTypeSPKISexp_QNAME, byte[].class, SPKIDataType.class, ((byte[]) value)); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "HMACOutputLength", scope = SignatureMethodType.class) - public JAXBElement<BigInteger> createSignatureMethodTypeHMACOutputLength(BigInteger value) { - return new JAXBElement<BigInteger>(_SignatureMethodTypeHMACOutputLength_QNAME, BigInteger.class, SignatureMethodType.class, value); + @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)); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link CheckResultType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} * */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "SignatureCheck", scope = VerifyCMSSignatureResponseType.class) - public JAXBElement<CheckResultType> createVerifyCMSSignatureResponseTypeSignatureCheck(CheckResultType value) { - return new JAXBElement<CheckResultType>(_VerifyCMSSignatureResponseTypeSignatureCheck_QNAME, CheckResultType.class, VerifyCMSSignatureResponseType.class, value); + @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 CheckResultType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} * */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "CertificateCheck", scope = VerifyCMSSignatureResponseType.class) - public JAXBElement<CheckResultType> createVerifyCMSSignatureResponseTypeCertificateCheck(CheckResultType value) { - return new JAXBElement<CheckResultType>(_VerifyCMSSignatureResponseTypeCertificateCheck_QNAME, CheckResultType.class, VerifyCMSSignatureResponseType.class, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyID", scope = PGPDataType.class) + public JAXBElement<byte[]> createPGPDataTypePGPKeyID(byte[] value) { + return new JAXBElement<byte[]>(_PGPDataTypePGPKeyID_QNAME, byte[].class, PGPDataType.class, ((byte[]) value)); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} * */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "SignerInfo", scope = VerifyCMSSignatureResponseType.class) - public JAXBElement<KeyInfoType> createVerifyCMSSignatureResponseTypeSignerInfo(KeyInfoType value) { - return new JAXBElement<KeyInfoType>(_VerifyCMSSignatureResponseTypeSignerInfo_QNAME, KeyInfoType.class, VerifyCMSSignatureResponseType.class, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyPacket", scope = PGPDataType.class) + public JAXBElement<byte[]> createPGPDataTypePGPKeyPacket(byte[] value) { + return new JAXBElement<byte[]>(_PGPDataTypePGPKeyPacket_QNAME, byte[].class, PGPDataType.class, ((byte[]) value)); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link FormResultType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@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); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKISexp", scope = SPKIDataType.class) + public JAXBElement<byte[]> createSPKIDataTypeSPKISexp(byte[] value) { + return new JAXBElement<byte[]>(_SPKIDataTypeSPKISexp_QNAME, byte[].class, SPKIDataType.class, ((byte[]) value)); } /** @@ -1205,9 +1170,18 @@ 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 String }{@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); } /** @@ -1220,57 +1194,57 @@ public class ObjectFactory { } /** - * 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 = "X509Certificate", scope = X509DataType.class) + public JAXBElement<byte[]> createX509DataTypeX509Certificate(byte[] value) { + return new JAXBElement<byte[]>(_X509DataTypeX509Certificate_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 BigInteger }{@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 = "HMACOutputLength", scope = SignatureMethodType.class) + public JAXBElement<BigInteger> createSignatureMethodTypeHMACOutputLength(BigInteger value) { + return new JAXBElement<BigInteger>(_SignatureMethodTypeHMACOutputLength_QNAME, BigInteger.class, SignatureMethodType.class, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link CheckResultType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyID", scope = PGPDataType.class) - public JAXBElement<byte[]> createPGPDataTypePGPKeyID(byte[] value) { - return new JAXBElement<byte[]>(_PGPDataTypePGPKeyID_QNAME, byte[].class, PGPDataType.class, ((byte[]) value)); + @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "CertificateCheck", scope = VerifyCMSSignatureResponseType.class) + public JAXBElement<CheckResultType> createVerifyCMSSignatureResponseTypeCertificateCheck(CheckResultType value) { + return new JAXBElement<CheckResultType>(_VerifyCMSSignatureResponseTypeCertificateCheck_QNAME, CheckResultType.class, VerifyCMSSignatureResponseType.class, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyPacket", scope = PGPDataType.class) - public JAXBElement<byte[]> createPGPDataTypePGPKeyPacket(byte[] value) { - return new JAXBElement<byte[]>(_PGPDataTypePGPKeyPacket_QNAME, byte[].class, PGPDataType.class, ((byte[]) value)); + @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", 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 byte[]}{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link CheckResultType }{@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/20151109#", name = "SignatureCheck", scope = VerifyCMSSignatureResponseType.class) + public JAXBElement<CheckResultType> createVerifyCMSSignatureResponseTypeSignatureCheck(CheckResultType value) { + return new JAXBElement<CheckResultType>(_VerifyCMSSignatureResponseTypeSignatureCheck_QNAME, CheckResultType.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/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 0fc0943..4494f4d 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // @@ -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 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 e1567bc..63ca953 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 8b18768..6af2130 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 fdade7f..f19eefa 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // @@ -88,10 +88,10 @@ public class PGPDataType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link Object } - * {@link JAXBElement }{@code <}{@link byte[]}{@code >} * {@link Element } * {@link JAXBElement }{@code <}{@link byte[]}{@code >} + * {@link Object } + * {@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 76049e6..76721ae 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 9577f98..15404b4 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 3a7ba44..9525231 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 cf5ff98..611f2c9 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 f6700ce..0260328 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 85c12ea..429cd60 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 1ec3d68..a3e6cd3 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 8e8e914..b5e36f3 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // @@ -67,9 +67,9 @@ public class SPKIDataType { * * <p> * Objects of the following type(s) are allowed in the list + * {@link Element } * {@link Object } * {@link JAXBElement }{@code <}{@link byte[]}{@code >} - * {@link Element } * * */ 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 e4f8397..e4b5ca5 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 8a425ed..2829062 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // @@ -75,8 +75,8 @@ public class SignatureMethodType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link BigInteger }{@code >} * {@link Object } + * {@link JAXBElement }{@code <}{@link BigInteger }{@code >} * {@link String } * * 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 c106440..c4017ef 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 8d58626..6cdb654 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // @@ -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 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 b0da91b..a928b80 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 efb6359..9f8dc29 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 b91610b..7ebb177 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 3cbc23b..55c2322 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 e320b31..9e62836 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // @@ -76,8 +76,8 @@ public class TransformType { * <p> * Objects of the following type(s) are allowed in the list * {@link Element } - * {@link JAXBElement }{@code <}{@link String }{@code >} * {@link Object } + * {@link JAXBElement }{@code <}{@link String }{@code >} * {@link String } * * 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 102a762..8e8b1df 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 5ad37b8..24c1631 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 fb97464..7b67ffb 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 b970ca6..c9aca2f 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // @@ -30,6 +30,7 @@ import javax.xml.datatype.XMLGregorianCalendar; * <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="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="TrustProfileID" type="{http://www.w3.org/2001/XMLSchema}token"/> @@ -44,6 +45,7 @@ import javax.xml.datatype.XMLGregorianCalendar; @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "VerifyCMSSignatureRequestType", propOrder = { "dateTime", + "extendedValidation", "cmsSignature", "dataObject", "trustProfileID" @@ -56,6 +58,8 @@ public class VerifyCMSSignatureRequestType { @XmlElement(name = "DateTime") @XmlSchemaType(name = "dateTime") protected XMLGregorianCalendar dateTime; + @XmlElement(name = "ExtendedValidation", defaultValue = "false") + protected Boolean extendedValidation; @XmlElement(name = "CMSSignature", required = true) protected byte[] cmsSignature; @XmlElement(name = "DataObject") @@ -90,6 +94,30 @@ public class VerifyCMSSignatureRequestType { } /** + * 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 cmsSignature property. * * @return 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 ece5c9d..e92bd48 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // @@ -47,10 +47,10 @@ import javax.xml.bind.annotation.XmlType; public class VerifyCMSSignatureResponseType { @XmlElementRefs({ - @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/20151109#", type = JAXBElement.class), @XmlElementRef(name = "FormCheckResult", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class), - @XmlElementRef(name = "SignerInfo", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class) + @XmlElementRef(name = "SignerInfo", 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/20151109#", type = JAXBElement.class) }) protected List<JAXBElement<?>> signerInfoAndSignatureCheckAndCertificateCheck; 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 045e36f..1a3d824 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,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.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 6487059..3414e94 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // @@ -30,6 +30,7 @@ import javax.xml.datatype.XMLGregorianCalendar; * <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="PDFSignature" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/> * <element name="TrustProfileID" type="{http://www.w3.org/2001/XMLSchema}token"/> * </sequence> @@ -43,6 +44,7 @@ import javax.xml.datatype.XMLGregorianCalendar; @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "VerifyPDFSignatureRequestType", propOrder = { "dateTime", + "extendedValidation", "pdfSignature", "trustProfileID" }) @@ -54,6 +56,8 @@ public class VerifyPDFSignatureRequestType { @XmlElement(name = "DateTime") @XmlSchemaType(name = "dateTime") protected XMLGregorianCalendar dateTime; + @XmlElement(name = "ExtendedValidation", defaultValue = "false") + protected Boolean extendedValidation; @XmlElement(name = "PDFSignature", required = true) protected byte[] pdfSignature; @XmlElement(name = "TrustProfileID", required = true) @@ -86,6 +90,30 @@ public class VerifyPDFSignatureRequestType { } /** + * 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 pdfSignature property. * * @return 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 bf344ce..9d2f7ed 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 35a5366..743e609 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 b015978..827b1d9 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureRequest.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureRequest.java index 3187efd..6041b0f 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureRequest.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureRequest.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.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 4e4d28d..8b02f1d 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // @@ -34,13 +34,14 @@ import javax.xml.datatype.XMLGregorianCalendar; * <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="VerifySignatureInfo"> * <complexType> * <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://www.w3.org/2001/XMLSchema}token"/> + * <element name="VerifySignatureLocation" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}XMLSignatureLocationType"/> * </sequence> * </restriction> * </complexContent> @@ -75,6 +76,7 @@ import javax.xml.datatype.XMLGregorianCalendar; @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "VerifyXMLSignatureRequestType", propOrder = { "dateTime", + "extendedValidation", "verifySignatureInfo", "supplementProfileOrSupplementProfileID", "signatureManifestCheckParams", @@ -89,6 +91,8 @@ public class VerifyXMLSignatureRequestType { @XmlElement(name = "DateTime") @XmlSchemaType(name = "dateTime") protected XMLGregorianCalendar dateTime; + @XmlElement(name = "ExtendedValidation", defaultValue = "false") + protected Boolean extendedValidation; @XmlElement(name = "VerifySignatureInfo", required = true) protected VerifyXMLSignatureRequestType.VerifySignatureInfo verifySignatureInfo; @XmlElements({ @@ -130,6 +134,30 @@ public class VerifyXMLSignatureRequestType { } /** + * 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 verifySignatureInfo property. * * @return @@ -358,7 +386,7 @@ public class VerifyXMLSignatureRequestType { * <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://www.w3.org/2001/XMLSchema}token"/> + * <element name="VerifySignatureLocation" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}XMLSignatureLocationType"/> * </sequence> * </restriction> * </complexContent> @@ -377,9 +405,7 @@ public class VerifyXMLSignatureRequestType { @XmlElement(name = "VerifySignatureEnvironment", required = true) protected ContentOptionalRefType verifySignatureEnvironment; @XmlElement(name = "VerifySignatureLocation", required = true) - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlSchemaType(name = "token") - protected String verifySignatureLocation; + protected XMLSignatureLocationType verifySignatureLocation; /** * Gets the value of the verifySignatureEnvironment property. @@ -410,10 +436,10 @@ public class VerifyXMLSignatureRequestType { * * @return * possible object is - * {@link String } + * {@link XMLSignatureLocationType } * */ - public String getVerifySignatureLocation() { + public XMLSignatureLocationType getVerifySignatureLocation() { return verifySignatureLocation; } @@ -422,10 +448,10 @@ public class VerifyXMLSignatureRequestType { * * @param value * allowed object is - * {@link String } + * {@link XMLSignatureLocationType } * */ - public void setVerifySignatureLocation(String value) { + public void setVerifySignatureLocation(XMLSignatureLocationType 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 69cac83..b1fb162 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 a7a7b97..fac1ade 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // @@ -54,9 +54,9 @@ public class X509DataType { @XmlElementRefs({ @XmlElementRef(name = "X509CRL", 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 = "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 = "X509SubjectName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) }) @XmlAnyElement(lax = true) @@ -80,12 +80,12 @@ public class X509DataType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link Element } - * {@link Object } * {@link JAXBElement }{@code <}{@link byte[]}{@code >} * {@link JAXBElement }{@code <}{@link byte[]}{@code >} - * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >} + * {@link Element } * {@link JAXBElement }{@code <}{@link byte[]}{@code >} + * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >} + * {@link Object } * {@link JAXBElement }{@code <}{@link String }{@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 4e066e5..6c4941c 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // 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 b9b0958..81aaf02 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: 2015.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/XMLSignatureLocation.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/XMLSignatureLocation.java new file mode 100644 index 0000000..a82bd26 --- /dev/null +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/XMLSignatureLocation.java @@ -0,0 +1,102 @@ +// +// 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:10:59 AM CET +// + + +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.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + * <p>Java class for XMLSignatureLocation complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="XMLSignatureLocation"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="NamespaceDeclaration" type="{http://www.w3.org/2001/XMLSchema}anyType"/> + * <element name="XPathExpression" type="{http://www.w3.org/2001/XMLSchema}token"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "XMLSignatureLocation", propOrder = { + "namespaceDeclaration", + "xPathExpression" +}) +public class XMLSignatureLocation { + + @XmlElement(name = "NamespaceDeclaration", required = true) + protected Object namespaceDeclaration; + @XmlElement(name = "XPathExpression", required = true) + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlSchemaType(name = "token") + protected String xPathExpression; + + /** + * Gets the value of the namespaceDeclaration property. + * + * @return + * possible object is + * {@link Object } + * + */ + public Object getNamespaceDeclaration() { + return namespaceDeclaration; + } + + /** + * Sets the value of the namespaceDeclaration property. + * + * @param value + * allowed object is + * {@link Object } + * + */ + public void setNamespaceDeclaration(Object value) { + this.namespaceDeclaration = value; + } + + /** + * Gets the value of the xPathExpression property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getXPathExpression() { + return xPathExpression; + } + + /** + * Sets the value of the xPathExpression property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setXPathExpression(String value) { + this.xPathExpression = value; + } + +} diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/XMLSignatureLocationType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/XMLSignatureLocationType.java new file mode 100644 index 0000000..9293c1d --- /dev/null +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/XMLSignatureLocationType.java @@ -0,0 +1,109 @@ +// +// 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.03.14 at 12:02:35 PM CET +// + + +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.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + * <p>Java class for XMLSignatureLocationType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="XMLSignatureLocationType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="NamespaceDeclaration" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}NamespaceDeclarationType" maxOccurs="unbounded" minOccurs="0"/> + * <element name="XPathExpression" type="{http://www.w3.org/2001/XMLSchema}token"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "XMLSignatureLocationType", propOrder = { + "namespaceDeclaration", + "xPathExpression" +}) +public class XMLSignatureLocationType { + + @XmlElement(name = "NamespaceDeclaration") + protected List<NamespaceDeclarationType> namespaceDeclaration; + @XmlElement(name = "XPathExpression", required = true) + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlSchemaType(name = "token") + protected String xPathExpression; + + /** + * Gets the value of the namespaceDeclaration 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 namespaceDeclaration property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getNamespaceDeclaration().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link NamespaceDeclarationType } + * + * + */ + public List<NamespaceDeclarationType> getNamespaceDeclaration() { + if (namespaceDeclaration == null) { + namespaceDeclaration = new ArrayList<NamespaceDeclarationType>(); + } + return this.namespaceDeclaration; + } + + /** + * Gets the value of the xPathExpression property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getXPathExpression() { + return xPathExpression; + } + + /** + * Sets the value of the xPathExpression property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setXPathExpression(String value) { + this.xPathExpression = value; + } + +} 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 0344afc..08d774d 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,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.11.30 at 11:32:30 AM CET +// Generated on: 2016.03.14 at 12:02:35 PM CET // @javax.xml.bind.annotation.XmlSchema(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/initializer/PDFASInitializer.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/initializer/PDFASInitializer.java index aaa41c1..fb84293 100644 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/initializer/PDFASInitializer.java +++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/initializer/PDFASInitializer.java @@ -13,14 +13,16 @@ public class PDFASInitializer implements ExternalInitializer { @Override public void initialize(ConfigurationProvider configurationProvider) { - String pdfAsConfiguration = configurationProvider.getPDFASConfiguration(); + logger.warn("Log4j Config: {}", System.getProperty("log4j.configuration")); + + /*String pdfAsConfiguration = configurationProvider.getPDFASConfiguration(); logger.info("Running PDFASInitializer with pdf as cfg: {}", pdfAsConfiguration); if(pdfAsConfiguration != null) { PDFASInvoker .init(pdfAsConfiguration); - } + }*/ } } diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/invoke/PDFASInvoker.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/invoke/PDFASInvoker.java index 7f638fa..1f7522b 100644 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/invoke/PDFASInvoker.java +++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/invoke/PDFASInvoker.java @@ -7,17 +7,6 @@ import java.util.List; import org.apache.commons.io.IOUtils; -import at.gv.egiz.pdfas.common.exceptions.PDFASError; -import at.gv.egiz.pdfas.lib.api.ByteArrayDataSource; -import at.gv.egiz.pdfas.lib.api.Configuration; -import at.gv.egiz.pdfas.lib.api.PdfAs; -import at.gv.egiz.pdfas.lib.api.PdfAsFactory; -import at.gv.egiz.pdfas.lib.api.sign.IPlainSigner; -import at.gv.egiz.pdfas.lib.api.sign.SignParameter; -import at.gv.egiz.pdfas.lib.api.verify.VerifyParameter; -import at.gv.egiz.pdfas.lib.api.verify.VerifyResult; -import at.gv.egiz.pdfas.sigs.pades.PAdESSigner; -import at.gv.egovernment.moa.logging.Logger; import at.gv.egovernment.moa.spss.MOAApplicationException; import at.gv.egovernment.moa.spss.MOAException; import at.gv.egovernment.moa.spss.server.logging.TransactionId; @@ -29,9 +18,10 @@ import at.gv.egovernment.moa.spss.server.xmlbind.PDFSignatureInfo; import at.gv.egovernment.moa.spss.server.xmlbind.SignedPDFInfo; import at.gv.egovernment.moa.spss.server.xmlbind.VerifyPDFRequest; import at.gv.egovernment.moa.spss.server.xmlbind.VerifyPDFResponse; +import at.gv.egovernment.moaspss.logging.Logger; public class PDFASInvoker { - + /* private static PDFASInvoker instance = null; private PdfAs pdfAS; @@ -124,5 +114,5 @@ public class PDFASInvoker { } return createPDFRespone; - } + }*/ } diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/pdfas/ExtendedVerifyResult.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/pdfas/ExtendedVerifyResult.java index 30bf148..705e124 100644 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/pdfas/ExtendedVerifyResult.java +++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/pdfas/ExtendedVerifyResult.java @@ -1,9 +1,9 @@ package at.gv.egovernment.moa.spss.server.pdfas; - +/* import at.gv.egiz.pdfas.lib.api.verify.VerifyResult; import at.gv.egiz.pdfas.lib.impl.verify.VerifyResultImpl; - -public class ExtendedVerifyResult extends VerifyResultImpl implements VerifyResult { +*/ +public class ExtendedVerifyResult { /*extends VerifyResultImpl implements VerifyResult { private String qcSource; private boolean publicAuthority; private String publicAuthorityID; @@ -57,5 +57,5 @@ public class ExtendedVerifyResult extends VerifyResultImpl implements VerifyResu public synchronized void setSscdSource(String sscdSource) { this.sscdSource = sscdSource; - } + }*/ } diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/pdfas/InternalMoaConnector.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/pdfas/InternalMoaConnector.java index f12a2d1..0344346 100644 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/pdfas/InternalMoaConnector.java +++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/pdfas/InternalMoaConnector.java @@ -13,13 +13,6 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import at.gv.egiz.pdfas.common.exceptions.PDFASError; -import at.gv.egiz.pdfas.common.exceptions.PdfAsErrorCarrier; -import at.gv.egiz.pdfas.common.exceptions.PdfAsException; -import at.gv.egiz.pdfas.lib.api.sign.SignParameter; -import at.gv.egiz.pdfas.lib.impl.status.RequestedSignature; -import at.gv.egiz.sl.util.ISignatureConnector; -import at.gv.egovernment.moa.logging.Logger; import at.gv.egovernment.moa.spss.MOAException; import at.gv.egovernment.moa.spss.api.cmssign.CMSSignatureResponse; import at.gv.egovernment.moa.spss.api.cmssign.CreateCMSSignatureResponse; @@ -35,7 +28,8 @@ import at.gv.egovernment.moa.spss.server.config.ConfigurationException; import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider; import at.gv.egovernment.moa.spss.server.config.KeyGroupEntry; import at.gv.egovernment.moa.spss.server.invoke.CMSSignatureCreationInvoker; -import at.gv.egovernment.moa.util.Base64Utils; +import at.gv.egovernment.moaspss.logging.Logger; +import at.gv.egovernment.moaspss.util.Base64Utils; import iaik.logging.TransactionId; import iaik.server.modules.keys.KeyEntryID; import iaik.server.modules.keys.KeyModule; @@ -43,7 +37,7 @@ import iaik.server.modules.keys.KeyModuleFactory; import iaik.server.modules.keys.UnknownKeyException; import iaik.x509.X509Certificate; -public class InternalMoaConnector implements ISignatureConnector { +public class InternalMoaConnector { /*implements ISignatureConnector { private String keyIdentifier; private X509Certificate clientCert; @@ -229,5 +223,5 @@ public class InternalMoaConnector implements ISignatureConnector { return null; } - + */ } diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/pdfas/InternalMoaVerifier.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/pdfas/InternalMoaVerifier.java index e59fe50..8d5a27e 100644 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/pdfas/InternalMoaVerifier.java +++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/pdfas/InternalMoaVerifier.java @@ -11,13 +11,14 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import at.gv.egiz.pdfas.common.exceptions.PdfAsException; +/*import at.gv.egiz.pdfas.common.exceptions.PdfAsException; import at.gv.egiz.pdfas.lib.api.Configuration; import at.gv.egiz.pdfas.lib.api.verify.SignatureCheck; import at.gv.egiz.pdfas.lib.api.verify.VerifyParameter.SignatureVerificationLevel; import at.gv.egiz.pdfas.lib.api.verify.VerifyResult; import at.gv.egiz.pdfas.lib.impl.verify.IVerifier; import at.gv.egiz.pdfas.lib.impl.verify.SignatureCheckImpl; +*/ import at.gv.egovernment.moa.spss.MOAException; import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest; import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse; @@ -30,7 +31,7 @@ import at.gv.egovernment.moa.spss.api.impl.VerifyCMSSignatureRequestImpl; import at.gv.egovernment.moa.spss.server.invoke.CMSSignatureVerificationInvoker; import iaik.x509.X509Certificate; -public class InternalMoaVerifier implements IVerifier { +public class InternalMoaVerifier { /*implements IVerifier { public static final String MOA_TRUSTPROFILE = "internal.moa.trustprofile"; @@ -124,5 +125,5 @@ public class InternalMoaVerifier implements IVerifier { public SignatureVerificationLevel getLevel() { return SignatureVerificationLevel.FULL_VERIFICATION; } - + */ } diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/AxisHandler.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/AxisHandler.java index a18ee9f..9fa99b1 100644 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/AxisHandler.java +++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/AxisHandler.java @@ -33,7 +33,9 @@ import java.util.Iterator; import javax.servlet.http.HttpServletRequest; +import org.apache.axis.AxisEngine; import org.apache.axis.AxisFault; +import org.apache.axis.AxisProperties; import org.apache.axis.Message; import org.apache.axis.MessageContext; import org.apache.axis.attachments.AttachmentPart; @@ -45,17 +47,17 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import at.gv.egovernment.moa.logging.LogMsg; -import at.gv.egovernment.moa.logging.Logger; -import at.gv.egovernment.moa.logging.LoggingContext; -import at.gv.egovernment.moa.logging.LoggingContextManager; import at.gv.egovernment.moa.spss.MOASystemException; import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider; import at.gv.egovernment.moa.spss.server.transaction.TransactionContext; import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager; import at.gv.egovernment.moa.spss.server.transaction.TransactionIDGenerator; import at.gv.egovernment.moa.spss.util.MessageProvider; -import at.gv.egovernment.moa.util.DOMUtils; +import at.gv.egovernment.moaspss.logging.LogMsg; +import at.gv.egovernment.moaspss.logging.Logger; +import at.gv.egovernment.moaspss.logging.LoggingContext; +import at.gv.egovernment.moaspss.logging.LoggingContextManager; +import at.gv.egovernment.moaspss.util.DOMUtils; /** * An handler that is invoked on each web service request and performs some @@ -141,9 +143,9 @@ public class AxisHandler extends BasicHandler { // Boolean.FALSE); // msgContext.setProperty(org.apache.axis. // AxisEngine.PROP_ENABLE_NAMESPACE_PREFIX_OPTIMIZATION,"false"); - + //AxisProperties.setProperty(AxisEngine.PROP_ATTACHMENT_IMPLEMENTATION, AxisEngine.DEFAULT_ATTACHMENT_IMPL); Message soapMessage = msgContext.getCurrentMessage(); - + ConfigurationProvider configuration = ConfigurationProvider.getInstance(); Element xmlRequest = null; diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/CertificateProviderServlet.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/CertificateProviderServlet.java index 5fe96ef..43804a2 100644 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/CertificateProviderServlet.java +++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/CertificateProviderServlet.java @@ -20,12 +20,12 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import at.gv.egovernment.moa.logging.Logger; import at.gv.egovernment.moa.spss.server.config.ConfigurationException; import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider; import at.gv.egovernment.moa.spss.server.config.KeyGroupEntry; import at.gv.egovernment.moa.spss.server.logging.TransactionId; import at.gv.egovernment.moa.spss.server.transaction.TransactionIDGenerator; +import at.gv.egovernment.moaspss.logging.Logger; /** * diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ConfigurationServlet.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ConfigurationServlet.java index bfefaec..6164154 100644 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ConfigurationServlet.java +++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ConfigurationServlet.java @@ -35,15 +35,14 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import at.gv.egovernment.moa.logging.LogMsg; -import at.gv.egovernment.moa.logging.Logger; -import at.gv.egovernment.moa.logging.LoggingContext; -import at.gv.egovernment.moa.logging.LoggingContextManager; - import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider; import at.gv.egovernment.moa.spss.server.iaik.config.IaikConfigurator; import at.gv.egovernment.moa.spss.server.init.*; import at.gv.egovernment.moa.spss.util.MessageProvider; +import at.gv.egovernment.moaspss.logging.LogMsg; +import at.gv.egovernment.moaspss.logging.Logger; +import at.gv.egovernment.moaspss.logging.LoggingContext; +import at.gv.egovernment.moaspss.logging.LoggingContextManager; /** * A servlet to initialize and update the MOA configuration. diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ServiceUtils.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ServiceUtils.java index d986f7a..03eb3d3 100644 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ServiceUtils.java +++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ServiceUtils.java @@ -31,9 +31,9 @@ import org.w3c.dom.Element; import at.gv.egovernment.moa.spss.MOAApplicationException; import at.gv.egovernment.moa.spss.util.MOASPSSEntityResolver; -import at.gv.egovernment.moa.util.Constants; -import at.gv.egovernment.moa.util.DOMUtils; -import at.gv.egovernment.moa.util.MOAErrorHandler; +import at.gv.egovernment.moaspss.util.Constants; +import at.gv.egovernment.moaspss.util.DOMUtils; +import at.gv.egovernment.moaspss.util.MOAErrorHandler; /** * Helper methods for the Service classes. diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureCreationService.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureCreationService.java index 0c800a2..4effec6 100644 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureCreationService.java +++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureCreationService.java @@ -32,7 +32,6 @@ import org.apache.axis.AxisFault; import org.apache.axis.i18n.Messages; import org.w3c.dom.Element; -import at.gv.egovernment.moa.logging.Logger; import at.gv.egovernment.moa.spss.MOAException; import at.gv.egovernment.moa.spss.MOASystemException; import at.gv.egovernment.moa.spss.api.cmssign.CreateCMSSignatureRequest; @@ -52,8 +51,9 @@ 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.CreatePDFSignatureRequestParser; import at.gv.egovernment.moa.spss.server.xmlbind.CreatePDFSignatureResponseBuilder; -import at.gv.egovernment.moa.util.Constants; -import at.gv.egovernment.moa.util.StreamUtils; +import at.gv.egovernment.moaspss.logging.Logger; +import at.gv.egovernment.moaspss.util.Constants; +import at.gv.egovernment.moaspss.util.StreamUtils; /** * The service endpoint for the <code>SignatureCreation</code> web service. @@ -100,7 +100,7 @@ public class SignatureCreationService { new CreatePDFSignatureResponseBuilder(); Element reparsedReq; CreatePDFRequest requestObj; - CreatePDFRespone responseObj; + CreatePDFRespone responseObj = null; //since Axis (1.1 ff) has problem with namespaces we take the raw request stored by the Axishandler. TransactionContext context = TransactionContextManager.getInstance().getTransactionContext(); @@ -115,7 +115,7 @@ public class SignatureCreationService { Logger.trace(">>> creating Signature"); // invoke the core logic - responseObj = PDFASInvoker.getInstance().createPDFSignature(requestObj, context.getTransactionID()); + //responseObj = PDFASInvoker.getInstance().createPDFSignature(requestObj, context.getTransactionID()); Logger.trace("<<< created Signature"); Logger.trace(">>> building Response"); 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 f676ed4..8278399 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 @@ -27,28 +27,23 @@ package at.gv.egovernment.moa.spss.server.service; import org.apache.axis.AxisFault; import org.w3c.dom.Element; -import at.gv.egovernment.moa.logging.Logger; import at.gv.egovernment.moa.spss.MOAException; import at.gv.egovernment.moa.spss.MOASystemException; 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.xmlbind.VerifyCMSSignatureRequestParser; import at.gv.egovernment.moa.spss.api.xmlbind.VerifyCMSSignatureResponseBuilder; +import at.gv.egovernment.moa.spss.api.xmlbind.VerifyPDFSignatureResponseBuilder; import at.gv.egovernment.moa.spss.api.xmlbind.VerifyXMLSignatureRequestParser; import at.gv.egovernment.moa.spss.api.xmlbind.VerifyXMLSignatureResponseBuilder; 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.config.ConfigurationProvider; import at.gv.egovernment.moa.spss.server.invoke.CMSSignatureVerificationInvoker; -import at.gv.egovernment.moa.spss.server.invoke.PDFASInvoker; import at.gv.egovernment.moa.spss.server.invoke.XMLSignatureVerificationInvoker; import at.gv.egovernment.moa.spss.server.transaction.TransactionContext; import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager; -import at.gv.egovernment.moa.spss.server.xmlbind.VerifyPDFRequest; -import at.gv.egovernment.moa.spss.server.xmlbind.VerifyPDFRequestParser; -import at.gv.egovernment.moa.spss.server.xmlbind.VerifyPDFResponse; -import at.gv.egovernment.moa.spss.server.xmlbind.VerifyPDFResponseBuilder; -import at.gv.egovernment.moa.util.StreamUtils; +import at.gv.egovernment.moaspss.logging.Logger; +import at.gv.egovernment.moaspss.util.StreamUtils; /** * The service endpoint for the <code>SignatureVerification</code> web service. @@ -69,20 +64,28 @@ public class SignatureVerificationService { */ public Element[] VerifyPDFSignatureRequest(Element[] request) throws AxisFault { - PDFASInvoker invoker = - PDFASInvoker.getInstance(); + CMSSignatureVerificationInvoker invoker = + CMSSignatureVerificationInvoker.getInstance(); Element[] response = new Element[1]; try { - + + // create a parser and builder for binding API objects to/from XML + VerifyCMSSignatureRequestParser requestParser = + new VerifyCMSSignatureRequestParser(); + VerifyPDFSignatureResponseBuilder responseBuilder = + new VerifyPDFSignatureResponseBuilder(); + Element reparsedReq; + VerifyCMSSignatureRequest requestObj; + VerifyCMSSignatureResponse responseObj; // create a parser and builder for binding API objects to/from XML - VerifyPDFRequestParser requestParser = + /*VerifyPDFRequestParser requestParser = new VerifyPDFRequestParser(); VerifyPDFResponseBuilder responseBuilder = new VerifyPDFResponseBuilder(); Element reparsedReq; VerifyPDFRequest requestObj; - VerifyPDFResponse responseObj; + VerifyPDFResponse responseObj;*/ //since Axis (1.1 ff) has problem with namespaces we take the raw request stored by the Axishandler. TransactionContext context = TransactionContextManager.getInstance().getTransactionContext(); @@ -90,10 +93,10 @@ public class SignatureVerificationService { reparsedReq = ServiceUtils.reparseRequest(request[0]);//context.getRequest()); // convert to API objects - requestObj = requestParser.parse(reparsedReq); + requestObj = requestParser.parsePDF(reparsedReq); // invoke the core logic - responseObj = invoker.verifyPDFSignature(requestObj); + responseObj = invoker.verifyCMSSignature(requestObj); // map back to XML response[0] = responseBuilder.build(responseObj).getDocumentElement(); diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/PDFVerifySignatureBinding.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/PDFVerifySignatureBinding.java deleted file mode 100644 index 6c6a89a..0000000 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/PDFVerifySignatureBinding.java +++ /dev/null @@ -1,15 +0,0 @@ -package at.gv.egovernment.moa.spss.server.webservice; - -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.server.xmlbind.VerifyPDFRequest; -import at.gv.egovernment.moa.spss.server.xmlbind.VerifyPDFResponse; - -public interface PDFVerifySignatureBinding { - public VerifyPDFRequest buildPDFRequest( - VerifyPDFSignatureRequest createCMSSignatureRequest) throws MOAApplicationException; - - public VerifyPDFSignatureResponseType buildPDFResponse(VerifyPDFResponse response) - throws MOAApplicationException; -} diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/SignatureCreationService.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/SignatureCreationService.java index 5162f55..ccfc3fc 100644 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/SignatureCreationService.java +++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/SignatureCreationService.java @@ -17,8 +17,8 @@ public interface SignatureCreationService { @WebParam(name = "CreateCMSSignatureRequest") at.gv.egiz.moasig.CreateCMSSignatureRequest createCMSSignatureRequest) throws Exception; - @WebMethod(action = "PDFSignatureCreate", operationName = "PDFSignatureCreate") + /*@WebMethod(action = "PDFSignatureCreate", operationName = "PDFSignatureCreate") public at.gv.egiz.moasig.CreatePDFSignatureResponseType createPDFSignature( @WebParam(name = "CreatePDFSignatureRequest") at.gv.egiz.moasig.CreatePDFSignatureRequest createPDFSignatureRequest) - throws Exception; + throws Exception;*/ } 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 index 9512761..3bfe2f5 100644 --- 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 @@ -13,7 +13,7 @@ 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.moa.util.Base64Utils; +import at.gv.egovernment.moaspss.util.Base64Utils; public class CMSParserUtils { 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 index 7a49d6a..1cfa806 100644 --- 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 @@ -25,7 +25,7 @@ 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.moa.util.CollectionUtils; +import at.gv.egovernment.moaspss.util.CollectionUtils; public class CMSVerifySignatureBindingImpl implements CMSVerifySignatureBinding { @@ -209,7 +209,7 @@ public class CMSVerifySignatureBindingImpl implements CMSVerifySignatureBinding public VerifyCMSSignatureRequest buildPDFRequest(VerifyPDFSignatureRequest verifyPDFSignatureRequest) throws MOAApplicationException { Date dateTime = null; - if (verifyPDFSignatureRequest.getDateTime() == null) { + if (verifyPDFSignatureRequest.getDateTime() != null) { dateTime = verifyPDFSignatureRequest.getDateTime().toGregorianCalendar().getTime(); } 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 index dfe3ce5..b16cce7 100644 --- 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 @@ -7,7 +7,6 @@ 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.api.SPSSFactory; 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; diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/PDFVerifySignatureBindingImpl.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/PDFVerifySignatureBindingImpl.java deleted file mode 100644 index 42301ad..0000000 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/PDFVerifySignatureBindingImpl.java +++ /dev/null @@ -1,25 +0,0 @@ -package at.gv.egovernment.moa.spss.server.webservice.binding; - -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.server.webservice.PDFVerifySignatureBinding; -import at.gv.egovernment.moa.spss.server.xmlbind.VerifyPDFRequest; -import at.gv.egovernment.moa.spss.server.xmlbind.VerifyPDFResponse; - -public class PDFVerifySignatureBindingImpl implements PDFVerifySignatureBinding { - - @Override - public VerifyPDFRequest buildPDFRequest(VerifyPDFSignatureRequest createCMSSignatureRequest) - throws MOAApplicationException { - // TODO Auto-generated method stub - return null; - } - - @Override - public VerifyPDFSignatureResponseType buildPDFResponse(VerifyPDFResponse response) throws MOAApplicationException { - // TODO Auto-generated method stub - return null; - } - -} 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 index cd10260..1d05f22 100644 --- 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 @@ -56,9 +56,9 @@ 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.moa.util.Constants; -import at.gv.egovernment.moa.util.DOMUtils; -import at.gv.egovernment.moa.util.XPathUtils; +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 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 index d5d50cd..6656d51 100644 --- 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 @@ -17,7 +17,7 @@ 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.moa.util.DOMUtils; +import at.gv.egovernment.moaspss.util.DOMUtils; public class XMLCreateSignatureBindingImpl implements XMLCreateSignatureBinding { 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 index 44dc2c2..dcc92f9 100644 --- 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 @@ -11,16 +11,21 @@ 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; @@ -28,6 +33,7 @@ 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; @@ -46,7 +52,7 @@ 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.moa.util.DOMUtils; +import at.gv.egovernment.moaspss.util.DOMUtils; import iaik.utils.RFC2253NameParser; import iaik.utils.RFC2253NameParserException; @@ -264,11 +270,26 @@ public class XMLVerifySignatureBindingImpl implements XMLVerifySignatureBinding throws MOAApplicationException { Content verifySignatureEnvironment = transformerUtils .buildContent(verifySignatureInfo.getVerifySignatureEnvironment()); + + XMLSignatureLocationType xmlSignatureLocationType = verifySignatureInfo.getVerifySignatureLocation(); - String xPathExpression = 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, - new HashMap()); + namespaceMap); return factory.createVerifySignatureInfo(verifySignatureEnvironment, verifySignatureLocation); } diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/impl/ContextSetupAspect.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/impl/ContextSetupAspect.java deleted file mode 100644 index 42ffd5e..0000000 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/impl/ContextSetupAspect.java +++ /dev/null @@ -1,104 +0,0 @@ -package at.gv.egovernment.moa.spss.server.webservice.impl; - -import java.security.cert.X509Certificate; - -import javax.servlet.http.HttpServletRequest; -import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.handler.soap.SOAPMessageContext; - -import org.apache.cxf.transport.http.AbstractHTTPDestination; -import org.aspectj.lang.annotation.Aspect; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.w3c.dom.Element; - -import at.gv.egovernment.moa.logging.LoggingContext; -import at.gv.egovernment.moa.logging.LoggingContextManager; -import at.gv.egovernment.moa.spss.server.config.ConfigurationException; -import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider; -import at.gv.egovernment.moa.spss.server.transaction.TransactionContext; -import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager; -import at.gv.egovernment.moa.spss.server.transaction.TransactionIDGenerator; - -@Aspect -public class ContextSetupAspect { - - private static final Logger logger = LoggerFactory.getLogger(ContextSetupAspect.class); - - /** The property name for accessing the X509 client certificate chain. */ - private static final String X509_CERTIFICATE_PROPERTY = "javax.servlet.request.X509Certificate"; - - /** The property name for accessing the SOAP action header. */ - private static final String SOAP_ACTION_HEADER = "soapaction"; - - /** - * Set up the thread-local contexts (<code>TransactionContext</code> and - * <code>LoggingContext</code>). - * - * @param context - * The <code>TransactionContext</code> to set for the current - * request. - */ - private static void setUpContexts(TransactionContext context) { - // set the transaction context in the TransactionContextManager - TransactionContextManager tcm = TransactionContextManager.getInstance(); - tcm.setTransactionContext(context); - - // set the logging context in the LoggingContextManager - LoggingContextManager lcm = LoggingContextManager.getInstance(); - LoggingContext lc = new LoggingContext(context.getTransactionID()); - lcm.setLoggingContext(lc); - } - - /** - * Tear down the thread-local contexts. - */ - private static void tearDownContexts() { - TransactionContextManager tcm = TransactionContextManager.getInstance(); - - // delete temporary files - TransactionContext context = tcm.getTransactionContext(); - context.cleanAttachmentCache(); - - // unset the transaction context - tcm.setTransactionContext(null); - - // unset the logging context - LoggingContextManager lcm = LoggingContextManager.getInstance(); - lcm.setLoggingContext(null); - } - - public static void setupContext(MessageContext messageContext, String targetService) throws ConfigurationException { - logger.debug("Context setup"); - - HttpServletRequest request = (HttpServletRequest) messageContext - .get(AbstractHTTPDestination.HTTP_REQUEST); - - X509Certificate[] clientCert = (X509Certificate[]) request.getAttribute(X509_CERTIFICATE_PROPERTY); - - ConfigurationProvider configuration = ConfigurationProvider.getInstance(); - - Element xmlRequest = null; - if (messageContext instanceof SOAPMessageContext) { - SOAPMessageContext soapMessageContext = (SOAPMessageContext) messageContext; - xmlRequest = soapMessageContext.getMessage().getSOAPPart().getDocumentElement(); - } - - TransactionContext context = new TransactionContext(TransactionIDGenerator.nextID(), clientCert, - configuration, xmlRequest, null); - - String soapAction = (String) request.getHeader(SOAP_ACTION_HEADER); - if ("\"\"".equals(soapAction)) { - // if http soap action header is empty - soapAction = targetService; - } - context.setRequestName(soapAction); - - setUpContexts(context); - } - - public static void cleanContext() { - logger.debug("Context clean up"); - tearDownContexts(); - } -} diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/impl/SignatureCreationServiceImpl.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/impl/SignatureCreationServiceImpl.java deleted file mode 100644 index 358b9d6..0000000 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/impl/SignatureCreationServiceImpl.java +++ /dev/null @@ -1,190 +0,0 @@ -package at.gv.egovernment.moa.spss.server.webservice.impl; - -import java.util.Collections; - -import javax.annotation.Resource; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.xml.ws.WebServiceContext; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import at.gv.egiz.moasig.CreateCMSSignatureRequest; -import at.gv.egiz.moasig.CreateCMSSignatureRequestType; -import at.gv.egiz.moasig.CreateCMSSignatureResponseType; -import at.gv.egiz.moasig.CreatePDFSignatureRequest; -import at.gv.egiz.moasig.CreatePDFSignatureRequestType; -import at.gv.egiz.moasig.CreatePDFSignatureResponseType; -import at.gv.egiz.moasig.CreateXMLSignatureRequest; -import at.gv.egiz.moasig.CreateXMLSignatureResponseType; -import at.gv.egovernment.moa.spss.MOAException; -import at.gv.egovernment.moa.spss.MOASystemException; -import at.gv.egovernment.moa.spss.server.invoke.CMSSignatureCreationInvoker; -import at.gv.egovernment.moa.spss.server.invoke.PDFASInvoker; -import at.gv.egovernment.moa.spss.server.invoke.XMLSignatureCreationInvoker; -import at.gv.egovernment.moa.spss.server.service.ServiceUtils; -import at.gv.egovernment.moa.spss.server.transaction.TransactionContext; -import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager; -import at.gv.egovernment.moa.spss.server.webservice.CMSCreateSignatureBinding; -import at.gv.egovernment.moa.spss.server.webservice.PDFCreateSignatureBinding; -import at.gv.egovernment.moa.spss.server.webservice.SignatureCreationService; -import at.gv.egovernment.moa.spss.server.webservice.XMLCreateSignatureBinding; -import at.gv.egovernment.moa.spss.server.webservice.binding.CMSCreateSignatureBindingImpl; -import at.gv.egovernment.moa.spss.server.webservice.binding.PDFCreateSignatureBindingImpl; -import at.gv.egovernment.moa.spss.server.webservice.binding.XMLCreateSignatureBindingImpl; -import at.gv.egovernment.moa.spss.server.xmlbind.CreatePDFRequest; -import at.gv.egovernment.moa.spss.server.xmlbind.CreatePDFRespone; -import at.gv.egovernment.moa.util.StreamUtils; - -@WebService(endpointInterface = "at.gv.egovernment.moa.spss.server.webservice.SignatureCreationService", portName = "SignatureCreationService", serviceName = "SignatureCreationService") -public class SignatureCreationServiceImpl implements SignatureCreationService { - - private static final Logger logger = LoggerFactory.getLogger(SignatureCreationServiceImpl.class); - - @Resource - private WebServiceContext context; - - private XMLCreateSignatureBinding xmlCreateSignatureBinding; - private CMSCreateSignatureBinding cmsCreateSignatureBinding; - private PDFCreateSignatureBinding pdfCreateSignatureBinding; - - public SignatureCreationServiceImpl() { - this.xmlCreateSignatureBinding = new XMLCreateSignatureBindingImpl(); - this.cmsCreateSignatureBinding = new CMSCreateSignatureBindingImpl(); - this.pdfCreateSignatureBinding = new PDFCreateSignatureBindingImpl(); - } - - @Override - @WebResult(name = "CreateXMLSignatureResponseType", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20151109#") - public CreateXMLSignatureResponseType createXMLSignature(CreateXMLSignatureRequest createXMLSignatureRequest) - throws Exception { - logger.info("createXMLSignature start"); - try { - logger.info("WebServiceContext: {}", context); - ContextSetupAspect.setupContext(context.getMessageContext(), "createXMLSignature"); - - XMLSignatureCreationInvoker invoker = XMLSignatureCreationInvoker.getInstance(); - - at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureRequest requestObj; - at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureResponse responseObj; - - logger.trace(">>> preparsing Request"); - requestObj = this.xmlCreateSignatureBinding.buildXMLRequest(createXMLSignatureRequest); - logger.trace("<<< preparsed Request"); - - logger.trace(">>> creating Signature"); - // invoke the core logic - responseObj = invoker.createXMLSignature(requestObj, Collections.EMPTY_SET); - logger.trace("<<< created Signature"); - - logger.trace(">>> building Response"); - // map back to XML - CreateXMLSignatureResponseType response = this.xmlCreateSignatureBinding.buildXMLResponse(responseObj); - logger.trace("<<< built Response"); - - return response; - } catch (MOAException e) { - logger.debug("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:" - + System.getProperty("line.separator") + StreamUtils.getStackTraceAsString(e)); - logger.error("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:", e); - throw new Exception(e.getMessage()); - } catch (Throwable t) { - MOASystemException e = new MOASystemException("2900", null, t); - logger.debug("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:" - + System.getProperty("line.separator") + StreamUtils.getStackTraceAsString(e)); - logger.error("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:", e); - throw new Exception(e.getMessage()); - } finally { - ContextSetupAspect.cleanContext(); - } - } - - @Override - @WebResult(name = "CreateCMSSignatureResponseType", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20151109#") - public CreateCMSSignatureResponseType createCMSSignature(CreateCMSSignatureRequest createCMSSignatureRequest) - throws Exception { - logger.info("createCMSSignature start"); - try { - logger.info("WebServiceContext: {}", context); - ContextSetupAspect.setupContext(context.getMessageContext(), "createCMSSignature"); - - CMSSignatureCreationInvoker invoker = CMSSignatureCreationInvoker.getInstance(); - - at.gv.egovernment.moa.spss.api.cmssign.CreateCMSSignatureRequest requestObj; - at.gv.egovernment.moa.spss.api.cmssign.CreateCMSSignatureResponse responseObj; - - logger.trace(">>> preparsing Request"); - requestObj = this.cmsCreateSignatureBinding.buildCMSRequest(createCMSSignatureRequest); - logger.trace("<<< preparsed Request"); - - logger.trace(">>> creating Signature"); - // invoke the core logic - responseObj = invoker.createCMSSignature(requestObj, Collections.EMPTY_SET); - logger.trace("<<< created Signature"); - - logger.trace(">>> building Response"); - // map back to XML - CreateCMSSignatureResponseType response = this.cmsCreateSignatureBinding.buildCMSResponse(responseObj); - logger.trace("<<< built Response"); - - return response; - - } catch (MOAException e) { - logger.debug("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:" - + System.getProperty("line.separator") + StreamUtils.getStackTraceAsString(e)); - logger.error("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:", e); - throw new Exception(e.getMessage()); - } catch (Throwable t) { - MOASystemException e = new MOASystemException("2900", null, t); - logger.debug("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:" - + System.getProperty("line.separator") + StreamUtils.getStackTraceAsString(e)); - logger.error("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:", e); - throw new Exception(e.getMessage()); - } finally { - ContextSetupAspect.cleanContext(); - } - } - - @Override - @WebResult(name = "CreatePDFSignatureResponseType", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20151109#") - public CreatePDFSignatureResponseType createPDFSignature(CreatePDFSignatureRequest createPDFSignatureRequest) - throws Exception { - logger.info("createPDFSignature start"); - try { - logger.info("WebServiceContext: {}", context); - ContextSetupAspect.setupContext(context.getMessageContext(), "createPDFSignature"); - - CreatePDFRequest requestObj; - CreatePDFRespone responseObj; - - TransactionContext context = TransactionContextManager.getInstance().getTransactionContext(); - - // convert to API objects - logger.trace(">>> preparsing Request"); - requestObj = this.pdfCreateSignatureBinding.buildPDFRequest(createPDFSignatureRequest); - logger.trace("<<< preparsed Request"); - - logger.trace(">>> creating Signature"); - // invoke the core logic - responseObj = PDFASInvoker.getInstance().createPDFSignature(requestObj, context.getTransactionID()); - logger.trace("<<< created Signature"); - - logger.trace(">>> building Response"); - // map back to XML - CreatePDFSignatureResponseType response = this.pdfCreateSignatureBinding.buildPDFResponse(responseObj); - logger.trace("<<< built Response"); - - return response; - } catch (Throwable t) { - MOASystemException e = new MOASystemException("2900", null, t); - logger.debug("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:" - + System.getProperty("line.separator") + StreamUtils.getStackTraceAsString(e)); - logger.error("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:", e); - throw new Exception(e.getMessage()); - } finally { - ContextSetupAspect.cleanContext(); - } - } - -} diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/impl/SignatureVerificationServiceImpl.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/impl/SignatureVerificationServiceImpl.java deleted file mode 100644 index cbc4d2d..0000000 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/impl/SignatureVerificationServiceImpl.java +++ /dev/null @@ -1,215 +0,0 @@ -package at.gv.egovernment.moa.spss.server.webservice.impl; - -import javax.annotation.Resource; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.xml.ws.WebServiceContext; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import at.gv.egiz.moasig.VerifyCMSSignatureRequest; -import at.gv.egiz.moasig.VerifyCMSSignatureResponseType; -import at.gv.egiz.moasig.VerifyPDFSignatureRequest; -import at.gv.egiz.moasig.VerifyPDFSignatureResponseType; -import at.gv.egiz.moasig.VerifyXMLSignatureRequest; -import at.gv.egiz.moasig.VerifyXMLSignatureResponseType; -import at.gv.egovernment.moa.spss.MOASystemException; -import at.gv.egovernment.moa.spss.server.invoke.CMSSignatureVerificationInvoker; -import at.gv.egovernment.moa.spss.server.invoke.PDFASInvoker; -import at.gv.egovernment.moa.spss.server.invoke.XMLSignatureVerificationInvoker; -import at.gv.egovernment.moa.spss.server.transaction.TransactionContext; -import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager; -import at.gv.egovernment.moa.spss.server.webservice.CMSVerifySignatureBinding; -import at.gv.egovernment.moa.spss.server.webservice.PDFVerifySignatureBinding; -import at.gv.egovernment.moa.spss.server.webservice.SignatureVerificationService; -import at.gv.egovernment.moa.spss.server.webservice.XMLVerifySignatureBinding; -import at.gv.egovernment.moa.spss.server.webservice.binding.CMSVerifySignatureBindingImpl; -import at.gv.egovernment.moa.spss.server.webservice.binding.PDFVerifySignatureBindingImpl; -import at.gv.egovernment.moa.spss.server.webservice.binding.XMLVerifySignatureBindingImpl; -import at.gv.egovernment.moa.spss.server.xmlbind.VerifyPDFRequest; -import at.gv.egovernment.moa.spss.server.xmlbind.VerifyPDFResponse; -import at.gv.egovernment.moa.util.StreamUtils; - -@WebService(endpointInterface = "at.gv.egovernment.moa.spss.server.webservice.SignatureVerificationService", portName = "SignatureVerificationService", serviceName = "SignatureVerificationService") -public class SignatureVerificationServiceImpl implements SignatureVerificationService { - - private static final Logger logger = LoggerFactory.getLogger(SignatureVerificationServiceImpl.class); - - @Resource - private WebServiceContext context; - - private XMLVerifySignatureBinding xmlVerifySignatureBinding; - private CMSVerifySignatureBinding cmsVerifySignatureBinding; - private PDFVerifySignatureBinding pdfVerifySignatureBinding; - - public SignatureVerificationServiceImpl() { - this.xmlVerifySignatureBinding = new XMLVerifySignatureBindingImpl(); - this.cmsVerifySignatureBinding = new CMSVerifySignatureBindingImpl(); - this.pdfVerifySignatureBinding = new PDFVerifySignatureBindingImpl(); - } - - @Override - @WebResult(name = "VerifyXMLSignatureResponseType", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20151109#") - public VerifyXMLSignatureResponseType verifyXMLSignature(VerifyXMLSignatureRequest verifyXMLSignatureRequest) - throws Exception { - logger.info("verifyXMLSignature start"); - try { - logger.info("WebServiceContext: {}", context); - ContextSetupAspect.setupContext(context.getMessageContext(), "verifyXMLSignature"); - - XMLSignatureVerificationInvoker invoker = XMLSignatureVerificationInvoker.getInstance(); - - at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest requestObj; - at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse responseObj; - - logger.trace(">>> preparsing Request"); - requestObj = this.xmlVerifySignatureBinding.buildXMLRequest(verifyXMLSignatureRequest); - logger.trace("<<< preparsed Request"); - - logger.trace(">>> verifying Signature"); - // invoke the core logic - responseObj = invoker.verifyXMLSignature(requestObj); - logger.trace("<<< verified Signature"); - - logger.trace(">>> building Response"); - // map back to XML - VerifyXMLSignatureResponseType response = this.xmlVerifySignatureBinding.buildXMLResponse(responseObj); - logger.trace("<<< built Response"); - - return response; - } catch (Throwable t) { - MOASystemException e = new MOASystemException("2900", null, t); - logger.debug("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:" - + System.getProperty("line.separator") + StreamUtils.getStackTraceAsString(e)); - logger.error("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:", e); - throw new Exception(e.getMessage()); - } finally { - ContextSetupAspect.cleanContext(); - } - } - - @Override - @WebResult(name = "VerifyCMSSignatureResponseType", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20151109#") - public VerifyCMSSignatureResponseType verifyCMSSignature(VerifyCMSSignatureRequest verifyCMSSignatureRequest) - throws Exception { - logger.info("verifyCMSSignature start"); - try { - logger.info("WebServiceContext: {}", context); - ContextSetupAspect.setupContext(context.getMessageContext(), "verifyCMSSignature"); - - CMSSignatureVerificationInvoker invoker = CMSSignatureVerificationInvoker.getInstance(); - - at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest requestObj; - at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse responseObj; - - logger.trace(">>> preparsing Request"); - requestObj = this.cmsVerifySignatureBinding.buildCMSRequest(verifyCMSSignatureRequest); - logger.trace("<<< preparsed Request"); - - logger.trace(">>> verifying Signature"); - // invoke the core logic - responseObj = invoker.verifyCMSSignature(requestObj); - logger.trace("<<< verified Signature"); - - logger.trace(">>> building Response"); - // map back to XML - VerifyCMSSignatureResponseType response = this.cmsVerifySignatureBinding.buildCMSResponse(responseObj); - logger.trace("<<< built Response"); - - return response; - } catch (Throwable t) { - MOASystemException e = new MOASystemException("2900", null, t); - logger.debug("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:" - + System.getProperty("line.separator") + StreamUtils.getStackTraceAsString(e)); - logger.error("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:", e); - throw new Exception(e.getMessage()); - } finally { - ContextSetupAspect.cleanContext(); - } - } - - //@Override - //@WebResult(name = "VerifyPDFSignatureResponseType", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20151109#") - private VerifyPDFSignatureResponseType verifyPDFASSignature(VerifyPDFSignatureRequest verifyPDFSignatureRequest) - throws Exception { - logger.info("verifyPDFSignature start"); - try { - logger.info("WebServiceContext: {}", context); - ContextSetupAspect.setupContext(context.getMessageContext(), "verifyPDFSignature"); - - VerifyPDFRequest requestObj; - VerifyPDFResponse responseObj; - - // since Axis (1.1 ff) has problem with namespaces we take the raw - // request stored by the Axishandler. - TransactionContext context = TransactionContextManager.getInstance().getTransactionContext(); - - // convert to API objects - logger.trace(">>> preparsing Request"); - requestObj = this.pdfVerifySignatureBinding.buildPDFRequest(verifyPDFSignatureRequest); - logger.trace("<<< preparsed Request"); - - logger.trace(">>> verifying Signature"); - // invoke the core logic - responseObj = PDFASInvoker.getInstance().verifyPDFSignature(requestObj); - logger.trace("<<< verified Signature"); - - logger.trace(">>> building Response"); - // map back to XML - VerifyPDFSignatureResponseType response = this.pdfVerifySignatureBinding.buildPDFResponse(responseObj); - logger.trace("<<< built Response"); - - return response; - } catch (Throwable t) { - MOASystemException e = new MOASystemException("2900", null, t); - logger.debug("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:" - + System.getProperty("line.separator") + StreamUtils.getStackTraceAsString(e)); - logger.error("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:", e); - throw new Exception(e.getMessage()); - } finally { - ContextSetupAspect.cleanContext(); - } - } - - @Override - @WebResult(name = "VerifyPDFSignatureResponseType", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20151109#") - public VerifyPDFSignatureResponseType verifyPDFSignature(VerifyPDFSignatureRequest verifyPDFSignatureRequest) - throws Exception { - logger.info("verifyPDFSignature start"); - try { - logger.info("WebServiceContext: {}", context); - ContextSetupAspect.setupContext(context.getMessageContext(), "verifyPDFSignature"); - - CMSSignatureVerificationInvoker invoker = CMSSignatureVerificationInvoker.getInstance(); - - at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest requestObj; - at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse responseObj; - - logger.trace(">>> preparsing Request"); - requestObj = this.cmsVerifySignatureBinding.buildPDFRequest(verifyPDFSignatureRequest); - logger.trace("<<< preparsed Request"); - - logger.trace(">>> verifying Signature"); - // invoke the core logic - responseObj = invoker.verifyCMSSignature(requestObj); - logger.trace("<<< verified Signature"); - - logger.trace(">>> building Response"); - // map back to XML - VerifyPDFSignatureResponseType response = this.cmsVerifySignatureBinding.buildPDFResponse(responseObj); - logger.trace("<<< built Response"); - - return response; - } catch (Throwable t) { - MOASystemException e = new MOASystemException("2900", null, t); - logger.debug("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:" - + System.getProperty("line.separator") + StreamUtils.getStackTraceAsString(e)); - logger.error("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:", e); - throw new Exception(e.getMessage()); - } finally { - ContextSetupAspect.cleanContext(); - } - } - -} diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/impl/SimpleCXFNonSpringServlet.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/impl/SimpleCXFNonSpringServlet.java deleted file mode 100644 index 65625a7..0000000 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/impl/SimpleCXFNonSpringServlet.java +++ /dev/null @@ -1,28 +0,0 @@ -package at.gv.egovernment.moa.spss.server.webservice.impl; - -import javax.servlet.ServletConfig; -import javax.xml.ws.Endpoint; - -import org.apache.cxf.Bus; -import org.apache.cxf.BusFactory; -import org.apache.cxf.transport.servlet.CXFNonSpringServlet; - -public class SimpleCXFNonSpringServlet extends CXFNonSpringServlet { - - /** - * - */ - private static final long serialVersionUID = 8564433272673970611L; - - @Override - public void loadBus(ServletConfig servletConfig) { - super.loadBus(servletConfig); - Bus bus = getBus(); - BusFactory.setDefaultBus(bus); - Endpoint signatureCreationEndpoint = Endpoint.publish("/SignatureCreation", new SignatureCreationServiceImpl()); - signatureCreationEndpoint.getProperties().put("schema-validation-enabled", "true"); - Endpoint signatureVerificationEndpoint = Endpoint.publish("/SignatureVerification", new SignatureVerificationServiceImpl()); - signatureVerificationEndpoint.getProperties().put("schema-validation-enabled", "true"); - } - -} diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/CreatePDFSignatureRequestParser.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/CreatePDFSignatureRequestParser.java index 163a7ba..c6b2126 100644 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/CreatePDFSignatureRequestParser.java +++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/CreatePDFSignatureRequestParser.java @@ -29,10 +29,10 @@ import org.w3c.dom.Element; import org.w3c.dom.traversal.NodeIterator; import at.gv.egovernment.moa.spss.MOAApplicationException; -import at.gv.egovernment.moa.util.Base64Utils; -import at.gv.egovernment.moa.util.Constants; -import at.gv.egovernment.moa.util.DOMUtils; -import at.gv.egovernment.moa.util.XPathUtils; +import at.gv.egovernment.moaspss.util.Base64Utils; +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 <code>CreateCMSSignatureRequest</code> DOM trees into diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/CreatePDFSignatureResponseBuilder.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/CreatePDFSignatureResponseBuilder.java index 78586ba..bdb9a71 100644 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/CreatePDFSignatureResponseBuilder.java +++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/CreatePDFSignatureResponseBuilder.java @@ -33,8 +33,8 @@ import org.w3c.dom.Element; import at.gv.egovernment.moa.spss.MOASystemException; import at.gv.egovernment.moa.spss.api.xmlbind.ResponseBuilderUtils; -import at.gv.egovernment.moa.util.Base64Utils; -import at.gv.egovernment.moa.util.Constants; +import at.gv.egovernment.moaspss.util.Base64Utils; +import at.gv.egovernment.moaspss.util.Constants; /** * Convert a <code>CreateCMSSignatureResponse</code> API object into its XML diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/VerifyPDFRequestParser.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/VerifyPDFRequestParser.java index 7601b31..66761e4 100644 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/VerifyPDFRequestParser.java +++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/VerifyPDFRequestParser.java @@ -7,10 +7,10 @@ import org.w3c.dom.Element; import at.gv.egovernment.moa.spss.MOAApplicationException; import at.gv.egovernment.moa.spss.api.xmlbind.RequestParserUtils; -import at.gv.egovernment.moa.util.Base64Utils; -import at.gv.egovernment.moa.util.Constants; -import at.gv.egovernment.moa.util.DOMUtils; -import at.gv.egovernment.moa.util.XPathUtils; +import at.gv.egovernment.moaspss.util.Base64Utils; +import at.gv.egovernment.moaspss.util.Constants; +import at.gv.egovernment.moaspss.util.DOMUtils; +import at.gv.egovernment.moaspss.util.XPathUtils; public class VerifyPDFRequestParser { diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/VerifyPDFResponse.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/VerifyPDFResponse.java index 76746cf..c162529 100644 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/VerifyPDFResponse.java +++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/VerifyPDFResponse.java @@ -2,10 +2,10 @@ package at.gv.egovernment.moa.spss.server.xmlbind; import java.util.List; -import at.gv.egiz.pdfas.lib.api.verify.VerifyResult; +//import at.gv.egiz.pdfas.lib.api.verify.VerifyResult; public class VerifyPDFResponse { - private List<VerifyResult> verificationResults = null; + /*private List<VerifyResult> verificationResults = null; public VerifyPDFResponse() { } @@ -16,5 +16,5 @@ public class VerifyPDFResponse { public synchronized void setVerificationResults(List<VerifyResult> verificationResults) { this.verificationResults = verificationResults; - } + }*/ } diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/VerifyPDFResponseBuilder.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/VerifyPDFResponseBuilder.java index 705eff6..cb3c66b 100644 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/VerifyPDFResponseBuilder.java +++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/VerifyPDFResponseBuilder.java @@ -5,13 +5,13 @@ import java.util.Iterator; import org.w3c.dom.Document; import org.w3c.dom.Element; -import at.gv.egiz.pdfas.lib.api.verify.VerifyResult; +//import at.gv.egiz.pdfas.lib.api.verify.VerifyResult; import at.gv.egovernment.moa.spss.MOAApplicationException; import at.gv.egovernment.moa.spss.MOAException; import at.gv.egovernment.moa.spss.MOASystemException; import at.gv.egovernment.moa.spss.api.xmlbind.ResponseBuilderUtils; import at.gv.egovernment.moa.spss.server.pdfas.ExtendedVerifyResult; -import at.gv.egovernment.moa.util.Constants; +import at.gv.egovernment.moaspss.util.Constants; public class VerifyPDFResponseBuilder { private static final String MOA_NS_URI = Constants.MOA_NS_URI; @@ -44,7 +44,7 @@ public class VerifyPDFResponseBuilder { * @return A document containing the <code>CreateCMSSignatureResponse</code> * DOM element. */ - public Document build(VerifyPDFResponse response) throws MOAException { + /*public Document build(VerifyPDFResponse response) throws MOAException { if(response.getVerificationResults() == null) { throw new MOAApplicationException("No verification results available", null); } @@ -106,5 +106,5 @@ public class VerifyPDFResponseBuilder { (String)null); responseElem.appendChild(pdfSignature); - } + }*/ } diff --git a/moaSig/moa-sig/src/main/resources/log4j.properties b/moaSig/moa-sig/src/main/resources/log4j.properties new file mode 100644 index 0000000..7beb0c5 --- /dev/null +++ b/moaSig/moa-sig/src/main/resources/log4j.properties @@ -0,0 +1,38 @@ +# +# Sample log4j configuration for the MOA-SPSS web service +# + +# commons-logging setup +org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.Log4jFactory + +# Configure root logger and loggers for moa-spss +log4j.rootLogger=TRACE, stdout +log4j.logger.moa.spss.server=TRACE, stdout, moaspss +log4j.logger.iaik.server=TRACE, stdout, moaspss +log4j.logger.at.gv.egovernment.moa.spss=TRACE, stdout, moaspss + +# Configure the 'stdout' appender to write logging output to the console +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %C{1} | %20c | %10t | %m%n + +# Configure the 'moaspss' appender to write moa-spss related logging output +# to the file '${catalina.base}/logs/moa-spss.log'. The file is rolled over every 1000KB, +# and a maximum history of 10 log files is being kept. +log4j.appender.moaspss=org.apache.log4j.RollingFileAppender +log4j.appender.moaspss.File=${catalina.base}/logs/moa-spss.log +log4j.appender.moaspss.MaxFileSize=1000KB +log4j.appender.moaspss.MaxBackupIndex=10 +log4j.appender.moaspss.layout=org.apache.log4j.PatternLayout +log4j.appender.moaspss.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %C{1} | %20c | %10t | %m%n + +# Configure the jdbc appender 'JDBC' to write logging output +# to the given PostgreSQL database +# a suitable table called 'spss_log' must have been created in the +# database using the command: +# create table spss_log (log_time timestamp, log_level char(5), log_msg text) +#log4j.appender.JDBC=org.apache.log4j.jdbc.JDBCAppender +#log4j.appender.JDBC.driver=org.postgresql.Driver +#log4j.appender.JDBC.URL=jdbc:postgresql://10.16.46.108/moa?user=moa&password=moatest +#log4j.appender.JDBC.layout=org.apache.log4j.PatternLayout +#log4j.appender.JDBC.sql=INSERT INTO spss_log (log_time, log_level, log_msg) VALUES ('%d{ yyyy-MM-dd HH:mm:ss.SSS}', '%5p', '%m') 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 index 63e82a2..55f0259 100644 --- 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 @@ -133,7 +133,7 @@ <xsd:element name="CreateXMLSignatureResponse" type="CreateXMLSignatureResponseType" /> <!--########## Create PDF Signature ### --> <!--### Create PDF Signature Request ### --> - <xsd:element name="CreatePDFSignatureRequest"> + <!--xsd:element name="CreatePDFSignatureRequest"> <xsd:complexType> <xsd:complexContent> <xsd:extension base="CreatePDFSignatureRequestType" /> @@ -161,15 +161,15 @@ </xsd:complexType> </xsd:element> </xsd:sequence> - </xsd:complexType> + </xsd:complexType--> <!--### Create PDF Signature Response ### --> - <xsd:element name="CreatePDFSignatureResponse" type="CreatePDFSignatureResponseType" /> + <!--xsd:element name="CreatePDFSignatureResponse" type="CreatePDFSignatureResponseType" /> <xsd:complexType name="CreatePDFSignatureResponseType"> <xsd:sequence> <xsd:element name="PDFSignature" type="PDFSignedRepsonse" maxOccurs="unbounded" /> </xsd:sequence> - </xsd:complexType> + </xsd:complexType--> <!--########## Verify CMS Signature ### --> <!--### Verifiy CMS Signature Request ### --> <xsd:element name="VerifyCMSSignatureRequest"> @@ -186,6 +186,7 @@ <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" /> @@ -230,6 +231,7 @@ <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> @@ -277,11 +279,12 @@ <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="xsd:token" /> + <xsd:element name="VerifySignatureLocation" type="XMLSignatureLocationType" /> </xsd:sequence> </xsd:complexType> </xsd:element> @@ -648,6 +651,19 @@ </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"> 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 03b14ba..00bf4c5 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 @@ -10,12 +10,12 @@ <message name="CreateCMSSignatureOutput">
<part name="body" element="moa:CreateCMSSignatureResponse"/>
</message>
- <message name="CreatePDFSignatureInput">
+ <!-- message name="CreatePDFSignatureInput">
<part name="body" element="moa:CreatePDFSignatureRequest"/>
</message>
<message name="CreatePDFSignatureOutput">
<part name="body" element="moa:CreatePDFSignatureResponse"/>
- </message>
+ </message-->
<message name="CreateXMLSignatureInput">
<part name="body" element="moa:CreateXMLSignatureRequest"/>
</message>
@@ -54,11 +54,11 @@ <output message="tns:CreateCMSSignatureOutput"/>
<fault name="MOAFault" message="tns:MOAFault"/>
</operation>
- <operation name="createPDFSignature">
+ <!-- operation name="createPDFSignature">
<input message="tns:CreatePDFSignatureInput"/>
<output message="tns:CreatePDFSignatureOutput"/>
<fault name="MOAFault" message="tns:MOAFault"/>
- </operation>
+ </operation-->
</portType>
<portType name="SignatureVerificationPortType">
<operation name="verifyCMSSignature">
@@ -103,7 +103,7 @@ <!-- soap:fault name="" use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/-->
</fault>
</operation>
- <operation name="createPDFSignature">
+ <!-- operation name="createPDFSignature">
<soap:operation soapAction="urn:CreatePDFSignatureAction"/>
<input>
<soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
@@ -111,10 +111,10 @@ <output>
<soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
</output>
- <fault name="MOAFault">
+ <fault name="MOAFault"-->
<!-- soap:fault name="" use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/-->
- </fault>
- </operation>
+ <!-- /fault>
+ </operation-->
</binding>
<binding name="SignatureVerificationBinding" type="tns:SignatureVerificationPortType">
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
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 67a897c..a12dc09 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 @@ -166,6 +166,7 @@ <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"> @@ -186,6 +187,7 @@ </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:sequence> </xsd:complexType> <!--########## Verify PDF Signature ###--> @@ -200,6 +202,7 @@ <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> @@ -224,6 +227,7 @@ </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:sequence> </xsd:complexType> <!--########## Verify XML Signature ###--> @@ -232,6 +236,7 @@ <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> diff --git a/moaSig/moa-sig/src/main/webapp/WEB-INF/web.xml b/moaSig/moa-sig/src/main/webapp/WEB-INF/web.xml index aca8e6a..667f084 100644 --- a/moaSig/moa-sig/src/main/webapp/WEB-INF/web.xml +++ b/moaSig/moa-sig/src/main/webapp/WEB-INF/web.xml @@ -1,9 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE web-app - PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" - "http://java.sun.com/dtd/web-app_2_3.dtd"> - <web-app> <display-name>MOA SP-SS</display-name> <description>MOA Signature Creation and Verification Services</description> @@ -16,29 +11,28 @@ <servlet> <servlet-name>AxisServlet</servlet-name> <display-name>Apache-Axis Servlet</display-name> - <servlet-class> - org.apache.axis.transport.http.AxisServlet - </servlet-class> + <servlet-class>org.apache.axis.transport.http.AxisServlet</servlet-class> </servlet> - <servlet> + <!-- servlet> <servlet-name>SimpleCXFNonSpringServlet</servlet-name> <display-name>SimpleCXFNonSpringServlet</display-name> <servlet-class>at.gv.egovernment.moa.spss.server.webservice.impl.SimpleCXFNonSpringServlet</servlet-class> - </servlet> + <load-on-startup>1</load-on-startup> + </servlet--> <servlet> <servlet-name>CertificateProviderServlet</servlet-name> <display-name>MOA Certificate Provider Servlet</display-name> <servlet-class>at.gv.egovernment.moa.spss.server.service.CertificateProviderServlet</servlet-class> - <load-on-startup>0</load-on-startup> + <load-on-startup>1</load-on-startup> </servlet> <servlet-mapping> <servlet-name>AxisServlet</servlet-name> <url-pattern>/services/*</url-pattern> </servlet-mapping> - <servlet-mapping> + <!-- servlet-mapping> <servlet-name>SimpleCXFNonSpringServlet</servlet-name> <url-pattern>/services2/*</url-pattern> - </servlet-mapping> + </servlet-mapping--> <servlet-mapping> <servlet-name>ConfigurationServlet</servlet-name> <url-pattern>/ConfigurationUpdate</url-pattern> 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 3b852ca..a12dc09 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 @@ -166,6 +166,7 @@ <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"> @@ -186,6 +187,7 @@ </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:sequence> </xsd:complexType> <!--########## Verify PDF Signature ###--> @@ -200,6 +202,7 @@ <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> @@ -224,6 +227,7 @@ </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:sequence> </xsd:complexType> <!--########## Verify XML Signature ###--> @@ -232,6 +236,7 @@ <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> @@ -279,6 +284,7 @@ <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:sequence> </xsd:complexType> <xsd:simpleType name="ProfileIdentifierType"> @@ -412,6 +418,12 @@ <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="ReferencesCheckResultType"> <xsd:complexContent> <xsd:restriction base="CheckResultType"> |