svn commit: r1629447 - in /tika/trunk/tika-parsers: pom.xml src/main/java/org/apache/tika/parser/feed/FeedParser.java

[ma...@apache.org]

Author: mattmann
Date: Sat Oct  4 21:40:53 2014
New Revision: 1629447

URL: http://svn.apache.org/r1629447
Log:
Revert TIKA-1435 until we figure out the Rome/JDOM/HDFParser issue merge 1629338:1629337

Modified:
    tika/trunk/tika-parsers/pom.xml
    tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/feed/FeedParser.java

Modified: tika/trunk/tika-parsers/pom.xml
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/pom.xml?rev=1629447&r1=1629446&r2=1629447&view=diff
==============================================================================
--- tika/trunk/tika-parsers/pom.xml (original)
+++ tika/trunk/tika-parsers/pom.xml Sat Oct  4 21:40:53 2014
@@ -180,9 +180,9 @@
       <version>1.1.0</version>
     </dependency>
     <dependency>
-      <groupId>com.rometools</groupId>
+      <groupId>rome</groupId>
       <artifactId>rome</artifactId>
-      <version>1.5.0</version>
+      <version>1.0</version>
     </dependency>
     <dependency>
       <groupId>org.gagravarr</groupId>

Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/feed/FeedParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/feed/FeedParser.java?rev=1629447&r1=1629446&r2=1629447&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/feed/FeedParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/feed/FeedParser.java Sat Oct  4 21:40:53 2014
@@ -35,11 +35,11 @@ import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
-import com.rometools.rome.feed.synd.SyndContent;
-import com.rometools.rome.feed.synd.SyndEntry;
-import com.rometools.rome.feed.synd.SyndFeed;
-import com.rometools.rome.io.FeedException;
-import com.rometools.rome.io.SyndFeedInput;
+import com.sun.syndication.feed.synd.SyndContent;
+import com.sun.syndication.feed.synd.SyndEntry;
+import com.sun.syndication.feed.synd.SyndFeed;
+import com.sun.syndication.io.FeedException;
+import com.sun.syndication.io.SyndFeedInput;
 
 /**
  * Feed parser.
@@ -85,7 +85,8 @@ public class FeedParser extends Abstract
             xhtml.element("p", description);
 
             xhtml.startElement("ul");
-            for (SyndEntry entry : feed.getEntries()) {
+            for (Object e : feed.getEntries()) {
+                SyndEntry entry = (SyndEntry) e;
                 String link = entry.getLink();
                 if (link != null) {
                     xhtml.startElement("li");