Author: nick Date: Sat Apr 28 16:08:21 2012 New Revision: 1331788 URL: http://svn.apache.org/viewvc?rev=1331788&view=rev Log: TIKA-852 Upgrade the MP4 parser to 1.0 RC1, which allows us to enable the MP4 unit test (patch from Sebastian Annies)
Modified: tika/trunk/tika-bundle/pom.xml tika/trunk/tika-parsers/pom.xml tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mp4/MP4Parser.java tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java Modified: tika/trunk/tika-bundle/pom.xml URL: http://svn.apache.org/viewvc/tika/trunk/tika-bundle/pom.xml?rev=1331788&r1=1331787&r2=1331788&view=diff ============================================================================== --- tika/trunk/tika-bundle/pom.xml (original) +++ tika/trunk/tika-bundle/pom.xml Sat Apr 28 16:08:21 2012 @@ -114,14 +114,14 @@ </Bundle-Activator> <Embed-Dependency> tika-parsers;inline=true, - commons-compress, commons-codec, + commons-compress, commons-codec, commons-io, pdfbox,fontbox,jempbox,bcmail-jdk15,bcprov-jdk15, poi,poi-scratchpad,poi-ooxml,poi-ooxml-schemas, xmlbeans, dom4j, tagsoup, asm, vorbis-java-core, vorbis-java-tika, - isoparser, scannotation, javassist, + isoparser, aspectjrt, metadata-extractor, boilerpipe, rome, apache-mime4j-core, apache-mime4j-dom Modified: tika/trunk/tika-parsers/pom.xml URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/pom.xml?rev=1331788&r1=1331787&r2=1331788&view=diff ============================================================================== --- tika/trunk/tika-parsers/pom.xml (original) +++ tika/trunk/tika-parsers/pom.xml Sat Apr 28 16:08:21 2012 @@ -158,7 +158,7 @@ <dependency> <groupId>com.googlecode.mp4parser</groupId> <artifactId>isoparser</artifactId> - <version>1.0-beta-5</version> + <version>1.0-RC-1</version> </dependency> <dependency> <groupId>com.drewnoakes</groupId> Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mp4/MP4Parser.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mp4/MP4Parser.java?rev=1331788&r1=1331787&r2=1331788&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mp4/MP4Parser.java (original) +++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mp4/MP4Parser.java Sat Apr 28 16:08:21 2012 @@ -38,8 +38,6 @@ import org.apache.tika.sax.XHTMLContentH import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; -import com.coremedia.iso.IsoBufferWrapper; -import com.coremedia.iso.IsoBufferWrapperImpl; import com.coremedia.iso.IsoFile; import com.coremedia.iso.boxes.Box; import com.coremedia.iso.boxes.ContainerBox; @@ -115,10 +113,7 @@ public class MP4Parser extends AbstractP // avoid OOMs that may occur with in-memory buffering TikaInputStream tstream = TikaInputStream.get(stream); try { - IsoBufferWrapper isoBufferWrapper = - new IsoBufferWrapperImpl(tstream.getFile()); - isoFile = new IsoFile(isoBufferWrapper); - isoFile.parse(); + isoFile = new IsoFile(tstream.getFileChannel()); } finally { tstream.close(); } Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java?rev=1331788&r1=1331787&r2=1331788&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java Sat Apr 28 16:08:21 2012 @@ -31,10 +31,8 @@ import org.xml.sax.ContentHandler; /** * Test case for parsing mp4 files. - * - * TODO Work out why this test passes in Eclipse, but fails from Maven */ -public abstract class MP4ParserTest extends TestCase { +public class MP4ParserTest extends TestCase { /** * Test that we can extract information from * a M4A MP4 Audio file