Renamed and harmonized packages

This commit is contained in:
Patrick Gotthard 2014-05-30 16:31:52 +02:00
parent e99ccfef27
commit 75b74c357a
33 changed files with 117 additions and 117 deletions

View file

@ -16,7 +16,7 @@
package com.rometools.propono.atom.client; package com.rometools.propono.atom.client;
import com.rometools.propono.utils.ProponoException; import com.rometools.propono.utils.ProponoException;
import com.sun.syndication.io.impl.Atom10Parser; import com.rometools.rome.io.impl.Atom10Parser;
/** /**
* Creates AtomService or ClientCollection based on username, password and end-point URI of Atom * Creates AtomService or ClientCollection based on username, password and end-point URI of Atom

View file

@ -19,7 +19,7 @@ import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpMethodBase; import org.apache.commons.httpclient.HttpMethodBase;
import com.rometools.propono.utils.ProponoException; import com.rometools.propono.utils.ProponoException;
import com.sun.syndication.io.impl.Base64; import com.rometools.rome.io.impl.Base64;
public class BasicAuthStrategy implements AuthStrategy { public class BasicAuthStrategy implements AuthStrategy {
private final String credentials; private final String credentials;

View file

@ -31,14 +31,14 @@ import org.slf4j.LoggerFactory;
import com.rometools.propono.atom.common.AtomService; import com.rometools.propono.atom.common.AtomService;
import com.rometools.propono.utils.ProponoException; import com.rometools.propono.utils.ProponoException;
import com.sun.syndication.feed.atom.Entry; import com.rometools.rome.feed.atom.Entry;
import com.sun.syndication.io.impl.Atom10Parser; import com.rometools.rome.io.impl.Atom10Parser;
/** /**
* This class models an Atom Publising Protocol Service Document. It extends the common * This class models an Atom Publising Protocol Service Document. It extends the common
* {@link com.sun.syndication.propono.atom.common.Collection} class to add a <code>getEntry()</code> * {@link com.rometools.rome.propono.atom.common.Collection} class to add a <code>getEntry()</code>
* method and to return {@link com.sun.syndication.propono.atom.client.ClientWorkspace} objects * method and to return {@link com.rometools.rome.propono.atom.client.ClientWorkspace} objects
* instead of common {@link com.sun.syndication.propono.atom.common.Workspace}s. * instead of common {@link com.rometools.rome.propono.atom.common.Workspace}s.
*/ */
public class ClientAtomService extends AtomService { public class ClientAtomService extends AtomService {

View file

@ -31,7 +31,7 @@ import com.rometools.propono.utils.ProponoException;
/** /**
* Models an Atom protocol Categories element, which may contain ROME Atom * Models an Atom protocol Categories element, which may contain ROME Atom
* {@link com.sun.syndication.feed.atom.Category} elements. * {@link com.rometools.rome.feed.atom.Category} elements.
*/ */
public class ClientCategories extends Categories { public class ClientCategories extends Categories {
private ClientCollection clientCollection = null; private ClientCollection clientCollection = null;

View file

@ -32,8 +32,8 @@ import com.rometools.propono.atom.common.Categories;
import com.rometools.propono.atom.common.Collection; import com.rometools.propono.atom.common.Collection;
import com.rometools.propono.atom.common.Workspace; import com.rometools.propono.atom.common.Workspace;
import com.rometools.propono.utils.ProponoException; import com.rometools.propono.utils.ProponoException;
import com.sun.syndication.feed.atom.Entry; import com.rometools.rome.feed.atom.Entry;
import com.sun.syndication.io.impl.Atom10Parser; import com.rometools.rome.io.impl.Atom10Parser;
/** /**
* Models an Atom collection, extends Collection and adds methods for adding, retrieving, updateing * Models an Atom collection, extends Collection and adds methods for adding, retrieving, updateing

View file

@ -38,11 +38,11 @@ import org.slf4j.LoggerFactory;
import com.rometools.propono.utils.ProponoException; import com.rometools.propono.utils.ProponoException;
import com.rometools.propono.utils.Utilities; import com.rometools.propono.utils.Utilities;
import com.sun.syndication.feed.atom.Content; import com.rometools.rome.feed.atom.Content;
import com.sun.syndication.feed.atom.Entry; import com.rometools.rome.feed.atom.Entry;
import com.sun.syndication.feed.atom.Link; import com.rometools.rome.feed.atom.Link;
import com.sun.syndication.io.impl.Atom10Generator; import com.rometools.rome.io.impl.Atom10Generator;
import com.sun.syndication.io.impl.Atom10Parser; import com.rometools.rome.io.impl.Atom10Parser;
/** /**
* Client implementation of Atom entry, extends ROME Entry to add methods for easily getting/setting * Client implementation of Atom entry, extends ROME Entry to add methods for easily getting/setting
@ -130,8 +130,8 @@ public class ClientEntry extends Entry {
* Update entry by posting new representation of entry to server. Note that you should not * Update entry by posting new representation of entry to server. Note that you should not
* attempt to update entries that you get from iterating over a collection they may be "partial" * attempt to update entries that you get from iterating over a collection they may be "partial"
* entries. If you want to update an entry, you must get it via one of the * entries. If you want to update an entry, you must get it via one of the
* <code>getEntry()</code> methods in {@link com.sun.syndication.propono.atom.common.Collection} * <code>getEntry()</code> methods in {@link com.rometools.rome.propono.atom.common.Collection}
* or {@link com.sun.syndication.propono.atom.common.AtomService}. * or {@link com.rometools.rome.propono.atom.common.AtomService}.
* *
* @throws ProponoException If entry is a "partial" entry. * @throws ProponoException If entry is a "partial" entry.
*/ */

View file

@ -39,12 +39,12 @@ import org.slf4j.LoggerFactory;
import com.rometools.propono.utils.ProponoException; import com.rometools.propono.utils.ProponoException;
import com.rometools.propono.utils.Utilities; import com.rometools.propono.utils.Utilities;
import com.sun.syndication.feed.atom.Content; import com.rometools.rome.feed.atom.Content;
import com.sun.syndication.feed.atom.Entry; import com.rometools.rome.feed.atom.Entry;
import com.sun.syndication.feed.atom.Link; import com.rometools.rome.feed.atom.Link;
import com.sun.syndication.io.FeedException; import com.rometools.rome.io.FeedException;
import com.sun.syndication.io.impl.Atom10Generator; import com.rometools.rome.io.impl.Atom10Generator;
import com.sun.syndication.io.impl.Atom10Parser; import com.rometools.rome.io.impl.Atom10Parser;
/** /**
* Client implementation of Atom media-link entry, an Atom entry that provides meta-data for a media * Client implementation of Atom media-link entry, an Atom entry that provides meta-data for a media

View file

@ -25,9 +25,9 @@ import com.rometools.propono.utils.ProponoException;
/** /**
* Represents Atom protocol workspace on client-side. It extends the common * Represents Atom protocol workspace on client-side. It extends the common
* {@link com.sun.syndication.propono.atom.common.Workspace} to return * {@link com.rometools.rome.propono.atom.common.Workspace} to return
* {@link com.sun.syndication.propono.atom.client.ClientCollection} objects instead of common * {@link com.rometools.rome.propono.atom.client.ClientCollection} objects instead of common
* {@link com.sun.syndication.propono.atom.common.Collection}s. * {@link com.rometools.rome.propono.atom.common.Collection}s.
*/ */
public class ClientWorkspace extends Workspace { public class ClientWorkspace extends Workspace {

View file

@ -26,10 +26,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.rometools.propono.utils.ProponoException; import com.rometools.propono.utils.ProponoException;
import com.sun.syndication.feed.atom.Entry; import com.rometools.rome.feed.atom.Entry;
import com.sun.syndication.feed.atom.Feed; import com.rometools.rome.feed.atom.Feed;
import com.sun.syndication.feed.atom.Link; import com.rometools.rome.feed.atom.Link;
import com.sun.syndication.io.WireFeedInput; import com.rometools.rome.io.WireFeedInput;
/** /**
* Enables iteration over entries in Atom protocol collection. * Enables iteration over entries in Atom protocol collection.

View file

@ -22,12 +22,12 @@ import java.util.List;
import org.jdom2.Element; import org.jdom2.Element;
import com.sun.syndication.feed.atom.Category; import com.rometools.rome.feed.atom.Category;
import com.sun.syndication.io.impl.Atom10Parser; import com.rometools.rome.io.impl.Atom10Parser;
/** /**
* Models an Atom protocol Categories element, which may contain ROME Atom * Models an Atom protocol Categories element, which may contain ROME Atom
* {@link com.sun.syndication.feed.atom.Category} elements. * {@link com.rometools.rome.feed.atom.Category} elements.
*/ */
public class Categories { public class Categories {
@ -56,7 +56,7 @@ public class Categories {
/** /**
* Iterate over Category objects * Iterate over Category objects
* *
* @return List of ROME Atom {@link com.sun.syndication.feed.atom.Category} * @return List of ROME Atom {@link com.rometools.rome.feed.atom.Category}
*/ */
public List<Category> getCategories() { public List<Category> getCategories() {
return categories; return categories;

View file

@ -23,7 +23,7 @@ import java.util.List;
import org.jdom2.Element; import org.jdom2.Element;
import com.rometools.propono.utils.ProponoException; import com.rometools.propono.utils.ProponoException;
import com.sun.syndication.io.impl.Atom10Parser; import com.rometools.rome.io.impl.Atom10Parser;
/** /**
* Models an Atom workspace collection. * Models an Atom workspace collection.
@ -150,7 +150,7 @@ public class Collection {
/** /**
* Get categories allowed by collection. * Get categories allowed by collection.
* *
* @return Collection of {@link com.sun.syndication.propono.atom.common.Categories} objects. * @return Collection of {@link com.rometools.rome.propono.atom.common.Categories} objects.
*/ */
public List<Categories> getCategories() { public List<Categories> getCategories() {
return categories; return categories;

View file

@ -21,7 +21,7 @@ package com.rometools.propono.atom.common.rome;
import java.util.Date; import java.util.Date;
import com.sun.syndication.feed.module.Module; import com.rometools.rome.feed.module.Module;
/** /**
* ROME Extension Module to Atom protocol extensions to Atom format. * ROME Extension Module to Atom protocol extensions to Atom format.

View file

@ -29,8 +29,8 @@ import java.util.TimeZone;
import org.jdom2.Element; import org.jdom2.Element;
import org.jdom2.Namespace; import org.jdom2.Namespace;
import com.sun.syndication.feed.module.Module; import com.rometools.rome.feed.module.Module;
import com.sun.syndication.io.ModuleGenerator; import com.rometools.rome.io.ModuleGenerator;
/** /**
* Creates JDOM representation for APP Extension Module. * Creates JDOM representation for APP Extension Module.

View file

@ -22,8 +22,8 @@ package com.rometools.propono.atom.common.rome;
import java.util.Date; import java.util.Date;
import com.sun.syndication.feed.CopyFrom; import com.rometools.rome.feed.CopyFrom;
import com.sun.syndication.feed.module.ModuleImpl; import com.rometools.rome.feed.module.ModuleImpl;
/** /**
* Bean representation of APP module. * Bean representation of APP module.

View file

@ -24,9 +24,9 @@ import java.util.Locale;
import org.jdom2.Element; import org.jdom2.Element;
import org.jdom2.Namespace; import org.jdom2.Namespace;
import com.sun.syndication.feed.module.Module; import com.rometools.rome.feed.module.Module;
import com.sun.syndication.io.ModuleParser; import com.rometools.rome.io.ModuleParser;
import com.sun.syndication.io.impl.DateParser; import com.rometools.rome.io.impl.DateParser;
/** /**
* Parses APP module information from a JDOM element and into <code>AppModule</code> form. * Parses APP module information from a JDOM element and into <code>AppModule</code> form.

View file

@ -22,7 +22,7 @@ package com.rometools.propono.atom.server;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
/** /**
* Exception thrown by {@link com.sun.syndication.propono.atom.server.AtomHandler} and extended by * Exception thrown by {@link com.rometools.rome.propono.atom.server.AtomHandler} and extended by
* other Propono Atom exception classes. * other Propono Atom exception classes.
*/ */
public class AtomException extends Exception { public class AtomException extends Exception {

View file

@ -21,15 +21,15 @@ package com.rometools.propono.atom.server;
import com.rometools.propono.atom.common.AtomService; import com.rometools.propono.atom.common.AtomService;
import com.rometools.propono.atom.common.Categories; import com.rometools.propono.atom.common.Categories;
import com.sun.syndication.feed.atom.Entry; import com.rometools.rome.feed.atom.Entry;
import com.sun.syndication.feed.atom.Feed; import com.rometools.rome.feed.atom.Feed;
/** /**
* Interface for handling single Atom protocol requests. * Interface for handling single Atom protocol requests.
* *
* <p> * <p>
* To create your own Atom protocol implementation you must implement this interface and create a * To create your own Atom protocol implementation you must implement this interface and create a
* concrete sub-class of {@link com.sun.syndication.propono.atom.server.AtomHandlerFactory} which is * concrete sub-class of {@link com.rometools.rome.propono.atom.server.AtomHandlerFactory} which is
* capable of instantiating it. * capable of instantiating it.
* </p> * </p>
*/ */
@ -40,10 +40,10 @@ public interface AtomHandler {
public String getAuthenticatedUsername(); public String getAuthenticatedUsername();
/** /**
* Return {@link com.sun.syndication.propono.atom.common.AtomService} object that contains the * Return {@link com.rometools.rome.propono.atom.common.AtomService} object that contains the
* {@link com.sun.syndication.propono.atom.common.Workspace} objects available to the currently * {@link com.rometools.rome.propono.atom.common.Workspace} objects available to the currently
* authenticated user and within those the * authenticated user and within those the
* {@link com.sun.syndication.propono.atom.common.Collection} avalaible. * {@link com.rometools.rome.propono.atom.common.Collection} avalaible.
*/ */
public AtomService getAtomService(AtomRequest req) throws AtomException; public AtomService getAtomService(AtomRequest req) throws AtomException;

View file

@ -22,14 +22,14 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
/** /**
* Defines a factory that enables the {@link com.sun.syndication.propono.atom.server.AtomServlet} to * Defines a factory that enables the {@link com.rometools.rome.propono.atom.server.AtomServlet} to
* obtain an {@link com.sun.syndication.propono.atom.server.AtomHandler} that handles an Atom * obtain an {@link com.rometools.rome.propono.atom.server.AtomHandler} that handles an Atom
* request. * request.
* *
* <p> * <p>
* To create your own Atom protocol implementation you must sub-class this class with your own * To create your own Atom protocol implementation you must sub-class this class with your own
* factory that is capable of creating instances of your * factory that is capable of creating instances of your
* {@link com.sun.syndication.propono.atom.server.AtomHandler} impementation. * {@link com.rometools.rome.propono.atom.server.AtomHandler} impementation.
* </p> * </p>
*/ */
public abstract class AtomHandlerFactory { public abstract class AtomHandlerFactory {
@ -51,7 +51,7 @@ public abstract class AtomHandlerFactory {
* <code>AtomHandlerFactory</code> implementation class to load: * <code>AtomHandlerFactory</code> implementation class to load:
* <ul> * <ul>
* <li> * <li>
* Use the <code>com.sun.syndication.propono.atom.server.AtomHandlerFactory</code> system * Use the <code>com.rometools.rome.propono.atom.server.AtomHandlerFactory</code> system
* property.</li> * property.</li>
* <li> * <li>
* Use the properties file "/propono.properties" in the classpath. This configuration file is in * Use the properties file "/propono.properties" in the classpath. This configuration file is in
@ -64,7 +64,7 @@ public abstract class AtomHandlerFactory {
* of any property in propono.properties after it has been read for the first time.</li> * of any property in propono.properties after it has been read for the first time.</li>
* <li> * <li>
* If not available, to determine the classname. The Services API will look for a classname in * If not available, to determine the classname. The Services API will look for a classname in
* the file: <code>META-INF/services/com.sun.syndication.AtomHandlerFactory</code> in jars * the file: <code>META-INF/services/com.rometools.rome.AtomHandlerFactory</code> in jars
* available to the runtime.</li> * available to the runtime.</li>
* <li> * <li>
* Platform default <code>AtomHandlerFactory</code> instance.</li> * Platform default <code>AtomHandlerFactory</code> instance.</li>
@ -88,7 +88,7 @@ public abstract class AtomHandlerFactory {
} }
/** /**
* Creates a new instance of a {@link com.sun.syndication.propono.atom.server.AtomHandler} using * Creates a new instance of a {@link com.rometools.rome.propono.atom.server.AtomHandler} using
* the currently configured parameters. * the currently configured parameters.
* *
* @return A new instance of a AtomHandler. * @return A new instance of a AtomHandler.

View file

@ -41,18 +41,18 @@ import org.slf4j.LoggerFactory;
import com.rometools.propono.atom.common.AtomService; import com.rometools.propono.atom.common.AtomService;
import com.rometools.propono.atom.common.Categories; import com.rometools.propono.atom.common.Categories;
import com.rometools.propono.utils.Utilities; import com.rometools.propono.utils.Utilities;
import com.sun.syndication.feed.atom.Content; import com.rometools.rome.feed.atom.Content;
import com.sun.syndication.feed.atom.Entry; import com.rometools.rome.feed.atom.Entry;
import com.sun.syndication.feed.atom.Feed; import com.rometools.rome.feed.atom.Feed;
import com.sun.syndication.feed.atom.Link; import com.rometools.rome.feed.atom.Link;
import com.sun.syndication.io.WireFeedOutput; import com.rometools.rome.io.WireFeedOutput;
import com.sun.syndication.io.impl.Atom10Generator; import com.rometools.rome.io.impl.Atom10Generator;
import com.sun.syndication.io.impl.Atom10Parser; import com.rometools.rome.io.impl.Atom10Parser;
/** /**
* Atom Servlet implements Atom protocol by calling an * Atom Servlet implements Atom protocol by calling an
* {@link com.sun.syndication.propono.atom.server.AtomHandler} implementation. This servlet takes * {@link com.rometools.rome.propono.atom.server.AtomHandler} implementation. This servlet takes
* care of parsing incoming XML into ROME Atom {@link com.sun.syndication.feed.atom.Entry} objects, * care of parsing incoming XML into ROME Atom {@link com.rometools.rome.feed.atom.Entry} objects,
* passing those to the handler and serializing to the response the entries and feeds returned by * passing those to the handler and serializing to the response the entries and feeds returned by
* the handler. * the handler.
*/ */

View file

@ -17,7 +17,7 @@ package com.rometools.propono.atom.server;
/** /**
* Thrown when a problem with configuration with the * Thrown when a problem with configuration with the
* {@link com.sun.syndication.propono.atom.server.AtomHandlerFactory} exists. This error will * {@link com.rometools.rome.propono.atom.server.AtomHandlerFactory} exists. This error will
* typically be thrown when the class of a parser factory specified in the system properties cannot * typically be thrown when the class of a parser factory specified in the system properties cannot
* be found or instantiated. * be found or instantiated.
*/ */

View file

@ -22,7 +22,7 @@ import java.io.InputStreamReader;
import java.util.Properties; import java.util.Properties;
/** /**
* Find {@link com.sun.syndication.propono.atom.server.AtomHandlerFactory} based on properties * Find {@link com.rometools.rome.propono.atom.server.AtomHandlerFactory} based on properties
* files. * files.
*/ */
class FactoryFinder { class FactoryFinder {

View file

@ -32,13 +32,13 @@ import com.rometools.propono.atom.server.AtomHandler;
import com.rometools.propono.atom.server.AtomMediaResource; import com.rometools.propono.atom.server.AtomMediaResource;
import com.rometools.propono.atom.server.AtomRequest; import com.rometools.propono.atom.server.AtomRequest;
import com.rometools.propono.atom.server.AtomServlet; import com.rometools.propono.atom.server.AtomServlet;
import com.sun.syndication.feed.atom.Entry; import com.rometools.rome.feed.atom.Entry;
import com.sun.syndication.feed.atom.Feed; import com.rometools.rome.feed.atom.Feed;
/** /**
* File-based {@link com.sun.syndication.propono.atom.server.AtomHandler} implementation that stores * File-based {@link com.rometools.rome.propono.atom.server.AtomHandler} implementation that stores
* entries and media-entries to disk. Implemented using * entries and media-entries to disk. Implemented using
* {@link com.sun.syndication.propono.atom.server.impl.FileBasedAtomService}. * {@link com.rometools.rome.propono.atom.server.impl.FileBasedAtomService}.
*/ */
public class FileBasedAtomHandler implements AtomHandler { public class FileBasedAtomHandler implements AtomHandler {
@ -118,7 +118,7 @@ public class FileBasedAtomHandler implements AtomHandler {
/** /**
* Return introspection document * Return introspection document
* *
* @throws com.sun.syndication.propono.atom.server.AtomException Unexpected exception. * @throws com.rometools.rome.propono.atom.server.AtomException Unexpected exception.
* @return AtomService object with workspaces and collections. * @return AtomService object with workspaces and collections.
*/ */
@Override @Override
@ -129,7 +129,7 @@ public class FileBasedAtomHandler implements AtomHandler {
/** /**
* Returns null because we use in-line categories. * Returns null because we use in-line categories.
* *
* @throws com.sun.syndication.propono.atom.server.AtomException Unexpected exception. * @throws com.rometools.rome.propono.atom.server.AtomException Unexpected exception.
* @return Categories object * @return Categories object
*/ */
@Override @Override
@ -147,7 +147,7 @@ public class FileBasedAtomHandler implements AtomHandler {
* *
* @param areq Details of HTTP request * @param areq Details of HTTP request
* @return ROME feed representing collection. * @return ROME feed representing collection.
* @throws com.sun.syndication.propono.atom.server.AtomException Invalid collection or other * @throws com.rometools.rome.propono.atom.server.AtomException Invalid collection or other
* exception. * exception.
*/ */
@Override @Override
@ -166,7 +166,7 @@ public class FileBasedAtomHandler implements AtomHandler {
* *
* @param entry Entry to be added to collection. * @param entry Entry to be added to collection.
* @param areq Details of HTTP request * @param areq Details of HTTP request
* @throws com.sun.syndication.propono.atom.server.AtomException On invalid collection or other * @throws com.rometools.rome.propono.atom.server.AtomException On invalid collection or other
* error. * error.
* @return Entry as represented on server. * @return Entry as represented on server.
*/ */
@ -191,7 +191,7 @@ public class FileBasedAtomHandler implements AtomHandler {
* Get entry specified by pathInfo. * Get entry specified by pathInfo.
* *
* @param areq Details of HTTP request * @param areq Details of HTTP request
* @throws com.sun.syndication.propono.atom.server.AtomException On invalid pathinfo or other * @throws com.rometools.rome.propono.atom.server.AtomException On invalid pathinfo or other
* error. * error.
* @return ROME Entry object. * @return ROME Entry object.
*/ */
@ -219,7 +219,7 @@ public class FileBasedAtomHandler implements AtomHandler {
* *
* @param entry * @param entry
* @param areq Details of HTTP request * @param areq Details of HTTP request
* @throws com.sun.syndication.propono.atom.server.AtomException * @throws com.rometools.rome.propono.atom.server.AtomException
*/ */
@Override @Override
public void putEntry(final AtomRequest areq, final Entry entry) throws AtomException { public void putEntry(final AtomRequest areq, final Entry entry) throws AtomException {

View file

@ -22,8 +22,8 @@ import com.rometools.propono.atom.server.AtomHandler;
import com.rometools.propono.atom.server.AtomHandlerFactory; import com.rometools.propono.atom.server.AtomHandlerFactory;
/** /**
* Extends {@link com.sun.syndication.propono.atom.server.AtomHandlerFactory} to create and return * Extends {@link com.rometools.rome.propono.atom.server.AtomHandlerFactory} to create and return
* {@link com.sun.syndication.propono.atom.server.impl.FileBasedAtomHandler}. * {@link com.rometools.rome.propono.atom.server.impl.FileBasedAtomHandler}.
*/ */
public class FileBasedAtomHandlerFactory extends AtomHandlerFactory { public class FileBasedAtomHandlerFactory extends AtomHandlerFactory {

View file

@ -46,18 +46,18 @@ import com.rometools.propono.atom.server.AtomException;
import com.rometools.propono.atom.server.AtomMediaResource; import com.rometools.propono.atom.server.AtomMediaResource;
import com.rometools.propono.atom.server.AtomNotFoundException; import com.rometools.propono.atom.server.AtomNotFoundException;
import com.rometools.propono.utils.Utilities; import com.rometools.propono.utils.Utilities;
import com.sun.syndication.feed.WireFeed; import com.rometools.rome.feed.WireFeed;
import com.sun.syndication.feed.atom.Category; import com.rometools.rome.feed.atom.Category;
import com.sun.syndication.feed.atom.Content; import com.rometools.rome.feed.atom.Content;
import com.sun.syndication.feed.atom.Entry; import com.rometools.rome.feed.atom.Entry;
import com.sun.syndication.feed.atom.Feed; import com.rometools.rome.feed.atom.Feed;
import com.sun.syndication.feed.atom.Link; import com.rometools.rome.feed.atom.Link;
import com.sun.syndication.feed.module.Module; import com.rometools.rome.feed.module.Module;
import com.sun.syndication.io.FeedException; import com.rometools.rome.io.FeedException;
import com.sun.syndication.io.WireFeedInput; import com.rometools.rome.io.WireFeedInput;
import com.sun.syndication.io.WireFeedOutput; import com.rometools.rome.io.WireFeedOutput;
import com.sun.syndication.io.impl.Atom10Generator; import com.rometools.rome.io.impl.Atom10Generator;
import com.sun.syndication.io.impl.Atom10Parser; import com.rometools.rome.io.impl.Atom10Parser;
/** /**
* File based Atom collection implementation. This is the heart of the file-based Atom service * File based Atom collection implementation. This is the heart of the file-based Atom service
@ -121,7 +121,7 @@ public class FileBasedCollection extends Collection {
/** /**
* Get feed document representing collection. * Get feed document representing collection.
* *
* @throws com.sun.syndication.propono.atom.server.AtomException On error retrieving feed file. * @throws com.rometools.rome.propono.atom.server.AtomException On error retrieving feed file.
* @return Atom Feed representing collection. * @return Atom Feed representing collection.
*/ */
public Feed getFeedDocument() throws AtomException { public Feed getFeedDocument() throws AtomException {

View file

@ -45,7 +45,7 @@ public interface Blog {
* Get a single BlogEntry (or BlogResource) by token. * Get a single BlogEntry (or BlogResource) by token.
* *
* @param token Token from blog entry's getToken() method. * @param token Token from blog entry's getToken() method.
* @throws com.sun.syndication.propono.blogclient.BlogClientException On error fetching the blog * @throws com.rometools.rome.propono.blogclient.BlogClientException On error fetching the blog
* entry. * entry.
* @return Blog entry specified by token. * @return Blog entry specified by token.
*/ */

View file

@ -27,7 +27,7 @@ import com.rometools.propono.blogclient.Blog;
import com.rometools.propono.blogclient.BlogClientException; import com.rometools.propono.blogclient.BlogClientException;
import com.rometools.propono.blogclient.BlogEntry; import com.rometools.propono.blogclient.BlogEntry;
import com.rometools.propono.blogclient.BlogResource; import com.rometools.propono.blogclient.BlogResource;
import com.sun.syndication.feed.atom.Category; import com.rometools.rome.feed.atom.Category;
/** /**
* Atom protocol implementation of BlogClient Blog.Collection. * Atom protocol implementation of BlogClient Blog.Collection.

View file

@ -26,10 +26,10 @@ import com.rometools.propono.blogclient.BaseBlogEntry;
import com.rometools.propono.blogclient.BlogClientException; import com.rometools.propono.blogclient.BlogClientException;
import com.rometools.propono.blogclient.BlogEntry; import com.rometools.propono.blogclient.BlogEntry;
import com.rometools.propono.utils.ProponoException; import com.rometools.propono.utils.ProponoException;
import com.sun.syndication.feed.atom.Entry; import com.rometools.rome.feed.atom.Entry;
import com.sun.syndication.feed.atom.Link; import com.rometools.rome.feed.atom.Link;
import com.sun.syndication.feed.module.Module; import com.rometools.rome.feed.module.Module;
import com.sun.syndication.feed.synd.SyndPerson; import com.rometools.rome.feed.synd.SyndPerson;
/** /**
* Atom protocol implementation of BlogEntry. * Atom protocol implementation of BlogEntry.
@ -135,8 +135,8 @@ public class AtomEntry extends BaseBlogEntry implements BlogEntry {
} }
} }
} }
final List<com.sun.syndication.feed.atom.Content> contents = entry.getContents(); final List<com.rometools.rome.feed.atom.Content> contents = entry.getContents();
com.sun.syndication.feed.atom.Content romeContent = null; com.rometools.rome.feed.atom.Content romeContent = null;
if (contents != null && !contents.isEmpty()) { if (contents != null && !contents.isEmpty()) {
romeContent = contents.get(0); romeContent = contents.get(0);
} }
@ -147,8 +147,8 @@ public class AtomEntry extends BaseBlogEntry implements BlogEntry {
} }
if (entry.getCategories() != null) { if (entry.getCategories() != null) {
final List<Category> cats = new ArrayList<Category>(); final List<Category> cats = new ArrayList<Category>();
final List<com.sun.syndication.feed.atom.Category> romeCats = entry.getCategories(); final List<com.rometools.rome.feed.atom.Category> romeCats = entry.getCategories();
for (final com.sun.syndication.feed.atom.Category romeCat : romeCats) { for (final com.rometools.rome.feed.atom.Category romeCat : romeCats) {
final BlogEntry.Category cat = new BlogEntry.Category(); final BlogEntry.Category cat = new BlogEntry.Category();
cat.setId(romeCat.getTerm()); cat.setId(romeCat.getTerm());
cat.setUrl(romeCat.getScheme()); cat.setUrl(romeCat.getScheme());
@ -159,7 +159,7 @@ public class AtomEntry extends BaseBlogEntry implements BlogEntry {
} }
final List<SyndPerson> authors = entry.getAuthors(); final List<SyndPerson> authors = entry.getAuthors();
if (authors != null && !authors.isEmpty()) { if (authors != null && !authors.isEmpty()) {
final com.sun.syndication.feed.atom.Person romeAuthor = (com.sun.syndication.feed.atom.Person) authors.get(0); final com.rometools.rome.feed.atom.Person romeAuthor = (com.rometools.rome.feed.atom.Person) authors.get(0);
if (romeAuthor != null) { if (romeAuthor != null) {
author = new Person(); author = new Person();
author.setName(romeAuthor.getName()); author.setName(romeAuthor.getName());
@ -184,7 +184,7 @@ public class AtomEntry extends BaseBlogEntry implements BlogEntry {
} }
entry.setTitle(title); entry.setTitle(title);
if (author != null) { if (author != null) {
final com.sun.syndication.feed.atom.Person person = new com.sun.syndication.feed.atom.Person(); final com.rometools.rome.feed.atom.Person person = new com.rometools.rome.feed.atom.Person();
person.setName(author.getName()); person.setName(author.getName());
person.setEmail(author.getEmail()); person.setEmail(author.getEmail());
person.setUrl(author.getUrl()); person.setUrl(author.getUrl());
@ -193,17 +193,17 @@ public class AtomEntry extends BaseBlogEntry implements BlogEntry {
entry.setAuthors(authors); entry.setAuthors(authors);
} }
if (content != null) { if (content != null) {
final com.sun.syndication.feed.atom.Content romeContent = new com.sun.syndication.feed.atom.Content(); final com.rometools.rome.feed.atom.Content romeContent = new com.rometools.rome.feed.atom.Content();
romeContent.setValue(content.getValue()); romeContent.setValue(content.getValue());
romeContent.setType(content.getType()); romeContent.setType(content.getType());
final List<com.sun.syndication.feed.atom.Content> contents = new ArrayList<com.sun.syndication.feed.atom.Content>(); final List<com.rometools.rome.feed.atom.Content> contents = new ArrayList<com.rometools.rome.feed.atom.Content>();
contents.add(romeContent); contents.add(romeContent);
entry.setContents(contents); entry.setContents(contents);
} }
if (categories != null) { if (categories != null) {
final List<com.sun.syndication.feed.atom.Category> romeCats = new ArrayList<com.sun.syndication.feed.atom.Category>(); final List<com.rometools.rome.feed.atom.Category> romeCats = new ArrayList<com.rometools.rome.feed.atom.Category>();
for (final Category cat : categories) { for (final Category cat : categories) {
final com.sun.syndication.feed.atom.Category romeCategory = new com.sun.syndication.feed.atom.Category(); final com.rometools.rome.feed.atom.Category romeCategory = new com.rometools.rome.feed.atom.Category();
romeCategory.setTerm(cat.getId()); romeCategory.setTerm(cat.getId());
romeCategory.setScheme(cat.getUrl()); romeCategory.setScheme(cat.getUrl());
romeCategory.setLabel(cat.getName()); romeCategory.setLabel(cat.getName());

View file

@ -25,7 +25,7 @@ import com.rometools.propono.atom.client.ClientMediaEntry;
import com.rometools.propono.blogclient.BlogClientException; import com.rometools.propono.blogclient.BlogClientException;
import com.rometools.propono.blogclient.BlogEntry; import com.rometools.propono.blogclient.BlogEntry;
import com.rometools.propono.blogclient.BlogResource; import com.rometools.propono.blogclient.BlogResource;
import com.sun.syndication.feed.atom.Link; import com.rometools.rome.feed.atom.Link;
/** /**
* Atom protocol implementation of BlogResource. * Atom protocol implementation of BlogResource.

View file

@ -30,8 +30,8 @@ import org.slf4j.LoggerFactory;
import com.rometools.propono.atom.common.Categories; import com.rometools.propono.atom.common.Categories;
import com.rometools.propono.atom.common.Collection; import com.rometools.propono.atom.common.Collection;
import com.rometools.propono.utils.ProponoException; import com.rometools.propono.utils.ProponoException;
import com.sun.syndication.feed.atom.Category; import com.rometools.rome.feed.atom.Category;
import com.sun.syndication.feed.atom.Content; import com.rometools.rome.feed.atom.Content;
/** /**
* Simple APP test designed to run against a live Atom server. * Simple APP test designed to run against a live Atom server.

View file

@ -23,7 +23,7 @@ import junit.framework.TestSuite;
import org.junit.Ignore; import org.junit.Ignore;
import com.sun.syndication.feed.atom.Content; import com.rometools.rome.feed.atom.Content;
/** /**
* Simple APP test designed to run against Blogger.com. * Simple APP test designed to run against Blogger.com.

View file

@ -39,7 +39,7 @@ public class CollectionTest extends TestCase {
} }
/** /**
* Test of accepts method, of class com.sun.syndication.propono.atom.common.Collection. * Test of accepts method, of class com.rometools.rome.propono.atom.common.Collection.
*/ */
public void testAccepts() { public void testAccepts() {

View file

@ -45,8 +45,8 @@ import com.rometools.propono.atom.common.Categories;
import com.rometools.propono.atom.common.Collection; import com.rometools.propono.atom.common.Collection;
import com.rometools.propono.atom.common.Workspace; import com.rometools.propono.atom.common.Workspace;
import com.rometools.propono.utils.ProponoException; import com.rometools.propono.utils.ProponoException;
import com.sun.syndication.feed.atom.Category; import com.rometools.rome.feed.atom.Category;
import com.sun.syndication.feed.atom.Content; import com.rometools.rome.feed.atom.Content;
/** /**
* Test Propono Atom Client against Atom Server via Jetty. Extends <code>AtomClientTest</code> to * Test Propono Atom Client against Atom Server via Jetty. Extends <code>AtomClientTest</code> to

View file

@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory;
import com.rometools.propono.blogclient.Blog.Collection; import com.rometools.propono.blogclient.Blog.Collection;
import com.rometools.propono.utils.Utilities; import com.rometools.propono.utils.Utilities;
import com.sun.syndication.io.impl.Atom10Parser; import com.rometools.rome.io.impl.Atom10Parser;
/** /**
* Tests Atom and MetaWeblog API CRUD via BlogClient. Exclude this from automated tests because it * Tests Atom and MetaWeblog API CRUD via BlogClient. Exclude this from automated tests because it