summaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/at/gv/util/client/szr/SZRSOAPHandler.java7
-rw-r--r--src/main/java/at/gv/util/wsdl/misstork/MISSTORKService.java1
-rw-r--r--src/main/java/at/gv/util/wsdl/szrgw/SZRGWService.java3
-rw-r--r--src/main/java/at/gv/util/wsdl/szrgw/SZRGWType.java1
-rw-r--r--src/main/java/at/gv/util/wsdl/ur/URSucheService.java12
-rw-r--r--src/main/java/at/gv/util/wsdl/ur_V2/URSucheService.java9
-rw-r--r--src/main/java/at/gv/util/xsd/ersb/pd/NichtNatuerlichePersonTyp.java8
-rw-r--r--src/main/java/at/gv/util/xsd/ersb/personendata1/NichtNatuerlichePersonTyp.java8
-rw-r--r--src/main/java/at/gv/util/xsd/mandate/Mandate.java5
-rw-r--r--src/main/java/at/gv/util/xsd/mis/MandateIssueRequestType.java107
-rw-r--r--src/main/java/at/gv/util/xsd/mis/ObjectFactory.java16
-rw-r--r--src/main/java/at/gv/util/xsd/mis/Target.java94
-rw-r--r--src/main/java/at/gv/util/xsd/misstork/MisStorkRequest.java207
-rw-r--r--src/main/java/at/gv/util/xsd/misstork/ObjectFactory.java8
-rw-r--r--src/main/java/at/gv/util/xsd/persondata/AbstractPersonType.java10
-rw-r--r--src/main/java/at/gv/util/xsd/persondata/CompactCorporateBodyType.java2
-rw-r--r--src/main/java/at/gv/util/xsd/persondata/CompactPersonDataType.java24
-rw-r--r--src/main/java/at/gv/util/xsd/persondata/CompactPhysicalPersonType.java2
-rw-r--r--src/main/java/at/gv/util/xsd/persondata/CorporateBodyType.java2
-rw-r--r--src/main/java/at/gv/util/xsd/persondata/IdentificationType.java2
-rw-r--r--src/main/java/at/gv/util/xsd/persondata/InternetAddressType.java2
-rw-r--r--src/main/java/at/gv/util/xsd/persondata/NationalityType.java8
-rw-r--r--src/main/java/at/gv/util/xsd/persondata/PersonDataType.java24
-rw-r--r--src/main/java/at/gv/util/xsd/persondata/PhysicalPersonType.java2
-rw-r--r--src/main/java/at/gv/util/xsd/persondata/TelephoneAddressType.java2
-rw-r--r--src/main/java/at/gv/util/xsd/persondata/TypedPostalAddressType.java2
-rw-r--r--src/main/java/at/gv/util/xsd/saml/assertion/AdviceType.java8
-rw-r--r--src/main/java/at/gv/util/xsd/saml/assertion/SubjectType.java6
-rw-r--r--src/main/java/at/gv/util/xsd/srzgw/CreateIdentityLinkRequest.java274
-rw-r--r--src/main/java/at/gv/util/xsd/srzgw/MISType.java185
-rw-r--r--src/main/java/at/gv/util/xsd/srzgw/ObjectFactory.java20
-rw-r--r--src/main/java/at/gv/util/xsd/stork/CanonicalResidenceAddress.java (renamed from src/main/java/at/gv/util/xsd/stork/CanonicalAddressType.java)17
-rw-r--r--src/main/java/at/gv/util/xsd/stork/MandateContent.java70
-rw-r--r--src/main/java/at/gv/util/xsd/stork/ObjectFactory.java43
-rw-r--r--src/main/java/at/gv/util/xsd/stork/RepresentationPerson.java113
-rw-r--r--src/main/java/at/gv/util/xsd/stork/package-info.java7
-rw-r--r--src/main/java/at/gv/util/xsd/ur/pd/PersonenDatenTyp.java2
-rw-r--r--src/main/java/at/gv/util/xsd/ur_V2/pd/NichtNatuerlichePersonTyp.java8
-rw-r--r--src/main/java/at/gv/util/xsd/xmldsig/CanonicalizationMethodType.java2
-rw-r--r--src/main/java/at/gv/util/xsd/xmldsig/DigestMethodType.java4
-rw-r--r--src/main/java/at/gv/util/xsd/xmldsig/KeyInfoType.java24
-rw-r--r--src/main/java/at/gv/util/xsd/xmldsig/KeyValueType.java8
-rw-r--r--src/main/java/at/gv/util/xsd/xmldsig/ObjectFactory.java50
-rw-r--r--src/main/java/at/gv/util/xsd/xmldsig/ObjectType.java4
-rw-r--r--src/main/java/at/gv/util/xsd/xmldsig/PGPDataType.java6
-rw-r--r--src/main/java/at/gv/util/xsd/xmldsig/SPKIDataType.java4
-rw-r--r--src/main/java/at/gv/util/xsd/xmldsig/SignatureMethodType.java4
-rw-r--r--src/main/java/at/gv/util/xsd/xmldsig/SignaturePropertyType.java4
-rw-r--r--src/main/java/at/gv/util/xsd/xmldsig/TransformType.java6
-rw-r--r--src/main/java/at/gv/util/xsd/xmldsig/X509DataType.java14
-rw-r--r--src/main/resources/wsdl/custom-bindings/stork.xml14
-rw-r--r--src/main/resources/wsdl/custom-bindings/szrgw-schemas.xml10
-rw-r--r--src/main/resources/wsdl/mis/mis-1.0.3.xsd19
-rw-r--r--src/main/resources/wsdl/misstork/misstork-1.0.xsd16
-rw-r--r--src/main/resources/wsdl/szrgw/stork.xsd62
-rw-r--r--src/main/resources/wsdl/szrgw/szr-gw-0.0.3.xsd42
56 files changed, 1007 insertions, 607 deletions
diff --git a/src/main/java/at/gv/util/client/szr/SZRSOAPHandler.java b/src/main/java/at/gv/util/client/szr/SZRSOAPHandler.java
index 05e5004..9ee672c 100644
--- a/src/main/java/at/gv/util/client/szr/SZRSOAPHandler.java
+++ b/src/main/java/at/gv/util/client/szr/SZRSOAPHandler.java
@@ -86,8 +86,11 @@ public class SZRSOAPHandler implements SOAPHandler<SOAPMessageContext> {
// adding elements
wsSecHeaderElm.addChildElement(pvpToken);
- SOAPHeader header = envelope.addHeader();
- header.addChildElement(wsSecHeaderElm);
+ SOAPHeader header = envelope.getHeader();
+ if (header == null)
+ header = envelope.addHeader();
+
+ header.addChildElement(wsSecHeaderElm);
return true;
} catch(SOAPException e) {
diff --git a/src/main/java/at/gv/util/wsdl/misstork/MISSTORKService.java b/src/main/java/at/gv/util/wsdl/misstork/MISSTORKService.java
index e09e161..a2b7700 100644
--- a/src/main/java/at/gv/util/wsdl/misstork/MISSTORKService.java
+++ b/src/main/java/at/gv/util/wsdl/misstork/MISSTORKService.java
@@ -42,6 +42,7 @@ public class MISSTORKService
super(__getWsdlLocation(), MISSTORKSERVICE_QNAME);
}
+
public MISSTORKService(URL wsdlLocation) {
super(wsdlLocation, MISSTORKSERVICE_QNAME);
}
diff --git a/src/main/java/at/gv/util/wsdl/szrgw/SZRGWService.java b/src/main/java/at/gv/util/wsdl/szrgw/SZRGWService.java
index 6a8d173..20ad87c 100644
--- a/src/main/java/at/gv/util/wsdl/szrgw/SZRGWService.java
+++ b/src/main/java/at/gv/util/wsdl/szrgw/SZRGWService.java
@@ -42,17 +42,14 @@ public class SZRGWService
super(__getWsdlLocation(), SZRGWSERVICE_QNAME);
}
-
public SZRGWService(URL wsdlLocation) {
super(wsdlLocation, SZRGWSERVICE_QNAME);
}
-
public SZRGWService(URL wsdlLocation, QName serviceName) {
super(wsdlLocation, serviceName);
}
-
/**
*
* @return
diff --git a/src/main/java/at/gv/util/wsdl/szrgw/SZRGWType.java b/src/main/java/at/gv/util/wsdl/szrgw/SZRGWType.java
index 98d2702..01ca437 100644
--- a/src/main/java/at/gv/util/wsdl/szrgw/SZRGWType.java
+++ b/src/main/java/at/gv/util/wsdl/szrgw/SZRGWType.java
@@ -24,7 +24,6 @@ import at.gv.util.xsd.srzgw.CreateIdentityLinkResponse;
at.gv.util.xsd.persondata.ObjectFactory.class,
at.gv.util.xsd.mis.ObjectFactory.class,
at.gv.util.xsd.saml.assertion.ObjectFactory.class,
- at.gv.util.xsd.stork.ObjectFactory.class,
at.gv.util.xsd.xmldsig.ObjectFactory.class
})
public interface SZRGWType {
diff --git a/src/main/java/at/gv/util/wsdl/ur/URSucheService.java b/src/main/java/at/gv/util/wsdl/ur/URSucheService.java
index 672e619..6168ae3 100644
--- a/src/main/java/at/gv/util/wsdl/ur/URSucheService.java
+++ b/src/main/java/at/gv/util/wsdl/ur/URSucheService.java
@@ -42,26 +42,14 @@ public class URSucheService
super(__getWsdlLocation(), URSUCHESERVICE_QNAME);
}
- public URSucheService(WebServiceFeature... features) {
- super(__getWsdlLocation(), URSUCHESERVICE_QNAME, features);
- }
-
public URSucheService(URL wsdlLocation) {
super(wsdlLocation, URSUCHESERVICE_QNAME);
}
- public URSucheService(URL wsdlLocation, WebServiceFeature... features) {
- super(wsdlLocation, URSUCHESERVICE_QNAME, features);
- }
-
public URSucheService(URL wsdlLocation, QName serviceName) {
super(wsdlLocation, serviceName);
}
- public URSucheService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) {
- super(wsdlLocation, serviceName, features);
- }
-
/**
*
* @return
diff --git a/src/main/java/at/gv/util/wsdl/ur_V2/URSucheService.java b/src/main/java/at/gv/util/wsdl/ur_V2/URSucheService.java
index da026e4..50c0be3 100644
--- a/src/main/java/at/gv/util/wsdl/ur_V2/URSucheService.java
+++ b/src/main/java/at/gv/util/wsdl/ur_V2/URSucheService.java
@@ -42,25 +42,16 @@ public class URSucheService
super(__getWsdlLocation(), URSUCHESERVICE_QNAME);
}
- public URSucheService(WebServiceFeature... features) {
- super(__getWsdlLocation(), URSUCHESERVICE_QNAME, features);
- }
public URSucheService(URL wsdlLocation) {
super(wsdlLocation, URSUCHESERVICE_QNAME);
}
- public URSucheService(URL wsdlLocation, WebServiceFeature... features) {
- super(wsdlLocation, URSUCHESERVICE_QNAME, features);
- }
public URSucheService(URL wsdlLocation, QName serviceName) {
super(wsdlLocation, serviceName);
}
- public URSucheService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) {
- super(wsdlLocation, serviceName, features);
- }
/**
*
diff --git a/src/main/java/at/gv/util/xsd/ersb/pd/NichtNatuerlichePersonTyp.java b/src/main/java/at/gv/util/xsd/ersb/pd/NichtNatuerlichePersonTyp.java
index 6699e20..dd52925 100644
--- a/src/main/java/at/gv/util/xsd/ersb/pd/NichtNatuerlichePersonTyp.java
+++ b/src/main/java/at/gv/util/xsd/ersb/pd/NichtNatuerlichePersonTyp.java
@@ -50,10 +50,10 @@ public class NichtNatuerlichePersonTyp
{
@XmlElementRefs({
- @XmlElementRef(name = "Rechtsform", namespace = "http://statistik.at/namespace/ur/stammdaten/2#", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "UntName", namespace = "http://statistik.at/namespace/ur/stammdaten/2#", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "Rechtsform", namespace = "http://reference.e-government.gv.at/namespace/persondata/de/20040201#", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "VollerName", namespace = "http://reference.e-government.gv.at/namespace/persondata/de/20040201#", type = JAXBElement.class, required = false)
+ @XmlElementRef(name = "Rechtsform", namespace = "http://statistik.at/namespace/ur/stammdaten/2#", type = JAXBElement.class),
+ @XmlElementRef(name = "UntName", namespace = "http://statistik.at/namespace/ur/stammdaten/2#", type = JAXBElement.class),
+ @XmlElementRef(name = "Rechtsform", namespace = "http://reference.e-government.gv.at/namespace/persondata/de/20040201#", type = JAXBElement.class),
+ @XmlElementRef(name = "VollerName", namespace = "http://reference.e-government.gv.at/namespace/persondata/de/20040201#", type = JAXBElement.class)
})
protected List<JAXBElement<?>> rest;
@XmlAttribute(name = "vollzugBeginn", namespace = "http://statistik.at/namespace/ur/stammdaten/2#")
diff --git a/src/main/java/at/gv/util/xsd/ersb/personendata1/NichtNatuerlichePersonTyp.java b/src/main/java/at/gv/util/xsd/ersb/personendata1/NichtNatuerlichePersonTyp.java
index 04796d9..987d70a 100644
--- a/src/main/java/at/gv/util/xsd/ersb/personendata1/NichtNatuerlichePersonTyp.java
+++ b/src/main/java/at/gv/util/xsd/ersb/personendata1/NichtNatuerlichePersonTyp.java
@@ -48,10 +48,10 @@ public class NichtNatuerlichePersonTyp
{
@XmlElementRefs({
- @XmlElementRef(name = "UntName", namespace = "http://statistik.at/namespace/ersb/1#", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "VollerName", namespace = "http://statistik.at/namespace/ersb/persondata/1#", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "Rechtsform", namespace = "http://statistik.at/namespace/ersb/1#", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "Rechtsform", namespace = "http://statistik.at/namespace/ersb/persondata/1#", type = JAXBElement.class, required = false)
+ @XmlElementRef(name = "UntName", namespace = "http://statistik.at/namespace/ersb/1#", type = JAXBElement.class),
+ @XmlElementRef(name = "VollerName", namespace = "http://statistik.at/namespace/ersb/persondata/1#", type = JAXBElement.class),
+ @XmlElementRef(name = "Rechtsform", namespace = "http://statistik.at/namespace/ersb/1#", type = JAXBElement.class),
+ @XmlElementRef(name = "Rechtsform", namespace = "http://statistik.at/namespace/ersb/persondata/1#", type = JAXBElement.class)
})
protected List<JAXBElement<?>> rest;
@XmlAttribute(name = "aktion", namespace = "http://statistik.at/namespace/ersb/1#")
diff --git a/src/main/java/at/gv/util/xsd/mandate/Mandate.java b/src/main/java/at/gv/util/xsd/mandate/Mandate.java
index 71e2a4f..ec8aae8 100644
--- a/src/main/java/at/gv/util/xsd/mandate/Mandate.java
+++ b/src/main/java/at/gv/util/xsd/mandate/Mandate.java
@@ -92,7 +92,7 @@ public class Mandate {
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
@XmlSchemaType(name = "token")
protected String mandateID;
-
+
/**
* Gets the value of the annotation property.
*
@@ -343,4 +343,7 @@ public class Mandate {
this.mandateID = value;
}
+
+
+
}
diff --git a/src/main/java/at/gv/util/xsd/mis/MandateIssueRequestType.java b/src/main/java/at/gv/util/xsd/mis/MandateIssueRequestType.java
index aef6e1b..0c67da5 100644
--- a/src/main/java/at/gv/util/xsd/mis/MandateIssueRequestType.java
+++ b/src/main/java/at/gv/util/xsd/mis/MandateIssueRequestType.java
@@ -44,18 +44,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
* &lt;/complexContent>
* &lt;/complexType>
* &lt;/element>
- * &lt;element name="Target" minOccurs="0">
- * &lt;complexType>
- * &lt;complexContent>
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * &lt;sequence>
- * &lt;element name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
- * &lt;element name="Value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * &lt;/sequence>
- * &lt;/restriction>
- * &lt;/complexContent>
- * &lt;/complexType>
- * &lt;/element>
+ * &lt;element ref="{http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd}Target" minOccurs="0"/>
* &lt;/sequence>
* &lt;element name="SessionID" type="{http://www.w3.org/2001/XMLSchema}string"/>
* &lt;/choice>
@@ -94,7 +83,7 @@ public class MandateIssueRequestType {
@XmlElement(name = "Filters")
protected MandateIssueRequestType.Filters filters;
@XmlElement(name = "Target")
- protected MandateIssueRequestType.Target target;
+ protected Target target;
@XmlElement(name = "SessionID")
protected String sessionID;
@@ -243,10 +232,10 @@ public class MandateIssueRequestType {
*
* @return
* possible object is
- * {@link MandateIssueRequestType.Target }
+ * {@link Target }
*
*/
- public MandateIssueRequestType.Target getTarget() {
+ public Target getTarget() {
return target;
}
@@ -255,10 +244,10 @@ public class MandateIssueRequestType {
*
* @param value
* allowed object is
- * {@link MandateIssueRequestType.Target }
+ * {@link Target }
*
*/
- public void setTarget(MandateIssueRequestType.Target value) {
+ public void setTarget(Target value) {
this.target = value;
}
@@ -341,88 +330,4 @@ public class MandateIssueRequestType {
}
-
- /**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType>
- * &lt;complexContent>
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * &lt;sequence>
- * &lt;element name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
- * &lt;element name="Value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * &lt;/sequence>
- * &lt;/restriction>
- * &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- *
- *
- */
- @XmlAccessorType(XmlAccessType.FIELD)
- @XmlType(name = "", propOrder = {
- "type",
- "value"
- })
- public static class Target {
-
- @XmlElement(name = "Type", required = true)
- @XmlSchemaType(name = "anyURI")
- protected String type;
- @XmlElement(name = "Value")
- protected String value;
-
- /**
- * Gets the value of the type property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getType() {
- return type;
- }
-
- /**
- * Sets the value of the type property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setType(String value) {
- this.type = value;
- }
-
- /**
- * Gets the value of the value property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getValue() {
- return value;
- }
-
- /**
- * Sets the value of the value property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setValue(String value) {
- this.value = value;
- }
-
- }
-
}
diff --git a/src/main/java/at/gv/util/xsd/mis/ObjectFactory.java b/src/main/java/at/gv/util/xsd/mis/ObjectFactory.java
index 415559b..5e58d91 100644
--- a/src/main/java/at/gv/util/xsd/mis/ObjectFactory.java
+++ b/src/main/java/at/gv/util/xsd/mis/ObjectFactory.java
@@ -59,6 +59,14 @@ public class ObjectFactory {
}
/**
+ * Create an instance of {@link Target }
+ *
+ */
+ public Target createTarget() {
+ return new Target();
+ }
+
+ /**
* Create an instance of {@link MandateIdentifiers }
*
*/
@@ -91,14 +99,6 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link MandateIssueRequestType.Target }
- *
- */
- public MandateIssueRequestType.Target createMandateIssueRequestTypeTarget() {
- return new MandateIssueRequestType.Target();
- }
-
- /**
* Create an instance of {@link JAXBElement }{@code <}{@link MandateIssueRequestType }{@code >}}
*
*/
diff --git a/src/main/java/at/gv/util/xsd/mis/Target.java b/src/main/java/at/gv/util/xsd/mis/Target.java
new file mode 100644
index 0000000..c853769
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/mis/Target.java
@@ -0,0 +1,94 @@
+
+package at.gv.util.xsd.mis;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * &lt;complexType>
+ * &lt;complexContent>
+ * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * &lt;sequence>
+ * &lt;element name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ * &lt;element name="Value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * &lt;/sequence>
+ * &lt;/restriction>
+ * &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+ "type",
+ "value"
+})
+@XmlRootElement(name = "Target")
+public class Target {
+
+ @XmlElement(name = "Type", required = true)
+ @XmlSchemaType(name = "anyURI")
+ protected String type;
+ @XmlElement(name = "Value")
+ protected String value;
+
+ /**
+ * Gets the value of the type property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getType() {
+ return type;
+ }
+
+ /**
+ * Sets the value of the type property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setType(String value) {
+ this.type = value;
+ }
+
+ /**
+ * Gets the value of the value property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getValue() {
+ return value;
+ }
+
+ /**
+ * Sets the value of the value property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/misstork/MisStorkRequest.java b/src/main/java/at/gv/util/xsd/misstork/MisStorkRequest.java
index 0c5675b..52a3a67 100644
--- a/src/main/java/at/gv/util/xsd/misstork/MisStorkRequest.java
+++ b/src/main/java/at/gv/util/xsd/misstork/MisStorkRequest.java
@@ -10,8 +10,8 @@ import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import at.gv.util.xsd.mis.MandateIdentifiers;
+import at.gv.util.xsd.mis.Target;
import at.gv.util.xsd.persondata.CorporateBodyType;
-import at.gv.util.xsd.persondata.PhysicalPersonType;
/**
@@ -27,18 +27,29 @@ import at.gv.util.xsd.persondata.PhysicalPersonType;
* &lt;sequence>
* &lt;element name="StorkMandateType" type="{http://www.w3.org/2001/XMLSchema}integer"/>
* &lt;element ref="{http://reference.e-government.gv.at/namespace/misstork/20131126/xsd}MandatorType"/>
- * &lt;element ref="{http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd}MandateIdentifiers" minOccurs="0"/>
+ * &lt;element name="Filters" minOccurs="0">
+ * &lt;complexType>
+ * &lt;complexContent>
+ * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * &lt;sequence>
+ * &lt;element ref="{http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd}MandateIdentifiers" minOccurs="0"/>
+ * &lt;/sequence>
+ * &lt;/restriction>
+ * &lt;/complexContent>
+ * &lt;/complexType>
+ * &lt;/element>
+ * &lt;element ref="{http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd}Target" minOccurs="0"/>
+ * &lt;element name="OAFriendlyName" type="{http://www.w3.org/2001/XMLSchema}string"/>
* &lt;/sequence>
* &lt;sequence>
* &lt;element ref="{http://reference.e-government.gv.at/namespace/misstork/20131126/xsd}ReferenceValue"/>
- * &lt;element name="MISMandateType" type="{http://www.w3.org/2001/XMLSchema}string"/>
* &lt;element name="Mandator">
* &lt;complexType>
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;choice>
* &lt;sequence>
- * &lt;element ref="{http://reference.e-government.gv.at/namespace/persondata/20020228#}PhysicalPerson"/>
+ * &lt;element name="IdentityLink" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
* &lt;/sequence>
* &lt;sequence>
* &lt;element ref="{http://reference.e-government.gv.at/namespace/persondata/20020228#}CorporateBody"/>
@@ -53,7 +64,7 @@ import at.gv.util.xsd.persondata.PhysicalPersonType;
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
- * &lt;element ref="{http://reference.e-government.gv.at/namespace/persondata/20020228#}PhysicalPerson"/>
+ * &lt;element name="IdentityLink" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
@@ -72,9 +83,10 @@ import at.gv.util.xsd.persondata.PhysicalPersonType;
@XmlType(name = "", propOrder = {
"storkMandateType",
"mandatorType",
- "mandateIdentifiers",
+ "filters",
+ "target",
+ "oaFriendlyName",
"referenceValue",
- "misMandateType",
"mandator",
"representative"
})
@@ -85,13 +97,15 @@ public class MisStorkRequest {
protected BigInteger storkMandateType;
@XmlElement(name = "MandatorType")
protected String mandatorType;
- @XmlElement(name = "MandateIdentifiers", namespace = "http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd")
- protected MandateIdentifiers mandateIdentifiers;
+ @XmlElement(name = "Filters")
+ protected MisStorkRequest.Filters filters;
+ @XmlElement(name = "Target", namespace = "http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd")
+ protected Target target;
+ @XmlElement(name = "OAFriendlyName")
+ protected String oaFriendlyName;
@XmlElement(name = "ReferenceValue")
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
protected String referenceValue;
- @XmlElement(name = "MISMandateType")
- protected String misMandateType;
@XmlElement(name = "Mandator")
protected MisStorkRequest.Mandator mandator;
@XmlElement(name = "Representative")
@@ -146,75 +160,99 @@ public class MisStorkRequest {
}
/**
- * Gets the value of the mandateIdentifiers property.
+ * Gets the value of the filters property.
*
* @return
* possible object is
- * {@link MandateIdentifiers }
+ * {@link MisStorkRequest.Filters }
*
*/
- public MandateIdentifiers getMandateIdentifiers() {
- return mandateIdentifiers;
+ public MisStorkRequest.Filters getFilters() {
+ return filters;
}
/**
- * Sets the value of the mandateIdentifiers property.
+ * Sets the value of the filters property.
*
* @param value
* allowed object is
- * {@link MandateIdentifiers }
+ * {@link MisStorkRequest.Filters }
*
*/
- public void setMandateIdentifiers(MandateIdentifiers value) {
- this.mandateIdentifiers = value;
+ public void setFilters(MisStorkRequest.Filters value) {
+ this.filters = value;
}
/**
- * Gets the value of the referenceValue property.
+ * Gets the value of the target property.
+ *
+ * @return
+ * possible object is
+ * {@link Target }
+ *
+ */
+ public Target getTarget() {
+ return target;
+ }
+
+ /**
+ * Sets the value of the target property.
+ *
+ * @param value
+ * allowed object is
+ * {@link Target }
+ *
+ */
+ public void setTarget(Target value) {
+ this.target = value;
+ }
+
+ /**
+ * Gets the value of the oaFriendlyName property.
*
* @return
* possible object is
* {@link String }
*
*/
- public String getReferenceValue() {
- return referenceValue;
+ public String getOAFriendlyName() {
+ return oaFriendlyName;
}
/**
- * Sets the value of the referenceValue property.
+ * Sets the value of the oaFriendlyName property.
*
* @param value
* allowed object is
* {@link String }
*
*/
- public void setReferenceValue(String value) {
- this.referenceValue = value;
+ public void setOAFriendlyName(String value) {
+ this.oaFriendlyName = value;
}
/**
- * Gets the value of the misMandateType property.
+ * Gets the value of the referenceValue property.
*
* @return
* possible object is
* {@link String }
*
*/
- public String getMISMandateType() {
- return misMandateType;
+ public String getReferenceValue() {
+ return referenceValue;
}
/**
- * Sets the value of the misMandateType property.
+ * Sets the value of the referenceValue property.
*
* @param value
* allowed object is
* {@link String }
*
*/
- public void setMISMandateType(String value) {
- this.misMandateType = value;
+ public void setReferenceValue(String value) {
+ this.referenceValue = value;
}
/**
@@ -275,9 +313,64 @@ public class MisStorkRequest {
* &lt;complexType>
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * &lt;sequence>
+ * &lt;element ref="{http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd}MandateIdentifiers" minOccurs="0"/>
+ * &lt;/sequence>
+ * &lt;/restriction>
+ * &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ *
+ *
+ */
+ @XmlAccessorType(XmlAccessType.FIELD)
+ @XmlType(name = "", propOrder = {
+ "mandateIdentifiers"
+ })
+ public static class Filters {
+
+ @XmlElement(name = "MandateIdentifiers", namespace = "http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd")
+ protected MandateIdentifiers mandateIdentifiers;
+
+ /**
+ * Gets the value of the mandateIdentifiers property.
+ *
+ * @return
+ * possible object is
+ * {@link MandateIdentifiers }
+ *
+ */
+ public MandateIdentifiers getMandateIdentifiers() {
+ return mandateIdentifiers;
+ }
+
+ /**
+ * Sets the value of the mandateIdentifiers property.
+ *
+ * @param value
+ * allowed object is
+ * {@link MandateIdentifiers }
+ *
+ */
+ public void setMandateIdentifiers(MandateIdentifiers value) {
+ this.mandateIdentifiers = value;
+ }
+
+ }
+
+
+ /**
+ * <p>Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * &lt;complexType>
+ * &lt;complexContent>
+ * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;choice>
* &lt;sequence>
- * &lt;element ref="{http://reference.e-government.gv.at/namespace/persondata/20020228#}PhysicalPerson"/>
+ * &lt;element name="IdentityLink" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
* &lt;/sequence>
* &lt;sequence>
* &lt;element ref="{http://reference.e-government.gv.at/namespace/persondata/20020228#}CorporateBody"/>
@@ -292,38 +385,36 @@ public class MisStorkRequest {
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
- "physicalPerson",
+ "identityLink",
"corporateBody"
})
public static class Mandator {
- @XmlElement(name = "PhysicalPerson", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#")
- protected PhysicalPersonType physicalPerson;
+ @XmlElement(name = "IdentityLink")
+ protected byte[] identityLink;
@XmlElement(name = "CorporateBody", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#")
protected CorporateBodyType corporateBody;
/**
- * Gets the value of the physicalPerson property.
+ * Gets the value of the identityLink property.
*
* @return
* possible object is
- * {@link PhysicalPersonType }
- *
+ * byte[]
*/
- public PhysicalPersonType getPhysicalPerson() {
- return physicalPerson;
+ public byte[] getIdentityLink() {
+ return identityLink;
}
/**
- * Sets the value of the physicalPerson property.
+ * Sets the value of the identityLink property.
*
* @param value
* allowed object is
- * {@link PhysicalPersonType }
- *
+ * byte[]
*/
- public void setPhysicalPerson(PhysicalPersonType value) {
- this.physicalPerson = value;
+ public void setIdentityLink(byte[] value) {
+ this.identityLink = value;
}
/**
@@ -363,7 +454,7 @@ public class MisStorkRequest {
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
- * &lt;element ref="{http://reference.e-government.gv.at/namespace/persondata/20020228#}PhysicalPerson"/>
+ * &lt;element name="IdentityLink" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
@@ -374,35 +465,33 @@ public class MisStorkRequest {
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
- "physicalPerson"
+ "identityLink"
})
public static class Representative {
- @XmlElement(name = "PhysicalPerson", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", required = true)
- protected PhysicalPersonType physicalPerson;
+ @XmlElement(name = "IdentityLink", required = true)
+ protected byte[] identityLink;
/**
- * Gets the value of the physicalPerson property.
+ * Gets the value of the identityLink property.
*
* @return
* possible object is
- * {@link PhysicalPersonType }
- *
+ * byte[]
*/
- public PhysicalPersonType getPhysicalPerson() {
- return physicalPerson;
+ public byte[] getIdentityLink() {
+ return identityLink;
}
/**
- * Sets the value of the physicalPerson property.
+ * Sets the value of the identityLink property.
*
* @param value
* allowed object is
- * {@link PhysicalPersonType }
- *
+ * byte[]
*/
- public void setPhysicalPerson(PhysicalPersonType value) {
- this.physicalPerson = value;
+ public void setIdentityLink(byte[] value) {
+ this.identityLink = value;
}
}
diff --git a/src/main/java/at/gv/util/xsd/misstork/ObjectFactory.java b/src/main/java/at/gv/util/xsd/misstork/ObjectFactory.java
index 6cacbc4..b8ee2b5 100644
--- a/src/main/java/at/gv/util/xsd/misstork/ObjectFactory.java
+++ b/src/main/java/at/gv/util/xsd/misstork/ObjectFactory.java
@@ -61,6 +61,14 @@ public class ObjectFactory {
}
/**
+ * Create an instance of {@link MisStorkRequest.Filters }
+ *
+ */
+ public MisStorkRequest.Filters createMisStorkRequestFilters() {
+ return new MisStorkRequest.Filters();
+ }
+
+ /**
* Create an instance of {@link MisStorkRequest.Mandator }
*
*/
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 3d20f54..8aa2dc8 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)
@@ -120,13 +120,13 @@ public class AbstractPersonType {
* <p>
* Objects of the following type(s) are allowed in the list
* {@link JAXBElement }{@code <}{@link AbstractSimpleIdentificationType }{@code >}
+ * {@link JAXBElement }{@code <}{@link Firmenbuchnummer }{@code >}
* {@link JAXBElement }{@code <}{@link AbstractSimpleIdentificationType }{@code >}
+ * {@link JAXBElement }{@code <}{@link ZMRzahl }{@code >}
* {@link JAXBElement }{@code <}{@link AbstractSimpleIdentificationType }{@code >}
- * {@link JAXBElement }{@code <}{@link AbstractSimpleIdentificationType }{@code >}
- * {@link JAXBElement }{@code <}{@link Vereinsnummer }{@code >}
* {@link JAXBElement }{@code <}{@link ERJPZahl }{@code >}
- * {@link JAXBElement }{@code <}{@link Firmenbuchnummer }{@code >}
- * {@link JAXBElement }{@code <}{@link ZMRzahl }{@code >}
+ * {@link JAXBElement }{@code <}{@link Vereinsnummer }{@code >}
+ * {@link JAXBElement }{@code <}{@link AbstractSimpleIdentificationType }{@code >}
* {@link JAXBElement }{@code <}{@link AbstractSimpleIdentificationType }{@code >}
*
*
diff --git a/src/main/java/at/gv/util/xsd/persondata/CompactCorporateBodyType.java b/src/main/java/at/gv/util/xsd/persondata/CompactCorporateBodyType.java
index bd7d324..0a542e0 100644
--- a/src/main/java/at/gv/util/xsd/persondata/CompactCorporateBodyType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/CompactCorporateBodyType.java
@@ -188,8 +188,8 @@ public class CompactCorporateBodyType
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Object }
* {@link Element }
+ * {@link Object }
*
*
*/
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 0880394..fb9b0e4 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;
@@ -75,11 +75,11 @@ public class CompactPersonDataType
*
* @return
* possible object is
- * {@link JAXBElement }{@code <}{@link CorporateBodyType }{@code >}
+ * {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >}
* {@link JAXBElement }{@code <}{@link AbstractPersonType }{@code >}
- * {@link JAXBElement }{@code <}{@link CompactCorporateBodyType }{@code >}
* {@link JAXBElement }{@code <}{@link CompactPhysicalPersonType }{@code >}
- * {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >}
+ * {@link JAXBElement }{@code <}{@link CorporateBodyType }{@code >}
+ * {@link JAXBElement }{@code <}{@link CompactCorporateBodyType }{@code >}
*
*/
public JAXBElement<? extends AbstractPersonType> getPerson() {
@@ -91,11 +91,11 @@ public class CompactPersonDataType
*
* @param value
* allowed object is
- * {@link JAXBElement }{@code <}{@link CorporateBodyType }{@code >}
+ * {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >}
* {@link JAXBElement }{@code <}{@link AbstractPersonType }{@code >}
- * {@link JAXBElement }{@code <}{@link CompactCorporateBodyType }{@code >}
* {@link JAXBElement }{@code <}{@link CompactPhysicalPersonType }{@code >}
- * {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >}
+ * {@link JAXBElement }{@code <}{@link CorporateBodyType }{@code >}
+ * {@link JAXBElement }{@code <}{@link CompactCorporateBodyType }{@code >}
*
*/
public void setPerson(JAXBElement<? extends AbstractPersonType> value) {
@@ -120,12 +120,12 @@ public class CompactPersonDataType
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link JAXBElement }{@code <}{@link CompactPostalAddressType }{@code >}
- * {@link JAXBElement }{@code <}{@link AbstractAddressType }{@code >}
* {@link JAXBElement }{@code <}{@link InternetAddressType }{@code >}
+ * {@link JAXBElement }{@code <}{@link TelephoneAddressType }{@code >}
+ * {@link JAXBElement }{@code <}{@link AbstractAddressType }{@code >}
* {@link JAXBElement }{@code <}{@link TypedPostalAddressType }{@code >}
+ * {@link JAXBElement }{@code <}{@link CompactPostalAddressType }{@code >}
* {@link JAXBElement }{@code <}{@link PostalAddressType }{@code >}
- * {@link JAXBElement }{@code <}{@link TelephoneAddressType }{@code >}
*
*
*/
@@ -237,9 +237,9 @@ public class CompactPersonDataType
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Object }
- * {@link String }
* {@link Element }
+ * {@link String }
+ * {@link Object }
*
*
*/
diff --git a/src/main/java/at/gv/util/xsd/persondata/CompactPhysicalPersonType.java b/src/main/java/at/gv/util/xsd/persondata/CompactPhysicalPersonType.java
index 1e37799..94e97ea 100644
--- a/src/main/java/at/gv/util/xsd/persondata/CompactPhysicalPersonType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/CompactPhysicalPersonType.java
@@ -240,8 +240,8 @@ public class CompactPhysicalPersonType
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Object }
* {@link Element }
+ * {@link Object }
*
*
*/
diff --git a/src/main/java/at/gv/util/xsd/persondata/CorporateBodyType.java b/src/main/java/at/gv/util/xsd/persondata/CorporateBodyType.java
index 6596ae3..19d957d 100644
--- a/src/main/java/at/gv/util/xsd/persondata/CorporateBodyType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/CorporateBodyType.java
@@ -256,8 +256,8 @@ public class CorporateBodyType
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Object }
* {@link Element }
+ * {@link Object }
*
*
*/
diff --git a/src/main/java/at/gv/util/xsd/persondata/IdentificationType.java b/src/main/java/at/gv/util/xsd/persondata/IdentificationType.java
index df20e77..f22d685 100644
--- a/src/main/java/at/gv/util/xsd/persondata/IdentificationType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/IdentificationType.java
@@ -172,8 +172,8 @@ public class IdentificationType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Object }
* {@link Element }
+ * {@link Object }
*
*
*/
diff --git a/src/main/java/at/gv/util/xsd/persondata/InternetAddressType.java b/src/main/java/at/gv/util/xsd/persondata/InternetAddressType.java
index 90dfd41..2afa515 100644
--- a/src/main/java/at/gv/util/xsd/persondata/InternetAddressType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/InternetAddressType.java
@@ -121,8 +121,8 @@ public class InternetAddressType
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Object }
* {@link Element }
+ * {@link Object }
*
*
*/
diff --git a/src/main/java/at/gv/util/xsd/persondata/NationalityType.java b/src/main/java/at/gv/util/xsd/persondata/NationalityType.java
index c88bda9..4a426fc 100644
--- a/src/main/java/at/gv/util/xsd/persondata/NationalityType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/NationalityType.java
@@ -52,10 +52,10 @@ import org.w3c.dom.Element;
public class NationalityType {
@XmlElementRefs({
+ @XmlElementRef(name = "ISOCode3", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class),
@XmlElementRef(name = "CountryNameEN", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class),
- @XmlElementRef(name = "CountryNameDE", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class),
@XmlElementRef(name = "CountryNameFR", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class),
- @XmlElementRef(name = "ISOCode3", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class)
+ @XmlElementRef(name = "CountryNameDE", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class)
})
@XmlMixed
@XmlAnyElement(lax = true)
@@ -79,13 +79,13 @@ public class NationalityType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Object }
* {@link Element }
* {@link JAXBElement }{@code <}{@link String }{@code >}
* {@link JAXBElement }{@code <}{@link String }{@code >}
- * {@link JAXBElement }{@code <}{@link String }{@code >}
+ * {@link Object }
* {@link String }
* {@link JAXBElement }{@code <}{@link String }{@code >}
+ * {@link JAXBElement }{@code <}{@link String }{@code >}
*
*
*/
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 29514bb..1423425 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;
@@ -75,11 +75,11 @@ public class PersonDataType
*
* @return
* possible object is
- * {@link JAXBElement }{@code <}{@link CorporateBodyType }{@code >}
+ * {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >}
* {@link JAXBElement }{@code <}{@link AbstractPersonType }{@code >}
- * {@link JAXBElement }{@code <}{@link CompactCorporateBodyType }{@code >}
* {@link JAXBElement }{@code <}{@link CompactPhysicalPersonType }{@code >}
- * {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >}
+ * {@link JAXBElement }{@code <}{@link CorporateBodyType }{@code >}
+ * {@link JAXBElement }{@code <}{@link CompactCorporateBodyType }{@code >}
*
*/
public JAXBElement<? extends AbstractPersonType> getPerson() {
@@ -91,11 +91,11 @@ public class PersonDataType
*
* @param value
* allowed object is
- * {@link JAXBElement }{@code <}{@link CorporateBodyType }{@code >}
+ * {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >}
* {@link JAXBElement }{@code <}{@link AbstractPersonType }{@code >}
- * {@link JAXBElement }{@code <}{@link CompactCorporateBodyType }{@code >}
* {@link JAXBElement }{@code <}{@link CompactPhysicalPersonType }{@code >}
- * {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >}
+ * {@link JAXBElement }{@code <}{@link CorporateBodyType }{@code >}
+ * {@link JAXBElement }{@code <}{@link CompactCorporateBodyType }{@code >}
*
*/
public void setPerson(JAXBElement<? extends AbstractPersonType> value) {
@@ -120,12 +120,12 @@ public class PersonDataType
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link JAXBElement }{@code <}{@link CompactPostalAddressType }{@code >}
- * {@link JAXBElement }{@code <}{@link AbstractAddressType }{@code >}
* {@link JAXBElement }{@code <}{@link InternetAddressType }{@code >}
+ * {@link JAXBElement }{@code <}{@link TelephoneAddressType }{@code >}
+ * {@link JAXBElement }{@code <}{@link AbstractAddressType }{@code >}
* {@link JAXBElement }{@code <}{@link TypedPostalAddressType }{@code >}
+ * {@link JAXBElement }{@code <}{@link CompactPostalAddressType }{@code >}
* {@link JAXBElement }{@code <}{@link PostalAddressType }{@code >}
- * {@link JAXBElement }{@code <}{@link TelephoneAddressType }{@code >}
*
*
*/
@@ -237,9 +237,9 @@ public class PersonDataType
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Object }
- * {@link String }
* {@link Element }
+ * {@link String }
+ * {@link Object }
*
*
*/
diff --git a/src/main/java/at/gv/util/xsd/persondata/PhysicalPersonType.java b/src/main/java/at/gv/util/xsd/persondata/PhysicalPersonType.java
index 4c5a5e3..f272763 100644
--- a/src/main/java/at/gv/util/xsd/persondata/PhysicalPersonType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/PhysicalPersonType.java
@@ -484,8 +484,8 @@ public class PhysicalPersonType
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Object }
* {@link Element }
+ * {@link Object }
*
*
*/
diff --git a/src/main/java/at/gv/util/xsd/persondata/TelephoneAddressType.java b/src/main/java/at/gv/util/xsd/persondata/TelephoneAddressType.java
index 2e8e7e6..eb76402 100644
--- a/src/main/java/at/gv/util/xsd/persondata/TelephoneAddressType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/TelephoneAddressType.java
@@ -125,8 +125,8 @@ public class TelephoneAddressType
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Object }
* {@link Element }
+ * {@link Object }
*
*
*/
diff --git a/src/main/java/at/gv/util/xsd/persondata/TypedPostalAddressType.java b/src/main/java/at/gv/util/xsd/persondata/TypedPostalAddressType.java
index 0b53e5e..c85e2ec 100644
--- a/src/main/java/at/gv/util/xsd/persondata/TypedPostalAddressType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/TypedPostalAddressType.java
@@ -120,8 +120,8 @@ public class TypedPostalAddressType
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Object }
* {@link Element }
+ * {@link Object }
*
*
*/
diff --git a/src/main/java/at/gv/util/xsd/saml/assertion/AdviceType.java b/src/main/java/at/gv/util/xsd/saml/assertion/AdviceType.java
index 3e80631..3375f18 100644
--- a/src/main/java/at/gv/util/xsd/saml/assertion/AdviceType.java
+++ b/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),
+ @XmlElementRef(name = "AssertionIDReference", namespace = "urn:oasis:names:tc:SAML:1.0:assertion", type = JAXBElement.class)
})
@XmlAnyElement(lax = true)
protected List<Object> assertionIDReferenceOrAssertionOrAny;
@@ -65,10 +65,10 @@ public class AdviceType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Object }
- * {@link JAXBElement }{@code <}{@link String }{@code >}
* {@link Element }
* {@link JAXBElement }{@code <}{@link AssertionType }{@code >}
+ * {@link Object }
+ * {@link JAXBElement }{@code <}{@link String }{@code >}
*
*
*/
diff --git a/src/main/java/at/gv/util/xsd/saml/assertion/SubjectType.java b/src/main/java/at/gv/util/xsd/saml/assertion/SubjectType.java
index 1a24a2c..89b61c3 100644
--- a/src/main/java/at/gv/util/xsd/saml/assertion/SubjectType.java
+++ b/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 = "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)
+ @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)
})
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 SubjectConfirmationType }{@code >}
* {@link JAXBElement }{@code <}{@link NameIdentifierType }{@code >}
+ * {@link JAXBElement }{@code <}{@link SubjectConfirmationType }{@code >}
*
*
*/
diff --git a/src/main/java/at/gv/util/xsd/srzgw/CreateIdentityLinkRequest.java b/src/main/java/at/gv/util/xsd/srzgw/CreateIdentityLinkRequest.java
index 15aa71b..d191cc6 100644
--- a/src/main/java/at/gv/util/xsd/srzgw/CreateIdentityLinkRequest.java
+++ b/src/main/java/at/gv/util/xsd/srzgw/CreateIdentityLinkRequest.java
@@ -6,9 +6,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import at.gv.util.xsd.mis.MandateIdentifiers;
-import at.gv.util.xsd.stork.MandateContent;
-import at.gv.util.xsd.stork.RepresentationPerson;
/**
@@ -26,30 +23,24 @@ import at.gv.util.xsd.stork.RepresentationPerson;
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
- * &lt;element name="Identifier" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * &lt;element name="Firstname" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * &lt;element name="Familyname" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * &lt;element name="DateOfBirth" type="{http://reference.e-government.gv.at/namespace/szrgw/20070807/xsd}DateOfBirthType"/>
- * &lt;element name="Representative" type="{urn:eu:stork:names:tc:PEPS:1.0:assertion}representationPerson" minOccurs="0"/>
- * &lt;element name="Represented" type="{urn:eu:stork:names:tc:PEPS:1.0:assertion}representationPerson" minOccurs="0"/>
- * &lt;element name="MandateContent" type="{urn:eu:stork:names:tc:PEPS:1.0:assertion}mandateContent" minOccurs="0"/>
+ * &lt;element name="Identifier" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * &lt;element name="Firstname" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * &lt;element name="Familyname" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * &lt;element name="DateOfBirth" type="{http://reference.e-government.gv.at/namespace/szrgw/20070807/xsd}DateOfBirthType" minOccurs="0"/>
+ * &lt;element name="Gender" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * &lt;element name="FiscalNumber" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * &lt;element name="LegalPersonTranslatableType" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * &lt;element name="LegalPersonCanonicalRegisteredAddress" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * &lt;element name="Representative" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * &lt;element name="Represented" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * &lt;element name="MandateContent" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* &lt;/element>
- * &lt;element name="Signature">
- * &lt;complexType>
- * &lt;complexContent>
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * &lt;sequence>
- * &lt;element name="Base64Content" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- * &lt;/sequence>
- * &lt;/restriction>
- * &lt;/complexContent>
- * &lt;/complexType>
- * &lt;/element>
- * &lt;element ref="{http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd}MandateIdentifiers" minOccurs="0"/>
+ * &lt;element name="Signature" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ * &lt;element name="MIS" type="{http://reference.e-government.gv.at/namespace/szrgw/20070807/xsd}MISType" minOccurs="0"/>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
@@ -62,7 +53,7 @@ import at.gv.util.xsd.stork.RepresentationPerson;
@XmlType(name = "", propOrder = {
"pepsData",
"signature",
- "mandateIdentifiers"
+ "mis"
})
@XmlRootElement(name = "CreateIdentityLinkRequest")
public class CreateIdentityLinkRequest {
@@ -70,9 +61,9 @@ public class CreateIdentityLinkRequest {
@XmlElement(name = "PEPSData")
protected CreateIdentityLinkRequest.PEPSData pepsData;
@XmlElement(name = "Signature", required = true)
- protected CreateIdentityLinkRequest.Signature signature;
- @XmlElement(name = "MandateIdentifiers", namespace = "http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd")
- protected MandateIdentifiers mandateIdentifiers;
+ protected byte[] signature;
+ @XmlElement(name = "MIS")
+ protected MISType mis;
/**
* Gets the value of the pepsData property.
@@ -103,10 +94,9 @@ public class CreateIdentityLinkRequest {
*
* @return
* possible object is
- * {@link CreateIdentityLinkRequest.Signature }
- *
+ * byte[]
*/
- public CreateIdentityLinkRequest.Signature getSignature() {
+ public byte[] getSignature() {
return signature;
}
@@ -115,35 +105,34 @@ public class CreateIdentityLinkRequest {
*
* @param value
* allowed object is
- * {@link CreateIdentityLinkRequest.Signature }
- *
+ * byte[]
*/
- public void setSignature(CreateIdentityLinkRequest.Signature value) {
+ public void setSignature(byte[] value) {
this.signature = value;
}
/**
- * Gets the value of the mandateIdentifiers property.
+ * Gets the value of the mis property.
*
* @return
* possible object is
- * {@link MandateIdentifiers }
+ * {@link MISType }
*
*/
- public MandateIdentifiers getMandateIdentifiers() {
- return mandateIdentifiers;
+ public MISType getMIS() {
+ return mis;
}
/**
- * Sets the value of the mandateIdentifiers property.
+ * Sets the value of the mis property.
*
* @param value
* allowed object is
- * {@link MandateIdentifiers }
+ * {@link MISType }
*
*/
- public void setMandateIdentifiers(MandateIdentifiers value) {
- this.mandateIdentifiers = value;
+ public void setMIS(MISType value) {
+ this.mis = value;
}
@@ -157,13 +146,17 @@ public class CreateIdentityLinkRequest {
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
- * &lt;element name="Identifier" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * &lt;element name="Firstname" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * &lt;element name="Familyname" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * &lt;element name="DateOfBirth" type="{http://reference.e-government.gv.at/namespace/szrgw/20070807/xsd}DateOfBirthType"/>
- * &lt;element name="Representative" type="{urn:eu:stork:names:tc:PEPS:1.0:assertion}representationPerson" minOccurs="0"/>
- * &lt;element name="Represented" type="{urn:eu:stork:names:tc:PEPS:1.0:assertion}representationPerson" minOccurs="0"/>
- * &lt;element name="MandateContent" type="{urn:eu:stork:names:tc:PEPS:1.0:assertion}mandateContent" minOccurs="0"/>
+ * &lt;element name="Identifier" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * &lt;element name="Firstname" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * &lt;element name="Familyname" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * &lt;element name="DateOfBirth" type="{http://reference.e-government.gv.at/namespace/szrgw/20070807/xsd}DateOfBirthType" minOccurs="0"/>
+ * &lt;element name="Gender" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * &lt;element name="FiscalNumber" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * &lt;element name="LegalPersonTranslatableType" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * &lt;element name="LegalPersonCanonicalRegisteredAddress" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * &lt;element name="Representative" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * &lt;element name="Represented" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * &lt;element name="MandateContent" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
@@ -178,26 +171,38 @@ public class CreateIdentityLinkRequest {
"firstname",
"familyname",
"dateOfBirth",
+ "gender",
+ "fiscalNumber",
+ "legalPersonTranslatableType",
+ "legalPersonCanonicalRegisteredAddress",
"representative",
"represented",
"mandateContent"
})
public static class PEPSData {
- @XmlElement(name = "Identifier", required = true)
+ @XmlElement(name = "Identifier")
protected String identifier;
- @XmlElement(name = "Firstname", required = true)
+ @XmlElement(name = "Firstname")
protected String firstname;
- @XmlElement(name = "Familyname", required = true)
+ @XmlElement(name = "Familyname")
protected String familyname;
- @XmlElement(name = "DateOfBirth", required = true)
+ @XmlElement(name = "DateOfBirth")
protected String dateOfBirth;
+ @XmlElement(name = "Gender")
+ protected String gender;
+ @XmlElement(name = "FiscalNumber")
+ protected String fiscalNumber;
+ @XmlElement(name = "LegalPersonTranslatableType")
+ protected String legalPersonTranslatableType;
+ @XmlElement(name = "LegalPersonCanonicalRegisteredAddress")
+ protected String legalPersonCanonicalRegisteredAddress;
@XmlElement(name = "Representative")
- protected RepresentationPerson representative;
+ protected String representative;
@XmlElement(name = "Represented")
- protected RepresentationPerson represented;
+ protected String represented;
@XmlElement(name = "MandateContent")
- protected MandateContent mandateContent;
+ protected String mandateContent;
/**
* Gets the value of the identifier property.
@@ -296,128 +301,171 @@ public class CreateIdentityLinkRequest {
}
/**
- * Gets the value of the representative property.
+ * Gets the value of the gender property.
*
* @return
* possible object is
- * {@link RepresentationPerson }
+ * {@link String }
*
*/
- public RepresentationPerson getRepresentative() {
- return representative;
+ public String getGender() {
+ return gender;
}
/**
- * Sets the value of the representative property.
+ * Sets the value of the gender property.
*
* @param value
* allowed object is
- * {@link RepresentationPerson }
+ * {@link String }
*
*/
- public void setRepresentative(RepresentationPerson value) {
- this.representative = value;
+ public void setGender(String value) {
+ this.gender = value;
}
/**
- * Gets the value of the represented property.
+ * Gets the value of the fiscalNumber property.
*
* @return
* possible object is
- * {@link RepresentationPerson }
+ * {@link String }
*
*/
- public RepresentationPerson getRepresented() {
- return represented;
+ public String getFiscalNumber() {
+ return fiscalNumber;
}
/**
- * Sets the value of the represented property.
+ * Sets the value of the fiscalNumber property.
*
* @param value
* allowed object is
- * {@link RepresentationPerson }
+ * {@link String }
*
*/
- public void setRepresented(RepresentationPerson value) {
- this.represented = value;
+ public void setFiscalNumber(String value) {
+ this.fiscalNumber = value;
}
/**
- * Gets the value of the mandateContent property.
+ * Gets the value of the legalPersonTranslatableType property.
*
* @return
* possible object is
- * {@link MandateContent }
+ * {@link String }
*
*/
- public MandateContent getMandateContent() {
- return mandateContent;
+ public String getLegalPersonTranslatableType() {
+ return legalPersonTranslatableType;
}
/**
- * Sets the value of the mandateContent property.
+ * Sets the value of the legalPersonTranslatableType property.
*
* @param value
* allowed object is
- * {@link MandateContent }
+ * {@link String }
*
*/
- public void setMandateContent(MandateContent value) {
- this.mandateContent = value;
+ public void setLegalPersonTranslatableType(String value) {
+ this.legalPersonTranslatableType = value;
}
- }
+ /**
+ * Gets the value of the legalPersonCanonicalRegisteredAddress property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getLegalPersonCanonicalRegisteredAddress() {
+ return legalPersonCanonicalRegisteredAddress;
+ }
+ /**
+ * Sets the value of the legalPersonCanonicalRegisteredAddress property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setLegalPersonCanonicalRegisteredAddress(String value) {
+ this.legalPersonCanonicalRegisteredAddress = value;
+ }
- /**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType>
- * &lt;complexContent>
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * &lt;sequence>
- * &lt;element name="Base64Content" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- * &lt;/sequence>
- * &lt;/restriction>
- * &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- *
- *
- */
- @XmlAccessorType(XmlAccessType.FIELD)
- @XmlType(name = "", propOrder = {
- "base64Content"
- })
- public static class Signature {
+ /**
+ * Gets the value of the representative property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getRepresentative() {
+ return representative;
+ }
+
+ /**
+ * Sets the value of the representative property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setRepresentative(String value) {
+ this.representative = value;
+ }
- @XmlElement(name = "Base64Content", required = true)
- protected byte[] base64Content;
+ /**
+ * Gets the value of the represented property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getRepresented() {
+ return represented;
+ }
/**
- * Gets the value of the base64Content property.
+ * Sets the value of the represented property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setRepresented(String value) {
+ this.represented = value;
+ }
+
+ /**
+ * Gets the value of the mandateContent property.
*
* @return
* possible object is
- * byte[]
+ * {@link String }
+ *
*/
- public byte[] getBase64Content() {
- return base64Content;
+ public String getMandateContent() {
+ return mandateContent;
}
/**
- * Sets the value of the base64Content property.
+ * Sets the value of the mandateContent property.
*
* @param value
* allowed object is
- * byte[]
+ * {@link String }
+ *
*/
- public void setBase64Content(byte[] value) {
- this.base64Content = value;
+ public void setMandateContent(String value) {
+ this.mandateContent = value;
}
}
diff --git a/src/main/java/at/gv/util/xsd/srzgw/MISType.java b/src/main/java/at/gv/util/xsd/srzgw/MISType.java
new file mode 100644
index 0000000..7b626ce
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/srzgw/MISType.java
@@ -0,0 +1,185 @@
+
+package at.gv.util.xsd.srzgw;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import at.gv.util.xsd.mis.MandateIdentifiers;
+import at.gv.util.xsd.mis.Target;
+
+
+/**
+ * <p>Java class for MISType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * &lt;complexType name="MISType">
+ * &lt;complexContent>
+ * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * &lt;sequence>
+ * &lt;element name="Filters">
+ * &lt;complexType>
+ * &lt;complexContent>
+ * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * &lt;sequence>
+ * &lt;element ref="{http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd}MandateIdentifiers" minOccurs="0"/>
+ * &lt;/sequence>
+ * &lt;/restriction>
+ * &lt;/complexContent>
+ * &lt;/complexType>
+ * &lt;/element>
+ * &lt;element ref="{http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd}Target" minOccurs="0"/>
+ * &lt;element name="OAFriendlyName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * &lt;/sequence>
+ * &lt;/restriction>
+ * &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "MISType", propOrder = {
+ "filters",
+ "target",
+ "oaFriendlyName"
+})
+public class MISType {
+
+ @XmlElement(name = "Filters", required = true)
+ protected MISType.Filters filters;
+ @XmlElement(name = "Target", namespace = "http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd")
+ protected Target target;
+ @XmlElement(name = "OAFriendlyName", required = true)
+ protected String oaFriendlyName;
+
+ /**
+ * Gets the value of the filters property.
+ *
+ * @return
+ * possible object is
+ * {@link MISType.Filters }
+ *
+ */
+ public MISType.Filters getFilters() {
+ return filters;
+ }
+
+ /**
+ * Sets the value of the filters property.
+ *
+ * @param value
+ * allowed object is
+ * {@link MISType.Filters }
+ *
+ */
+ public void setFilters(MISType.Filters value) {
+ this.filters = value;
+ }
+
+ /**
+ * Gets the value of the target property.
+ *
+ * @return
+ * possible object is
+ * {@link Target }
+ *
+ */
+ public Target getTarget() {
+ return target;
+ }
+
+ /**
+ * Sets the value of the target property.
+ *
+ * @param value
+ * allowed object is
+ * {@link Target }
+ *
+ */
+ public void setTarget(Target value) {
+ this.target = value;
+ }
+
+ /**
+ * Gets the value of the oaFriendlyName property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getOAFriendlyName() {
+ return oaFriendlyName;
+ }
+
+ /**
+ * Sets the value of the oaFriendlyName property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setOAFriendlyName(String value) {
+ this.oaFriendlyName = value;
+ }
+
+
+ /**
+ * <p>Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * &lt;complexType>
+ * &lt;complexContent>
+ * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * &lt;sequence>
+ * &lt;element ref="{http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd}MandateIdentifiers" minOccurs="0"/>
+ * &lt;/sequence>
+ * &lt;/restriction>
+ * &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ *
+ *
+ */
+ @XmlAccessorType(XmlAccessType.FIELD)
+ @XmlType(name = "", propOrder = {
+ "mandateIdentifiers"
+ })
+ public static class Filters {
+
+ @XmlElement(name = "MandateIdentifiers", namespace = "http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd")
+ protected MandateIdentifiers mandateIdentifiers;
+
+ /**
+ * Gets the value of the mandateIdentifiers property.
+ *
+ * @return
+ * possible object is
+ * {@link MandateIdentifiers }
+ *
+ */
+ public MandateIdentifiers getMandateIdentifiers() {
+ return mandateIdentifiers;
+ }
+
+ /**
+ * Sets the value of the mandateIdentifiers property.
+ *
+ * @param value
+ * allowed object is
+ * {@link MandateIdentifiers }
+ *
+ */
+ public void setMandateIdentifiers(MandateIdentifiers value) {
+ this.mandateIdentifiers = value;
+ }
+
+ }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/srzgw/ObjectFactory.java b/src/main/java/at/gv/util/xsd/srzgw/ObjectFactory.java
index af0129b..1fd2fa5 100644
--- a/src/main/java/at/gv/util/xsd/srzgw/ObjectFactory.java
+++ b/src/main/java/at/gv/util/xsd/srzgw/ObjectFactory.java
@@ -38,19 +38,19 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link CreateIdentityLinkRequest.PEPSData }
+ * Create an instance of {@link MISType }
*
*/
- public CreateIdentityLinkRequest.PEPSData createCreateIdentityLinkRequestPEPSData() {
- return new CreateIdentityLinkRequest.PEPSData();
+ public MISType createMISType() {
+ return new MISType();
}
/**
- * Create an instance of {@link CreateIdentityLinkRequest.Signature }
+ * Create an instance of {@link CreateIdentityLinkRequest.PEPSData }
*
*/
- public CreateIdentityLinkRequest.Signature createCreateIdentityLinkRequestSignature() {
- return new CreateIdentityLinkRequest.Signature();
+ public CreateIdentityLinkRequest.PEPSData createCreateIdentityLinkRequestPEPSData() {
+ return new CreateIdentityLinkRequest.PEPSData();
}
/**
@@ -69,4 +69,12 @@ public class ObjectFactory {
return new ErrorResponseType();
}
+ /**
+ * Create an instance of {@link MISType.Filters }
+ *
+ */
+ public MISType.Filters createMISTypeFilters() {
+ return new MISType.Filters();
+ }
+
}
diff --git a/src/main/java/at/gv/util/xsd/stork/CanonicalAddressType.java b/src/main/java/at/gv/util/xsd/stork/CanonicalResidenceAddress.java
index 23d89ff..58180c3 100644
--- a/src/main/java/at/gv/util/xsd/stork/CanonicalAddressType.java
+++ b/src/main/java/at/gv/util/xsd/stork/CanonicalResidenceAddress.java
@@ -1,19 +1,27 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2
+// 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: 2014.01.29 at 11:13:18 AM CET
+//
+
package at.gv.util.xsd.stork;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
/**
- * <p>Java class for canonicalAddressType complex type.
+ * <p>Java class for anonymous complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
- * &lt;complexType name="canonicalAddressType">
+ * &lt;complexType>
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
@@ -34,7 +42,7 @@ import javax.xml.bind.annotation.XmlType;
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "canonicalAddressType", propOrder = {
+@XmlType(name = "", propOrder = {
"countryCodeAddress",
"state",
"municipalityCode",
@@ -44,7 +52,8 @@ import javax.xml.bind.annotation.XmlType;
"streetNumber",
"apartmentNumber"
})
-public class CanonicalAddressType {
+@XmlRootElement(name = "canonicalResidenceAddress")
+public class CanonicalResidenceAddress {
@XmlElement(required = true)
protected String countryCodeAddress;
diff --git a/src/main/java/at/gv/util/xsd/stork/MandateContent.java b/src/main/java/at/gv/util/xsd/stork/MandateContent.java
index c0eae22..643ccb5 100644
--- a/src/main/java/at/gv/util/xsd/stork/MandateContent.java
+++ b/src/main/java/at/gv/util/xsd/stork/MandateContent.java
@@ -1,3 +1,10 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2
+// 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: 2014.01.29 at 11:13:18 AM CET
+//
+
package at.gv.util.xsd.stork;
@@ -5,23 +12,26 @@ import java.math.BigInteger;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
import javax.xml.datatype.XMLGregorianCalendar;
/**
- * <p>Java class for mandateContent complex type.
+ * <p>Java class for anonymous complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
- * &lt;complexType name="mandateContent">
+ * &lt;complexType>
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element name="validFrom" type="{http://www.w3.org/2001/XMLSchema}date" minOccurs="0"/>
* &lt;element name="validTo" type="{http://www.w3.org/2001/XMLSchema}date" minOccurs="0"/>
+ * &lt;element name="transactionLimit" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
+ * &lt;element ref="{urn:eu:stork:names:tc:PEPS:1.0:assertion}transactionLimitCurrency"/>
* &lt;element name="isJoint" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
* &lt;element name="isChained" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
* &lt;element name="typePower" type="{http://www.w3.org/2001/XMLSchema}integer"/>
@@ -34,19 +44,25 @@ import javax.xml.datatype.XMLGregorianCalendar;
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "mandateContent", propOrder = {
+@XmlType(name = "", propOrder = {
"validFrom",
"validTo",
+ "transactionLimit",
+ "transactionLimitCurrency",
"isJoint",
"isChained",
"typePower"
})
+@XmlRootElement(name = "mandateContent")
public class MandateContent {
@XmlSchemaType(name = "date")
protected XMLGregorianCalendar validFrom;
@XmlSchemaType(name = "date")
protected XMLGregorianCalendar validTo;
+ protected BigInteger transactionLimit;
+ @XmlElement(required = true)
+ protected Object transactionLimitCurrency;
protected BigInteger isJoint;
protected Boolean isChained;
@XmlElement(required = true)
@@ -101,6 +117,54 @@ public class MandateContent {
}
/**
+ * Gets the value of the transactionLimit property.
+ *
+ * @return
+ * possible object is
+ * {@link BigInteger }
+ *
+ */
+ public BigInteger getTransactionLimit() {
+ return transactionLimit;
+ }
+
+ /**
+ * Sets the value of the transactionLimit property.
+ *
+ * @param value
+ * allowed object is
+ * {@link BigInteger }
+ *
+ */
+ public void setTransactionLimit(BigInteger value) {
+ this.transactionLimit = value;
+ }
+
+ /**
+ * Gets the value of the transactionLimitCurrency property.
+ *
+ * @return
+ * possible object is
+ * {@link Object }
+ *
+ */
+ public Object getTransactionLimitCurrency() {
+ return transactionLimitCurrency;
+ }
+
+ /**
+ * Sets the value of the transactionLimitCurrency property.
+ *
+ * @param value
+ * allowed object is
+ * {@link Object }
+ *
+ */
+ public void setTransactionLimitCurrency(Object value) {
+ this.transactionLimitCurrency = value;
+ }
+
+ /**
* Gets the value of the isJoint property.
*
* @return
diff --git a/src/main/java/at/gv/util/xsd/stork/ObjectFactory.java b/src/main/java/at/gv/util/xsd/stork/ObjectFactory.java
index 923299a..c5fdcd9 100644
--- a/src/main/java/at/gv/util/xsd/stork/ObjectFactory.java
+++ b/src/main/java/at/gv/util/xsd/stork/ObjectFactory.java
@@ -1,3 +1,10 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2
+// 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: 2014.01.29 at 11:13:18 AM CET
+//
+
package at.gv.util.xsd.stork;
@@ -24,6 +31,9 @@ import javax.xml.namespace.QName;
@XmlRegistry
public class ObjectFactory {
+ private final static QName _Representative_QNAME = new QName("urn:eu:stork:names:tc:PEPS:1.0:assertion", "representative");
+ private final static QName _Represented_QNAME = new QName("urn:eu:stork:names:tc:PEPS:1.0:assertion", "represented");
+ private final static QName _TransactionLimitCurrency_QNAME = new QName("urn:eu:stork:names:tc:PEPS:1.0:assertion", "transactionLimitCurrency");
private final static QName _CountryCodeAddress_QNAME = new QName("urn:eu:stork:names:tc:PEPS:1.0:assertion", "countryCodeAddress");
/**
@@ -34,6 +44,14 @@ public class ObjectFactory {
}
/**
+ * Create an instance of {@link CanonicalResidenceAddress }
+ *
+ */
+ public CanonicalResidenceAddress createCanonicalResidenceAddress() {
+ return new CanonicalResidenceAddress();
+ }
+
+ /**
* Create an instance of {@link RepresentationPerson }
*
*/
@@ -50,11 +68,30 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link CanonicalAddressType }
+ * Create an instance of {@link JAXBElement }{@code <}{@link RepresentationPerson }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "urn:eu:stork:names:tc:PEPS:1.0:assertion", name = "representative")
+ public JAXBElement<RepresentationPerson> createRepresentative(RepresentationPerson value) {
+ return new JAXBElement<RepresentationPerson>(_Representative_QNAME, RepresentationPerson.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link RepresentationPerson }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "urn:eu:stork:names:tc:PEPS:1.0:assertion", name = "represented")
+ public JAXBElement<RepresentationPerson> createRepresented(RepresentationPerson value) {
+ return new JAXBElement<RepresentationPerson>(_Represented_QNAME, RepresentationPerson.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link Object }{@code >}}
*
*/
- public CanonicalAddressType createCanonicalAddressType() {
- return new CanonicalAddressType();
+ @XmlElementDecl(namespace = "urn:eu:stork:names:tc:PEPS:1.0:assertion", name = "transactionLimitCurrency")
+ public JAXBElement<Object> createTransactionLimitCurrency(Object value) {
+ return new JAXBElement<Object>(_TransactionLimitCurrency_QNAME, Object.class, null, value);
}
/**
diff --git a/src/main/java/at/gv/util/xsd/stork/RepresentationPerson.java b/src/main/java/at/gv/util/xsd/stork/RepresentationPerson.java
index 2c491c5..c92b80a 100644
--- a/src/main/java/at/gv/util/xsd/stork/RepresentationPerson.java
+++ b/src/main/java/at/gv/util/xsd/stork/RepresentationPerson.java
@@ -1,3 +1,10 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2
+// 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: 2014.01.29 at 11:13:18 AM CET
+//
+
package at.gv.util.xsd.stork;
@@ -24,15 +31,12 @@ import javax.xml.datatype.XMLGregorianCalendar;
* &lt;element name="givenName" type="{http://www.w3.org/2001/XMLSchema}string"/>
* &lt;element name="surname" type="{http://www.w3.org/2001/XMLSchema}string"/>
* &lt;element name="dateOfBirth" type="{http://www.w3.org/2001/XMLSchema}date"/>
- * &lt;element name="fiscalNumber" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
* &lt;/sequence>
* &lt;sequence>
* &lt;element name="eLPIdentifier" type="{http://www.w3.org/2001/XMLSchema}string"/>
* &lt;element name="legalName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * &lt;element name="canonicalRegisteredAddress" type="{urn:eu:stork:names:tc:PEPS:1.0:assertion}canonicalAddressType"/>
+ * &lt;element name="adress" type="{http://www.w3.org/2001/XMLSchema}string"/>
* &lt;element name="type" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * &lt;element name="translatableType" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * &lt;element name="LPfiscalNumber" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
* &lt;/sequence>
* &lt;/choice>
* &lt;/restriction>
@@ -48,13 +52,10 @@ import javax.xml.datatype.XMLGregorianCalendar;
"givenName",
"surname",
"dateOfBirth",
- "fiscalNumber",
"elpIdentifier",
"legalName",
- "canonicalRegisteredAddress",
- "type",
- "translatableType",
- "lPfiscalNumber"
+ "adress",
+ "type"
})
public class RepresentationPerson {
@@ -63,15 +64,11 @@ public class RepresentationPerson {
protected String surname;
@XmlSchemaType(name = "date")
protected XMLGregorianCalendar dateOfBirth;
- protected String fiscalNumber;
@XmlElement(name = "eLPIdentifier")
protected String elpIdentifier;
protected String legalName;
- protected CanonicalAddressType canonicalRegisteredAddress;
+ protected String adress;
protected String type;
- protected String translatableType;
- @XmlElement(name = "LPfiscalNumber")
- protected String lPfiscalNumber;
/**
* Gets the value of the eIdentifier property.
@@ -170,30 +167,6 @@ public class RepresentationPerson {
}
/**
- * Gets the value of the fiscalNumber property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getFiscalNumber() {
- return fiscalNumber;
- }
-
- /**
- * Sets the value of the fiscalNumber property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setFiscalNumber(String value) {
- this.fiscalNumber = value;
- }
-
- /**
* Gets the value of the elpIdentifier property.
*
* @return
@@ -242,27 +215,27 @@ public class RepresentationPerson {
}
/**
- * Gets the value of the canonicalRegisteredAddress property.
+ * Gets the value of the adress property.
*
* @return
* possible object is
- * {@link CanonicalAddressType }
+ * {@link String }
*
*/
- public CanonicalAddressType getCanonicalRegisteredAddress() {
- return canonicalRegisteredAddress;
+ public String getAdress() {
+ return adress;
}
/**
- * Sets the value of the canonicalRegisteredAddress property.
+ * Sets the value of the adress property.
*
* @param value
* allowed object is
- * {@link CanonicalAddressType }
+ * {@link String }
*
*/
- public void setCanonicalRegisteredAddress(CanonicalAddressType value) {
- this.canonicalRegisteredAddress = value;
+ public void setAdress(String value) {
+ this.adress = value;
}
/**
@@ -289,52 +262,4 @@ public class RepresentationPerson {
this.type = value;
}
- /**
- * Gets the value of the translatableType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getTranslatableType() {
- return translatableType;
- }
-
- /**
- * Sets the value of the translatableType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setTranslatableType(String value) {
- this.translatableType = value;
- }
-
- /**
- * Gets the value of the lPfiscalNumber property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getLPfiscalNumber() {
- return lPfiscalNumber;
- }
-
- /**
- * Sets the value of the lPfiscalNumber property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setLPfiscalNumber(String value) {
- this.lPfiscalNumber = value;
- }
-
}
diff --git a/src/main/java/at/gv/util/xsd/stork/package-info.java b/src/main/java/at/gv/util/xsd/stork/package-info.java
index 49c23d7..4ae9fd0 100644
--- a/src/main/java/at/gv/util/xsd/stork/package-info.java
+++ b/src/main/java/at/gv/util/xsd/stork/package-info.java
@@ -1,2 +1,9 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2
+// 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: 2014.01.29 at 11:13:18 AM CET
+//
+
@javax.xml.bind.annotation.XmlSchema(namespace = "urn:eu:stork:names:tc:PEPS:1.0:assertion", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package at.gv.util.xsd.stork;
diff --git a/src/main/java/at/gv/util/xsd/ur/pd/PersonenDatenTyp.java b/src/main/java/at/gv/util/xsd/ur/pd/PersonenDatenTyp.java
index 633d2f2..b84f115 100644
--- a/src/main/java/at/gv/util/xsd/ur/pd/PersonenDatenTyp.java
+++ b/src/main/java/at/gv/util/xsd/ur/pd/PersonenDatenTyp.java
@@ -60,7 +60,7 @@ public class PersonenDatenTyp
@XmlElementRef(name = "Person", namespace = "http://reference.e-government.gv.at/namespace/persondata/de/20040201#", type = JAXBElement.class)
protected JAXBElement<? extends AbstractPersonType> person;
- @XmlElementRef(name = "Address", namespace = "http://reference.e-government.gv.at/namespace/persondata/de/20040201#", type = JAXBElement.class, required = false)
+ @XmlElementRef(name = "Address", namespace = "http://reference.e-government.gv.at/namespace/persondata/de/20040201#", type = JAXBElement.class)
protected List<JAXBElement<? extends AbstractAddressType>> address;
@XmlElement(name = "Zusatzdaten")
protected PersonenDatenTyp.Zusatzdaten zusatzdaten;
diff --git a/src/main/java/at/gv/util/xsd/ur_V2/pd/NichtNatuerlichePersonTyp.java b/src/main/java/at/gv/util/xsd/ur_V2/pd/NichtNatuerlichePersonTyp.java
index 850e08c..758dfbd 100644
--- a/src/main/java/at/gv/util/xsd/ur_V2/pd/NichtNatuerlichePersonTyp.java
+++ b/src/main/java/at/gv/util/xsd/ur_V2/pd/NichtNatuerlichePersonTyp.java
@@ -50,10 +50,10 @@ public class NichtNatuerlichePersonTyp
{
@XmlElementRefs({
- @XmlElementRef(name = "UntName", namespace = "http://statistik.at/namespace/ur/stammdaten/2#", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "Rechtsform", namespace = "http://statistik.at/namespace/ur/stammdaten/2#", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "Rechtsform", namespace = "http://reference.e-government.gv.at/namespace/persondata/de/20040201#", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "VollerName", namespace = "http://reference.e-government.gv.at/namespace/persondata/de/20040201#", type = JAXBElement.class, required = false)
+ @XmlElementRef(name = "UntName", namespace = "http://statistik.at/namespace/ur/stammdaten/2#", type = JAXBElement.class),
+ @XmlElementRef(name = "Rechtsform", namespace = "http://statistik.at/namespace/ur/stammdaten/2#", type = JAXBElement.class),
+ @XmlElementRef(name = "Rechtsform", namespace = "http://reference.e-government.gv.at/namespace/persondata/de/20040201#", type = JAXBElement.class),
+ @XmlElementRef(name = "VollerName", namespace = "http://reference.e-government.gv.at/namespace/persondata/de/20040201#", type = JAXBElement.class)
})
protected List<JAXBElement<?>> rest;
@XmlAttribute(name = "vollzugBeginn", namespace = "http://statistik.at/namespace/ur/stammdaten/2#")
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/CanonicalizationMethodType.java b/src/main/java/at/gv/util/xsd/xmldsig/CanonicalizationMethodType.java
index 816a11f..98f97fb 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/CanonicalizationMethodType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/CanonicalizationMethodType.java
@@ -63,8 +63,8 @@ public class CanonicalizationMethodType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Object }
* {@link String }
+ * {@link Object }
*
*
*/
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/DigestMethodType.java b/src/main/java/at/gv/util/xsd/xmldsig/DigestMethodType.java
index 0ff9f98..630d170 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/DigestMethodType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/DigestMethodType.java
@@ -64,9 +64,9 @@ public class DigestMethodType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Object }
- * {@link String }
* {@link Element }
+ * {@link String }
+ * {@link Object }
*
*
*/
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 92f7e41..416dada 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 = "X509Data", 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 = "PGPData", 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 = "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 = "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 = "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 = "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 = "KeyName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class)
})
@XmlMixed
@XmlAnyElement(lax = true)
@@ -88,16 +88,16 @@ public class KeyInfoType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Object }
- * {@link JAXBElement }{@code <}{@link String }{@code >}
* {@link Element }
- * {@link JAXBElement }{@code <}{@link X509DataType }{@code >}
- * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}
+ * {@link JAXBElement }{@code <}{@link String }{@code >}
* {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}
+ * {@link JAXBElement }{@code <}{@link X509DataType }{@code >}
* {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}
+ * {@link Object }
* {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}
- * {@link JAXBElement }{@code <}{@link String }{@code >}
* {@link String }
+ * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}
+ * {@link JAXBElement }{@code <}{@link String }{@code >}
*
*
*/
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 ec43d07..5bf87d4 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)
@@ -67,10 +67,10 @@ public class KeyValueType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Object }
- * {@link String }
* {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}
* {@link Element }
+ * {@link String }
+ * {@link Object }
* {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}
*
*
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/ObjectFactory.java b/src/main/java/at/gv/util/xsd/xmldsig/ObjectFactory.java
index 2ad14af..a32d3ba 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/ObjectFactory.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/ObjectFactory.java
@@ -25,7 +25,6 @@ import javax.xml.namespace.QName;
@XmlRegistry
public class ObjectFactory {
- private final static QName _SignatureMethodTypeHMACOutputLength_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "HMACOutputLength");
private final static QName _PGPData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPData");
private final static QName _SPKIData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKIData");
private final static QName _CanonicalizationMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "CanonicalizationMethod");
@@ -50,15 +49,16 @@ public class ObjectFactory {
private final static QName _Transform_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transform");
private final static QName _DigestValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestValue");
private final static QName _KeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyValue");
+ private final static QName _TransformTypeXPath_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "XPath");
private final static QName _X509DataTypeX509IssuerSerial_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509IssuerSerial");
private final static QName _X509DataTypeX509Certificate_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Certificate");
private final static QName _X509DataTypeX509SKI_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SKI");
private final static QName _X509DataTypeX509SubjectName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SubjectName");
private final static QName _X509DataTypeX509CRL_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509CRL");
+ private final static QName _SignatureMethodTypeHMACOutputLength_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "HMACOutputLength");
+ private final static QName _SPKIDataTypeSPKISexp_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKISexp");
private final static QName _PGPDataTypePGPKeyID_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyID");
private final static QName _PGPDataTypePGPKeyPacket_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyPacket");
- private final static QName _SPKIDataTypeSPKISexp_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKISexp");
- private final static QName _TransformTypeXPath_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "XPath");
/**
* Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.gv.util.xsd.xmldsig
@@ -244,15 +244,6 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "HMACOutputLength", scope = SignatureMethodType.class)
- public JAXBElement<BigInteger> createSignatureMethodTypeHMACOutputLength(BigInteger value) {
- return new JAXBElement<BigInteger>(_SignatureMethodTypeHMACOutputLength_QNAME, BigInteger.class, SignatureMethodType.class, value);
- }
-
- /**
* Create an instance of {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}}
*
*/
@@ -469,6 +460,15 @@ public class ObjectFactory {
}
/**
+ * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "XPath", scope = TransformType.class)
+ public JAXBElement<String> createTransformTypeXPath(String value) {
+ return new JAXBElement<String>(_TransformTypeXPath_QNAME, String.class, TransformType.class, value);
+ }
+
+ /**
* Create an instance of {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}}
*
*/
@@ -514,39 +514,39 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyID", scope = PGPDataType.class)
- public JAXBElement<String> createPGPDataTypePGPKeyID(String value) {
- return new JAXBElement<String>(_PGPDataTypePGPKeyID_QNAME, String.class, PGPDataType.class, value);
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "HMACOutputLength", scope = SignatureMethodType.class)
+ public JAXBElement<BigInteger> createSignatureMethodTypeHMACOutputLength(BigInteger value) {
+ return new JAXBElement<BigInteger>(_SignatureMethodTypeHMACOutputLength_QNAME, BigInteger.class, SignatureMethodType.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyPacket", scope = PGPDataType.class)
- public JAXBElement<String> createPGPDataTypePGPKeyPacket(String value) {
- return new JAXBElement<String>(_PGPDataTypePGPKeyPacket_QNAME, String.class, PGPDataType.class, value);
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKISexp", scope = SPKIDataType.class)
+ public JAXBElement<String> createSPKIDataTypeSPKISexp(String value) {
+ return new JAXBElement<String>(_SPKIDataTypeSPKISexp_QNAME, String.class, SPKIDataType.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKISexp", scope = SPKIDataType.class)
- public JAXBElement<String> createSPKIDataTypeSPKISexp(String value) {
- return new JAXBElement<String>(_SPKIDataTypeSPKISexp_QNAME, String.class, SPKIDataType.class, value);
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyID", scope = PGPDataType.class)
+ public JAXBElement<String> createPGPDataTypePGPKeyID(String value) {
+ return new JAXBElement<String>(_PGPDataTypePGPKeyID_QNAME, String.class, PGPDataType.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "XPath", scope = TransformType.class)
- public JAXBElement<String> createTransformTypeXPath(String value) {
- return new JAXBElement<String>(_TransformTypeXPath_QNAME, String.class, TransformType.class, value);
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyPacket", scope = PGPDataType.class)
+ public JAXBElement<String> createPGPDataTypePGPKeyPacket(String value) {
+ return new JAXBElement<String>(_PGPDataTypePGPKeyPacket_QNAME, String.class, PGPDataType.class, value);
}
}
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/ObjectType.java b/src/main/java/at/gv/util/xsd/xmldsig/ObjectType.java
index 9d10b47..7e60f82 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/ObjectType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/ObjectType.java
@@ -76,9 +76,9 @@ public class ObjectType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Object }
- * {@link String }
* {@link Element }
+ * {@link String }
+ * {@link Object }
*
*
*/
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 a3d309f..bab2890 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;
@@ -81,9 +81,9 @@ public class PGPDataType {
*
* <p>
* Objects of the following type(s) are allowed in the list
+ * {@link Element }
* {@link Object }
* {@link JAXBElement }{@code <}{@link String }{@code >}
- * {@link Element }
* {@link JAXBElement }{@code <}{@link String }{@code >}
*
*
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/SPKIDataType.java b/src/main/java/at/gv/util/xsd/xmldsig/SPKIDataType.java
index cc1d2a5..f829d35 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/SPKIDataType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/SPKIDataType.java
@@ -60,9 +60,9 @@ public class SPKIDataType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Object }
- * {@link JAXBElement }{@code <}{@link String }{@code >}
* {@link Element }
+ * {@link JAXBElement }{@code <}{@link String }{@code >}
+ * {@link Object }
*
*
*/
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 5f5f973..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;
@@ -68,9 +68,9 @@ public class SignatureMethodType {
*
* <p>
* Objects of the following type(s) are allowed in the list
+ * {@link String }
* {@link Object }
* {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
- * {@link String }
*
*
*/
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/SignaturePropertyType.java b/src/main/java/at/gv/util/xsd/xmldsig/SignaturePropertyType.java
index 8efa497..23b7c84 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/SignaturePropertyType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/SignaturePropertyType.java
@@ -73,9 +73,9 @@ public class SignaturePropertyType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Object }
- * {@link String }
* {@link Element }
+ * {@link String }
+ * {@link Object }
*
*
*/
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 8617ced..2d6814a 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;
@@ -68,10 +68,10 @@ public class TransformType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Object }
- * {@link String }
* {@link JAXBElement }{@code <}{@link String }{@code >}
* {@link Element }
+ * {@link String }
+ * {@link Object }
*
*
*/
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 b501f94..bfea4d1 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 = "X509IssuerSerial", 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 = "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 = "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),
+ @XmlElementRef(name = "X509Certificate", 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 = "X509IssuerSerial", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
+ @XmlElementRef(name = "X509SubjectName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class)
})
@XmlAnyElement(lax = true)
protected List<Object> x509IssuerSerialOrX509SKIOrX509SubjectName;
@@ -73,11 +73,11 @@ public class X509DataType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Object }
- * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}
* {@link Element }
+ * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}
* {@link JAXBElement }{@code <}{@link String }{@code >}
* {@link JAXBElement }{@code <}{@link String }{@code >}
+ * {@link Object }
* {@link JAXBElement }{@code <}{@link String }{@code >}
* {@link JAXBElement }{@code <}{@link String }{@code >}
*
diff --git a/src/main/resources/wsdl/custom-bindings/stork.xml b/src/main/resources/wsdl/custom-bindings/stork.xml
new file mode 100644
index 0000000..01bd26b
--- /dev/null
+++ b/src/main/resources/wsdl/custom-bindings/stork.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bindings version="2.0" xmlns="http://java.sun.com/xml/ns/jaxb"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc">
+
+ <bindings schemaLocation="../szrgw/stork.xsd">
+ <bindings node="/xsd:schema">
+ <schemaBindings>
+ <package name="at.gv.util.xsd.stork"/>
+ </schemaBindings>
+ </bindings>
+ </bindings>
+
+</bindings> \ No newline at end of file
diff --git a/src/main/resources/wsdl/custom-bindings/szrgw-schemas.xml b/src/main/resources/wsdl/custom-bindings/szrgw-schemas.xml
index 7388e8e..3a10098 100644
--- a/src/main/resources/wsdl/custom-bindings/szrgw-schemas.xml
+++ b/src/main/resources/wsdl/custom-bindings/szrgw-schemas.xml
@@ -18,15 +18,7 @@
</schemaBindings>
</bindings>
</bindings>
-
- <bindings schemaLocation="../szrgw/stork.xsd">
- <bindings node="/xsd:schema">
- <schemaBindings>
- <package name="at.gv.util.xsd.stork"/>
- </schemaBindings>
- </bindings>
- </bindings>
-
+
<bindings schemaLocation="../PersonData_20_en_moaWID.xsd">
<bindings node="/xsd:schema">
<schemaBindings>
diff --git a/src/main/resources/wsdl/mis/mis-1.0.3.xsd b/src/main/resources/wsdl/mis/mis-1.0.3.xsd
index 1a3fb14..0369145 100644
--- a/src/main/resources/wsdl/mis/mis-1.0.3.xsd
+++ b/src/main/resources/wsdl/mis/mis-1.0.3.xsd
@@ -29,14 +29,7 @@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="Target" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Type" type="xs:anyURI" minOccurs="1"/>
- <xs:element name="Value" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ <xs:element ref="Target" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
<xs:element name="SessionID" type="xs:string"/>
</xs:choice>
@@ -47,7 +40,15 @@
<xs:element name="MandateIdentifier" type="xs:string"/>
</xs:sequence>
</xs:complexType>
- </xs:element>
+ </xs:element>
+ <xs:element name="Target">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Type" type="xs:anyURI" minOccurs="1"/>
+ <xs:element name="Value" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
<xs:element name="MandateIssueResponse" type="MandateIssueResponseType">
<xs:annotation>
<xs:documentation>Response from MIS</xs:documentation>
diff --git a/src/main/resources/wsdl/misstork/misstork-1.0.xsd b/src/main/resources/wsdl/misstork/misstork-1.0.xsd
index 9205483..68d62b8 100644
--- a/src/main/resources/wsdl/misstork/misstork-1.0.xsd
+++ b/src/main/resources/wsdl/misstork/misstork-1.0.xsd
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Mit XMLSpy v2013 sp1 (http://www.altova.com) von Thomas Lenz (Graz University of Technology IAIK) bearbeitet -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ms="http://reference.e-government.gv.at/namespace/misstork/20131126/xsd" xmlns:pr="http://reference.e-government.gv.at/namespace/persondata/20020228#" xmlns:mis="http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd" targetNamespace="http://reference.e-government.gv.at/namespace/misstork/20131126/xsd" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.0.1">
<xs:import namespace="http://reference.e-government.gv.at/namespace/persondata/20020228#" schemaLocation="../PersonData_20_en_moaWID.xsd"/>
<xs:import namespace="http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd" schemaLocation="../mis/mis-1.0.3.xsd"/>
@@ -8,16 +9,23 @@
<xs:sequence>
<xs:element name="StorkMandateType" type="xs:integer" minOccurs="1"/>
<xs:element ref="ms:MandatorType" minOccurs="1" maxOccurs="1"/>
- <xs:element ref="mis:MandateIdentifiers" minOccurs="0"/>
+ <xs:element name="Filters" minOccurs="0">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="mis:MandateIdentifiers" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element ref="mis:Target" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="OAFriendlyName" type="xs:string" minOccurs="1" maxOccurs="1"/>
</xs:sequence>
<xs:sequence>
<xs:element ref="ms:ReferenceValue" minOccurs="1" maxOccurs="1"/>
- <xs:element name="MISMandateType" type="xs:string" minOccurs="1" maxOccurs="1"/>
<xs:element name="Mandator">
<xs:complexType>
<xs:choice>
<xs:sequence>
- <xs:element ref="pr:PhysicalPerson" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="IdentityLink" type="xs:base64Binary" minOccurs="1" maxOccurs="1"/>
</xs:sequence>
<xs:sequence>
<xs:element ref="pr:CorporateBody" minOccurs="1" maxOccurs="1"/>
@@ -28,7 +36,7 @@
<xs:element name="Representative">
<xs:complexType>
<xs:sequence>
- <xs:element ref="pr:PhysicalPerson" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="IdentityLink" type="xs:base64Binary" minOccurs="1" maxOccurs="1"/>
</xs:sequence>
</xs:complexType>
</xs:element>
diff --git a/src/main/resources/wsdl/szrgw/stork.xsd b/src/main/resources/wsdl/szrgw/stork.xsd
index fa216ca..10f0f56 100644
--- a/src/main/resources/wsdl/szrgw/stork.xsd
+++ b/src/main/resources/wsdl/szrgw/stork.xsd
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:stork="urn:eu:stork:names:tc:PEPS:1.0:assertion" targetNamespace="urn:eu:stork:names:tc:PEPS:1.0:assertion" elementFormDefault="qualified" attributeFormDefault="unqualified">
+ <xs:element name="representative" type="stork:representationPerson"/>
+ <xs:element name="represented" type="stork:representationPerson" />
<xs:complexType name="representationPerson">
<xs:choice>
<xs:sequence>
@@ -7,39 +9,51 @@
<xs:element name="givenName" type="xs:string" minOccurs="1" maxOccurs="1"/>
<xs:element name="surname" type="xs:string" minOccurs="1" maxOccurs="1"/>
<xs:element name="dateOfBirth" type="xs:date" minOccurs="1" maxOccurs="1"/>
- <xs:element name="fiscalNumber" type="xs:string" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
<xs:sequence>
<xs:element name="eLPIdentifier" type="xs:string" minOccurs="1" maxOccurs="1"/>
<xs:element name="legalName" type="xs:string" minOccurs="1" maxOccurs="1"/>
- <xs:element name="canonicalRegisteredAddress" type="stork:canonicalAddressType" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="adress" type="xs:string" minOccurs="1" maxOccurs="1"/>
<xs:element name="type" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="translatableType" type="xs:string" minOccurs="1" maxOccurs="1"/>
- <xs:element name="LPfiscalNumber" type="xs:string" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
</xs:choice>
</xs:complexType>
- <xs:complexType name="mandateContent">
- <xs:sequence>
- <xs:element name="validFrom" type="xs:date" minOccurs="0" maxOccurs="1"/>
- <xs:element name="validTo" type="xs:date" minOccurs="0" maxOccurs="1"/>
- <xs:element name="isJoint" type="xs:integer" minOccurs="0" maxOccurs="1"/>
- <xs:element name="isChained" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
- <xs:element name="typePower" type="xs:integer" minOccurs="1" maxOccurs="1"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="canonicalAddressType">
- <xs:sequence>
- <xs:element ref="stork:countryCodeAddress"/>
- <xs:element name="state" type="xs:string" minOccurs="1" maxOccurs="1"/>
- <xs:element name="municipalityCode" type="xs:string" minOccurs="0"/>
- <xs:element name="town" type="xs:string" minOccurs="1" maxOccurs="1"/>
- <xs:element name="postalCode" type="xs:string" minOccurs="1" maxOccurs="1"/>
- <xs:element name="streetName" type="xs:string" minOccurs="1" maxOccurs="1"/>
- <xs:element name="streetNumber" type="xs:string" minOccurs="0"/>
- <xs:element name="apartmentNumber" type="xs:string" minOccurs="0"/>
- </xs:sequence>
+
+ <xs:element name="mandateContent">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="validFrom" type="xs:date" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="validTo" type="xs:date" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="transactionLimit" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="stork:transactionLimitCurrency"/>
+ <xs:element name="isJoint" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="isChained" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="typePower" type="xs:integer" minOccurs="1" maxOccurs="1"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="transactionLimitCurrency"/>
+ <xs:simpleType name="currency">
+ <xs:restriction base="xs:string">
+ <xs:maxLength value="3"/>
+ <xs:minLength value="3"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:element name="canonicalResidenceAddress">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="stork:countryCodeAddress"/>
+ <xs:element name="state" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="municipalityCode" type="xs:string" minOccurs="0"/>
+ <xs:element name="town" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="postalCode" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="streetName" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="streetNumber" type="xs:string" minOccurs="0"/>
+ <xs:element name="apartmentNumber" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
</xs:complexType>
+ </xs:element>
<xs:element name="countryCodeAddress">
<xs:simpleType>
<xs:restriction base="xs:string">
diff --git a/src/main/resources/wsdl/szrgw/szr-gw-0.0.3.xsd b/src/main/resources/wsdl/szrgw/szr-gw-0.0.3.xsd
index 8ff05a9..c978224 100644
--- a/src/main/resources/wsdl/szrgw/szr-gw-0.0.3.xsd
+++ b/src/main/resources/wsdl/szrgw/szr-gw-0.0.3.xsd
@@ -3,7 +3,6 @@
<xs:import namespace="urn:oasis:names:tc:SAML:1.0:assertion" schemaLocation="../cs-sstc-schema-assertion-01.xsd"/>
<xs:import namespace="http://reference.e-government.gv.at/namespace/persondata/20020228#" schemaLocation="../PersonData_20_en_moaWID.xsd"/>
<xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="../W3C-XMLDSig.xsd"/>
- <xs:import namespace="urn:eu:stork:names:tc:PEPS:1.0:assertion" schemaLocation="stork.xsd"/>
<xs:import namespace="http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd" schemaLocation="../mis/mis-1.0.3.xsd"/>
<xs:element name="CreateIdentityLinkRequest">
<xs:complexType>
@@ -11,27 +10,38 @@
<xs:element name="PEPSData" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:sequence>
- <xs:element name="Identifier" type="xs:string" minOccurs="1" maxOccurs="1"/>
- <xs:element name="Firstname" type="xs:string" minOccurs="1" maxOccurs="1"/>
- <xs:element name="Familyname" type="xs:string" minOccurs="1" maxOccurs="1"/>
- <xs:element name="DateOfBirth" type="sgw:DateOfBirthType" minOccurs="1" maxOccurs="1"/>
- <xs:element name="Representative" type="stork:representationPerson" minOccurs="0" maxOccurs="1"/>
- <xs:element name="Represented" type="stork:representationPerson" minOccurs="0" maxOccurs="1"/>
- <xs:element name="MandateContent" type="stork:mandateContent" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="Identifier" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="Firstname" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="Familyname" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="DateOfBirth" type="sgw:DateOfBirthType" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="Gender" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="FiscalNumber" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="LegalPersonTranslatableType" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="LegalPersonCanonicalRegisteredAddress" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="Representative" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="Represented" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="MandateContent" type="xs:string" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="Signature">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Base64Content" type="xs:base64Binary" minOccurs="1"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element ref="mis:MandateIdentifiers" minOccurs="0"/>
+ <xs:element name="Signature" type="xs:base64Binary" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="MIS" type="sgw:MISType" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
</xs:complexType>
</xs:element>
+ <xs:complexType name="MISType">
+ <xs:sequence>
+ <xs:element name="Filters" minOccurs="1" maxOccurs="1">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="mis:MandateIdentifiers" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element ref="mis:Target" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="OAFriendlyName" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ </xs:sequence>
+ </xs:complexType>
<xs:element name="CreateIdentityLinkResponse">
<xs:annotation>
<xs:documentation>Antwort auf Personenbindung-Request</xs:documentation>