diff options
Diffstat (limited to 'moaSig')
103 files changed, 1001 insertions, 296 deletions
diff --git a/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/api/ASiCFactory.java b/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/api/ASiCFactory.java new file mode 100644 index 0000000..e9ad9dc --- /dev/null +++ b/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/api/ASiCFactory.java @@ -0,0 +1,7 @@ +package at.gv.egiz.asic.api; + +/** + * Created by afitzek on 6/15/16. + */ +public interface ASiCFactory { +} diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/OutputConstants.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/OutputConstants.java new file mode 100644 index 0000000..83519d2 --- /dev/null +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/OutputConstants.java @@ -0,0 +1,15 @@ +package at.gv.egovernment.moa.spss; + +import java.lang.reflect.Field; + +import iaik.server.modules.ResultCode; + +public class OutputConstants { + public static void main(String[] argv) throws IllegalArgumentException, IllegalAccessException { + Field[] fields = ResultCode.class.getFields(); + for(int i = 0; i < fields.length; i++) { + Field f = fields[i]; + System.out.println(f.getName() + " : " + f.get(null)); + } + } +} diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/SPSSFactory.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/SPSSFactory.java index c6a750e..2d19871 100644 --- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/SPSSFactory.java +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/SPSSFactory.java @@ -45,6 +45,7 @@ import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse; import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponseElement; import at.gv.egovernment.moa.spss.api.common.CheckResult; import at.gv.egovernment.moa.spss.api.common.Content; +import at.gv.egovernment.moa.spss.api.common.ExtendedCertificateCheckResult; import at.gv.egovernment.moa.spss.api.common.MetaInfo; import at.gv.egovernment.moa.spss.api.common.SignerInfo; import at.gv.egovernment.moa.spss.api.common.Transform; @@ -576,7 +577,8 @@ public abstract class SPSSFactory { SignerInfo signerInfo, CheckResult signatureCheck, CheckResult certificateCheck, - List adesResult); + List adesResult, + ExtendedCertificateCheckResult extendedCertificateCheckResult); // // Factory methods for verifying XML signatures @@ -866,7 +868,8 @@ public abstract class SPSSFactory { ReferencesCheckResult signatureManifestCheck, List xmlDsigManifestChecks, CheckResult certificateCheck, - List adesFormResults); + List adesFormResults, + ExtendedCertificateCheckResult extCheckResult); /** * Create a new <code>ReferencesCheckResult</code> object. diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureResponseElement.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureResponseElement.java index 8579a2f..6b08471 100644 --- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureResponseElement.java +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureResponseElement.java @@ -27,6 +27,7 @@ package at.gv.egovernment.moa.spss.api.cmsverify; import java.util.List; import at.gv.egovernment.moa.spss.api.common.CheckResult; +import at.gv.egovernment.moa.spss.api.common.ExtendedCertificateCheckResult; import at.gv.egovernment.moa.spss.api.common.SignerInfo; /** @@ -64,4 +65,6 @@ public interface VerifyCMSSignatureResponseElement { * @return The result of the AdES Form validation */ public List getAdESFormResults(); + + public ExtendedCertificateCheckResult getExtendedCertificateCheck(); } diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/common/ExtendedCertificateCheckResult.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/common/ExtendedCertificateCheckResult.java new file mode 100644 index 0000000..494b216 --- /dev/null +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/common/ExtendedCertificateCheckResult.java @@ -0,0 +1,33 @@ +package at.gv.egovernment.moa.spss.api.common; + +import org.w3c.dom.NodeList; + +public interface ExtendedCertificateCheckResult { + /** + * Gets the result code. + * + * @return The result code. + */ + public int getMajorCode(); + + /** + * Gets descriptive information. + * + * @return Descriptive information. + */ + public String getMajorInfo(); + + /** + * Gets the result code. + * + * @return The result code. + */ + public int getMinorCode(); + + /** + * Gets descriptive information. + * + * @return Descriptive information. + */ + public String getMinorInfo(); +} diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ExtendedCertificateCheckResultImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ExtendedCertificateCheckResultImpl.java new file mode 100644 index 0000000..f36760c --- /dev/null +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ExtendedCertificateCheckResultImpl.java @@ -0,0 +1,44 @@ +package at.gv.egovernment.moa.spss.api.impl; + +import at.gv.egovernment.moa.spss.api.common.ExtendedCertificateCheckResult; + +public class ExtendedCertificateCheckResultImpl implements ExtendedCertificateCheckResult { + private int majorCode; + private String majorInfo; + + private int minorCode; + private String minorInfo; + + public ExtendedCertificateCheckResultImpl(int majorCode, String majorInfo) { + this(majorCode, majorInfo, -1, ""); + } + + public ExtendedCertificateCheckResultImpl(int majorCode, String majorInfo, + int minorCode, String minorInfo) { + this.majorCode = majorCode; + this.majorInfo = majorInfo; + this.minorCode = minorCode; + this.minorInfo = minorInfo; + } + + @Override + public int getMajorCode() { + return this.majorCode; + } + + @Override + public String getMajorInfo() { + return this.majorInfo; + } + + @Override + public int getMinorCode() { + return this.minorCode; + } + + @Override + public String getMinorInfo() { + return this.minorInfo; + } + +} diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java index 9719c29..4781b8d 100644 --- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java @@ -45,6 +45,7 @@ import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse; import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponseElement; import at.gv.egovernment.moa.spss.api.common.CheckResult; import at.gv.egovernment.moa.spss.api.common.Content; +import at.gv.egovernment.moa.spss.api.common.ExtendedCertificateCheckResult; import at.gv.egovernment.moa.spss.api.common.MetaInfo; import at.gv.egovernment.moa.spss.api.common.SignerInfo; import at.gv.egovernment.moa.spss.api.common.Transform; @@ -279,12 +280,14 @@ public class SPSSFactoryImpl extends SPSSFactory { } public VerifyCMSSignatureResponseElement createVerifyCMSSignatureResponseElement(SignerInfo signerInfo, - CheckResult signatureCheck, CheckResult certificateCheck, List adesResult) { + CheckResult signatureCheck, CheckResult certificateCheck, List adesResult, + ExtendedCertificateCheckResult extendedCertificateCheckResult) { VerifyCMSSignatureResponseElementImpl verifyCMSSignatureResponseElement = new VerifyCMSSignatureResponseElementImpl(); verifyCMSSignatureResponseElement.setSignerInfo(signerInfo); verifyCMSSignatureResponseElement.setSignatureCheck(signatureCheck); verifyCMSSignatureResponseElement.setCertificateCheck(certificateCheck); verifyCMSSignatureResponseElement.setAdESFormResults(adesResult); + verifyCMSSignatureResponseElement.setExtendedCertificateCheck(extendedCertificateCheckResult); return verifyCMSSignatureResponseElement; } @@ -375,7 +378,7 @@ public class SPSSFactoryImpl extends SPSSFactory { public VerifyXMLSignatureResponse createVerifyXMLSignatureResponse(SignerInfo signerInfo, List hashInputDatas, List referenceInputDatas, ReferencesCheckResult signatureCheck, ReferencesCheckResult signatureManifestCheck, List xmlDsigManifestChecks, CheckResult certificateCheck, - List adesFormResults) { + List adesFormResults, ExtendedCertificateCheckResult extCheckResult) { VerifyXMLSignatureResponseImpl verifyXMLSignatureResponse = new VerifyXMLSignatureResponseImpl(); verifyXMLSignatureResponse.setSignerInfo(signerInfo); verifyXMLSignatureResponse.setHashInputDatas(hashInputDatas); @@ -385,6 +388,7 @@ public class SPSSFactoryImpl extends SPSSFactory { verifyXMLSignatureResponse.setXMLDsigManifestChecks(xmlDsigManifestChecks); verifyXMLSignatureResponse.setCertificateCheck(certificateCheck); verifyXMLSignatureResponse.setAdESFormResults(adesFormResults); + verifyXMLSignatureResponse.setExtendedCertificateCheck(extCheckResult); return verifyXMLSignatureResponse; } diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureResponseElementImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureResponseElementImpl.java index 3d6b72a..9b7881c 100644 --- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureResponseElementImpl.java +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureResponseElementImpl.java @@ -28,6 +28,7 @@ import java.util.List; import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponseElement; import at.gv.egovernment.moa.spss.api.common.CheckResult; +import at.gv.egovernment.moa.spss.api.common.ExtendedCertificateCheckResult; import at.gv.egovernment.moa.spss.api.common.SignerInfo; /** @@ -46,6 +47,8 @@ public class VerifyCMSSignatureResponseElementImpl /** Information about the certificate check. */ private CheckResult certificateCheck; + private ExtendedCertificateCheckResult extendedResult; + private List adesResults = null; /** @@ -94,5 +97,14 @@ public class VerifyCMSSignatureResponseElementImpl public List getAdESFormResults() { return adesResults; } + + public void setExtendedCertificateCheck(ExtendedCertificateCheckResult r) { + this.extendedResult = r; + } + + @Override + public ExtendedCertificateCheckResult getExtendedCertificateCheck() { + return extendedResult; + } } diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyXMLSignatureResponseImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyXMLSignatureResponseImpl.java index bfee774..60ac3be 100644 --- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyXMLSignatureResponseImpl.java +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyXMLSignatureResponseImpl.java @@ -28,6 +28,7 @@ import java.util.Collections; import java.util.List; import at.gv.egovernment.moa.spss.api.common.CheckResult; +import at.gv.egovernment.moa.spss.api.common.ExtendedCertificateCheckResult; import at.gv.egovernment.moa.spss.api.common.SignerInfo; import at.gv.egovernment.moa.spss.api.xmlverify.ReferencesCheckResult; import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse; @@ -40,6 +41,8 @@ public class VerifyXMLSignatureResponseImpl implements VerifyXMLSignatureRespons /** Information about the signer certificate. */ private SignerInfo signerInfo; + + private ExtendedCertificateCheckResult extendedResult; /** * The hash input data objects. The list consists of @@ -177,4 +180,13 @@ public class VerifyXMLSignatureResponseImpl implements VerifyXMLSignatureRespons return this.adesFormResults; } + public void setExtendedCertificateCheck(ExtendedCertificateCheckResult r) { + this.extendedResult = r; + } + + @Override + public ExtendedCertificateCheckResult getExtendedCertificateCheck() { + return extendedResult; + } + } diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/ResponseBuilderUtils.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/ResponseBuilderUtils.java index a6ed83d..193ea33 100644 --- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/ResponseBuilderUtils.java +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/ResponseBuilderUtils.java @@ -41,6 +41,7 @@ import iaik.utils.RFC2253NameParser; import iaik.utils.RFC2253NameParserException; import at.gv.egovernment.moa.spss.MOAApplicationException; import at.gv.egovernment.moa.spss.MOASystemException; +import at.gv.egovernment.moa.spss.api.common.ExtendedCertificateCheckResult; import at.gv.egovernment.moaspss.util.Base64Utils; import at.gv.egovernment.moaspss.util.Constants; @@ -284,6 +285,41 @@ public class ResponseBuilderUtils { root.appendChild(codeInfoElem); } + public static void addExtendendResult(Document response, + Element root, + ExtendedCertificateCheckResult result) { + Element extElem = response.createElementNS(MOA_NS_URI, "ExtendedCertificateCheck"); + + Element extMajorElem = response.createElementNS(MOA_NS_URI, "Major"); + + Element codeMajorCodeElem = response.createElementNS(MOA_NS_URI, "Code"); + Element codeMajorNameElem = response.createElementNS(MOA_NS_URI, "Name"); + codeMajorCodeElem.appendChild(response.createTextNode(Integer.toString( + result.getMajorCode()))); + codeMajorNameElem.appendChild(response.createTextNode(result.getMajorInfo())); + + extMajorElem.appendChild(codeMajorCodeElem); + extMajorElem.appendChild(codeMajorNameElem); + + extElem.appendChild(extMajorElem); + + if(result.getMinorCode() >= 0) { + Element extMinorElem = response.createElementNS(MOA_NS_URI, "Minor"); + Element codeMinorCodeElem = response.createElementNS(MOA_NS_URI, "Code"); + Element codeMinorNameElem = response.createElementNS(MOA_NS_URI, "Name"); + codeMinorCodeElem.appendChild(response.createTextNode(Integer.toString( + result.getMinorCode()))); + codeMinorNameElem.appendChild(response.createTextNode(result.getMinorInfo())); + + extMinorElem.appendChild(codeMinorCodeElem); + extMinorElem.appendChild(codeMinorNameElem); + + extElem.appendChild(extMinorElem); + } + + root.appendChild(extElem); + } + /** * Add an element containing <code>Code</code> and <code>Info</code> * subelements. diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureResponseBuilder.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureResponseBuilder.java index cefecac..6c4667b 100644 --- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureResponseBuilder.java +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureResponseBuilder.java @@ -140,6 +140,10 @@ public class VerifyCMSSignatureResponseBuilder { } } + if(responseElement.getExtendedCertificateCheck() != null) { + ResponseBuilderUtils.addExtendendResult(responseDoc, responseElem, responseElement.getExtendedCertificateCheck()); + } + } } diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyPDFSignatureResponseBuilder.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyPDFSignatureResponseBuilder.java index cc44c29..1826ffc 100644 --- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyPDFSignatureResponseBuilder.java +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyPDFSignatureResponseBuilder.java @@ -140,6 +140,10 @@ public class VerifyPDFSignatureResponseBuilder { } } + if(responseElement.getExtendedCertificateCheck() != null) { + ResponseBuilderUtils.addExtendendResult(responseDoc, responseElem, responseElement.getExtendedCertificateCheck()); + } + } } diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureResponseBuilder.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureResponseBuilder.java index 2109b35..5329861 100644 --- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureResponseBuilder.java +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureResponseBuilder.java @@ -149,6 +149,11 @@ public class VerifyXMLSignatureResponseBuilder { } } + + if(response.getExtendedCertificateCheck() != null) { + ResponseBuilderUtils.addExtendendResult(responseDoc, responseElem, response.getExtendedCertificateCheck()); + } + return responseDoc; } diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/VerifyXMLSignatureResponse.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/VerifyXMLSignatureResponse.java index 63c496a..0ed12bf 100644 --- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/VerifyXMLSignatureResponse.java +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/VerifyXMLSignatureResponse.java @@ -27,6 +27,7 @@ package at.gv.egovernment.moa.spss.api.xmlverify; import java.util.List; import at.gv.egovernment.moa.spss.api.common.CheckResult; +import at.gv.egovernment.moa.spss.api.common.ExtendedCertificateCheckResult; import at.gv.egovernment.moa.spss.api.common.SignerInfo; /** @@ -90,5 +91,5 @@ public interface VerifyXMLSignatureResponse { */ public List getAdESFormResults(); - + public ExtendedCertificateCheckResult getExtendedCertificateCheck(); } diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/XSLTTransformationImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/XSLTTransformationImpl.java index 9e6ed6d..9dc45fc 100644 --- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/XSLTTransformationImpl.java +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/XSLTTransformationImpl.java @@ -205,10 +205,31 @@ public class XSLTTransformationImpl extends TransformationImpl implements XSLTTr //CanonicalizationAlgorithm c14n = // new CanonicalizationAlgorithmImplExclusiveCanonicalXML(); - Traverser traverser = new Traverser(element, true, true); - Canonicalizer canonicalizer = new Canonicalizer(traverser, false, true, null); + //Traverser traverser = new Traverser(element, true, true); + //Canonicalizer canonicalizer = new Canonicalizer(traverser, false, true, null); - return new CanonInputStream(canonicalizer); + //return new CanonInputStream(canonicalizer); + + CanonicalizationMethod canonicalizationMethod = + MOAXSecProvider.getXMLSignatureFactory().newCanonicalizationMethod( + CanonicalizationMethod.EXCLUSIVE, new ExcC14NParameterSpec()); + + //CanonicalizationAlgorithm c14n = + // new CanonicalizationAlgorithmImplExclusiveCanonicalXML(); + NodeList nodeList; + + try { + nodeList = XPathUtils.selectNodeList(element, + XPathUtils.ALL_NODES_XPATH); + } catch (XPathException e) { + nodeList = new NodeListAdapter(Collections.EMPTY_LIST); + } + //c14n.setInput(nodeList); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + canonicalizationMethod.transform(new + NodeListToNodeSetDataAdapter(nodeList), null, baos); + baos.close(); + return new ByteArrayInputStream(baos.toByteArray()); /* NodeList nodeList; diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java index f5d2826..ba0474c 100644 --- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java @@ -41,6 +41,7 @@ import at.gv.egovernment.moa.spss.api.cmsverify.CMSContentReference; import at.gv.egovernment.moa.spss.api.cmsverify.CMSDataObject; import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest; import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse; +import at.gv.egovernment.moa.spss.api.common.ExtendedCertificateCheckResult; import at.gv.egovernment.moa.spss.server.config.TrustProfile; import at.gv.egovernment.moa.spss.server.logging.IaikLog; import at.gv.egovernment.moa.spss.server.logging.TransactionId; @@ -258,15 +259,13 @@ public class CMSSignatureVerificationInvoker { CMSSignatureVerificationResult cmsResult = null; List adesResults = null; + ExtendedCertificateCheckResult extCheckResult = null; if (resultObject instanceof ExtendedCMSSignatureVerificationResult) { Logger.info("Got ExtendedCMSSignatureVerificationResult"); ExtendedCMSSignatureVerificationResult result = (ExtendedCMSSignatureVerificationResult) resultObject; cmsResult = result.getCMSSignatureVerificationResult(); - try { - adesResults = getAdESResult(result); - } catch (ConfigurationException e) { - Logger.warn("Failed to provide extended validation results: " + e.getMessage()); - } + adesResults = AdESResultUtils.getAdESResult(result.getFormVerificationResult()); + if (adesResults != null) { Iterator adesIterator = adesResults.iterator(); @@ -274,6 +273,17 @@ public class CMSSignatureVerificationInvoker { Logger.info("ADES Formresults: " + adesIterator.next().toString()); } } + try { + //Logger.info("Extended Validation Report: " + result.getName()); + Logger.info("Extended Validation Code: " + result.getResultCode().toString()); + Logger.info("Extended Validation Info: " + result.getInfo()); + + extCheckResult = AdESResultUtils.getExtendedResult(result.getResultCode()); + } catch (ConfigurationException e) { + Logger.warn("Cannot generate Extendend Result. Check SVA Configuration!", e); + } catch (NullPointerException e) { + Logger.info("No extendend validation result available."); + } } else { Logger.info("Got CMSSignatureVerificationResult"); cmsResult = (CMSSignatureVerificationResult) resultObject; @@ -302,7 +312,7 @@ public class CMSSignatureVerificationInvoker { } responseBuilder.addResult(cmsResult, trustProfile, qcsscdresult.isQC(), qcsscdresult.isQCSourceTSL(), - qcsscdresult.isSSCD(), qcsscdresult.isSSCDSourceTSL(), issuerCountryCode, adesResults); + qcsscdresult.isSSCD(), qcsscdresult.isSSCDSourceTSL(), issuerCountryCode, adesResults, extCheckResult); } private void handlePDFResult(Object resultObject, VerifyCMSSignatureResponseBuilder responseBuilder, @@ -316,17 +326,14 @@ public class CMSSignatureVerificationInvoker { PDFSignatureVerificationResult cmsResult = null; List adesResults = null; + + ExtendedCertificateCheckResult extCheckResult = null; if (resultObject instanceof ExtendedPDFSignatureVerificationResult) { Logger.info("Got ExtendedPDFSignatureVerificationResult"); ExtendedPDFSignatureVerificationResult result = (ExtendedPDFSignatureVerificationResult) resultObject; cmsResult = result.getPDFSignatureVerificationResult(); - try { - adesResults = getAdESResult(result); - } catch (ConfigurationException e) { - Logger.warn("Failed to provide extended validation results", e); - //throw new MOARuntimeException("config.52", null); - } - + adesResults = AdESResultUtils.getAdESResult(result.getFormVerificationResult()); + if (adesResults != null) { Iterator adesIterator = adesResults.iterator(); while (adesIterator.hasNext()) { @@ -334,6 +341,17 @@ public class CMSSignatureVerificationInvoker { } } cmsResult = result.getPDFSignatureVerificationResult(); + try { + //Logger.info("Extended Validation Report: " + result.getName()); + Logger.info("Extended Validation Code: " + result.getResultCode().toString()); + Logger.info("Extended Validation Info: " + result.getInfo()); + + extCheckResult = AdESResultUtils.getExtendedResult(result.getResultCode()); + } catch (ConfigurationException e) { + Logger.warn("Cannot generate Extendend Result. Check SVA Configuration!", e); + } catch (NullPointerException e) { + Logger.info("No extendend validation result available."); + } } else { Logger.info("Got PDFSignatureVerificationResult"); cmsResult = (PDFSignatureVerificationResult) resultObject; @@ -361,7 +379,8 @@ public class CMSSignatureVerificationInvoker { } responseBuilder.addResult(cmsResult, trustProfile, qcsscdresult.isQC(), qcsscdresult.isQCSourceTSL(), - qcsscdresult.isSSCD(), qcsscdresult.isSSCDSourceTSL(), issuerCountryCode, adesResults); + qcsscdresult.isSSCD(), qcsscdresult.isSSCDSourceTSL(), issuerCountryCode, adesResults, + extCheckResult); } /** diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyCMSSignatureResponseBuilder.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyCMSSignatureResponseBuilder.java index 3e18c2a..7b4a350 100644 --- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyCMSSignatureResponseBuilder.java +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyCMSSignatureResponseBuilder.java @@ -37,6 +37,7 @@ import at.gv.egovernment.moa.spss.api.SPSSFactory; import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse; import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponseElement; import at.gv.egovernment.moa.spss.api.common.CheckResult; +import at.gv.egovernment.moa.spss.api.common.ExtendedCertificateCheckResult; import at.gv.egovernment.moa.spss.api.common.SignerInfo; import at.gv.egovernment.moa.spss.server.config.TrustProfile; @@ -80,7 +81,8 @@ public class VerifyCMSSignatureResponseBuilder { * otherwise <code>false</code>. * @throws MOAException */ - public void addResult(CMSSignatureVerificationResult result, TrustProfile trustProfile, boolean checkQC, boolean qcSourceTSL, boolean checkSSCD, boolean sscdSourceTSL, String issuerCountryCode, List adesResults) + public void addResult(CMSSignatureVerificationResult result, TrustProfile trustProfile, boolean checkQC, boolean qcSourceTSL, boolean checkSSCD, boolean sscdSourceTSL, String issuerCountryCode, List adesResults, + ExtendedCertificateCheckResult extendedCertificateCheckResult) throws MOAException { CertificateValidationResult certResult = @@ -120,7 +122,8 @@ public class VerifyCMSSignatureResponseBuilder { signerInfo, signatureCheck, certificateCheck, - adesResults); + adesResults, + extendedCertificateCheckResult); responseElements.add(responseElement); } @@ -137,7 +140,8 @@ public class VerifyCMSSignatureResponseBuilder { * otherwise <code>false</code>. * @throws MOAException */ - public void addResult(PDFSignatureVerificationResult result, TrustProfile trustProfile, boolean checkQC, boolean qcSourceTSL, boolean checkSSCD, boolean sscdSourceTSL, String issuerCountryCode, List adesResults) + public void addResult(PDFSignatureVerificationResult result, TrustProfile trustProfile, boolean checkQC, boolean qcSourceTSL, boolean checkSSCD, boolean sscdSourceTSL, String issuerCountryCode, List adesResults, + ExtendedCertificateCheckResult extendedCertificateCheckResult) throws MOAException { CertificateValidationResult certResult = @@ -177,7 +181,8 @@ public class VerifyCMSSignatureResponseBuilder { signerInfo, signatureCheck, certificateCheck, - adesResults); + adesResults, + extendedCertificateCheckResult); responseElements.add(responseElement); } diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyXMLSignatureResponseBuilder.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyXMLSignatureResponseBuilder.java index a6e8971..7bd7c27 100644 --- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyXMLSignatureResponseBuilder.java +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyXMLSignatureResponseBuilder.java @@ -42,6 +42,7 @@ import at.gv.egovernment.moa.spss.MOAApplicationException; import at.gv.egovernment.moa.spss.api.SPSSFactory; import at.gv.egovernment.moa.spss.api.common.CheckResult; import at.gv.egovernment.moa.spss.api.common.Content; +import at.gv.egovernment.moa.spss.api.common.ExtendedCertificateCheckResult; import at.gv.egovernment.moa.spss.api.common.InputData; import at.gv.egovernment.moa.spss.api.common.SignerInfo; import at.gv.egovernment.moa.spss.api.impl.InputDataBinaryImpl; @@ -101,7 +102,7 @@ public class VerifyXMLSignatureResponseBuilder { /** The result of the certificate check. */ private CheckResult certificateCheck; private List adesFormResults = null; - + private ExtendedCertificateCheckResult extCheckResult = null; /** * Get the <code>VerifyMLSignatureResponse</code> built so far. * @@ -116,7 +117,12 @@ public class VerifyXMLSignatureResponseBuilder { signatureManifestCheck, xmlDsigManifestChecks, certificateCheck, - adesFormResults); + adesFormResults, + extCheckResult); + } + + public void setExtendedCertificateCheckResult(ExtendedCertificateCheckResult extCheckResult) { + this.extCheckResult = extCheckResult; } public void setAdESFormResults(List adesForm) { diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java index 5d7b852..c3ebda4 100644 --- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java @@ -37,6 +37,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import javax.xml.ws.soap.AddressingFeature.Responses; + import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -45,6 +47,7 @@ import at.gv.egovernment.moa.spss.MOAException; import at.gv.egovernment.moa.spss.MOASystemException; import at.gv.egovernment.moa.spss.api.SPSSFactory; import at.gv.egovernment.moa.spss.api.common.CheckResult; +import at.gv.egovernment.moa.spss.api.common.ExtendedCertificateCheckResult; import at.gv.egovernment.moa.spss.api.common.XMLDataObjectAssociation; import at.gv.egovernment.moa.spss.api.impl.AdESFormResultsImpl; import at.gv.egovernment.moa.spss.api.xmlverify.ReferenceInfo; @@ -235,14 +238,11 @@ public class XMLSignatureVerificationInvoker { throw moaException; } + ExtendedCertificateCheckResult extCheckResult; if(result != null) { - List adesResults = null;//getAdESResult(result.getFormVerificationResult()); + List adesResults = null;// - try { - adesResults = getAdESResult(result); - } catch (ConfigurationException e) { - Logger.warn("Failed to provide extended validation results", e); - } + adesResults = AdESResultUtils.getAdESResult(result.getFormVerificationResult()); if (adesResults != null) { Iterator adesIterator = adesResults.iterator(); @@ -252,6 +252,19 @@ public class XMLSignatureVerificationInvoker { } responseBuilder.setAdESFormResults(adesResults); + + try { + //Logger.info("Extended Validation Report: " + result.getName()); + Logger.info("Extended Validation Code: " + result.getResultCode().toString()); + Logger.info("Extended Validation Info: " + result.getInfo()); + + extCheckResult = AdESResultUtils.getExtendedResult(result.getResultCode()); + responseBuilder.setExtendedCertificateCheckResult(extCheckResult); + } catch (ConfigurationException e) { + Logger.warn("Cannot generate Extendend Result. Check SVA Configuration!", e); + } catch (NullPointerException e) { + Logger.info("No extendend validation result available."); + } } // QC/SSCD check List list = plainResult.getCertificateValidationResult().getCertificateChain(); @@ -313,11 +326,13 @@ public class XMLSignatureVerificationInvoker { * <code>trustProfile</code> cannot be read from the file * system. */ - private CheckResult validateSignerCertificate(XMLSignatureVerificationResult result, TrustProfile trustProfile) + private CheckResult validateSignerCertificate(XMLSignatureVerificationResult result, + TrustProfile trustProfile) throws MOAException { MessageProvider msg = MessageProvider.getInstance(); int resultCode = result.getCertificateValidationResult().getValidationResultCode().intValue(); + if (resultCode == 0 && trustProfile.getSignerCertsUri() != null) { X509Certificate signerCertificate = (X509Certificate) result.getCertificateValidationResult() .getCertificateChain().get(0); diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/AdESResultUtils.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/AdESResultUtils.java index 90722b8..4903391 100644 --- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/AdESResultUtils.java +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/AdESResultUtils.java @@ -1,15 +1,20 @@ package at.gv.egovernment.moa.spss.util; +import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import at.gv.egovernment.moa.spss.api.common.ExtendedCertificateCheckResult; import at.gv.egovernment.moa.spss.api.impl.AdESFormResultsImpl; +import at.gv.egovernment.moa.spss.api.impl.ExtendedCertificateCheckResultImpl; import at.gv.egovernment.moaspss.logging.Logger; import iaik.esi.sva.validation.ValidationReport; import iaik.server.ConfigurationException; +import iaik.server.modules.AdESVerificationResult; import iaik.server.modules.ResultCode; import iaik.server.modules.ResultCodeInvalid; import iaik.server.modules.ResultCodeValid; +import iaik.server.modules.SignatureVerificationProfile; import iaik.server.modules.SignatureVerificationResult; public class AdESResultUtils { @@ -17,39 +22,159 @@ public class AdESResultUtils { public static Integer getResultCode(Integer adesCode) { return adesCode; } - - public static void buildResult(ValidationReport report, List adesList) { + + public static ExtendedCertificateCheckResult getExtendedResult(iaik.server.modules.ResultCode resultCode) { + ExtendedCertificateCheckResult check = null; + + int majorCode = -1; + String majorInfo = ""; + int minorCode = -1; + String minorInfo = ""; + + Logger.debug("Generating extendend validation result: " + resultCode.toString()); - if(report == null) { + if (resultCode instanceof ResultCodeValid) { + majorCode = SignatureVerificationResult.VALID; + majorInfo = "VALID"; + } else if (resultCode instanceof ResultCodeInvalid) { + majorCode = SignatureVerificationResult.INVALID; + majorInfo = "INVALID"; + } else { + majorCode = SignatureVerificationResult.INDETERMINATE; + majorInfo = "INDETERMINATE"; + } + + if (resultCode.getCode() != null) { + minorCode = resultCode.getCode(); + if (resultCode.getCode().equals(ResultCode.CODE_CHAIN_CONSTRAINTS_FAILURE)) { + minorInfo = "CHAIN_CONSTRAINTS_FAILURE"; + } else if (resultCode.getCode().equals(ResultCode.CODE_CRYPTO_CONSTRAINTS_FAILURE)) { + minorInfo = "CRYPTO_CONSTRAINTS_FAILURE"; + } else if (resultCode.getCode().equals(ResultCode.CODE_CRYPTO_CONSTRAINTS_FAILURE_NO_POE)) { + minorInfo = "CRYPTO_CONSTRAINTS_FAILURE_NO_POE"; + } else if (resultCode.getCode().equals(ResultCode.CODE_EXPIRED)) { + minorInfo = "EXPIRED"; + } else if (resultCode.getCode().equals(ResultCode.CODE_FORMAT_FAILURE)) { + minorInfo = "FORMAT_FAILURE"; + } else if (resultCode.getCode().equals(ResultCode.CODE_GENERIC)) { + minorInfo = "GENERIC"; + } else if (resultCode.getCode().equals(ResultCode.CODE_HASH_FAILURE)) { + minorInfo = "HASH_FAILURE"; + } else if (resultCode.getCode().equals(ResultCode.CODE_NO_CERTIFICATE_CHAIN_FOUND)) { + minorInfo = "NO_CERTIFICATE_CHAIN_FOUND"; + } else if (resultCode.getCode().equals(ResultCode.CODE_NO_POE)) { + minorInfo = "NO_POE"; + } else if (resultCode.getCode().equals(ResultCode.CODE_NO_POLICY)) { + minorInfo = "NO_POLICY"; + } else if (resultCode.getCode().equals(ResultCode.CODE_NOT_YET_VALID)) { + minorInfo = "NOT_YET_VALID"; + } else if (resultCode.getCode().equals(ResultCode.CODE_OUT_OF_BOUNDS_NO_POE)) { + minorInfo = "OUT_OF_BOUNDS_NO_POE"; + } else if (resultCode.getCode().equals(ResultCode.CODE_POLICY_PROCESSING_ERROR)) { + minorInfo = "POLICY_PROCESSING_ERROR"; + } else if (resultCode.getCode().equals(ResultCode.CODE_REVOKED)) { + minorInfo = "REVOKED"; + } else if (resultCode.getCode().equals(ResultCode.CODE_REVOKED_CA_NO_POE)) { + minorInfo = "REVOKED_CA_NO_POE"; + } else if (resultCode.getCode().equals(ResultCode.CODE_REVOKED_NO_POE)) { + minorInfo = "REVOKED_NO_POE"; + } else if (resultCode.getCode().equals(ResultCode.CODE_SIG_CONSTRAINTS_FAILURE)) { + minorInfo = "SIG_CONSTRAINTS_FAILURE"; + } else if (resultCode.getCode().equals(ResultCode.CODE_SIG_CRYPTO_FAILURE)) { + minorInfo = "SIG_CRYPTO_FAILURE"; + } else if (resultCode.getCode().equals(ResultCode.CODE_SIGNED_DATA_NOT_FOUND)) { + minorInfo = "SIGNED_DATA_NOT_FOUND"; + } else if (resultCode.getCode().equals(ResultCode.CODE_TIMESTAMP_ORDER_FAILURE)) { + minorInfo = "TIMESTAMP_ORDER_FAILURE"; + } else if (resultCode.getCode().equals(ResultCode.CODE_TRY_LATER)) { + minorInfo = "TRY_LATER"; + } else if (resultCode.getCode().equals(ResultCode.CODE_UNKNOWN_COMMITMENT_TYPE)) { + minorInfo = "UNKNOWN_COMMITMENT_TYPE"; + } else if (resultCode.getCode().equals(ResultCode.SUCCESS)) { + minorInfo = "SUCCESS"; + } + } + + check = new ExtendedCertificateCheckResultImpl(majorCode, majorInfo, minorCode, + minorInfo); + + return check; + + } + + public static List getAdESResult(iaik.server.modules.AdESFormVerificationResult adesFormVerification) { + if (adesFormVerification == null) { + // no form information + return null; + } + + List adesList = new ArrayList(); + + checkSubResult(adesFormVerification.getSubResult(SignatureVerificationProfile.LEVEL_LTA), + SignatureVerificationProfile.LEVEL_LTA, adesList); + checkSubResult(adesFormVerification.getSubResult(SignatureVerificationProfile.LEVEL_LT), + SignatureVerificationProfile.LEVEL_LT, adesList); + checkSubResult(adesFormVerification.getSubResult(SignatureVerificationProfile.LEVEL_T), + SignatureVerificationProfile.LEVEL_T, adesList); + checkSubResult(adesFormVerification.getSubResult(SignatureVerificationProfile.LEVEL_B), + SignatureVerificationProfile.LEVEL_B, adesList); + + return adesList; + } + + public static void buildResult(ValidationReport report, List adesList) { + + if (report == null) { return; } - - AdESFormResultsImpl adESFormResultsImpl = new AdESFormResultsImpl(); + + AdESFormResultsImpl adESFormResultsImpl = new AdESFormResultsImpl(); adESFormResultsImpl.setCode(report.getStatus().ordinal()); adESFormResultsImpl.setInfo(report.getLongText()); adESFormResultsImpl.setName(report.getValidationName()); adesList.add(adESFormResultsImpl); - - if(report.getSubValidationReports() != null && !report.getSubValidationReports().isEmpty()) { + + if (report.getSubValidationReports() != null && !report.getSubValidationReports().isEmpty()) { Iterator<ValidationReport> reportIt = report.getSubValidationReports().iterator(); - while(reportIt.hasNext()) { + while (reportIt.hasNext()) { buildResult(reportIt.next(), adesList); } } - + + } + + public static void checkSubResult(AdESVerificationResult subResult, String level, List adesList) { + if (subResult != null) { + Logger.info("Checking Level: " + level); + try { + + AdESFormResultsImpl adESFormResultsImpl = new AdESFormResultsImpl(); + adESFormResultsImpl.setCode(subResult.getResultCode()); + Logger.info("RESULT: " + String.valueOf(subResult.getResultCode())); + adESFormResultsImpl.setInfo(subResult.getInfo()); + adESFormResultsImpl.setName(level); + + adesList.add(adESFormResultsImpl); + } catch (NullPointerException e) { + Logger.warn("Catching NullPointer Exception, of invalid Form Results", e); + } + } else { + Logger.info("Subresult Level: " + level + " not available"); + } } - - public static void checkSubResult(SignatureVerificationResult subResult, String level, List adesList) throws ConfigurationException { + + public static void checkSubResult(SignatureVerificationResult subResult, String level, List adesList) + throws ConfigurationException { if (subResult != null) { Logger.info("Checking Level: " + level); try { - - AdESFormResultsImpl adESFormResultsImpl = new AdESFormResultsImpl(); + + AdESFormResultsImpl adESFormResultsImpl = new AdESFormResultsImpl(); ResultCode resultCode = subResult.getResultCode(); - if(resultCode instanceof ResultCodeValid) { - adESFormResultsImpl.setCode(SignatureVerificationResult.VALID);//.getResultCode().getCode())); - } else if(resultCode instanceof ResultCodeInvalid) { + if (resultCode instanceof ResultCodeValid) { + adESFormResultsImpl.setCode(SignatureVerificationResult.VALID);// .getResultCode().getCode())); + } else if (resultCode instanceof ResultCodeInvalid) { adESFormResultsImpl.setCode(SignatureVerificationResult.INVALID); } else { adESFormResultsImpl.setCode(SignatureVerificationResult.INDETERMINATE); @@ -66,5 +191,5 @@ public class AdESResultUtils { Logger.info("Subresult Level: " + level + " not available"); } } - + } 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 12a463a..f15b8c6 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/AllSignatoriesType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/AllSignatoriesType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/AnyChildrenType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/AnyChildrenType.java index 293c655..13ca6a0 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/AnyChildrenType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/AnyChildrenType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 9cf027a..5eec1e8 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSContentBaseType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSContentBaseType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 068e736..cd118f2 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectInfoType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectInfoType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 d72e7d4..2c0cc35 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: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 da8abe0..7ee94a0 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: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 9d04b30..909f3ae 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CanonicalizationMethodType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CanonicalizationMethodType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // @@ -70,8 +70,8 @@ public class CanonicalizationMethodType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link Object } * {@link String } + * {@link Object } * * */ 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 d5af3ed..9a66392 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CheckResultType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CheckResultType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 50e7680..35de827 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentBaseType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentBaseType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 841e8f0..c14ebec 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentExLocRefBaseType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentExLocRefBaseType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 fbe544b..b6d9109 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentOptionalRefType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentOptionalRefType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // @@ -36,8 +36,8 @@ import javax.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "ContentOptionalRefType") @XmlSeeAlso({ - CMSContentBaseType.class, ContentRequiredRefType.class, + CMSContentBaseType.class, at.gv.egiz.moasig.DataObjectInfoType.DataObject.class }) public class ContentOptionalRefType 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 143cb71..933c352 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentRequiredRefType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentRequiredRefType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 abed586..129cc35 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureRequest.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureRequest.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 9af73cb..088dd74 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureRequestType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureRequestType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 6df5b28..7423e89 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureResponseType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureResponseType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 1bcf19c..030a112 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateSignatureEnvironmentProfile.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateSignatureEnvironmentProfile.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 0165f97..8c60d7a 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateSignatureLocationType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateSignatureLocationType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateTransformsInfoProfile.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateTransformsInfoProfile.java index da405da..e99caca 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateTransformsInfoProfile.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateTransformsInfoProfile.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 0e241ca..c141926 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureRequest.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureRequest.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 83032ae..d5d131e 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureRequestType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureRequestType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 6bae298..da52b65 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureResponseType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureResponseType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 0b01219..e0586c9 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DSAKeyValueType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DSAKeyValueType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DataObjectInfoType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DataObjectInfoType.java index 583adc2..16fc1e4 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DataObjectInfoType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DataObjectInfoType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 9ea1e7f..647ac8f 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DigestMethodType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DigestMethodType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 f2e99a0..48728a7 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ErrorResponseType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ErrorResponseType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ExtendedCertificateCheckResultType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ExtendedCertificateCheckResultType.java new file mode 100644 index 0000000..7f5929b --- /dev/null +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ExtendedCertificateCheckResultType.java @@ -0,0 +1,97 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2016.06.09 at 06:28:21 AM CEST +// + + +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.XmlType; + + +/** + * <p>Java class for ExtendedCertificateCheckResultType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="ExtendedCertificateCheckResultType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="Major" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}IndicationResultType"/> + * <element name="Minor" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}IndicationResultType" minOccurs="0"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "ExtendedCertificateCheckResultType", propOrder = { + "major", + "minor" +}) +public class ExtendedCertificateCheckResultType { + + @XmlElement(name = "Major", required = true) + protected IndicationResultType major; + @XmlElement(name = "Minor") + protected IndicationResultType minor; + + /** + * Gets the value of the major property. + * + * @return + * possible object is + * {@link IndicationResultType } + * + */ + public IndicationResultType getMajor() { + return major; + } + + /** + * Sets the value of the major property. + * + * @param value + * allowed object is + * {@link IndicationResultType } + * + */ + public void setMajor(IndicationResultType value) { + this.major = value; + } + + /** + * Gets the value of the minor property. + * + * @return + * possible object is + * {@link IndicationResultType } + * + */ + public IndicationResultType getMinor() { + return minor; + } + + /** + * Sets the value of the minor property. + * + * @param value + * allowed object is + * {@link IndicationResultType } + * + */ + public void setMinor(IndicationResultType value) { + this.minor = value; + } + +} 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 75ad23f..d353f07 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/FinalDataMetaInfoType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/FinalDataMetaInfoType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 bff368e..8661a78 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/FormResultType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/FormResultType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/IndicationResultType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/IndicationResultType.java new file mode 100644 index 0000000..d297898 --- /dev/null +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/IndicationResultType.java @@ -0,0 +1,100 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2016.06.09 at 06:28:21 AM CEST +// + + +package at.gv.egiz.moasig; + +import java.math.BigInteger; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for IndicationResultType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="IndicationResultType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="Code" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger"/> + * <element name="Name" type="{http://www.w3.org/2001/XMLSchema}string"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "IndicationResultType", propOrder = { + "code", + "name" +}) +public class IndicationResultType { + + @XmlElement(name = "Code", required = true) + @XmlSchemaType(name = "nonNegativeInteger") + protected BigInteger code; + @XmlElement(name = "Name", required = true) + protected String name; + + /** + * Gets the value of the code property. + * + * @return + * possible object is + * {@link BigInteger } + * + */ + public BigInteger getCode() { + return code; + } + + /** + * Sets the value of the code property. + * + * @param value + * allowed object is + * {@link BigInteger } + * + */ + public void setCode(BigInteger value) { + this.code = value; + } + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + +} 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 fa6f5cf..55daace 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/InputDataType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/InputDataType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 d71a201..3d0a2db 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyInfoType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyInfoType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // @@ -62,11 +62,11 @@ public class KeyInfoType { @XmlElementRefs({ @XmlElementRef(name = "KeyName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), @XmlElementRef(name = "MgmtData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "KeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), @XmlElementRef(name = "SPKIData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), @XmlElementRef(name = "PGPData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "RetrievalMethod", 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 = "KeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), + @XmlElementRef(name = "X509Data", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), + @XmlElementRef(name = "RetrievalMethod", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) }) @XmlMixed @XmlAnyElement(lax = true) @@ -96,13 +96,13 @@ public class KeyInfoType { * <p> * Objects of the following type(s) are allowed in the list * {@link Object } - * {@link Element } * {@link JAXBElement }{@code <}{@link String }{@code >} - * {@link String } * {@link JAXBElement }{@code <}{@link String }{@code >} - * {@link JAXBElement }{@code <}{@link KeyValueType }{@code >} * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >} * {@link JAXBElement }{@code <}{@link PGPDataType }{@code >} + * {@link JAXBElement }{@code <}{@link KeyValueType }{@code >} + * {@link String } + * {@link Element } * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >} * {@link JAXBElement }{@code <}{@link X509DataType }{@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 c13bd59..5bab822 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyStorageType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyStorageType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyValueType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyValueType.java index fd29043..f2368dd 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyValueType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyValueType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // @@ -74,11 +74,11 @@ public class KeyValueType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link Element } * {@link Object } - * {@link String } * {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >} + * {@link Element } * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >} + * {@link String } * * */ diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestRefsCheckResultInfoType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestRefsCheckResultInfoType.java index 9cc9fdc..3ecbcee 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestRefsCheckResultInfoType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestRefsCheckResultInfoType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 73b6d45..98b0b63 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestRefsCheckResultType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestRefsCheckResultType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 82e4e31..1ebead3 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MetaInfoType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MetaInfoType.java index 48c012c..75b927c 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MetaInfoType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MetaInfoType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 213d3b6..0c85bbb 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: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // @@ -50,8 +50,8 @@ import javax.xml.bind.annotation.XmlType; public class MoaTransformType { @XmlElementRefs({ - @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) + @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) }) @XmlMixed protected List<Serializable> content; @@ -77,9 +77,9 @@ public class MoaTransformType { * * <p> * Objects of the following type(s) are allowed in the list + * {@link JAXBElement }{@code <}{@link byte[]}{@code >} * {@link JAXBElement }{@code <}{@link String }{@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 22147f6..127f92a 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: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 index 009a20a..82dc683 100644 --- 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 @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 7c3bfc2..a0436fe 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ObjectFactory.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ObjectFactory.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // @@ -57,8 +57,8 @@ public class ObjectFactory { 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 _CreateCMSSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "CreateCMSSignatureResponse"); private final static QName _SupplementProfile_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "SupplementProfile"); + private final static QName _CreateCMSSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "CreateCMSSignatureResponse"); private final static QName _VerifyCMSSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "VerifyCMSSignatureResponse"); private final static QName _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"); @@ -73,21 +73,22 @@ public class ObjectFactory { 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 _SPKIDataTypeSPKISexp_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKISexp"); - 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 _VerifyCMSSignatureResponseTypeFormCheckResult_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "FormCheckResult"); - private final static QName _MoaTransformTypeTransformData_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "transformData"); - private final static QName _MoaTransformTypeXPath_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "XPath"); - private final static QName _SignatureMethodTypeHMACOutputLength_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "HMACOutputLength"); - 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 _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 _TransformTypeXPath_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "XPath"); + private final static QName _SignatureMethodTypeHMACOutputLength_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "HMACOutputLength"); + private final static QName _MoaTransformTypeTransformData_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "transformData"); + private final static QName _MoaTransformTypeXPath_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "XPath"); + private final static QName _VerifyCMSSignatureResponseTypeSignatureCheck_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "SignatureCheck"); + private final static QName _VerifyCMSSignatureResponseTypeCertificateCheck_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "CertificateCheck"); + private final static QName _VerifyCMSSignatureResponseTypeSignerInfo_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "SignerInfo"); + private final static QName _VerifyCMSSignatureResponseTypeExtendedCertificateCheck_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "ExtendedCertificateCheck"); + private final static QName _VerifyCMSSignatureResponseTypeFormCheckResult_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "FormCheckResult"); /** * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.gv.egiz.moasig @@ -369,11 +370,67 @@ public class ObjectFactory { } /** - * Create an instance of {@link FormResultType } + * Create an instance of {@link ManifestRefsCheckResultType } * */ - public FormResultType createFormResultType() { - return new FormResultType(); + public ManifestRefsCheckResultType createManifestRefsCheckResultType() { + return new ManifestRefsCheckResultType(); + } + + /** + * Create an instance of {@link CheckResultType } + * + */ + public CheckResultType createCheckResultType() { + return new CheckResultType(); + } + + /** + * Create an instance of {@link IndicationResultType } + * + */ + public IndicationResultType createIndicationResultType() { + return new IndicationResultType(); + } + + /** + * Create an instance of {@link ExtendedCertificateCheckResultType } + * + */ + public ExtendedCertificateCheckResultType createExtendedCertificateCheckResultType() { + return new ExtendedCertificateCheckResultType(); + } + + /** + * Create an instance of {@link ContentExLocRefBaseType } + * + */ + public ContentExLocRefBaseType createContentExLocRefBaseType() { + return new ContentExLocRefBaseType(); + } + + /** + * Create an instance of {@link VerifyTransformsDataType } + * + */ + public VerifyTransformsDataType createVerifyTransformsDataType() { + return new VerifyTransformsDataType(); + } + + /** + * Create an instance of {@link ContentRequiredRefType } + * + */ + public ContentRequiredRefType createContentRequiredRefType() { + return new ContentRequiredRefType(); + } + + /** + * Create an instance of {@link NamespaceDeclarationType } + * + */ + public NamespaceDeclarationType createNamespaceDeclarationType() { + return new NamespaceDeclarationType(); } /** @@ -385,11 +442,11 @@ public class ObjectFactory { } /** - * Create an instance of {@link ManifestRefsCheckResultType } + * Create an instance of {@link FormResultType } * */ - public ManifestRefsCheckResultType createManifestRefsCheckResultType() { - return new ManifestRefsCheckResultType(); + public FormResultType createFormResultType() { + return new FormResultType(); } /** @@ -409,14 +466,6 @@ public class ObjectFactory { } /** - * Create an instance of {@link CheckResultType } - * - */ - public CheckResultType createCheckResultType() { - return new CheckResultType(); - } - - /** * Create an instance of {@link ContentBaseType } * */ @@ -425,19 +474,19 @@ public class ObjectFactory { } /** - * 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 PDFSignatureResultType } * */ - public FinalDataMetaInfoType createFinalDataMetaInfoType() { - return new FinalDataMetaInfoType(); + public PDFSignatureResultType createPDFSignatureResultType() { + return new PDFSignatureResultType(); } /** @@ -473,30 +522,6 @@ public class ObjectFactory { } /** - * Create an instance of {@link ContentExLocRefBaseType } - * - */ - public ContentExLocRefBaseType createContentExLocRefBaseType() { - return new ContentExLocRefBaseType(); - } - - /** - * Create an instance of {@link AnyChildrenType } - * - */ - public AnyChildrenType createAnyChildrenType() { - return new AnyChildrenType(); - } - - /** - * Create an instance of {@link ManifestRefsCheckResultInfoType } - * - */ - public ManifestRefsCheckResultInfoType createManifestRefsCheckResultInfoType() { - return new ManifestRefsCheckResultInfoType(); - } - - /** * Create an instance of {@link ReferencesCheckResultType } * */ @@ -505,27 +530,19 @@ public class ObjectFactory { } /** - * Create an instance of {@link VerifyTransformsDataType } - * - */ - public VerifyTransformsDataType createVerifyTransformsDataType() { - return new VerifyTransformsDataType(); - } - - /** - * Create an instance of {@link ContentRequiredRefType } + * Create an instance of {@link ManifestRefsCheckResultInfoType } * */ - public ContentRequiredRefType createContentRequiredRefType() { - return new ContentRequiredRefType(); + public ManifestRefsCheckResultInfoType createManifestRefsCheckResultInfoType() { + return new ManifestRefsCheckResultInfoType(); } /** - * Create an instance of {@link NamespaceDeclarationType } + * Create an instance of {@link AnyChildrenType } * */ - public NamespaceDeclarationType createNamespaceDeclarationType() { - return new NamespaceDeclarationType(); + public AnyChildrenType createAnyChildrenType() { + return new AnyChildrenType(); } /** @@ -969,21 +986,21 @@ public class ObjectFactory { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link CreateCMSSignatureResponseType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link XMLDataObjectAssociationType }{@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 = "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 XMLDataObjectAssociationType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link CreateCMSSignatureResponseType }{@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://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); } /** @@ -1113,66 +1130,48 @@ public class ObjectFactory { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link CheckResultType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "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 CheckResultType }{@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); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@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 = "X509IssuerSerial", scope = X509DataType.class) + public JAXBElement<X509IssuerSerialType> createX509DataTypeX509IssuerSerial(X509IssuerSerialType value) { + return new JAXBElement<X509IssuerSerialType>(_X509DataTypeX509IssuerSerial_QNAME, X509IssuerSerialType.class, X509DataType.class, 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 = "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 >}} * */ - @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://www.w3.org/2000/09/xmldsig#", name = "X509SKI", scope = X509DataType.class) + public JAXBElement<byte[]> createX509DataTypeX509SKI(byte[] value) { + return new JAXBElement<byte[]>(_X509DataTypeX509SKI_QNAME, byte[].class, X509DataType.class, ((byte[]) value)); } /** * Create an instance of {@link JAXBElement }{@code <}{@link String }{@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://www.w3.org/2000/09/xmldsig#", name = "X509SubjectName", scope = X509DataType.class) + public JAXBElement<String> createX509DataTypeX509SubjectName(String value) { + return new JAXBElement<String>(_X509DataTypeX509SubjectName_QNAME, String.class, X509DataType.class, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@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://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)); } /** @@ -1194,57 +1193,84 @@ public class ObjectFactory { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509IssuerSerial", scope = X509DataType.class) - public JAXBElement<X509IssuerSerialType> createX509DataTypeX509IssuerSerial(X509IssuerSerialType value) { - return new JAXBElement<X509IssuerSerialType>(_X509DataTypeX509IssuerSerial_QNAME, X509IssuerSerialType.class, X509DataType.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 byte[]}{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@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 = "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 >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509SKI", scope = X509DataType.class) - public JAXBElement<byte[]> createX509DataTypeX509SKI(byte[] value) { - return new JAXBElement<byte[]>(_X509DataTypeX509SKI_QNAME, byte[].class, X509DataType.class, ((byte[]) value)); + @XmlElementDecl(namespace = "http://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 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); + @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 >}} + * Create an instance of {@link JAXBElement }{@code <}{@link CheckResultType }{@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://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 CheckResultType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "XPath", scope = TransformType.class) - public JAXBElement<String> createTransformTypeXPath(String value) { - return new JAXBElement<String>(_TransformTypeXPath_QNAME, String.class, TransformType.class, value); + @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 KeyInfoType }{@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); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link ExtendedCertificateCheckResultType }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "ExtendedCertificateCheck", scope = VerifyCMSSignatureResponseType.class) + public JAXBElement<ExtendedCertificateCheckResultType> createVerifyCMSSignatureResponseTypeExtendedCertificateCheck(ExtendedCertificateCheckResultType value) { + return new JAXBElement<ExtendedCertificateCheckResultType>(_VerifyCMSSignatureResponseTypeExtendedCertificateCheck_QNAME, ExtendedCertificateCheckResultType.class, VerifyCMSSignatureResponseType.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link FormResultType }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "FormCheckResult", scope = VerifyCMSSignatureResponseType.class) + public JAXBElement<FormResultType> createVerifyCMSSignatureResponseTypeFormCheckResult(FormResultType value) { + return new JAXBElement<FormResultType>(_VerifyCMSSignatureResponseTypeFormCheckResult_QNAME, FormResultType.class, VerifyCMSSignatureResponseType.class, value); } } diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ObjectType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ObjectType.java index 7587cc6..d9d6f39 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ObjectType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ObjectType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 be342cf..8fadbe0 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PDFSignatureResultType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PDFSignatureResultType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // @@ -30,6 +30,7 @@ import javax.xml.bind.annotation.XmlType; * <element name="SignatureCheck" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}CheckResultType"/> * <element name="CertificateCheck" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}CheckResultType"/> * <element name="FormCheckResult" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}FormResultType" maxOccurs="unbounded" minOccurs="0"/> + * <element name="ExtendedCertificateCheck" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}ExtendedCertificateCheckResultType" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -43,7 +44,8 @@ import javax.xml.bind.annotation.XmlType; "signerInfo", "signatureCheck", "certificateCheck", - "formCheckResult" + "formCheckResult", + "extendedCertificateCheck" }) public class PDFSignatureResultType { @@ -55,6 +57,8 @@ public class PDFSignatureResultType { protected CheckResultType certificateCheck; @XmlElement(name = "FormCheckResult") protected List<FormResultType> formCheckResult; + @XmlElement(name = "ExtendedCertificateCheck") + protected ExtendedCertificateCheckResultType extendedCertificateCheck; /** * Gets the value of the signerInfo property. @@ -157,4 +161,28 @@ public class PDFSignatureResultType { return this.formCheckResult; } + /** + * Gets the value of the extendedCertificateCheck property. + * + * @return + * possible object is + * {@link ExtendedCertificateCheckResultType } + * + */ + public ExtendedCertificateCheckResultType getExtendedCertificateCheck() { + return extendedCertificateCheck; + } + + /** + * Sets the value of the extendedCertificateCheck property. + * + * @param value + * allowed object is + * {@link ExtendedCertificateCheckResultType } + * + */ + public void setExtendedCertificateCheck(ExtendedCertificateCheckResultType value) { + this.extendedCertificateCheck = value; + } + } 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 4d60578..c3f27e3 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PDFSignedRepsonse.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PDFSignedRepsonse.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 c47aebe..826fc28 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PGPDataType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PGPDataType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // @@ -54,8 +54,8 @@ import org.w3c.dom.Element; public class PGPDataType { @XmlElementRefs({ - @XmlElementRef(name = "PGPKeyPacket", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "PGPKeyID", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) + @XmlElementRef(name = "PGPKeyID", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), + @XmlElementRef(name = "PGPKeyPacket", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) }) @XmlAnyElement(lax = true) protected List<Object> content; @@ -88,9 +88,9 @@ 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 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 d4832d8..c1cc02e 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PublicAuthorityType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PublicAuthorityType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/QualifiedCertificate.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/QualifiedCertificate.java index c4e38b9..efb4eea 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/QualifiedCertificate.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/QualifiedCertificate.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/RSAKeyValueType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/RSAKeyValueType.java index 1a2c0ad..338de95 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/RSAKeyValueType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/RSAKeyValueType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferenceType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferenceType.java index 38e159d..cd501c3 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferenceType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferenceType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferencesCheckResultInfoType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferencesCheckResultInfoType.java index 73d682c..11cef97 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferencesCheckResultInfoType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferencesCheckResultInfoType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 aec0d92..bf50314 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferencesCheckResultType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferencesCheckResultType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 08680c9..837c2e7 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/RetrievalMethodType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/RetrievalMethodType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SPKIDataType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SPKIDataType.java index 4b2aba8..472b9ee 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SPKIDataType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SPKIDataType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // @@ -68,8 +68,8 @@ public class SPKIDataType { * <p> * Objects of the following type(s) are allowed in the list * {@link Object } - * {@link Element } * {@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 aca7872..3577910 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SecureSignatureCreationDevice.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SecureSignatureCreationDevice.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureMethodType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureMethodType.java index 0481414..3645163 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureMethodType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureMethodType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 8225914..666ea81 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignaturePropertiesType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignaturePropertiesType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignaturePropertyType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignaturePropertyType.java index 14fe1ad..b252649 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignaturePropertyType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignaturePropertyType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 9452d69..804a1d5 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureValueType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureValueType.java index ec0c199..5201ee6 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureValueType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureValueType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignedInfoType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignedInfoType.java index 7c8fb2d..af29580 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignedInfoType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignedInfoType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformParameterType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformParameterType.java index 83326e5..3b94f4b 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformParameterType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformParameterType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformType.java index 1d83806..d270580 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // @@ -75,9 +75,9 @@ 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 Element } * {@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 37ee86e..583858d 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformsInfoType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformsInfoType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 eea68d0..8c035a4 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformsType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformsType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 a515d09..4294b6f 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureRequest.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureRequest.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 fc1230f..a8f1eda 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureRequestType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureRequestType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 8373ac3..9068808 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureResponseType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureResponseType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // @@ -32,6 +32,7 @@ import javax.xml.bind.annotation.XmlType; * <element name="SignatureCheck" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}CheckResultType"/> * <element name="CertificateCheck" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}CheckResultType"/> * <element name="FormCheckResult" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}FormResultType" maxOccurs="unbounded" minOccurs="0"/> + * <element name="ExtendedCertificateCheck" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}ExtendedCertificateCheckResultType" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -47,10 +48,11 @@ 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 = "SignerInfo", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class), @XmlElementRef(name = "SignatureCheck", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class), - @XmlElementRef(name = "FormCheckResult", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class) + @XmlElementRef(name = "ExtendedCertificateCheck", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class), + @XmlElementRef(name = "FormCheckResult", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class), + @XmlElementRef(name = "CertificateCheck", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class) }) protected List<JAXBElement<?>> signerInfoAndSignatureCheckAndCertificateCheck; @@ -72,10 +74,11 @@ public class VerifyCMSSignatureResponseType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link CheckResultType }{@code >} + * {@link JAXBElement }{@code <}{@link ExtendedCertificateCheckResultType }{@code >} + * {@link JAXBElement }{@code <}{@link FormResultType }{@code >} * {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >} * {@link JAXBElement }{@code <}{@link CheckResultType }{@code >} - * {@link JAXBElement }{@code <}{@link FormResultType }{@code >} + * {@link JAXBElement }{@code <}{@link CheckResultType }{@code >} * * */ diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureRequest.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureRequest.java index 954d961..bb06824 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: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 b2cc6e6..6cb4858 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureRequestType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureRequestType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureResponseType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureResponseType.java index cda88ae..1ab3ef2 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureResponseType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureResponseType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 e9b0be9..0c10bef 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyTransformsDataType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyTransformsDataType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 03384e6..43c29bb 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyTransformsInfoProfile.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyTransformsInfoProfile.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 55ea915..8bad296 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: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 e31bfe0..9a1427c 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureRequestType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureRequestType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 22de8de..622b90f 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureResponseType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureResponseType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // @@ -34,6 +34,7 @@ import javax.xml.bind.annotation.XmlType; * <element name="XMLDSIGManifestCheck" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}ManifestRefsCheckResultType" maxOccurs="unbounded" minOccurs="0"/> * <element name="CertificateCheck" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}CheckResultType"/> * <element name="FormCheckResult" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}FormResultType" maxOccurs="unbounded" minOccurs="0"/> + * <element name="ExtendedCertificateCheck" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}ExtendedCertificateCheckResultType" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -51,7 +52,8 @@ import javax.xml.bind.annotation.XmlType; "signatureManifestCheck", "xmldsigManifestCheck", "certificateCheck", - "formCheckResult" + "formCheckResult", + "extendedCertificateCheck" }) public class VerifyXMLSignatureResponseType { @@ -71,6 +73,8 @@ public class VerifyXMLSignatureResponseType { protected CheckResultType certificateCheck; @XmlElement(name = "FormCheckResult") protected List<FormResultType> formCheckResult; + @XmlElement(name = "ExtendedCertificateCheck") + protected ExtendedCertificateCheckResultType extendedCertificateCheck; /** * Gets the value of the signerInfo property. @@ -284,4 +288,28 @@ public class VerifyXMLSignatureResponseType { return this.formCheckResult; } + /** + * Gets the value of the extendedCertificateCheck property. + * + * @return + * possible object is + * {@link ExtendedCertificateCheckResultType } + * + */ + public ExtendedCertificateCheckResultType getExtendedCertificateCheck() { + return extendedCertificateCheck; + } + + /** + * Sets the value of the extendedCertificateCheck property. + * + * @param value + * allowed object is + * {@link ExtendedCertificateCheckResultType } + * + */ + public void setExtendedCertificateCheck(ExtendedCertificateCheckResultType value) { + this.extendedCertificateCheck = value; + } + } 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 9eb776f..76ad845 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/X509DataType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/X509DataType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // @@ -54,10 +54,10 @@ 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 = "X509SubjectName", 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 = "X509IssuerSerial", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), + @XmlElementRef(name = "X509Certificate", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), + @XmlElementRef(name = "X509SKI", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) }) @XmlAnyElement(lax = true) protected List<Object> x509IssuerSerialOrX509SKIOrX509SubjectName; @@ -80,13 +80,13 @@ 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 String }{@code >} - * {@link JAXBElement }{@code <}{@link byte[]}{@code >} * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >} + * {@link JAXBElement }{@code <}{@link byte[]}{@code >} + * {@link Element } + * {@link JAXBElement }{@code <}{@link byte[]}{@code >} * * */ diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/X509IssuerSerialType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/X509IssuerSerialType.java index ab08f10..684ade3 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/X509IssuerSerialType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/X509IssuerSerialType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 ea611e3..f0c8a59 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/XMLDataObjectAssociationType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/XMLDataObjectAssociationType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 index 5381867..3105a9a 100644 --- 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 @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // 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 112d41c..cb3fb6c 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: 2016.05.02 at 02:57:59 PM CEST +// Generated on: 2016.06.09 at 06:28:21 AM CEST // @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/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 55f0259..3fb11ee 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 @@ -216,6 +216,7 @@ <xsd:element name="CertificateCheck" type="CheckResultType" /> <xsd:element name="FormCheckResult" type="FormResultType" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="ExtendedCertificateCheck" type="ExtendedCertificateCheckResultType" minOccurs="0" maxOccurs="1"/> </xsd:sequence> </xsd:complexType> <!--########## Verify PDF Signature ### --> @@ -264,6 +265,7 @@ <xsd:element name="CertificateCheck" type="CheckResultType" /> <xsd:element name="FormCheckResult" type="FormResultType" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="ExtendedCertificateCheck" type="ExtendedCertificateCheckResultType" minOccurs="0" maxOccurs="1"/> </xsd:sequence> </xsd:complexType> <!--########## Verify XML Signature ### --> @@ -346,6 +348,7 @@ <xsd:element name="CertificateCheck" type="CheckResultType" /> <xsd:element name="FormCheckResult" type="FormResultType" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="ExtendedCertificateCheck" type="ExtendedCertificateCheckResultType" minOccurs="0" maxOccurs="1"/> </xsd:sequence> </xsd:complexType> <xsd:simpleType name="ProfileIdentifierType"> @@ -508,6 +511,18 @@ maxOccurs="1" /> </xsd:sequence> </xsd:complexType> + <xsd:complexType name="IndicationResultType"> + <xsd:sequence> + <xsd:element name="Code" type="xsd:nonNegativeInteger" minOccurs="1" maxOccurs="1"/> + <xsd:element name="Name" type="xsd:string" minOccurs="1" maxOccurs="1"/> + </xsd:sequence> + </xsd:complexType> + <xsd:complexType name="ExtendedCertificateCheckResultType"> + <xsd:sequence> + <xsd:element name="Major" type="IndicationResultType" minOccurs="1" maxOccurs="1"/> + <xsd:element name="Minor" type="IndicationResultType" minOccurs="0" maxOccurs="1"/> + </xsd:sequence> + </xsd:complexType> <xsd:complexType name="ReferencesCheckResultType"> <xsd:complexContent> <xsd:restriction base="CheckResultType"> 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 a12dc09..edd82cb 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 @@ -188,6 +188,7 @@ <xsd:element name="SignatureCheck" type="CheckResultType"/> <xsd:element name="CertificateCheck" type="CheckResultType"/> <xsd:element name="FormCheckResult" type="FormResultType" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="ExtendedCertificateCheck" type="ExtendedCertificateCheckResultType" minOccurs="0" maxOccurs="1"/> </xsd:sequence> </xsd:complexType> <!--########## Verify PDF Signature ###--> @@ -195,7 +196,9 @@ <xsd:element name="VerifyPDFSignatureRequest"> <xsd:complexType> <xsd:complexContent> - <xsd:extension base="VerifyPDFSignatureRequestType"/> + <xsd:extension base="VerifyPDFSignatureRequestType"> + <xsd:attribute name="Signatories" type="SignatoriesType" use="optional" default="1"/> + </xsd:extension> </xsd:complexContent> </xsd:complexType> </xsd:element> @@ -228,6 +231,7 @@ <xsd:element name="SignatureCheck" type="CheckResultType"/> <xsd:element name="CertificateCheck" type="CheckResultType"/> <xsd:element name="FormCheckResult" type="FormResultType" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="ExtendedCertificateCheck" type="ExtendedCertificateCheckResultType" minOccurs="0" maxOccurs="1"/> </xsd:sequence> </xsd:complexType> <!--########## Verify XML Signature ###--> @@ -285,6 +289,7 @@ <xsd:element name="XMLDSIGManifestCheck" type="ManifestRefsCheckResultType" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="CertificateCheck" type="CheckResultType"/> <xsd:element name="FormCheckResult" type="FormResultType" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="ExtendedCertificateCheck" type="ExtendedCertificateCheckResultType" minOccurs="0" maxOccurs="1"/> </xsd:sequence> </xsd:complexType> <xsd:simpleType name="ProfileIdentifierType"> @@ -424,6 +429,18 @@ <xsd:element name="Name" type="xsd:string" minOccurs="1" maxOccurs="1"/> </xsd:sequence> </xsd:complexType> + <xsd:complexType name="IndicationResultType"> + <xsd:sequence> + <xsd:element name="Code" type="xsd:nonNegativeInteger" minOccurs="1" maxOccurs="1"/> + <xsd:element name="Name" type="xsd:string" minOccurs="1" maxOccurs="1"/> + </xsd:sequence> + </xsd:complexType> + <xsd:complexType name="ExtendedCertificateCheckResultType"> + <xsd:sequence> + <xsd:element name="Major" type="IndicationResultType" minOccurs="1" maxOccurs="1"/> + <xsd:element name="Minor" type="IndicationResultType" minOccurs="0" maxOccurs="1"/> + </xsd:sequence> + </xsd:complexType> <xsd:complexType name="ReferencesCheckResultType"> <xsd:complexContent> <xsd:restriction base="CheckResultType"> 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 a12dc09..edd82cb 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 @@ -188,6 +188,7 @@ <xsd:element name="SignatureCheck" type="CheckResultType"/> <xsd:element name="CertificateCheck" type="CheckResultType"/> <xsd:element name="FormCheckResult" type="FormResultType" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="ExtendedCertificateCheck" type="ExtendedCertificateCheckResultType" minOccurs="0" maxOccurs="1"/> </xsd:sequence> </xsd:complexType> <!--########## Verify PDF Signature ###--> @@ -195,7 +196,9 @@ <xsd:element name="VerifyPDFSignatureRequest"> <xsd:complexType> <xsd:complexContent> - <xsd:extension base="VerifyPDFSignatureRequestType"/> + <xsd:extension base="VerifyPDFSignatureRequestType"> + <xsd:attribute name="Signatories" type="SignatoriesType" use="optional" default="1"/> + </xsd:extension> </xsd:complexContent> </xsd:complexType> </xsd:element> @@ -228,6 +231,7 @@ <xsd:element name="SignatureCheck" type="CheckResultType"/> <xsd:element name="CertificateCheck" type="CheckResultType"/> <xsd:element name="FormCheckResult" type="FormResultType" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="ExtendedCertificateCheck" type="ExtendedCertificateCheckResultType" minOccurs="0" maxOccurs="1"/> </xsd:sequence> </xsd:complexType> <!--########## Verify XML Signature ###--> @@ -285,6 +289,7 @@ <xsd:element name="XMLDSIGManifestCheck" type="ManifestRefsCheckResultType" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="CertificateCheck" type="CheckResultType"/> <xsd:element name="FormCheckResult" type="FormResultType" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="ExtendedCertificateCheck" type="ExtendedCertificateCheckResultType" minOccurs="0" maxOccurs="1"/> </xsd:sequence> </xsd:complexType> <xsd:simpleType name="ProfileIdentifierType"> @@ -424,6 +429,18 @@ <xsd:element name="Name" type="xsd:string" minOccurs="1" maxOccurs="1"/> </xsd:sequence> </xsd:complexType> + <xsd:complexType name="IndicationResultType"> + <xsd:sequence> + <xsd:element name="Code" type="xsd:nonNegativeInteger" minOccurs="1" maxOccurs="1"/> + <xsd:element name="Name" type="xsd:string" minOccurs="1" maxOccurs="1"/> + </xsd:sequence> + </xsd:complexType> + <xsd:complexType name="ExtendedCertificateCheckResultType"> + <xsd:sequence> + <xsd:element name="Major" type="IndicationResultType" minOccurs="1" maxOccurs="1"/> + <xsd:element name="Minor" type="IndicationResultType" minOccurs="0" maxOccurs="1"/> + </xsd:sequence> + </xsd:complexType> <xsd:complexType name="ReferencesCheckResultType"> <xsd:complexContent> <xsd:restriction base="CheckResultType"> |