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/PGPDataType.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/PGPDataType.java')
-rw-r--r-- | id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/PGPDataType.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/PGPDataType.java b/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/PGPDataType.java index fb215030e..bcf41f9d3 100644 --- a/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/PGPDataType.java +++ b/id/server/idserverlib/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 = "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; |