roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r1588669 - in /roller/branches/rome2/app: ./ src/main/java/org/apache/roller/planet/util/rome/
Date Sat, 19 Apr 2014 16:15:04 GMT
Author: snoopdave
Date: Sat Apr 19 16:15:04 2014
New Revision: 1588669

URL: http://svn.apache.org/r1588669
Log:
Moving to ROME 1.5 snapshot for testing.

Modified:
    roller/branches/rome2/app/pom.xml
    roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleImpl.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleParser.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/PlanetRSS091NParser.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/PlanetRSS091UParser.java

Modified: roller/branches/rome2/app/pom.xml
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/pom.xml?rev=1588669&r1=1588668&r2=1588669&view=diff
==============================================================================
--- roller/branches/rome2/app/pom.xml (original)
+++ roller/branches/rome2/app/pom.xml Sat Apr 19 16:15:04 2014
@@ -164,23 +164,23 @@
         </dependency>
 
         <dependency>
-            <groupId>org.rometools</groupId>
+            <groupId>com.rometools</groupId>
             <artifactId>rome</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>1.5.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.rometools</groupId>
+            <groupId>com.rometools</groupId>
             <artifactId>rome-fetcher</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>1.5.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.rometools</groupId>
+            <groupId>com.rometools</groupId>
             <artifactId>rome-propono</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>1.5.0-SNAPSHOT</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleImpl.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleImpl.java?rev=1588669&r1=1588668&r2=1588669&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleImpl.java
(original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleImpl.java
Sat Apr 19 16:15:04 2014
@@ -17,7 +17,6 @@
 package org.apache.roller.planet.util.rome;
 
 import com.sun.syndication.feed.CopyFrom;
-import com.sun.syndication.feed.module.Module;
 import com.sun.syndication.feed.module.ModuleImpl;
 
 public class ContentModuleImpl extends ModuleImpl implements ContentModule {
@@ -41,9 +40,8 @@ public class ContentModuleImpl extends M
     }
 
 	@Override
-	public void copyFrom(CopyFrom<? extends Module> obj) {
+    public void copyFrom(CopyFrom obj) {
         ContentModule sm = (ContentModule) obj;
         setEncoded(sm.getEncoded());
 	}
-
 }

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleParser.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleParser.java?rev=1588669&r1=1588668&r2=1588669&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleParser.java
(original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleParser.java
Sat Apr 19 16:15:04 2014
@@ -21,6 +21,7 @@ import org.jdom2.Namespace;
 
 import com.sun.syndication.feed.module.Module;
 import com.sun.syndication.io.ModuleParser;
+import java.util.Locale;
 
 public class ContentModuleParser implements ModuleParser {
 
@@ -31,11 +32,11 @@ public class ContentModuleParser impleme
     public Namespace getContentNamespace() {
         return Namespace.getNamespace(ContentModule.URI);
     }
-    public Module parse(Element dcRoot) {
+    public Module parse(Element element, Locale locale) {
         boolean foundSomething = false;
         ContentModule fm = new ContentModuleImpl();
 
-        Element e = dcRoot.getChild("encoded", getContentNamespace());
+        Element e = element.getChild("encoded", getContentNamespace());
         if (e != null) {
             foundSomething = true;
             fm.setEncoded(e.getText());

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/PlanetRSS091NParser.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/PlanetRSS091NParser.java?rev=1588669&r1=1588668&r2=1588669&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/PlanetRSS091NParser.java
(original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/PlanetRSS091NParser.java
Sat Apr 19 16:15:04 2014
@@ -21,6 +21,7 @@ import org.jdom2.Element;
 import com.sun.syndication.feed.rss.Item;
 import com.sun.syndication.io.impl.DateParser;
 import com.sun.syndication.io.impl.RSS091UserlandParser;
+import java.util.Locale;
 
 /**
  */
@@ -34,11 +35,12 @@ public class PlanetRSS091NParser extends
         super(type);
     }
 
-    protected Item parseItem(Element rssRoot,Element eItem) {
-        Item item = super.parseItem(rssRoot, eItem);
+    @Override
+    protected Item parseItem(Element rssRoot,Element eItem, Locale locale) {
+        Item item = super.parseItem(rssRoot, eItem, locale);
         Element e = eItem.getChild("pubDate",getRSSNamespace());
         if (e!=null) {
-            item.setPubDate(DateParser.parseRFC822(e.getText()));
+            item.setPubDate(DateParser.parseRFC822(e.getText(), locale));
         }
         return item;
     }

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/PlanetRSS091UParser.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/PlanetRSS091UParser.java?rev=1588669&r1=1588668&r2=1588669&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/PlanetRSS091UParser.java
(original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/PlanetRSS091UParser.java
Sat Apr 19 16:15:04 2014
@@ -21,6 +21,7 @@ import org.jdom2.Element;
 import com.sun.syndication.feed.rss.Item;
 import com.sun.syndication.io.impl.DateParser;
 import com.sun.syndication.io.impl.RSS091UserlandParser;
+import java.util.Locale;
 
 /**
  */
@@ -34,11 +35,12 @@ public class PlanetRSS091UParser extends
         super(type);
     }
 
-    protected Item parseItem(Element rssRoot,Element eItem) {
-        Item item = super.parseItem(rssRoot, eItem);
+    @Override
+    protected Item parseItem(Element rssRoot,Element eItem, Locale locale) {
+        Item item = super.parseItem(rssRoot, eItem, locale);
         Element e = eItem.getChild("pubDate",getRSSNamespace());
         if (e!=null) {
-            item.setPubDate(DateParser.parseRFC822(e.getText()));
+            item.setPubDate(DateParser.parseRFC822(e.getText(), locale));
         }
         return item;
     }



Mime
View raw message