summaryrefslogtreecommitdiff
path: root/utils/src/main/java/oasis/names/tc
diff options
context:
space:
mode:
authormcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2010-05-05 15:29:01 +0000
committermcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2010-05-05 15:29:01 +0000
commitb1c8641a63a67e3c64d948f9e8dce5c01e11e2dd (patch)
tree0883f08a408f89f758e9a1be629232e3dd055c3a /utils/src/main/java/oasis/names/tc
parent83a9b613836910f7edc370c2fe60fa2268dc4461 (diff)
downloadmocca-b1c8641a63a67e3c64d948f9e8dce5c01e11e2dd.tar.gz
mocca-b1c8641a63a67e3c64d948f9e8dce5c01e11e2dd.tar.bz2
mocca-b1c8641a63a67e3c64d948f9e8dce5c01e11e2dd.zip
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
Diffstat (limited to 'utils/src/main/java/oasis/names/tc')
-rw-r--r--utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/ActionType.java4
-rw-r--r--utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AdviceType.java10
-rw-r--r--utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AnyType.java12
-rw-r--r--utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AssertionType.java25
-rw-r--r--utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AttributeDesignatorType.java4
-rw-r--r--utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AttributeStatementType.java4
-rw-r--r--utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AttributeType.java4
-rw-r--r--utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AudienceRestrictionConditionType.java4
-rw-r--r--utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AuthenticationStatementType.java4
-rw-r--r--utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AuthorityBindingType.java4
-rw-r--r--utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AuthorizationDecisionStatementType.java4
-rw-r--r--utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/ConditionAbstractType.java4
-rw-r--r--utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/ConditionsType.java4
-rw-r--r--utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/DecisionType.java4
-rw-r--r--utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/EvidenceType.java4
-rw-r--r--utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/NameIdentifierType.java4
-rw-r--r--utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/ObjectFactory.java96
-rw-r--r--utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/StatementAbstractType.java4
-rw-r--r--utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectConfirmationType.java19
-rw-r--r--utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectLocalityType.java4
-rw-r--r--utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectStatementAbstractType.java4
-rw-r--r--utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectType.java14
-rw-r--r--utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/package-info.java4
23 files changed, 119 insertions, 125 deletions
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/ActionType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/ActionType.java
index d2b96381..d5a84e81 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/ActionType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/ActionType.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 <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: 2008.12.23 at 03:26:53 PM GMT
+// Generated on: 2010.02.24 at 05:41:17 PM MEZ
//
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AdviceType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AdviceType.java
index d2630fac..6009576c 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AdviceType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AdviceType.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 <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: 2008.12.23 at 03:26:53 PM GMT
+// Generated on: 2010.02.24 at 05:41:17 PM MEZ
//
@@ -72,10 +72,10 @@ public class AdviceType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Element }
- * {@link JAXBElement }{@code <}{@link AssertionType }{@code >}
- * {@link JAXBElement }{@code <}{@link String }{@code >}
* {@link Object }
+ * {@link JAXBElement }{@code <}{@link String }{@code >}
+ * {@link JAXBElement }{@code <}{@link AssertionType }{@code >}
+ * {@link Element }
*
*
*/
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AnyType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AnyType.java
index a9f7dd8d..b9b3773c 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AnyType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AnyType.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 <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: 2008.12.23 at 03:26:53 PM GMT
+// Generated on: 2010.02.24 at 05:41:17 PM MEZ
//
@@ -18,14 +18,6 @@ import javax.xml.bind.annotation.XmlType;
/**
- * This type is introduced to avoid the DOM Element binding of
- * AttributeValue and SubjectConfirmationData, specified as
- * <pre>
- * &lt;element name="AttributeValue" type="anyType"/>
- * &lt;element name="SubjectConfirmationData" type="anyType"/>
- * </pre>
- * in the original SAML 1.0 Assertion schema.
- *
* <p>Java class for AnyType complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
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 <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: 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<StatementAbstractType> 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 {
*
* <p>
* 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;
}
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AttributeDesignatorType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AttributeDesignatorType.java
index 12bd8738..fc111d12 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AttributeDesignatorType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AttributeDesignatorType.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 <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: 2008.12.23 at 03:26:53 PM GMT
+// Generated on: 2010.02.24 at 05:41:17 PM MEZ
//
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AttributeStatementType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AttributeStatementType.java
index f710b74b..ad518a96 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AttributeStatementType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AttributeStatementType.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 <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: 2008.12.23 at 03:26:53 PM GMT
+// Generated on: 2010.02.24 at 05:41:17 PM MEZ
//
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AttributeType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AttributeType.java
index 31d258a9..d6f13089 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AttributeType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AttributeType.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 <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: 2008.12.23 at 03:26:53 PM GMT
+// Generated on: 2010.02.24 at 05:41:17 PM MEZ
//
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AudienceRestrictionConditionType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AudienceRestrictionConditionType.java
index 61091b73..2492fb97 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AudienceRestrictionConditionType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AudienceRestrictionConditionType.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 <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: 2008.12.23 at 03:26:53 PM GMT
+// Generated on: 2010.02.24 at 05:41:17 PM MEZ
//
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AuthenticationStatementType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AuthenticationStatementType.java
index 93c24117..6a3910af 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AuthenticationStatementType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AuthenticationStatementType.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 <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: 2008.12.23 at 03:26:53 PM GMT
+// Generated on: 2010.02.24 at 05:41:17 PM MEZ
//
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AuthorityBindingType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AuthorityBindingType.java
index 8663f35a..259a9349 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AuthorityBindingType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AuthorityBindingType.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 <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: 2008.12.23 at 03:26:53 PM GMT
+// Generated on: 2010.02.24 at 05:41:17 PM MEZ
//
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AuthorizationDecisionStatementType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AuthorizationDecisionStatementType.java
index b6b37c90..9e5bdd45 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AuthorizationDecisionStatementType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AuthorizationDecisionStatementType.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 <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: 2008.12.23 at 03:26:53 PM GMT
+// Generated on: 2010.02.24 at 05:41:17 PM MEZ
//
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/ConditionAbstractType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/ConditionAbstractType.java
index 965bb4bd..9055688b 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/ConditionAbstractType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/ConditionAbstractType.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 <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: 2008.12.23 at 03:26:53 PM GMT
+// Generated on: 2010.02.24 at 05:41:17 PM MEZ
//
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/ConditionsType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/ConditionsType.java
index 42c1e1af..c62de41b 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/ConditionsType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/ConditionsType.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 <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: 2008.12.23 at 03:26:53 PM GMT
+// Generated on: 2010.02.24 at 05:41:17 PM MEZ
//
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/DecisionType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/DecisionType.java
index e5efbf0a..1a06a4ca 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/DecisionType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/DecisionType.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 <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: 2008.12.23 at 03:26:53 PM GMT
+// Generated on: 2010.02.24 at 05:41:17 PM MEZ
//
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/EvidenceType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/EvidenceType.java
index 74f74440..89f09632 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/EvidenceType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/EvidenceType.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 <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: 2008.12.23 at 03:26:53 PM GMT
+// Generated on: 2010.02.24 at 05:41:17 PM MEZ
//
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/NameIdentifierType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/NameIdentifierType.java
index 34fed5d2..73d2dbcb 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/NameIdentifierType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/NameIdentifierType.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 <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: 2008.12.23 at 03:26:53 PM GMT
+// Generated on: 2010.02.24 at 05:41:17 PM MEZ
//
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/ObjectFactory.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/ObjectFactory.java
index d5165b71..6ea9f265 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/ObjectFactory.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/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-661
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833
// 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: 2008.12.23 at 03:26:53 PM GMT
+// Generated on: 2010.02.24 at 05:41:17 PM MEZ
//
@@ -64,19 +64,19 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link AnyType }
+ * Create an instance of {@link AssertionType }
*
*/
- public AnyType createAnyType() {
- return new AnyType();
+ public AssertionType createAssertionType() {
+ return new AssertionType();
}
/**
- * Create an instance of {@link ActionType }
+ * Create an instance of {@link EvidenceType }
*
*/
- public ActionType createActionType() {
- return new ActionType();
+ public EvidenceType createEvidenceType() {
+ return new EvidenceType();
}
/**
@@ -88,11 +88,19 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link SubjectConfirmationType }
+ * Create an instance of {@link ActionType }
*
*/
- public SubjectConfirmationType createSubjectConfirmationType() {
- return new SubjectConfirmationType();
+ public ActionType createActionType() {
+ return new ActionType();
+ }
+
+ /**
+ * Create an instance of {@link NameIdentifierType }
+ *
+ */
+ public NameIdentifierType createNameIdentifierType() {
+ return new NameIdentifierType();
}
/**
@@ -104,11 +112,11 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link AudienceRestrictionConditionType }
+ * Create an instance of {@link AuthorizationDecisionStatementType }
*
*/
- public AudienceRestrictionConditionType createAudienceRestrictionConditionType() {
- return new AudienceRestrictionConditionType();
+ public AuthorizationDecisionStatementType createAuthorizationDecisionStatementType() {
+ return new AuthorizationDecisionStatementType();
}
/**
@@ -120,19 +128,27 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link AssertionType }
+ * Create an instance of {@link AnyType }
*
*/
- public AssertionType createAssertionType() {
- return new AssertionType();
+ public AnyType createAnyType() {
+ return new AnyType();
}
/**
- * Create an instance of {@link AuthorityBindingType }
+ * Create an instance of {@link AudienceRestrictionConditionType }
*
*/
- public AuthorityBindingType createAuthorityBindingType() {
- return new AuthorityBindingType();
+ public AudienceRestrictionConditionType createAudienceRestrictionConditionType() {
+ return new AudienceRestrictionConditionType();
+ }
+
+ /**
+ * Create an instance of {@link AttributeStatementType }
+ *
+ */
+ public AttributeStatementType createAttributeStatementType() {
+ return new AttributeStatementType();
}
/**
@@ -144,19 +160,19 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link AdviceType }
+ * Create an instance of {@link SubjectConfirmationType }
*
*/
- public AdviceType createAdviceType() {
- return new AdviceType();
+ public SubjectConfirmationType createSubjectConfirmationType() {
+ return new SubjectConfirmationType();
}
/**
- * Create an instance of {@link EvidenceType }
+ * Create an instance of {@link SubjectType }
*
*/
- public EvidenceType createEvidenceType() {
- return new EvidenceType();
+ public SubjectType createSubjectType() {
+ return new SubjectType();
}
/**
@@ -168,35 +184,19 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link AttributeStatementType }
- *
- */
- public AttributeStatementType createAttributeStatementType() {
- return new AttributeStatementType();
- }
-
- /**
- * Create an instance of {@link NameIdentifierType }
- *
- */
- public NameIdentifierType createNameIdentifierType() {
- return new NameIdentifierType();
- }
-
- /**
- * Create an instance of {@link AuthorizationDecisionStatementType }
+ * Create an instance of {@link AuthorityBindingType }
*
*/
- public AuthorizationDecisionStatementType createAuthorizationDecisionStatementType() {
- return new AuthorizationDecisionStatementType();
+ public AuthorityBindingType createAuthorityBindingType() {
+ return new AuthorityBindingType();
}
/**
- * Create an instance of {@link SubjectType }
+ * Create an instance of {@link AdviceType }
*
*/
- public SubjectType createSubjectType() {
- return new SubjectType();
+ public AdviceType createAdviceType() {
+ return new AdviceType();
}
/**
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/StatementAbstractType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/StatementAbstractType.java
index eabd815f..e29030c9 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/StatementAbstractType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/StatementAbstractType.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 <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: 2008.12.23 at 03:26:53 PM GMT
+// Generated on: 2010.02.24 at 05:41:17 PM MEZ
//
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectConfirmationType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectConfirmationType.java
index d7bd8856..0b13dd6e 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectConfirmationType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectConfirmationType.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 <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: 2008.12.23 at 03:26:53 PM GMT
+// Generated on: 2010.02.24 at 05:41:17 PM MEZ
//
@@ -12,10 +12,11 @@ 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.XmlElement;
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.w3._2000._09.xmldsig_.KeyInfoType;
+import org.w3c.dom.Element;
/**
@@ -52,8 +53,8 @@ public class SubjectConfirmationType {
protected List<String> confirmationMethod;
@XmlElement(name = "SubjectConfirmationData")
protected AnyType subjectConfirmationData;
- @XmlElement(name = "KeyInfo", namespace = "http://www.w3.org/2000/09/xmldsig#")
- protected KeyInfoType keyInfo;
+ @XmlAnyElement
+ protected Element keyInfo;
/**
* Gets the value of the confirmationMethod property.
@@ -113,10 +114,10 @@ public class SubjectConfirmationType {
*
* @return
* possible object is
- * {@link KeyInfoType }
+ * {@link Element }
*
*/
- public KeyInfoType getKeyInfo() {
+ public Element getKeyInfo() {
return keyInfo;
}
@@ -125,10 +126,10 @@ public class SubjectConfirmationType {
*
* @param value
* allowed object is
- * {@link KeyInfoType }
+ * {@link Element }
*
*/
- public void setKeyInfo(KeyInfoType value) {
+ public void setKeyInfo(Element value) {
this.keyInfo = value;
}
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectLocalityType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectLocalityType.java
index 1515d535..2ffa9d9d 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectLocalityType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectLocalityType.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 <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: 2008.12.23 at 03:26:53 PM GMT
+// Generated on: 2010.02.24 at 05:41:17 PM MEZ
//
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectStatementAbstractType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectStatementAbstractType.java
index 07916c14..99f503fa 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectStatementAbstractType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectStatementAbstractType.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 <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: 2008.12.23 at 03:26:53 PM GMT
+// Generated on: 2010.02.24 at 05:41:17 PM MEZ
//
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectType.java
index 646339c8..abb08c4d 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectType.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 <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: 2008.12.23 at 03:26:53 PM GMT
+// Generated on: 2010.02.24 at 05:41:17 PM MEZ
//
@@ -48,8 +48,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),
- @XmlElementRef(name = "SubjectConfirmation", namespace = "urn:oasis:names:tc:SAML:1.0:assertion", type = JAXBElement.class)
+ @XmlElementRef(name = "SubjectConfirmation", namespace = "urn:oasis:names:tc:SAML:1.0:assertion", type = JAXBElement.class),
+ @XmlElementRef(name = "NameIdentifier", namespace = "urn:oasis:names:tc:SAML:1.0:assertion", type = JAXBElement.class)
})
protected List<JAXBElement<?>> content;
@@ -59,8 +59,8 @@ public class SubjectType {
* <p>
* You are getting this "catch-all" property because of the following reason:
* The field name "SubjectConfirmation" is used by two different parts of a schema. See:
- * line 94 of file:/home/clemens/workspace/schema-base/src/main/schema/oasis-sstc-saml-schema-assertion-1.0.xsd
- * line 92 of file:/home/clemens/workspace/schema-base/src/main/schema/oasis-sstc-saml-schema-assertion-1.0.xsd
+ * line 98 of file:/Users/clemens/Documents/workspace/schema-base/src/main/schema/oasis-sstc-saml-schema-assertion-1.0.xsd
+ * line 96 of file:/Users/clemens/Documents/workspace/schema-base/src/main/schema/oasis-sstc-saml-schema-assertion-1.0.xsd
* <p>
* To get rid of this property, apply a property customization to one
* of both of the following declarations to change their names:
@@ -81,8 +81,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 >}
*
*
*/
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/package-info.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/package-info.java
index 4eb7ece2..75f6af85 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/package-info.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/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-661
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833
// 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: 2008.12.23 at 03:26:53 PM GMT
+// Generated on: 2010.02.24 at 05:41:17 PM MEZ
//
@javax.xml.bind.annotation.XmlSchema(namespace = "urn:oasis:names:tc:SAML:1.0:assertion", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)