diff options
author | Andreas Fitzek <andreas.fitzek@iaik.tugraz.at> | 2013-12-12 13:31:47 +0100 |
---|---|---|
committer | Andreas Fitzek <andreas.fitzek@iaik.tugraz.at> | 2013-12-12 13:31:47 +0100 |
commit | a465414ecb2bc2792bb56a17d5ae4e883d8c3a88 (patch) | |
tree | a445844289f1f5e815e1c517a3302c9f0912291a /pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping | |
parent | 863f99753af19b3f5ce354d4d1ff0a5e8a4f32dd (diff) | |
download | pdf-as-4-a465414ecb2bc2792bb56a17d5ae4e883d8c3a88.tar.gz pdf-as-4-a465414ecb2bc2792bb56a17d5ae4e883d8c3a88.tar.bz2 pdf-as-4-a465414ecb2bc2792bb56a17d5ae4e883d8c3a88.zip |
Moved harded messages to common.properties
Diffstat (limited to 'pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping')
3 files changed, 10 insertions, 21 deletions
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/CertificateResolver.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/CertificateResolver.java index 7f8b0a0b..f5a89741 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/CertificateResolver.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/CertificateResolver.java @@ -1,19 +1,20 @@ package at.gv.egiz.pdfas.lib.impl.stamping; -import at.gv.egiz.pdfas.common.settings.SignatureProfileSettings; -import at.gv.egiz.pdfas.common.utils.DNUtils; -import at.gv.egiz.pdfas.common.utils.OgnlUtils; -import at.gv.egiz.pdfas.lib.impl.status.RequestedSignature; import iaik.x509.X509Certificate; + +import java.util.Map; + +import javax.naming.InvalidNameException; + import ognl.OgnlContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.naming.InvalidNameException; -import javax.naming.ldap.LdapName; - -import java.util.Map; +import at.gv.egiz.pdfas.common.settings.SignatureProfileSettings; +import at.gv.egiz.pdfas.common.utils.DNUtils; +import at.gv.egiz.pdfas.common.utils.OgnlUtils; +import at.gv.egiz.pdfas.lib.impl.status.RequestedSignature; public class CertificateResolver implements IResolver { diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/StamperFactory.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/StamperFactory.java index f04a955a..e215e07d 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/StamperFactory.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/StamperFactory.java @@ -15,7 +15,7 @@ public class StamperFactory { stamper.setSettings(settings); return stamper; } catch (Throwable e) { - throw new PdfAsException("NO STAMPER!", e); + throw new PdfAsException("error.pdf.stamp.10", e); } } } diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/ValueResolver.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/ValueResolver.java index 19b38f27..38fead85 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/ValueResolver.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/ValueResolver.java @@ -30,11 +30,6 @@ public class ValueResolver implements IProfileConstants, IResolver { public static final String EXP_START = "${"; public static final String EXP_END = "}"; - // TODO: Currently just for proof of concept ... - // Should support Reading Fields from Certificate and DATETIME - - // TODO: Use status in real implementation to get currently needed - // informations... public String resolve(String key, String value, SignatureProfileSettings settings, RequestedSignature signature) { @@ -61,13 +56,6 @@ public class ValueResolver implements IProfileConstants, IResolver { } else { result = value; } - /* - * if (value.startsWith(EXP_START) && value.endsWith(EXP_END)) { // - * TODO: handle OGNL expression for key and value // TODO: Here we - * need the certificate - * - * String exp = value.replace('$', ' '); return } - */ return result; } |