You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@roller.apache.org by Glen Mazza <gl...@gmail.com> on 2014/06/08 22:05:43 UTC
Re: svn commit: r1601248 - in /roller/branches/rome2/app: ./ m2/
src/main/java/org/apache/roller/planet/business/fetcher/ src/main/java/org/apache/roller/planet/util/rome/
src/main/java/org/apache/roller/weblogger/util/ src/main/java/org/apache/roller/webl...
https://www.youtube.com/watch?v=DuDeBcpLITQ :)
On 6/8/2014 3:55 PM, snoopdave@apache.org wrote:
> Author: snoopdave
> Date: Sun Jun 8 19:55:46 2014
> New Revision: 1601248
>
> URL: http://svn.apache.org/r1601248
> Log:
> Move to final ROME 1.5.0 release, which is now in Maven Central
>
> Removed:
> roller/branches/rome2/app/m2/
> Modified:
> roller/branches/rome2/app/pom.xml
> roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java
> roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModule.java
> roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleGenerator.java
> 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/PlanetConverterForRSS091N.java
> roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS091U.java
> roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS20.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
> roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/LinkbackExtractor.java
> roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/CommentCollection.java
> roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java
> roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java
> roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
> roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java
> roller/branches/rome2/app/src/main/resources/rome.properties
>
> Modified: roller/branches/rome2/app/pom.xml
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/pom.xml?rev=1601248&r1=1601247&r2=1601248&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/pom.xml (original)
> +++ roller/branches/rome2/app/pom.xml Sun Jun 8 19:55:46 2014
> @@ -166,21 +166,21 @@
> <dependency>
> <groupId>com.rometools</groupId>
> <artifactId>rome</artifactId>
> - <version>1.5.0-SNAPSHOT</version>
> + <version>1.5.0</version>
> <scope>compile</scope>
> </dependency>
>
> <dependency>
> <groupId>com.rometools</groupId>
> <artifactId>rome-fetcher</artifactId>
> - <version>1.5.0-SNAPSHOT</version>
> + <version>1.5.0</version>
> <scope>compile</scope>
> </dependency>
>
> <dependency>
> <groupId>com.rometools</groupId>
> <artifactId>rome-propono</artifactId>
> - <version>1.5.0-SNAPSHOT</version>
> + <version>1.5.0</version>
> <scope>compile</scope>
> <exclusions>
> <exclusion>
> @@ -643,13 +643,4 @@
>
> </build>
>
> - <!-- Temporary solution until ROME 1.5 gets unto Maven Central -->
> - <repositories>
> - <repository>
> - <id>local-dependencies</id>
> - <name>In-Tree Maven Repository</name>
> - <url>file://${project.basedir}/m2/repository</url>
> - </repository>
> - </repositories>
> -
> </project>
>
> Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java?rev=1601248&r1=1601247&r2=1601248&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java (original)
> +++ roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java Sun Jun 8 19:55:46 2014
> @@ -18,11 +18,11 @@
>
> package org.apache.roller.planet.business.fetcher;
>
> -import com.sun.syndication.feed.module.DCModule;
> -import com.sun.syndication.feed.synd.SyndCategory;
> -import com.sun.syndication.feed.synd.SyndContent;
> -import com.sun.syndication.feed.synd.SyndEntry;
> -import com.sun.syndication.feed.synd.SyndFeed;
> +import com.rometools.rome.feed.module.DCModule;
> +import com.rometools.rome.feed.synd.SyndCategory;
> +import com.rometools.rome.feed.synd.SyndContent;
> +import com.rometools.rome.feed.synd.SyndEntry;
> +import com.rometools.rome.feed.synd.SyndFeed;
> import com.rometools.fetcher.FeedFetcher;
> import com.rometools.fetcher.impl.FeedFetcherCache;
> import com.rometools.fetcher.impl.HttpURLFeedFetcher;
>
> Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModule.java
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModule.java?rev=1601248&r1=1601247&r2=1601248&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModule.java (original)
> +++ roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModule.java Sun Jun 8 19:55:46 2014
> @@ -16,7 +16,7 @@
> */
> package org.apache.roller.planet.util.rome;
>
> -import com.sun.syndication.feed.module.Module;
> +import com.rometools.rome.feed.module.Module;
>
> public interface ContentModule extends Module {
>
>
> Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleGenerator.java
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleGenerator.java?rev=1601248&r1=1601247&r2=1601248&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleGenerator.java (original)
> +++ roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleGenerator.java Sun Jun 8 19:55:46 2014
> @@ -23,8 +23,8 @@ import java.util.Set;
> import org.jdom2.Element;
> import org.jdom2.Namespace;
>
> -import com.sun.syndication.feed.module.Module;
> -import com.sun.syndication.io.ModuleGenerator;
> +import com.rometools.rome.feed.module.Module;
> +import com.rometools.rome.io.ModuleGenerator;
>
> public class ContentModuleGenerator implements ModuleGenerator {
> private static final Namespace CONTENT_NS =
>
> 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=1601248&r1=1601247&r2=1601248&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 Sun Jun 8 19:55:46 2014
> @@ -16,8 +16,8 @@
> */
> package org.apache.roller.planet.util.rome;
>
> -import com.sun.syndication.feed.CopyFrom;
> -import com.sun.syndication.feed.module.ModuleImpl;
> +import com.rometools.rome.feed.CopyFrom;
> +import com.rometools.rome.feed.module.ModuleImpl;
>
> public class ContentModuleImpl extends ModuleImpl implements ContentModule {
> private String encoded;
>
> 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=1601248&r1=1601247&r2=1601248&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 Sun Jun 8 19:55:46 2014
> @@ -19,8 +19,8 @@ package org.apache.roller.planet.util.ro
> import org.jdom2.Element;
> import org.jdom2.Namespace;
>
> -import com.sun.syndication.feed.module.Module;
> -import com.sun.syndication.io.ModuleParser;
> +import com.rometools.rome.feed.module.Module;
> +import com.rometools.rome.io.ModuleParser;
> import java.util.Locale;
>
> public class ContentModuleParser implements ModuleParser {
>
> Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS091N.java
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS091N.java?rev=1601248&r1=1601247&r2=1601248&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS091N.java (original)
> +++ roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS091N.java Sun Jun 8 19:55:46 2014
> @@ -16,9 +16,9 @@
> */
> package org.apache.roller.planet.util.rome;
>
> -import com.sun.syndication.feed.rss.Item;
> -import com.sun.syndication.feed.synd.SyndEntry;
> -import com.sun.syndication.feed.synd.impl.ConverterForRSS091Userland;
> +import com.rometools.rome.feed.rss.Item;
> +import com.rometools.rome.feed.synd.SyndEntry;
> +import com.rometools.rome.feed.synd.impl.ConverterForRSS091Userland;
>
> /**
> */
>
> Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS091U.java
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS091U.java?rev=1601248&r1=1601247&r2=1601248&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS091U.java (original)
> +++ roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS091U.java Sun Jun 8 19:55:46 2014
> @@ -16,9 +16,9 @@
> */
> package org.apache.roller.planet.util.rome;
>
> -import com.sun.syndication.feed.rss.Item;
> -import com.sun.syndication.feed.synd.SyndEntry;
> -import com.sun.syndication.feed.synd.impl.ConverterForRSS091Userland;
> +import com.rometools.rome.feed.rss.Item;
> +import com.rometools.rome.feed.synd.SyndEntry;
> +import com.rometools.rome.feed.synd.impl.ConverterForRSS091Userland;
>
> /**
> */
>
> Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS20.java
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS20.java?rev=1601248&r1=1601247&r2=1601248&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS20.java (original)
> +++ roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS20.java Sun Jun 8 19:55:46 2014
> @@ -16,13 +16,12 @@
> */
> package org.apache.roller.planet.util.rome;
>
> +import com.rometools.rome.feed.module.DCModule;
> +import com.rometools.rome.feed.rss.Item;
> +import com.rometools.rome.feed.synd.SyndEntry;
> +import com.rometools.rome.feed.synd.impl.ConverterForRSS20;
> import java.util.Date;
>
> -import com.sun.syndication.feed.module.DCModule;
> -import com.sun.syndication.feed.rss.Item;
> -import com.sun.syndication.feed.synd.SyndEntry;
> -import com.sun.syndication.feed.synd.impl.ConverterForRSS20;
> -
> /**
> * Workaround Rome bug.
> */
>
> 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=1601248&r1=1601247&r2=1601248&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 Sun Jun 8 19:55:46 2014
> @@ -18,9 +18,9 @@ package org.apache.roller.planet.util.ro
>
> 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 com.rometools.rome.feed.rss.Item;
> +import com.rometools.rome.io.impl.DateParser;
> +import com.rometools.rome.io.impl.RSS091UserlandParser;
> import java.util.Locale;
>
> /**
>
> 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=1601248&r1=1601247&r2=1601248&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 Sun Jun 8 19:55:46 2014
> @@ -16,11 +16,11 @@
> */
> package org.apache.roller.planet.util.rome;
>
> +import com.rometools.rome.feed.rss.Item;
> +import com.rometools.rome.io.impl.DateParser;
> +import com.rometools.rome.io.impl.RSS091UserlandParser;
> 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;
>
> /**
>
> Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/LinkbackExtractor.java
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/LinkbackExtractor.java?rev=1601248&r1=1601247&r2=1601248&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/LinkbackExtractor.java (original)
> +++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/LinkbackExtractor.java Sun Jun 8 19:55:46 2014
> @@ -17,6 +17,10 @@
> */
> package org.apache.roller.weblogger.util;
>
> +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 java.io.BufferedReader;
> import java.io.IOException;
> import java.io.InputStream;
> @@ -37,10 +41,6 @@ import javax.swing.text.html.HTMLEditorK
> import org.apache.commons.logging.Log;
> import org.apache.commons.logging.LogFactory;
>
> -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;
>
> /**
> * Parses HTML file for referring linkback title and excerpt.
>
> Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/CommentCollection.java
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/CommentCollection.java?rev=1601248&r1=1601247&r2=1601248&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/CommentCollection.java (original)
> +++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/CommentCollection.java Sun Jun 8 19:55:46 2014
> @@ -17,10 +17,10 @@
>
> package org.apache.roller.weblogger.webservices.atomprotocol;
>
> -import com.sun.syndication.feed.atom.Entry;
> -import com.sun.syndication.feed.atom.Feed;
> import com.rometools.propono.atom.server.AtomException;
> import com.rometools.propono.atom.server.AtomRequest;
> +import com.rometools.rome.feed.atom.Feed;
> +import java.util.Map.Entry;
>
>
> /**
>
> Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java?rev=1601248&r1=1601247&r2=1601248&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java (original)
> +++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java Sun Jun 8 19:55:46 2014
> @@ -17,20 +17,21 @@
>
> package org.apache.roller.weblogger.webservices.atomprotocol;
>
> -import com.sun.syndication.feed.atom.Category;
> -import com.sun.syndication.feed.atom.Content;
> -import com.sun.syndication.feed.atom.Entry;
> -import com.sun.syndication.feed.atom.Feed;
> -import com.sun.syndication.feed.atom.Link;
> -import com.sun.syndication.feed.atom.Person;
> -import com.sun.syndication.feed.module.Module;
> -import com.sun.syndication.feed.synd.SyndPerson;
> +
> import com.rometools.propono.atom.common.rome.AppModule;
> import com.rometools.propono.atom.common.rome.AppModuleImpl;
> import com.rometools.propono.atom.server.AtomException;
> import com.rometools.propono.atom.server.AtomNotAuthorizedException;
> import com.rometools.propono.atom.server.AtomNotFoundException;
> import com.rometools.propono.atom.server.AtomRequest;
> +import com.rometools.rome.feed.atom.Category;
> +import com.rometools.rome.feed.atom.Content;
> +import com.rometools.rome.feed.atom.Entry;
> +import com.rometools.rome.feed.atom.Feed;
> +import com.rometools.rome.feed.atom.Link;
> +import com.rometools.rome.feed.atom.Person;
> +import com.rometools.rome.feed.module.Module;
> +import com.rometools.rome.feed.synd.SyndPerson;
>
> import java.sql.Timestamp;
> import java.util.ArrayList;
>
> Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java?rev=1601248&r1=1601247&r2=1601248&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java (original)
> +++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java Sun Jun 8 19:55:46 2014
> @@ -17,10 +17,6 @@
>
> package org.apache.roller.weblogger.webservices.atomprotocol;
>
> -import com.sun.syndication.feed.atom.Content;
> -import com.sun.syndication.feed.atom.Entry;
> -import com.sun.syndication.feed.atom.Feed;
> -import com.sun.syndication.feed.atom.Link;
> import com.rometools.propono.atom.common.rome.AppModule;
> import com.rometools.propono.atom.common.rome.AppModuleImpl;
> import com.rometools.propono.atom.server.AtomException;
> @@ -28,6 +24,10 @@ import com.rometools.propono.atom.server
> import com.rometools.propono.atom.server.AtomNotAuthorizedException;
> import com.rometools.propono.atom.server.AtomNotFoundException;
> import com.rometools.propono.atom.server.AtomRequest;
> +import com.rometools.rome.feed.atom.Content;
> +import com.rometools.rome.feed.atom.Entry;
> +import com.rometools.rome.feed.atom.Feed;
> +import com.rometools.rome.feed.atom.Link;
> import java.io.File;
> import java.io.FileInputStream;
> import java.io.FileOutputStream;
>
> Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java?rev=1601248&r1=1601247&r2=1601248&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java (original)
> +++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java Sun Jun 8 19:55:46 2014
> @@ -31,13 +31,13 @@ import org.apache.roller.weblogger.pojos
> import org.apache.roller.weblogger.pojos.Weblog;
> import org.apache.roller.weblogger.util.Utilities;
> import org.apache.roller.weblogger.util.WSSEUtilities;
> -import com.sun.syndication.feed.atom.Entry;
> -import com.sun.syndication.feed.atom.Feed;
> import com.rometools.propono.atom.common.AtomService;
> import com.rometools.propono.atom.server.AtomException;
> import com.rometools.propono.atom.server.AtomHandler;
> import com.rometools.propono.atom.server.AtomMediaResource;
> import com.rometools.propono.atom.server.AtomNotFoundException;
> +import com.rometools.rome.feed.atom.Entry;
> +import com.rometools.rome.feed.atom.Feed;
> import javax.servlet.http.HttpServletResponse;
> import net.oauth.OAuthAccessor;
> import net.oauth.OAuthMessage;
>
> Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java?rev=1601248&r1=1601247&r2=1601248&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java (original)
> +++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java Sun Jun 8 19:55:46 2014
> @@ -36,12 +36,12 @@ import org.apache.roller.weblogger.pojos
> import org.apache.roller.weblogger.pojos.WeblogPermission;
> import org.apache.roller.weblogger.util.Utilities;
>
> -import com.sun.syndication.feed.atom.Category;
> import com.rometools.propono.atom.common.AtomService;
> import com.rometools.propono.atom.common.Categories;
> import com.rometools.propono.atom.common.Collection;
> import com.rometools.propono.atom.common.Workspace;
> import com.rometools.propono.atom.server.AtomException;
> +import com.rometools.rome.feed.atom.Category;
>
>
> /**
>
> Modified: roller/branches/rome2/app/src/main/resources/rome.properties
> URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/rome.properties?rev=1601248&r1=1601247&r2=1601248&view=diff
> ==============================================================================
> --- roller/branches/rome2/app/src/main/resources/rome.properties (original)
> +++ roller/branches/rome2/app/src/main/resources/rome.properties Sun Jun 8 19:55:46 2014
> @@ -26,29 +26,29 @@ Converter.classes =org.apache.roller
>
> # Handle funky RSS (RSS 2.0 with <dc:date> and/or <content:encoded>)
>
> -rss_2.0.feed.ModuleGenerator.classes =com.sun.syndication.io.impl.DCModuleGenerator \
> +rss_2.0.feed.ModuleGenerator.classes =com.rometools.rome.io.impl.DCModuleGenerator \
> org.apache.roller.planet.util.rome.ContentModuleGenerator
>
> -rss_2.0.item.ModuleGenerator.classes =com.sun.syndication.io.impl.DCModuleGenerator \
> +rss_2.0.item.ModuleGenerator.classes =com.rometools.rome.io.impl.DCModuleGenerator \
> org.apache.roller.planet.util.rome.ContentModuleGenerator
>
> -rss_2.0.feed.ModuleParser.classes =com.sun.syndication.io.impl.DCModuleParser \
> +rss_2.0.feed.ModuleParser.classes =com.rometools.rome.io.impl.DCModuleParser \
> org.apache.roller.planet.util.rome.ContentModuleParser
>
> -rss_2.0.item.ModuleParser.classes =com.sun.syndication.io.impl.DCModuleParser \
> +rss_2.0.item.ModuleParser.classes =com.rometools.rome.io.impl.DCModuleParser \
> org.apache.roller.planet.util.rome.ContentModuleParser
>
> # Handle <content:encoded> in RSS 1.0
>
> -rss_1.0.feed.ModuleParser.classes =com.sun.syndication.io.impl.DCModuleParser \
> +rss_1.0.feed.ModuleParser.classes =com.rometools.rome.io.impl.DCModuleParser \
> org.apache.roller.planet.util.rome.ContentModuleParser
>
> -rss_1.0.item.ModuleParser.classes =com.sun.syndication.io.impl.DCModuleParser \
> +rss_1.0.item.ModuleParser.classes =com.rometools.rome.io.impl.DCModuleParser \
> org.apache.roller.planet.util.rome.ContentModuleParser
>
> -rss_1.0.feed.ModuleGenerator.classes =com.sun.syndication.io.impl.DCModuleGenerator \
> +rss_1.0.feed.ModuleGenerator.classes =com.rometools.rome.io.impl.DCModuleGenerator \
> org.apache.roller.planet.util.rome.ContentModuleGenerator
>
> -rss_1.0.item.ModuleGenerator.classes =com.sun.syndication.io.impl.DCModuleGenerator \
> +rss_1.0.item.ModuleGenerator.classes =com.rometools.rome.io.impl.DCModuleGenerator \
> org.apache.roller.planet.util.rome.ContentModuleGenerator
>
> \ No newline at end of file
>
>