diff options
| author | Florian Reimair <florian.reimair@iaik.tugraz.at> | 2014-01-31 17:15:01 +0100 |
|---|---|---|
| committer | Florian Reimair <florian.reimair@iaik.tugraz.at> | 2014-01-31 17:15:13 +0100 |
| commit | 830929713b75d4cd712f1fb8a05f0ccb728f54f2 (patch) | |
| tree | 4d4b4e7cc6147e7212884ea25db0d3f04bae4452 /id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/X509DataType.java | |
| parent | 04a2d507dfcf59dac15e542e391797e57a820c82 (diff) | |
| parent | d8bc160b455fd8b9edc01fc054d74d06f2399cab (diff) | |
| download | moa-id-spss-830929713b75d4cd712f1fb8a05f0ccb728f54f2.tar.gz moa-id-spss-830929713b75d4cd712f1fb8a05f0ccb728f54f2.tar.bz2 moa-id-spss-830929713b75d4cd712f1fb8a05f0ccb728f54f2.zip | |
Merge tlenz into HEAD
Diffstat (limited to 'id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/X509DataType.java')
| -rw-r--r-- | id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/X509DataType.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/X509DataType.java b/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/X509DataType.java index 9d1ec2cd1..5c3ee0dfe 100644 --- a/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/X509DataType.java +++ b/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/X509DataType.java @@ -47,10 +47,10 @@ public class X509DataType { @XmlElementRefs({ @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), - @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 = "X509SubjectName", 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) }) @XmlAnyElement(lax = true) protected List<Object> x509IssuerSerialOrX509SKIOrX509SubjectName; @@ -73,13 +73,13 @@ public class X509DataType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >} * {@link JAXBElement }{@code <}{@link String }{@code >} - * {@link Object } * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >} * {@link JAXBElement }{@code <}{@link String }{@code >} * {@link JAXBElement }{@code <}{@link String }{@code >} * {@link Element } + * {@link Object } * * */ |