From 75b74c357a447a52849aa63ed9b28da20c04add0 Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Fri, 30 May 2014 16:31:52 +0200 Subject: [PATCH] Renamed and harmonized packages --- .../atom/client/AtomClientFactory.java | 2 +- .../atom/client/BasicAuthStrategy.java | 2 +- .../atom/client/ClientAtomService.java | 10 +++---- .../propono/atom/client/ClientCategories.java | 2 +- .../propono/atom/client/ClientCollection.java | 4 +-- .../propono/atom/client/ClientEntry.java | 14 +++++----- .../propono/atom/client/ClientMediaEntry.java | 12 ++++---- .../propono/atom/client/ClientWorkspace.java | 6 ++-- .../propono/atom/client/EntryIterator.java | 8 +++--- .../propono/atom/common/Categories.java | 8 +++--- .../propono/atom/common/Collection.java | 4 +-- .../propono/atom/common/rome/AppModule.java | 2 +- .../atom/common/rome/AppModuleGenerator.java | 4 +-- .../atom/common/rome/AppModuleImpl.java | 4 +-- .../atom/common/rome/AppModuleParser.java | 6 ++-- .../propono/atom/server/AtomException.java | 2 +- .../propono/atom/server/AtomHandler.java | 12 ++++---- .../atom/server/AtomHandlerFactory.java | 12 ++++---- .../propono/atom/server/AtomServlet.java | 18 ++++++------ .../server/FactoryConfigurationError.java | 2 +- .../propono/atom/server/FactoryFinder.java | 2 +- .../server/impl/FileBasedAtomHandler.java | 20 ++++++------- .../impl/FileBasedAtomHandlerFactory.java | 4 +-- .../atom/server/impl/FileBasedCollection.java | 26 ++++++++--------- .../rometools/propono/blogclient/Blog.java | 2 +- .../atomprotocol/AtomCollection.java | 2 +- .../blogclient/atomprotocol/AtomEntry.java | 28 +++++++++---------- .../blogclient/atomprotocol/AtomResource.java | 2 +- .../propono/atom/client/AtomClientTest.java | 4 +-- .../atom/client/BloggerDotComTest.java | 2 +- .../propono/atom/common/CollectionTest.java | 2 +- .../atom/server/AtomClientServerTest.java | 4 +-- .../blogclient/SimpleBlogClientTest.java | 2 +- 33 files changed, 117 insertions(+), 117 deletions(-) diff --git a/src/main/java/com/rometools/propono/atom/client/AtomClientFactory.java b/src/main/java/com/rometools/propono/atom/client/AtomClientFactory.java index 3a0e675..281baaf 100644 --- a/src/main/java/com/rometools/propono/atom/client/AtomClientFactory.java +++ b/src/main/java/com/rometools/propono/atom/client/AtomClientFactory.java @@ -16,7 +16,7 @@ package com.rometools.propono.atom.client; 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 diff --git a/src/main/java/com/rometools/propono/atom/client/BasicAuthStrategy.java b/src/main/java/com/rometools/propono/atom/client/BasicAuthStrategy.java index 38077b8..8bf51e4 100644 --- a/src/main/java/com/rometools/propono/atom/client/BasicAuthStrategy.java +++ b/src/main/java/com/rometools/propono/atom/client/BasicAuthStrategy.java @@ -19,7 +19,7 @@ import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpMethodBase; 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 { private final String credentials; diff --git a/src/main/java/com/rometools/propono/atom/client/ClientAtomService.java b/src/main/java/com/rometools/propono/atom/client/ClientAtomService.java index 30d5cb0..77ca1ca 100644 --- a/src/main/java/com/rometools/propono/atom/client/ClientAtomService.java +++ b/src/main/java/com/rometools/propono/atom/client/ClientAtomService.java @@ -31,14 +31,14 @@ import org.slf4j.LoggerFactory; import com.rometools.propono.atom.common.AtomService; import com.rometools.propono.utils.ProponoException; -import com.sun.syndication.feed.atom.Entry; -import com.sun.syndication.io.impl.Atom10Parser; +import com.rometools.rome.feed.atom.Entry; +import com.rometools.rome.io.impl.Atom10Parser; /** * 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 getEntry() - * method and to return {@link com.sun.syndication.propono.atom.client.ClientWorkspace} objects - * instead of common {@link com.sun.syndication.propono.atom.common.Workspace}s. + * {@link com.rometools.rome.propono.atom.common.Collection} class to add a getEntry() + * method and to return {@link com.rometools.rome.propono.atom.client.ClientWorkspace} objects + * instead of common {@link com.rometools.rome.propono.atom.common.Workspace}s. */ public class ClientAtomService extends AtomService { diff --git a/src/main/java/com/rometools/propono/atom/client/ClientCategories.java b/src/main/java/com/rometools/propono/atom/client/ClientCategories.java index 83286ec..229430d 100644 --- a/src/main/java/com/rometools/propono/atom/client/ClientCategories.java +++ b/src/main/java/com/rometools/propono/atom/client/ClientCategories.java @@ -31,7 +31,7 @@ import com.rometools.propono.utils.ProponoException; /** * 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 { private ClientCollection clientCollection = null; diff --git a/src/main/java/com/rometools/propono/atom/client/ClientCollection.java b/src/main/java/com/rometools/propono/atom/client/ClientCollection.java index e6cb354..a96f0b8 100644 --- a/src/main/java/com/rometools/propono/atom/client/ClientCollection.java +++ b/src/main/java/com/rometools/propono/atom/client/ClientCollection.java @@ -32,8 +32,8 @@ 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.utils.ProponoException; -import com.sun.syndication.feed.atom.Entry; -import com.sun.syndication.io.impl.Atom10Parser; +import com.rometools.rome.feed.atom.Entry; +import com.rometools.rome.io.impl.Atom10Parser; /** * Models an Atom collection, extends Collection and adds methods for adding, retrieving, updateing diff --git a/src/main/java/com/rometools/propono/atom/client/ClientEntry.java b/src/main/java/com/rometools/propono/atom/client/ClientEntry.java index 8d25295..1af10cb 100644 --- a/src/main/java/com/rometools/propono/atom/client/ClientEntry.java +++ b/src/main/java/com/rometools/propono/atom/client/ClientEntry.java @@ -38,11 +38,11 @@ import org.slf4j.LoggerFactory; import com.rometools.propono.utils.ProponoException; import com.rometools.propono.utils.Utilities; -import com.sun.syndication.feed.atom.Content; -import com.sun.syndication.feed.atom.Entry; -import com.sun.syndication.feed.atom.Link; -import com.sun.syndication.io.impl.Atom10Generator; -import com.sun.syndication.io.impl.Atom10Parser; +import com.rometools.rome.feed.atom.Content; +import com.rometools.rome.feed.atom.Entry; +import com.rometools.rome.feed.atom.Link; +import com.rometools.rome.io.impl.Atom10Generator; +import com.rometools.rome.io.impl.Atom10Parser; /** * 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 * 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 - * getEntry() methods in {@link com.sun.syndication.propono.atom.common.Collection} - * or {@link com.sun.syndication.propono.atom.common.AtomService}. + * getEntry() methods in {@link com.rometools.rome.propono.atom.common.Collection} + * or {@link com.rometools.rome.propono.atom.common.AtomService}. * * @throws ProponoException If entry is a "partial" entry. */ diff --git a/src/main/java/com/rometools/propono/atom/client/ClientMediaEntry.java b/src/main/java/com/rometools/propono/atom/client/ClientMediaEntry.java index baa9ab2..049f039 100644 --- a/src/main/java/com/rometools/propono/atom/client/ClientMediaEntry.java +++ b/src/main/java/com/rometools/propono/atom/client/ClientMediaEntry.java @@ -39,12 +39,12 @@ import org.slf4j.LoggerFactory; import com.rometools.propono.utils.ProponoException; import com.rometools.propono.utils.Utilities; -import com.sun.syndication.feed.atom.Content; -import com.sun.syndication.feed.atom.Entry; -import com.sun.syndication.feed.atom.Link; -import com.sun.syndication.io.FeedException; -import com.sun.syndication.io.impl.Atom10Generator; -import com.sun.syndication.io.impl.Atom10Parser; +import com.rometools.rome.feed.atom.Content; +import com.rometools.rome.feed.atom.Entry; +import com.rometools.rome.feed.atom.Link; +import com.rometools.rome.io.FeedException; +import com.rometools.rome.io.impl.Atom10Generator; +import com.rometools.rome.io.impl.Atom10Parser; /** * Client implementation of Atom media-link entry, an Atom entry that provides meta-data for a media diff --git a/src/main/java/com/rometools/propono/atom/client/ClientWorkspace.java b/src/main/java/com/rometools/propono/atom/client/ClientWorkspace.java index 399e2c0..e06b7e0 100644 --- a/src/main/java/com/rometools/propono/atom/client/ClientWorkspace.java +++ b/src/main/java/com/rometools/propono/atom/client/ClientWorkspace.java @@ -25,9 +25,9 @@ import com.rometools.propono.utils.ProponoException; /** * Represents Atom protocol workspace on client-side. It extends the common - * {@link com.sun.syndication.propono.atom.common.Workspace} to return - * {@link com.sun.syndication.propono.atom.client.ClientCollection} objects instead of common - * {@link com.sun.syndication.propono.atom.common.Collection}s. + * {@link com.rometools.rome.propono.atom.common.Workspace} to return + * {@link com.rometools.rome.propono.atom.client.ClientCollection} objects instead of common + * {@link com.rometools.rome.propono.atom.common.Collection}s. */ public class ClientWorkspace extends Workspace { diff --git a/src/main/java/com/rometools/propono/atom/client/EntryIterator.java b/src/main/java/com/rometools/propono/atom/client/EntryIterator.java index a9c8202..a92d2ba 100644 --- a/src/main/java/com/rometools/propono/atom/client/EntryIterator.java +++ b/src/main/java/com/rometools/propono/atom/client/EntryIterator.java @@ -26,10 +26,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.rometools.propono.utils.ProponoException; -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.io.WireFeedInput; +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.io.WireFeedInput; /** * Enables iteration over entries in Atom protocol collection. diff --git a/src/main/java/com/rometools/propono/atom/common/Categories.java b/src/main/java/com/rometools/propono/atom/common/Categories.java index 067a1ba..c3bde6e 100644 --- a/src/main/java/com/rometools/propono/atom/common/Categories.java +++ b/src/main/java/com/rometools/propono/atom/common/Categories.java @@ -22,12 +22,12 @@ import java.util.List; import org.jdom2.Element; -import com.sun.syndication.feed.atom.Category; -import com.sun.syndication.io.impl.Atom10Parser; +import com.rometools.rome.feed.atom.Category; +import com.rometools.rome.io.impl.Atom10Parser; /** * 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 { @@ -56,7 +56,7 @@ public class Categories { /** * 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 getCategories() { return categories; diff --git a/src/main/java/com/rometools/propono/atom/common/Collection.java b/src/main/java/com/rometools/propono/atom/common/Collection.java index a0037db..9fb0834 100644 --- a/src/main/java/com/rometools/propono/atom/common/Collection.java +++ b/src/main/java/com/rometools/propono/atom/common/Collection.java @@ -23,7 +23,7 @@ import java.util.List; import org.jdom2.Element; 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. @@ -150,7 +150,7 @@ public class 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 getCategories() { return categories; diff --git a/src/main/java/com/rometools/propono/atom/common/rome/AppModule.java b/src/main/java/com/rometools/propono/atom/common/rome/AppModule.java index 5811a90..dde22be 100644 --- a/src/main/java/com/rometools/propono/atom/common/rome/AppModule.java +++ b/src/main/java/com/rometools/propono/atom/common/rome/AppModule.java @@ -21,7 +21,7 @@ package com.rometools.propono.atom.common.rome; 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. diff --git a/src/main/java/com/rometools/propono/atom/common/rome/AppModuleGenerator.java b/src/main/java/com/rometools/propono/atom/common/rome/AppModuleGenerator.java index 221a535..7f57b6d 100644 --- a/src/main/java/com/rometools/propono/atom/common/rome/AppModuleGenerator.java +++ b/src/main/java/com/rometools/propono/atom/common/rome/AppModuleGenerator.java @@ -29,8 +29,8 @@ import java.util.TimeZone; 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; /** * Creates JDOM representation for APP Extension Module. diff --git a/src/main/java/com/rometools/propono/atom/common/rome/AppModuleImpl.java b/src/main/java/com/rometools/propono/atom/common/rome/AppModuleImpl.java index 273e8f6..c1a42e3 100644 --- a/src/main/java/com/rometools/propono/atom/common/rome/AppModuleImpl.java +++ b/src/main/java/com/rometools/propono/atom/common/rome/AppModuleImpl.java @@ -22,8 +22,8 @@ package com.rometools.propono.atom.common.rome; import java.util.Date; -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; /** * Bean representation of APP module. diff --git a/src/main/java/com/rometools/propono/atom/common/rome/AppModuleParser.java b/src/main/java/com/rometools/propono/atom/common/rome/AppModuleParser.java index 99ae4f0..a9d0e87 100644 --- a/src/main/java/com/rometools/propono/atom/common/rome/AppModuleParser.java +++ b/src/main/java/com/rometools/propono/atom/common/rome/AppModuleParser.java @@ -24,9 +24,9 @@ import java.util.Locale; import org.jdom2.Element; import org.jdom2.Namespace; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.io.ModuleParser; -import com.sun.syndication.io.impl.DateParser; +import com.rometools.rome.feed.module.Module; +import com.rometools.rome.io.ModuleParser; +import com.rometools.rome.io.impl.DateParser; /** * Parses APP module information from a JDOM element and into AppModule form. diff --git a/src/main/java/com/rometools/propono/atom/server/AtomException.java b/src/main/java/com/rometools/propono/atom/server/AtomException.java index 8fe0930..c8d06e4 100644 --- a/src/main/java/com/rometools/propono/atom/server/AtomException.java +++ b/src/main/java/com/rometools/propono/atom/server/AtomException.java @@ -22,7 +22,7 @@ package com.rometools.propono.atom.server; 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. */ public class AtomException extends Exception { diff --git a/src/main/java/com/rometools/propono/atom/server/AtomHandler.java b/src/main/java/com/rometools/propono/atom/server/AtomHandler.java index 6a5b061..f08762b 100644 --- a/src/main/java/com/rometools/propono/atom/server/AtomHandler.java +++ b/src/main/java/com/rometools/propono/atom/server/AtomHandler.java @@ -21,15 +21,15 @@ package com.rometools.propono.atom.server; import com.rometools.propono.atom.common.AtomService; import com.rometools.propono.atom.common.Categories; -import com.sun.syndication.feed.atom.Entry; -import com.sun.syndication.feed.atom.Feed; +import com.rometools.rome.feed.atom.Entry; +import com.rometools.rome.feed.atom.Feed; /** * Interface for handling single Atom protocol requests. * *

* 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. *

*/ @@ -40,10 +40,10 @@ public interface AtomHandler { public String getAuthenticatedUsername(); /** - * Return {@link com.sun.syndication.propono.atom.common.AtomService} object that contains the - * {@link com.sun.syndication.propono.atom.common.Workspace} objects available to the currently + * Return {@link com.rometools.rome.propono.atom.common.AtomService} object that contains the + * {@link com.rometools.rome.propono.atom.common.Workspace} objects available to the currently * 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; diff --git a/src/main/java/com/rometools/propono/atom/server/AtomHandlerFactory.java b/src/main/java/com/rometools/propono/atom/server/AtomHandlerFactory.java index f8dd35b..3bd635f 100644 --- a/src/main/java/com/rometools/propono/atom/server/AtomHandlerFactory.java +++ b/src/main/java/com/rometools/propono/atom/server/AtomHandlerFactory.java @@ -22,14 +22,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * Defines a factory that enables the {@link com.sun.syndication.propono.atom.server.AtomServlet} to - * obtain an {@link com.sun.syndication.propono.atom.server.AtomHandler} that handles an Atom + * Defines a factory that enables the {@link com.rometools.rome.propono.atom.server.AtomServlet} to + * obtain an {@link com.rometools.rome.propono.atom.server.AtomHandler} that handles an Atom * request. * *

* 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 - * {@link com.sun.syndication.propono.atom.server.AtomHandler} impementation. + * {@link com.rometools.rome.propono.atom.server.AtomHandler} impementation. *

*/ public abstract class AtomHandlerFactory { @@ -51,7 +51,7 @@ public abstract class AtomHandlerFactory { * AtomHandlerFactory implementation class to load: *
    *
  • - * Use the com.sun.syndication.propono.atom.server.AtomHandlerFactory system + * Use the com.rometools.rome.propono.atom.server.AtomHandlerFactory system * property.
    • *
  • * 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.
    • *
  • * If not available, to determine the classname. The Services API will look for a classname in - * the file: META-INF/services/com.sun.syndication.AtomHandlerFactory in jars + * the file: META-INF/services/com.rometools.rome.AtomHandlerFactory in jars * available to the runtime.
    • *
  • * Platform default AtomHandlerFactory instance.
    • @@ -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. * * @return A new instance of a AtomHandler. diff --git a/src/main/java/com/rometools/propono/atom/server/AtomServlet.java b/src/main/java/com/rometools/propono/atom/server/AtomServlet.java index b440b15..9933f33 100644 --- a/src/main/java/com/rometools/propono/atom/server/AtomServlet.java +++ b/src/main/java/com/rometools/propono/atom/server/AtomServlet.java @@ -41,18 +41,18 @@ import org.slf4j.LoggerFactory; import com.rometools.propono.atom.common.AtomService; import com.rometools.propono.atom.common.Categories; import com.rometools.propono.utils.Utilities; -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.io.WireFeedOutput; -import com.sun.syndication.io.impl.Atom10Generator; -import com.sun.syndication.io.impl.Atom10Parser; +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.io.WireFeedOutput; +import com.rometools.rome.io.impl.Atom10Generator; +import com.rometools.rome.io.impl.Atom10Parser; /** * Atom Servlet implements Atom protocol by calling an - * {@link com.sun.syndication.propono.atom.server.AtomHandler} implementation. This servlet takes - * care of parsing incoming XML into ROME Atom {@link com.sun.syndication.feed.atom.Entry} objects, + * {@link com.rometools.rome.propono.atom.server.AtomHandler} implementation. This servlet takes + * 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 * the handler. */ diff --git a/src/main/java/com/rometools/propono/atom/server/FactoryConfigurationError.java b/src/main/java/com/rometools/propono/atom/server/FactoryConfigurationError.java index 01acb69..62a1b98 100644 --- a/src/main/java/com/rometools/propono/atom/server/FactoryConfigurationError.java +++ b/src/main/java/com/rometools/propono/atom/server/FactoryConfigurationError.java @@ -17,7 +17,7 @@ package com.rometools.propono.atom.server; /** * 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 * be found or instantiated. */ diff --git a/src/main/java/com/rometools/propono/atom/server/FactoryFinder.java b/src/main/java/com/rometools/propono/atom/server/FactoryFinder.java index b850c50..12f0b05 100644 --- a/src/main/java/com/rometools/propono/atom/server/FactoryFinder.java +++ b/src/main/java/com/rometools/propono/atom/server/FactoryFinder.java @@ -22,7 +22,7 @@ import java.io.InputStreamReader; 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. */ class FactoryFinder { diff --git a/src/main/java/com/rometools/propono/atom/server/impl/FileBasedAtomHandler.java b/src/main/java/com/rometools/propono/atom/server/impl/FileBasedAtomHandler.java index b1e0b9c..dc754da 100644 --- a/src/main/java/com/rometools/propono/atom/server/impl/FileBasedAtomHandler.java +++ b/src/main/java/com/rometools/propono/atom/server/impl/FileBasedAtomHandler.java @@ -32,13 +32,13 @@ import com.rometools.propono.atom.server.AtomHandler; import com.rometools.propono.atom.server.AtomMediaResource; import com.rometools.propono.atom.server.AtomRequest; import com.rometools.propono.atom.server.AtomServlet; -import com.sun.syndication.feed.atom.Entry; -import com.sun.syndication.feed.atom.Feed; +import com.rometools.rome.feed.atom.Entry; +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 - * {@link com.sun.syndication.propono.atom.server.impl.FileBasedAtomService}. + * {@link com.rometools.rome.propono.atom.server.impl.FileBasedAtomService}. */ public class FileBasedAtomHandler implements AtomHandler { @@ -118,7 +118,7 @@ public class FileBasedAtomHandler implements AtomHandler { /** * 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. */ @Override @@ -129,7 +129,7 @@ public class FileBasedAtomHandler implements AtomHandler { /** * 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 */ @Override @@ -147,7 +147,7 @@ public class FileBasedAtomHandler implements AtomHandler { * * @param areq Details of HTTP request * @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. */ @Override @@ -166,7 +166,7 @@ public class FileBasedAtomHandler implements AtomHandler { * * @param entry Entry to be added to collection. * @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. * @return Entry as represented on server. */ @@ -191,7 +191,7 @@ public class FileBasedAtomHandler implements AtomHandler { * Get entry specified by pathInfo. * * @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. * @return ROME Entry object. */ @@ -219,7 +219,7 @@ public class FileBasedAtomHandler implements AtomHandler { * * @param entry * @param areq Details of HTTP request - * @throws com.sun.syndication.propono.atom.server.AtomException + * @throws com.rometools.rome.propono.atom.server.AtomException */ @Override public void putEntry(final AtomRequest areq, final Entry entry) throws AtomException { diff --git a/src/main/java/com/rometools/propono/atom/server/impl/FileBasedAtomHandlerFactory.java b/src/main/java/com/rometools/propono/atom/server/impl/FileBasedAtomHandlerFactory.java index d460371..f4cb6bc 100644 --- a/src/main/java/com/rometools/propono/atom/server/impl/FileBasedAtomHandlerFactory.java +++ b/src/main/java/com/rometools/propono/atom/server/impl/FileBasedAtomHandlerFactory.java @@ -22,8 +22,8 @@ import com.rometools.propono.atom.server.AtomHandler; import com.rometools.propono.atom.server.AtomHandlerFactory; /** - * Extends {@link com.sun.syndication.propono.atom.server.AtomHandlerFactory} to create and return - * {@link com.sun.syndication.propono.atom.server.impl.FileBasedAtomHandler}. + * Extends {@link com.rometools.rome.propono.atom.server.AtomHandlerFactory} to create and return + * {@link com.rometools.rome.propono.atom.server.impl.FileBasedAtomHandler}. */ public class FileBasedAtomHandlerFactory extends AtomHandlerFactory { diff --git a/src/main/java/com/rometools/propono/atom/server/impl/FileBasedCollection.java b/src/main/java/com/rometools/propono/atom/server/impl/FileBasedCollection.java index 26efd37..ab296c7 100644 --- a/src/main/java/com/rometools/propono/atom/server/impl/FileBasedCollection.java +++ b/src/main/java/com/rometools/propono/atom/server/impl/FileBasedCollection.java @@ -46,18 +46,18 @@ import com.rometools.propono.atom.server.AtomException; import com.rometools.propono.atom.server.AtomMediaResource; import com.rometools.propono.atom.server.AtomNotFoundException; import com.rometools.propono.utils.Utilities; -import com.sun.syndication.feed.WireFeed; -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.module.Module; -import com.sun.syndication.io.FeedException; -import com.sun.syndication.io.WireFeedInput; -import com.sun.syndication.io.WireFeedOutput; -import com.sun.syndication.io.impl.Atom10Generator; -import com.sun.syndication.io.impl.Atom10Parser; +import com.rometools.rome.feed.WireFeed; +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.module.Module; +import com.rometools.rome.io.FeedException; +import com.rometools.rome.io.WireFeedInput; +import com.rometools.rome.io.WireFeedOutput; +import com.rometools.rome.io.impl.Atom10Generator; +import com.rometools.rome.io.impl.Atom10Parser; /** * 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. * - * @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. */ public Feed getFeedDocument() throws AtomException { diff --git a/src/main/java/com/rometools/propono/blogclient/Blog.java b/src/main/java/com/rometools/propono/blogclient/Blog.java index 5369eaa..eb5d505 100644 --- a/src/main/java/com/rometools/propono/blogclient/Blog.java +++ b/src/main/java/com/rometools/propono/blogclient/Blog.java @@ -45,7 +45,7 @@ public interface Blog { * Get a single BlogEntry (or BlogResource) by token. * * @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. * @return Blog entry specified by token. */ diff --git a/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomCollection.java b/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomCollection.java index 72eddec..d944b89 100644 --- a/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomCollection.java +++ b/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomCollection.java @@ -27,7 +27,7 @@ import com.rometools.propono.blogclient.Blog; import com.rometools.propono.blogclient.BlogClientException; import com.rometools.propono.blogclient.BlogEntry; 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. diff --git a/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomEntry.java b/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomEntry.java index af53fb3..945473b 100644 --- a/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomEntry.java +++ b/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomEntry.java @@ -26,10 +26,10 @@ import com.rometools.propono.blogclient.BaseBlogEntry; import com.rometools.propono.blogclient.BlogClientException; import com.rometools.propono.blogclient.BlogEntry; import com.rometools.propono.utils.ProponoException; -import com.sun.syndication.feed.atom.Entry; -import com.sun.syndication.feed.atom.Link; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.feed.synd.SyndPerson; +import com.rometools.rome.feed.atom.Entry; +import com.rometools.rome.feed.atom.Link; +import com.rometools.rome.feed.module.Module; +import com.rometools.rome.feed.synd.SyndPerson; /** * Atom protocol implementation of BlogEntry. @@ -135,8 +135,8 @@ public class AtomEntry extends BaseBlogEntry implements BlogEntry { } } } - final List contents = entry.getContents(); - com.sun.syndication.feed.atom.Content romeContent = null; + final List contents = entry.getContents(); + com.rometools.rome.feed.atom.Content romeContent = null; if (contents != null && !contents.isEmpty()) { romeContent = contents.get(0); } @@ -147,8 +147,8 @@ public class AtomEntry extends BaseBlogEntry implements BlogEntry { } if (entry.getCategories() != null) { final List cats = new ArrayList(); - final List romeCats = entry.getCategories(); - for (final com.sun.syndication.feed.atom.Category romeCat : romeCats) { + final List romeCats = entry.getCategories(); + for (final com.rometools.rome.feed.atom.Category romeCat : romeCats) { final BlogEntry.Category cat = new BlogEntry.Category(); cat.setId(romeCat.getTerm()); cat.setUrl(romeCat.getScheme()); @@ -159,7 +159,7 @@ public class AtomEntry extends BaseBlogEntry implements BlogEntry { } final List authors = entry.getAuthors(); 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) { author = new Person(); author.setName(romeAuthor.getName()); @@ -184,7 +184,7 @@ public class AtomEntry extends BaseBlogEntry implements BlogEntry { } entry.setTitle(title); 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.setEmail(author.getEmail()); person.setUrl(author.getUrl()); @@ -193,17 +193,17 @@ public class AtomEntry extends BaseBlogEntry implements BlogEntry { entry.setAuthors(authors); } 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.setType(content.getType()); - final List contents = new ArrayList(); + final List contents = new ArrayList(); contents.add(romeContent); entry.setContents(contents); } if (categories != null) { - final List romeCats = new ArrayList(); + final List romeCats = new ArrayList(); 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.setScheme(cat.getUrl()); romeCategory.setLabel(cat.getName()); diff --git a/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomResource.java b/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomResource.java index 97a0d3c..59ccf60 100644 --- a/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomResource.java +++ b/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomResource.java @@ -25,7 +25,7 @@ import com.rometools.propono.atom.client.ClientMediaEntry; import com.rometools.propono.blogclient.BlogClientException; import com.rometools.propono.blogclient.BlogEntry; 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. diff --git a/src/test/java/com/rometools/propono/atom/client/AtomClientTest.java b/src/test/java/com/rometools/propono/atom/client/AtomClientTest.java index 468ce57..58739e3 100644 --- a/src/test/java/com/rometools/propono/atom/client/AtomClientTest.java +++ b/src/test/java/com/rometools/propono/atom/client/AtomClientTest.java @@ -30,8 +30,8 @@ import org.slf4j.LoggerFactory; import com.rometools.propono.atom.common.Categories; import com.rometools.propono.atom.common.Collection; import com.rometools.propono.utils.ProponoException; -import com.sun.syndication.feed.atom.Category; -import com.sun.syndication.feed.atom.Content; +import com.rometools.rome.feed.atom.Category; +import com.rometools.rome.feed.atom.Content; /** * Simple APP test designed to run against a live Atom server. diff --git a/src/test/java/com/rometools/propono/atom/client/BloggerDotComTest.java b/src/test/java/com/rometools/propono/atom/client/BloggerDotComTest.java index fc02902..b1aa31b 100644 --- a/src/test/java/com/rometools/propono/atom/client/BloggerDotComTest.java +++ b/src/test/java/com/rometools/propono/atom/client/BloggerDotComTest.java @@ -23,7 +23,7 @@ import junit.framework.TestSuite; 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. diff --git a/src/test/java/com/rometools/propono/atom/common/CollectionTest.java b/src/test/java/com/rometools/propono/atom/common/CollectionTest.java index fb05fee..267f85c 100644 --- a/src/test/java/com/rometools/propono/atom/common/CollectionTest.java +++ b/src/test/java/com/rometools/propono/atom/common/CollectionTest.java @@ -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() { diff --git a/src/test/java/com/rometools/propono/atom/server/AtomClientServerTest.java b/src/test/java/com/rometools/propono/atom/server/AtomClientServerTest.java index 3f8e292..c68752d 100644 --- a/src/test/java/com/rometools/propono/atom/server/AtomClientServerTest.java +++ b/src/test/java/com/rometools/propono/atom/server/AtomClientServerTest.java @@ -45,8 +45,8 @@ 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.utils.ProponoException; -import com.sun.syndication.feed.atom.Category; -import com.sun.syndication.feed.atom.Content; +import com.rometools.rome.feed.atom.Category; +import com.rometools.rome.feed.atom.Content; /** * Test Propono Atom Client against Atom Server via Jetty. Extends AtomClientTest to diff --git a/src/test/java/com/rometools/propono/blogclient/SimpleBlogClientTest.java b/src/test/java/com/rometools/propono/blogclient/SimpleBlogClientTest.java index 0d04035..55ae45c 100644 --- a/src/test/java/com/rometools/propono/blogclient/SimpleBlogClientTest.java +++ b/src/test/java/com/rometools/propono/blogclient/SimpleBlogClientTest.java @@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory; import com.rometools.propono.blogclient.Blog.Collection; 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