diff --git a/.classpath b/.classpath index f133492ba..13a1e6add 100644 --- a/.classpath +++ b/.classpath @@ -46,9 +46,6 @@ - - - @@ -59,17 +56,20 @@ - + - + + + + diff --git a/addon/YaCy.app/Contents/Info.plist b/addon/YaCy.app/Contents/Info.plist index 83f5a4194..beddc2db9 100644 --- a/addon/YaCy.app/Contents/Info.plist +++ b/addon/YaCy.app/Contents/Info.plist @@ -53,7 +53,7 @@ $JAVAROOT/lib/commons-jxpath-1.3.jar $JAVAROOT/lib/commons-lang-2.6.jar $JAVAROOT/lib/commons-logging-1.1.1.jar - $JAVAROOT/lib/fontbox-1.7.0.jar + $JAVAROOT/lib/fontbox-1.7.1.jar $JAVAROOT/lib/geronimo-stax-api_1.0_spec-1.0.1.jar $JAVAROOT/lib/guava-r05.jar $JAVAROOT/lib/htmllexer.jar @@ -66,7 +66,7 @@ $JAVAROOT/lib/jaudiotagger-2.0.4-20111207.115108-15.jar $JAVAROOT/lib/jcifs-1.3.15.jar $JAVAROOT/lib/jcl-over-slf4j-1.6.4.jar - $JAVAROOT/lib/jempbox-1.7.0.jar + $JAVAROOT/lib/jempbox-1.7.1.jar $JAVAROOT/lib/jena-2.6.4.jar $JAVAROOT/lib/jetty-6.1.26-patched-JETTY-1340.jar $JAVAROOT/lib/jetty-util-6.1.26-patched-JETTY-1340.jar @@ -87,7 +87,7 @@ $JAVAROOT/lib/lucene-suggest-4.0.0.jar $JAVAROOT/lib/metadata-extractor-2.4.0-beta-1.jar $JAVAROOT/lib/mysql-connector-java-5.1.12-bin.jar - $JAVAROOT/lib/pdfbox-1.7.0.jar + $JAVAROOT/lib/pdfbox-1.7.1.jar $JAVAROOT/lib/poi-3.6-20091214.jar $JAVAROOT/lib/poi-scratchpad-3.6-20091214.jar $JAVAROOT/lib/sax-2.0.1.jar diff --git a/build.xml b/build.xml index db06713b9..b0e2a9f4f 100644 --- a/build.xml +++ b/build.xml @@ -172,7 +172,7 @@ - + @@ -185,7 +185,7 @@ - + @@ -207,7 +207,7 @@ - + diff --git a/lib/apache-solr-core-3.6.1.License b/lib/apache-solr-core-4.0.0.License similarity index 100% rename from lib/apache-solr-core-3.6.1.License rename to lib/apache-solr-core-4.0.0.License diff --git a/lib/apache-solr-solrj-3.6.1.License b/lib/apache-solr-solrj-4.0.0.License similarity index 100% rename from lib/apache-solr-solrj-3.6.1.License rename to lib/apache-solr-solrj-4.0.0.License diff --git a/lib/fontbox-1.7.0.License b/lib/fontbox-1.7.1.License similarity index 100% rename from lib/fontbox-1.7.0.License rename to lib/fontbox-1.7.1.License diff --git a/lib/fontbox-1.7.0.jar b/lib/fontbox-1.7.1.jar similarity index 83% rename from lib/fontbox-1.7.0.jar rename to lib/fontbox-1.7.1.jar index 2f3fbe2c3..1c35eb9fe 100644 Binary files a/lib/fontbox-1.7.0.jar and b/lib/fontbox-1.7.1.jar differ diff --git a/lib/jempbox-1.7.0.License b/lib/jempbox-1.7.1.License similarity index 100% rename from lib/jempbox-1.7.0.License rename to lib/jempbox-1.7.1.License diff --git a/lib/jempbox-1.7.0.jar b/lib/jempbox-1.7.1.jar similarity index 83% rename from lib/jempbox-1.7.0.jar rename to lib/jempbox-1.7.1.jar index 770b39bd6..a9ca02293 100644 Binary files a/lib/jempbox-1.7.0.jar and b/lib/jempbox-1.7.1.jar differ diff --git a/lib/pdfbox-1.7.0.License b/lib/pdfbox-1.7.1.License similarity index 100% rename from lib/pdfbox-1.7.0.License rename to lib/pdfbox-1.7.1.License diff --git a/lib/pdfbox-1.7.0.jar b/lib/pdfbox-1.7.1.jar similarity index 95% rename from lib/pdfbox-1.7.0.jar rename to lib/pdfbox-1.7.1.jar index 9198f1047..1df3cfb41 100644 Binary files a/lib/pdfbox-1.7.0.jar and b/lib/pdfbox-1.7.1.jar differ diff --git a/source/net/yacy/document/parser/pdfParser.java b/source/net/yacy/document/parser/pdfParser.java index 716787697..cc4ac6427 100644 --- a/source/net/yacy/document/parser/pdfParser.java +++ b/source/net/yacy/document/parser/pdfParser.java @@ -33,16 +33,6 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; -import net.yacy.cora.document.MultiProtocolURI; -import net.yacy.document.AbstractParser; -import net.yacy.document.Document; -import net.yacy.document.Parser; -import net.yacy.kelondro.data.meta.DigestURI; -import net.yacy.kelondro.io.CharBuffer; -import net.yacy.kelondro.logging.Log; -import net.yacy.kelondro.util.FileUtils; -import net.yacy.kelondro.util.MemoryControl; - import org.apache.pdfbox.cos.COSName; import org.apache.pdfbox.exceptions.CryptographyException; import org.apache.pdfbox.pdmodel.PDDocument; @@ -53,6 +43,16 @@ import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial; import org.apache.pdfbox.pdmodel.font.PDFont; import org.apache.pdfbox.util.PDFTextStripper; +import net.yacy.cora.document.MultiProtocolURI; +import net.yacy.document.AbstractParser; +import net.yacy.document.Document; +import net.yacy.document.Parser; +import net.yacy.kelondro.data.meta.DigestURI; +import net.yacy.kelondro.io.CharBuffer; +import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.util.FileUtils; +import net.yacy.kelondro.util.MemoryControl; + public class pdfParser extends AbstractParser implements Parser {