PatchesAndForks/rome
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Jani Halinen 2014-05-31 00:26:39 +03:00
commit 55c535468b
15 changed files with 43 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pom.xml
View file

@ -68,6 +68,7 @@
<dependency> <dependency>
<groupId>com.rometools</groupId> <groupId>com.rometools</groupId>
<artifactId>rome</artifactId> <artifactId>rome</artifactId>
<version>1.5.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-httpclient</groupId> <groupId>commons-httpclient</groupId>

6
src/main/java/com/rometools/fetcher/FeedFetcher.java
View file

@ -19,8 +19,8 @@ package com.rometools.fetcher;
import java.io.IOException; import java.io.IOException;
import java.net.URL; import java.net.URL;
import com.sun.syndication.feed.synd.SyndFeed; import com.rometools.rome.feed.synd.SyndFeed;
import com.sun.syndication.io.FeedException; import com.rometools.rome.io.FeedException;
public interface FeedFetcher { public interface FeedFetcher {
/** /**
@ -101,7 +101,7 @@ public interface FeedFetcher {
* Retrieve a feed over HTTP * Retrieve a feed over HTTP
* *
* @param feedUrl A non-null URL of a RSS/Atom feed to retrieve * @param feedUrl A non-null URL of a RSS/Atom feed to retrieve
* @return A {@link com.sun.syndication.feed.synd.SyndFeed} object * @return A {@link com.rometools.rome.feed.synd.SyndFeed} object
* @throws IllegalArgumentException if the URL is null; * @throws IllegalArgumentException if the URL is null;
* @throws IOException if a TCP error occurs * @throws IOException if a TCP error occurs
* @throws FeedException if the feed is not valid * @throws FeedException if the feed is not valid

2
src/main/java/com/rometools/fetcher/FetcherEvent.java
View file

@ -2,7 +2,7 @@ package com.rometools.fetcher;
import java.util.EventObject; import java.util.EventObject;
import com.sun.syndication.feed.synd.SyndFeed; import com.rometools.rome.feed.synd.SyndFeed;
/** /**
* Implementation note: FetcherEvent is not thread safe. Make sure that they are only ever accessed * Implementation note: FetcherEvent is not thread safe. Make sure that they are only ever accessed

2
src/main/java/com/rometools/fetcher/impl/AbstractFeedFetcher.java
View file

@ -32,7 +32,7 @@ import com.rometools.fetcher.FeedFetcher;
import com.rometools.fetcher.FetcherEvent; import com.rometools.fetcher.FetcherEvent;
import com.rometools.fetcher.FetcherException; import com.rometools.fetcher.FetcherException;
import com.rometools.fetcher.FetcherListener; import com.rometools.fetcher.FetcherListener;
import com.sun.syndication.feed.synd.SyndFeed; import com.rometools.rome.feed.synd.SyndFeed;
public abstract class AbstractFeedFetcher implements FeedFetcher { public abstract class AbstractFeedFetcher implements FeedFetcher {

4
src/main/java/com/rometools/fetcher/impl/HashMapFeedInfoCache.java
View file

@ -114,7 +114,7 @@ public class HashMapFeedInfoCache implements FeedFetcherCache, Serializable {
} }
/** /**
* @see com.sun.syndication.fetcher.impl.FeedFetcherCache#clear() * @see com.rometools.rome.fetcher.impl.FeedFetcherCache#clear()
*/ */
@Override @Override
public void clear() { public void clear() {
@ -124,7 +124,7 @@ public class HashMapFeedInfoCache implements FeedFetcherCache, Serializable {
} }
/** /**
* @see com.sun.syndication.fetcher.impl.FeedFetcherCache#remove(java.net.URL) * @see com.rometools.rome.fetcher.impl.FeedFetcherCache#remove(java.net.URL)
*/ */
@Override @Override
public SyndFeedInfo remove(final URL url) { public SyndFeedInfo remove(final URL url) {

8
src/main/java/com/rometools/fetcher/impl/HttpClientFeedFetcher.java
View file

@ -36,10 +36,10 @@ import org.apache.commons.httpclient.params.HttpMethodParams;
import com.rometools.fetcher.FetcherEvent; import com.rometools.fetcher.FetcherEvent;
import com.rometools.fetcher.FetcherException; import com.rometools.fetcher.FetcherException;
import com.sun.syndication.feed.synd.SyndFeed; import com.rometools.rome.feed.synd.SyndFeed;
import com.sun.syndication.io.FeedException; import com.rometools.rome.io.FeedException;
import com.sun.syndication.io.SyndFeedInput; import com.rometools.rome.io.SyndFeedInput;
import com.sun.syndication.io.XmlReader; import com.rometools.rome.io.XmlReader;
/** /**
* @author Nick Lothian * @author Nick Lothian

10
src/main/java/com/rometools/fetcher/impl/HttpURLFeedFetcher.java
View file

@ -26,10 +26,10 @@ import java.util.zip.GZIPInputStream;
import com.rometools.fetcher.FetcherEvent; import com.rometools.fetcher.FetcherEvent;
import com.rometools.fetcher.FetcherException; import com.rometools.fetcher.FetcherException;
import com.sun.syndication.feed.synd.SyndFeed; import com.rometools.rome.feed.synd.SyndFeed;
import com.sun.syndication.io.FeedException; import com.rometools.rome.io.FeedException;
import com.sun.syndication.io.SyndFeedInput; import com.rometools.rome.io.SyndFeedInput;
import com.sun.syndication.io.XmlReader; import com.rometools.rome.io.XmlReader;
/** /**
* <p> * <p>
@ -103,7 +103,7 @@ public class HttpURLFeedFetcher extends AbstractFeedFetcher {
* Retrieve a feed over HTTP * Retrieve a feed over HTTP
* *
* @param feedUrl A non-null URL of a RSS/Atom feed to retrieve * @param feedUrl A non-null URL of a RSS/Atom feed to retrieve
* @return A {@link com.sun.syndication.feed.synd.SyndFeed} object * @return A {@link com.rometools.rome.feed.synd.SyndFeed} object
* @throws IllegalArgumentException if the URL is null; * @throws IllegalArgumentException if the URL is null;
* @throws IOException if a TCP error occurs * @throws IOException if a TCP error occurs
* @throws FeedException if the feed is not valid * @throws FeedException if the feed is not valid

6
src/main/java/com/rometools/fetcher/impl/SyndFeedInfo.java
View file

@ -19,12 +19,12 @@ package com.rometools.fetcher.impl;
import java.io.Serializable; import java.io.Serializable;
import java.net.URL; import java.net.URL;
import com.sun.syndication.feed.impl.ObjectBean; import com.rometools.rome.feed.impl.ObjectBean;
import com.sun.syndication.feed.synd.SyndFeed; import com.rometools.rome.feed.synd.SyndFeed;
/** /**
* <p> * <p>
* A class to represent a {@link com.sun.syndication.feed.synd.SyndFeed} and some useful information * A class to represent a {@link com.rometools.rome.feed.synd.SyndFeed} and some useful information
* about it. * about it.
* </p> * </p>
* *

8
src/main/java/com/rometools/fetcher/samples/FeedAggregator.java
View file

@ -25,10 +25,10 @@ import com.rometools.fetcher.FeedFetcher;
import com.rometools.fetcher.impl.FeedFetcherCache; import com.rometools.fetcher.impl.FeedFetcherCache;
import com.rometools.fetcher.impl.HashMapFeedInfoCache; import com.rometools.fetcher.impl.HashMapFeedInfoCache;
import com.rometools.fetcher.impl.HttpURLFeedFetcher; import com.rometools.fetcher.impl.HttpURLFeedFetcher;
import com.sun.syndication.feed.synd.SyndEntry; import com.rometools.rome.feed.synd.SyndEntry;
import com.sun.syndication.feed.synd.SyndFeed; import com.rometools.rome.feed.synd.SyndFeed;
import com.sun.syndication.feed.synd.SyndFeedImpl; import com.rometools.rome.feed.synd.SyndFeedImpl;
import com.sun.syndication.io.SyndFeedOutput; import com.rometools.rome.io.SyndFeedOutput;
/** /**
* <p> * <p>

4
src/main/java/com/rometools/fetcher/samples/FeedReader.java
View file

@ -25,7 +25,7 @@ import com.rometools.fetcher.FetcherListener;
import com.rometools.fetcher.impl.FeedFetcherCache; import com.rometools.fetcher.impl.FeedFetcherCache;
import com.rometools.fetcher.impl.HashMapFeedInfoCache; import com.rometools.fetcher.impl.HashMapFeedInfoCache;
import com.rometools.fetcher.impl.HttpURLFeedFetcher; import com.rometools.fetcher.impl.HttpURLFeedFetcher;
import com.sun.syndication.feed.synd.SyndFeed; import com.rometools.rome.feed.synd.SyndFeed;
/** /**
* Reads and prints any RSS/Atom feed type. Converted from the original Rome sample FeedReader * Reads and prints any RSS/Atom feed type. Converted from the original Rome sample FeedReader
@ -81,7 +81,7 @@ public class FeedReader {
static class FetcherEventListenerImpl implements FetcherListener { static class FetcherEventListenerImpl implements FetcherListener {
/** /**
* @see com.sun.syndication.fetcher.FetcherListener#fetcherEvent(com.sun.syndication.fetcher.FetcherEvent) * @see com.rometools.rome.fetcher.FetcherListener#fetcherEvent(com.rometools.rome.fetcher.FetcherEvent)
*/ */
@Override @Override
public void fetcherEvent(final FetcherEvent event) { public void fetcherEvent(final FetcherEvent event) {

2
src/site/apt/ChangeLog.apt
View file

@ -93,7 +93,7 @@ Change Log
*Prior to 1.0RC2 *Prior to 1.0RC2
[[1]] BeanInfo class added for AbstractFeedFetcher\ [[1]] BeanInfo class added for AbstractFeedFetcher\
com.sun.syndication.fetcher.impl.AbstractFeedFetcherBeanInfo was created to allow introspection to correctly find the events com.rometools.rome.fetcher.impl.AbstractFeedFetcherBeanInfo was created to allow introspection to correctly find the events
[[1]] Callback to allow access to HttpClient HttpMethod object\ [[1]] Callback to allow access to HttpClient HttpMethod object\
Add a HttpClientMethodCallbackIntf to allow the calling code to modify the HttpClient HttpMethod used to make the request Add a HttpClientMethodCallbackIntf to allow the calling code to modify the HttpClient HttpMethod used to make the request

8
src/test/java/com/rometools/test/AbstractJettyTest.java
View file

@ -38,9 +38,9 @@ import com.rometools.fetcher.FetcherException;
import com.rometools.fetcher.FetcherListener; import com.rometools.fetcher.FetcherListener;
import com.rometools.fetcher.impl.FeedFetcherCache; import com.rometools.fetcher.impl.FeedFetcherCache;
import com.rometools.fetcher.impl.HashMapFeedInfoCache; import com.rometools.fetcher.impl.HashMapFeedInfoCache;
import com.sun.syndication.feed.atom.Entry; import com.rometools.rome.feed.atom.Entry;
import com.sun.syndication.feed.synd.SyndEntry; import com.rometools.rome.feed.synd.SyndEntry;
import com.sun.syndication.feed.synd.SyndFeed; import com.rometools.rome.feed.synd.SyndFeed;
/** /**
* @author nl * @author nl
@ -145,7 +145,7 @@ public abstract class AbstractJettyTest extends TestCase {
} }
/** /**
* @see com.sun.syndication.fetcher.FetcherListener#fetcherEvent(com.sun.syndication.fetcher.FetcherEvent) * @see com.rometools.rome.fetcher.FetcherListener#fetcherEvent(com.rometools.rome.fetcher.FetcherEvent)
*/ */
@Override @Override
public void fetcherEvent(final FetcherEvent event) { public void fetcherEvent(final FetcherEvent event) {

16
src/test/java/com/rometools/test/FetcherTestServlet.java
View file

@ -34,14 +34,14 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.sun.syndication.feed.synd.SyndContent; import com.rometools.rome.feed.synd.SyndContent;
import com.sun.syndication.feed.synd.SyndContentImpl; import com.rometools.rome.feed.synd.SyndContentImpl;
import com.sun.syndication.feed.synd.SyndEntry; import com.rometools.rome.feed.synd.SyndEntry;
import com.sun.syndication.feed.synd.SyndEntryImpl; import com.rometools.rome.feed.synd.SyndEntryImpl;
import com.sun.syndication.feed.synd.SyndFeed; import com.rometools.rome.feed.synd.SyndFeed;
import com.sun.syndication.feed.synd.SyndFeedImpl; import com.rometools.rome.feed.synd.SyndFeedImpl;
import com.sun.syndication.io.FeedException; import com.rometools.rome.io.FeedException;
import com.sun.syndication.io.SyndFeedOutput; import com.rometools.rome.io.SyndFeedOutput;
public class FetcherTestServlet extends HttpServlet { public class FetcherTestServlet extends HttpServlet {

4
src/test/java/com/rometools/test/HttpClientFeedFetcherTest.java
View file

@ -33,7 +33,7 @@ public class HttpClientFeedFetcherTest extends AbstractJettyTest {
} }
/** /**
* @see com.sun.syndication.fetcher.impl.AbstractJettyTest#getFeedFetcher() * @see com.rometools.rome.fetcher.impl.AbstractJettyTest#getFeedFetcher()
*/ */
@Override @Override
protected FeedFetcher getFeedFetcher() { protected FeedFetcher getFeedFetcher() {
@ -46,7 +46,7 @@ public class HttpClientFeedFetcherTest extends AbstractJettyTest {
} }
/** /**
* @see com.sun.syndication.fetcher.impl.AbstractJettyTest#getAuthenticatedFeedFetcher() * @see com.rometools.rome.fetcher.impl.AbstractJettyTest#getAuthenticatedFeedFetcher()
*/ */
@Override @Override
public FeedFetcher getAuthenticatedFeedFetcher() { public FeedFetcher getAuthenticatedFeedFetcher() {

4
src/test/java/com/rometools/test/HttpURLFeedFetcherTest.java
View file

@ -27,7 +27,7 @@ public class HttpURLFeedFetcherTest extends AbstractJettyTest {
} }
/** /**
* @see com.sun.syndication.fetcher.impl.AbstractJettyTest#getFeedFetcher() * @see com.rometools.rome.fetcher.impl.AbstractJettyTest#getFeedFetcher()
*/ */
@Override @Override
protected FeedFetcher getFeedFetcher() { protected FeedFetcher getFeedFetcher() {
@ -40,7 +40,7 @@ public class HttpURLFeedFetcherTest extends AbstractJettyTest {
} }
/** /**
* @see com.sun.syndication.fetcher.impl.AbstractJettyTest#getAuthenticatedFeedFetcher() * @see com.rometools.rome.fetcher.impl.AbstractJettyTest#getAuthenticatedFeedFetcher()
*/ */
@Override @Override
public FeedFetcher getAuthenticatedFeedFetcher() { public FeedFetcher getAuthenticatedFeedFetcher() {