svn commit: r1443564 - in /tika/trunk: CHANGES.txt tika-parsers/pom.xml tika-parsers/src/main/java/org/apache/tika/parser/asm/XHTMLClassVisitor.java

[mi...@apache.org]

Author: mikemccand
Date: Thu Feb  7 15:41:23 2013
New Revision: 1443564

URL: http://svn.apache.org/viewvc?rev=1443564&view=rev
Log:
TIKA-1053: upgrade to ASM 4.1

Modified:
    tika/trunk/CHANGES.txt
    tika/trunk/tika-parsers/pom.xml
    tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/asm/XHTMLClassVisitor.java

Modified: tika/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/tika/trunk/CHANGES.txt?rev=1443564&r1=1443563&r2=1443564&view=diff
==============================================================================
--- tika/trunk/CHANGES.txt (original)
+++ tika/trunk/CHANGES.txt Thu Feb  7 15:41:23 2013
@@ -8,6 +8,9 @@ Release 1.4 Current Development
 
   * MP3: Audio duration is now extracted (TIKA-991)
 
+  * Java .class files: upgraded from ASM 3.1 to ASM 4.1 for parsing
+    the Java bytecodes (TIKA-1053).
+
 Release 1.3 - 01/19/2013
 
   * Mimetype definitions added for more common programming languages,

Modified: tika/trunk/tika-parsers/pom.xml
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/pom.xml?rev=1443564&r1=1443563&r2=1443564&view=diff
==============================================================================
--- tika/trunk/tika-parsers/pom.xml (original)
+++ tika/trunk/tika-parsers/pom.xml Thu Feb  7 15:41:23 2013
@@ -151,9 +151,9 @@
       <version>1.2.1</version>
     </dependency>
     <dependency>
-      <groupId>asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>3.1</version>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-debug-all</artifactId>
+      <version>4.1</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.mp4parser</groupId> 

Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/asm/XHTMLClassVisitor.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/asm/XHTMLClassVisitor.java?rev=1443564&r1=1443563&r2=1443564&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/asm/XHTMLClassVisitor.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/asm/XHTMLClassVisitor.java Thu Feb  7 15:41:23 2013
@@ -38,7 +38,7 @@ import org.xml.sax.SAXException;
  * Class visitor that generates XHTML SAX events to describe the
  * contents of the visited class.
  */
-class XHTMLClassVisitor implements ClassVisitor {
+class XHTMLClassVisitor extends ClassVisitor {
 
     private final XHTMLContentHandler xhtml;
 
@@ -49,6 +49,7 @@ class XHTMLClassVisitor implements Class
     private String packageName;
 
     public XHTMLClassVisitor(ContentHandler handler, Metadata metadata) {
+        super(Opcodes.ASM4);
         this.xhtml = new XHTMLContentHandler(handler, metadata);
         this.metadata = metadata;
     }