From 4d3c33af0ba3474bc67b4f06708305c8c0129540 Mon Sep 17 00:00:00 2001 From: tkellner Date: Wed, 25 Jan 2012 14:36:53 +0000 Subject: Generated JAXB bindings for XAdES 1.4 git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@1008 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- .../_09/xmldsig_/CanonicalizationMethodType.java | 6 +- .../org/w3/_2000/_09/xmldsig_/DSAKeyValueType.java | 4 +- .../w3/_2000/_09/xmldsig_/DigestMethodType.java | 6 +- .../org/w3/_2000/_09/xmldsig_/KeyInfoType.java | 24 +- .../org/w3/_2000/_09/xmldsig_/KeyValueType.java | 14 +- .../org/w3/_2000/_09/xmldsig_/ManifestType.java | 4 +- .../org/w3/_2000/_09/xmldsig_/ObjectFactory.java | 386 ++++++++++----------- .../java/org/w3/_2000/_09/xmldsig_/ObjectType.java | 6 +- .../org/w3/_2000/_09/xmldsig_/PGPDataType.java | 16 +- .../org/w3/_2000/_09/xmldsig_/RSAKeyValueType.java | 4 +- .../org/w3/_2000/_09/xmldsig_/ReferenceType.java | 4 +- .../w3/_2000/_09/xmldsig_/RetrievalMethodType.java | 4 +- .../org/w3/_2000/_09/xmldsig_/SPKIDataType.java | 6 +- .../w3/_2000/_09/xmldsig_/SignatureMethodType.java | 6 +- .../_09/xmldsig_/SignaturePropertiesType.java | 4 +- .../_2000/_09/xmldsig_/SignaturePropertyType.java | 6 +- .../org/w3/_2000/_09/xmldsig_/SignatureType.java | 18 +- .../w3/_2000/_09/xmldsig_/SignatureValueType.java | 4 +- .../org/w3/_2000/_09/xmldsig_/SignedInfoType.java | 4 +- .../org/w3/_2000/_09/xmldsig_/TransformType.java | 8 +- .../org/w3/_2000/_09/xmldsig_/TransformsType.java | 4 +- .../org/w3/_2000/_09/xmldsig_/X509DataType.java | 16 +- .../_2000/_09/xmldsig_/X509IssuerSerialType.java | 4 +- .../org/w3/_2000/_09/xmldsig_/package-info.java | 4 +- 24 files changed, 280 insertions(+), 282 deletions(-) (limited to 'utils/src/main/java/org/w3') diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/CanonicalizationMethodType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/CanonicalizationMethodType.java index c2c257aa..86fb9f22 100644 --- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/CanonicalizationMethodType.java +++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/CanonicalizationMethodType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2010.02.24 at 05:42:21 PM MEZ +// Generated on: 2012.01.10 at 12:03:52 PM CET // @@ -70,8 +70,8 @@ public class CanonicalizationMethodType { * *

* Objects of the following type(s) are allowed in the list - * {@link Object } * {@link String } + * {@link Object } * * */ diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/DSAKeyValueType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/DSAKeyValueType.java index fe83fbb8..a7439ff8 100644 --- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/DSAKeyValueType.java +++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/DSAKeyValueType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2010.02.24 at 05:42:21 PM MEZ +// Generated on: 2012.01.10 at 12:03:52 PM CET // diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/DigestMethodType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/DigestMethodType.java index f1c1480b..e118bb4c 100644 --- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/DigestMethodType.java +++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/DigestMethodType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2010.02.24 at 05:42:21 PM MEZ +// Generated on: 2012.01.10 at 12:03:52 PM CET // @@ -72,8 +72,8 @@ public class DigestMethodType { *

* Objects of the following type(s) are allowed in the list * {@link String } - * {@link Object } * {@link Element } + * {@link Object } * * */ diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/KeyInfoType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/KeyInfoType.java index e2339e56..52b4d3fb 100644 --- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/KeyInfoType.java +++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/KeyInfoType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2010.02.24 at 05:42:21 PM MEZ +// Generated on: 2012.01.10 at 12:03:52 PM CET // @@ -60,13 +60,13 @@ import org.w3c.dom.Element; public class KeyInfoType { @XmlElementRefs({ - @XmlElementRef(name = "MgmtData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), - @XmlElementRef(name = "RetrievalMethod", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), - @XmlElementRef(name = "X509Data", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), @XmlElementRef(name = "PGPData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), @XmlElementRef(name = "KeyName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), + @XmlElementRef(name = "SPKIData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), + @XmlElementRef(name = "X509Data", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), @XmlElementRef(name = "KeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), - @XmlElementRef(name = "SPKIData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class) + @XmlElementRef(name = "MgmtData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), + @XmlElementRef(name = "RetrievalMethod", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class) }) @XmlMixed @XmlAnyElement(lax = true) @@ -95,16 +95,16 @@ public class KeyInfoType { * *

* Objects of the following type(s) are allowed in the list + * {@link JAXBElement }{@code <}{@link PGPDataType }{@code >} + * {@link Object } * {@link Element } * {@link JAXBElement }{@code <}{@link String }{@code >} - * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >} - * {@link String } + * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >} * {@link JAXBElement }{@code <}{@link X509DataType }{@code >} - * {@link Object } - * {@link JAXBElement }{@code <}{@link PGPDataType }{@code >} - * {@link JAXBElement }{@code <}{@link String }{@code >} * {@link JAXBElement }{@code <}{@link KeyValueType }{@code >} - * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link String } + * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >} * * */ diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/KeyValueType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/KeyValueType.java index 6d4e7b40..86659ace 100644 --- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/KeyValueType.java +++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/KeyValueType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2010.02.24 at 05:42:21 PM MEZ +// Generated on: 2012.01.10 at 12:03:52 PM CET // @@ -49,8 +49,8 @@ import org.w3c.dom.Element; public class KeyValueType { @XmlElementRefs({ - @XmlElementRef(name = "DSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), - @XmlElementRef(name = "RSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class) + @XmlElementRef(name = "RSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), + @XmlElementRef(name = "DSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class) }) @XmlMixed @XmlAnyElement(lax = true) @@ -74,11 +74,11 @@ public class KeyValueType { * *

* Objects of the following type(s) are allowed in the list - * {@link Object } + * {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >} * {@link Element } - * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >} + * {@link Object } * {@link String } - * {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >} + * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >} * * */ diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ManifestType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ManifestType.java index 414dba2f..5fd68ede 100644 --- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ManifestType.java +++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ManifestType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2010.02.24 at 05:42:21 PM MEZ +// Generated on: 2012.01.10 at 12:03:52 PM CET // diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ObjectFactory.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ObjectFactory.java index b0379614..7858d7f7 100644 --- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ObjectFactory.java +++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ObjectFactory.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2010.02.24 at 05:42:21 PM MEZ +// Generated on: 2012.01.10 at 12:03:52 PM CET // @@ -32,40 +32,40 @@ import javax.xml.namespace.QName; @XmlRegistry public class ObjectFactory { - 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 _Signature_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Signature"); + private final static QName _SPKIDataTypeSPKISexp_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKISexp"); private final static QName _PGPData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPData"); - private final static QName _DSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DSAKeyValue"); private final static QName _SPKIData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKIData"); - private final static QName _SignedInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignedInfo"); private final static QName _RetrievalMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RetrievalMethod"); private final static QName _CanonicalizationMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "CanonicalizationMethod"); - private final static QName _Object_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Object"); private final static QName _SignatureProperty_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperty"); private final static QName _Transforms_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transforms"); - private final static QName _SignatureValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureValue"); private final static QName _Manifest_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Manifest"); - private final static QName _Transform_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transform"); - private final static QName _X509Data_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Data"); private final static QName _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 _DigestValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestValue"); private final static QName _DigestMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestMethod"); private final static QName _MgmtData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "MgmtData"); + private final static QName _Reference_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Reference"); + private final static QName _RSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RSAKeyValue"); + private final static QName _Signature_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Signature"); + private final static QName _DSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DSAKeyValue"); + private final static QName _SignedInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignedInfo"); + private final static QName _Object_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Object"); + private final static QName _SignatureValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureValue"); + private final static QName _Transform_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transform"); + private final static QName _X509Data_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Data"); + private final static QName _DigestValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestValue"); private final static QName _SignatureProperties_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperties"); private final static QName _KeyName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyName"); private final static QName _KeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyValue"); - private final static QName _Reference_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Reference"); - private final static QName _RSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RSAKeyValue"); - 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 _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 _SPKIDataTypeSPKISexp_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKISexp"); + private final static QName _SignatureMethodTypeHMACOutputLength_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "HMACOutputLength"); + private final static QName _TransformTypeXPath_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "XPath"); /** * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.w3._2000._09.xmldsig_ @@ -74,6 +74,22 @@ public class ObjectFactory { public ObjectFactory() { } + /** + * Create an instance of {@link RSAKeyValueType } + * + */ + public RSAKeyValueType createRSAKeyValueType() { + return new RSAKeyValueType(); + } + + /** + * Create an instance of {@link SignatureMethodType } + * + */ + public SignatureMethodType createSignatureMethodType() { + return new SignatureMethodType(); + } + /** * Create an instance of {@link DigestMethodType } * @@ -83,83 +99,83 @@ public class ObjectFactory { } /** - * Create an instance of {@link ManifestType } + * Create an instance of {@link SignatureType } * */ - public ManifestType createManifestType() { - return new ManifestType(); + public SignatureType createSignatureType() { + return new SignatureType(); } /** - * Create an instance of {@link TransformType } + * Create an instance of {@link SPKIDataType } * */ - public TransformType createTransformType() { - return new TransformType(); + public SPKIDataType createSPKIDataType() { + return new SPKIDataType(); } /** - * Create an instance of {@link SignedInfoType } + * Create an instance of {@link KeyInfoType } * */ - public SignedInfoType createSignedInfoType() { - return new SignedInfoType(); + public KeyInfoType createKeyInfoType() { + return new KeyInfoType(); } /** - * Create an instance of {@link ReferenceType } + * Create an instance of {@link X509DataType } * */ - public ReferenceType createReferenceType() { - return new ReferenceType(); + public X509DataType createX509DataType() { + return new X509DataType(); } /** - * Create an instance of {@link KeyValueType } + * Create an instance of {@link ObjectType } * */ - public KeyValueType createKeyValueType() { - return new KeyValueType(); + public ObjectType createObjectType() { + return new ObjectType(); } /** - * Create an instance of {@link PGPDataType } + * Create an instance of {@link TransformsType } * */ - public PGPDataType createPGPDataType() { - return new PGPDataType(); + public TransformsType createTransformsType() { + return new TransformsType(); } /** - * Create an instance of {@link SignatureType } + * Create an instance of {@link SignaturePropertiesType } * */ - public SignatureType createSignatureType() { - return new SignatureType(); + public SignaturePropertiesType createSignaturePropertiesType() { + return new SignaturePropertiesType(); } /** - * Create an instance of {@link DSAKeyValueType } + * Create an instance of {@link PGPDataType } * */ - public DSAKeyValueType createDSAKeyValueType() { - return new DSAKeyValueType(); + public PGPDataType createPGPDataType() { + return new PGPDataType(); } /** - * Create an instance of {@link SignatureValueType } + * Create an instance of {@link ReferenceType } * */ - public SignatureValueType createSignatureValueType() { - return new SignatureValueType(); + public ReferenceType createReferenceType() { + return new ReferenceType(); } /** - * Create an instance of {@link SignaturePropertiesType } + * Create an instance of {@link TransformType } * */ - public SignaturePropertiesType createSignaturePropertiesType() { - return new SignaturePropertiesType(); + public TransformType createTransformType() { + return new TransformType(); } /** @@ -171,11 +187,11 @@ public class ObjectFactory { } /** - * Create an instance of {@link RetrievalMethodType } + * Create an instance of {@link KeyValueType } * */ - public RetrievalMethodType createRetrievalMethodType() { - return new RetrievalMethodType(); + public KeyValueType createKeyValueType() { + return new KeyValueType(); } /** @@ -187,256 +203,249 @@ public class ObjectFactory { } /** - * Create an instance of {@link SPKIDataType } - * - */ - public SPKIDataType createSPKIDataType() { - return new SPKIDataType(); - } - - /** - * Create an instance of {@link ObjectType } + * Create an instance of {@link SignedInfoType } * */ - public ObjectType createObjectType() { - return new ObjectType(); + public SignedInfoType createSignedInfoType() { + return new SignedInfoType(); } /** - * Create an instance of {@link KeyInfoType } + * Create an instance of {@link CanonicalizationMethodType } * */ - public KeyInfoType createKeyInfoType() { - return new KeyInfoType(); + public CanonicalizationMethodType createCanonicalizationMethodType() { + return new CanonicalizationMethodType(); } /** - * Create an instance of {@link TransformsType } + * Create an instance of {@link SignatureValueType } * */ - public TransformsType createTransformsType() { - return new TransformsType(); + public SignatureValueType createSignatureValueType() { + return new SignatureValueType(); } /** - * Create an instance of {@link SignatureMethodType } + * Create an instance of {@link ManifestType } * */ - public SignatureMethodType createSignatureMethodType() { - return new SignatureMethodType(); + public ManifestType createManifestType() { + return new ManifestType(); } /** - * Create an instance of {@link X509DataType } + * Create an instance of {@link RetrievalMethodType } * */ - public X509DataType createX509DataType() { - return new X509DataType(); + public RetrievalMethodType createRetrievalMethodType() { + return new RetrievalMethodType(); } /** - * Create an instance of {@link CanonicalizationMethodType } + * Create an instance of {@link DSAKeyValueType } * */ - public CanonicalizationMethodType createCanonicalizationMethodType() { - return new CanonicalizationMethodType(); + public DSAKeyValueType createDSAKeyValueType() { + return new DSAKeyValueType(); } /** - * Create an instance of {@link RSAKeyValueType } + * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} * */ - public RSAKeyValueType createRSAKeyValueType() { - return new RSAKeyValueType(); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKISexp", scope = SPKIDataType.class) + public JAXBElement createSPKIDataTypeSPKISexp(byte[] value) { + return new JAXBElement(_SPKIDataTypeSPKISexp_QNAME, byte[].class, SPKIDataType.class, ((byte[]) value)); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyID", scope = PGPDataType.class) - public JAXBElement createPGPDataTypePGPKeyID(byte[] value) { - return new JAXBElement(_PGPDataTypePGPKeyID_QNAME, byte[].class, PGPDataType.class, ((byte[]) value)); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPData") + public JAXBElement createPGPData(PGPDataType value) { + return new JAXBElement(_PGPData_QNAME, PGPDataType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyPacket", scope = PGPDataType.class) - public JAXBElement createPGPDataTypePGPKeyPacket(byte[] value) { - return new JAXBElement(_PGPDataTypePGPKeyPacket_QNAME, byte[].class, PGPDataType.class, ((byte[]) value)); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKIData") + public JAXBElement createSPKIData(SPKIDataType value) { + return new JAXBElement(_SPKIData_QNAME, SPKIDataType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link SignatureType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Signature") - public JAXBElement createSignature(SignatureType value) { - return new JAXBElement(_Signature_QNAME, SignatureType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RetrievalMethod") + public JAXBElement createRetrievalMethod(RetrievalMethodType value) { + return new JAXBElement(_RetrievalMethod_QNAME, RetrievalMethodType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link CanonicalizationMethodType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPData") - public JAXBElement createPGPData(PGPDataType value) { - return new JAXBElement(_PGPData_QNAME, PGPDataType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "CanonicalizationMethod") + public JAXBElement createCanonicalizationMethod(CanonicalizationMethodType value) { + return new JAXBElement(_CanonicalizationMethod_QNAME, CanonicalizationMethodType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertyType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DSAKeyValue") - public JAXBElement createDSAKeyValue(DSAKeyValueType value) { - return new JAXBElement(_DSAKeyValue_QNAME, DSAKeyValueType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperty") + public JAXBElement createSignatureProperty(SignaturePropertyType value) { + return new JAXBElement(_SignatureProperty_QNAME, SignaturePropertyType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link TransformsType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKIData") - public JAXBElement createSPKIData(SPKIDataType value) { - return new JAXBElement(_SPKIData_QNAME, SPKIDataType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Transforms") + public JAXBElement createTransforms(TransformsType value) { + return new JAXBElement(_Transforms_QNAME, TransformsType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link SignedInfoType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link ManifestType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignedInfo") - public JAXBElement createSignedInfo(SignedInfoType value) { - return new JAXBElement(_SignedInfo_QNAME, SignedInfoType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Manifest") + public JAXBElement createManifest(ManifestType value) { + return new JAXBElement(_Manifest_QNAME, ManifestType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link SignatureMethodType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RetrievalMethod") - public JAXBElement createRetrievalMethod(RetrievalMethodType value) { - return new JAXBElement(_RetrievalMethod_QNAME, RetrievalMethodType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureMethod") + public JAXBElement createSignatureMethod(SignatureMethodType value) { + return new JAXBElement(_SignatureMethod_QNAME, SignatureMethodType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link CanonicalizationMethodType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "CanonicalizationMethod") - public JAXBElement createCanonicalizationMethod(CanonicalizationMethodType value) { - return new JAXBElement(_CanonicalizationMethod_QNAME, CanonicalizationMethodType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyInfo") + public JAXBElement createKeyInfo(KeyInfoType value) { + return new JAXBElement(_KeyInfo_QNAME, KeyInfoType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link ObjectType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link DigestMethodType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Object") - public JAXBElement createObject(ObjectType value) { - return new JAXBElement(_Object_QNAME, ObjectType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestMethod") + public JAXBElement createDigestMethod(DigestMethodType value) { + return new JAXBElement(_DigestMethod_QNAME, DigestMethodType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertyType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperty") - public JAXBElement createSignatureProperty(SignaturePropertyType value) { - return new JAXBElement(_SignatureProperty_QNAME, SignaturePropertyType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "MgmtData") + public JAXBElement createMgmtData(String value) { + return new JAXBElement(_MgmtData_QNAME, String.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link TransformsType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link ReferenceType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Transforms") - public JAXBElement createTransforms(TransformsType value) { - return new JAXBElement(_Transforms_QNAME, TransformsType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Reference") + public JAXBElement createReference(ReferenceType value) { + return new JAXBElement(_Reference_QNAME, ReferenceType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link SignatureValueType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureValue") - public JAXBElement createSignatureValue(SignatureValueType value) { - return new JAXBElement(_SignatureValue_QNAME, SignatureValueType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RSAKeyValue") + public JAXBElement createRSAKeyValue(RSAKeyValueType value) { + return new JAXBElement(_RSAKeyValue_QNAME, RSAKeyValueType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link ManifestType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link SignatureType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Manifest") - public JAXBElement createManifest(ManifestType value) { - return new JAXBElement(_Manifest_QNAME, ManifestType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Signature") + public JAXBElement createSignature(SignatureType value) { + return new JAXBElement(_Signature_QNAME, SignatureType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link TransformType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Transform") - public JAXBElement createTransform(TransformType value) { - return new JAXBElement(_Transform_QNAME, TransformType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DSAKeyValue") + public JAXBElement createDSAKeyValue(DSAKeyValueType value) { + return new JAXBElement(_DSAKeyValue_QNAME, DSAKeyValueType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link X509DataType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link SignedInfoType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Data") - public JAXBElement createX509Data(X509DataType value) { - return new JAXBElement(_X509Data_QNAME, X509DataType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignedInfo") + public JAXBElement createSignedInfo(SignedInfoType value) { + return new JAXBElement(_SignedInfo_QNAME, SignedInfoType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link SignatureMethodType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link ObjectType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureMethod") - public JAXBElement createSignatureMethod(SignatureMethodType value) { - return new JAXBElement(_SignatureMethod_QNAME, SignatureMethodType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Object") + public JAXBElement createObject(ObjectType value) { + return new JAXBElement(_Object_QNAME, ObjectType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link SignatureValueType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyInfo") - public JAXBElement createKeyInfo(KeyInfoType value) { - return new JAXBElement(_KeyInfo_QNAME, KeyInfoType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureValue") + public JAXBElement createSignatureValue(SignatureValueType value) { + return new JAXBElement(_SignatureValue_QNAME, SignatureValueType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link TransformType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestValue") - public JAXBElement createDigestValue(byte[] value) { - return new JAXBElement(_DigestValue_QNAME, byte[].class, null, ((byte[]) value)); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Transform") + public JAXBElement createTransform(TransformType value) { + return new JAXBElement(_Transform_QNAME, TransformType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link DigestMethodType }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link X509DataType }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestMethod") - public JAXBElement createDigestMethod(DigestMethodType value) { - return new JAXBElement(_DigestMethod_QNAME, DigestMethodType.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Data") + public JAXBElement createX509Data(X509DataType value) { + return new JAXBElement(_X509Data_QNAME, X509DataType.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "MgmtData") - public JAXBElement createMgmtData(String value) { - return new JAXBElement(_MgmtData_QNAME, String.class, null, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestValue") + public JAXBElement createDigestValue(byte[] value) { + return new JAXBElement(_DigestValue_QNAME, byte[].class, null, ((byte[]) value)); } /** @@ -467,39 +476,21 @@ public class ObjectFactory { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link ReferenceType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Reference") - public JAXBElement createReference(ReferenceType value) { - return new JAXBElement(_Reference_QNAME, ReferenceType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RSAKeyValue") - public JAXBElement createRSAKeyValue(RSAKeyValueType value) { - return new JAXBElement(_RSAKeyValue_QNAME, RSAKeyValueType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "XPath", scope = TransformType.class) - public JAXBElement createTransformTypeXPath(String value) { - return new JAXBElement(_TransformTypeXPath_QNAME, String.class, TransformType.class, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyID", scope = PGPDataType.class) + public JAXBElement createPGPDataTypePGPKeyID(byte[] value) { + return new JAXBElement(_PGPDataTypePGPKeyID_QNAME, byte[].class, PGPDataType.class, ((byte[]) 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 createSignatureMethodTypeHMACOutputLength(BigInteger value) { - return new JAXBElement(_SignatureMethodTypeHMACOutputLength_QNAME, BigInteger.class, SignatureMethodType.class, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyPacket", scope = PGPDataType.class) + public JAXBElement createPGPDataTypePGPKeyPacket(byte[] value) { + return new JAXBElement(_PGPDataTypePGPKeyPacket_QNAME, byte[].class, PGPDataType.class, ((byte[]) value)); } /** @@ -548,12 +539,21 @@ public class ObjectFactory { } /** - * 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 = "SPKISexp", scope = SPKIDataType.class) - public JAXBElement createSPKIDataTypeSPKISexp(byte[] value) { - return new JAXBElement(_SPKIDataTypeSPKISexp_QNAME, byte[].class, SPKIDataType.class, ((byte[]) value)); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "HMACOutputLength", scope = SignatureMethodType.class) + public JAXBElement createSignatureMethodTypeHMACOutputLength(BigInteger value) { + return new JAXBElement(_SignatureMethodTypeHMACOutputLength_QNAME, BigInteger.class, SignatureMethodType.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "XPath", scope = TransformType.class) + public JAXBElement createTransformTypeXPath(String value) { + return new JAXBElement(_TransformTypeXPath_QNAME, String.class, TransformType.class, value); } } diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ObjectType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ObjectType.java index de805aee..a1bfe70b 100644 --- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ObjectType.java +++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ObjectType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2010.02.24 at 05:42:21 PM MEZ +// Generated on: 2012.01.10 at 12:03:52 PM CET // @@ -84,8 +84,8 @@ public class ObjectType { *

* Objects of the following type(s) are allowed in the list * {@link String } - * {@link Object } * {@link Element } + * {@link Object } * * */ diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/PGPDataType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/PGPDataType.java index 43791f92..04a90b8e 100644 --- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/PGPDataType.java +++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/PGPDataType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2010.02.24 at 05:42:21 PM MEZ +// Generated on: 2012.01.10 at 12:03:52 PM CET // @@ -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), - @XmlElementRef(name = "PGPKeyID", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class) + @XmlElementRef(name = "PGPKeyID", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), + @XmlElementRef(name = "PGPKeyPacket", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class) }) @XmlAnyElement(lax = true) protected List content; @@ -66,8 +66,8 @@ public class PGPDataType { *

* You are getting this "catch-all" property because of the following reason: * The field name "PGPKeyPacket" is used by two different parts of a schema. See: - * line 218 of http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd - * line 213 of http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd + * line 218 of http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd + * line 213 of http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd *

* To get rid of this property, apply a property customization to one * of both of the following declarations to change their names: @@ -88,10 +88,10 @@ public class PGPDataType { * *

* Objects of the following type(s) are allowed in the list - * {@link Object } - * {@link Element } * {@link JAXBElement }{@code <}{@link byte[]}{@code >} * {@link JAXBElement }{@code <}{@link byte[]}{@code >} + * {@link Element } + * {@link Object } * * */ diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/RSAKeyValueType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/RSAKeyValueType.java index 74e9fa62..2712d596 100644 --- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/RSAKeyValueType.java +++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/RSAKeyValueType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2010.02.24 at 05:42:21 PM MEZ +// Generated on: 2012.01.10 at 12:03:52 PM CET // diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ReferenceType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ReferenceType.java index 47f51aa8..4e6a8560 100644 --- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ReferenceType.java +++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ReferenceType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2010.02.24 at 05:42:21 PM MEZ +// Generated on: 2012.01.10 at 12:03:52 PM CET // diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/RetrievalMethodType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/RetrievalMethodType.java index 37b6717b..ede4c242 100644 --- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/RetrievalMethodType.java +++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/RetrievalMethodType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2010.02.24 at 05:42:21 PM MEZ +// Generated on: 2012.01.10 at 12:03:52 PM CET // diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SPKIDataType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SPKIDataType.java index 2e2f904c..290bef87 100644 --- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SPKIDataType.java +++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SPKIDataType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2010.02.24 at 05:42:21 PM MEZ +// Generated on: 2012.01.10 at 12:03:52 PM CET // @@ -68,8 +68,8 @@ public class SPKIDataType { *

* 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/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureMethodType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureMethodType.java index 6d73cea0..d01ced96 100644 --- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureMethodType.java +++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureMethodType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2010.02.24 at 05:42:21 PM MEZ +// Generated on: 2012.01.10 at 12:03:52 PM CET // @@ -75,9 +75,9 @@ public class SignatureMethodType { * *

* Objects of the following type(s) are allowed in the list + * {@link JAXBElement }{@code <}{@link BigInteger }{@code >} * {@link String } * {@link Object } - * {@link JAXBElement }{@code <}{@link BigInteger }{@code >} * * */ diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignaturePropertiesType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignaturePropertiesType.java index 49527d45..7a732a78 100644 --- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignaturePropertiesType.java +++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignaturePropertiesType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2010.02.24 at 05:42:21 PM MEZ +// Generated on: 2012.01.10 at 12:03:52 PM CET // diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignaturePropertyType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignaturePropertyType.java index 09838725..35b200de 100644 --- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignaturePropertyType.java +++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignaturePropertyType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2010.02.24 at 05:42:21 PM MEZ +// Generated on: 2012.01.10 at 12:03:52 PM CET // @@ -81,8 +81,8 @@ public class SignaturePropertyType { *

* Objects of the following type(s) are allowed in the list * {@link String } - * {@link Object } * {@link Element } + * {@link Object } * * */ diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureType.java index 0611c217..c753270d 100644 --- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureType.java +++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2010.02.24 at 05:42:21 PM MEZ +// Generated on: 2012.01.10 at 12:03:52 PM CET // @@ -12,7 +12,6 @@ import java.util.ArrayList; import java.util.List; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlID; @@ -20,7 +19,6 @@ import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.w3c.dom.Element; /** @@ -59,8 +57,8 @@ public class SignatureType { protected SignedInfoType signedInfo; @XmlElement(name = "SignatureValue", required = true) protected SignatureValueType signatureValue; - @XmlAnyElement - protected Element keyInfo; + @XmlElement(name = "KeyInfo") + protected KeyInfoType keyInfo; @XmlElement(name = "Object") protected List object; @XmlAttribute(name = "Id") @@ -122,10 +120,10 @@ public class SignatureType { * * @return * possible object is - * {@link Element } + * {@link KeyInfoType } * */ - public Element getKeyInfo() { + public KeyInfoType getKeyInfo() { return keyInfo; } @@ -134,10 +132,10 @@ public class SignatureType { * * @param value * allowed object is - * {@link Element } + * {@link KeyInfoType } * */ - public void setKeyInfo(Element value) { + public void setKeyInfo(KeyInfoType value) { this.keyInfo = value; } diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureValueType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureValueType.java index b18f01d6..4159ad69 100644 --- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureValueType.java +++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureValueType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2010.02.24 at 05:42:21 PM MEZ +// Generated on: 2012.01.10 at 12:03:52 PM CET // diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignedInfoType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignedInfoType.java index db7d2d3c..6d5563a0 100644 --- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignedInfoType.java +++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignedInfoType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2010.02.24 at 05:42:21 PM MEZ +// Generated on: 2012.01.10 at 12:03:52 PM CET // diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/TransformType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/TransformType.java index 3e81e118..3d32f33f 100644 --- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/TransformType.java +++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/TransformType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2010.02.24 at 05:42:21 PM MEZ +// Generated on: 2012.01.10 at 12:03:52 PM CET // @@ -75,9 +75,9 @@ public class TransformType { * *

* Objects of the following type(s) are allowed in the list - * {@link Object } - * {@link Element } * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link Element } + * {@link Object } * {@link String } * * diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/TransformsType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/TransformsType.java index 29205150..5a2f7547 100644 --- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/TransformsType.java +++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/TransformsType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2010.02.24 at 05:42:21 PM MEZ +// Generated on: 2012.01.10 at 12:03:52 PM CET // diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/X509DataType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/X509DataType.java index fcf07b84..1200e5a3 100644 --- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/X509DataType.java +++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/X509DataType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2010.02.24 at 05:42:21 PM MEZ +// Generated on: 2012.01.10 at 12:03:52 PM CET // @@ -53,11 +53,11 @@ import org.w3c.dom.Element; public class X509DataType { @XmlElementRefs({ + @XmlElementRef(name = "X509Certificate", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), @XmlElementRef(name = "X509SKI", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), + @XmlElementRef(name = "X509SubjectName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), @XmlElementRef(name = "X509IssuerSerial", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), - @XmlElementRef(name = "X509CRL", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), - @XmlElementRef(name = "X509Certificate", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), - @XmlElementRef(name = "X509SubjectName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class) + @XmlElementRef(name = "X509CRL", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class) }) @XmlAnyElement(lax = true) protected List x509IssuerSerialOrX509SKIOrX509SubjectName; @@ -80,13 +80,13 @@ public class X509DataType { * *

* Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link byte[]}{@code >} * {@link Element } - * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >} - * {@link JAXBElement }{@code <}{@link byte[]}{@code >} * {@link Object } * {@link JAXBElement }{@code <}{@link byte[]}{@code >} + * {@link JAXBElement }{@code <}{@link byte[]}{@code >} * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >} + * {@link JAXBElement }{@code <}{@link byte[]}{@code >} * * */ diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/X509IssuerSerialType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/X509IssuerSerialType.java index bb5957b9..05226e38 100644 --- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/X509IssuerSerialType.java +++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/X509IssuerSerialType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2010.02.24 at 05:42:21 PM MEZ +// Generated on: 2012.01.10 at 12:03:52 PM CET // diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/package-info.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/package-info.java index db9f2dc4..551e89f7 100644 --- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/package-info.java +++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/package-info.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2010.02.24 at 05:42:21 PM MEZ +// Generated on: 2012.01.10 at 12:03:52 PM CET // @javax.xml.bind.annotation.XmlSchema(namespace = "http://www.w3.org/2000/09/xmldsig#", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -- cgit v1.2.3