From 3bd45ace2bfd7e92e744b958ec05cf89dfe602f4 Mon Sep 17 00:00:00 2001 From: Andreas Fitzek Date: Thu, 9 Oct 2014 13:41:46 +0200 Subject: Verifier SPI changes --- pdf-as-lib/build.gradle | 4 ++-- pdf-as-lib/src/main/java/META-INF/MANIFEST.MF | 3 --- .../java/META-INF/services/at.gv.egiz.pdfas.lib.impl.verify.IVerifier | 1 - .../java/at/gv/egiz/pdfas/lib/impl/verify/VerifierDispatcher.java | 2 ++ pdf-as-lib/src/main/resources/META-INF/MANIFEST.MF | 3 +++ .../META-INF/services/at.gv.egiz.pdfas.lib.impl.verify.IVerifier | 1 + 6 files changed, 8 insertions(+), 6 deletions(-) delete mode 100644 pdf-as-lib/src/main/java/META-INF/MANIFEST.MF delete mode 100644 pdf-as-lib/src/main/java/META-INF/services/at.gv.egiz.pdfas.lib.impl.verify.IVerifier create mode 100644 pdf-as-lib/src/main/resources/META-INF/MANIFEST.MF create mode 100644 pdf-as-lib/src/main/resources/META-INF/services/at.gv.egiz.pdfas.lib.impl.verify.IVerifier diff --git a/pdf-as-lib/build.gradle b/pdf-as-lib/build.gradle index b98bf0c9..1bbd4d0d 100644 --- a/pdf-as-lib/build.gradle +++ b/pdf-as-lib/build.gradle @@ -55,10 +55,10 @@ repositories { dependencies { compile project (':pdf-as-common') - compile group: 'org.apache.httpcomponents', name: 'httpmime', version: '4.3.5' - compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.3.5' compile group: 'org.apache.pdfbox', name: 'pdfbox', version: '1.8.7' compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.3.2' + compile group: 'org.apache.httpcomponents', name: 'httpmime', version: '4.3.5' + compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.3.5' compile group: 'commons-io', name: 'commons-io', version: '2.4' compile 'org.apache.commons:commons-collections4:4.0' compile group: 'ognl', name: 'ognl', version: '3.0.8' diff --git a/pdf-as-lib/src/main/java/META-INF/MANIFEST.MF b/pdf-as-lib/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 5e949512..00000000 --- a/pdf-as-lib/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: - diff --git a/pdf-as-lib/src/main/java/META-INF/services/at.gv.egiz.pdfas.lib.impl.verify.IVerifier b/pdf-as-lib/src/main/java/META-INF/services/at.gv.egiz.pdfas.lib.impl.verify.IVerifier deleted file mode 100644 index bd8d2b22..00000000 --- a/pdf-as-lib/src/main/java/META-INF/services/at.gv.egiz.pdfas.lib.impl.verify.IVerifier +++ /dev/null @@ -1 +0,0 @@ -at.gv.egiz.pdfas.lib.impl.verify.IntegrityVerifier #Integrity Only Verifier \ No newline at end of file diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/VerifierDispatcher.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/VerifierDispatcher.java index 56ac41a6..ce7b4707 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/VerifierDispatcher.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/VerifierDispatcher.java @@ -64,6 +64,8 @@ public class VerifierDispatcher { verifiers.add(verfier); } + verifiers.add(new IntegrityVerifier()); + for (IVerifier verfier : verifiers) { logger.info("Registered Verifier: " + verfier.getClass().getName()); } diff --git a/pdf-as-lib/src/main/resources/META-INF/MANIFEST.MF b/pdf-as-lib/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 00000000..5e949512 --- /dev/null +++ b/pdf-as-lib/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + diff --git a/pdf-as-lib/src/main/resources/META-INF/services/at.gv.egiz.pdfas.lib.impl.verify.IVerifier b/pdf-as-lib/src/main/resources/META-INF/services/at.gv.egiz.pdfas.lib.impl.verify.IVerifier new file mode 100644 index 00000000..bd8d2b22 --- /dev/null +++ b/pdf-as-lib/src/main/resources/META-INF/services/at.gv.egiz.pdfas.lib.impl.verify.IVerifier @@ -0,0 +1 @@ +at.gv.egiz.pdfas.lib.impl.verify.IntegrityVerifier #Integrity Only Verifier \ No newline at end of file -- cgit v1.2.3