update PVP 1.9 Header schema

12 files changed, 67 insertions, 67 deletions

diff --git a/src/main/java/at/gv/util/xsd/persondata/AbstractPersonType.java b/src/main/java/at/gv/util/xsd/persondata/AbstractPersonType.java
index 25ee2c2..711376e 100644
--- a/src/main/java/at/gv/util/xsd/persondata/AbstractPersonType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/AbstractPersonType.java
@@ -62,7 +62,7 @@ public class AbstractPersonType {
 
     @XmlElement(name = "Identification")
     protected List<IdentificationType> identification;
-    @XmlElementRef(name = "AbstractSimpleIdentification", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class, required = false)
+    @XmlElementRef(name = "AbstractSimpleIdentification", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class)
     protected List<JAXBElement<? extends AbstractSimpleIdentificationType>> abstractSimpleIdentification;
     @XmlAttribute(name = "Id")
     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
diff --git a/src/main/java/at/gv/util/xsd/persondata/CompactPersonDataType.java b/src/main/java/at/gv/util/xsd/persondata/CompactPersonDataType.java
index 16b0a22..a8b7caf 100644
--- a/src/main/java/at/gv/util/xsd/persondata/CompactPersonDataType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/CompactPersonDataType.java
@@ -63,7 +63,7 @@ public class CompactPersonDataType
 
     @XmlElementRef(name = "Person", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class)
     protected JAXBElement<? extends AbstractPersonType> person;
-    @XmlElementRef(name = "Address", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class, required = false)
+    @XmlElementRef(name = "Address", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class)
     protected List<JAXBElement<? extends AbstractAddressType>> address;
     @XmlElement(name = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#")
     protected List<SignatureType> signature;
diff --git a/src/main/java/at/gv/util/xsd/persondata/PersonDataType.java b/src/main/java/at/gv/util/xsd/persondata/PersonDataType.java
index 5d0ea67..94f21e8 100644
--- a/src/main/java/at/gv/util/xsd/persondata/PersonDataType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/PersonDataType.java
@@ -63,7 +63,7 @@ public class PersonDataType
 
     @XmlElementRef(name = "Person", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class)
     protected JAXBElement<? extends AbstractPersonType> person;
-    @XmlElementRef(name = "Address", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class, required = false)
+    @XmlElementRef(name = "Address", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class)
     protected List<JAXBElement<? extends AbstractAddressType>> address;
     @XmlElement(name = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#")
     protected List<SignatureType> signature;
diff --git a/src/main/java/at/gv/util/xsd/szr/pvp/ObjectFactory.java b/src/main/java/at/gv/util/xsd/szr/pvp/ObjectFactory.java
index b7d4820..d0e577b 100644
--- a/src/main/java/at/gv/util/xsd/szr/pvp/ObjectFactory.java
+++ b/src/main/java/at/gv/util/xsd/szr/pvp/ObjectFactory.java
@@ -34,19 +34,11 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link PvpTokenType.Accounting.GvCostCenterId }
-     * 
-     */
-    public PvpTokenType.Accounting.GvCostCenterId createPvpTokenTypeAccountingGvCostCenterId() {
-        return new PvpTokenType.Accounting.GvCostCenterId();
-    }
-
-    /**
-     * Create an instance of {@link Role }
+     * Create an instance of {@link PvpTokenType }
      * 
      */
-    public Role createRole() {
-        return new Role();
+    public PvpTokenType createPvpTokenType() {
+        return new PvpTokenType();
     }
 
     /**
@@ -58,27 +50,27 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link PvpTokenType }
+     * Create an instance of {@link PvpTokenType.Authenticate }
      * 
      */
-    public PvpTokenType createPvpTokenType() {
-        return new PvpTokenType();
+    public PvpTokenType.Authenticate createPvpTokenTypeAuthenticate() {
+        return new PvpTokenType.Authenticate();
     }
 
     /**
-     * Create an instance of {@link PvpTokenType.Authenticate.UserPrincipal }
+     * Create an instance of {@link Param }
      * 
      */
-    public PvpTokenType.Authenticate.UserPrincipal createPvpTokenTypeAuthenticateUserPrincipal() {
-        return new PvpTokenType.Authenticate.UserPrincipal();
+    public Param createParam() {
+        return new Param();
     }
 
     /**
-     * Create an instance of {@link PvpTokenType.Authenticate }
+     * Create an instance of {@link Role }
      * 
      */
-    public PvpTokenType.Authenticate createPvpTokenTypeAuthenticate() {
-        return new PvpTokenType.Authenticate();
+    public Role createRole() {
+        return new Role();
     }
 
     /**
@@ -90,27 +82,27 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link PvpTokenType.PvpExtension }
+     * Create an instance of {@link PvpTokenType.Authorize }
      * 
      */
-    public PvpTokenType.PvpExtension createPvpTokenTypePvpExtension() {
-        return new PvpTokenType.PvpExtension();
+    public PvpTokenType.Authorize createPvpTokenTypeAuthorize() {
+        return new PvpTokenType.Authorize();
     }
 
     /**
-     * Create an instance of {@link PvpTokenType.Authorize }
+     * Create an instance of {@link PvpTokenType.PvpExtension }
      * 
      */
-    public PvpTokenType.Authorize createPvpTokenTypeAuthorize() {
-        return new PvpTokenType.Authorize();
+    public PvpTokenType.PvpExtension createPvpTokenTypePvpExtension() {
+        return new PvpTokenType.PvpExtension();
     }
 
     /**
-     * Create an instance of {@link Param }
+     * Create an instance of {@link PvpTokenType.Accounting.GvCostCenterId }
      * 
      */
-    public Param createParam() {
-        return new Param();
+    public PvpTokenType.Accounting.GvCostCenterId createPvpTokenTypeAccountingGvCostCenterId() {
+        return new PvpTokenType.Accounting.GvCostCenterId();
     }
 
     /**
@@ -122,6 +114,14 @@ public class ObjectFactory {
     }
 
     /**
+     * Create an instance of {@link PvpTokenType.Authenticate.UserPrincipal }
+     * 
+     */
+    public PvpTokenType.Authenticate.UserPrincipal createPvpTokenTypeAuthenticateUserPrincipal() {
+        return new PvpTokenType.Authenticate.UserPrincipal();
+    }
+
+    /**
      * Create an instance of {@link JAXBElement }{@code <}{@link PvpTokenType }{@code >}}
      * 
      */
diff --git a/src/main/java/at/gv/util/xsd/szr/pvp/PvpTokenType.java b/src/main/java/at/gv/util/xsd/szr/pvp/PvpTokenType.java
index 0c1e55f..3e3910a 100644
--- a/src/main/java/at/gv/util/xsd/szr/pvp/PvpTokenType.java
+++ b/src/main/java/at/gv/util/xsd/szr/pvp/PvpTokenType.java
@@ -32,8 +32,8 @@ import org.w3c.dom.Element;
  *             &lt;complexContent>
  *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *                 &lt;sequence>
- *                   &lt;element name="participantId" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
- *                   &lt;element name="gvOuDomain" type="{http://www.w3.org/2001/XMLSchema}anyType" minOccurs="0"/>
+ *                   &lt;element name="participantId" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *                   &lt;element name="gvOuDomain" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *                   &lt;choice>
  *                     &lt;element name="userPrincipal">
  *                       &lt;complexType>
@@ -134,7 +134,7 @@ public class PvpTokenType {
     protected PvpTokenType.Accounting accounting;
     protected PvpTokenType pvpChainedToken;
     protected PvpTokenType.PvpExtension pvpExtension;
-    @XmlAttribute(required = true)
+    @XmlAttribute(name = "version", required = true)
     protected String version;
     @XmlAnyAttribute
     private Map<QName, String> otherAttributes = new HashMap<QName, String>();
@@ -615,8 +615,8 @@ public class PvpTokenType {
      *   &lt;complexContent>
      *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
      *       &lt;sequence>
-     *         &lt;element name="participantId" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
-     *         &lt;element name="gvOuDomain" type="{http://www.w3.org/2001/XMLSchema}anyType" minOccurs="0"/>
+     *         &lt;element name="participantId" type="{http://www.w3.org/2001/XMLSchema}string"/>
+     *         &lt;element name="gvOuDomain" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
      *         &lt;choice>
      *           &lt;element name="userPrincipal">
      *             &lt;complexType>
@@ -651,8 +651,8 @@ public class PvpTokenType {
     public static class Authenticate {
 
         @XmlElement(required = true)
-        protected Object participantId;
-        protected Object gvOuDomain;
+        protected String participantId;
+        protected String gvOuDomain;
         protected PvpTokenType.Authenticate.UserPrincipal userPrincipal;
         protected PvpPrincipalType systemPrincipal;
 
@@ -661,10 +661,10 @@ public class PvpTokenType {
          * 
          * @return
          *     possible object is
-         *     {@link Object }
+         *     {@link String }
          *     
          */
-        public Object getParticipantId() {
+        public String getParticipantId() {
             return participantId;
         }
 
@@ -673,10 +673,10 @@ public class PvpTokenType {
          * 
          * @param value
          *     allowed object is
-         *     {@link Object }
+         *     {@link String }
          *     
          */
-        public void setParticipantId(Object value) {
+        public void setParticipantId(String value) {
             this.participantId = value;
         }
 
@@ -685,10 +685,10 @@ public class PvpTokenType {
          * 
          * @return
          *     possible object is
-         *     {@link Object }
+         *     {@link String }
          *     
          */
-        public Object getGvOuDomain() {
+        public String getGvOuDomain() {
             return gvOuDomain;
         }
 
@@ -697,10 +697,10 @@ public class PvpTokenType {
          * 
          * @param value
          *     allowed object is
-         *     {@link Object }
+         *     {@link String }
          *     
          */
-        public void setGvOuDomain(Object value) {
+        public void setGvOuDomain(String value) {
             this.gvOuDomain = value;
         }
 
@@ -973,8 +973,8 @@ public class PvpTokenType {
          * 
          * <p>
          * Objects of the following type(s) are allowed in the list
-         * {@link Element }
          * {@link Object }
+         * {@link Element }
          * 
          * 
          */
diff --git a/src/main/java/at/gv/util/xsd/szr/pvp/Role.java b/src/main/java/at/gv/util/xsd/szr/pvp/Role.java
index edf84f0..624347b 100644
--- a/src/main/java/at/gv/util/xsd/szr/pvp/Role.java
+++ b/src/main/java/at/gv/util/xsd/szr/pvp/Role.java
@@ -43,7 +43,7 @@ public class Role {
     @XmlElement(required = true)
     protected List<Param> param;
     protected Object dummy;
-    @XmlAttribute(required = true)
+    @XmlAttribute(name = "value", required = true)
     protected String value;
 
     /**
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/KeyInfoType.java b/src/main/java/at/gv/util/xsd/xmldsig/KeyInfoType.java
index 1cea66e..6e6603d 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/KeyInfoType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/KeyInfoType.java
@@ -53,13 +53,13 @@ import org.w3c.dom.Element;
 public class KeyInfoType {
 
     @XmlElementRefs({
-        @XmlElementRef(name = "MgmtData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "PGPData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "KeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "SPKIData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "X509Data", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "RetrievalMethod", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "KeyName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
+        @XmlElementRef(name = "MgmtData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
+        @XmlElementRef(name = "PGPData", 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 = "X509Data", 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 = "KeyName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class)
     })
     @XmlMixed
     @XmlAnyElement(lax = true)
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/KeyValueType.java b/src/main/java/at/gv/util/xsd/xmldsig/KeyValueType.java
index 73d0b30..922ac74 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/KeyValueType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/KeyValueType.java
@@ -42,8 +42,8 @@ import org.w3c.dom.Element;
 public class KeyValueType {
 
     @XmlElementRefs({
-        @XmlElementRef(name = "RSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "DSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
+        @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)
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/PGPDataType.java b/src/main/java/at/gv/util/xsd/xmldsig/PGPDataType.java
index 582db74..b07ad11 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/PGPDataType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/PGPDataType.java
@@ -47,8 +47,8 @@ import org.w3c.dom.Element;
 public class PGPDataType {
 
     @XmlElementRefs({
-        @XmlElementRef(name = "PGPKeyPacket", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "PGPKeyID", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
+        @XmlElementRef(name = "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)
     })
     @XmlAnyElement(lax = true)
     protected List<Object> content;
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/SignatureMethodType.java b/src/main/java/at/gv/util/xsd/xmldsig/SignatureMethodType.java
index 70695af..45d08b6 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/SignatureMethodType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/SignatureMethodType.java
@@ -42,7 +42,7 @@ import javax.xml.bind.annotation.XmlType;
 })
 public class SignatureMethodType {
 
-    @XmlElementRef(name = "HMACOutputLength", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
+    @XmlElementRef(name = "HMACOutputLength", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class)
     @XmlMixed
     @XmlAnyElement(lax = true)
     protected List<Object> content;
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/TransformType.java b/src/main/java/at/gv/util/xsd/xmldsig/TransformType.java
index f968ff2..7499065 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/TransformType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/TransformType.java
@@ -42,7 +42,7 @@ import org.w3c.dom.Element;
 })
 public class TransformType {
 
-    @XmlElementRef(name = "XPath", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
+    @XmlElementRef(name = "XPath", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class)
     @XmlMixed
     @XmlAnyElement(lax = true)
     protected List<Object> content;
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/X509DataType.java b/src/main/java/at/gv/util/xsd/xmldsig/X509DataType.java
index 05c0081..3adef12 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/X509DataType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/X509DataType.java
@@ -46,11 +46,11 @@ import org.w3c.dom.Element;
 public class X509DataType {
 
     @XmlElementRefs({
-        @XmlElementRef(name = "X509SubjectName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "X509SKI", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "X509Certificate", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "X509CRL", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "X509IssuerSerial", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
+        @XmlElementRef(name = "X509SubjectName", 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 = "X509Certificate", 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 = "X509IssuerSerial", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class)
     })
     @XmlAnyElement(lax = true)
     protected List<Object> x509IssuerSerialOrX509SKIOrX509SubjectName;