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/KeyValueType.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/KeyValueType.java')
| -rw-r--r-- | id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/KeyValueType.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/KeyValueType.java b/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/KeyValueType.java index 73cf64902..a4b394877 100644 --- a/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/KeyValueType.java +++ b/id/server/idserverlib/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 = "DSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "RSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) + @XmlElementRef(name = "RSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), + @XmlElementRef(name = "DSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) }) @XmlMixed @XmlAnyElement(lax = true) @@ -67,10 +67,10 @@ public class KeyValueType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >} * {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >} - * {@link Object } * {@link String } + * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >} + * {@link Object } * {@link Element } * * |