aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbschnalzer <bianca.schnalzer@egiz.gv.at>2017-08-09 13:56:12 +0200
committerbschnalzer <bianca.schnalzer@egiz.gv.at>2017-08-09 13:56:14 +0200
commit7fe464cc98d714179b907c142bdd2fabfd009aa3 (patch)
tree328c53a9b60dfa1106c6b9d930d75ab127dce33f
parent17be060a4d2d79ee75036a2f785d4a4913f7935f (diff)
downloadpdf-as-4-7fe464cc98d714179b907c142bdd2fabfd009aa3.tar.gz
pdf-as-4-7fe464cc98d714179b907c142bdd2fabfd009aa3.tar.bz2
pdf-as-4-7fe464cc98d714179b907c142bdd2fabfd009aa3.zip
Fixed problem with PAdES Signatures, removed some attributes from CAdES signatures which are not required, minor bug fixes, implemented new style (lineCenter)4.1.1-RC
-rw-r--r--.gitignore1
-rw-r--r--build.gradle2
-rw-r--r--cpycommands.txt2
-rw-r--r--pdf-as-common/src/main/java/at/gv/egiz/pdfas/api/ws/PDFASSignParameters.java4
-rw-r--r--pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/DefaultSignatureProfileSettings.java4
-rw-r--r--pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/IProfileConstants.java2
-rw-r--r--pdf-as-lib/libs/iaik_jce_full.jarbin1129729 -> 1283803 bytes
-rw-r--r--pdf-as-lib/src/configuration/cfg/config.properties7
-rw-r--r--pdf-as-lib/src/configuration/cfg/profiles/BASE_NORMAL.properties4
-rw-r--r--pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/IConfigurationConstants.java16
-rw-r--r--pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/configuration/PlaceholderConfiguration.java42
-rw-r--r--pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/placeholder/PlaceholderFilter.java34
-rw-r--r--pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/settings/Settings.java1
-rw-r--r--pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateCMSSignatureRequestType.java37
-rw-r--r--pdf-as-lib/src/main/java/at/gv/egiz/sl/util/BKUSLConnector.java9
-rw-r--r--pdf-as-lib/src/main/java/at/gv/egiz/sl/util/BaseSLConnector.java71
-rw-r--r--pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/table/Style.java13
-rw-r--r--pdf-as-lib/src/main/resources/config/config.zipbin1276538 -> 1276506 bytes
-rw-r--r--pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/AnyChildrenType.java6
-rw-r--r--pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/CheckResultType.java4
-rw-r--r--pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/ContentOptionalRefType.java4
-rw-r--r--pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/CreateCMSSignatureRequestType.java32
-rw-r--r--pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/CreateXMLSignatureResponseType.java4
-rw-r--r--pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/ObjectFactory.java314
-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.java20
-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.java20
-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/DigestMethodType.java2
-rw-r--r--pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/KeyInfoType.java22
-rw-r--r--pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/KeyValueType.java6
-rw-r--r--pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java406
-rw-r--r--pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectType.java2
-rw-r--r--pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/PGPDataType.java12
-rw-r--r--pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/SPKIDataType.java4
-rw-r--r--pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/SignaturePropertyType.java2
-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.java28
-rw-r--r--pdf-as-moa/src/main/resources/wsdl/MOA-SPSS-1.5.2.xsd1
-rw-r--r--pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/pdfbox2/placeholder/SignaturePlaceholderExtractor.java1
-rw-r--r--pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/pdfbox2/PADESPDFBOXSigner.java1
-rw-r--r--pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/pdfbox2/TableDrawUtils.java102
-rw-r--r--pdf-as-web/src/main/configuration/pdf-as-web.properties2
-rw-r--r--pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/WebConfiguration.java26
-rw-r--r--schemas/MOA-SPSS-1.5.2.xsd1
-rw-r--r--signature-standards/sigs-pades/src/main/java/at/gv/egiz/pdfas/sigs/pades/PAdESSignerKeystore.java37
49 files changed, 846 insertions, 488 deletions
diff --git a/.gitignore b/.gitignore
index 21d31a35..d61b2cb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,4 @@ local.properties
# PDT-specific
.buildpath
+/PDF-AS/.nb-gradle/ \ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 6f2257d6..39c78b3b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ task wrapper(type: Wrapper) {
allprojects {
apply plugin: 'com.github.ben-manes.versions'
repositories { mavenCentral() }
- version = '4.1.1-SNAPSHOT'
+ version = '4.1.1-RC'
}
configurations {
diff --git a/cpycommands.txt b/cpycommands.txt
index 51d138d4..4b0ee0d7 100644
--- a/cpycommands.txt
+++ b/cpycommands.txt
@@ -8,4 +8,4 @@
./davcpy.sh releases/. https://joinup.ec.europa.eu/webdav/pdf-as/www/releases
-./davcpy.sh doc/. https://joinup.ec.europa.eu/webdav/pdf-as/www/4_0_0_RC9/ \ No newline at end of file
+./davcpy.sh doc/. https://joinup.ec.europa.eu/webdav/pdf-as/www/4_1_1_RC1/ \ No newline at end of file
diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/api/ws/PDFASSignParameters.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/api/ws/PDFASSignParameters.java
index 650e34d6..35c057a3 100644
--- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/api/ws/PDFASSignParameters.java
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/api/ws/PDFASSignParameters.java
@@ -23,6 +23,10 @@
******************************************************************************/
package at.gv.egiz.pdfas.api.ws;
+import at.gv.egiz.pdfas.common.settings.SignatureProfileSettings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.Serializable;
import javax.xml.bind.annotation.XmlElement;
diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/DefaultSignatureProfileSettings.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/DefaultSignatureProfileSettings.java
index f5293935..6f1519a4 100644
--- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/DefaultSignatureProfileSettings.java
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/DefaultSignatureProfileSettings.java
@@ -64,8 +64,9 @@ public class DefaultSignatureProfileSettings {
public static final String VALUE_SIG_META_DEFAULT = "Informationen zur Pr\u00FCfung der elektronischen Signatur finden Sie unter: https://www.signaturpruefung.gv.at\n\nInformationen zur Pr\u00FCfung des Ausdrucks finden Sie unter: https://www.behoerde.gv.at/el_signatur/";
public static final String VALUE_SIG_DATE_DEFAULT = "yyyy-MM-dd'T'HH:mm:ssXXX";
-
+
static {
+
profileSettings.put(KEY_SIG_SUBJECT, new SignatureProfileEntry(KEY_SIG_SUBJECT, KEY_SIG_SUBJECT_DEFAULT, VALUE_SIG_SUBJECT_DEFAULT) );
profileSettings.put(KEY_SIG_ISSUER, new SignatureProfileEntry(KEY_SIG_ISSUER, KEY_SIG_ISSUER_DEFAULT, VALUE_SIG_ISSUER_DEFAULT) );
profileSettings.put(KEY_SIG_NUMBER, new SignatureProfileEntry(KEY_SIG_NUMBER, KEY_SIG_NUMBER_DEFAULT, VALUE_SIG_NUMBER_DEFAULT) );
@@ -73,6 +74,7 @@ public class DefaultSignatureProfileSettings {
profileSettings.put(KEY_SIG_ID, new SignatureProfileEntry(KEY_SIG_ID, KEY_SIG_ID_DEFAULT, VALUE_SIG_ID_DEFAULT) );
profileSettings.put(KEY_SIG_META, new SignatureProfileEntry(KEY_SIG_META, KEY_SIG_META_DEFAULT, VALUE_SIG_META_DEFAULT) );
profileSettings.put(KEY_SIG_DATE, new SignatureProfileEntry(KEY_SIG_DATE, KEY_SIG_DATE_DEFAULT, VALUE_SIG_DATE_DEFAULT) );
+
}
public static Map<String, SignatureProfileEntry> getDefaultValues() {
diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/IProfileConstants.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/IProfileConstants.java
index 2a248cbe..df1f4682 100644
--- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/IProfileConstants.java
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/IProfileConstants.java
@@ -94,5 +94,5 @@ public interface IProfileConstants {
public final static String SIG_PDFA1B_VALID = "SIG_PDFA1B_VALID";
public final static String SIG_PDFA_VALID = "SIG_PDFA_VALID";
public final static String SIG_PDFUA_FORCE = "SIG_PDFUA_FORCE";
-
+
}
diff --git a/pdf-as-lib/libs/iaik_jce_full.jar b/pdf-as-lib/libs/iaik_jce_full.jar
index 18cb0a0b..ec92882e 100644
--- a/pdf-as-lib/libs/iaik_jce_full.jar
+++ b/pdf-as-lib/libs/iaik_jce_full.jar
Binary files differ
diff --git a/pdf-as-lib/src/configuration/cfg/config.properties b/pdf-as-lib/src/configuration/cfg/config.properties
index a5275aff..f9eaeb98 100644
--- a/pdf-as-lib/src/configuration/cfg/config.properties
+++ b/pdf-as-lib/src/configuration/cfg/config.properties
@@ -26,10 +26,6 @@ bku.sign.url=http://127.0.0.1:3495/http-security-layer-request
# Verifikation
bku.verify.url=http://127.0.0.1:3495/http-security-layer-request
-##
-# Online BKU (MOCCA)
-# Signatur
-moc.sign.url=http://127.0.0.1:8080/bkuonline/http-security-layer-request
##
# Handy-Signatur
@@ -104,4 +100,5 @@ include.01 = profiles/*.properties
#include.22 = profiles/justizsignatur.properties
# Legt das Standard-Signaturprofil fest
-sig_obj.type.default=SIGNATURBLOCK_SMALL_DE
+sig_obj.type.default=SIGNATURBLOCK_SMALL_DE_NOTE
+
diff --git a/pdf-as-lib/src/configuration/cfg/profiles/BASE_NORMAL.properties b/pdf-as-lib/src/configuration/cfg/profiles/BASE_NORMAL.properties
index b85fc381..36304b66 100644
--- a/pdf-as-lib/src/configuration/cfg/profiles/BASE_NORMAL.properties
+++ b/pdf-as-lib/src/configuration/cfg/profiles/BASE_NORMAL.properties
@@ -82,9 +82,9 @@ sig_obj.BASE_NORMAL.table.main.Style.border=0.1
## Horizontale Ausrichtung der Eintraege im Signaturblock.
#
# sig_obj.PROFILE.table.TABLE_NAME.Style.halign=[left|center|right]
-# sig_obj.PROFILE.table.TABLE_NAME.Style.valuehalign=[left|center|right]
+# sig_obj.PROFILE.table.TABLE_NAME.Style.valuehalign=[left|lineCenter|center|right]
# sig_obj.PROFILE.table.TABLE_NAME.Style.imagehalign=[left|center|right]
-sig_obj.BASE_NORMAL.table.main.Style.halign=center
+sig_obj.BASE_NORMAL.table.main.Style.halign=right
## Vertikale Ausrichtung der Eintraege im Signaturblock.
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/IConfigurationConstants.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/IConfigurationConstants.java
index 14aca130..364acb44 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/IConfigurationConstants.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/IConfigurationConstants.java
@@ -50,15 +50,10 @@ public interface IConfigurationConstants {
public static final String PLACEHOLDER_SEARCH_ENABLED = "enable_placeholder_search";
public static final String DEFAULT_SIGNATURE_PROFILE = SIG_OBJECT + SEPERATOR + TYPE + SEPERATOR + DEFAULT;
-
+
public static final String CONFIG_BKU_URL = "bku.sign.url";
/**
- * Signature object Prefix
- */
- public static final String SIG_OBJECT_PREFIX = "sig_obj.";
-
- /**
* MOA SS Signing Key Identifier
*/
public static final String MOA_SS_KEY_IDENTIFIER = "moa.sign.KeyIdentifier";
@@ -103,10 +98,17 @@ public interface IConfigurationConstants {
* Signature object Prefix
*/
public static final String SIG_RESERVED_SIZE = "signatureSize";
-
+
/**
* Visual Signature placement
*/
public static final String BG_COLOR_DETECTION = "sigblock.placement.bgcolor.detection.enabled";
public static final String SIG_PLACEMENT_DEBUG_OUTPUT = "sigblock.placement.debug.file";
+
+
+ /**
+ * PADES Constants
+ */
+ public static final String SIG_PADES_FORCE_FLAG= SIG_OBJECT + SEPERATOR+"PAdESCompatibility";
+ public static final String SIG_PADES_INTELL_FLAG = SIG_OBJECT + SEPERATOR+"CheckPAdESCompatibility";
}
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/configuration/PlaceholderConfiguration.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/configuration/PlaceholderConfiguration.java
index ec030388..6e91e808 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/configuration/PlaceholderConfiguration.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/configuration/PlaceholderConfiguration.java
@@ -24,7 +24,23 @@
package at.gv.egiz.pdfas.lib.impl.configuration;
import at.gv.egiz.pdfas.common.settings.ISettings;
+import at.gv.egiz.pdfas.common.settings.Profiles;
+import at.gv.egiz.pdfas.common.settings.SignatureProfileSettings;
+import at.gv.egiz.pdfas.lib.api.Configuration;
import at.gv.egiz.pdfas.lib.api.IConfigurationConstants;
+import at.gv.egiz.pdfas.lib.api.PdfAs;
+import at.gv.egiz.pdfas.lib.impl.PdfAsImpl;
+import at.gv.egiz.pdfas.lib.impl.PdfAsParameterImpl;
+import at.gv.egiz.pdfas.lib.impl.placeholder.SignaturePlaceholderData;
+import at.gv.egiz.pdfas.lib.impl.status.OperationStatus;
+import at.gv.egiz.pdfas.lib.settings.Settings;
+import at.gv.egiz.pdfas.lib.util.SignatureUtils;
+import at.gv.egiz.pdfas.lib.api.PdfAs;
+import com.sun.corba.se.spi.orb.Operation;
+
+import java.security.Signature;
+import java.util.Properties;
+
public class PlaceholderConfiguration extends SpecificBaseConfiguration
implements IConfigurationConstants {
@@ -34,13 +50,33 @@ public class PlaceholderConfiguration extends SpecificBaseConfiguration
}
public boolean isGlobalPlaceholderEnabled() {
- if(configuration.hasValue(PLACEHOLDER_SEARCH_ENABLED)) {
+ if (configuration.hasValue(PLACEHOLDER_SEARCH_ENABLED)) {
String value = configuration.getValue(PLACEHOLDER_SEARCH_ENABLED);
- if(value.equalsIgnoreCase(TRUE)) {
+ if (value.equalsIgnoreCase(TRUE)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+
+ /**
+ * Match selected Profile for Placeholder
+ * Enables to activate placeholder search/match for different profiles
+ * @return
+ */
+ public boolean isProfileConfigurationEnabled(String selectedProfileID)
+ {
+ String profileMatch = SIG_OBJECT+SEPERATOR+selectedProfileID+SEPERATOR+PLACEHOLDER_SEARCH_ENABLED;
+ if (configuration.hasValue(profileMatch)) {
+ String value = configuration.getValue(profileMatch);
+ if (value.equalsIgnoreCase(TRUE)) {
return true;
}
}
return false;
}
-
}
+
+
+
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/placeholder/PlaceholderFilter.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/placeholder/PlaceholderFilter.java
index 19ea496d..9906fd6a 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/placeholder/PlaceholderFilter.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/placeholder/PlaceholderFilter.java
@@ -63,7 +63,35 @@ public class PlaceholderFilter implements IConfigurationConstants,
.extract(status.getPdfObject(), placeholderID, placeholderMode);
return signaturePlaceholderData;
- }
+ } else
+ //filter for local placeholder in selected profiles
+ if (status.getPlaceholderConfiguration().isProfileConfigurationEnabled(status.getRequestedSignature().getSignatureProfileID())) {
+ PlaceholderExtractor extractor = status.getBackend()
+ .getPlaceholderExtractor();
+ String placeholderID = settings.getValue(PLACEHOLDER_ID);
+ String placeholderModeString = settings.getValue(PLACEHOLDER_MODE);
+ int placeholderMode = PLACEHOLDER_MATCH_MODE_MODERATE;
+ if (placeholderModeString != null) {
+ try {
+ placeholderMode = Integer.parseInt(placeholderModeString);
+
+ if (placeholderMode < PLACEHOLDER_MODE_MIN
+ || placeholderMode > PLACEHOLDER_MODE_MAX) {
+ throw new PdfAsErrorCarrier(new PDFASError(
+ PDFASError.ERROR_INVALID_PLACEHOLDER_MODE));
+ }
+ } catch (NumberFormatException e) {
+ throw new PdfAsErrorCarrier(new PDFASError(
+ PDFASError.ERROR_INVALID_PLACEHOLDER_MODE, e));
+ }
+ }
+ SignaturePlaceholderData signaturePlaceholderData = extractor
+ .extract(status.getPdfObject(), placeholderID, placeholderMode);
+
+ return signaturePlaceholderData;
+
+
+
+ }
return null;
- }
-}
+ }} \ No newline at end of file
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/settings/Settings.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/settings/Settings.java
index c5879783..c5b6dc57 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/settings/Settings.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/settings/Settings.java
@@ -399,6 +399,7 @@ public class Settings implements ISettings, IProfileConstants {
while (keyIterator.hasNext()) {
String key = keyIterator.next().toString();
+
if (key.startsWith(prefix)) {
valueMap.put(key, props.getProperty(key));
}
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateCMSSignatureRequestType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateCMSSignatureRequestType.java
index cbfb1f53..5d565d9d 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateCMSSignatureRequestType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/CreateCMSSignatureRequestType.java
@@ -31,6 +31,8 @@
package at.gv.egiz.sl.schema;
+import com.sun.org.apache.xpath.internal.operations.Bool;
+
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
@@ -82,14 +84,17 @@ public class CreateCMSSignatureRequestType {
protected CMSDataObjectRequiredMetaType dataObject;
@XmlAttribute(name = "Structure", required = true)
protected String structure;
+ //PAdES Signatures
+ @XmlAttribute(name = "PAdESCompatibility", required = false)
+ private Boolean PAdESFlag;
/**
* Gets the value of the keyboxIdentifier property.
- *
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getKeyboxIdentifier() {
return keyboxIdentifier;
@@ -97,11 +102,11 @@ public class CreateCMSSignatureRequestType {
/**
* Sets the value of the keyboxIdentifier property.
- *
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setKeyboxIdentifier(String value) {
this.keyboxIdentifier = value;
@@ -109,11 +114,11 @@ public class CreateCMSSignatureRequestType {
/**
* Gets the value of the dataObject property.
- *
+ *
* @return
* possible object is
* {@link CMSDataObjectRequiredMetaType }
- *
+ *
*/
public CMSDataObjectRequiredMetaType getDataObject() {
return dataObject;
@@ -121,11 +126,11 @@ public class CreateCMSSignatureRequestType {
/**
* Sets the value of the dataObject property.
- *
+ *
* @param value
* allowed object is
* {@link CMSDataObjectRequiredMetaType }
- *
+ *
*/
public void setDataObject(CMSDataObjectRequiredMetaType value) {
this.dataObject = value;
@@ -133,11 +138,11 @@ public class CreateCMSSignatureRequestType {
/**
* Gets the value of the structure property.
- *
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getStructure() {
return structure;
@@ -145,14 +150,22 @@ public class CreateCMSSignatureRequestType {
/**
* Sets the value of the structure property.
- *
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setStructure(String value) {
this.structure = value;
}
+
+ public Boolean getPAdESFlag() {
+ return PAdESFlag;
+ }
+
+ public void setPAdESFlag(Boolean PAdESFlag) {
+ this.PAdESFlag = PAdESFlag;
+ }
}
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/BKUSLConnector.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/BKUSLConnector.java
index 6383b89b..4a32390b 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/BKUSLConnector.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/BKUSLConnector.java
@@ -164,14 +164,23 @@ public class BKUSLConnector extends BaseSLConnector {
BKUHeader hdr = new BKUHeader(headers[i].getName(),
headers[i].getValue());
logger.debug("Response Header : {}", hdr.toString());
+ if (hdr.toString().contains("Server"))
+ {
+ BaseSLConnector.responseHeader=hdr.toString();
+ }
+
holder.getProcessInfo().add(hdr);
+
}
+
}
BKUHeader hdr = new BKUHeader(
ErrorConstants.STATUS_INFO_SIGDEVICE, SIGNATURE_DEVICE);
logger.debug("Response Header : {}", hdr.toString());
+
holder.getProcessInfo().add(hdr);
+
}
BufferedReader rd = new BufferedReader(new InputStreamReader(
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/BaseSLConnector.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/BaseSLConnector.java
index d6c21672..46857249 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/BaseSLConnector.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/BaseSLConnector.java
@@ -24,6 +24,9 @@
package at.gv.egiz.sl.util;
import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -58,6 +61,11 @@ public abstract class BaseSLConnector implements ISLConnector,
public static final String XMLREQUEST = "XMLRequest";
+ public static final String WHITELIST_VERSION_ENABLED = "whitelistVersion.enabled";
+ public static final String WHITELIST_VALUE_PRE = "whiteListVersions";
+ private static List<String> whiteListregEx = new ArrayList<String>();
+ public static String responseHeader;
+
protected ObjectFactory of = new ObjectFactory();
public InfoboxReadRequestType createInfoboxReadRequest(
@@ -92,7 +100,6 @@ public abstract class BaseSLConnector implements ISLConnector,
logger.info("Exclude Byte Range: " + exclude_range[0] + " "
+ exclude_range[1]);
- // == MetaInfoType
MetaInfoType metaInfoType = new MetaInfoType();
metaInfoType.setMimeType(PDF_MIME_TYPE);
@@ -122,12 +129,74 @@ public abstract class BaseSLConnector implements ISLConnector,
}
// == CreateCMSSignatureRequestType
+
CreateCMSSignatureRequestType request = new CreateCMSSignatureRequestType();
request.setKeyboxIdentifier(SecureSignatureKeypair);
request.setDataObject(cmsDataObjectRequiredMetaType);
request.setStructure(DETACHED);
+
+
+ //whiteListregEx.add("1.2 MOCCA");
+ if (parameter.getConfiguration().hasValue(IConfigurationConstants.SIG_PADES_FORCE_FLAG))
+ {
+ if (IConfigurationConstants.TRUE.equalsIgnoreCase(parameter.getConfiguration().getValue(IConfigurationConstants.SIG_PADES_FORCE_FLAG)))
+ {
+ request.setPAdESFlag(true);
+ }
+ }
+ else
+ if (parameter.getConfiguration().hasValue(IConfigurationConstants.SIG_PADES_INTELL_FLAG)){
+ if (IConfigurationConstants.TRUE.equalsIgnoreCase(parameter.getConfiguration().getValue(IConfigurationConstants.SIG_PADES_INTELL_FLAG)))
+ {
+ boolean intellFlag=isProvidePdfVersionInWhitelist(responseHeader, parameter);
+
+ if (intellFlag)
+ {
+ request.setPAdESFlag(true);
+ }
+ }}
+
pack.setRequestType(request);
return pack;
}
+
+
+ public static boolean isWhiteListEnabled(SignParameter parameter) {
+
+ boolean whiteListConfig = parameter.getConfiguration().hasValue(WHITELIST_VERSION_ENABLED);
+ if (whiteListConfig)
+ {
+ String value = parameter.getConfiguration().getValue(WHITELIST_VERSION_ENABLED);
+
+ if (value != null) {
+ if (value.equals("true")) {
+ whiteListregEx.add(parameter.getConfiguration().getValue(WHITELIST_VALUE_PRE));
+ return true;
+ }
+ }}
+ return false;
+
+ }
+
+ public static synchronized boolean isProvidePdfVersionInWhitelist(String bkuVersionInformation, SignParameter parameter) {
+ if (isWhiteListEnabled(parameter)) {
+
+ Iterator<String> patterns = whiteListregEx.iterator();
+ while (patterns.hasNext()) {
+ String pattern = patterns.next();
+ try {
+ if (bkuVersionInformation.contains(pattern)) {
+ return true;
+ }
+ //TODO: extend with BlackList
+
+ } catch (Throwable e) {
+ logger.warn("Error in matching regex: " + pattern, e);
+ }
+ }
+ return false;
+ }
+ return true;
+ }
}
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/table/Style.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/table/Style.java
index 2dded8ae..a3af957d 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/table/Style.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/table/Style.java
@@ -74,7 +74,12 @@ public class Style implements Serializable {
* SVUID.
*/
private static final long serialVersionUID = 5855722896712428387L;
-
+
+ /**
+ * New Style to set each line centered
+ */
+ public final static String LINECENTER = "lineCenter";
+
/**
* valign statement key top
*/
@@ -275,6 +280,7 @@ public class Style implements Serializable {
}
}
}
+
if (HALIGN.equals(id)) {
if (LEFT.equals(value) || CENTER.equals(value) || RIGHT.equals(value)) {
hAlign_ = value;
@@ -285,8 +291,9 @@ public class Style implements Serializable {
vAlign_ = value;
}
}
+ //Set new align for horziontal valign of lineCenter
if (VALUEHALIGN.equals(id)) {
- if (LEFT.equals(value) || CENTER.equals(value) || RIGHT.equals(value)) {
+ if (LEFT.equals(value) || CENTER.equals(value) || RIGHT.equals(value)||LINECENTER.equals(value)) {
valueHAlign_ = value;
}
}
@@ -509,7 +516,7 @@ public class Style implements Serializable {
* The toString method, used for tests or debugging.
*/
public String toString() {
- return "bgcolor:" + getBgColor() + " halign:" + getHAlign() + " valign:" + getVAlign() + " padding:" + getPadding() + " border:" + getBorder() + " font:" + getFont() + " valuefont:" + getValueFont() + " imageScaleToFit:" + getImageScaleToFit();
+ return "bgcolor:" + getBgColor() + " halign:" + getHAlign() + " valueAlign:" + getValueHAlign()+ " valign:" + getVAlign() + " padding:" + getPadding() + " border:" + getBorder() + " font:" + getFont() + " valuefont:" + getValueFont() + " imageScaleToFit:" + getImageScaleToFit();
}
/**
diff --git a/pdf-as-lib/src/main/resources/config/config.zip b/pdf-as-lib/src/main/resources/config/config.zip
index 3a750a26..2b699d54 100644
--- a/pdf-as-lib/src/main/resources/config/config.zip
+++ b/pdf-as-lib/src/main/resources/config/config.zip
Binary files differ
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 5304f283..a0acc4b0 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
@@ -36,9 +36,9 @@ import org.w3c.dom.Element;
"content"
})
@XmlSeeAlso({
- ReferencesCheckResultInfoType.class,
+ ManifestRefsCheckResultInfoType.class,
XMLContentType.class,
- ManifestRefsCheckResultInfoType.class
+ ReferencesCheckResultInfoType.class
})
public class AnyChildrenType {
@@ -64,9 +64,9 @@ public class AnyChildrenType {
*
* <p>
* Objects of the following type(s) are allowed in the list
+ * {@link Element }
* {@link Object }
* {@link String }
- * {@link Element }
*
*
*/
diff --git a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/CheckResultType.java b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/CheckResultType.java
index 266cf4c8..cfcf48d5 100644
--- a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/CheckResultType.java
+++ b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/CheckResultType.java
@@ -36,8 +36,8 @@ import javax.xml.bind.annotation.XmlType;
"info"
})
@XmlSeeAlso({
- ManifestRefsCheckResultType.class,
- ReferencesCheckResultType.class
+ ReferencesCheckResultType.class,
+ ManifestRefsCheckResultType.class
})
public class CheckResultType {
diff --git a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/ContentOptionalRefType.java b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/ContentOptionalRefType.java
index 13195f92..608cc97c 100644
--- a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/ContentOptionalRefType.java
+++ b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/ContentOptionalRefType.java
@@ -29,9 +29,9 @@ import javax.xml.bind.annotation.XmlType;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "ContentOptionalRefType")
@XmlSeeAlso({
+ at.gv.e_government.reference.namespace.moa._20020822.DataObjectInfoType.DataObject.class,
CMSContentBaseType.class,
- ContentRequiredRefType.class,
- at.gv.e_government.reference.namespace.moa._20020822.DataObjectInfoType.DataObject.class
+ ContentRequiredRefType.class
})
public class ContentOptionalRefType
extends ContentBaseType
diff --git a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/CreateCMSSignatureRequestType.java b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/CreateCMSSignatureRequestType.java
index 554d097d..92afe7a5 100644
--- a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/CreateCMSSignatureRequestType.java
+++ b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/CreateCMSSignatureRequestType.java
@@ -37,6 +37,7 @@ import javax.xml.bind.annotation.XmlType;
* &lt;/element>
* &lt;/sequence>
* &lt;attribute name="SecurityLayerConformity" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
+ * &lt;attribute name="PAdESConformity" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
@@ -138,6 +139,7 @@ public class CreateCMSSignatureRequestType {
* &lt;/element>
* &lt;/sequence>
* &lt;attribute name="SecurityLayerConformity" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
+ * &lt;attribute name="PAdESConformity" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
@@ -155,6 +157,8 @@ public class CreateCMSSignatureRequestType {
protected CreateCMSSignatureRequestType.SingleSignatureInfo.DataObjectInfo dataObjectInfo;
@XmlAttribute(name = "SecurityLayerConformity")
protected Boolean securityLayerConformity;
+ @XmlAttribute(name = "PAdESConformity")
+ protected Boolean pAdESConformity;
/**
* Gets the value of the dataObjectInfo property.
@@ -208,6 +212,34 @@ public class CreateCMSSignatureRequestType {
this.securityLayerConformity = value;
}
+ /**
+ * Gets the value of the pAdESConformity property.
+ *
+ * @return
+ * possible object is
+ * {@link Boolean }
+ *
+ */
+ public boolean isPAdESConformity() {
+ if (pAdESConformity == null) {
+ return false;
+ } else {
+ return pAdESConformity;
+ }
+ }
+
+ /**
+ * Sets the value of the pAdESConformity property.
+ *
+ * @param value
+ * allowed object is
+ * {@link Boolean }
+ *
+ */
+ public void setPAdESConformity(Boolean value) {
+ this.pAdESConformity = value;
+ }
+
/**
* <p>Java class for anonymous complex type.
diff --git a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/CreateXMLSignatureResponseType.java b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/CreateXMLSignatureResponseType.java
index b0084406..5c313107 100644
--- a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/CreateXMLSignatureResponseType.java
+++ b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/CreateXMLSignatureResponseType.java
@@ -118,8 +118,8 @@ public class CreateXMLSignatureResponseType {
*
* @return
* possible object is
- * {@link Object }
* {@link Element }
+ * {@link Object }
*
*/
public Object getAny() {
@@ -131,8 +131,8 @@ public class CreateXMLSignatureResponseType {
*
* @param value
* allowed object is
- * {@link Object }
* {@link Element }
+ * {@link Object }
*
*/
public void setAny(Object value) {
diff --git a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/ObjectFactory.java b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/ObjectFactory.java
index b3ef1238..0b8b066e 100644
--- a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/ObjectFactory.java
+++ b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/ObjectFactory.java
@@ -27,19 +27,19 @@ import org.w3._2000._09.xmldsig.KeyInfoType;
@XmlRegistry
public class ObjectFactory {
- private final static QName _CreateXMLSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "CreateXMLSignatureResponse");
private final static QName _IssuingCountry_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "IssuingCountry");
+ private final static QName _PublicAuthority_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "PublicAuthority");
+ private final static QName _VerifyXMLSignatureRequest_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "VerifyXMLSignatureRequest");
private final static QName _VerifyCMSSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "VerifyCMSSignatureResponse");
private final static QName _CreateCMSSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "CreateCMSSignatureResponse");
- private final static QName _SupplementProfile_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "SupplementProfile");
- private final static QName _VerifyXMLSignatureRequest_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "VerifyXMLSignatureRequest");
- private final static QName _PublicAuthority_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "PublicAuthority");
- private final static QName _ErrorResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "ErrorResponse");
- private final static QName _VerifyXMLSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "VerifyXMLSignatureResponse");
private final static QName _Supplement_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "Supplement");
+ private final static QName _VerifyXMLSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "VerifyXMLSignatureResponse");
+ private final static QName _ErrorResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "ErrorResponse");
+ private final static QName _CreateXMLSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "CreateXMLSignatureResponse");
+ private final static QName _SupplementProfile_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "SupplementProfile");
+ private final static QName _VerifyCMSSignatureResponseTypeSignatureCheck_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "SignatureCheck");
private final static QName _VerifyCMSSignatureResponseTypeCertificateCheck_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "CertificateCheck");
private final static QName _VerifyCMSSignatureResponseTypeSignerInfo_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "SignerInfo");
- private final static QName _VerifyCMSSignatureResponseTypeSignatureCheck_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "SignatureCheck");
/**
* Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.gv.e_government.reference.namespace.moa._20020822
@@ -97,11 +97,11 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link CreateXMLSignatureResponseType }
+ * Create an instance of {@link CreateXMLSignatureRequestType.SingleSignatureInfo }
*
*/
- public CreateXMLSignatureResponseType createCreateXMLSignatureResponseType() {
- return new CreateXMLSignatureResponseType();
+ public CreateXMLSignatureRequestType.SingleSignatureInfo createCreateXMLSignatureRequestTypeSingleSignatureInfo() {
+ return new CreateXMLSignatureRequestType.SingleSignatureInfo();
}
/**
@@ -113,27 +113,51 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link CreateXMLSignatureRequestType.SingleSignatureInfo }
+ * Create an instance of {@link CreateXMLSignatureResponseType }
*
*/
- public CreateXMLSignatureRequestType.SingleSignatureInfo createCreateXMLSignatureRequestTypeSingleSignatureInfo() {
- return new CreateXMLSignatureRequestType.SingleSignatureInfo();
+ public CreateXMLSignatureResponseType createCreateXMLSignatureResponseType() {
+ return new CreateXMLSignatureResponseType();
}
/**
- * Create an instance of {@link VerifyXMLSignatureResponseType }
+ * Create an instance of {@link QualifiedCertificate }
*
*/
- public VerifyXMLSignatureResponseType createVerifyXMLSignatureResponseType() {
- return new VerifyXMLSignatureResponseType();
+ public QualifiedCertificate createQualifiedCertificate() {
+ return new QualifiedCertificate();
}
/**
- * Create an instance of {@link PublicAuthorityType }
+ * Create an instance of {@link XMLDataObjectAssociationType }
*
*/
- public PublicAuthorityType createPublicAuthorityType() {
- return new PublicAuthorityType();
+ public XMLDataObjectAssociationType createXMLDataObjectAssociationType() {
+ return new XMLDataObjectAssociationType();
+ }
+
+ /**
+ * Create an instance of {@link CreateCMSSignatureResponseType }
+ *
+ */
+ public CreateCMSSignatureResponseType createCreateCMSSignatureResponseType() {
+ return new CreateCMSSignatureResponseType();
+ }
+
+ /**
+ * Create an instance of {@link CreateTransformsInfoProfile }
+ *
+ */
+ public CreateTransformsInfoProfile createCreateTransformsInfoProfile() {
+ return new CreateTransformsInfoProfile();
+ }
+
+ /**
+ * Create an instance of {@link TransformsInfoType }
+ *
+ */
+ public TransformsInfoType createTransformsInfoType() {
+ return new TransformsInfoType();
}
/**
@@ -161,27 +185,19 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link XMLDataObjectAssociationType }
- *
- */
- public XMLDataObjectAssociationType createXMLDataObjectAssociationType() {
- return new XMLDataObjectAssociationType();
- }
-
- /**
- * Create an instance of {@link QualifiedCertificate }
+ * Create an instance of {@link VerifyCMSSignatureResponseType }
*
*/
- public QualifiedCertificate createQualifiedCertificate() {
- return new QualifiedCertificate();
+ public VerifyCMSSignatureResponseType createVerifyCMSSignatureResponseType() {
+ return new VerifyCMSSignatureResponseType();
}
/**
- * Create an instance of {@link CreateXMLSignatureRequest }
+ * Create an instance of {@link SecureSignatureCreationDevice }
*
*/
- public CreateXMLSignatureRequest createCreateXMLSignatureRequest() {
- return new CreateXMLSignatureRequest();
+ public SecureSignatureCreationDevice createSecureSignatureCreationDevice() {
+ return new SecureSignatureCreationDevice();
}
/**
@@ -193,19 +209,19 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link CreateCMSSignatureRequest }
+ * Create an instance of {@link ErrorResponseType }
*
*/
- public CreateCMSSignatureRequest createCreateCMSSignatureRequest() {
- return new CreateCMSSignatureRequest();
+ public ErrorResponseType createErrorResponseType() {
+ return new ErrorResponseType();
}
/**
- * Create an instance of {@link ErrorResponseType }
+ * Create an instance of {@link VerifyXMLSignatureResponseType }
*
*/
- public ErrorResponseType createErrorResponseType() {
- return new ErrorResponseType();
+ public VerifyXMLSignatureResponseType createVerifyXMLSignatureResponseType() {
+ return new VerifyXMLSignatureResponseType();
}
/**
@@ -225,75 +241,51 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link CreateCMSSignatureResponseType }
- *
- */
- public CreateCMSSignatureResponseType createCreateCMSSignatureResponseType() {
- return new CreateCMSSignatureResponseType();
- }
-
- /**
- * Create an instance of {@link SecureSignatureCreationDevice }
- *
- */
- public SecureSignatureCreationDevice createSecureSignatureCreationDevice() {
- return new SecureSignatureCreationDevice();
- }
-
- /**
- * Create an instance of {@link VerifyCMSSignatureResponseType }
- *
- */
- public VerifyCMSSignatureResponseType createVerifyCMSSignatureResponseType() {
- return new VerifyCMSSignatureResponseType();
- }
-
- /**
- * Create an instance of {@link CreateTransformsInfoProfile }
+ * Create an instance of {@link CreateXMLSignatureRequest }
*
*/
- public CreateTransformsInfoProfile createCreateTransformsInfoProfile() {
- return new CreateTransformsInfoProfile();
+ public CreateXMLSignatureRequest createCreateXMLSignatureRequest() {
+ return new CreateXMLSignatureRequest();
}
/**
- * Create an instance of {@link TransformsInfoType }
+ * Create an instance of {@link CreateCMSSignatureRequest }
*
*/
- public TransformsInfoType createTransformsInfoType() {
- return new TransformsInfoType();
+ public CreateCMSSignatureRequest createCreateCMSSignatureRequest() {
+ return new CreateCMSSignatureRequest();
}
/**
- * Create an instance of {@link CMSContentBaseType }
+ * Create an instance of {@link PublicAuthorityType }
*
*/
- public CMSContentBaseType createCMSContentBaseType() {
- return new CMSContentBaseType();
+ public PublicAuthorityType createPublicAuthorityType() {
+ return new PublicAuthorityType();
}
/**
- * Create an instance of {@link ManifestRefsCheckResultType }
+ * Create an instance of {@link CheckResultType }
*
*/
- public ManifestRefsCheckResultType createManifestRefsCheckResultType() {
- return new ManifestRefsCheckResultType();
+ public CheckResultType createCheckResultType() {
+ return new CheckResultType();
}
/**
- * Create an instance of {@link InputDataType }
+ * Create an instance of {@link ManifestRefsCheckResultInfoType }
*
*/
- public InputDataType createInputDataType() {
- return new InputDataType();
+ public ManifestRefsCheckResultInfoType createManifestRefsCheckResultInfoType() {
+ return new ManifestRefsCheckResultInfoType();
}
/**
- * Create an instance of {@link CheckResultType }
+ * Create an instance of {@link XMLContentType }
*
*/
- public CheckResultType createCheckResultType() {
- return new CheckResultType();
+ public XMLContentType createXMLContentType() {
+ return new XMLContentType();
}
/**
@@ -305,19 +297,11 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link FinalDataMetaInfoType }
- *
- */
- public FinalDataMetaInfoType createFinalDataMetaInfoType() {
- return new FinalDataMetaInfoType();
- }
-
- /**
- * Create an instance of {@link ReferencesCheckResultInfoType }
+ * Create an instance of {@link VerifyTransformsDataType }
*
*/
- public ReferencesCheckResultInfoType createReferencesCheckResultInfoType() {
- return new ReferencesCheckResultInfoType();
+ public VerifyTransformsDataType createVerifyTransformsDataType() {
+ return new VerifyTransformsDataType();
}
/**
@@ -329,11 +313,11 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link XMLContentType }
+ * Create an instance of {@link FinalDataMetaInfoType }
*
*/
- public XMLContentType createXMLContentType() {
- return new XMLContentType();
+ public FinalDataMetaInfoType createFinalDataMetaInfoType() {
+ return new FinalDataMetaInfoType();
}
/**
@@ -345,6 +329,14 @@ public class ObjectFactory {
}
/**
+ * Create an instance of {@link InputDataType }
+ *
+ */
+ public InputDataType createInputDataType() {
+ return new InputDataType();
+ }
+
+ /**
* Create an instance of {@link ContentExLocRefBaseType }
*
*/
@@ -361,27 +353,35 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link ReferencesCheckResultType }
+ * Create an instance of {@link ContentOptionalRefType }
*
*/
- public ReferencesCheckResultType createReferencesCheckResultType() {
- return new ReferencesCheckResultType();
+ public ContentOptionalRefType createContentOptionalRefType() {
+ return new ContentOptionalRefType();
}
/**
- * Create an instance of {@link ManifestRefsCheckResultInfoType }
+ * Create an instance of {@link CMSContentBaseType }
*
*/
- public ManifestRefsCheckResultInfoType createManifestRefsCheckResultInfoType() {
- return new ManifestRefsCheckResultInfoType();
+ public CMSContentBaseType createCMSContentBaseType() {
+ return new CMSContentBaseType();
}
/**
- * Create an instance of {@link VerifyTransformsDataType }
+ * Create an instance of {@link ReferencesCheckResultInfoType }
*
*/
- public VerifyTransformsDataType createVerifyTransformsDataType() {
- return new VerifyTransformsDataType();
+ public ReferencesCheckResultInfoType createReferencesCheckResultInfoType() {
+ return new ReferencesCheckResultInfoType();
+ }
+
+ /**
+ * Create an instance of {@link ReferencesCheckResultType }
+ *
+ */
+ public ReferencesCheckResultType createReferencesCheckResultType() {
+ return new ReferencesCheckResultType();
}
/**
@@ -393,11 +393,11 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link ContentOptionalRefType }
+ * Create an instance of {@link ManifestRefsCheckResultType }
*
*/
- public ContentOptionalRefType createContentOptionalRefType() {
- return new ContentOptionalRefType();
+ public ManifestRefsCheckResultType createManifestRefsCheckResultType() {
+ return new ManifestRefsCheckResultType();
}
/**
@@ -441,11 +441,19 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link CreateXMLSignatureResponseType.SignatureEnvironment }
+ * Create an instance of {@link CreateXMLSignatureRequestType.SingleSignatureInfo.DataObjectInfo }
*
*/
- public CreateXMLSignatureResponseType.SignatureEnvironment createCreateXMLSignatureResponseTypeSignatureEnvironment() {
- return new CreateXMLSignatureResponseType.SignatureEnvironment();
+ public CreateXMLSignatureRequestType.SingleSignatureInfo.DataObjectInfo createCreateXMLSignatureRequestTypeSingleSignatureInfoDataObjectInfo() {
+ return new CreateXMLSignatureRequestType.SingleSignatureInfo.DataObjectInfo();
+ }
+
+ /**
+ * Create an instance of {@link CreateXMLSignatureRequestType.SingleSignatureInfo.CreateSignatureInfo }
+ *
+ */
+ public CreateXMLSignatureRequestType.SingleSignatureInfo.CreateSignatureInfo createCreateXMLSignatureRequestTypeSingleSignatureInfoCreateSignatureInfo() {
+ return new CreateXMLSignatureRequestType.SingleSignatureInfo.CreateSignatureInfo();
}
/**
@@ -457,38 +465,39 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link CreateXMLSignatureRequestType.SingleSignatureInfo.DataObjectInfo }
+ * Create an instance of {@link CreateXMLSignatureResponseType.SignatureEnvironment }
*
*/
- public CreateXMLSignatureRequestType.SingleSignatureInfo.DataObjectInfo createCreateXMLSignatureRequestTypeSingleSignatureInfoDataObjectInfo() {
- return new CreateXMLSignatureRequestType.SingleSignatureInfo.DataObjectInfo();
+ public CreateXMLSignatureResponseType.SignatureEnvironment createCreateXMLSignatureResponseTypeSignatureEnvironment() {
+ return new CreateXMLSignatureResponseType.SignatureEnvironment();
}
/**
- * Create an instance of {@link CreateXMLSignatureRequestType.SingleSignatureInfo.CreateSignatureInfo }
+ * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
*
*/
- public CreateXMLSignatureRequestType.SingleSignatureInfo.CreateSignatureInfo createCreateXMLSignatureRequestTypeSingleSignatureInfoCreateSignatureInfo() {
- return new CreateXMLSignatureRequestType.SingleSignatureInfo.CreateSignatureInfo();
+ @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "IssuingCountry")
+ @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+ public JAXBElement<String> createIssuingCountry(String value) {
+ return new JAXBElement<String>(_IssuingCountry_QNAME, String.class, null, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link CreateXMLSignatureResponseType }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link PublicAuthorityType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "CreateXMLSignatureResponse")
- public JAXBElement<CreateXMLSignatureResponseType> createCreateXMLSignatureResponse(CreateXMLSignatureResponseType value) {
- return new JAXBElement<CreateXMLSignatureResponseType>(_CreateXMLSignatureResponse_QNAME, CreateXMLSignatureResponseType.class, null, value);
+ @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "PublicAuthority")
+ public JAXBElement<PublicAuthorityType> createPublicAuthority(PublicAuthorityType value) {
+ return new JAXBElement<PublicAuthorityType>(_PublicAuthority_QNAME, PublicAuthorityType.class, null, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link VerifyXMLSignatureRequestType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "IssuingCountry")
- @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
- public JAXBElement<String> createIssuingCountry(String value) {
- return new JAXBElement<String>(_IssuingCountry_QNAME, String.class, null, value);
+ @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "VerifyXMLSignatureRequest")
+ public JAXBElement<VerifyXMLSignatureRequestType> createVerifyXMLSignatureRequest(VerifyXMLSignatureRequestType value) {
+ return new JAXBElement<VerifyXMLSignatureRequestType>(_VerifyXMLSignatureRequest_QNAME, VerifyXMLSignatureRequestType.class, null, value);
}
/**
@@ -513,27 +522,18 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link XMLDataObjectAssociationType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "SupplementProfile")
- public JAXBElement<XMLDataObjectAssociationType> createSupplementProfile(XMLDataObjectAssociationType value) {
- return new JAXBElement<XMLDataObjectAssociationType>(_SupplementProfile_QNAME, XMLDataObjectAssociationType.class, null, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link VerifyXMLSignatureRequestType }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "VerifyXMLSignatureRequest")
- public JAXBElement<VerifyXMLSignatureRequestType> createVerifyXMLSignatureRequest(VerifyXMLSignatureRequestType value) {
- return new JAXBElement<VerifyXMLSignatureRequestType>(_VerifyXMLSignatureRequest_QNAME, VerifyXMLSignatureRequestType.class, null, value);
+ @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "Supplement")
+ public JAXBElement<XMLDataObjectAssociationType> createSupplement(XMLDataObjectAssociationType value) {
+ return new JAXBElement<XMLDataObjectAssociationType>(_Supplement_QNAME, XMLDataObjectAssociationType.class, null, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link PublicAuthorityType }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link VerifyXMLSignatureResponseType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "PublicAuthority")
- public JAXBElement<PublicAuthorityType> createPublicAuthority(PublicAuthorityType value) {
- return new JAXBElement<PublicAuthorityType>(_PublicAuthority_QNAME, PublicAuthorityType.class, null, value);
+ @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "VerifyXMLSignatureResponse")
+ public JAXBElement<VerifyXMLSignatureResponseType> createVerifyXMLSignatureResponse(VerifyXMLSignatureResponseType value) {
+ return new JAXBElement<VerifyXMLSignatureResponseType>(_VerifyXMLSignatureResponse_QNAME, VerifyXMLSignatureResponseType.class, null, value);
}
/**
@@ -546,21 +546,30 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link VerifyXMLSignatureResponseType }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link CreateXMLSignatureResponseType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "VerifyXMLSignatureResponse")
- public JAXBElement<VerifyXMLSignatureResponseType> createVerifyXMLSignatureResponse(VerifyXMLSignatureResponseType value) {
- return new JAXBElement<VerifyXMLSignatureResponseType>(_VerifyXMLSignatureResponse_QNAME, VerifyXMLSignatureResponseType.class, null, value);
+ @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "CreateXMLSignatureResponse")
+ public JAXBElement<CreateXMLSignatureResponseType> createCreateXMLSignatureResponse(CreateXMLSignatureResponseType value) {
+ return new JAXBElement<CreateXMLSignatureResponseType>(_CreateXMLSignatureResponse_QNAME, CreateXMLSignatureResponseType.class, null, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link XMLDataObjectAssociationType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "Supplement")
- public JAXBElement<XMLDataObjectAssociationType> createSupplement(XMLDataObjectAssociationType value) {
- return new JAXBElement<XMLDataObjectAssociationType>(_Supplement_QNAME, XMLDataObjectAssociationType.class, null, value);
+ @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "SupplementProfile")
+ public JAXBElement<XMLDataObjectAssociationType> createSupplementProfile(XMLDataObjectAssociationType value) {
+ return new JAXBElement<XMLDataObjectAssociationType>(_SupplementProfile_QNAME, XMLDataObjectAssociationType.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link CheckResultType }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "SignatureCheck", scope = VerifyCMSSignatureResponseType.class)
+ public JAXBElement<CheckResultType> createVerifyCMSSignatureResponseTypeSignatureCheck(CheckResultType value) {
+ return new JAXBElement<CheckResultType>(_VerifyCMSSignatureResponseTypeSignatureCheck_QNAME, CheckResultType.class, VerifyCMSSignatureResponseType.class, value);
}
/**
@@ -581,13 +590,4 @@ public class ObjectFactory {
return new JAXBElement<KeyInfoType>(_VerifyCMSSignatureResponseTypeSignerInfo_QNAME, KeyInfoType.class, VerifyCMSSignatureResponseType.class, value);
}
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CheckResultType }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "SignatureCheck", scope = VerifyCMSSignatureResponseType.class)
- public JAXBElement<CheckResultType> createVerifyCMSSignatureResponseTypeSignatureCheck(CheckResultType value) {
- return new JAXBElement<CheckResultType>(_VerifyCMSSignatureResponseTypeSignatureCheck_QNAME, CheckResultType.class, VerifyCMSSignatureResponseType.class, value);
- }
-
}
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 405805b7..0f3d1337 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 = "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 = "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 = "SignatureCheck", 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 KeyInfoType }{@code >}
* {@link JAXBElement }{@code <}{@link CheckResultType }{@code >}
* {@link JAXBElement }{@code <}{@link CheckResultType }{@code >}
+ * {@link JAXBElement }{@code <}{@link KeyInfoType }{@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 0add2565..1596c7df 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-11-28T08:32:27.729+01:00
+ * 2017-08-08T09:15:33.051+02: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 e682e0d6..e998392a 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,26 +9,26 @@ import javax.xml.bind.annotation.XmlSeeAlso;
/**
* This class was generated by Apache CXF 3.0.1
- * 2014-11-28T08:32:27.738+01:00
+ * 2017-08-08T09:15:33.051+02:00
* Generated source version: 3.0.1
*
*/
@WebService(targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "SignatureCreationPortType")
-@XmlSeeAlso({at.gv.e_government.reference.namespace.moa._20020822.ObjectFactory.class, org.w3._2000._09.xmldsig.ObjectFactory.class})
+@XmlSeeAlso({org.w3._2000._09.xmldsig.ObjectFactory.class, at.gv.e_government.reference.namespace.moa._20020822.ObjectFactory.class})
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
public interface SignatureCreationPortType {
- @WebResult(name = "CreateXMLSignatureResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", partName = "body")
- @WebMethod(action = "urn:CreateXMLSignatureAction")
- public at.gv.e_government.reference.namespace.moa._20020822.CreateXMLSignatureResponseType createXMLSignature(
- @WebParam(partName = "body", name = "CreateXMLSignatureRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#")
- at.gv.e_government.reference.namespace.moa._20020822.CreateXMLSignatureRequest body
- ) throws MOAFault;
-
- @WebResult(name = "CreateCMSSignatureResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", partName = "body")
@WebMethod(action = "urn:CreateCMSSignatureAction")
+ @WebResult(name = "CreateCMSSignatureResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", partName = "body")
public at.gv.e_government.reference.namespace.moa._20020822.CreateCMSSignatureResponseType createCMSSignature(
@WebParam(partName = "body", name = "CreateCMSSignatureRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#")
at.gv.e_government.reference.namespace.moa._20020822.CreateCMSSignatureRequest body
) throws MOAFault;
+
+ @WebMethod(action = "urn:CreateXMLSignatureAction")
+ @WebResult(name = "CreateXMLSignatureResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", partName = "body")
+ public at.gv.e_government.reference.namespace.moa._20020822.CreateXMLSignatureResponseType createXMLSignature(
+ @WebParam(partName = "body", name = "CreateXMLSignatureRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#")
+ at.gv.e_government.reference.namespace.moa._20020822.CreateXMLSignatureRequest body
+ ) throws MOAFault;
}
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 c88833e5..67ad0fc0 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-11-28T08:32:27.775+01:00
+ * 2017-08-08T09:15:33.082+02: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 446276c6..128044f1 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,26 +9,26 @@ import javax.xml.bind.annotation.XmlSeeAlso;
/**
* This class was generated by Apache CXF 3.0.1
- * 2014-11-28T08:32:27.767+01:00
+ * 2017-08-08T09:15:33.067+02:00
* Generated source version: 3.0.1
*
*/
@WebService(targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "SignatureVerificationPortType")
-@XmlSeeAlso({at.gv.e_government.reference.namespace.moa._20020822.ObjectFactory.class, org.w3._2000._09.xmldsig.ObjectFactory.class})
+@XmlSeeAlso({org.w3._2000._09.xmldsig.ObjectFactory.class, at.gv.e_government.reference.namespace.moa._20020822.ObjectFactory.class})
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
public interface SignatureVerificationPortType {
- @WebResult(name = "VerifyXMLSignatureResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", partName = "body")
- @WebMethod(action = "urn:VerifyXMLSignatureAction")
- public at.gv.e_government.reference.namespace.moa._20020822.VerifyXMLSignatureResponseType verifyXMLSignature(
- @WebParam(partName = "body", name = "VerifyXMLSignatureRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#")
- at.gv.e_government.reference.namespace.moa._20020822.VerifyXMLSignatureRequestType body
- ) throws MOAFault;
-
- @WebResult(name = "VerifyCMSSignatureResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", partName = "body")
@WebMethod(action = "urn:VerifyCMSSignatureAction")
+ @WebResult(name = "VerifyCMSSignatureResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", partName = "body")
public at.gv.e_government.reference.namespace.moa._20020822.VerifyCMSSignatureResponseType verifyCMSSignature(
@WebParam(partName = "body", name = "VerifyCMSSignatureRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#")
at.gv.e_government.reference.namespace.moa._20020822.VerifyCMSSignatureRequest body
) throws MOAFault;
+
+ @WebMethod(action = "urn:VerifyXMLSignatureAction")
+ @WebResult(name = "VerifyXMLSignatureResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", partName = "body")
+ public at.gv.e_government.reference.namespace.moa._20020822.VerifyXMLSignatureResponseType verifyXMLSignature(
+ @WebParam(partName = "body", name = "VerifyXMLSignatureRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#")
+ at.gv.e_government.reference.namespace.moa._20020822.VerifyXMLSignatureRequestType body
+ ) throws MOAFault;
}
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 c242d913..2de494b7 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-11-28T08:32:27.797+01:00
+ * 2017-08-08T09:15:33.098+02:00
* Generated source version: 3.0.1
*
*/
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 7ecc4eeb..75d2fa8e 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 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 2ed8d404..4c5e5d02 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,13 +53,13 @@ import org.w3c.dom.Element;
public class KeyInfoType {
@XmlElementRefs({
- @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 = "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 = "KeyValue", 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)
+ @XmlElementRef(name = "MgmtData", 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 = "SPKIData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class)
})
@XmlMixed
@XmlAnyElement(lax = true)
@@ -88,16 +88,16 @@ public class KeyInfoType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link String }
- * {@link JAXBElement }{@code <}{@link String }{@code >}
* {@link JAXBElement }{@code <}{@link X509DataType }{@code >}
- * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}
- * {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}
+ * {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}
* {@link JAXBElement }{@code <}{@link String }{@code >}
- * {@link Object }
- * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}
* {@link Element }
- * {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}
+ * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}
+ * {@link Object }
+ * {@link JAXBElement }{@code <}{@link String }{@code >}
+ * {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}
+ * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}
+ * {@link String }
*
*
*/
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 94431007..5f4adb1e 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
@@ -67,11 +67,11 @@ public class KeyValueType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Object }
- * {@link String }
* {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}
- * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}
* {@link Element }
+ * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}
+ * {@link Object }
+ * {@link String }
*
*
*/
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 f15b501f..79024471 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
@@ -25,40 +25,40 @@ import javax.xml.namespace.QName;
@XmlRegistry
public class ObjectFactory {
- private final static QName _PGPData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPData");
- private final static QName _Signature_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Signature");
- private final static QName _DSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DSAKeyValue");
private final static QName _SPKIData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKIData");
- private final static QName _SignedInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignedInfo");
- private final static QName _RetrievalMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RetrievalMethod");
- private final static QName _CanonicalizationMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "CanonicalizationMethod");
- private final static QName _Object_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Object");
- private final static QName _SignatureProperty_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperty");
- private final static QName _Transforms_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transforms");
- private final static QName _Manifest_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Manifest");
- private final static QName _SignatureValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureValue");
- private final static QName _Transform_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transform");
- private final static QName _X509Data_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Data");
- private final static QName _SignatureMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureMethod");
private final static QName _KeyInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyInfo");
+ private final static QName _SignatureValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureValue");
+ private final static QName _KeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyValue");
+ private final static QName _Transforms_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transforms");
private final static QName _DigestMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestMethod");
- private final static QName _DigestValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestValue");
+ private final static QName _X509Data_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Data");
+ private final static QName _SignatureProperty_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperty");
+ private final static QName _KeyName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyName");
+ private final static QName _RSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RSAKeyValue");
+ private final static QName _Signature_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Signature");
private final static QName _MgmtData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "MgmtData");
+ private final static QName _SignatureMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureMethod");
+ private final static QName _Object_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Object");
private final static QName _SignatureProperties_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperties");
- private final static QName _KeyName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyName");
- private final static QName _KeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyValue");
+ private final static QName _Transform_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transform");
+ private final static QName _PGPData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPData");
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 _RetrievalMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RetrievalMethod");
+ private final static QName _DSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DSAKeyValue");
+ private final static QName _DigestValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestValue");
+ private final static QName _CanonicalizationMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "CanonicalizationMethod");
+ private final static QName _SignedInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignedInfo");
+ private final static QName _Manifest_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Manifest");
+ private final static QName _SignatureMethodTypeHMACOutputLength_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "HMACOutputLength");
+ private final static QName _SPKIDataTypeSPKISexp_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKISexp");
+ private final static QName _TransformTypeXPath_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "XPath");
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 _TransformTypeXPath_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "XPath");
+ private final static QName _X509DataTypeX509SubjectName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SubjectName");
+ private final static QName _X509DataTypeX509SKI_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SKI");
+ private final static QName _X509DataTypeX509Certificate_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Certificate");
/**
* Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.w3._2000._09.xmldsig
@@ -76,19 +76,35 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link KeyInfoType }
+ * Create an instance of {@link PGPDataType }
*
*/
- public KeyInfoType createKeyInfoType() {
- return new KeyInfoType();
+ public PGPDataType createPGPDataType() {
+ return new PGPDataType();
}
/**
- * Create an instance of {@link SignedInfoType }
+ * Create an instance of {@link KeyValueType }
*
*/
- public SignedInfoType createSignedInfoType() {
- return new SignedInfoType();
+ public KeyValueType createKeyValueType() {
+ return new KeyValueType();
+ }
+
+ /**
+ * Create an instance of {@link DSAKeyValueType }
+ *
+ */
+ public DSAKeyValueType createDSAKeyValueType() {
+ return new DSAKeyValueType();
+ }
+
+ /**
+ * Create an instance of {@link ReferenceType }
+ *
+ */
+ public ReferenceType createReferenceType() {
+ return new ReferenceType();
}
/**
@@ -100,6 +116,14 @@ public class ObjectFactory {
}
/**
+ * Create an instance of {@link CanonicalizationMethodType }
+ *
+ */
+ public CanonicalizationMethodType createCanonicalizationMethodType() {
+ return new CanonicalizationMethodType();
+ }
+
+ /**
* Create an instance of {@link DigestMethodType }
*
*/
@@ -108,19 +132,19 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link SignatureMethodType }
+ * Create an instance of {@link ManifestType }
*
*/
- public SignatureMethodType createSignatureMethodType() {
- return new SignatureMethodType();
+ public ManifestType createManifestType() {
+ return new ManifestType();
}
/**
- * Create an instance of {@link SPKIDataType }
+ * Create an instance of {@link SignaturePropertyType }
*
*/
- public SPKIDataType createSPKIDataType() {
- return new SPKIDataType();
+ public SignaturePropertyType createSignaturePropertyType() {
+ return new SignaturePropertyType();
}
/**
@@ -132,223 +156,226 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link PGPDataType }
+ * Create an instance of {@link SignedInfoType }
*
*/
- public PGPDataType createPGPDataType() {
- return new PGPDataType();
+ public SignedInfoType createSignedInfoType() {
+ return new SignedInfoType();
}
/**
- * Create an instance of {@link SignatureType }
+ * Create an instance of {@link RSAKeyValueType }
*
*/
- public SignatureType createSignatureType() {
- return new SignatureType();
+ public RSAKeyValueType createRSAKeyValueType() {
+ return new RSAKeyValueType();
}
/**
- * Create an instance of {@link DSAKeyValueType }
+ * Create an instance of {@link SPKIDataType }
*
*/
- public DSAKeyValueType createDSAKeyValueType() {
- return new DSAKeyValueType();
+ public SPKIDataType createSPKIDataType() {
+ return new SPKIDataType();
}
/**
- * Create an instance of {@link ManifestType }
+ * Create an instance of {@link SignatureValueType }
*
*/
- public ManifestType createManifestType() {
- return new ManifestType();
+ public SignatureValueType createSignatureValueType() {
+ return new SignatureValueType();
}
/**
- * Create an instance of {@link SignatureValueType }
+ * Create an instance of {@link KeyInfoType }
*
*/
- public SignatureValueType createSignatureValueType() {
- return new SignatureValueType();
+ public KeyInfoType createKeyInfoType() {
+ return new KeyInfoType();
}
/**
- * Create an instance of {@link RSAKeyValueType }
+ * Create an instance of {@link SignatureType }
*
*/
- public RSAKeyValueType createRSAKeyValueType() {
- return new RSAKeyValueType();
+ public SignatureType createSignatureType() {
+ return new SignatureType();
}
/**
- * Create an instance of {@link TransformType }
+ * Create an instance of {@link SignaturePropertiesType }
*
*/
- public TransformType createTransformType() {
- return new TransformType();
+ public SignaturePropertiesType createSignaturePropertiesType() {
+ return new SignaturePropertiesType();
}
/**
- * Create an instance of {@link SignaturePropertyType }
+ * Create an instance of {@link SignatureMethodType }
*
*/
- public SignaturePropertyType createSignaturePropertyType() {
- return new SignaturePropertyType();
+ public SignatureMethodType createSignatureMethodType() {
+ return new SignatureMethodType();
}
/**
- * Create an instance of {@link KeyValueType }
+ * Create an instance of {@link ObjectType }
*
*/
- public KeyValueType createKeyValueType() {
- return new KeyValueType();
+ public ObjectType createObjectType() {
+ return new ObjectType();
}
/**
- * Create an instance of {@link ReferenceType }
+ * Create an instance of {@link TransformType }
*
*/
- public ReferenceType createReferenceType() {
- return new ReferenceType();
+ public TransformType createTransformType() {
+ return new TransformType();
}
/**
- * Create an instance of {@link CanonicalizationMethodType }
+ * Create an instance of {@link X509IssuerSerialType }
*
*/
- public CanonicalizationMethodType createCanonicalizationMethodType() {
- return new CanonicalizationMethodType();
+ public X509IssuerSerialType createX509IssuerSerialType() {
+ return new X509IssuerSerialType();
}
/**
- * Create an instance of {@link SignaturePropertiesType }
+ * Create an instance of {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}}
*
*/
- public SignaturePropertiesType createSignaturePropertiesType() {
- return new SignaturePropertiesType();
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKIData")
+ public JAXBElement<SPKIDataType> createSPKIData(SPKIDataType value) {
+ return new JAXBElement<SPKIDataType>(_SPKIData_QNAME, SPKIDataType.class, null, value);
}
/**
- * Create an instance of {@link ObjectType }
+ * Create an instance of {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >}}
*
*/
- public ObjectType createObjectType() {
- return new ObjectType();
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyInfo")
+ public JAXBElement<KeyInfoType> createKeyInfo(KeyInfoType value) {
+ return new JAXBElement<KeyInfoType>(_KeyInfo_QNAME, KeyInfoType.class, null, value);
}
/**
- * Create an instance of {@link X509IssuerSerialType }
+ * Create an instance of {@link JAXBElement }{@code <}{@link SignatureValueType }{@code >}}
*
*/
- public X509IssuerSerialType createX509IssuerSerialType() {
- return new X509IssuerSerialType();
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureValue")
+ public JAXBElement<SignatureValueType> createSignatureValue(SignatureValueType value) {
+ return new JAXBElement<SignatureValueType>(_SignatureValue_QNAME, SignatureValueType.class, null, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPData")
- public JAXBElement<PGPDataType> createPGPData(PGPDataType value) {
- return new JAXBElement<PGPDataType>(_PGPData_QNAME, PGPDataType.class, null, value);
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyValue")
+ public JAXBElement<KeyValueType> createKeyValue(KeyValueType value) {
+ return new JAXBElement<KeyValueType>(_KeyValue_QNAME, KeyValueType.class, null, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link SignatureType }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link TransformsType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Signature")
- public JAXBElement<SignatureType> createSignature(SignatureType value) {
- return new JAXBElement<SignatureType>(_Signature_QNAME, SignatureType.class, null, value);
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Transforms")
+ public JAXBElement<TransformsType> createTransforms(TransformsType value) {
+ return new JAXBElement<TransformsType>(_Transforms_QNAME, TransformsType.class, null, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link DigestMethodType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DSAKeyValue")
- public JAXBElement<DSAKeyValueType> createDSAKeyValue(DSAKeyValueType value) {
- return new JAXBElement<DSAKeyValueType>(_DSAKeyValue_QNAME, DSAKeyValueType.class, null, value);
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestMethod")
+ public JAXBElement<DigestMethodType> createDigestMethod(DigestMethodType value) {
+ return new JAXBElement<DigestMethodType>(_DigestMethod_QNAME, DigestMethodType.class, null, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link X509DataType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKIData")
- public JAXBElement<SPKIDataType> createSPKIData(SPKIDataType value) {
- return new JAXBElement<SPKIDataType>(_SPKIData_QNAME, SPKIDataType.class, null, value);
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Data")
+ public JAXBElement<X509DataType> createX509Data(X509DataType value) {
+ return new JAXBElement<X509DataType>(_X509Data_QNAME, X509DataType.class, null, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link SignedInfoType }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertyType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignedInfo")
- public JAXBElement<SignedInfoType> createSignedInfo(SignedInfoType value) {
- return new JAXBElement<SignedInfoType>(_SignedInfo_QNAME, SignedInfoType.class, null, value);
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperty")
+ public JAXBElement<SignaturePropertyType> createSignatureProperty(SignaturePropertyType value) {
+ return new JAXBElement<SignaturePropertyType>(_SignatureProperty_QNAME, SignaturePropertyType.class, null, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RetrievalMethod")
- public JAXBElement<RetrievalMethodType> createRetrievalMethod(RetrievalMethodType value) {
- return new JAXBElement<RetrievalMethodType>(_RetrievalMethod_QNAME, RetrievalMethodType.class, null, value);
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyName")
+ public JAXBElement<String> createKeyName(String value) {
+ return new JAXBElement<String>(_KeyName_QNAME, String.class, null, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link CanonicalizationMethodType }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "CanonicalizationMethod")
- public JAXBElement<CanonicalizationMethodType> createCanonicalizationMethod(CanonicalizationMethodType value) {
- return new JAXBElement<CanonicalizationMethodType>(_CanonicalizationMethod_QNAME, CanonicalizationMethodType.class, null, value);
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RSAKeyValue")
+ public JAXBElement<RSAKeyValueType> createRSAKeyValue(RSAKeyValueType value) {
+ return new JAXBElement<RSAKeyValueType>(_RSAKeyValue_QNAME, RSAKeyValueType.class, null, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link ObjectType }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link SignatureType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Object")
- public JAXBElement<ObjectType> createObject(ObjectType value) {
- return new JAXBElement<ObjectType>(_Object_QNAME, ObjectType.class, null, value);
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Signature")
+ public JAXBElement<SignatureType> createSignature(SignatureType value) {
+ return new JAXBElement<SignatureType>(_Signature_QNAME, SignatureType.class, null, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertyType }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperty")
- public JAXBElement<SignaturePropertyType> createSignatureProperty(SignaturePropertyType value) {
- return new JAXBElement<SignaturePropertyType>(_SignatureProperty_QNAME, SignaturePropertyType.class, null, value);
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "MgmtData")
+ public JAXBElement<String> createMgmtData(String value) {
+ return new JAXBElement<String>(_MgmtData_QNAME, String.class, null, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link TransformsType }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link SignatureMethodType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Transforms")
- public JAXBElement<TransformsType> createTransforms(TransformsType value) {
- return new JAXBElement<TransformsType>(_Transforms_QNAME, TransformsType.class, null, value);
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureMethod")
+ public JAXBElement<SignatureMethodType> createSignatureMethod(SignatureMethodType value) {
+ return new JAXBElement<SignatureMethodType>(_SignatureMethod_QNAME, SignatureMethodType.class, null, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link ManifestType }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link ObjectType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Manifest")
- public JAXBElement<ManifestType> createManifest(ManifestType value) {
- return new JAXBElement<ManifestType>(_Manifest_QNAME, ManifestType.class, null, value);
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Object")
+ public JAXBElement<ObjectType> createObject(ObjectType value) {
+ return new JAXBElement<ObjectType>(_Object_QNAME, ObjectType.class, null, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link SignatureValueType }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertiesType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureValue")
- public JAXBElement<SignatureValueType> createSignatureValue(SignatureValueType value) {
- return new JAXBElement<SignatureValueType>(_SignatureValue_QNAME, SignatureValueType.class, null, value);
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperties")
+ public JAXBElement<SignaturePropertiesType> createSignatureProperties(SignaturePropertiesType value) {
+ return new JAXBElement<SignaturePropertiesType>(_SignatureProperties_QNAME, SignaturePropertiesType.class, null, value);
}
/**
@@ -361,39 +388,39 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link X509DataType }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Data")
- public JAXBElement<X509DataType> createX509Data(X509DataType value) {
- return new JAXBElement<X509DataType>(_X509Data_QNAME, X509DataType.class, null, value);
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPData")
+ public JAXBElement<PGPDataType> createPGPData(PGPDataType value) {
+ return new JAXBElement<PGPDataType>(_PGPData_QNAME, PGPDataType.class, null, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link SignatureMethodType }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link ReferenceType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureMethod")
- public JAXBElement<SignatureMethodType> createSignatureMethod(SignatureMethodType value) {
- return new JAXBElement<SignatureMethodType>(_SignatureMethod_QNAME, SignatureMethodType.class, null, value);
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Reference")
+ public JAXBElement<ReferenceType> createReference(ReferenceType value) {
+ return new JAXBElement<ReferenceType>(_Reference_QNAME, ReferenceType.class, null, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyInfo")
- public JAXBElement<KeyInfoType> createKeyInfo(KeyInfoType value) {
- return new JAXBElement<KeyInfoType>(_KeyInfo_QNAME, KeyInfoType.class, null, value);
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RetrievalMethod")
+ public JAXBElement<RetrievalMethodType> createRetrievalMethod(RetrievalMethodType value) {
+ return new JAXBElement<RetrievalMethodType>(_RetrievalMethod_QNAME, RetrievalMethodType.class, null, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link DigestMethodType }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestMethod")
- public JAXBElement<DigestMethodType> createDigestMethod(DigestMethodType value) {
- return new JAXBElement<DigestMethodType>(_DigestMethod_QNAME, DigestMethodType.class, null, value);
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DSAKeyValue")
+ public JAXBElement<DSAKeyValueType> createDSAKeyValue(DSAKeyValueType value) {
+ return new JAXBElement<DSAKeyValueType>(_DSAKeyValue_QNAME, DSAKeyValueType.class, null, value);
}
/**
@@ -406,57 +433,57 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link CanonicalizationMethodType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "MgmtData")
- public JAXBElement<String> createMgmtData(String value) {
- return new JAXBElement<String>(_MgmtData_QNAME, String.class, null, value);
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "CanonicalizationMethod")
+ public JAXBElement<CanonicalizationMethodType> createCanonicalizationMethod(CanonicalizationMethodType value) {
+ return new JAXBElement<CanonicalizationMethodType>(_CanonicalizationMethod_QNAME, CanonicalizationMethodType.class, null, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertiesType }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link SignedInfoType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperties")
- public JAXBElement<SignaturePropertiesType> createSignatureProperties(SignaturePropertiesType value) {
- return new JAXBElement<SignaturePropertiesType>(_SignatureProperties_QNAME, SignaturePropertiesType.class, null, value);
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignedInfo")
+ public JAXBElement<SignedInfoType> createSignedInfo(SignedInfoType value) {
+ return new JAXBElement<SignedInfoType>(_SignedInfo_QNAME, SignedInfoType.class, null, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link ManifestType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyName")
- public JAXBElement<String> createKeyName(String value) {
- return new JAXBElement<String>(_KeyName_QNAME, String.class, null, value);
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Manifest")
+ public JAXBElement<ManifestType> createManifest(ManifestType value) {
+ return new JAXBElement<ManifestType>(_Manifest_QNAME, ManifestType.class, null, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyValue")
- public JAXBElement<KeyValueType> createKeyValue(KeyValueType value) {
- return new JAXBElement<KeyValueType>(_KeyValue_QNAME, KeyValueType.class, null, value);
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "HMACOutputLength", scope = SignatureMethodType.class)
+ public JAXBElement<BigInteger> createSignatureMethodTypeHMACOutputLength(BigInteger value) {
+ return new JAXBElement<BigInteger>(_SignatureMethodTypeHMACOutputLength_QNAME, BigInteger.class, SignatureMethodType.class, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link ReferenceType }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Reference")
- public JAXBElement<ReferenceType> createReference(ReferenceType value) {
- return new JAXBElement<ReferenceType>(_Reference_QNAME, ReferenceType.class, null, value);
+ @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 RSAKeyValueType }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RSAKeyValue")
- public JAXBElement<RSAKeyValueType> createRSAKeyValue(RSAKeyValueType value) {
- return new JAXBElement<RSAKeyValueType>(_RSAKeyValue_QNAME, RSAKeyValueType.class, null, value);
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "XPath", scope = TransformType.class)
+ public JAXBElement<String> createTransformTypeXPath(String value) {
+ return new JAXBElement<String>(_TransformTypeXPath_QNAME, String.class, TransformType.class, value);
}
/**
@@ -478,24 +505,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 BigInteger }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "HMACOutputLength", scope = SignatureMethodType.class)
- public JAXBElement<BigInteger> createSignatureMethodTypeHMACOutputLength(BigInteger value) {
- return new JAXBElement<BigInteger>(_SignatureMethodTypeHMACOutputLength_QNAME, BigInteger.class, SignatureMethodType.class, value);
- }
-
- /**
* Create an instance of {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}}
*
*/
@@ -508,18 +517,9 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Certificate", scope = X509DataType.class)
- public JAXBElement<byte[]> createX509DataTypeX509Certificate(byte[] value) {
- return new JAXBElement<byte[]>(_X509DataTypeX509Certificate_QNAME, byte[].class, X509DataType.class, ((byte[]) value));
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509SKI", scope = X509DataType.class)
- public JAXBElement<byte[]> createX509DataTypeX509SKI(byte[] value) {
- return new JAXBElement<byte[]>(_X509DataTypeX509SKI_QNAME, byte[].class, X509DataType.class, ((byte[]) value));
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509CRL", scope = X509DataType.class)
+ public JAXBElement<byte[]> createX509DataTypeX509CRL(byte[] value) {
+ return new JAXBElement<byte[]>(_X509DataTypeX509CRL_QNAME, byte[].class, X509DataType.class, ((byte[]) value));
}
/**
@@ -535,18 +535,18 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509CRL", scope = X509DataType.class)
- public JAXBElement<byte[]> createX509DataTypeX509CRL(byte[] value) {
- return new JAXBElement<byte[]>(_X509DataTypeX509CRL_QNAME, byte[].class, X509DataType.class, ((byte[]) value));
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509SKI", scope = X509DataType.class)
+ public JAXBElement<byte[]> createX509DataTypeX509SKI(byte[] value) {
+ return new JAXBElement<byte[]>(_X509DataTypeX509SKI_QNAME, byte[].class, X509DataType.class, ((byte[]) value));
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "XPath", scope = TransformType.class)
- public JAXBElement<String> createTransformTypeXPath(String value) {
- return new JAXBElement<String>(_TransformTypeXPath_QNAME, String.class, TransformType.class, value);
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Certificate", scope = X509DataType.class)
+ public JAXBElement<byte[]> createX509DataTypeX509Certificate(byte[] value) {
+ return new JAXBElement<byte[]>(_X509DataTypeX509Certificate_QNAME, byte[].class, X509DataType.class, ((byte[]) value));
}
}
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 3de8892c..b7006e4e 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 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 5a9025e4..04455b19 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
@@ -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),
- @XmlElementRef(name = "PGPKeyID", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class)
+ @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;
@@ -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 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
+ * line 218 of file:/D:/Projects/pdf-as-4/pdf-as-moa/src/main/resources/wsdl/xmldsig-core-schema.xsd
+ * line 213 of file:/D:/Projects/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,10 +81,10 @@ public class PGPDataType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Object }
- * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
* {@link JAXBElement }{@code <}{@link byte[]}{@code >}
* {@link Element }
+ * {@link Object }
+ * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
*
*
*/
diff --git a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/SPKIDataType.java b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/SPKIDataType.java
index 899ae41c..1bb739f5 100644
--- a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/SPKIDataType.java
+++ b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/SPKIDataType.java
@@ -60,9 +60,9 @@ public class SPKIDataType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Object }
- * {@link Element }
* {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+ * {@link Element }
+ * {@link Object }
*
*
*/
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 ecfbdb1f..10eb3b35 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 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 6d55d9ef..cff418d1 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 Object }
* {@link JAXBElement }{@code <}{@link String }{@code >}
- * {@link String }
* {@link Element }
+ * {@link Object }
+ * {@link String }
*
*
*/
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 b56b5bd1..dce5df11 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
@@ -46,11 +46,11 @@ import org.w3c.dom.Element;
public class X509DataType {
@XmlElementRefs({
- @XmlElementRef(name = "X509CRL", 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 = "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 = "X509Certificate", 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;
@@ -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 byte[]}{@code >}
* {@link JAXBElement }{@code <}{@link String }{@code >}
- * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}
+ * {@link Element }
* {@link Object }
* {@link JAXBElement }{@code <}{@link byte[]}{@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 5f3d9cb8..a6cbcd72 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
@@ -23,6 +23,7 @@
******************************************************************************/
package at.gv.egiz.pdfas.moa;
+import at.gv.e_government.reference.namespace.moa._20020822.*;
import iaik.x509.X509Certificate;
import java.io.File;
@@ -32,6 +33,9 @@ import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.security.cert.CertificateException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
import javax.xml.ws.BindingProvider;
@@ -39,14 +43,9 @@ import org.apache.commons.codec.binary.Base64;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import at.gv.e_government.reference.namespace.moa._20020822.CMSContentBaseType;
import at.gv.e_government.reference.namespace.moa._20020822.CMSDataObjectInfoType.DataObject;
-import at.gv.e_government.reference.namespace.moa._20020822.CreateCMSSignatureRequest;
import at.gv.e_government.reference.namespace.moa._20020822.CreateCMSSignatureRequestType.SingleSignatureInfo;
import at.gv.e_government.reference.namespace.moa._20020822.CreateCMSSignatureRequestType.SingleSignatureInfo.DataObjectInfo;
-import at.gv.e_government.reference.namespace.moa._20020822.CreateCMSSignatureResponseType;
-import at.gv.e_government.reference.namespace.moa._20020822.ErrorResponseType;
-import at.gv.e_government.reference.namespace.moa._20020822.MetaInfoType;
import at.gv.e_government.reference.namespace.moa._20020822_.MOAFault;
import at.gv.e_government.reference.namespace.moa._20020822_.SignatureCreationPortType;
import at.gv.e_government.reference.namespace.moa._20020822_.SignatureCreationService;
@@ -80,6 +79,7 @@ public class MOAConnector implements ISignatureConnector,
private String moaEndpoint;
private String keyIdentifier;
+
public MOAConnector(Configuration config,
java.security.cert.Certificate certificate)
throws CertificateException, FileNotFoundException, IOException {
@@ -161,6 +161,7 @@ public class MOAConnector implements ISignatureConnector,
return this.certificate;
}
+
public byte[] sign(byte[] input, int[] byteRange, SignParameter parameter,
RequestedSignature requestedSignature) throws PdfAsException {
@@ -187,8 +188,23 @@ public class MOAConnector implements ISignatureConnector,
DataObject dataObject = new DataObject();
MetaInfoType metaInfoType = new MetaInfoType();
- metaInfoType.setMimeType("application/pdf");
+ if (parameter.getConfiguration().hasValue(IConfigurationConstants.SIG_PADES_FORCE_FLAG))
+ {
+ if (IConfigurationConstants.TRUE.equalsIgnoreCase(parameter.getConfiguration().getValue(IConfigurationConstants.SIG_PADES_FORCE_FLAG)))
+ {
+ metaInfoType.setMimeType("application/pdf");
+ sigInfo.setPAdESConformity(true);
+ }
+ else
+ {
+ metaInfoType.setMimeType("application/pdf");
+ }
+ }
+ else
+ {
+ metaInfoType.setMimeType("application/pdf");
+ }
dataObject.setMetaInfo(metaInfoType);
CMSContentBaseType content = new CMSContentBaseType();
diff --git a/pdf-as-moa/src/main/resources/wsdl/MOA-SPSS-1.5.2.xsd b/pdf-as-moa/src/main/resources/wsdl/MOA-SPSS-1.5.2.xsd
index 9b94d993..fabe75e0 100644
--- a/pdf-as-moa/src/main/resources/wsdl/MOA-SPSS-1.5.2.xsd
+++ b/pdf-as-moa/src/main/resources/wsdl/MOA-SPSS-1.5.2.xsd
@@ -32,6 +32,7 @@
</xsd:element>
</xsd:sequence>
<xsd:attribute name="SecurityLayerConformity" type="xsd:boolean" use="optional" default="true"/>
+ <xsd:attribute name="PAdESConformity" type="xsd:boolean" use="optional" default="false"/>
</xsd:complexType>
</xsd:element>
</xsd:sequence>
diff --git a/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/pdfbox2/placeholder/SignaturePlaceholderExtractor.java b/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/pdfbox2/placeholder/SignaturePlaceholderExtractor.java
index c239ed94..31bbb76f 100644
--- a/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/pdfbox2/placeholder/SignaturePlaceholderExtractor.java
+++ b/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/pdfbox2/placeholder/SignaturePlaceholderExtractor.java
@@ -437,6 +437,7 @@ public class SignaturePlaceholderExtractor extends PDFStreamEngine implements Pl
String id = null;
if (text != null) {
if (text.startsWith(QR_PLACEHOLDER_IDENTIFIER)) {
+
String[] data = text.split(";");
if (data.length > 1) {
for (int i = 1; i < data.length; i++) {
diff --git a/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/pdfbox2/PADESPDFBOXSigner.java b/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/pdfbox2/PADESPDFBOXSigner.java
index 901e47db..df201f3e 100644
--- a/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/pdfbox2/PADESPDFBOXSigner.java
+++ b/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/pdfbox2/PADESPDFBOXSigner.java
@@ -23,6 +23,7 @@
******************************************************************************/
package at.gv.egiz.pdfas.lib.impl.signing.pdfbox2;
+import at.gv.egiz.pdfas.lib.api.Configuration;
import iaik.x509.X509Certificate;
import java.awt.Graphics2D;
diff --git a/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/pdfbox2/TableDrawUtils.java b/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/pdfbox2/TableDrawUtils.java
index df8d3e3b..d49a6518 100644
--- a/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/pdfbox2/TableDrawUtils.java
+++ b/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/pdfbox2/TableDrawUtils.java
@@ -182,10 +182,94 @@ public class TableDrawUtils {
ty -= bottom_offset;
}
+ float descent=0;
+ float ascent;
+ float lineWidth=0;
+ float txNew=0;
+
+
+ if (tlines.length>1&&Style.LINECENTER.equals(halign)) {
+
+ //Calculate TXs
+ ArrayList<Float> calculatedTXs = new ArrayList<>();
+ for (int k = 0; k < tlines.length; k++) {
+
+
+
+ // if (textFont instanceof PDType1Font) {
+ lineWidth = textFont.getStringWidth(tlines[k]) / 1000.0f
+ * fontSize;
+ txNew = (innerWidth-lineWidth)/2.0f;
+ logger.debug("calculatedTXNew in k-Loop: {} {}", k, txNew);
+ calculatedTXs.add(tx+txNew);
+
+ logger.debug("INNERWIDTH in drawString: "+innerWidth);
+ logger.debug("TX in drawString: "+tx);
+
+ ascent = textFont.getFontDescriptor().getAscent();
+ descent = textFont.getFontDescriptor().getDescent();
+ ascent = ascent / 1000.0f * fontSize;
+ descent = descent / 1000.0f * fontSize;
+
+ //ty = ty + (descent * (-1));
+
+ logger.debug("Text txNew {} ty {} lineWidth {} textHeight {}", txNew, ty,
+ lineWidth, textHeight);
+ logger.debug("Text ASCENT {} DESCENT {}", ascent, descent);
+
+ logger.debug("Text TRANSFORMED ASCENT {} DESCENT {}", ascent, descent);
+ drawDebugLineString(contentStream, txNew, ty, lineWidth, textHeight, descent, settings);
+ }
+
+
+ contentStream.beginText();
+ contentStream.setFont(textFont, fontSize);
+ txNew=tx+calculatedTXs.get(0);
+ logger.debug("Calculated TX0: "+txNew);
+ //contentStream.newLineAtOffset(txNew, (ty - fontSize + (descent * (-1))));
+
+ /*
+ if (formResources.getFont(COSName.getPDFName(textFont.getName())) != null) {
+ String fontID = getFontID(textFont, formResources);
+ logger.debug("Using Font: " + fontID);
+ contentStream.appendRawCommands("/" + fontID + " " + fontSize
+ + " Tf\n");
+ } else {
+ contentStream.setFont(textFont, fontSize);
+ }
+
+ logger.debug("Writing: " + tx + " : " + (ty - fontSize + (descent * (-1))) + " as "
+ + cell.getType());
+ contentStream.moveTextPositionByAmount(tx, (ty - fontSize + (descent * (-1))));
+
+ contentStream.appendRawCommands(fontSize + " TL\n");
+ */
+
+
+ for (int k = 0; k < tlines.length; k++) {
+ float offset = calculatedTXs.get(k);
+ if (k==0)
+ {
+ contentStream.newLineAtOffset(offset, (ty - fontSize + (descent * (-1))));
+
+ }else {
+ logger.debug("Calculated TX: {} {} ", k, offset);
+ contentStream.newLineAtOffset(offset, -1 * fontSize);
+ } //contentStream.appendRawCommands("T*\n");
+
+ contentStream.showText(tlines[k]);
+
+
+ contentStream.newLineAtOffset(-1 * offset, 0);
+ }
+ contentStream.endText();
+
+ }else
+ {
// calculate the max with of the text content
float maxWidth = 0;
for (int k = 0; k < tlines.length; k++) {
- float lineWidth;
+
// if (textFont instanceof PDType1Font) {
lineWidth = textFont.getStringWidth(tlines[k]) / 1000.0f
* fontSize;
@@ -201,7 +285,7 @@ public class TableDrawUtils {
}
}
- if (Style.CENTER.equals(halign)) {
+ if (Style.CENTER.equals(halign)||Style.LINECENTER.equals(halign)) {
float offset = innerWidth - maxWidth;
if (offset > 0) {
offset = offset / 2.0f;
@@ -213,20 +297,20 @@ public class TableDrawUtils {
tx += offset;
}
}
- float ascent = textFont.getFontDescriptor().getAscent();
- float descent = textFont.getFontDescriptor().getDescent();
-
+ ascent = textFont.getFontDescriptor().getAscent();
+ descent = textFont.getFontDescriptor().getDescent();
+
ascent = ascent / 1000.0f * fontSize;
descent = descent / 1000.0f * fontSize;
-
+
//ty = ty + (descent * (-1));
-
+
logger.debug("Text tx {} ty {} maxWidth {} textHeight {}", tx, ty,
maxWidth, textHeight);
logger.debug("Text ASCENT {} DESCENT {}", ascent, descent);
logger.debug("Text TRANSFORMED ASCENT {} DESCENT {}", ascent, descent);
-
+
drawDebugLineString(contentStream, tx, ty, maxWidth, textHeight, descent, settings);
contentStream.beginText();
@@ -262,7 +346,7 @@ public class TableDrawUtils {
}
}
- contentStream.endText();
+ contentStream.endText();}
} catch (IOException e) {
logger.warn("IO Exception", e);
diff --git a/pdf-as-web/src/main/configuration/pdf-as-web.properties b/pdf-as-web/src/main/configuration/pdf-as-web.properties
index b06fb152..10ef26a1 100644
--- a/pdf-as-web/src/main/configuration/pdf-as-web.properties
+++ b/pdf-as-web/src/main/configuration/pdf-as-web.properties
@@ -5,8 +5,6 @@ error.showdetails=false
bku.local.url=http://127.0.0.1:3495/http-security-layer-request
-#bku.online.url=http://www.example.com/bkuonline/http-security-layer-request
-
bku.mobile.url=https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx
# Allow configuration overwrite from external sources
diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/WebConfiguration.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/WebConfiguration.java
index cdd66a1d..9b14df16 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/WebConfiguration.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/WebConfiguration.java
@@ -220,6 +220,20 @@ public class WebConfiguration implements IConfigurationConstants {
return null;
}
+ public static String getOnlineBKUURL() {
+ if(getOnlineBKUEnabled()) {
+ String overwrite = properties.getProperty(MOC_SIGN_URL);
+ if(overwrite == null) {
+ overwrite = properties.getProperty(ONLINE_BKU_URL);
+ if(overwrite == null) {
+ overwrite = PdfAsHelper.getPdfAsConfig().getValue(MOC_SIGN_URL);
+ }
+ }
+ return overwrite;
+ }
+ return null;
+ }
+
public static String getHandyBKUURL() {
if(getMobileBKUEnabled()) {
String overwrite = properties.getProperty(MOBILE_SIGN_URL);
@@ -422,7 +436,17 @@ public class WebConfiguration implements IConfigurationConstants {
}
return false;
}
-
+
+ public static boolean getOnlineBKUEnabled() {
+ String value = properties.getProperty(ONLINE_BKU_ENABLED);
+ if (value != null) {
+ if (value.equals("true")) {
+ return true;
+ }
+ }
+ return false;
+ }
+
public static boolean getSoapSignEnabled() {
String value = properties.getProperty(SOAP_SIGN_ENABLED);
if (value != null) {
diff --git a/schemas/MOA-SPSS-1.5.2.xsd b/schemas/MOA-SPSS-1.5.2.xsd
index cc0a7c88..2fffa2fe 100644
--- a/schemas/MOA-SPSS-1.5.2.xsd
+++ b/schemas/MOA-SPSS-1.5.2.xsd
@@ -32,6 +32,7 @@
</xsd:element>
</xsd:sequence>
<xsd:attribute name="SecurityLayerConformity" type="xsd:boolean" use="optional" default="true"/>
+ <xsd:attribute name="PAdESConformity" type="xsd:boolean" use="optional" default="false"/>
</xsd:complexType>
</xsd:element>
</xsd:sequence>
diff --git a/signature-standards/sigs-pades/src/main/java/at/gv/egiz/pdfas/sigs/pades/PAdESSignerKeystore.java b/signature-standards/sigs-pades/src/main/java/at/gv/egiz/pdfas/sigs/pades/PAdESSignerKeystore.java
index 7e236d30..0dcbfd9f 100644
--- a/signature-standards/sigs-pades/src/main/java/at/gv/egiz/pdfas/sigs/pades/PAdESSignerKeystore.java
+++ b/signature-standards/sigs-pades/src/main/java/at/gv/egiz/pdfas/sigs/pades/PAdESSignerKeystore.java
@@ -23,6 +23,7 @@
******************************************************************************/
package at.gv.egiz.pdfas.sigs.pades;
+import at.gv.egiz.pdfas.lib.api.IConfigurationConstants;
import iaik.asn1.ASN1Object;
import iaik.asn1.CodingException;
import iaik.asn1.ObjectID;
@@ -270,10 +271,22 @@ public class PAdESSignerKeystore implements IPlainSigner, PAdESConstants {
SignerInfo signerInfo) throws CertificateException,
NoSuchAlgorithmException, CodingException {
List<Attribute> attributes = new ArrayList<Attribute>();
+
setMimeTypeAttrib(attributes, mimeType);
setContentTypeAttrib(attributes);
setSigningCertificateAttrib(attributes, signingCertificate);
- //setSigningTimeAttrib(attributes, signingTime);
+ setSigningTimeAttrib(attributes, signingTime);
+ Attribute[] attributeArray = attributes
+ .toArray(new Attribute[attributes.size()]);
+ signerInfo.setSignedAttributes(attributeArray);
+ }
+
+ private void setAttributes(X509Certificate signingCertificate, SignerInfo signerInfo) throws CertificateException,
+ NoSuchAlgorithmException, CodingException {
+ List<Attribute> attributes = new ArrayList<Attribute>();
+
+ setContentTypeAttrib(attributes);
+ setSigningCertificateAttrib(attributes, signingCertificate);
Attribute[] attributeArray = attributes
.toArray(new Attribute[attributes.size()]);
signerInfo.setSignedAttributes(attributeArray);
@@ -283,7 +296,7 @@ public class PAdESSignerKeystore implements IPlainSigner, PAdESConstants {
RequestedSignature requestedSignature) throws PdfAsException {
try {
logger.info("Creating PAdES signature.");
-
+
requestedSignature.getStatus().getMetaInformations()
.put(ErrorConstants.STATUS_INFO_SIGDEVICE, SIGNATURE_DEVICE);
requestedSignature.getStatus().getMetaInformations()
@@ -298,7 +311,25 @@ public class PAdESSignerKeystore implements IPlainSigner, PAdESConstants {
SignedData si = new SignedData(input, SignedData.EXPLICIT);
si.addCertificates(new Certificate[] { cert });
- setAttributes("application/pdf", cert, new Date(), signer1);
+
+
+ //Check PAdES Flag
+ if (parameter.getConfiguration().hasValue(IConfigurationConstants.SIG_PADES_FORCE_FLAG))
+ {
+ if (IConfigurationConstants.TRUE.equalsIgnoreCase(parameter.getConfiguration().getValue(IConfigurationConstants.SIG_PADES_FORCE_FLAG)))
+ {
+ setAttributes(cert, signer1);
+ }
+ else
+ {
+ setAttributes("application/pdf", cert, new Date(), signer1);
+ }
+ }
+ else
+ {
+ setAttributes("application/pdf", cert, new Date(), signer1);
+ }
+
si.addSignerInfo(signer1);
InputStream dataIs = si.getInputStream();
byte[] buf = new byte[1024];