From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Tue, 16 Aug 2016 22:25:02 +0000 (+0300)
Subject: Replace embedded pdfbox jars with external plug-ins.
X-Git-Tag: v1.25.0~170^2
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=71889caad48cf3cd105d646816e5fe4bfc3f14b6

Replace embedded pdfbox jars with external plug-ins.

Also updated pdfbox version from 1.8.10 to 2.0.2.

Change-Id: I400d049f5d90f839b9075e4370bd565b642d756a
---

diff --git a/bundles/org.simantics.help.base/.classpath b/bundles/org.simantics.help.base/.classpath
index 6cf33fb32..b1dabee38 100644
--- a/bundles/org.simantics.help.base/.classpath
+++ b/bundles/org.simantics.help.base/.classpath
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="fontbox-1.8.10.jar"/>
-	<classpathentry exported="true" kind="lib" path="jempbox-1.8.10.jar"/>
-	<classpathentry exported="true" kind="lib" path="xmpbox-1.8.10.jar"/>
-	<classpathentry exported="true" kind="lib" path="pdfbox-1.8.10.jar" sourcepath="pdfbox-1.8.10-src.zip"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
diff --git a/bundles/org.simantics.help.base/META-INF/MANIFEST.MF b/bundles/org.simantics.help.base/META-INF/MANIFEST.MF
index 51c9d1aa0..a20f8e475 100644
--- a/bundles/org.simantics.help.base/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.help.base/META-INF/MANIFEST.MF
@@ -7,11 +7,9 @@ Bundle-Activator: org.simantics.help.base.internal.Activator
 Bundle-Vendor: Semantum Oy
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.help.base,
- org.apache.commons.logging;bundle-version="1.0.4"
+ org.apache.commons.logging;bundle-version="1.0.4",
+ org.apache.pdfbox;bundle-version="2.0.2",
+ org.apache.pdfbox.fontbox;bundle-version="2.0.2"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .,
- xmpbox-1.8.10.jar,
- jempbox-1.8.10.jar,
- fontbox-1.8.10.jar,
- pdfbox-1.8.10.jar
+Bundle-ClassPath: .
diff --git a/bundles/org.simantics.help.base/build.properties b/bundles/org.simantics.help.base/build.properties
index 7904aba26..c125ab4d7 100644
--- a/bundles/org.simantics.help.base/build.properties
+++ b/bundles/org.simantics.help.base/build.properties
@@ -2,9 +2,5 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               plugin.xml,\
-               pdfbox-1.8.10.jar,\
-               fontbox-1.8.10.jar,\
-               jempbox-1.8.10.jar,\
-               xmpbox-1.8.10.jar
+               plugin.xml
 source.. = src/
diff --git a/bundles/org.simantics.help.base/fontbox-1.8.10.jar b/bundles/org.simantics.help.base/fontbox-1.8.10.jar
deleted file mode 100644
index 3284950c8..000000000
Binary files a/bundles/org.simantics.help.base/fontbox-1.8.10.jar and /dev/null differ
diff --git a/bundles/org.simantics.help.base/jempbox-1.8.10.jar b/bundles/org.simantics.help.base/jempbox-1.8.10.jar
deleted file mode 100644
index 48cc63375..000000000
Binary files a/bundles/org.simantics.help.base/jempbox-1.8.10.jar and /dev/null differ
diff --git a/bundles/org.simantics.help.base/pdfbox-1.8.10-src.zip b/bundles/org.simantics.help.base/pdfbox-1.8.10-src.zip
deleted file mode 100644
index e05aa634b..000000000
Binary files a/bundles/org.simantics.help.base/pdfbox-1.8.10-src.zip and /dev/null differ
diff --git a/bundles/org.simantics.help.base/pdfbox-1.8.10.jar b/bundles/org.simantics.help.base/pdfbox-1.8.10.jar
deleted file mode 100644
index 87bb9a704..000000000
Binary files a/bundles/org.simantics.help.base/pdfbox-1.8.10.jar and /dev/null differ
diff --git a/bundles/org.simantics.help.base/src/org/simantics/help/base/internal/PDFUtil.java b/bundles/org.simantics.help.base/src/org/simantics/help/base/internal/PDFUtil.java
index c12e56b4d..43fac6c70 100644
--- a/bundles/org.simantics.help.base/src/org/simantics/help/base/internal/PDFUtil.java
+++ b/bundles/org.simantics.help.base/src/org/simantics/help/base/internal/PDFUtil.java
@@ -1,14 +1,14 @@
 package org.simantics.help.base.internal;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 
 import org.apache.pdfbox.cos.COSDocument;
+import org.apache.pdfbox.io.RandomAccessFile;
 import org.apache.pdfbox.pdfparser.PDFParser;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDDocumentInformation;
-import org.apache.pdfbox.util.PDFTextStripper;
+import org.apache.pdfbox.text.PDFTextStripper;
 import org.eclipse.help.search.ISearchDocument;
 
 /**
@@ -17,7 +17,7 @@ import org.eclipse.help.search.ISearchDocument;
 public class PDFUtil {
 
     public static void stripText(File fromPdf, ISearchDocument doc) throws IOException {
-        PDFParser parser = new PDFParser(new FileInputStream(fromPdf));
+        PDFParser parser = new PDFParser(new RandomAccessFile(fromPdf, "r"));
         parser.parse();
 
         try (COSDocument cosDoc = parser.getDocument()) {
diff --git a/bundles/org.simantics.help.base/xmpbox-1.8.10.jar b/bundles/org.simantics.help.base/xmpbox-1.8.10.jar
deleted file mode 100644
index 7a8a46594..000000000
Binary files a/bundles/org.simantics.help.base/xmpbox-1.8.10.jar and /dev/null differ