diff options
author | Florian Reimair <florian.reimair@iaik.tugraz.at> | 2014-01-31 17:15:01 +0100 |
---|---|---|
committer | Florian Reimair <florian.reimair@iaik.tugraz.at> | 2014-01-31 17:15:13 +0100 |
commit | 830929713b75d4cd712f1fb8a05f0ccb728f54f2 (patch) | |
tree | 4d4b4e7cc6147e7212884ea25db0d3f04bae4452 /id/server/idserverlib/src/main/java/at/gv/util/xsd/saml | |
parent | 04a2d507dfcf59dac15e542e391797e57a820c82 (diff) | |
parent | d8bc160b455fd8b9edc01fc054d74d06f2399cab (diff) | |
download | moa-id-spss-830929713b75d4cd712f1fb8a05f0ccb728f54f2.tar.gz moa-id-spss-830929713b75d4cd712f1fb8a05f0ccb728f54f2.tar.bz2 moa-id-spss-830929713b75d4cd712f1fb8a05f0ccb728f54f2.zip |
Merge tlenz into HEAD
Diffstat (limited to 'id/server/idserverlib/src/main/java/at/gv/util/xsd/saml')
-rw-r--r-- | id/server/idserverlib/src/main/java/at/gv/util/xsd/saml/assertion/AdviceType.java | 6 | ||||
-rw-r--r-- | id/server/idserverlib/src/main/java/at/gv/util/xsd/saml/assertion/SubjectType.java | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/util/xsd/saml/assertion/AdviceType.java b/id/server/idserverlib/src/main/java/at/gv/util/xsd/saml/assertion/AdviceType.java index a4af90342..ae10d4c1e 100644 --- a/id/server/idserverlib/src/main/java/at/gv/util/xsd/saml/assertion/AdviceType.java +++ b/id/server/idserverlib/src/main/java/at/gv/util/xsd/saml/assertion/AdviceType.java @@ -41,8 +41,8 @@ import org.w3c.dom.Element; public class AdviceType { @XmlElementRefs({ - @XmlElementRef(name = "AssertionIDReference", namespace = "urn:oasis:names:tc:SAML:1.0:assertion", type = JAXBElement.class, required = false), - @XmlElementRef(name = "Assertion", namespace = "urn:oasis:names:tc:SAML:1.0:assertion", type = JAXBElement.class, required = false) + @XmlElementRef(name = "Assertion", namespace = "urn:oasis:names:tc:SAML:1.0:assertion", type = JAXBElement.class, required = false), + @XmlElementRef(name = "AssertionIDReference", namespace = "urn:oasis:names:tc:SAML:1.0:assertion", type = JAXBElement.class, required = false) }) @XmlAnyElement(lax = true) protected List<Object> assertionIDReferenceOrAssertionOrAny; @@ -66,8 +66,8 @@ public class AdviceType { * <p> * Objects of the following type(s) are allowed in the list * {@link JAXBElement }{@code <}{@link String }{@code >} - * {@link Object } * {@link JAXBElement }{@code <}{@link AssertionType }{@code >} + * {@link Object } * {@link Element } * * diff --git a/id/server/idserverlib/src/main/java/at/gv/util/xsd/saml/assertion/SubjectType.java b/id/server/idserverlib/src/main/java/at/gv/util/xsd/saml/assertion/SubjectType.java index 6845e807a..1a24a2c13 100644 --- a/id/server/idserverlib/src/main/java/at/gv/util/xsd/saml/assertion/SubjectType.java +++ b/id/server/idserverlib/src/main/java/at/gv/util/xsd/saml/assertion/SubjectType.java @@ -41,8 +41,8 @@ import javax.xml.bind.annotation.XmlType; public class SubjectType { @XmlElementRefs({ - @XmlElementRef(name = "NameIdentifier", namespace = "urn:oasis:names:tc:SAML:1.0:assertion", type = JAXBElement.class, required = false), - @XmlElementRef(name = "SubjectConfirmation", namespace = "urn:oasis:names:tc:SAML:1.0:assertion", type = JAXBElement.class, required = false) + @XmlElementRef(name = "SubjectConfirmation", namespace = "urn:oasis:names:tc:SAML:1.0:assertion", type = JAXBElement.class, required = false), + @XmlElementRef(name = "NameIdentifier", namespace = "urn:oasis:names:tc:SAML:1.0:assertion", type = JAXBElement.class, required = false) }) protected List<JAXBElement<?>> content; @@ -74,8 +74,8 @@ public class SubjectType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link NameIdentifierType }{@code >} * {@link JAXBElement }{@code <}{@link SubjectConfirmationType }{@code >} + * {@link JAXBElement }{@code <}{@link NameIdentifierType }{@code >} * * */ |