aboutsummaryrefslogtreecommitdiff
path: root/pdf-as-moa
diff options
context:
space:
mode:
Diffstat (limited to 'pdf-as-moa')
-rw-r--r--pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/AnyChildrenType.java4
-rw-r--r--pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/VerifyCMSSignatureResponseType.java6
-rw-r--r--pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/MOAFault.java2
-rw-r--r--pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureCreationPortType.java2
-rw-r--r--pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureCreationService.java2
-rw-r--r--pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureVerificationPortType.java2
-rw-r--r--pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureVerificationService.java2
-rw-r--r--pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/CanonicalizationMethodType.java2
-rw-r--r--pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/DigestMethodType.java4
-rw-r--r--pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/KeyInfoType.java16
-rw-r--r--pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/KeyValueType.java8
-rw-r--r--pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java60
-rw-r--r--pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectType.java4
-rw-r--r--pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/PGPDataType.java6
-rw-r--r--pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/SignatureMethodType.java4
-rw-r--r--pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/SignaturePropertyType.java4
-rw-r--r--pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/TransformType.java4
-rw-r--r--pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/X509DataType.java10
-rw-r--r--pdf-as-moa/src/main/java/at/gv/egiz/pdfas/moa/MOAConnector.java4
-rw-r--r--pdf-as-moa/src/main/java/at/gv/egiz/pdfas/moa/MOAVerifier.java2
20 files changed, 74 insertions, 74 deletions
diff --git a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/AnyChildrenType.java b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/AnyChildrenType.java
index a7ce868d..5304f283 100644
--- a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/AnyChildrenType.java
+++ b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/AnyChildrenType.java
@@ -64,9 +64,9 @@ public class AnyChildrenType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Element }
- * {@link String }
* {@link Object }
+ * {@link String }
+ * {@link Element }
*
*
*/
diff --git a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/VerifyCMSSignatureResponseType.java b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/VerifyCMSSignatureResponseType.java
index 0a370d28..405805b7 100644
--- a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/VerifyCMSSignatureResponseType.java
+++ b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/VerifyCMSSignatureResponseType.java
@@ -40,9 +40,9 @@ import org.w3._2000._09.xmldsig.KeyInfoType;
public class VerifyCMSSignatureResponseType {
@XmlElementRefs({
+ @XmlElementRef(name = "SignerInfo", namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", type = JAXBElement.class),
@XmlElementRef(name = "SignatureCheck", namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", type = JAXBElement.class),
- @XmlElementRef(name = "CertificateCheck", namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", type = JAXBElement.class),
- @XmlElementRef(name = "SignerInfo", namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", type = JAXBElement.class)
+ @XmlElementRef(name = "CertificateCheck", namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", type = JAXBElement.class)
})
protected List<JAXBElement<?>> signerInfoAndSignatureCheckAndCertificateCheck;
@@ -64,9 +64,9 @@ public class VerifyCMSSignatureResponseType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link JAXBElement }{@code <}{@link CheckResultType }{@code >}
* {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >}
* {@link JAXBElement }{@code <}{@link CheckResultType }{@code >}
+ * {@link JAXBElement }{@code <}{@link CheckResultType }{@code >}
*
*
*/
diff --git a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/MOAFault.java b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/MOAFault.java
index 69cef510..0add2565 100644
--- a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/MOAFault.java
+++ b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/MOAFault.java
@@ -6,7 +6,7 @@ import javax.xml.ws.WebFault;
/**
* This class was generated by Apache CXF 3.0.1
- * 2014-10-21T07:59:06.684+02:00
+ * 2014-11-28T08:32:27.729+01:00
* Generated source version: 3.0.1
*/
diff --git a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureCreationPortType.java b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureCreationPortType.java
index 8cb5ad50..e682e0d6 100644
--- a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureCreationPortType.java
+++ b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureCreationPortType.java
@@ -9,7 +9,7 @@ import javax.xml.bind.annotation.XmlSeeAlso;
/**
* This class was generated by Apache CXF 3.0.1
- * 2014-10-21T07:59:06.696+02:00
+ * 2014-11-28T08:32:27.738+01:00
* Generated source version: 3.0.1
*
*/
diff --git a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureCreationService.java b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureCreationService.java
index 09a0e99d..c88833e5 100644
--- a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureCreationService.java
+++ b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureCreationService.java
@@ -9,7 +9,7 @@ import javax.xml.ws.Service;
/**
* This class was generated by Apache CXF 3.0.1
- * 2014-10-21T07:59:06.741+02:00
+ * 2014-11-28T08:32:27.775+01:00
* Generated source version: 3.0.1
*
*/
diff --git a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureVerificationPortType.java b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureVerificationPortType.java
index 050caf76..446276c6 100644
--- a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureVerificationPortType.java
+++ b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureVerificationPortType.java
@@ -9,7 +9,7 @@ import javax.xml.bind.annotation.XmlSeeAlso;
/**
* This class was generated by Apache CXF 3.0.1
- * 2014-10-21T07:59:06.733+02:00
+ * 2014-11-28T08:32:27.767+01:00
* Generated source version: 3.0.1
*
*/
diff --git a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureVerificationService.java b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureVerificationService.java
index 4d847f29..c242d913 100644
--- a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureVerificationService.java
+++ b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureVerificationService.java
@@ -9,7 +9,7 @@ import javax.xml.ws.Service;
/**
* This class was generated by Apache CXF 3.0.1
- * 2014-10-21T07:59:06.766+02:00
+ * 2014-11-28T08:32:27.797+01:00
* Generated source version: 3.0.1
*
*/
diff --git a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/CanonicalizationMethodType.java b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/CanonicalizationMethodType.java
index 6bdfca52..9ff1650b 100644
--- a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/CanonicalizationMethodType.java
+++ b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/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/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/DigestMethodType.java b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/DigestMethodType.java
index 64ce9a83..7ecc4eeb 100644
--- a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/DigestMethodType.java
+++ b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/DigestMethodType.java
@@ -64,9 +64,9 @@ public class DigestMethodType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Element }
- * {@link String }
* {@link Object }
+ * {@link String }
+ * {@link Element }
*
*
*/
diff --git a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/KeyInfoType.java b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/KeyInfoType.java
index b45024fc..2ed8d404 100644
--- a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/KeyInfoType.java
+++ b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/KeyInfoType.java
@@ -53,12 +53,12 @@ import org.w3c.dom.Element;
public class KeyInfoType {
@XmlElementRefs({
- @XmlElementRef(name = "RetrievalMethod", 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 = "MgmtData", 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 = "KeyName", 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 = "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),
@XmlElementRef(name = "KeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class)
})
@XmlMixed
@@ -88,14 +88,14 @@ public class KeyInfoType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}
- * {@link Object }
- * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}
+ * {@link String }
* {@link JAXBElement }{@code <}{@link String }{@code >}
* {@link JAXBElement }{@code <}{@link X509DataType }{@code >}
- * {@link JAXBElement }{@code <}{@link String }{@code >}
- * {@link String }
+ * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}
* {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}
+ * {@link JAXBElement }{@code <}{@link String }{@code >}
+ * {@link Object }
+ * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}
* {@link Element }
* {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}
*
diff --git a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/KeyValueType.java b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/KeyValueType.java
index f995991b..94431007 100644
--- a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/KeyValueType.java
+++ b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/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),
- @XmlElementRef(name = "RSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class)
+ @XmlElementRef(name = "RSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
+ @XmlElementRef(name = "DSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class)
})
@XmlMixed
@XmlAnyElement(lax = true)
@@ -67,10 +67,10 @@ public class KeyValueType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link String }
* {@link Object }
- * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}
+ * {@link String }
* {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}
+ * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}
* {@link Element }
*
*
diff --git a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java
index 29ed3692..f15b501f 100644
--- a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java
+++ b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java
@@ -49,15 +49,15 @@ public class ObjectFactory {
private final static QName _KeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyValue");
private final static QName _Reference_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Reference");
private final static QName _RSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RSAKeyValue");
+ private final static QName _PGPDataTypePGPKeyID_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyID");
+ private final static QName _PGPDataTypePGPKeyPacket_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyPacket");
+ private final static QName _SPKIDataTypeSPKISexp_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKISexp");
private final static QName _SignatureMethodTypeHMACOutputLength_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "HMACOutputLength");
private final static QName _X509DataTypeX509IssuerSerial_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509IssuerSerial");
private final static QName _X509DataTypeX509Certificate_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Certificate");
private final static QName _X509DataTypeX509SKI_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SKI");
private final static QName _X509DataTypeX509SubjectName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SubjectName");
private final static QName _X509DataTypeX509CRL_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509CRL");
- private final static QName _SPKIDataTypeSPKISexp_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKISexp");
- private final static QName _PGPDataTypePGPKeyID_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyID");
- private final static QName _PGPDataTypePGPKeyPacket_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyPacket");
private final static QName _TransformTypeXPath_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "XPath");
/**
@@ -460,6 +460,33 @@ public class ObjectFactory {
}
/**
+ * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyID", scope = PGPDataType.class)
+ public JAXBElement<byte[]> createPGPDataTypePGPKeyID(byte[] value) {
+ return new JAXBElement<byte[]>(_PGPDataTypePGPKeyID_QNAME, byte[].class, PGPDataType.class, ((byte[]) value));
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyPacket", scope = PGPDataType.class)
+ public JAXBElement<byte[]> createPGPDataTypePGPKeyPacket(byte[] value) {
+ return new JAXBElement<byte[]>(_PGPDataTypePGPKeyPacket_QNAME, byte[].class, PGPDataType.class, ((byte[]) value));
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKISexp", scope = SPKIDataType.class)
+ public JAXBElement<byte[]> createSPKIDataTypeSPKISexp(byte[] value) {
+ return new JAXBElement<byte[]>(_SPKIDataTypeSPKISexp_QNAME, byte[].class, SPKIDataType.class, ((byte[]) value));
+ }
+
+ /**
* Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}}
*
*/
@@ -514,33 +541,6 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKISexp", scope = SPKIDataType.class)
- public JAXBElement<byte[]> createSPKIDataTypeSPKISexp(byte[] value) {
- return new JAXBElement<byte[]>(_SPKIDataTypeSPKISexp_QNAME, byte[].class, SPKIDataType.class, ((byte[]) value));
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyID", scope = PGPDataType.class)
- public JAXBElement<byte[]> createPGPDataTypePGPKeyID(byte[] value) {
- return new JAXBElement<byte[]>(_PGPDataTypePGPKeyID_QNAME, byte[].class, PGPDataType.class, ((byte[]) value));
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyPacket", scope = PGPDataType.class)
- public JAXBElement<byte[]> createPGPDataTypePGPKeyPacket(byte[] value) {
- return new JAXBElement<byte[]>(_PGPDataTypePGPKeyPacket_QNAME, byte[].class, PGPDataType.class, ((byte[]) value));
- }
-
- /**
* Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
*
*/
diff --git a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectType.java b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectType.java
index 358ee9d5..3de8892c 100644
--- a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectType.java
+++ b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectType.java
@@ -76,9 +76,9 @@ public class ObjectType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Element }
- * {@link String }
* {@link Object }
+ * {@link String }
+ * {@link Element }
*
*
*/
diff --git a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/PGPDataType.java b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/PGPDataType.java
index 013db7d0..5a9025e4 100644
--- a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/PGPDataType.java
+++ b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/PGPDataType.java
@@ -59,8 +59,8 @@ public class PGPDataType {
* <p>
* You are getting this "catch-all" property because of the following reason:
* The field name "PGPKeyPacket" is used by two different parts of a schema. See:
- * line 0 of http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd
- * line 0 of http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd
+ * line 218 of file:/home/afitzek/devel/pdf-as-4/src/pdf-as-4/pdf-as-moa/src/main/resources/wsdl/xmldsig-core-schema.xsd
+ * line 213 of file:/home/afitzek/devel/pdf-as-4/src/pdf-as-4/pdf-as-moa/src/main/resources/wsdl/xmldsig-core-schema.xsd
* <p>
* To get rid of this property, apply a property customization to one
* of both of the following declarations to change their names:
@@ -81,9 +81,9 @@ public class PGPDataType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
* {@link Object }
* {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+ * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
* {@link Element }
*
*
diff --git a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/SignatureMethodType.java b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/SignatureMethodType.java
index 08944fd5..045718ac 100644
--- a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/SignatureMethodType.java
+++ b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/SignatureMethodType.java
@@ -68,9 +68,9 @@ public class SignatureMethodType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
- * {@link String }
* {@link Object }
+ * {@link String }
+ * {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
*
*
*/
diff --git a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/SignaturePropertyType.java b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/SignaturePropertyType.java
index 4e84715e..ecfbdb1f 100644
--- a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/SignaturePropertyType.java
+++ b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/SignaturePropertyType.java
@@ -73,9 +73,9 @@ public class SignaturePropertyType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Element }
- * {@link String }
* {@link Object }
+ * {@link String }
+ * {@link Element }
*
*
*/
diff --git a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/TransformType.java b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/TransformType.java
index 0f631ea6..6d55d9ef 100644
--- a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/TransformType.java
+++ b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/TransformType.java
@@ -68,10 +68,10 @@ public class TransformType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Element }
- * {@link String }
* {@link Object }
* {@link JAXBElement }{@code <}{@link String }{@code >}
+ * {@link String }
+ * {@link Element }
*
*
*/
diff --git a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/X509DataType.java b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/X509DataType.java
index cecbef03..b56b5bd1 100644
--- a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/X509DataType.java
+++ b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/X509DataType.java
@@ -47,10 +47,10 @@ public class X509DataType {
@XmlElementRefs({
@XmlElementRef(name = "X509CRL", 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 = "X509SubjectName", 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 = "X509IssuerSerial", 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 = "X509Certificate", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class)
})
@XmlAnyElement(lax = true)
protected List<Object> x509IssuerSerialOrX509SKIOrX509SubjectName;
@@ -73,11 +73,11 @@ public class X509DataType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Object }
* {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+ * {@link JAXBElement }{@code <}{@link String }{@code >}
* {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}
+ * {@link Object }
* {@link JAXBElement }{@code <}{@link byte[]}{@code >}
- * {@link JAXBElement }{@code <}{@link String }{@code >}
* {@link JAXBElement }{@code <}{@link byte[]}{@code >}
* {@link Element }
*
diff --git a/pdf-as-moa/src/main/java/at/gv/egiz/pdfas/moa/MOAConnector.java b/pdf-as-moa/src/main/java/at/gv/egiz/pdfas/moa/MOAConnector.java
index 212e4116..5f3d9cb8 100644
--- a/pdf-as-moa/src/main/java/at/gv/egiz/pdfas/moa/MOAConnector.java
+++ b/pdf-as-moa/src/main/java/at/gv/egiz/pdfas/moa/MOAConnector.java
@@ -131,7 +131,7 @@ public class MOAConnector implements ISignatureConnector,
this.certificate = new X509Certificate(
certificateURL.openStream());
} catch (MalformedURLException e) {
- logger.error(certificateValue + " is not a valid url but!");
+ logger.error(certificateValue + " is not a valid url but starts with http!");
throw new PdfAsWrappedIOException(new PdfAsException(
certificateValue + " is not a valid url but!"));
}
@@ -210,7 +210,7 @@ public class MOAConnector implements ISignatureConnector,
try {
response = creationPort.createCMSSignature(request);
} catch (MOAFault e) {
- logger.error("MOA signing failed!", e);
+ logger.warn("MOA signing failed!", e);
if (e.getFaultInfo() != null) {
throw new PdfAsMOAException(e.getFaultInfo().getErrorCode()
.toString(), e.getFaultInfo().getInfo(), "", "");
diff --git a/pdf-as-moa/src/main/java/at/gv/egiz/pdfas/moa/MOAVerifier.java b/pdf-as-moa/src/main/java/at/gv/egiz/pdfas/moa/MOAVerifier.java
index 45f9a223..1dc63e0b 100644
--- a/pdf-as-moa/src/main/java/at/gv/egiz/pdfas/moa/MOAVerifier.java
+++ b/pdf-as-moa/src/main/java/at/gv/egiz/pdfas/moa/MOAVerifier.java
@@ -177,7 +177,7 @@ public class MOAVerifier implements IVerifier {
}
resultList.add(result);
} catch (Throwable e) {
- logger.error("Verification failed", e);
+ logger.warn("Verification failed", e);
throw new PdfAsException("error.pdf.verify.02", e);
}
return resultList;