summaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorThomas Lenz <thomas.lenz@egiz.gv.at>2019-10-01 10:57:01 +0200
committerThomas Lenz <thomas.lenz@egiz.gv.at>2019-10-01 10:57:01 +0200
commitdf2ba23f9479f37c11a7a23b697b5acaa4e97d33 (patch)
treeea042bb74cab85c45f47f84ff864ab808f72342b /src/main/java
parentdcd678d6ac5ededc8b58b5d473cf12acfdbd8598 (diff)
downloadegovutils-df2ba23f9479f37c11a7a23b697b5acaa4e97d33.tar.gz
egovutils-df2ba23f9479f37c11a7a23b697b5acaa4e97d33.tar.bz2
egovutils-df2ba23f9479f37c11a7a23b697b5acaa4e97d33.zip
update MIS v2.0 end-point implementation
add MISV2Client.java for testing
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/at/gv/util/client/mis_v2/MISV2Client.java117
-rw-r--r--src/main/java/at/gv/util/wsdl/mis_v2/GetMandatesError.java2
-rw-r--r--src/main/java/at/gv/util/wsdl/mis_v2/GetMandatesPortType.java4
-rw-r--r--src/main/java/at/gv/util/wsdl/mis_v2/GetMandatesService.java2
-rw-r--r--src/main/java/at/gv/util/xsd/mis_v2/AttributeType.java146
-rw-r--r--src/main/java/at/gv/util/xsd/mis_v2/GetMandatesRequestType.java34
-rw-r--r--src/main/java/at/gv/util/xsd/mis_v2/MisMandateType.java5
-rw-r--r--src/main/java/at/gv/util/xsd/mis_v2/ObjectFactory.java8
-rw-r--r--src/main/java/at/gv/util/xsd/mis_v2/persondata/AbstractPersonType.java8
-rw-r--r--src/main/java/at/gv/util/xsd/mis_v2/persondata/CompactCorporateBodyType.java2
-rw-r--r--src/main/java/at/gv/util/xsd/mis_v2/persondata/CompactPersonDataType.java22
-rw-r--r--src/main/java/at/gv/util/xsd/mis_v2/persondata/CompactPhysicalPersonType.java2
-rw-r--r--src/main/java/at/gv/util/xsd/mis_v2/persondata/CorporateBodyType.java2
-rw-r--r--src/main/java/at/gv/util/xsd/mis_v2/persondata/IdentificationType.java2
-rw-r--r--src/main/java/at/gv/util/xsd/mis_v2/persondata/InternetAddressType.java2
-rw-r--r--src/main/java/at/gv/util/xsd/mis_v2/persondata/NationalityType.java12
-rw-r--r--src/main/java/at/gv/util/xsd/mis_v2/persondata/PersonDataType.java22
-rw-r--r--src/main/java/at/gv/util/xsd/mis_v2/persondata/PhysicalPersonType.java2
-rw-r--r--src/main/java/at/gv/util/xsd/mis_v2/persondata/TelephoneAddressType.java2
-rw-r--r--src/main/java/at/gv/util/xsd/mis_v2/persondata/TypedPostalAddressType.java2
-rw-r--r--src/main/java/at/gv/util/xsd/w3c_xmldsig/CanonicalizationMethodType.java2
-rw-r--r--src/main/java/at/gv/util/xsd/w3c_xmldsig/DigestMethodType.java2
-rw-r--r--src/main/java/at/gv/util/xsd/w3c_xmldsig/KeyInfoType.java20
-rw-r--r--src/main/java/at/gv/util/xsd/w3c_xmldsig/KeyValueType.java10
-rw-r--r--src/main/java/at/gv/util/xsd/w3c_xmldsig/ObjectType.java2
-rw-r--r--src/main/java/at/gv/util/xsd/w3c_xmldsig/PGPDataType.java8
-rw-r--r--src/main/java/at/gv/util/xsd/w3c_xmldsig/SPKIDataType.java2
-rw-r--r--src/main/java/at/gv/util/xsd/w3c_xmldsig/SignatureMethodType.java2
-rw-r--r--src/main/java/at/gv/util/xsd/w3c_xmldsig/SignaturePropertyType.java2
-rw-r--r--src/main/java/at/gv/util/xsd/w3c_xmldsig/TransformType.java4
-rw-r--r--src/main/java/at/gv/util/xsd/w3c_xmldsig/X509DataType.java8
31 files changed, 382 insertions, 78 deletions
diff --git a/src/main/java/at/gv/util/client/mis_v2/MISV2Client.java b/src/main/java/at/gv/util/client/mis_v2/MISV2Client.java
new file mode 100644
index 0000000..ed145f5
--- /dev/null
+++ b/src/main/java/at/gv/util/client/mis_v2/MISV2Client.java
@@ -0,0 +1,117 @@
+package at.gv.util.client.mis_v2;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.net.ssl.SSLContext;
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.handler.Handler;
+
+import org.apache.cxf.configuration.jsse.TLSClientParameters;
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.frontend.ClientProxy;
+import org.apache.cxf.transport.http.HTTPConduit;
+import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import at.gv.util.LaxHostNameVerifier;
+import at.gv.util.LoggingHandler;
+import at.gv.util.MiscUtil;
+import at.gv.util.client.moaid.MOAIDClient;
+import at.gv.util.client.szr.SZRClient;
+import at.gv.util.config.EgovUtilConfiguration;
+import at.gv.util.ex.EgovUtilException;
+import at.gv.util.wsdl.mis.MandateIssuePortType;
+import at.gv.util.wsdl.mis.MandateIssueService;
+import at.gv.util.wsdl.mis_v2.GetMandatesError;
+import at.gv.util.wsdl.mis_v2.GetMandatesPortType;
+import at.gv.util.wsdl.mis_v2.GetMandatesService;
+import at.gv.util.wsdl.szr.SZRException;
+import at.gv.util.xsd.mis.MandateIssueRequestType;
+import at.gv.util.xsd.mis.MandateIssueResponseType;
+import at.gv.util.xsd.mis_v2.GetMandatesRequestType;
+import at.gv.util.xsd.mis_v2.GetMandatesResponseType;
+
+public class MISV2Client {
+
+ @Resource WebServiceContext wsContext;
+
+ private EgovUtilConfiguration config = null;
+ Logger log = LoggerFactory.getLogger(MISV2Client.class);
+
+ private GetMandatesService service;
+
+ public MISV2Client() {}
+
+ public MISV2Client(EgovUtilConfiguration config) {
+ if (config == null) {
+ throw new NullPointerException("Parameter config must not be null.");
+ }
+ this.config = config;
+
+ URL url = MISV2Client.class.getResource("/wsdl/mis/mis_2.0/mis-2.0.0.wsdl");
+ service = new GetMandatesService(url);
+
+ }
+
+ @SuppressWarnings({ "unchecked", "rawtypes" })
+ public GetMandatesResponseType sendMandateIssueRequest(GetMandatesRequestType getMandatesRequest, String misServiceURL) throws SZRException, EgovUtilException, GetMandatesError {
+ MiscUtil.assertNotNull(getMandatesRequest, "mir");
+ MiscUtil.assertNotNull(misServiceURL, "misServiceURL");
+
+
+ GetMandatesPortType port = service.getGetMandatesPort();
+
+ log.debug("MIS v2.0 connection URL: " + misServiceURL);
+ BindingProvider bindingProvider = (BindingProvider) port;
+ Map<String, Object> requestContext = bindingProvider.getRequestContext();
+ requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, misServiceURL);
+
+ log.trace("Adding JAX-WS request/response trace handler.");
+ List<Handler> handlerList = bindingProvider.getBinding().getHandlerChain();
+ if (handlerList == null) {
+ handlerList = new ArrayList();
+ }
+ LoggingHandler loggingHandler = new LoggingHandler();
+ handlerList.add(loggingHandler);
+ bindingProvider.getBinding().setHandlerChain(handlerList);
+
+ // check for ssl
+ if (misServiceURL.toLowerCase().startsWith("https")) {
+ log.trace("Using ssl for MIS client request.");
+ SSLContext sslContext = config.getMMSsslConfiguration().getSSLContext(false);
+ if (sslContext == null) {
+ throw new EgovUtilException("SSL context from configuration is empty. Please configure an SSL context in the configuration first.");
+ }
+ Client client = ClientProxy.getClient(port);
+ HTTPConduit http = (HTTPConduit) client.getConduit();
+ HTTPClientPolicy httpClientPolicy = new HTTPClientPolicy();
+
+ httpClientPolicy.setConnectionTimeout(36000);
+ httpClientPolicy.setAllowChunking(false);
+ httpClientPolicy.setReceiveTimeout(32000);
+
+ http.setClient(httpClientPolicy);
+
+ TLSClientParameters tlsParams = new TLSClientParameters();
+ tlsParams.setSSLSocketFactory(sslContext.getSocketFactory());
+
+ // check for lax hostname
+ if (this.config.getMISsslConfiguration().useLaxHostNameVerifier()) {
+ log.trace("LaxHostnameVerifier enabled. This setting is not recommended to use.");
+ tlsParams.setHostnameVerifier(new LaxHostNameVerifier());
+ }
+
+ http.setTlsClientParameters(tlsParams );
+ }
+ return port.getMandatesOperation(getMandatesRequest);
+
+ }
+
+}
diff --git a/src/main/java/at/gv/util/wsdl/mis_v2/GetMandatesError.java b/src/main/java/at/gv/util/wsdl/mis_v2/GetMandatesError.java
index 253f773..1a1513d 100644
--- a/src/main/java/at/gv/util/wsdl/mis_v2/GetMandatesError.java
+++ b/src/main/java/at/gv/util/wsdl/mis_v2/GetMandatesError.java
@@ -6,7 +6,7 @@ import javax.xml.ws.WebFault;
/**
* This class was generated by Apache CXF 3.1.10
- * 2019-09-30T12:17:52.990+02:00
+ * 2019-09-30T16:58:56.086+02:00
* Generated source version: 3.1.10
*/
diff --git a/src/main/java/at/gv/util/wsdl/mis_v2/GetMandatesPortType.java b/src/main/java/at/gv/util/wsdl/mis_v2/GetMandatesPortType.java
index 1898468..5a8a83b 100644
--- a/src/main/java/at/gv/util/wsdl/mis_v2/GetMandatesPortType.java
+++ b/src/main/java/at/gv/util/wsdl/mis_v2/GetMandatesPortType.java
@@ -9,12 +9,12 @@ import javax.xml.bind.annotation.XmlSeeAlso;
/**
* This class was generated by Apache CXF 3.1.10
- * 2019-09-30T12:17:53.018+02:00
+ * 2019-09-30T16:58:56.108+02:00
* Generated source version: 3.1.10
*
*/
@WebService(targetNamespace = "http://reference.e-government.gv.at/namespace/mandates/mis/2.0/wsdl", name = "GetMandatesPortType")
-@XmlSeeAlso({at.gv.util.xsd.w3c_xmlenc.ObjectFactory.class, at.gv.util.xsd.mis_v2.ObjectFactory.class, at.gv.util.xsd.saml.v2_0.assertion.ObjectFactory.class, at.gv.util.xsd.w3c_xmldsig.ObjectFactory.class, at.gv.util.xsd.mis_v2.persondata.ObjectFactory.class})
+@XmlSeeAlso({at.gv.util.xsd.mis_v2.ObjectFactory.class, at.gv.util.xsd.w3c_xmldsig.ObjectFactory.class, at.gv.util.xsd.mis_v2.persondata.ObjectFactory.class})
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
public interface GetMandatesPortType {
diff --git a/src/main/java/at/gv/util/wsdl/mis_v2/GetMandatesService.java b/src/main/java/at/gv/util/wsdl/mis_v2/GetMandatesService.java
index f0f9ceb..7e08ba0 100644
--- a/src/main/java/at/gv/util/wsdl/mis_v2/GetMandatesService.java
+++ b/src/main/java/at/gv/util/wsdl/mis_v2/GetMandatesService.java
@@ -10,7 +10,7 @@ import javax.xml.ws.Service;
/**
* This class was generated by Apache CXF 3.1.10
- * 2019-09-30T12:17:53.040+02:00
+ * 2019-09-30T16:58:56.124+02:00
* Generated source version: 3.1.10
*
*/
diff --git a/src/main/java/at/gv/util/xsd/mis_v2/AttributeType.java b/src/main/java/at/gv/util/xsd/mis_v2/AttributeType.java
new file mode 100644
index 0000000..0d986a6
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/mis_v2/AttributeType.java
@@ -0,0 +1,146 @@
+
+package at.gv.util.xsd.mis_v2;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java-Klasse für AttributeType complex type.
+ *
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
+ *
+ * <pre>
+ * &lt;complexType name="AttributeType"&gt;
+ * &lt;complexContent&gt;
+ * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ * &lt;sequence&gt;
+ * &lt;element name="AttributeValue" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
+ * &lt;/sequence&gt;
+ * &lt;attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
+ * &lt;attribute name="FriendlyName" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
+ * &lt;attribute name="NameFormat" type="{http://www.w3.org/2001/XMLSchema}anyURI" /&gt;
+ * &lt;/restriction&gt;
+ * &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * </pre>
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "AttributeType", propOrder = {
+ "attributeValue"
+})
+public class AttributeType {
+
+ @XmlElement(name = "AttributeValue", required = true)
+ protected String attributeValue;
+ @XmlAttribute(name = "Name", required = true)
+ protected String name;
+ @XmlAttribute(name = "FriendlyName")
+ protected String friendlyName;
+ @XmlAttribute(name = "NameFormat")
+ @XmlSchemaType(name = "anyURI")
+ protected String nameFormat;
+
+ /**
+ * Ruft den Wert der attributeValue-Eigenschaft ab.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getAttributeValue() {
+ return attributeValue;
+ }
+
+ /**
+ * Legt den Wert der attributeValue-Eigenschaft fest.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setAttributeValue(String value) {
+ this.attributeValue = value;
+ }
+
+ /**
+ * Ruft den Wert der name-Eigenschaft ab.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Legt den Wert der name-Eigenschaft fest.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setName(String value) {
+ this.name = value;
+ }
+
+ /**
+ * Ruft den Wert der friendlyName-Eigenschaft ab.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getFriendlyName() {
+ return friendlyName;
+ }
+
+ /**
+ * Legt den Wert der friendlyName-Eigenschaft fest.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setFriendlyName(String value) {
+ this.friendlyName = value;
+ }
+
+ /**
+ * Ruft den Wert der nameFormat-Eigenschaft ab.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getNameFormat() {
+ return nameFormat;
+ }
+
+ /**
+ * Legt den Wert der nameFormat-Eigenschaft fest.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setNameFormat(String value) {
+ this.nameFormat = value;
+ }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/mis_v2/GetMandatesRequestType.java b/src/main/java/at/gv/util/xsd/mis_v2/GetMandatesRequestType.java
index c384aca..c1aacd8 100644
--- a/src/main/java/at/gv/util/xsd/mis_v2/GetMandatesRequestType.java
+++ b/src/main/java/at/gv/util/xsd/mis_v2/GetMandatesRequestType.java
@@ -3,9 +3,13 @@ package at.gv.util.xsd.mis_v2;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
/**
@@ -21,6 +25,7 @@ import javax.xml.bind.annotation.XmlType;
* &lt;element name="PersonInformation" type="{http://reference.e-government.gv.at/namespace/mandates/mis/2.0/xsd}PersonInformationType"/&gt;
* &lt;element name="MandateCollectionToken" type="{http://www.w3.org/2001/XMLSchema}anyURI"/&gt;
* &lt;/choice&gt;
+ * &lt;attribute name="reqId" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" /&gt;
* &lt;/restriction&gt;
* &lt;/complexContent&gt;
* &lt;/complexType&gt;
@@ -40,6 +45,11 @@ public class GetMandatesRequestType {
@XmlElement(name = "MandateCollectionToken")
@XmlSchemaType(name = "anyURI")
protected String mandateCollectionToken;
+ @XmlAttribute(name = "reqId", required = true)
+ @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+ @XmlID
+ @XmlSchemaType(name = "ID")
+ protected String reqId;
/**
* Ruft den Wert der personInformation-Eigenschaft ab.
@@ -89,4 +99,28 @@ public class GetMandatesRequestType {
this.mandateCollectionToken = value;
}
+ /**
+ * Ruft den Wert der reqId-Eigenschaft ab.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getReqId() {
+ return reqId;
+ }
+
+ /**
+ * Legt den Wert der reqId-Eigenschaft fest.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setReqId(String value) {
+ this.reqId = value;
+ }
+
}
diff --git a/src/main/java/at/gv/util/xsd/mis_v2/MisMandateType.java b/src/main/java/at/gv/util/xsd/mis_v2/MisMandateType.java
index 984369b..1a0eaed 100644
--- a/src/main/java/at/gv/util/xsd/mis_v2/MisMandateType.java
+++ b/src/main/java/at/gv/util/xsd/mis_v2/MisMandateType.java
@@ -7,7 +7,6 @@ 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.saml.v2_0.assertion.AttributeType;
/**
@@ -20,7 +19,7 @@ import at.gv.util.xsd.saml.v2_0.assertion.AttributeType;
* &lt;complexContent&gt;
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
* &lt;sequence&gt;
- * &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Attribute" maxOccurs="unbounded"/&gt;
+ * &lt;element name="Attribute" type="{http://reference.e-government.gv.at/namespace/mandates/mis/2.0/xsd}AttributeType" maxOccurs="unbounded"/&gt;
* &lt;/sequence&gt;
* &lt;/restriction&gt;
* &lt;/complexContent&gt;
@@ -35,7 +34,7 @@ import at.gv.util.xsd.saml.v2_0.assertion.AttributeType;
})
public class MisMandateType {
- @XmlElement(name = "Attribute", namespace = "urn:oasis:names:tc:SAML:2.0:assertion", required = true)
+ @XmlElement(name = "Attribute", required = true)
protected List<AttributeType> attribute;
/**
diff --git a/src/main/java/at/gv/util/xsd/mis_v2/ObjectFactory.java b/src/main/java/at/gv/util/xsd/mis_v2/ObjectFactory.java
index c376013..678e61f 100644
--- a/src/main/java/at/gv/util/xsd/mis_v2/ObjectFactory.java
+++ b/src/main/java/at/gv/util/xsd/mis_v2/ObjectFactory.java
@@ -76,6 +76,14 @@ public class ObjectFactory {
}
/**
+ * Create an instance of {@link AttributeType }
+ *
+ */
+ public AttributeType createAttributeType() {
+ return new AttributeType();
+ }
+
+ /**
* Create an instance of {@link JAXBElement }{@code <}{@link GetMandatesRequestType }{@code >}}
*
*/
diff --git a/src/main/java/at/gv/util/xsd/mis_v2/persondata/AbstractPersonType.java b/src/main/java/at/gv/util/xsd/mis_v2/persondata/AbstractPersonType.java
index 04d5139..8de0335 100644
--- a/src/main/java/at/gv/util/xsd/mis_v2/persondata/AbstractPersonType.java
+++ b/src/main/java/at/gv/util/xsd/mis_v2/persondata/AbstractPersonType.java
@@ -119,15 +119,15 @@ public class AbstractPersonType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link JAXBElement }{@code <}{@link ERJPZahl }{@code >}
+ * {@link JAXBElement }{@code <}{@link Vereinsnummer }{@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 ZMRzahl }{@code >}
* {@link JAXBElement }{@code <}{@link AbstractSimpleIdentificationType }{@code >}
- * {@link JAXBElement }{@code <}{@link Firmenbuchnummer }{@code >}
* {@link JAXBElement }{@code <}{@link AbstractSimpleIdentificationType }{@code >}
+ * {@link JAXBElement }{@code <}{@link Firmenbuchnummer }{@code >}
+ * {@link JAXBElement }{@code <}{@link ERJPZahl }{@code >}
*
*
*/
diff --git a/src/main/java/at/gv/util/xsd/mis_v2/persondata/CompactCorporateBodyType.java b/src/main/java/at/gv/util/xsd/mis_v2/persondata/CompactCorporateBodyType.java
index 6fad454..f58755e 100644
--- a/src/main/java/at/gv/util/xsd/mis_v2/persondata/CompactCorporateBodyType.java
+++ b/src/main/java/at/gv/util/xsd/mis_v2/persondata/CompactCorporateBodyType.java
@@ -188,8 +188,8 @@ public class CompactCorporateBodyType
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Element }
* {@link Object }
+ * {@link Element }
*
*
*/
diff --git a/src/main/java/at/gv/util/xsd/mis_v2/persondata/CompactPersonDataType.java b/src/main/java/at/gv/util/xsd/mis_v2/persondata/CompactPersonDataType.java
index 925e0c9..1e572a4 100644
--- a/src/main/java/at/gv/util/xsd/mis_v2/persondata/CompactPersonDataType.java
+++ b/src/main/java/at/gv/util/xsd/mis_v2/persondata/CompactPersonDataType.java
@@ -75,10 +75,10 @@ public class CompactPersonDataType
*
* @return
* possible object is
- * {@link JAXBElement }{@code <}{@link CompactPhysicalPersonType }{@code >}
- * {@link JAXBElement }{@code <}{@link CompactCorporateBodyType }{@code >}
- * {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >}
* {@link JAXBElement }{@code <}{@link CorporateBodyType }{@code >}
+ * {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >}
+ * {@link JAXBElement }{@code <}{@link CompactCorporateBodyType }{@code >}
+ * {@link JAXBElement }{@code <}{@link CompactPhysicalPersonType }{@code >}
* {@link JAXBElement }{@code <}{@link AbstractPersonType }{@code >}
*
*/
@@ -91,10 +91,10 @@ public class CompactPersonDataType
*
* @param value
* allowed object is
- * {@link JAXBElement }{@code <}{@link CompactPhysicalPersonType }{@code >}
- * {@link JAXBElement }{@code <}{@link CompactCorporateBodyType }{@code >}
- * {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >}
* {@link JAXBElement }{@code <}{@link CorporateBodyType }{@code >}
+ * {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >}
+ * {@link JAXBElement }{@code <}{@link CompactCorporateBodyType }{@code >}
+ * {@link JAXBElement }{@code <}{@link CompactPhysicalPersonType }{@code >}
* {@link JAXBElement }{@code <}{@link AbstractPersonType }{@code >}
*
*/
@@ -120,12 +120,12 @@ public class CompactPersonDataType
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link JAXBElement }{@code <}{@link PostalAddressType }{@code >}
- * {@link JAXBElement }{@code <}{@link CompactPostalAddressType }{@code >}
- * {@link JAXBElement }{@code <}{@link TypedPostalAddressType }{@code >}
+ * {@link JAXBElement }{@code <}{@link TelephoneAddressType }{@code >}
* {@link JAXBElement }{@code <}{@link AbstractAddressType }{@code >}
* {@link JAXBElement }{@code <}{@link InternetAddressType }{@code >}
- * {@link JAXBElement }{@code <}{@link TelephoneAddressType }{@code >}
+ * {@link JAXBElement }{@code <}{@link PostalAddressType }{@code >}
+ * {@link JAXBElement }{@code <}{@link TypedPostalAddressType }{@code >}
+ * {@link JAXBElement }{@code <}{@link CompactPostalAddressType }{@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 Object }
*
*
*/
diff --git a/src/main/java/at/gv/util/xsd/mis_v2/persondata/CompactPhysicalPersonType.java b/src/main/java/at/gv/util/xsd/mis_v2/persondata/CompactPhysicalPersonType.java
index 7b395f0..d97e067 100644
--- a/src/main/java/at/gv/util/xsd/mis_v2/persondata/CompactPhysicalPersonType.java
+++ b/src/main/java/at/gv/util/xsd/mis_v2/persondata/CompactPhysicalPersonType.java
@@ -243,8 +243,8 @@ public class CompactPhysicalPersonType
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Element }
* {@link Object }
+ * {@link Element }
*
*
*/
diff --git a/src/main/java/at/gv/util/xsd/mis_v2/persondata/CorporateBodyType.java b/src/main/java/at/gv/util/xsd/mis_v2/persondata/CorporateBodyType.java
index 7eea511..25e86fa 100644
--- a/src/main/java/at/gv/util/xsd/mis_v2/persondata/CorporateBodyType.java
+++ b/src/main/java/at/gv/util/xsd/mis_v2/persondata/CorporateBodyType.java
@@ -256,8 +256,8 @@ public class CorporateBodyType
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Element }
* {@link Object }
+ * {@link Element }
*
*
*/
diff --git a/src/main/java/at/gv/util/xsd/mis_v2/persondata/IdentificationType.java b/src/main/java/at/gv/util/xsd/mis_v2/persondata/IdentificationType.java
index 948d89a..b919b3d 100644
--- a/src/main/java/at/gv/util/xsd/mis_v2/persondata/IdentificationType.java
+++ b/src/main/java/at/gv/util/xsd/mis_v2/persondata/IdentificationType.java
@@ -172,8 +172,8 @@ public class IdentificationType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Element }
* {@link Object }
+ * {@link Element }
*
*
*/
diff --git a/src/main/java/at/gv/util/xsd/mis_v2/persondata/InternetAddressType.java b/src/main/java/at/gv/util/xsd/mis_v2/persondata/InternetAddressType.java
index ab7946c..90f82ef 100644
--- a/src/main/java/at/gv/util/xsd/mis_v2/persondata/InternetAddressType.java
+++ b/src/main/java/at/gv/util/xsd/mis_v2/persondata/InternetAddressType.java
@@ -121,8 +121,8 @@ public class InternetAddressType
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Element }
* {@link Object }
+ * {@link Element }
*
*
*/
diff --git a/src/main/java/at/gv/util/xsd/mis_v2/persondata/NationalityType.java b/src/main/java/at/gv/util/xsd/mis_v2/persondata/NationalityType.java
index 2a3018b..78113c0 100644
--- a/src/main/java/at/gv/util/xsd/mis_v2/persondata/NationalityType.java
+++ b/src/main/java/at/gv/util/xsd/mis_v2/persondata/NationalityType.java
@@ -52,10 +52,10 @@ import org.w3c.dom.Element;
public class NationalityType {
@XmlElementRefs({
- @XmlElementRef(name = "CountryNameDE", 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 = "CountryNameFR", 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 = "CountryNameEN", 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)
@@ -80,11 +80,11 @@ public class NationalityType {
* <p>
* Objects of the following type(s) are allowed in the list
* {@link JAXBElement }{@code <}{@link String }{@code >}
- * {@link String }
- * {@link Element }
- * {@link Object }
* {@link JAXBElement }{@code <}{@link String }{@code >}
* {@link JAXBElement }{@code <}{@link String }{@code >}
+ * {@link Object }
+ * {@link String }
+ * {@link Element }
* {@link JAXBElement }{@code <}{@link String }{@code >}
*
*
diff --git a/src/main/java/at/gv/util/xsd/mis_v2/persondata/PersonDataType.java b/src/main/java/at/gv/util/xsd/mis_v2/persondata/PersonDataType.java
index 1be64ea..e3f3e34 100644
--- a/src/main/java/at/gv/util/xsd/mis_v2/persondata/PersonDataType.java
+++ b/src/main/java/at/gv/util/xsd/mis_v2/persondata/PersonDataType.java
@@ -75,10 +75,10 @@ public class PersonDataType
*
* @return
* possible object is
- * {@link JAXBElement }{@code <}{@link CompactPhysicalPersonType }{@code >}
- * {@link JAXBElement }{@code <}{@link CompactCorporateBodyType }{@code >}
- * {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >}
* {@link JAXBElement }{@code <}{@link CorporateBodyType }{@code >}
+ * {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >}
+ * {@link JAXBElement }{@code <}{@link CompactCorporateBodyType }{@code >}
+ * {@link JAXBElement }{@code <}{@link CompactPhysicalPersonType }{@code >}
* {@link JAXBElement }{@code <}{@link AbstractPersonType }{@code >}
*
*/
@@ -91,10 +91,10 @@ public class PersonDataType
*
* @param value
* allowed object is
- * {@link JAXBElement }{@code <}{@link CompactPhysicalPersonType }{@code >}
- * {@link JAXBElement }{@code <}{@link CompactCorporateBodyType }{@code >}
- * {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >}
* {@link JAXBElement }{@code <}{@link CorporateBodyType }{@code >}
+ * {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >}
+ * {@link JAXBElement }{@code <}{@link CompactCorporateBodyType }{@code >}
+ * {@link JAXBElement }{@code <}{@link CompactPhysicalPersonType }{@code >}
* {@link JAXBElement }{@code <}{@link AbstractPersonType }{@code >}
*
*/
@@ -120,12 +120,12 @@ public class PersonDataType
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link JAXBElement }{@code <}{@link PostalAddressType }{@code >}
- * {@link JAXBElement }{@code <}{@link CompactPostalAddressType }{@code >}
- * {@link JAXBElement }{@code <}{@link TypedPostalAddressType }{@code >}
+ * {@link JAXBElement }{@code <}{@link TelephoneAddressType }{@code >}
* {@link JAXBElement }{@code <}{@link AbstractAddressType }{@code >}
* {@link JAXBElement }{@code <}{@link InternetAddressType }{@code >}
- * {@link JAXBElement }{@code <}{@link TelephoneAddressType }{@code >}
+ * {@link JAXBElement }{@code <}{@link PostalAddressType }{@code >}
+ * {@link JAXBElement }{@code <}{@link TypedPostalAddressType }{@code >}
+ * {@link JAXBElement }{@code <}{@link CompactPostalAddressType }{@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 Object }
*
*
*/
diff --git a/src/main/java/at/gv/util/xsd/mis_v2/persondata/PhysicalPersonType.java b/src/main/java/at/gv/util/xsd/mis_v2/persondata/PhysicalPersonType.java
index cbec436..24ab584 100644
--- a/src/main/java/at/gv/util/xsd/mis_v2/persondata/PhysicalPersonType.java
+++ b/src/main/java/at/gv/util/xsd/mis_v2/persondata/PhysicalPersonType.java
@@ -488,8 +488,8 @@ public class PhysicalPersonType
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Element }
* {@link Object }
+ * {@link Element }
*
*
*/
diff --git a/src/main/java/at/gv/util/xsd/mis_v2/persondata/TelephoneAddressType.java b/src/main/java/at/gv/util/xsd/mis_v2/persondata/TelephoneAddressType.java
index 2a65cab..03809cd 100644
--- a/src/main/java/at/gv/util/xsd/mis_v2/persondata/TelephoneAddressType.java
+++ b/src/main/java/at/gv/util/xsd/mis_v2/persondata/TelephoneAddressType.java
@@ -125,8 +125,8 @@ public class TelephoneAddressType
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Element }
* {@link Object }
+ * {@link Element }
*
*
*/
diff --git a/src/main/java/at/gv/util/xsd/mis_v2/persondata/TypedPostalAddressType.java b/src/main/java/at/gv/util/xsd/mis_v2/persondata/TypedPostalAddressType.java
index 0bb2141..bcd27a8 100644
--- a/src/main/java/at/gv/util/xsd/mis_v2/persondata/TypedPostalAddressType.java
+++ b/src/main/java/at/gv/util/xsd/mis_v2/persondata/TypedPostalAddressType.java
@@ -120,8 +120,8 @@ public class TypedPostalAddressType
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Element }
* {@link Object }
+ * {@link Element }
*
*
*/
diff --git a/src/main/java/at/gv/util/xsd/w3c_xmldsig/CanonicalizationMethodType.java b/src/main/java/at/gv/util/xsd/w3c_xmldsig/CanonicalizationMethodType.java
index 06ae1dc..ac1a64f 100644
--- a/src/main/java/at/gv/util/xsd/w3c_xmldsig/CanonicalizationMethodType.java
+++ b/src/main/java/at/gv/util/xsd/w3c_xmldsig/CanonicalizationMethodType.java
@@ -63,8 +63,8 @@ public class CanonicalizationMethodType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link String }
* {@link Object }
+ * {@link String }
*
*
*/
diff --git a/src/main/java/at/gv/util/xsd/w3c_xmldsig/DigestMethodType.java b/src/main/java/at/gv/util/xsd/w3c_xmldsig/DigestMethodType.java
index c430ddb..ee5ff4f 100644
--- a/src/main/java/at/gv/util/xsd/w3c_xmldsig/DigestMethodType.java
+++ b/src/main/java/at/gv/util/xsd/w3c_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 Object }
*
*
*/
diff --git a/src/main/java/at/gv/util/xsd/w3c_xmldsig/KeyInfoType.java b/src/main/java/at/gv/util/xsd/w3c_xmldsig/KeyInfoType.java
index a21d4ab..ac5821e 100644
--- a/src/main/java/at/gv/util/xsd/w3c_xmldsig/KeyInfoType.java
+++ b/src/main/java/at/gv/util/xsd/w3c_xmldsig/KeyInfoType.java
@@ -53,13 +53,13 @@ import org.w3c.dom.Element;
public class KeyInfoType {
@XmlElementRefs({
+ @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 = "SPKIData", 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 = "X509Data", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+ @XmlElementRef(name = "MgmtData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
@XmlElementRef(name = "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 = "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 = "KeyName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
})
@XmlMixed
@XmlAnyElement(lax = true)
@@ -88,15 +88,15 @@ public class KeyInfoType {
*
* <p>
* Objects of the following type(s) are allowed in the list
+ * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}
* {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}
+ * {@link Object }
* {@link String }
- * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}
- * {@link JAXBElement }{@code <}{@link String }{@code >}
* {@link Element }
- * {@link JAXBElement }{@code <}{@link X509DataType }{@code >}
- * {@link Object }
+ * {@link JAXBElement }{@code <}{@link String }{@code >}
* {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}
- * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}
+ * {@link JAXBElement }{@code <}{@link X509DataType }{@code >}
+ * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}
* {@link JAXBElement }{@code <}{@link String }{@code >}
*
*
diff --git a/src/main/java/at/gv/util/xsd/w3c_xmldsig/KeyValueType.java b/src/main/java/at/gv/util/xsd/w3c_xmldsig/KeyValueType.java
index e5ac1b6..796512f 100644
--- a/src/main/java/at/gv/util/xsd/w3c_xmldsig/KeyValueType.java
+++ b/src/main/java/at/gv/util/xsd/w3c_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 = "DSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+ @XmlElementRef(name = "RSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
})
@XmlMixed
@XmlAnyElement(lax = true)
@@ -67,11 +67,11 @@ public class KeyValueType {
*
* <p>
* Objects of the following type(s) are allowed in the list
+ * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}
+ * {@link Object }
* {@link String }
- * {@link Element }
* {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}
- * {@link Object }
- * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}
+ * {@link Element }
*
*
*/
diff --git a/src/main/java/at/gv/util/xsd/w3c_xmldsig/ObjectType.java b/src/main/java/at/gv/util/xsd/w3c_xmldsig/ObjectType.java
index e40340e..e0e0021 100644
--- a/src/main/java/at/gv/util/xsd/w3c_xmldsig/ObjectType.java
+++ b/src/main/java/at/gv/util/xsd/w3c_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 Object }
*
*
*/
diff --git a/src/main/java/at/gv/util/xsd/w3c_xmldsig/PGPDataType.java b/src/main/java/at/gv/util/xsd/w3c_xmldsig/PGPDataType.java
index 07eb0e1..d9cec44 100644
--- a/src/main/java/at/gv/util/xsd/w3c_xmldsig/PGPDataType.java
+++ b/src/main/java/at/gv/util/xsd/w3c_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 = "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, required = false)
})
@XmlAnyElement(lax = true)
protected List<Object> content;
@@ -82,9 +82,9 @@ public class PGPDataType {
* <p>
* Objects of the following type(s) are allowed in the list
* {@link JAXBElement }{@code <}{@link byte[]}{@code >}
- * {@link Element }
- * {@link Object }
* {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+ * {@link Object }
+ * {@link Element }
*
*
*/
diff --git a/src/main/java/at/gv/util/xsd/w3c_xmldsig/SPKIDataType.java b/src/main/java/at/gv/util/xsd/w3c_xmldsig/SPKIDataType.java
index 3e7a6f7..2f127cb 100644
--- a/src/main/java/at/gv/util/xsd/w3c_xmldsig/SPKIDataType.java
+++ b/src/main/java/at/gv/util/xsd/w3c_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 byte[]}{@code >}
* {@link Element }
- * {@link Object }
*
*
*/
diff --git a/src/main/java/at/gv/util/xsd/w3c_xmldsig/SignatureMethodType.java b/src/main/java/at/gv/util/xsd/w3c_xmldsig/SignatureMethodType.java
index 5f1cf91..6010677 100644
--- a/src/main/java/at/gv/util/xsd/w3c_xmldsig/SignatureMethodType.java
+++ b/src/main/java/at/gv/util/xsd/w3c_xmldsig/SignatureMethodType.java
@@ -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/w3c_xmldsig/SignaturePropertyType.java b/src/main/java/at/gv/util/xsd/w3c_xmldsig/SignaturePropertyType.java
index 71614cf..0aab37a 100644
--- a/src/main/java/at/gv/util/xsd/w3c_xmldsig/SignaturePropertyType.java
+++ b/src/main/java/at/gv/util/xsd/w3c_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 Object }
*
*
*/
diff --git a/src/main/java/at/gv/util/xsd/w3c_xmldsig/TransformType.java b/src/main/java/at/gv/util/xsd/w3c_xmldsig/TransformType.java
index bcf0b35..0f061e0 100644
--- a/src/main/java/at/gv/util/xsd/w3c_xmldsig/TransformType.java
+++ b/src/main/java/at/gv/util/xsd/w3c_xmldsig/TransformType.java
@@ -68,10 +68,10 @@ public class TransformType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link String }
- * {@link Element }
* {@link JAXBElement }{@code <}{@link String }{@code >}
* {@link Object }
+ * {@link String }
+ * {@link Element }
*
*
*/
diff --git a/src/main/java/at/gv/util/xsd/w3c_xmldsig/X509DataType.java b/src/main/java/at/gv/util/xsd/w3c_xmldsig/X509DataType.java
index 9077b3c..078ab82 100644
--- a/src/main/java/at/gv/util/xsd/w3c_xmldsig/X509DataType.java
+++ b/src/main/java/at/gv/util/xsd/w3c_xmldsig/X509DataType.java
@@ -47,9 +47,9 @@ public class X509DataType {
@XmlElementRefs({
@XmlElementRef(name = "X509SubjectName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+ @XmlElementRef(name = "X509IssuerSerial", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
@XmlElementRef(name = "X509SKI", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
@XmlElementRef(name = "X509Certificate", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "X509IssuerSerial", 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)
})
@XmlAnyElement(lax = true)
@@ -74,11 +74,11 @@ public class X509DataType {
* <p>
* Objects of the following type(s) are allowed in the list
* {@link JAXBElement }{@code <}{@link String }{@code >}
- * {@link Element }
- * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+ * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}
* {@link Object }
* {@link JAXBElement }{@code <}{@link byte[]}{@code >}
- * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}
+ * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+ * {@link Element }
* {@link JAXBElement }{@code <}{@link byte[]}{@code >}
*
*