From b1c8641a63a67e3c64d948f9e8dce5c01e11e2dd Mon Sep 17 00:00:00 2001 From: mcentner Date: Wed, 5 May 2010 15:29:01 +0000 Subject: Merged feature branch mocca-1.2.13-id@r724 back to trunk. git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@725 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- .../tc/saml/_1_0/assertion/AssertionType.java | 25 +++++++++++----------- 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AssertionType.java') diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AssertionType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AssertionType.java index 2a108984..314ff36e 100644 --- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AssertionType.java +++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AssertionType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.23 at 03:26:53 PM GMT +// Generated on: 2010.02.24 at 05:41:17 PM MEZ // @@ -13,13 +13,14 @@ 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.XmlElements; import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlType; import javax.xml.datatype.XMLGregorianCalendar; -import org.w3._2000._09.xmldsig_.SignatureType; +import org.w3c.dom.Element; /** @@ -69,15 +70,15 @@ public class AssertionType { @XmlElement(name = "Advice") protected AdviceType advice; @XmlElements({ + @XmlElement(name = "AuthenticationStatement", type = AuthenticationStatementType.class), @XmlElement(name = "Statement"), @XmlElement(name = "AttributeStatement", type = AttributeStatementType.class), @XmlElement(name = "SubjectStatement", type = SubjectStatementAbstractType.class), - @XmlElement(name = "AuthorizationDecisionStatement", type = AuthorizationDecisionStatementType.class), - @XmlElement(name = "AuthenticationStatement", type = AuthenticationStatementType.class) + @XmlElement(name = "AuthorizationDecisionStatement", type = AuthorizationDecisionStatementType.class) }) protected List statementOrSubjectStatementOrAuthenticationStatement; - @XmlElement(name = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#") - protected SignatureType signature; + @XmlAnyElement + protected Element signature; @XmlAttribute(name = "MajorVersion", required = true) protected BigInteger majorVersion; @XmlAttribute(name = "MinorVersion", required = true) @@ -156,11 +157,11 @@ public class AssertionType { * *

* Objects of the following type(s) are allowed in the list + * {@link AuthenticationStatementType } * {@link StatementAbstractType } * {@link AttributeStatementType } * {@link SubjectStatementAbstractType } * {@link AuthorizationDecisionStatementType } - * {@link AuthenticationStatementType } * * */ @@ -176,10 +177,10 @@ public class AssertionType { * * @return * possible object is - * {@link SignatureType } + * {@link Element } * */ - public SignatureType getSignature() { + public Element getSignature() { return signature; } @@ -188,10 +189,10 @@ public class AssertionType { * * @param value * allowed object is - * {@link SignatureType } + * {@link Element } * */ - public void setSignature(SignatureType value) { + public void setSignature(Element value) { this.signature = value; } -- cgit v1.2.3