aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Fitzek <andreas.fitzek@iaik.tugraz.at>2014-09-02 13:45:12 +0200
committerAndreas Fitzek <andreas.fitzek@iaik.tugraz.at>2014-09-02 13:45:12 +0200
commit0b26e046f9cb41f7f327ea366ccfdabfd5e72df0 (patch)
tree7fc37497d7689c1d17838f16e7794784c98ae5b3
parentf6680bd0a6f06a653d1c5621dca4fd36b8b060f4 (diff)
downloadpdf-as-4-0b26e046f9cb41f7f327ea366ccfdabfd5e72df0.tar.gz
pdf-as-4-0b26e046f9cb41f7f327ea366ccfdabfd5e72df0.tar.bz2
pdf-as-4-0b26e046f9cb41f7f327ea366ccfdabfd5e72df0.zip
XMLElementRef Annotation Java 1.6 compatible
-rw-r--r--pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/KeyInfoType.java14
-rw-r--r--pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/PGPDataType.java4
-rw-r--r--pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ReferencesCheckResultInfoType.java2
-rw-r--r--pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/X509DataType.java10
4 files changed, 15 insertions, 15 deletions
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/KeyInfoType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/KeyInfoType.java
index 26ae8c38..65b749be 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/KeyInfoType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/KeyInfoType.java
@@ -83,13 +83,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 = "SPKIData", 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 = "KeyValue", 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 = "KeyName", 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),
+ @XmlElementRef(name = "SPKIData", 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 = "KeyValue", 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 = "KeyName", 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)
})
@XmlMixed
@XmlAnyElement(lax = true)
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/PGPDataType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/PGPDataType.java
index 63f025f8..6a33f3f8 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/PGPDataType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/PGPDataType.java
@@ -77,8 +77,8 @@ import org.w3c.dom.Element;
public class PGPDataType {
@XmlElementRefs({
- @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)
+ @XmlElementRef(name = "PGPKeyID", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
+ @XmlElementRef(name = "PGPKeyPacket", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class)
})
@XmlAnyElement(lax = true)
protected List<Object> content;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ReferencesCheckResultInfoType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ReferencesCheckResultInfoType.java
index 231c559d..53847b71 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ReferencesCheckResultInfoType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/ReferencesCheckResultInfoType.java
@@ -70,7 +70,7 @@ import org.w3c.dom.Element;
})
public class ReferencesCheckResultInfoType {
- @XmlElementRef(name = "FailedReference", namespace = "http://www.buergerkarte.at/namespaces/securitylayer/1.2#", type = JAXBElement.class, required = false)
+ @XmlElementRef(name = "FailedReference", namespace = "http://www.buergerkarte.at/namespaces/securitylayer/1.2#", type = JAXBElement.class)
@XmlMixed
@XmlAnyElement(lax = true)
protected List<Object> content;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/X509DataType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/X509DataType.java
index 881a6b3c..d377fb74 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/X509DataType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/X509DataType.java
@@ -76,11 +76,11 @@ import org.w3c.dom.Element;
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 = "X509Certificate", 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, required = false)
+ @XmlElementRef(name = "X509SubjectName", 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 = "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 = "X509CRL", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class)
})
@XmlAnyElement(lax = true)
protected List<Object> x509IssuerSerialOrX509SKIOrX509SubjectName;