From 2c3c1d6bb748a0655a83fdf4cd26135042d898b9 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Fri, 19 Jul 2019 10:35:29 +0200
Subject: USP client integration switch to v2.0.7

---
 .../xsd/mis/usp_v2/xmldsig/DigestMethodType.java     |  2 +-
 .../gv/util/xsd/mis/usp_v2/xmldsig/KeyInfoType.java  | 20 ++++++++++----------
 .../gv/util/xsd/mis/usp_v2/xmldsig/KeyValueType.java | 10 +++++-----
 .../gv/util/xsd/mis/usp_v2/xmldsig/ObjectType.java   |  2 +-
 .../gv/util/xsd/mis/usp_v2/xmldsig/PGPDataType.java  |  4 ++--
 .../gv/util/xsd/mis/usp_v2/xmldsig/SPKIDataType.java |  2 +-
 .../xsd/mis/usp_v2/xmldsig/SignatureMethodType.java  |  2 +-
 .../mis/usp_v2/xmldsig/SignaturePropertyType.java    |  2 +-
 .../util/xsd/mis/usp_v2/xmldsig/TransformType.java   |  4 ++--
 .../gv/util/xsd/mis/usp_v2/xmldsig/X509DataType.java | 10 +++++-----
 10 files changed, 29 insertions(+), 29 deletions(-)

(limited to 'src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig')

diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/DigestMethodType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/DigestMethodType.java
index 0274215..4136a2d 100644
--- a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/DigestMethodType.java
+++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/DigestMethodType.java
@@ -64,8 +64,8 @@ public class DigestMethodType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Object }
      * {@link Element }
+     * {@link Object }
      * {@link String }
      * 
      * 
diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/KeyInfoType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/KeyInfoType.java
index 8a5bec4..b32a783 100644
--- a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/KeyInfoType.java
+++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/KeyInfoType.java
@@ -53,13 +53,13 @@ import org.w3c.dom.Element;
 public class KeyInfoType {
 
     @XmlElementRefs({
-        @XmlElementRef(name = "SPKIData", 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 = "MgmtData", 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 = "X509Data", 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, required = false),
+        @XmlElementRef(name = "SPKIData", 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 = "KeyName", 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 = "PGPData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
     })
     @XmlMixed
     @XmlAnyElement(lax = true)
@@ -88,16 +88,16 @@ public class KeyInfoType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}
+     * {@link Object }
+     * {@link JAXBElement }{@code <}{@link String }{@code >}
+     * {@link String }
      * {@link Element }
-     * {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}
      * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}
      * {@link JAXBElement }{@code <}{@link X509DataType }{@code >}
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link Object }
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
+     * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}
      * {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}
-     * {@link String }
+     * {@link JAXBElement }{@code <}{@link String }{@code >}
+     * {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}
      * 
      * 
      */
diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/KeyValueType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/KeyValueType.java
index ff873e0..e89715e 100644
--- a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/KeyValueType.java
+++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/KeyValueType.java
@@ -42,8 +42,8 @@ import org.w3c.dom.Element;
 public class KeyValueType {
 
     @XmlElementRefs({
-        @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, required = false)
+        @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)
     })
     @XmlMixed
     @XmlAnyElement(lax = true)
@@ -67,11 +67,11 @@ public class KeyValueType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}
-     * {@link Element }
-     * {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}
      * {@link Object }
      * {@link String }
+     * {@link Element }
+     * {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}
+     * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}
      * 
      * 
      */
diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/ObjectType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/ObjectType.java
index d1d716d..5c1ebf8 100644
--- a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/ObjectType.java
+++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/ObjectType.java
@@ -76,8 +76,8 @@ public class ObjectType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Object }
      * {@link Element }
+     * {@link Object }
      * {@link String }
      * 
      * 
diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/PGPDataType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/PGPDataType.java
index 9b1c1b8..6d2b209 100644
--- a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/PGPDataType.java
+++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/PGPDataType.java
@@ -82,9 +82,9 @@ public class PGPDataType {
      * <p>
      * Objects of the following type(s) are allowed in the list
      * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-     * {@link Element }
-     * {@link Object }
      * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+     * {@link Object }
+     * {@link Element }
      * 
      * 
      */
diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/SPKIDataType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/SPKIDataType.java
index c0a6931..5cd9d4e 100644
--- a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/SPKIDataType.java
+++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/SPKIDataType.java
@@ -60,9 +60,9 @@ public class SPKIDataType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
+     * {@link Element }
      * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
      * {@link Object }
-     * {@link Element }
      * 
      * 
      */
diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/SignatureMethodType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/SignatureMethodType.java
index 12cb706..92cd0d8 100644
--- a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/SignatureMethodType.java
+++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/SignatureMethodType.java
@@ -68,8 +68,8 @@ public class SignatureMethodType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Object }
      * {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
+     * {@link Object }
      * {@link String }
      * 
      * 
diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/SignaturePropertyType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/SignaturePropertyType.java
index e6b1f69..078ff11 100644
--- a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/SignaturePropertyType.java
+++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/SignaturePropertyType.java
@@ -73,8 +73,8 @@ public class SignaturePropertyType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Object }
      * {@link Element }
+     * {@link Object }
      * {@link String }
      * 
      * 
diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/TransformType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/TransformType.java
index e98f7ec..a17e181 100644
--- a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/TransformType.java
+++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/TransformType.java
@@ -68,10 +68,10 @@ public class TransformType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
      * {@link Object }
+     * {@link JAXBElement }{@code <}{@link String }{@code >}
      * {@link String }
+     * {@link Element }
      * 
      * 
      */
diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/X509DataType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/X509DataType.java
index b40cf7d..f32cae5 100644
--- a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/X509DataType.java
+++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/X509DataType.java
@@ -46,11 +46,11 @@ import org.w3c.dom.Element;
 public class X509DataType {
 
     @XmlElementRefs({
-        @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, required = false),
-        @XmlElementRef(name = "X509CRL", 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 = "X509SKI", 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 = "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)
     })
     @XmlAnyElement(lax = true)
     protected List<Object> x509CRLOrX509CertificateOrX509IssuerSerial;
@@ -73,13 +73,13 @@ public class X509DataType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}
+     * {@link Object }
      * {@link Element }
      * {@link JAXBElement }{@code <}{@link String }{@code >}
      * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
      * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
      * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-     * {@link Object }
+     * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}
      * 
      * 
      */
-- 
cgit v1.2.3