diff --git a/src/main/java/org/rometools/feed/module/activitystreams/ActivityStreamModule.java b/src/main/java/com/rometools/modules/activitystreams/ActivityStreamModule.java similarity index 80% rename from src/main/java/org/rometools/feed/module/activitystreams/ActivityStreamModule.java rename to src/main/java/com/rometools/modules/activitystreams/ActivityStreamModule.java index 43f4da5..e4b0f4c 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/ActivityStreamModule.java +++ b/src/main/java/com/rometools/modules/activitystreams/ActivityStreamModule.java @@ -15,11 +15,11 @@ * under the License. */ -package org.rometools.feed.module.activitystreams; +package com.rometools.modules.activitystreams; -import org.rometools.feed.module.activitystreams.types.ActivityObject; -import org.rometools.feed.module.activitystreams.types.Mood; -import org.rometools.feed.module.activitystreams.types.Verb; +import com.rometools.modules.activitystreams.types.ActivityObject; +import com.rometools.modules.activitystreams.types.Mood; +import com.rometools.modules.activitystreams.types.Verb; /** * diff --git a/src/main/java/org/rometools/feed/module/activitystreams/ActivityStreamModuleImpl.java b/src/main/java/com/rometools/modules/activitystreams/ActivityStreamModuleImpl.java similarity index 89% rename from src/main/java/org/rometools/feed/module/activitystreams/ActivityStreamModuleImpl.java rename to src/main/java/com/rometools/modules/activitystreams/ActivityStreamModuleImpl.java index aafc5cb..797ed63 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/ActivityStreamModuleImpl.java +++ b/src/main/java/com/rometools/modules/activitystreams/ActivityStreamModuleImpl.java @@ -14,11 +14,11 @@ * limitations under the License. * under the License. */ -package org.rometools.feed.module.activitystreams; +package com.rometools.modules.activitystreams; -import org.rometools.feed.module.activitystreams.types.ActivityObject; -import org.rometools.feed.module.activitystreams.types.Mood; -import org.rometools.feed.module.activitystreams.types.Verb; +import com.rometools.modules.activitystreams.types.ActivityObject; +import com.rometools.modules.activitystreams.types.Mood; +import com.rometools.modules.activitystreams.types.Verb; /** * diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/ActivityObject.java b/src/main/java/com/rometools/modules/activitystreams/types/ActivityObject.java similarity index 86% rename from src/main/java/org/rometools/feed/module/activitystreams/types/ActivityObject.java rename to src/main/java/com/rometools/modules/activitystreams/types/ActivityObject.java index f602e91..513e359 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/ActivityObject.java +++ b/src/main/java/com/rometools/modules/activitystreams/types/ActivityObject.java @@ -15,12 +15,11 @@ * under the License. */ -package org.rometools.feed.module.activitystreams.types; +package com.rometools.modules.activitystreams.types; -import org.rometools.feed.module.georss.GeoRSSModule; -import org.rometools.feed.module.portablecontacts.ContactModule; - -import com.sun.syndication.feed.atom.Entry; +import com.rometools.modules.georss.GeoRSSModule; +import com.rometools.modules.portablecontacts.ContactModule; +import com.rometools.rome.feed.atom.Entry; /** * diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Article.java b/src/main/java/com/rometools/modules/activitystreams/types/Article.java similarity index 97% rename from src/main/java/org/rometools/feed/module/activitystreams/types/Article.java rename to src/main/java/com/rometools/modules/activitystreams/types/Article.java index 88b303e..62e139b 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Article.java +++ b/src/main/java/com/rometools/modules/activitystreams/types/Article.java @@ -14,7 +14,7 @@ * limitations under the License. * under the License. */ -package org.rometools.feed.module.activitystreams.types; +package com.rometools.modules.activitystreams.types; /** *

diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Audio.java b/src/main/java/com/rometools/modules/activitystreams/types/Audio.java similarity index 97% rename from src/main/java/org/rometools/feed/module/activitystreams/types/Audio.java rename to src/main/java/com/rometools/modules/activitystreams/types/Audio.java index 5d0c533..2fa0a0d 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Audio.java +++ b/src/main/java/com/rometools/modules/activitystreams/types/Audio.java @@ -14,7 +14,7 @@ * limitations under the License. * under the License. */ -package org.rometools.feed.module.activitystreams.types; +package com.rometools.modules.activitystreams.types; /** *

diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Bookmark.java b/src/main/java/com/rometools/modules/activitystreams/types/Bookmark.java similarity index 97% rename from src/main/java/org/rometools/feed/module/activitystreams/types/Bookmark.java rename to src/main/java/com/rometools/modules/activitystreams/types/Bookmark.java index a399811..5a229cf 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Bookmark.java +++ b/src/main/java/com/rometools/modules/activitystreams/types/Bookmark.java @@ -15,9 +15,9 @@ * under the License. */ -package org.rometools.feed.module.activitystreams.types; +package com.rometools.modules.activitystreams.types; -import com.sun.syndication.feed.atom.Link; +import com.rometools.rome.feed.atom.Link; /** *

diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Comment.java b/src/main/java/com/rometools/modules/activitystreams/types/Comment.java similarity index 97% rename from src/main/java/org/rometools/feed/module/activitystreams/types/Comment.java rename to src/main/java/com/rometools/modules/activitystreams/types/Comment.java index a0842e6..7de8614 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Comment.java +++ b/src/main/java/com/rometools/modules/activitystreams/types/Comment.java @@ -15,7 +15,7 @@ * under the License. */ -package org.rometools.feed.module.activitystreams.types; +package com.rometools.modules.activitystreams.types; /** *

diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Event.java b/src/main/java/com/rometools/modules/activitystreams/types/Event.java similarity index 97% rename from src/main/java/org/rometools/feed/module/activitystreams/types/Event.java rename to src/main/java/com/rometools/modules/activitystreams/types/Event.java index 3ea5e01..f2c1be1 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Event.java +++ b/src/main/java/com/rometools/modules/activitystreams/types/Event.java @@ -15,7 +15,7 @@ * under the License. */ -package org.rometools.feed.module.activitystreams.types; +package com.rometools.modules.activitystreams.types; /** *

diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/File.java b/src/main/java/com/rometools/modules/activitystreams/types/File.java similarity index 97% rename from src/main/java/org/rometools/feed/module/activitystreams/types/File.java rename to src/main/java/com/rometools/modules/activitystreams/types/File.java index 5c120ad..862c2dc 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/File.java +++ b/src/main/java/com/rometools/modules/activitystreams/types/File.java @@ -15,7 +15,7 @@ * under the License. */ -package org.rometools.feed.module.activitystreams.types; +package com.rometools.modules.activitystreams.types; /** *

diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Folder.java b/src/main/java/com/rometools/modules/activitystreams/types/Folder.java similarity index 96% rename from src/main/java/org/rometools/feed/module/activitystreams/types/Folder.java rename to src/main/java/com/rometools/modules/activitystreams/types/Folder.java index 5c73e4f..2694940 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Folder.java +++ b/src/main/java/com/rometools/modules/activitystreams/types/Folder.java @@ -15,7 +15,7 @@ * under the License. */ -package org.rometools.feed.module.activitystreams.types; +package com.rometools.modules.activitystreams.types; /** *

diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Group.java b/src/main/java/com/rometools/modules/activitystreams/types/Group.java similarity index 94% rename from src/main/java/org/rometools/feed/module/activitystreams/types/Group.java rename to src/main/java/com/rometools/modules/activitystreams/types/Group.java index 5694179..952e2f0 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Group.java +++ b/src/main/java/com/rometools/modules/activitystreams/types/Group.java @@ -15,7 +15,7 @@ * under the License. */ -package org.rometools.feed.module.activitystreams.types; +package com.rometools.modules.activitystreams.types; /** *

diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/HasLocation.java b/src/main/java/com/rometools/modules/activitystreams/types/HasLocation.java similarity index 95% rename from src/main/java/org/rometools/feed/module/activitystreams/types/HasLocation.java rename to src/main/java/com/rometools/modules/activitystreams/types/HasLocation.java index 854f706..8b1705c 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/HasLocation.java +++ b/src/main/java/com/rometools/modules/activitystreams/types/HasLocation.java @@ -15,10 +15,10 @@ * under the License. */ -package org.rometools.feed.module.activitystreams.types; +package com.rometools.modules.activitystreams.types; -import org.rometools.feed.module.georss.GeoRSSModule; -import org.rometools.feed.module.portablecontacts.ContactModule; +import com.rometools.modules.georss.GeoRSSModule; +import com.rometools.modules.portablecontacts.ContactModule; /** *

diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/List.java b/src/main/java/com/rometools/modules/activitystreams/types/List.java similarity index 95% rename from src/main/java/org/rometools/feed/module/activitystreams/types/List.java rename to src/main/java/com/rometools/modules/activitystreams/types/List.java index 0bc1dd3..d2a5010 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/List.java +++ b/src/main/java/com/rometools/modules/activitystreams/types/List.java @@ -15,7 +15,7 @@ * under the License. */ -package org.rometools.feed.module.activitystreams.types; +package com.rometools.modules.activitystreams.types; /** *

diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Mood.java b/src/main/java/com/rometools/modules/activitystreams/types/Mood.java similarity index 97% rename from src/main/java/org/rometools/feed/module/activitystreams/types/Mood.java rename to src/main/java/com/rometools/modules/activitystreams/types/Mood.java index 28e2b37..c215f67 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Mood.java +++ b/src/main/java/com/rometools/modules/activitystreams/types/Mood.java @@ -14,7 +14,7 @@ * limitations under the License. * under the License. */ -package org.rometools.feed.module.activitystreams.types; +package com.rometools.modules.activitystreams.types; /** * diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Note.java b/src/main/java/com/rometools/modules/activitystreams/types/Note.java similarity index 97% rename from src/main/java/org/rometools/feed/module/activitystreams/types/Note.java rename to src/main/java/com/rometools/modules/activitystreams/types/Note.java index b058bab..8dd0128 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Note.java +++ b/src/main/java/com/rometools/modules/activitystreams/types/Note.java @@ -15,7 +15,7 @@ * under the License. */ -package org.rometools.feed.module.activitystreams.types; +package com.rometools.modules.activitystreams.types; /** *

diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Person.java b/src/main/java/com/rometools/modules/activitystreams/types/Person.java similarity index 96% rename from src/main/java/org/rometools/feed/module/activitystreams/types/Person.java rename to src/main/java/com/rometools/modules/activitystreams/types/Person.java index 3d64fdd..6858773 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Person.java +++ b/src/main/java/com/rometools/modules/activitystreams/types/Person.java @@ -15,9 +15,9 @@ * under the License. */ -package org.rometools.feed.module.activitystreams.types; +package com.rometools.modules.activitystreams.types; -import com.sun.syndication.feed.atom.Link; +import com.rometools.rome.feed.atom.Link; /** *

diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Photo.java b/src/main/java/com/rometools/modules/activitystreams/types/Photo.java similarity index 97% rename from src/main/java/org/rometools/feed/module/activitystreams/types/Photo.java rename to src/main/java/com/rometools/modules/activitystreams/types/Photo.java index 1d0f641..d7ebe85 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Photo.java +++ b/src/main/java/com/rometools/modules/activitystreams/types/Photo.java @@ -15,7 +15,7 @@ * under the License. */ -package org.rometools.feed.module.activitystreams.types; +package com.rometools.modules.activitystreams.types; /** *

diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/PhotoAlbum.java b/src/main/java/com/rometools/modules/activitystreams/types/PhotoAlbum.java similarity index 96% rename from src/main/java/org/rometools/feed/module/activitystreams/types/PhotoAlbum.java rename to src/main/java/com/rometools/modules/activitystreams/types/PhotoAlbum.java index faa42e1..b912057 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/PhotoAlbum.java +++ b/src/main/java/com/rometools/modules/activitystreams/types/PhotoAlbum.java @@ -15,7 +15,7 @@ * under the License. */ -package org.rometools.feed.module.activitystreams.types; +package com.rometools.modules.activitystreams.types; /** *

diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Place.java b/src/main/java/com/rometools/modules/activitystreams/types/Place.java similarity index 96% rename from src/main/java/org/rometools/feed/module/activitystreams/types/Place.java rename to src/main/java/com/rometools/modules/activitystreams/types/Place.java index c0d34bd..ec3b645 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Place.java +++ b/src/main/java/com/rometools/modules/activitystreams/types/Place.java @@ -15,7 +15,7 @@ * under the License. */ -package org.rometools.feed.module.activitystreams.types; +package com.rometools.modules.activitystreams.types; /** *

diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Playlist.java b/src/main/java/com/rometools/modules/activitystreams/types/Playlist.java similarity index 95% rename from src/main/java/org/rometools/feed/module/activitystreams/types/Playlist.java rename to src/main/java/com/rometools/modules/activitystreams/types/Playlist.java index 9d65457..e12a04f 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Playlist.java +++ b/src/main/java/com/rometools/modules/activitystreams/types/Playlist.java @@ -15,7 +15,7 @@ * under the License. */ -package org.rometools.feed.module.activitystreams.types; +package com.rometools.modules.activitystreams.types; /** * diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Product.java b/src/main/java/com/rometools/modules/activitystreams/types/Product.java similarity index 97% rename from src/main/java/org/rometools/feed/module/activitystreams/types/Product.java rename to src/main/java/com/rometools/modules/activitystreams/types/Product.java index 8c039ca..f293283 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Product.java +++ b/src/main/java/com/rometools/modules/activitystreams/types/Product.java @@ -15,7 +15,7 @@ * under the License. */ -package org.rometools.feed.module.activitystreams.types; +package com.rometools.modules.activitystreams.types; /** *

diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Review.java b/src/main/java/com/rometools/modules/activitystreams/types/Review.java similarity index 97% rename from src/main/java/org/rometools/feed/module/activitystreams/types/Review.java rename to src/main/java/com/rometools/modules/activitystreams/types/Review.java index 81f7971..047211d 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Review.java +++ b/src/main/java/com/rometools/modules/activitystreams/types/Review.java @@ -15,7 +15,7 @@ * under the License. */ -package org.rometools.feed.module.activitystreams.types; +package com.rometools.modules.activitystreams.types; /** *

diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Service.java b/src/main/java/com/rometools/modules/activitystreams/types/Service.java similarity index 97% rename from src/main/java/org/rometools/feed/module/activitystreams/types/Service.java rename to src/main/java/com/rometools/modules/activitystreams/types/Service.java index 27a1d4b..a882d68 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Service.java +++ b/src/main/java/com/rometools/modules/activitystreams/types/Service.java @@ -15,7 +15,7 @@ * under the License. */ -package org.rometools.feed.module.activitystreams.types; +package com.rometools.modules.activitystreams.types; /** *

diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Song.java b/src/main/java/com/rometools/modules/activitystreams/types/Song.java similarity index 97% rename from src/main/java/org/rometools/feed/module/activitystreams/types/Song.java rename to src/main/java/com/rometools/modules/activitystreams/types/Song.java index 697bbb5..b651bbb 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Song.java +++ b/src/main/java/com/rometools/modules/activitystreams/types/Song.java @@ -14,7 +14,7 @@ * limitations under the License. * under the License. */ -package org.rometools.feed.module.activitystreams.types; +package com.rometools.modules.activitystreams.types; /** *

diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Status.java b/src/main/java/com/rometools/modules/activitystreams/types/Status.java similarity index 96% rename from src/main/java/org/rometools/feed/module/activitystreams/types/Status.java rename to src/main/java/com/rometools/modules/activitystreams/types/Status.java index 9e6bdbf..8492684 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Status.java +++ b/src/main/java/com/rometools/modules/activitystreams/types/Status.java @@ -15,7 +15,7 @@ * under the License. */ -package org.rometools.feed.module.activitystreams.types; +package com.rometools.modules.activitystreams.types; /** *

diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Verb.java b/src/main/java/com/rometools/modules/activitystreams/types/Verb.java similarity index 99% rename from src/main/java/org/rometools/feed/module/activitystreams/types/Verb.java rename to src/main/java/com/rometools/modules/activitystreams/types/Verb.java index 1cc3909..39aabaf 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Verb.java +++ b/src/main/java/com/rometools/modules/activitystreams/types/Verb.java @@ -14,7 +14,7 @@ * limitations under the License. * under the License. */ -package org.rometools.feed.module.activitystreams.types; +package com.rometools.modules.activitystreams.types; /** * diff --git a/src/main/java/org/rometools/feed/module/activitystreams/types/Video.java b/src/main/java/com/rometools/modules/activitystreams/types/Video.java similarity index 96% rename from src/main/java/org/rometools/feed/module/activitystreams/types/Video.java rename to src/main/java/com/rometools/modules/activitystreams/types/Video.java index 0411b5f..8cc07fb 100644 --- a/src/main/java/org/rometools/feed/module/activitystreams/types/Video.java +++ b/src/main/java/com/rometools/modules/activitystreams/types/Video.java @@ -15,7 +15,7 @@ * under the License. */ -package org.rometools.feed.module.activitystreams.types; +package com.rometools.modules.activitystreams.types; /** *

diff --git a/src/main/java/org/rometools/feed/module/atomthread/ThreadModule.java b/src/main/java/com/rometools/modules/atomthread/ThreadModule.java similarity index 93% rename from src/main/java/org/rometools/feed/module/atomthread/ThreadModule.java rename to src/main/java/com/rometools/modules/atomthread/ThreadModule.java index 58ba127..09e0f2a 100644 --- a/src/main/java/org/rometools/feed/module/atomthread/ThreadModule.java +++ b/src/main/java/com/rometools/modules/atomthread/ThreadModule.java @@ -15,7 +15,7 @@ * under the License. */ -package org.rometools.feed.module.atomthread; +package com.rometools.modules.atomthread; /** * diff --git a/src/main/java/org/rometools/feed/module/base/Article.java b/src/main/java/com/rometools/modules/base/Article.java similarity index 99% rename from src/main/java/org/rometools/feed/module/base/Article.java rename to src/main/java/com/rometools/modules/base/Article.java index 0642503..0f90578 100644 --- a/src/main/java/org/rometools/feed/module/base/Article.java +++ b/src/main/java/com/rometools/modules/base/Article.java @@ -37,7 +37,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.base; +package com.rometools.modules.base; import java.util.Date; diff --git a/src/main/java/org/rometools/feed/module/base/Course.java b/src/main/java/com/rometools/modules/base/Course.java similarity index 99% rename from src/main/java/org/rometools/feed/module/base/Course.java rename to src/main/java/com/rometools/modules/base/Course.java index b025b3d..9b2a80d 100644 --- a/src/main/java/org/rometools/feed/module/base/Course.java +++ b/src/main/java/com/rometools/modules/base/Course.java @@ -36,9 +36,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.base; +package com.rometools.modules.base; -import org.rometools.feed.module.base.types.DateTimeRange; +import com.rometools.modules.base.types.DateTimeRange; /** * This is an interface for the GoogleBase plug in that exposes methods used for Class or Course diff --git a/src/main/java/org/rometools/feed/module/base/CustomTag.java b/src/main/java/com/rometools/modules/base/CustomTag.java similarity index 99% rename from src/main/java/org/rometools/feed/module/base/CustomTag.java rename to src/main/java/com/rometools/modules/base/CustomTag.java index 646cc44..5b7d91a 100644 --- a/src/main/java/org/rometools/feed/module/base/CustomTag.java +++ b/src/main/java/com/rometools/modules/base/CustomTag.java @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.rometools.feed.module.base; +package com.rometools.modules.base; /** * This class represents a custom tag name and value. diff --git a/src/main/java/org/rometools/feed/module/base/CustomTagImpl.java b/src/main/java/com/rometools/modules/base/CustomTagImpl.java similarity index 97% rename from src/main/java/org/rometools/feed/module/base/CustomTagImpl.java rename to src/main/java/com/rometools/modules/base/CustomTagImpl.java index aafa838..45e5891 100644 --- a/src/main/java/org/rometools/feed/module/base/CustomTagImpl.java +++ b/src/main/java/com/rometools/modules/base/CustomTagImpl.java @@ -17,15 +17,15 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.rometools.feed.module.base; +package com.rometools.modules.base; import java.net.URL; import java.util.Date; -import org.rometools.feed.module.base.types.DateTimeRange; -import org.rometools.feed.module.base.types.FloatUnit; -import org.rometools.feed.module.base.types.IntUnit; -import org.rometools.feed.module.base.types.ShortDate; +import com.rometools.modules.base.types.DateTimeRange; +import com.rometools.modules.base.types.FloatUnit; +import com.rometools.modules.base.types.IntUnit; +import com.rometools.modules.base.types.ShortDate; /** * @version $Revision: 1.1 $ diff --git a/src/main/java/org/rometools/feed/module/base/CustomTags.java b/src/main/java/com/rometools/modules/base/CustomTags.java similarity index 93% rename from src/main/java/org/rometools/feed/module/base/CustomTags.java rename to src/main/java/com/rometools/modules/base/CustomTags.java index eba31a0..933f699 100644 --- a/src/main/java/org/rometools/feed/module/base/CustomTags.java +++ b/src/main/java/com/rometools/modules/base/CustomTags.java @@ -18,11 +18,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.rometools.feed.module.base; +package com.rometools.modules.base; import java.util.List; -import com.sun.syndication.feed.module.Module; +import com.rometools.rome.feed.module.Module; /** * @version $Revision: 1.1 $ diff --git a/src/main/java/org/rometools/feed/module/base/CustomTagsImpl.java b/src/main/java/com/rometools/modules/base/CustomTagsImpl.java similarity index 95% rename from src/main/java/org/rometools/feed/module/base/CustomTagsImpl.java rename to src/main/java/com/rometools/modules/base/CustomTagsImpl.java index 4c87f56..8a13dc7 100644 --- a/src/main/java/org/rometools/feed/module/base/CustomTagsImpl.java +++ b/src/main/java/com/rometools/modules/base/CustomTagsImpl.java @@ -18,12 +18,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.rometools.feed.module.base; +package com.rometools.modules.base; import java.util.ArrayList; import java.util.List; -import com.sun.syndication.feed.CopyFrom; +import com.rometools.rome.feed.CopyFrom; /** * @version $Revision: 1.1 $ diff --git a/src/main/java/org/rometools/feed/module/base/Event.java b/src/main/java/com/rometools/modules/base/Event.java similarity index 96% rename from src/main/java/org/rometools/feed/module/base/Event.java rename to src/main/java/com/rometools/modules/base/Event.java index 00df831..e45feb0 100644 --- a/src/main/java/org/rometools/feed/module/base/Event.java +++ b/src/main/java/com/rometools/modules/base/Event.java @@ -37,14 +37,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.base; +package com.rometools.modules.base; -import org.rometools.feed.module.base.types.CurrencyEnumeration; -import org.rometools.feed.module.base.types.DateTimeRange; -import org.rometools.feed.module.base.types.FloatUnit; -import org.rometools.feed.module.base.types.PaymentTypeEnumeration; -import org.rometools.feed.module.base.types.PriceTypeEnumeration; -import org.rometools.feed.module.base.types.ShippingType; +import com.rometools.modules.base.types.CurrencyEnumeration; +import com.rometools.modules.base.types.DateTimeRange; +import com.rometools.modules.base.types.FloatUnit; +import com.rometools.modules.base.types.PaymentTypeEnumeration; +import com.rometools.modules.base.types.PriceTypeEnumeration; +import com.rometools.modules.base.types.ShippingType; /** * This is an interface for the GoogleBase plug in that exposes methods used for Event entry types. diff --git a/src/main/java/org/rometools/feed/module/base/GlobalInterface.java b/src/main/java/com/rometools/modules/base/GlobalInterface.java similarity index 99% rename from src/main/java/org/rometools/feed/module/base/GlobalInterface.java rename to src/main/java/com/rometools/modules/base/GlobalInterface.java index 260fc72..1760248 100644 --- a/src/main/java/org/rometools/feed/module/base/GlobalInterface.java +++ b/src/main/java/com/rometools/modules/base/GlobalInterface.java @@ -37,7 +37,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.base; +package com.rometools.modules.base; import java.io.Serializable; import java.net.URL; diff --git a/src/main/java/org/rometools/feed/module/base/GoogleBase.java b/src/main/java/com/rometools/modules/base/GoogleBase.java similarity index 96% rename from src/main/java/org/rometools/feed/module/base/GoogleBase.java rename to src/main/java/com/rometools/modules/base/GoogleBase.java index b72a97c..db9b121 100644 --- a/src/main/java/org/rometools/feed/module/base/GoogleBase.java +++ b/src/main/java/com/rometools/modules/base/GoogleBase.java @@ -37,9 +37,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.base; +package com.rometools.modules.base; -import com.sun.syndication.feed.module.Module; +import com.rometools.rome.feed.module.Module; /** * This is the root interface for the Google Base module. diff --git a/src/main/java/org/rometools/feed/module/base/GoogleBaseImpl.java b/src/main/java/com/rometools/modules/base/GoogleBaseImpl.java similarity index 97% rename from src/main/java/org/rometools/feed/module/base/GoogleBaseImpl.java rename to src/main/java/com/rometools/modules/base/GoogleBaseImpl.java index 5fc0dfd..408a630 100644 --- a/src/main/java/org/rometools/feed/module/base/GoogleBaseImpl.java +++ b/src/main/java/com/rometools/modules/base/GoogleBaseImpl.java @@ -36,27 +36,26 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.base; +package com.rometools.modules.base; import java.lang.reflect.Array; import java.net.URL; import java.util.Date; -import org.rometools.feed.module.base.types.CloneableType; -import org.rometools.feed.module.base.types.CurrencyEnumeration; -import org.rometools.feed.module.base.types.DateTimeRange; -import org.rometools.feed.module.base.types.FloatUnit; -import org.rometools.feed.module.base.types.GenderEnumeration; -import org.rometools.feed.module.base.types.IntUnit; -import org.rometools.feed.module.base.types.PaymentTypeEnumeration; -import org.rometools.feed.module.base.types.PriceTypeEnumeration; -import org.rometools.feed.module.base.types.ShippingType; -import org.rometools.feed.module.base.types.ShortDate; -import org.rometools.feed.module.base.types.Size; -import org.rometools.feed.module.base.types.YearType; - -import com.sun.syndication.feed.CopyFrom; -import com.sun.syndication.feed.impl.EqualsBean; +import com.rometools.modules.base.types.CloneableType; +import com.rometools.modules.base.types.CurrencyEnumeration; +import com.rometools.modules.base.types.DateTimeRange; +import com.rometools.modules.base.types.FloatUnit; +import com.rometools.modules.base.types.GenderEnumeration; +import com.rometools.modules.base.types.IntUnit; +import com.rometools.modules.base.types.PaymentTypeEnumeration; +import com.rometools.modules.base.types.PriceTypeEnumeration; +import com.rometools.modules.base.types.ShippingType; +import com.rometools.modules.base.types.ShortDate; +import com.rometools.modules.base.types.Size; +import com.rometools.modules.base.types.YearType; +import com.rometools.rome.feed.CopyFrom; +import com.rometools.rome.feed.impl.EqualsBean; /** * This is the implementation class for the GoogleBase module interface. diff --git a/src/main/java/org/rometools/feed/module/base/Housing.java b/src/main/java/com/rometools/modules/base/Housing.java similarity index 96% rename from src/main/java/org/rometools/feed/module/base/Housing.java rename to src/main/java/com/rometools/modules/base/Housing.java index 0fa3167..005b133 100644 --- a/src/main/java/org/rometools/feed/module/base/Housing.java +++ b/src/main/java/com/rometools/modules/base/Housing.java @@ -37,14 +37,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.base; +package com.rometools.modules.base; -import org.rometools.feed.module.base.types.CurrencyEnumeration; -import org.rometools.feed.module.base.types.FloatUnit; -import org.rometools.feed.module.base.types.IntUnit; -import org.rometools.feed.module.base.types.PaymentTypeEnumeration; -import org.rometools.feed.module.base.types.PriceTypeEnumeration; -import org.rometools.feed.module.base.types.YearType; +import com.rometools.modules.base.types.CurrencyEnumeration; +import com.rometools.modules.base.types.FloatUnit; +import com.rometools.modules.base.types.IntUnit; +import com.rometools.modules.base.types.PaymentTypeEnumeration; +import com.rometools.modules.base.types.PriceTypeEnumeration; +import com.rometools.modules.base.types.YearType; /** * This is an interface for the GoogleBase plug in that exposes methods used for Housing entry diff --git a/src/main/java/org/rometools/feed/module/base/Job.java b/src/main/java/com/rometools/modules/base/Job.java similarity index 99% rename from src/main/java/org/rometools/feed/module/base/Job.java rename to src/main/java/com/rometools/modules/base/Job.java index 3bda751..342867e 100644 --- a/src/main/java/org/rometools/feed/module/base/Job.java +++ b/src/main/java/com/rometools/modules/base/Job.java @@ -37,10 +37,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.base; +package com.rometools.modules.base; -import org.rometools.feed.module.base.types.CurrencyEnumeration; -import org.rometools.feed.module.base.types.PriceTypeEnumeration; +import com.rometools.modules.base.types.CurrencyEnumeration; +import com.rometools.modules.base.types.PriceTypeEnumeration; /** * This is an interface for the GoogleBase plug in that exposes methods used for Job listing entry diff --git a/src/main/java/org/rometools/feed/module/base/Person.java b/src/main/java/com/rometools/modules/base/Person.java similarity index 99% rename from src/main/java/org/rometools/feed/module/base/Person.java rename to src/main/java/com/rometools/modules/base/Person.java index 613f3ff..8d9038d 100644 --- a/src/main/java/org/rometools/feed/module/base/Person.java +++ b/src/main/java/com/rometools/modules/base/Person.java @@ -37,9 +37,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.base; +package com.rometools.modules.base; -import org.rometools.feed.module.base.types.GenderEnumeration; +import com.rometools.modules.base.types.GenderEnumeration; /** * This is an interface for the GoogleBase plug in that exposes methods used for Person (personal diff --git a/src/main/java/org/rometools/feed/module/base/Product.java b/src/main/java/com/rometools/modules/base/Product.java similarity index 99% rename from src/main/java/org/rometools/feed/module/base/Product.java rename to src/main/java/com/rometools/modules/base/Product.java index 297a574..0764e6a 100644 --- a/src/main/java/org/rometools/feed/module/base/Product.java +++ b/src/main/java/com/rometools/modules/base/Product.java @@ -37,14 +37,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.base; +package com.rometools.modules.base; -import org.rometools.feed.module.base.types.CurrencyEnumeration; -import org.rometools.feed.module.base.types.FloatUnit; -import org.rometools.feed.module.base.types.PaymentTypeEnumeration; -import org.rometools.feed.module.base.types.PriceTypeEnumeration; -import org.rometools.feed.module.base.types.ShippingType; -import org.rometools.feed.module.base.types.Size; +import com.rometools.modules.base.types.CurrencyEnumeration; +import com.rometools.modules.base.types.FloatUnit; +import com.rometools.modules.base.types.PaymentTypeEnumeration; +import com.rometools.modules.base.types.PriceTypeEnumeration; +import com.rometools.modules.base.types.ShippingType; +import com.rometools.modules.base.types.Size; /** * This is an interface for the GoogleBase plug in that exposes methods used for Products. diff --git a/src/main/java/org/rometools/feed/module/base/Review.java b/src/main/java/com/rometools/modules/base/Review.java similarity index 99% rename from src/main/java/org/rometools/feed/module/base/Review.java rename to src/main/java/com/rometools/modules/base/Review.java index f195f34..dfdd8cf 100644 --- a/src/main/java/org/rometools/feed/module/base/Review.java +++ b/src/main/java/com/rometools/modules/base/Review.java @@ -37,12 +37,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.base; +package com.rometools.modules.base; import java.net.URL; import java.util.Date; -import org.rometools.feed.module.base.types.FloatUnit; +import com.rometools.modules.base.types.FloatUnit; /** * This is an interface for the GoogleBase plug in that exposes methods used for critical reviews of diff --git a/src/main/java/org/rometools/feed/module/base/ScholarlyArticle.java b/src/main/java/com/rometools/modules/base/ScholarlyArticle.java similarity index 99% rename from src/main/java/org/rometools/feed/module/base/ScholarlyArticle.java rename to src/main/java/com/rometools/modules/base/ScholarlyArticle.java index 0a7bf8b..b0dc686 100644 --- a/src/main/java/org/rometools/feed/module/base/ScholarlyArticle.java +++ b/src/main/java/com/rometools/modules/base/ScholarlyArticle.java @@ -37,7 +37,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.base; +package com.rometools.modules.base; import java.util.Date; diff --git a/src/main/java/org/rometools/feed/module/base/Service.java b/src/main/java/com/rometools/modules/base/Service.java similarity index 99% rename from src/main/java/org/rometools/feed/module/base/Service.java rename to src/main/java/com/rometools/modules/base/Service.java index 57e1bd4..cd5f142 100644 --- a/src/main/java/org/rometools/feed/module/base/Service.java +++ b/src/main/java/com/rometools/modules/base/Service.java @@ -37,13 +37,13 @@ * ee the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.base; +package com.rometools.modules.base; -import org.rometools.feed.module.base.types.CurrencyEnumeration; -import org.rometools.feed.module.base.types.FloatUnit; -import org.rometools.feed.module.base.types.PaymentTypeEnumeration; -import org.rometools.feed.module.base.types.PriceTypeEnumeration; -import org.rometools.feed.module.base.types.ShippingType; +import com.rometools.modules.base.types.CurrencyEnumeration; +import com.rometools.modules.base.types.FloatUnit; +import com.rometools.modules.base.types.PaymentTypeEnumeration; +import com.rometools.modules.base.types.PriceTypeEnumeration; +import com.rometools.modules.base.types.ShippingType; /** * This is an interface for the GoogleBase plug in that exposes methods used for service offerings. diff --git a/src/main/java/org/rometools/feed/module/base/Travel.java b/src/main/java/com/rometools/modules/base/Travel.java similarity index 99% rename from src/main/java/org/rometools/feed/module/base/Travel.java rename to src/main/java/com/rometools/modules/base/Travel.java index 16d3460..bfd9ae9 100644 --- a/src/main/java/org/rometools/feed/module/base/Travel.java +++ b/src/main/java/com/rometools/modules/base/Travel.java @@ -37,14 +37,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.base; +package com.rometools.modules.base; -import org.rometools.feed.module.base.types.CurrencyEnumeration; -import org.rometools.feed.module.base.types.DateTimeRange; -import org.rometools.feed.module.base.types.FloatUnit; -import org.rometools.feed.module.base.types.PaymentTypeEnumeration; -import org.rometools.feed.module.base.types.PriceTypeEnumeration; -import org.rometools.feed.module.base.types.ShippingType; +import com.rometools.modules.base.types.CurrencyEnumeration; +import com.rometools.modules.base.types.DateTimeRange; +import com.rometools.modules.base.types.FloatUnit; +import com.rometools.modules.base.types.PaymentTypeEnumeration; +import com.rometools.modules.base.types.PriceTypeEnumeration; +import com.rometools.modules.base.types.ShippingType; /** * This is an interface for the GoogleBase plug in that exposes methods used for travel items. diff --git a/src/main/java/org/rometools/feed/module/base/Unknown.java b/src/main/java/com/rometools/modules/base/Unknown.java similarity index 96% rename from src/main/java/org/rometools/feed/module/base/Unknown.java rename to src/main/java/com/rometools/modules/base/Unknown.java index 70e4a74..1e231a6 100644 --- a/src/main/java/org/rometools/feed/module/base/Unknown.java +++ b/src/main/java/com/rometools/modules/base/Unknown.java @@ -37,11 +37,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.base; +package com.rometools.modules.base; import java.net.URL; -import org.rometools.feed.module.base.types.IntUnit; +import com.rometools.modules.base.types.IntUnit; /** * This interface contains all the other schema elements that the document doesn't associate with a diff --git a/src/main/java/org/rometools/feed/module/base/ValidationException.java b/src/main/java/com/rometools/modules/base/ValidationException.java similarity index 97% rename from src/main/java/org/rometools/feed/module/base/ValidationException.java rename to src/main/java/com/rometools/modules/base/ValidationException.java index 9c3dd54..0dabae1 100644 --- a/src/main/java/org/rometools/feed/module/base/ValidationException.java +++ b/src/main/java/com/rometools/modules/base/ValidationException.java @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.rometools.feed.module.base; +package com.rometools.modules.base; /** * This is an unchecked exception that is thrown when a data value violates the Google Schema diff --git a/src/main/java/org/rometools/feed/module/base/Vehicle.java b/src/main/java/com/rometools/modules/base/Vehicle.java similarity index 99% rename from src/main/java/org/rometools/feed/module/base/Vehicle.java rename to src/main/java/com/rometools/modules/base/Vehicle.java index 95ca3f8..3cb3286 100644 --- a/src/main/java/org/rometools/feed/module/base/Vehicle.java +++ b/src/main/java/com/rometools/modules/base/Vehicle.java @@ -37,14 +37,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.base; +package com.rometools.modules.base; -import org.rometools.feed.module.base.types.CurrencyEnumeration; -import org.rometools.feed.module.base.types.FloatUnit; -import org.rometools.feed.module.base.types.PaymentTypeEnumeration; -import org.rometools.feed.module.base.types.PriceTypeEnumeration; -import org.rometools.feed.module.base.types.ShippingType; -import org.rometools.feed.module.base.types.YearType; +import com.rometools.modules.base.types.CurrencyEnumeration; +import com.rometools.modules.base.types.FloatUnit; +import com.rometools.modules.base.types.PaymentTypeEnumeration; +import com.rometools.modules.base.types.PriceTypeEnumeration; +import com.rometools.modules.base.types.ShippingType; +import com.rometools.modules.base.types.YearType; /** * This is an interface for the GoogleBase plug in that exposes methods used for vehicles. diff --git a/src/main/java/org/rometools/feed/module/base/Wanted.java b/src/main/java/com/rometools/modules/base/Wanted.java similarity index 99% rename from src/main/java/org/rometools/feed/module/base/Wanted.java rename to src/main/java/com/rometools/modules/base/Wanted.java index 8ef033f..7b7bdeb 100644 --- a/src/main/java/org/rometools/feed/module/base/Wanted.java +++ b/src/main/java/com/rometools/modules/base/Wanted.java @@ -37,9 +37,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.base; +package com.rometools.modules.base; -import org.rometools.feed.module.base.types.FloatUnit; +import com.rometools.modules.base.types.FloatUnit; /** * This is an interface for the GoogleBase plug in that exposes methods used for wanted ads. diff --git a/src/main/java/org/rometools/feed/module/base/io/CustomTagGenerator.java b/src/main/java/com/rometools/modules/base/io/CustomTagGenerator.java similarity index 91% rename from src/main/java/org/rometools/feed/module/base/io/CustomTagGenerator.java rename to src/main/java/com/rometools/modules/base/io/CustomTagGenerator.java index d80d861..28ab289 100644 --- a/src/main/java/org/rometools/feed/module/base/io/CustomTagGenerator.java +++ b/src/main/java/com/rometools/modules/base/io/CustomTagGenerator.java @@ -17,7 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.rometools.feed.module.base.io; +package com.rometools.modules.base.io; import java.net.URL; import java.util.Date; @@ -28,16 +28,16 @@ import java.util.Set; import org.jdom2.Element; import org.jdom2.Namespace; -import org.rometools.feed.module.base.CustomTag; -import org.rometools.feed.module.base.CustomTagImpl; -import org.rometools.feed.module.base.CustomTags; -import org.rometools.feed.module.base.types.DateTimeRange; -import org.rometools.feed.module.base.types.FloatUnit; -import org.rometools.feed.module.base.types.IntUnit; -import org.rometools.feed.module.base.types.ShortDate; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.io.ModuleGenerator; +import com.rometools.modules.base.CustomTag; +import com.rometools.modules.base.CustomTagImpl; +import com.rometools.modules.base.CustomTags; +import com.rometools.modules.base.types.DateTimeRange; +import com.rometools.modules.base.types.FloatUnit; +import com.rometools.modules.base.types.IntUnit; +import com.rometools.modules.base.types.ShortDate; +import com.rometools.rome.feed.module.Module; +import com.rometools.rome.io.ModuleGenerator; /** * @version $Revision: 1.1 $ diff --git a/src/main/java/org/rometools/feed/module/base/io/CustomTagParser.java b/src/main/java/com/rometools/modules/base/io/CustomTagParser.java similarity index 90% rename from src/main/java/org/rometools/feed/module/base/io/CustomTagParser.java rename to src/main/java/com/rometools/modules/base/io/CustomTagParser.java index bf379da..74d2295 100644 --- a/src/main/java/org/rometools/feed/module/base/io/CustomTagParser.java +++ b/src/main/java/com/rometools/modules/base/io/CustomTagParser.java @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.rometools.feed.module.base.io; +package com.rometools.modules.base.io; import java.net.MalformedURLException; import java.net.URL; @@ -30,19 +30,19 @@ import java.util.Locale; import org.jdom2.Element; import org.jdom2.Namespace; -import org.rometools.feed.module.base.CustomTag; -import org.rometools.feed.module.base.CustomTagImpl; -import org.rometools.feed.module.base.CustomTags; -import org.rometools.feed.module.base.CustomTagsImpl; -import org.rometools.feed.module.base.types.DateTimeRange; -import org.rometools.feed.module.base.types.FloatUnit; -import org.rometools.feed.module.base.types.IntUnit; -import org.rometools.feed.module.base.types.ShortDate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.io.ModuleParser; +import com.rometools.modules.base.CustomTag; +import com.rometools.modules.base.CustomTagImpl; +import com.rometools.modules.base.CustomTags; +import com.rometools.modules.base.CustomTagsImpl; +import com.rometools.modules.base.types.DateTimeRange; +import com.rometools.modules.base.types.FloatUnit; +import com.rometools.modules.base.types.IntUnit; +import com.rometools.modules.base.types.ShortDate; +import com.rometools.rome.feed.module.Module; +import com.rometools.rome.io.ModuleParser; /** * @version $Revision: 1.4 $ diff --git a/src/main/java/org/rometools/feed/module/base/io/GoogleBaseGenerator.java b/src/main/java/com/rometools/modules/base/io/GoogleBaseGenerator.java similarity index 86% rename from src/main/java/org/rometools/feed/module/base/io/GoogleBaseGenerator.java rename to src/main/java/com/rometools/modules/base/io/GoogleBaseGenerator.java index 6d72f93..57618d8 100644 --- a/src/main/java/org/rometools/feed/module/base/io/GoogleBaseGenerator.java +++ b/src/main/java/com/rometools/modules/base/io/GoogleBaseGenerator.java @@ -37,7 +37,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.base.io; +package com.rometools.modules.base.io; import java.beans.PropertyDescriptor; import java.net.URL; @@ -48,22 +48,22 @@ import java.util.Set; import org.jdom2.Element; import org.jdom2.Namespace; -import org.rometools.feed.module.base.GoogleBase; -import org.rometools.feed.module.base.GoogleBaseImpl; -import org.rometools.feed.module.base.types.CurrencyEnumeration; -import org.rometools.feed.module.base.types.DateTimeRange; -import org.rometools.feed.module.base.types.FloatUnit; -import org.rometools.feed.module.base.types.GenderEnumeration; -import org.rometools.feed.module.base.types.IntUnit; -import org.rometools.feed.module.base.types.PaymentTypeEnumeration; -import org.rometools.feed.module.base.types.PriceTypeEnumeration; -import org.rometools.feed.module.base.types.ShippingType; -import org.rometools.feed.module.base.types.ShortDate; -import org.rometools.feed.module.base.types.Size; -import org.rometools.feed.module.base.types.YearType; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.io.ModuleGenerator; +import com.rometools.modules.base.GoogleBase; +import com.rometools.modules.base.GoogleBaseImpl; +import com.rometools.modules.base.types.CurrencyEnumeration; +import com.rometools.modules.base.types.DateTimeRange; +import com.rometools.modules.base.types.FloatUnit; +import com.rometools.modules.base.types.GenderEnumeration; +import com.rometools.modules.base.types.IntUnit; +import com.rometools.modules.base.types.PaymentTypeEnumeration; +import com.rometools.modules.base.types.PriceTypeEnumeration; +import com.rometools.modules.base.types.ShippingType; +import com.rometools.modules.base.types.ShortDate; +import com.rometools.modules.base.types.Size; +import com.rometools.modules.base.types.YearType; +import com.rometools.rome.feed.module.Module; +import com.rometools.rome.io.ModuleGenerator; /** * diff --git a/src/main/java/org/rometools/feed/module/base/io/GoogleBaseParser.java b/src/main/java/com/rometools/modules/base/io/GoogleBaseParser.java similarity index 92% rename from src/main/java/org/rometools/feed/module/base/io/GoogleBaseParser.java rename to src/main/java/com/rometools/modules/base/io/GoogleBaseParser.java index 842f2c0..48b30c9 100644 --- a/src/main/java/org/rometools/feed/module/base/io/GoogleBaseParser.java +++ b/src/main/java/com/rometools/modules/base/io/GoogleBaseParser.java @@ -37,7 +37,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.base.io; +package com.rometools.modules.base.io; import java.beans.IntrospectionException; import java.beans.Introspector; @@ -55,23 +55,23 @@ import java.util.Properties; import org.jdom2.Element; import org.jdom2.Namespace; -import org.rometools.feed.module.base.GoogleBase; -import org.rometools.feed.module.base.GoogleBaseImpl; -import org.rometools.feed.module.base.types.CurrencyEnumeration; -import org.rometools.feed.module.base.types.DateTimeRange; -import org.rometools.feed.module.base.types.FloatUnit; -import org.rometools.feed.module.base.types.GenderEnumeration; -import org.rometools.feed.module.base.types.IntUnit; -import org.rometools.feed.module.base.types.PaymentTypeEnumeration; -import org.rometools.feed.module.base.types.PriceTypeEnumeration; -import org.rometools.feed.module.base.types.ShippingType; -import org.rometools.feed.module.base.types.Size; -import org.rometools.feed.module.base.types.YearType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.io.ModuleParser; +import com.rometools.modules.base.GoogleBase; +import com.rometools.modules.base.GoogleBaseImpl; +import com.rometools.modules.base.types.CurrencyEnumeration; +import com.rometools.modules.base.types.DateTimeRange; +import com.rometools.modules.base.types.FloatUnit; +import com.rometools.modules.base.types.GenderEnumeration; +import com.rometools.modules.base.types.IntUnit; +import com.rometools.modules.base.types.PaymentTypeEnumeration; +import com.rometools.modules.base.types.PriceTypeEnumeration; +import com.rometools.modules.base.types.ShippingType; +import com.rometools.modules.base.types.Size; +import com.rometools.modules.base.types.YearType; +import com.rometools.rome.feed.module.Module; +import com.rometools.rome.io.ModuleParser; /** * DOCUMENT ME! @@ -94,7 +94,7 @@ public class GoogleBaseParser implements ModuleParser { static { try { pds = Introspector.getBeanInfo(GoogleBaseImpl.class).getPropertyDescriptors(); - PROPS2TAGS.load(GoogleBaseParser.class.getResourceAsStream("/org/rometools/feed/module/base/io/tags.properties")); + PROPS2TAGS.load(GoogleBaseParser.class.getResourceAsStream("/com/rometools/modules/base/io/tags.properties")); } catch (final IOException e) { e.printStackTrace(); LOG.error("Unable to read properties file for Google Base tags!", e); diff --git a/src/main/java/org/rometools/feed/module/base/package.html b/src/main/java/com/rometools/modules/base/package.html similarity index 100% rename from src/main/java/org/rometools/feed/module/base/package.html rename to src/main/java/com/rometools/modules/base/package.html diff --git a/src/main/java/org/rometools/feed/module/base/types/CloneableType.java b/src/main/java/com/rometools/modules/base/types/CloneableType.java similarity index 97% rename from src/main/java/org/rometools/feed/module/base/types/CloneableType.java rename to src/main/java/com/rometools/modules/base/types/CloneableType.java index fdd2c27..0f3ba6a 100644 --- a/src/main/java/org/rometools/feed/module/base/types/CloneableType.java +++ b/src/main/java/com/rometools/modules/base/types/CloneableType.java @@ -37,7 +37,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.base.types; +package com.rometools.modules.base.types; /** * This is just a holder interface for cloneable elements. diff --git a/src/main/java/org/rometools/feed/module/base/types/CurrencyEnumeration.java b/src/main/java/com/rometools/modules/base/types/CurrencyEnumeration.java similarity index 99% rename from src/main/java/org/rometools/feed/module/base/types/CurrencyEnumeration.java rename to src/main/java/com/rometools/modules/base/types/CurrencyEnumeration.java index 9740a66..6d4cdc6 100644 --- a/src/main/java/org/rometools/feed/module/base/types/CurrencyEnumeration.java +++ b/src/main/java/com/rometools/modules/base/types/CurrencyEnumeration.java @@ -37,7 +37,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.base.types; +package com.rometools.modules.base.types; import java.util.HashMap; diff --git a/src/main/java/org/rometools/feed/module/base/types/DateTimeRange.java b/src/main/java/com/rometools/modules/base/types/DateTimeRange.java similarity index 98% rename from src/main/java/org/rometools/feed/module/base/types/DateTimeRange.java rename to src/main/java/com/rometools/modules/base/types/DateTimeRange.java index 3adbff5..6de93ca 100644 --- a/src/main/java/org/rometools/feed/module/base/types/DateTimeRange.java +++ b/src/main/java/com/rometools/modules/base/types/DateTimeRange.java @@ -37,7 +37,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.base.types; +package com.rometools.modules.base.types; import java.util.Date; diff --git a/src/main/java/org/rometools/feed/module/base/types/FloatUnit.java b/src/main/java/com/rometools/modules/base/types/FloatUnit.java similarity index 97% rename from src/main/java/org/rometools/feed/module/base/types/FloatUnit.java rename to src/main/java/com/rometools/modules/base/types/FloatUnit.java index a334bbe..6f36442 100644 --- a/src/main/java/org/rometools/feed/module/base/types/FloatUnit.java +++ b/src/main/java/com/rometools/modules/base/types/FloatUnit.java @@ -37,9 +37,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.base.types; +package com.rometools.modules.base.types; -import org.rometools.feed.module.base.io.GoogleBaseParser; +import com.rometools.modules.base.io.GoogleBaseParser; /** * This class represents a quantity consisting of a float value and an optional units specification. diff --git a/src/main/java/org/rometools/feed/module/base/types/GenderEnumeration.java b/src/main/java/com/rometools/modules/base/types/GenderEnumeration.java similarity index 98% rename from src/main/java/org/rometools/feed/module/base/types/GenderEnumeration.java rename to src/main/java/com/rometools/modules/base/types/GenderEnumeration.java index adb5a90..a47bd8d 100644 --- a/src/main/java/org/rometools/feed/module/base/types/GenderEnumeration.java +++ b/src/main/java/com/rometools/modules/base/types/GenderEnumeration.java @@ -37,7 +37,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.base.types; +package com.rometools.modules.base.types; /** * Simple enumeration for Genders. diff --git a/src/main/java/org/rometools/feed/module/base/types/IntUnit.java b/src/main/java/com/rometools/modules/base/types/IntUnit.java similarity index 97% rename from src/main/java/org/rometools/feed/module/base/types/IntUnit.java rename to src/main/java/com/rometools/modules/base/types/IntUnit.java index 3d26289..eb00e10 100644 --- a/src/main/java/org/rometools/feed/module/base/types/IntUnit.java +++ b/src/main/java/com/rometools/modules/base/types/IntUnit.java @@ -37,9 +37,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.base.types; +package com.rometools.modules.base.types; -import org.rometools.feed.module.base.io.GoogleBaseParser; +import com.rometools.modules.base.io.GoogleBaseParser; /** * diff --git a/src/main/java/org/rometools/feed/module/base/types/PaymentTypeEnumeration.java b/src/main/java/com/rometools/modules/base/types/PaymentTypeEnumeration.java similarity index 98% rename from src/main/java/org/rometools/feed/module/base/types/PaymentTypeEnumeration.java rename to src/main/java/com/rometools/modules/base/types/PaymentTypeEnumeration.java index 82a7368..f367e0f 100644 --- a/src/main/java/org/rometools/feed/module/base/types/PaymentTypeEnumeration.java +++ b/src/main/java/com/rometools/modules/base/types/PaymentTypeEnumeration.java @@ -37,7 +37,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.base.types; +package com.rometools.modules.base.types; import java.util.HashMap; diff --git a/src/main/java/org/rometools/feed/module/base/types/PriceTypeEnumeration.java b/src/main/java/com/rometools/modules/base/types/PriceTypeEnumeration.java similarity index 98% rename from src/main/java/org/rometools/feed/module/base/types/PriceTypeEnumeration.java rename to src/main/java/com/rometools/modules/base/types/PriceTypeEnumeration.java index 28cdbbd..c06c4a5 100644 --- a/src/main/java/org/rometools/feed/module/base/types/PriceTypeEnumeration.java +++ b/src/main/java/com/rometools/modules/base/types/PriceTypeEnumeration.java @@ -37,7 +37,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.base.types; +package com.rometools.modules.base.types; /** * Enumeration of values suitable for "price_type" or "salary_type". diff --git a/src/main/java/org/rometools/feed/module/base/types/ShippingType.java b/src/main/java/com/rometools/modules/base/types/ShippingType.java similarity index 99% rename from src/main/java/org/rometools/feed/module/base/types/ShippingType.java rename to src/main/java/com/rometools/modules/base/types/ShippingType.java index 8b8e2f1..daae24d 100644 --- a/src/main/java/org/rometools/feed/module/base/types/ShippingType.java +++ b/src/main/java/com/rometools/modules/base/types/ShippingType.java @@ -37,7 +37,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.base.types; +package com.rometools.modules.base.types; import java.util.HashMap; diff --git a/src/main/java/org/rometools/feed/module/base/types/ShortDate.java b/src/main/java/com/rometools/modules/base/types/ShortDate.java similarity index 98% rename from src/main/java/org/rometools/feed/module/base/types/ShortDate.java rename to src/main/java/com/rometools/modules/base/types/ShortDate.java index 6bb4220..952ee67 100644 --- a/src/main/java/org/rometools/feed/module/base/types/ShortDate.java +++ b/src/main/java/com/rometools/modules/base/types/ShortDate.java @@ -37,7 +37,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.base.types; +package com.rometools.modules.base.types; import java.util.Date; diff --git a/src/main/java/org/rometools/feed/module/base/types/Size.java b/src/main/java/com/rometools/modules/base/types/Size.java similarity index 98% rename from src/main/java/org/rometools/feed/module/base/types/Size.java rename to src/main/java/com/rometools/modules/base/types/Size.java index db86847..a913368 100644 --- a/src/main/java/org/rometools/feed/module/base/types/Size.java +++ b/src/main/java/com/rometools/modules/base/types/Size.java @@ -37,7 +37,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.base.types; +package com.rometools.modules.base.types; import java.util.StringTokenizer; diff --git a/src/main/java/org/rometools/feed/module/base/types/YearType.java b/src/main/java/com/rometools/modules/base/types/YearType.java similarity index 98% rename from src/main/java/org/rometools/feed/module/base/types/YearType.java rename to src/main/java/com/rometools/modules/base/types/YearType.java index 683ca01..e4887b7 100644 --- a/src/main/java/org/rometools/feed/module/base/types/YearType.java +++ b/src/main/java/com/rometools/modules/base/types/YearType.java @@ -37,7 +37,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.base.types; +package com.rometools.modules.base.types; import java.util.Calendar; import java.util.Date; diff --git a/src/main/java/org/rometools/feed/module/base/types/package.html b/src/main/java/com/rometools/modules/base/types/package.html similarity index 100% rename from src/main/java/org/rometools/feed/module/base/types/package.html rename to src/main/java/com/rometools/modules/base/types/package.html diff --git a/src/main/java/org/rometools/feed/module/cc/CreativeCommons.java b/src/main/java/com/rometools/modules/cc/CreativeCommons.java similarity index 93% rename from src/main/java/org/rometools/feed/module/cc/CreativeCommons.java rename to src/main/java/com/rometools/modules/cc/CreativeCommons.java index a746bcc..24d3345 100644 --- a/src/main/java/org/rometools/feed/module/cc/CreativeCommons.java +++ b/src/main/java/com/rometools/modules/cc/CreativeCommons.java @@ -38,11 +38,10 @@ * limitations under the License. */ -package org.rometools.feed.module.cc; +package com.rometools.modules.cc; -import org.rometools.feed.module.cc.types.License; - -import com.sun.syndication.feed.module.Module; +import com.rometools.modules.cc.types.License; +import com.rometools.rome.feed.module.Module; /** * diff --git a/src/main/java/org/rometools/feed/module/cc/CreativeCommonsImpl.java b/src/main/java/com/rometools/modules/cc/CreativeCommonsImpl.java similarity index 94% rename from src/main/java/org/rometools/feed/module/cc/CreativeCommonsImpl.java rename to src/main/java/com/rometools/modules/cc/CreativeCommonsImpl.java index aae52bd..1ea754a 100644 --- a/src/main/java/org/rometools/feed/module/cc/CreativeCommonsImpl.java +++ b/src/main/java/com/rometools/modules/cc/CreativeCommonsImpl.java @@ -38,15 +38,14 @@ * limitations under the License. */ -package org.rometools.feed.module.cc; +package com.rometools.modules.cc; import java.lang.reflect.Array; -import org.rometools.feed.module.cc.types.License; - -import com.sun.syndication.feed.CopyFrom; -import com.sun.syndication.feed.impl.EqualsBean; -import com.sun.syndication.feed.impl.ToStringBean; +import com.rometools.modules.cc.types.License; +import com.rometools.rome.feed.CopyFrom; +import com.rometools.rome.feed.impl.EqualsBean; +import com.rometools.rome.feed.impl.ToStringBean; /** * @version $Revision: 1.1 $ diff --git a/src/main/java/org/rometools/feed/module/cc/io/CCModuleGenerator.java b/src/main/java/com/rometools/modules/cc/io/CCModuleGenerator.java similarity index 95% rename from src/main/java/org/rometools/feed/module/cc/io/CCModuleGenerator.java rename to src/main/java/com/rometools/modules/cc/io/CCModuleGenerator.java index 8352b9b..de0e065 100644 --- a/src/main/java/org/rometools/feed/module/cc/io/CCModuleGenerator.java +++ b/src/main/java/com/rometools/modules/cc/io/CCModuleGenerator.java @@ -38,21 +38,21 @@ * limitations under the License. */ -package org.rometools.feed.module.cc.io; +package com.rometools.modules.cc.io; import java.util.HashSet; import java.util.Set; import org.jdom2.Element; import org.jdom2.Namespace; -import org.rometools.feed.module.cc.CreativeCommons; -import org.rometools.feed.module.cc.CreativeCommonsImpl; -import org.rometools.feed.module.cc.types.License; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.io.ModuleGenerator; +import com.rometools.modules.cc.CreativeCommons; +import com.rometools.modules.cc.CreativeCommonsImpl; +import com.rometools.modules.cc.types.License; +import com.rometools.rome.feed.module.Module; +import com.rometools.rome.io.ModuleGenerator; /** * @version $Revision: 1.1 $ diff --git a/src/main/java/org/rometools/feed/module/cc/io/ModuleParserRSS1.java b/src/main/java/com/rometools/modules/cc/io/ModuleParserRSS1.java similarity index 94% rename from src/main/java/org/rometools/feed/module/cc/io/ModuleParserRSS1.java rename to src/main/java/com/rometools/modules/cc/io/ModuleParserRSS1.java index 6060770..04ba046 100644 --- a/src/main/java/org/rometools/feed/module/cc/io/ModuleParserRSS1.java +++ b/src/main/java/com/rometools/modules/cc/io/ModuleParserRSS1.java @@ -38,7 +38,7 @@ * limitations under the License. */ -package org.rometools.feed.module.cc.io; +package com.rometools.modules.cc.io; import java.util.ArrayList; import java.util.Iterator; @@ -47,12 +47,12 @@ import java.util.Locale; import org.jdom2.Element; import org.jdom2.Namespace; -import org.rometools.feed.module.cc.CreativeCommonsImpl; -import org.rometools.feed.module.cc.types.License; -import org.rometools.feed.module.cc.types.License.Behaviour; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.io.ModuleParser; +import com.rometools.modules.cc.CreativeCommonsImpl; +import com.rometools.modules.cc.types.License; +import com.rometools.modules.cc.types.License.Behaviour; +import com.rometools.rome.feed.module.Module; +import com.rometools.rome.io.ModuleParser; /** * @version $Revision: 1.3 $ diff --git a/src/main/java/org/rometools/feed/module/cc/io/ModuleParserRSS2.java b/src/main/java/com/rometools/modules/cc/io/ModuleParserRSS2.java similarity index 94% rename from src/main/java/org/rometools/feed/module/cc/io/ModuleParserRSS2.java rename to src/main/java/com/rometools/modules/cc/io/ModuleParserRSS2.java index d1ba294..8030c68 100644 --- a/src/main/java/org/rometools/feed/module/cc/io/ModuleParserRSS2.java +++ b/src/main/java/com/rometools/modules/cc/io/ModuleParserRSS2.java @@ -38,7 +38,7 @@ * limitations under the License. */ -package org.rometools.feed.module.cc.io; +package com.rometools.modules.cc.io; import java.util.ArrayList; import java.util.Iterator; @@ -47,11 +47,11 @@ import java.util.Locale; import org.jdom2.Element; import org.jdom2.Namespace; -import org.rometools.feed.module.cc.CreativeCommonsImpl; -import org.rometools.feed.module.cc.types.License; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.io.ModuleParser; +import com.rometools.modules.cc.CreativeCommonsImpl; +import com.rometools.modules.cc.types.License; +import com.rometools.rome.feed.module.Module; +import com.rometools.rome.io.ModuleParser; /** * diff --git a/src/main/java/org/rometools/feed/module/cc/package.html b/src/main/java/com/rometools/modules/cc/package.html similarity index 100% rename from src/main/java/org/rometools/feed/module/cc/package.html rename to src/main/java/com/rometools/modules/cc/package.html diff --git a/src/main/java/org/rometools/feed/module/cc/types/License.java b/src/main/java/com/rometools/modules/cc/types/License.java similarity index 98% rename from src/main/java/org/rometools/feed/module/cc/types/License.java rename to src/main/java/com/rometools/modules/cc/types/License.java index 075d7c5..29ac313 100644 --- a/src/main/java/org/rometools/feed/module/cc/types/License.java +++ b/src/main/java/com/rometools/modules/cc/types/License.java @@ -37,7 +37,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.cc.types; +package com.rometools.modules.cc.types; import java.util.HashMap; import java.util.Iterator; @@ -45,8 +45,8 @@ import java.util.Map; import java.util.StringTokenizer; import java.util.concurrent.ConcurrentHashMap; -import com.sun.syndication.feed.impl.EqualsBean; -import com.sun.syndication.feed.impl.ToStringBean; +import com.rometools.rome.feed.impl.EqualsBean; +import com.rometools.rome.feed.impl.ToStringBean; /** * @version $Revision: 1.1 $ diff --git a/src/main/java/org/rometools/feed/module/cc/types/package.html b/src/main/java/com/rometools/modules/cc/types/package.html similarity index 100% rename from src/main/java/org/rometools/feed/module/cc/types/package.html rename to src/main/java/com/rometools/modules/cc/types/package.html diff --git a/src/main/java/org/rometools/feed/module/content/ContentItem.java b/src/main/java/com/rometools/modules/content/ContentItem.java similarity index 99% rename from src/main/java/org/rometools/feed/module/content/ContentItem.java rename to src/main/java/com/rometools/modules/content/ContentItem.java index 97e2d75..34f95e3 100644 --- a/src/main/java/org/rometools/feed/module/content/ContentItem.java +++ b/src/main/java/com/rometools/modules/content/ContentItem.java @@ -39,7 +39,7 @@ * * */ -package org.rometools.feed.module.content; +package com.rometools.modules.content; import java.util.List; diff --git a/src/main/java/org/rometools/feed/module/content/ContentModule.java b/src/main/java/com/rometools/modules/content/ContentModule.java similarity index 97% rename from src/main/java/org/rometools/feed/module/content/ContentModule.java rename to src/main/java/com/rometools/modules/content/ContentModule.java index 76edbf8..342701d 100644 --- a/src/main/java/org/rometools/feed/module/content/ContentModule.java +++ b/src/main/java/com/rometools/modules/content/ContentModule.java @@ -38,11 +38,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.content; +package com.rometools.modules.content; import java.util.List; -import com.sun.syndication.feed.module.Module; +import com.rometools.rome.feed.module.Module; /** * @version $Revision: 1.1 $ diff --git a/src/main/java/org/rometools/feed/module/content/ContentModuleImpl.java b/src/main/java/com/rometools/modules/content/ContentModuleImpl.java similarity index 96% rename from src/main/java/org/rometools/feed/module/content/ContentModuleImpl.java rename to src/main/java/com/rometools/modules/content/ContentModuleImpl.java index d3edfbc..e0e345d 100644 --- a/src/main/java/org/rometools/feed/module/content/ContentModuleImpl.java +++ b/src/main/java/com/rometools/modules/content/ContentModuleImpl.java @@ -41,13 +41,13 @@ * * */ -package org.rometools.feed.module.content; +package com.rometools.modules.content; import java.util.ArrayList; import java.util.List; -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; /** * @version $Revision: 1.4 $ diff --git a/src/main/java/org/rometools/feed/module/content/io/ContentModuleGenerator.java b/src/main/java/com/rometools/modules/content/io/ContentModuleGenerator.java similarity index 95% rename from src/main/java/org/rometools/feed/module/content/io/ContentModuleGenerator.java rename to src/main/java/com/rometools/modules/content/io/ContentModuleGenerator.java index 480e8d4..3c9126c 100644 --- a/src/main/java/org/rometools/feed/module/content/io/ContentModuleGenerator.java +++ b/src/main/java/com/rometools/modules/content/io/ContentModuleGenerator.java @@ -39,7 +39,7 @@ * * */ -package org.rometools.feed.module.content.io; +package com.rometools.modules.content.io; import java.util.ArrayList; import java.util.Collections; @@ -52,16 +52,17 @@ import org.jdom2.CDATA; import org.jdom2.Content; import org.jdom2.Element; import org.jdom2.Namespace; -import org.rometools.feed.module.content.ContentItem; -import org.rometools.feed.module.content.ContentModule; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.rometools.modules.content.ContentItem; +import com.rometools.modules.content.ContentModule; + /** * @version $Revision: 1.2 $ * @author Robert "kebernet" Cooper */ -public class ContentModuleGenerator implements com.sun.syndication.io.ModuleGenerator { +public class ContentModuleGenerator implements com.rometools.rome.io.ModuleGenerator { private static final Logger LOG = LoggerFactory.getLogger(ContentModuleGenerator.class); @@ -80,7 +81,7 @@ public class ContentModuleGenerator implements com.sun.syndication.io.ModuleGene } @Override - public void generate(final com.sun.syndication.feed.module.Module module, final org.jdom2.Element element) { + public void generate(final com.rometools.rome.feed.module.Module module, final org.jdom2.Element element) { // this is not necessary, it is done to avoid the namespace definition in every item. Element root = element; diff --git a/src/main/java/org/rometools/feed/module/content/io/ContentModuleParser.java b/src/main/java/com/rometools/modules/content/io/ContentModuleParser.java similarity index 93% rename from src/main/java/org/rometools/feed/module/content/io/ContentModuleParser.java rename to src/main/java/com/rometools/modules/content/io/ContentModuleParser.java index 3df7c3a..61e4c92 100644 --- a/src/main/java/org/rometools/feed/module/content/io/ContentModuleParser.java +++ b/src/main/java/com/rometools/modules/content/io/ContentModuleParser.java @@ -41,7 +41,7 @@ * * */ -package org.rometools.feed.module.content.io; +package com.rometools.modules.content.io; import java.util.ArrayList; import java.util.List; @@ -52,15 +52,16 @@ import org.jdom2.Content; import org.jdom2.Element; import org.jdom2.Namespace; import org.jdom2.output.XMLOutputter; -import org.rometools.feed.module.content.ContentItem; -import org.rometools.feed.module.content.ContentModule; -import org.rometools.feed.module.content.ContentModuleImpl; + +import com.rometools.modules.content.ContentItem; +import com.rometools.modules.content.ContentModule; +import com.rometools.modules.content.ContentModuleImpl; /** * @version $Revision: 1.3 $ * @author Robert "kebernet" Cooper */ -public class ContentModuleParser implements com.sun.syndication.io.ModuleParser { +public class ContentModuleParser implements com.rometools.rome.io.ModuleParser { private static final Namespace CONTENT_NS = Namespace.getNamespace("content", ContentModule.URI); private static final Namespace RDF_NS = Namespace.getNamespace("rdf", ContentModule.RDF_URI); @@ -74,7 +75,7 @@ public class ContentModuleParser implements com.sun.syndication.io.ModuleParser } @Override - public com.sun.syndication.feed.module.Module parse(final Element element, final Locale locale) { + public com.rometools.rome.feed.module.Module parse(final Element element, final Locale locale) { boolean foundSomething = false; final ContentModule cm = new ContentModuleImpl(); final List encodeds = element.getChildren("encoded", CONTENT_NS); diff --git a/src/main/java/org/rometools/feed/module/content/package.html b/src/main/java/com/rometools/modules/content/package.html similarity index 100% rename from src/main/java/org/rometools/feed/module/content/package.html rename to src/main/java/com/rometools/modules/content/package.html diff --git a/src/main/java/org/rometools/feed/module/feedburner/FeedBurner.java b/src/main/java/com/rometools/modules/feedburner/FeedBurner.java similarity index 92% rename from src/main/java/org/rometools/feed/module/feedburner/FeedBurner.java rename to src/main/java/com/rometools/modules/feedburner/FeedBurner.java index fb42012..d1619a4 100644 --- a/src/main/java/org/rometools/feed/module/feedburner/FeedBurner.java +++ b/src/main/java/com/rometools/modules/feedburner/FeedBurner.java @@ -15,11 +15,11 @@ * under the License. */ -package org.rometools.feed.module.feedburner; +package com.rometools.modules.feedburner; import java.io.Serializable; -import com.sun.syndication.feed.module.Module; +import com.rometools.rome.feed.module.Module; /** * Interface for the FeedBurner RSS extension. diff --git a/src/main/java/org/rometools/feed/module/feedburner/FeedBurnerImpl.java b/src/main/java/com/rometools/modules/feedburner/FeedBurnerImpl.java similarity index 96% rename from src/main/java/org/rometools/feed/module/feedburner/FeedBurnerImpl.java rename to src/main/java/com/rometools/modules/feedburner/FeedBurnerImpl.java index ea941c1..cf74014 100644 --- a/src/main/java/org/rometools/feed/module/feedburner/FeedBurnerImpl.java +++ b/src/main/java/com/rometools/modules/feedburner/FeedBurnerImpl.java @@ -15,9 +15,9 @@ * */ -package org.rometools.feed.module.feedburner; +package com.rometools.modules.feedburner; -import com.sun.syndication.feed.CopyFrom; +import com.rometools.rome.feed.CopyFrom; /** * Implementation of the FeedBurner RSS extension. diff --git a/src/main/java/org/rometools/feed/module/feedburner/io/FeedBurnerModuleGenerator.java b/src/main/java/com/rometools/modules/feedburner/io/FeedBurnerModuleGenerator.java similarity index 91% rename from src/main/java/org/rometools/feed/module/feedburner/io/FeedBurnerModuleGenerator.java rename to src/main/java/com/rometools/modules/feedburner/io/FeedBurnerModuleGenerator.java index 02b0d50..9406f04 100644 --- a/src/main/java/org/rometools/feed/module/feedburner/io/FeedBurnerModuleGenerator.java +++ b/src/main/java/com/rometools/modules/feedburner/io/FeedBurnerModuleGenerator.java @@ -14,17 +14,17 @@ * limitations under the License. * */ -package org.rometools.feed.module.feedburner.io; +package com.rometools.modules.feedburner.io; import java.util.HashSet; import java.util.Set; import org.jdom2.Element; import org.jdom2.Namespace; -import org.rometools.feed.module.feedburner.FeedBurner; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.io.ModuleGenerator; +import com.rometools.modules.feedburner.FeedBurner; +import com.rometools.rome.feed.module.Module; +import com.rometools.rome.io.ModuleGenerator; /** * ModuleGenerator implementation for the FeedBurner RSS extension. diff --git a/src/main/java/org/rometools/feed/module/feedburner/io/FeedBurnerModuleParser.java b/src/main/java/com/rometools/modules/feedburner/io/FeedBurnerModuleParser.java similarity index 88% rename from src/main/java/org/rometools/feed/module/feedburner/io/FeedBurnerModuleParser.java rename to src/main/java/com/rometools/modules/feedburner/io/FeedBurnerModuleParser.java index 34b3822..ad124ff 100644 --- a/src/main/java/org/rometools/feed/module/feedburner/io/FeedBurnerModuleParser.java +++ b/src/main/java/com/rometools/modules/feedburner/io/FeedBurnerModuleParser.java @@ -14,17 +14,17 @@ * limitations under the License. * */ -package org.rometools.feed.module.feedburner.io; +package com.rometools.modules.feedburner.io; import java.util.Locale; import org.jdom2.Element; import org.jdom2.Namespace; -import org.rometools.feed.module.feedburner.FeedBurner; -import org.rometools.feed.module.feedburner.FeedBurnerImpl; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.io.ModuleParser; +import com.rometools.modules.feedburner.FeedBurner; +import com.rometools.modules.feedburner.FeedBurnerImpl; +import com.rometools.rome.feed.module.Module; +import com.rometools.rome.io.ModuleParser; /** * ModuleParser implementation for the FeedBurner RSS extension. diff --git a/src/main/java/org/rometools/feed/module/feedburner/package.html b/src/main/java/com/rometools/modules/feedburner/package.html similarity index 100% rename from src/main/java/org/rometools/feed/module/feedburner/package.html rename to src/main/java/com/rometools/modules/feedburner/package.html diff --git a/src/main/java/org/rometools/feed/module/georss/GMLGenerator.java b/src/main/java/com/rometools/modules/georss/GMLGenerator.java similarity index 87% rename from src/main/java/org/rometools/feed/module/georss/GMLGenerator.java rename to src/main/java/com/rometools/modules/georss/GMLGenerator.java index a092c47..b83a0f7 100644 --- a/src/main/java/org/rometools/feed/module/georss/GMLGenerator.java +++ b/src/main/java/com/rometools/modules/georss/GMLGenerator.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.rometools.feed.module.georss; +package com.rometools.modules.georss; import java.util.Collections; import java.util.HashSet; @@ -24,18 +24,18 @@ import java.util.Set; import org.jdom2.Element; import org.jdom2.Namespace; -import org.rometools.feed.module.georss.geometries.AbstractGeometry; -import org.rometools.feed.module.georss.geometries.AbstractRing; -import org.rometools.feed.module.georss.geometries.Envelope; -import org.rometools.feed.module.georss.geometries.LineString; -import org.rometools.feed.module.georss.geometries.LinearRing; -import org.rometools.feed.module.georss.geometries.Point; -import org.rometools.feed.module.georss.geometries.Polygon; -import org.rometools.feed.module.georss.geometries.Position; -import org.rometools.feed.module.georss.geometries.PositionList; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.io.ModuleGenerator; +import com.rometools.modules.georss.geometries.AbstractGeometry; +import com.rometools.modules.georss.geometries.AbstractRing; +import com.rometools.modules.georss.geometries.Envelope; +import com.rometools.modules.georss.geometries.LineString; +import com.rometools.modules.georss.geometries.LinearRing; +import com.rometools.modules.georss.geometries.Point; +import com.rometools.modules.georss.geometries.Polygon; +import com.rometools.modules.georss.geometries.Position; +import com.rometools.modules.georss.geometries.PositionList; +import com.rometools.rome.feed.module.Module; +import com.rometools.rome.io.ModuleGenerator; /** * GMLGenerator produces georss elements in georss GML format. @@ -67,7 +67,7 @@ public class GMLGenerator implements ModuleGenerator { /* * (non-Javadoc) - * @see com.sun.syndication.io.ModuleGenerator#getNamespaceUri() + * @see com.rometools.rome.io.ModuleGenerator#getNamespaceUri() */ @Override public String getNamespaceUri() { @@ -76,7 +76,7 @@ public class GMLGenerator implements ModuleGenerator { /* * (non-Javadoc) - * @see com.sun.syndication.io.ModuleGenerator#getNamespaces() + * @see com.rometools.rome.io.ModuleGenerator#getNamespaces() */ @Override public Set getNamespaces() { @@ -85,7 +85,7 @@ public class GMLGenerator implements ModuleGenerator { /* * (non-Javadoc) - * @see com.sun.syndication.io.ModuleGenerator#generate(com.sun.syndication.feed.module.Module, + * @see com.rometools.rome.io.ModuleGenerator#generate(com.rometools.rome.feed.module.Module, * org.jdom2.Element) */ @Override diff --git a/src/main/java/org/rometools/feed/module/georss/GMLModuleImpl.java b/src/main/java/com/rometools/modules/georss/GMLModuleImpl.java similarity index 96% rename from src/main/java/org/rometools/feed/module/georss/GMLModuleImpl.java rename to src/main/java/com/rometools/modules/georss/GMLModuleImpl.java index edb41f6..03c944d 100644 --- a/src/main/java/org/rometools/feed/module/georss/GMLModuleImpl.java +++ b/src/main/java/com/rometools/modules/georss/GMLModuleImpl.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.rometools.feed.module.georss; +package com.rometools.modules.georss; /** * GMLModuleImpl is the implementation of the {@link GeoRSSModule} Interface for the gml GeoRSS diff --git a/src/main/java/org/rometools/feed/module/georss/GMLParser.java b/src/main/java/com/rometools/modules/georss/GMLParser.java similarity index 91% rename from src/main/java/org/rometools/feed/module/georss/GMLParser.java rename to src/main/java/com/rometools/modules/georss/GMLParser.java index d51d0b1..7312418 100644 --- a/src/main/java/org/rometools/feed/module/georss/GMLParser.java +++ b/src/main/java/com/rometools/modules/georss/GMLParser.java @@ -14,24 +14,24 @@ * limitations under the License. * */ -package org.rometools.feed.module.georss; +package com.rometools.modules.georss; import java.util.Iterator; import java.util.List; import java.util.Locale; import org.jdom2.Element; -import org.rometools.feed.module.georss.geometries.Envelope; -import org.rometools.feed.module.georss.geometries.LineString; -import org.rometools.feed.module.georss.geometries.LinearRing; -import org.rometools.feed.module.georss.geometries.Point; -import org.rometools.feed.module.georss.geometries.Polygon; -import org.rometools.feed.module.georss.geometries.Position; -import org.rometools.feed.module.georss.geometries.PositionList; +import com.rometools.modules.georss.geometries.Envelope; +import com.rometools.modules.georss.geometries.LineString; +import com.rometools.modules.georss.geometries.LinearRing; +import com.rometools.modules.georss.geometries.Point; +import com.rometools.modules.georss.geometries.Polygon; +import com.rometools.modules.georss.geometries.Position; +import com.rometools.modules.georss.geometries.PositionList; +import com.rometools.rome.feed.module.Module; +import com.rometools.rome.io.ModuleParser; import com.rometools.utils.Strings; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.io.ModuleParser; /** * GMLParser is a parser for the GML georss format. diff --git a/src/main/java/org/rometools/feed/module/georss/GeoRSSModule.java b/src/main/java/com/rometools/modules/georss/GeoRSSModule.java similarity index 91% rename from src/main/java/org/rometools/feed/module/georss/GeoRSSModule.java rename to src/main/java/com/rometools/modules/georss/GeoRSSModule.java index 8337271..0dcb1ae 100644 --- a/src/main/java/org/rometools/feed/module/georss/GeoRSSModule.java +++ b/src/main/java/com/rometools/modules/georss/GeoRSSModule.java @@ -14,15 +14,15 @@ * limitations under the License. * */ -package org.rometools.feed.module.georss; +package com.rometools.modules.georss; import org.jdom2.Namespace; -import org.rometools.feed.module.georss.geometries.AbstractGeometry; -import org.rometools.feed.module.georss.geometries.Point; -import org.rometools.feed.module.georss.geometries.Position; -import com.sun.syndication.feed.CopyFrom; -import com.sun.syndication.feed.module.ModuleImpl; +import com.rometools.modules.georss.geometries.AbstractGeometry; +import com.rometools.modules.georss.geometries.Point; +import com.rometools.modules.georss.geometries.Position; +import com.rometools.rome.feed.CopyFrom; +import com.rometools.rome.feed.module.ModuleImpl; /** * GeoRSSModule is the main georss interface defining the methods to produce and consume georss @@ -118,7 +118,7 @@ public abstract class GeoRSSModule extends ModuleImpl implements Cloneable { /* * (non-Javadoc) - * @see com.sun.syndication.feed.CopyFrom#copyFrom(java.lang.Object) + * @see com.rometools.rome.feed.CopyFrom#copyFrom(java.lang.Object) */ @Override public void copyFrom(final CopyFrom obj) { diff --git a/src/main/java/org/rometools/feed/module/georss/GeoRSSPoint.java b/src/main/java/com/rometools/modules/georss/GeoRSSPoint.java similarity index 97% rename from src/main/java/org/rometools/feed/module/georss/GeoRSSPoint.java rename to src/main/java/com/rometools/modules/georss/GeoRSSPoint.java index 512bc83..ef7f1f6 100644 --- a/src/main/java/org/rometools/feed/module/georss/GeoRSSPoint.java +++ b/src/main/java/com/rometools/modules/georss/GeoRSSPoint.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.rometools.feed.module.georss; +package com.rometools.modules.georss; /** * @author marc diff --git a/src/main/java/org/rometools/feed/module/georss/GeoRSSUtils.java b/src/main/java/com/rometools/modules/georss/GeoRSSUtils.java similarity index 96% rename from src/main/java/org/rometools/feed/module/georss/GeoRSSUtils.java rename to src/main/java/com/rometools/modules/georss/GeoRSSUtils.java index 2b1e83f..56c82cf 100644 --- a/src/main/java/org/rometools/feed/module/georss/GeoRSSUtils.java +++ b/src/main/java/com/rometools/modules/georss/GeoRSSUtils.java @@ -14,10 +14,10 @@ * limitations under the License. * */ -package org.rometools.feed.module.georss; +package com.rometools.modules.georss; -import com.sun.syndication.feed.synd.SyndEntry; -import com.sun.syndication.feed.synd.SyndFeed; +import com.rometools.rome.feed.synd.SyndEntry; +import com.rometools.rome.feed.synd.SyndFeed; /** * static utility methods for georss. diff --git a/src/main/java/org/rometools/feed/module/georss/SimpleGenerator.java b/src/main/java/com/rometools/modules/georss/SimpleGenerator.java similarity index 83% rename from src/main/java/org/rometools/feed/module/georss/SimpleGenerator.java rename to src/main/java/com/rometools/modules/georss/SimpleGenerator.java index 624cd74..f30e11e 100644 --- a/src/main/java/org/rometools/feed/module/georss/SimpleGenerator.java +++ b/src/main/java/com/rometools/modules/georss/SimpleGenerator.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.rometools.feed.module.georss; +package com.rometools.modules.georss; import java.util.Collections; import java.util.HashSet; @@ -22,20 +22,20 @@ import java.util.Set; import org.jdom2.Element; import org.jdom2.Namespace; -import org.rometools.feed.module.georss.geometries.AbstractGeometry; -import org.rometools.feed.module.georss.geometries.AbstractRing; -import org.rometools.feed.module.georss.geometries.Envelope; -import org.rometools.feed.module.georss.geometries.LineString; -import org.rometools.feed.module.georss.geometries.LinearRing; -import org.rometools.feed.module.georss.geometries.Point; -import org.rometools.feed.module.georss.geometries.Polygon; -import org.rometools.feed.module.georss.geometries.Position; -import org.rometools.feed.module.georss.geometries.PositionList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.io.ModuleGenerator; +import com.rometools.modules.georss.geometries.AbstractGeometry; +import com.rometools.modules.georss.geometries.AbstractRing; +import com.rometools.modules.georss.geometries.Envelope; +import com.rometools.modules.georss.geometries.LineString; +import com.rometools.modules.georss.geometries.LinearRing; +import com.rometools.modules.georss.geometries.Point; +import com.rometools.modules.georss.geometries.Polygon; +import com.rometools.modules.georss.geometries.Position; +import com.rometools.modules.georss.geometries.PositionList; +import com.rometools.rome.feed.module.Module; +import com.rometools.rome.io.ModuleGenerator; /** * SimpleGenerator produces georss elements in georss simple format. @@ -68,7 +68,7 @@ public class SimpleGenerator implements ModuleGenerator { /* * (non-Javadoc) - * @see com.sun.syndication.io.ModuleGenerator#getNamespaceUri() + * @see com.rometools.rome.io.ModuleGenerator#getNamespaceUri() */ @Override public String getNamespaceUri() { @@ -77,7 +77,7 @@ public class SimpleGenerator implements ModuleGenerator { /* * (non-Javadoc) - * @see com.sun.syndication.io.ModuleGenerator#getNamespaces() + * @see com.rometools.rome.io.ModuleGenerator#getNamespaces() */ @Override public Set getNamespaces() { @@ -86,7 +86,7 @@ public class SimpleGenerator implements ModuleGenerator { /* * (non-Javadoc) - * @see com.sun.syndication.io.ModuleGenerator#generate(com.sun.syndication.feed.module.Module, + * @see com.rometools.rome.io.ModuleGenerator#generate(com.rometools.rome.feed.module.Module, * org.jdom2.Element) */ @Override diff --git a/src/main/java/org/rometools/feed/module/georss/SimpleModuleImpl.java b/src/main/java/com/rometools/modules/georss/SimpleModuleImpl.java similarity index 96% rename from src/main/java/org/rometools/feed/module/georss/SimpleModuleImpl.java rename to src/main/java/com/rometools/modules/georss/SimpleModuleImpl.java index f6dce2b..1e96d78 100644 --- a/src/main/java/org/rometools/feed/module/georss/SimpleModuleImpl.java +++ b/src/main/java/com/rometools/modules/georss/SimpleModuleImpl.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.rometools.feed.module.georss; +package com.rometools.modules.georss; /** * SimpleModuleImpl is the implementation of the {@link GeoRSSModule} Interface for the GeoRSS diff --git a/src/main/java/org/rometools/feed/module/georss/SimpleParser.java b/src/main/java/com/rometools/modules/georss/SimpleParser.java similarity index 89% rename from src/main/java/org/rometools/feed/module/georss/SimpleParser.java rename to src/main/java/com/rometools/modules/georss/SimpleParser.java index 9053a49..d407f47 100644 --- a/src/main/java/org/rometools/feed/module/georss/SimpleParser.java +++ b/src/main/java/com/rometools/modules/georss/SimpleParser.java @@ -14,23 +14,23 @@ * limitations under the License. * */ -package org.rometools.feed.module.georss; +package com.rometools.modules.georss; import java.util.Locale; import org.jdom2.Element; -import org.rometools.feed.module.georss.geometries.Envelope; -import org.rometools.feed.module.georss.geometries.LineString; -import org.rometools.feed.module.georss.geometries.LinearRing; -import org.rometools.feed.module.georss.geometries.Point; -import org.rometools.feed.module.georss.geometries.Polygon; -import org.rometools.feed.module.georss.geometries.Position; -import org.rometools.feed.module.georss.geometries.PositionList; +import com.rometools.modules.georss.geometries.Envelope; +import com.rometools.modules.georss.geometries.LineString; +import com.rometools.modules.georss.geometries.LinearRing; +import com.rometools.modules.georss.geometries.Point; +import com.rometools.modules.georss.geometries.Polygon; +import com.rometools.modules.georss.geometries.Position; +import com.rometools.modules.georss.geometries.PositionList; +import com.rometools.rome.feed.module.Module; +import com.rometools.rome.io.ModuleParser; import com.rometools.utils.Doubles; import com.rometools.utils.Strings; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.io.ModuleParser; /** * SimpleParser is a parser for the GeoRSS Simple format. diff --git a/src/main/java/org/rometools/feed/module/georss/W3CGeoGenerator.java b/src/main/java/com/rometools/modules/georss/W3CGeoGenerator.java similarity index 84% rename from src/main/java/org/rometools/feed/module/georss/W3CGeoGenerator.java rename to src/main/java/com/rometools/modules/georss/W3CGeoGenerator.java index c7a6988..06185ad 100644 --- a/src/main/java/org/rometools/feed/module/georss/W3CGeoGenerator.java +++ b/src/main/java/com/rometools/modules/georss/W3CGeoGenerator.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.rometools.feed.module.georss; +package com.rometools.modules.georss; import java.util.Collections; import java.util.HashSet; @@ -22,12 +22,12 @@ import java.util.Set; import org.jdom2.Element; import org.jdom2.Namespace; -import org.rometools.feed.module.georss.geometries.AbstractGeometry; -import org.rometools.feed.module.georss.geometries.Point; -import org.rometools.feed.module.georss.geometries.Position; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.io.ModuleGenerator; +import com.rometools.modules.georss.geometries.AbstractGeometry; +import com.rometools.modules.georss.geometries.Point; +import com.rometools.modules.georss.geometries.Position; +import com.rometools.rome.feed.module.Module; +import com.rometools.rome.io.ModuleGenerator; /** * W3CGeoGenerator produces georss elements in georss W3C geo format. @@ -54,7 +54,7 @@ public class W3CGeoGenerator implements ModuleGenerator { /* * (non-Javadoc) - * @see com.sun.syndication.io.ModuleGenerator#getNamespaceUri() + * @see com.rometools.rome.io.ModuleGenerator#getNamespaceUri() */ @Override public String getNamespaceUri() { @@ -63,7 +63,7 @@ public class W3CGeoGenerator implements ModuleGenerator { /* * (non-Javadoc) - * @see com.sun.syndication.io.ModuleGenerator#getNamespaces() + * @see com.rometools.rome.io.ModuleGenerator#getNamespaces() */ @Override public Set getNamespaces() { @@ -72,7 +72,7 @@ public class W3CGeoGenerator implements ModuleGenerator { /* * (non-Javadoc) - * @see com.sun.syndication.io.ModuleGenerator#generate(com.sun.syndication.feed.module.Module, + * @see com.rometools.rome.io.ModuleGenerator#generate(com.rometools.rome.feed.module.Module, * org.jdom2.Element) */ @Override diff --git a/src/main/java/org/rometools/feed/module/georss/W3CGeoModuleImpl.java b/src/main/java/com/rometools/modules/georss/W3CGeoModuleImpl.java similarity index 96% rename from src/main/java/org/rometools/feed/module/georss/W3CGeoModuleImpl.java rename to src/main/java/com/rometools/modules/georss/W3CGeoModuleImpl.java index 8a9460a..a4ff886 100644 --- a/src/main/java/org/rometools/feed/module/georss/W3CGeoModuleImpl.java +++ b/src/main/java/com/rometools/modules/georss/W3CGeoModuleImpl.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.rometools.feed.module.georss; +package com.rometools.modules.georss; /** * W3CGeoModuleImpl is the implementation of the {@link GeoRSSModule} Interface for the W3C geo diff --git a/src/main/java/org/rometools/feed/module/georss/W3CGeoParser.java b/src/main/java/com/rometools/modules/georss/W3CGeoParser.java similarity index 90% rename from src/main/java/org/rometools/feed/module/georss/W3CGeoParser.java rename to src/main/java/com/rometools/modules/georss/W3CGeoParser.java index e492f80..c887fbf 100644 --- a/src/main/java/org/rometools/feed/module/georss/W3CGeoParser.java +++ b/src/main/java/com/rometools/modules/georss/W3CGeoParser.java @@ -14,17 +14,17 @@ * limitations under the License. * */ -package org.rometools.feed.module.georss; +package com.rometools.modules.georss; import java.util.Locale; import org.jdom2.Element; -import org.rometools.feed.module.georss.geometries.Point; -import org.rometools.feed.module.georss.geometries.Position; +import com.rometools.modules.georss.geometries.Point; +import com.rometools.modules.georss.geometries.Position; +import com.rometools.rome.feed.module.Module; +import com.rometools.rome.io.ModuleParser; import com.rometools.utils.Strings; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.io.ModuleParser; /** * W3CGeoParser is a parser for the W3C geo format. diff --git a/src/main/java/org/rometools/feed/module/georss/geometries/AbstractCurve.java b/src/main/java/com/rometools/modules/georss/geometries/AbstractCurve.java similarity index 90% rename from src/main/java/org/rometools/feed/module/georss/geometries/AbstractCurve.java rename to src/main/java/com/rometools/modules/georss/geometries/AbstractCurve.java index 64754c7..73386f4 100644 --- a/src/main/java/org/rometools/feed/module/georss/geometries/AbstractCurve.java +++ b/src/main/java/com/rometools/modules/georss/geometries/AbstractCurve.java @@ -7,7 +7,7 @@ * and open the template in the editor. */ -package org.rometools.feed.module.georss.geometries; +package com.rometools.modules.georss.geometries; /** * Abstract base class for Curves (linear objects) diff --git a/src/main/java/org/rometools/feed/module/georss/geometries/AbstractGeometricPrimitive.java b/src/main/java/com/rometools/modules/georss/geometries/AbstractGeometricPrimitive.java similarity index 91% rename from src/main/java/org/rometools/feed/module/georss/geometries/AbstractGeometricPrimitive.java rename to src/main/java/com/rometools/modules/georss/geometries/AbstractGeometricPrimitive.java index 033fb79..42ecb3f 100644 --- a/src/main/java/org/rometools/feed/module/georss/geometries/AbstractGeometricPrimitive.java +++ b/src/main/java/com/rometools/modules/georss/geometries/AbstractGeometricPrimitive.java @@ -7,7 +7,7 @@ * and open the template in the editor. */ -package org.rometools.feed.module.georss.geometries; +package com.rometools.modules.georss.geometries; /** * Abstract base class for geometric primitives (non-composite geometric objects) diff --git a/src/main/java/org/rometools/feed/module/georss/geometries/AbstractGeometry.java b/src/main/java/com/rometools/modules/georss/geometries/AbstractGeometry.java similarity index 94% rename from src/main/java/org/rometools/feed/module/georss/geometries/AbstractGeometry.java rename to src/main/java/com/rometools/modules/georss/geometries/AbstractGeometry.java index 9f27557..4ead6ee 100644 --- a/src/main/java/org/rometools/feed/module/georss/geometries/AbstractGeometry.java +++ b/src/main/java/com/rometools/modules/georss/geometries/AbstractGeometry.java @@ -7,7 +7,7 @@ * and open the template in the editor. */ -package org.rometools.feed.module.georss.geometries; +package com.rometools.modules.georss.geometries; import java.io.Serializable; diff --git a/src/main/java/org/rometools/feed/module/georss/geometries/AbstractRing.java b/src/main/java/com/rometools/modules/georss/geometries/AbstractRing.java similarity index 92% rename from src/main/java/org/rometools/feed/module/georss/geometries/AbstractRing.java rename to src/main/java/com/rometools/modules/georss/geometries/AbstractRing.java index 0405d45..399007f 100644 --- a/src/main/java/org/rometools/feed/module/georss/geometries/AbstractRing.java +++ b/src/main/java/com/rometools/modules/georss/geometries/AbstractRing.java @@ -7,7 +7,7 @@ * and open the template in the editor. */ -package org.rometools.feed.module.georss.geometries; +package com.rometools.modules.georss.geometries; import java.io.Serializable; diff --git a/src/main/java/org/rometools/feed/module/georss/geometries/AbstractSurface.java b/src/main/java/com/rometools/modules/georss/geometries/AbstractSurface.java similarity index 90% rename from src/main/java/org/rometools/feed/module/georss/geometries/AbstractSurface.java rename to src/main/java/com/rometools/modules/georss/geometries/AbstractSurface.java index b355ba2..400c8f6 100644 --- a/src/main/java/org/rometools/feed/module/georss/geometries/AbstractSurface.java +++ b/src/main/java/com/rometools/modules/georss/geometries/AbstractSurface.java @@ -7,7 +7,7 @@ * and open the template in the editor. */ -package org.rometools.feed.module.georss.geometries; +package com.rometools.modules.georss.geometries; /** * Abstract base class for surface (area) objects diff --git a/src/main/java/org/rometools/feed/module/georss/geometries/Envelope.java b/src/main/java/com/rometools/modules/georss/geometries/Envelope.java similarity index 97% rename from src/main/java/org/rometools/feed/module/georss/geometries/Envelope.java rename to src/main/java/com/rometools/modules/georss/geometries/Envelope.java index a62f2b0..4edc358 100644 --- a/src/main/java/org/rometools/feed/module/georss/geometries/Envelope.java +++ b/src/main/java/com/rometools/modules/georss/geometries/Envelope.java @@ -7,7 +7,7 @@ * and open the template in the editor. */ -package org.rometools.feed.module.georss.geometries; +package com.rometools.modules.georss.geometries; /** * Envelope, a bounding box spanned by an upper right and lower left corner point. Note that if the diff --git a/src/main/java/org/rometools/feed/module/georss/geometries/LineString.java b/src/main/java/com/rometools/modules/georss/geometries/LineString.java similarity index 96% rename from src/main/java/org/rometools/feed/module/georss/geometries/LineString.java rename to src/main/java/com/rometools/modules/georss/geometries/LineString.java index ecec3c1..49ffc06 100644 --- a/src/main/java/org/rometools/feed/module/georss/geometries/LineString.java +++ b/src/main/java/com/rometools/modules/georss/geometries/LineString.java @@ -7,7 +7,7 @@ * and open the template in the editor. */ -package org.rometools.feed.module.georss.geometries; +package com.rometools.modules.georss.geometries; /** * Linear object constructed by linear interpolation between points diff --git a/src/main/java/org/rometools/feed/module/georss/geometries/LinearRing.java b/src/main/java/com/rometools/modules/georss/geometries/LinearRing.java similarity index 96% rename from src/main/java/org/rometools/feed/module/georss/geometries/LinearRing.java rename to src/main/java/com/rometools/modules/georss/geometries/LinearRing.java index 14845c1..e36e37b 100644 --- a/src/main/java/org/rometools/feed/module/georss/geometries/LinearRing.java +++ b/src/main/java/com/rometools/modules/georss/geometries/LinearRing.java @@ -7,7 +7,7 @@ * and open the template in the editor. */ -package org.rometools.feed.module.georss.geometries; +package com.rometools.modules.georss.geometries; /** * Linear boundary object constructed by linear interpolation between points. Start and end point diff --git a/src/main/java/org/rometools/feed/module/georss/geometries/Point.java b/src/main/java/com/rometools/modules/georss/geometries/Point.java similarity index 96% rename from src/main/java/org/rometools/feed/module/georss/geometries/Point.java rename to src/main/java/com/rometools/modules/georss/geometries/Point.java index d059c3e..6c5f94d 100644 --- a/src/main/java/org/rometools/feed/module/georss/geometries/Point.java +++ b/src/main/java/com/rometools/modules/georss/geometries/Point.java @@ -7,7 +7,7 @@ * and open the template in the editor. */ -package org.rometools.feed.module.georss.geometries; +package com.rometools.modules.georss.geometries; /** * Point object, contains a position diff --git a/src/main/java/org/rometools/feed/module/georss/geometries/Polygon.java b/src/main/java/com/rometools/modules/georss/geometries/Polygon.java similarity index 98% rename from src/main/java/org/rometools/feed/module/georss/geometries/Polygon.java rename to src/main/java/com/rometools/modules/georss/geometries/Polygon.java index b1df09a..03b3ca8 100644 --- a/src/main/java/org/rometools/feed/module/georss/geometries/Polygon.java +++ b/src/main/java/com/rometools/modules/georss/geometries/Polygon.java @@ -7,7 +7,7 @@ * and open the template in the editor. */ -package org.rometools.feed.module.georss.geometries; +package com.rometools.modules.georss.geometries; import java.util.ArrayList; import java.util.Iterator; diff --git a/src/main/java/org/rometools/feed/module/georss/geometries/Position.java b/src/main/java/com/rometools/modules/georss/geometries/Position.java similarity index 97% rename from src/main/java/org/rometools/feed/module/georss/geometries/Position.java rename to src/main/java/com/rometools/modules/georss/geometries/Position.java index 75097ff..86cd097 100644 --- a/src/main/java/org/rometools/feed/module/georss/geometries/Position.java +++ b/src/main/java/com/rometools/modules/georss/geometries/Position.java @@ -7,7 +7,7 @@ * and open the template in the editor. */ -package org.rometools.feed.module.georss.geometries; +package com.rometools.modules.georss.geometries; import java.io.Serializable; diff --git a/src/main/java/org/rometools/feed/module/georss/geometries/PositionList.java b/src/main/java/com/rometools/modules/georss/geometries/PositionList.java similarity index 98% rename from src/main/java/org/rometools/feed/module/georss/geometries/PositionList.java rename to src/main/java/com/rometools/modules/georss/geometries/PositionList.java index f24d861..a62b60c 100644 --- a/src/main/java/org/rometools/feed/module/georss/geometries/PositionList.java +++ b/src/main/java/com/rometools/modules/georss/geometries/PositionList.java @@ -7,7 +7,7 @@ * and open the template in the editor. */ -package org.rometools.feed.module.georss.geometries; +package com.rometools.modules.georss.geometries; import java.io.Serializable; diff --git a/src/main/java/org/rometools/feed/module/georss/geometries/package.html b/src/main/java/com/rometools/modules/georss/geometries/package.html similarity index 100% rename from src/main/java/org/rometools/feed/module/georss/geometries/package.html rename to src/main/java/com/rometools/modules/georss/geometries/package.html diff --git a/src/main/java/org/rometools/feed/module/georss/package.html b/src/main/java/com/rometools/modules/georss/package.html similarity index 100% rename from src/main/java/org/rometools/feed/module/georss/package.html rename to src/main/java/com/rometools/modules/georss/package.html diff --git a/src/main/java/org/rometools/feed/module/itunes/AbstractITunesObject.java b/src/main/java/com/rometools/modules/itunes/AbstractITunesObject.java similarity index 99% rename from src/main/java/org/rometools/feed/module/itunes/AbstractITunesObject.java rename to src/main/java/com/rometools/modules/itunes/AbstractITunesObject.java index b66e5e9..ef53e44 100644 --- a/src/main/java/org/rometools/feed/module/itunes/AbstractITunesObject.java +++ b/src/main/java/com/rometools/modules/itunes/AbstractITunesObject.java @@ -38,7 +38,7 @@ * limitations under the License. * */ -package org.rometools.feed.module.itunes; +package com.rometools.modules.itunes; /** * This is an abstract object that implements the attributes common across Feeds or Items in an diff --git a/src/main/java/org/rometools/feed/module/itunes/EntryInformation.java b/src/main/java/com/rometools/modules/itunes/EntryInformation.java similarity index 95% rename from src/main/java/org/rometools/feed/module/itunes/EntryInformation.java rename to src/main/java/com/rometools/modules/itunes/EntryInformation.java index d44e4a7..d578179 100644 --- a/src/main/java/org/rometools/feed/module/itunes/EntryInformation.java +++ b/src/main/java/com/rometools/modules/itunes/EntryInformation.java @@ -39,9 +39,9 @@ * */ -package org.rometools.feed.module.itunes; +package com.rometools.modules.itunes; -import org.rometools.feed.module.itunes.types.Duration; +import com.rometools.modules.itunes.types.Duration; /** * This class contains information for iTunes podcast feeds that exist at the Item level. diff --git a/src/main/java/org/rometools/feed/module/itunes/EntryInformationImpl.java b/src/main/java/com/rometools/modules/itunes/EntryInformationImpl.java similarity index 96% rename from src/main/java/org/rometools/feed/module/itunes/EntryInformationImpl.java rename to src/main/java/com/rometools/modules/itunes/EntryInformationImpl.java index 0f9e961..b38da1f 100644 --- a/src/main/java/org/rometools/feed/module/itunes/EntryInformationImpl.java +++ b/src/main/java/com/rometools/modules/itunes/EntryInformationImpl.java @@ -38,11 +38,10 @@ * limitations under the License. * */ -package org.rometools.feed.module.itunes; +package com.rometools.modules.itunes; -import org.rometools.feed.module.itunes.types.Duration; - -import com.sun.syndication.feed.CopyFrom; +import com.rometools.modules.itunes.types.Duration; +import com.rometools.rome.feed.CopyFrom; /** * This class contains information for iTunes podcast feeds that exist at the Item level. diff --git a/src/main/java/org/rometools/feed/module/itunes/FeedInformation.java b/src/main/java/com/rometools/modules/itunes/FeedInformation.java similarity index 97% rename from src/main/java/org/rometools/feed/module/itunes/FeedInformation.java rename to src/main/java/com/rometools/modules/itunes/FeedInformation.java index 8bdf955..2252c52 100644 --- a/src/main/java/org/rometools/feed/module/itunes/FeedInformation.java +++ b/src/main/java/com/rometools/modules/itunes/FeedInformation.java @@ -38,12 +38,12 @@ * limitations under the License. * */ -package org.rometools.feed.module.itunes; +package com.rometools.modules.itunes; import java.net.URL; import java.util.List; -import org.rometools.feed.module.itunes.types.Category; +import com.rometools.modules.itunes.types.Category; /** * This class contains information for iTunes podcast feeds that exist at the Channel level. diff --git a/src/main/java/org/rometools/feed/module/itunes/FeedInformationImpl.java b/src/main/java/com/rometools/modules/itunes/FeedInformationImpl.java similarity index 97% rename from src/main/java/org/rometools/feed/module/itunes/FeedInformationImpl.java rename to src/main/java/com/rometools/modules/itunes/FeedInformationImpl.java index 2aca108..8bdd850 100644 --- a/src/main/java/org/rometools/feed/module/itunes/FeedInformationImpl.java +++ b/src/main/java/com/rometools/modules/itunes/FeedInformationImpl.java @@ -39,18 +39,18 @@ * limitations under the License. * */ -package org.rometools.feed.module.itunes; +package com.rometools.modules.itunes; import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; import java.util.List; -import org.rometools.feed.module.itunes.types.Category; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.sun.syndication.feed.CopyFrom; +import com.rometools.modules.itunes.types.Category; +import com.rometools.rome.feed.CopyFrom; /** * This class contains information for iTunes podcast feeds that exist at the Channel level. diff --git a/src/main/java/org/rometools/feed/module/itunes/ITunes.java b/src/main/java/com/rometools/modules/itunes/ITunes.java similarity index 97% rename from src/main/java/org/rometools/feed/module/itunes/ITunes.java rename to src/main/java/com/rometools/modules/itunes/ITunes.java index 08b3465..5798841 100644 --- a/src/main/java/org/rometools/feed/module/itunes/ITunes.java +++ b/src/main/java/com/rometools/modules/itunes/ITunes.java @@ -38,9 +38,9 @@ * limitations under the License. */ -package org.rometools.feed.module.itunes; +package com.rometools.modules.itunes; -import com.sun.syndication.feed.module.Module; +import com.rometools.rome.feed.module.Module; /** * This interface contains the methods common to all iTunes module points. diff --git a/src/main/java/org/rometools/feed/module/itunes/io/ITunesGenerator.java b/src/main/java/com/rometools/modules/itunes/io/ITunesGenerator.java similarity index 94% rename from src/main/java/org/rometools/feed/module/itunes/io/ITunesGenerator.java rename to src/main/java/com/rometools/modules/itunes/io/ITunesGenerator.java index 27b80c1..a62e671 100644 --- a/src/main/java/org/rometools/feed/module/itunes/io/ITunesGenerator.java +++ b/src/main/java/com/rometools/modules/itunes/io/ITunesGenerator.java @@ -38,7 +38,7 @@ * limitations under the License. * */ -package org.rometools.feed.module.itunes.io; +package com.rometools.modules.itunes.io; import java.util.HashSet; import java.util.List; @@ -46,13 +46,13 @@ import java.util.Set; import org.jdom2.Element; import org.jdom2.Namespace; -import org.rometools.feed.module.itunes.AbstractITunesObject; -import org.rometools.feed.module.itunes.EntryInformationImpl; -import org.rometools.feed.module.itunes.FeedInformationImpl; -import org.rometools.feed.module.itunes.types.Category; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.io.ModuleGenerator; +import com.rometools.modules.itunes.AbstractITunesObject; +import com.rometools.modules.itunes.EntryInformationImpl; +import com.rometools.modules.itunes.FeedInformationImpl; +import com.rometools.modules.itunes.types.Category; +import com.rometools.rome.feed.module.Module; +import com.rometools.rome.io.ModuleGenerator; /** * @version $Revision: 1.3 $ diff --git a/src/main/java/org/rometools/feed/module/itunes/io/ITunesParser.java b/src/main/java/com/rometools/modules/itunes/io/ITunesParser.java similarity index 92% rename from src/main/java/org/rometools/feed/module/itunes/io/ITunesParser.java rename to src/main/java/com/rometools/modules/itunes/io/ITunesParser.java index 3d62c38..a01b3a9 100644 --- a/src/main/java/org/rometools/feed/module/itunes/io/ITunesParser.java +++ b/src/main/java/com/rometools/modules/itunes/io/ITunesParser.java @@ -38,7 +38,7 @@ * limitations under the License. */ -package org.rometools.feed.module.itunes.io; +package com.rometools.modules.itunes.io; import java.net.MalformedURLException; import java.net.URL; @@ -50,17 +50,17 @@ import org.jdom2.Content; import org.jdom2.Element; import org.jdom2.Namespace; import org.jdom2.output.XMLOutputter; -import org.rometools.feed.module.itunes.AbstractITunesObject; -import org.rometools.feed.module.itunes.EntryInformationImpl; -import org.rometools.feed.module.itunes.FeedInformationImpl; -import org.rometools.feed.module.itunes.types.Category; -import org.rometools.feed.module.itunes.types.Duration; -import org.rometools.feed.module.itunes.types.Subcategory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.sun.syndication.io.ModuleParser; -import com.sun.syndication.io.WireFeedParser; +import com.rometools.modules.itunes.AbstractITunesObject; +import com.rometools.modules.itunes.EntryInformationImpl; +import com.rometools.modules.itunes.FeedInformationImpl; +import com.rometools.modules.itunes.types.Category; +import com.rometools.modules.itunes.types.Duration; +import com.rometools.modules.itunes.types.Subcategory; +import com.rometools.rome.io.ModuleParser; +import com.rometools.rome.io.WireFeedParser; /** * @version $Revision: 1.10 $ @@ -85,7 +85,7 @@ public class ITunesParser implements ModuleParser { } @Override - public com.sun.syndication.feed.module.Module parse(final Element element, final Locale locale) { + public com.rometools.rome.feed.module.Module parse(final Element element, final Locale locale) { AbstractITunesObject module = null; if (element.getName().equals("channel")) { diff --git a/src/main/java/org/rometools/feed/module/itunes/io/ITunesParserOldNamespace.java b/src/main/java/com/rometools/modules/itunes/io/ITunesParserOldNamespace.java similarity index 96% rename from src/main/java/org/rometools/feed/module/itunes/io/ITunesParserOldNamespace.java rename to src/main/java/com/rometools/modules/itunes/io/ITunesParserOldNamespace.java index 8dbeb01..922b5fa 100644 --- a/src/main/java/org/rometools/feed/module/itunes/io/ITunesParserOldNamespace.java +++ b/src/main/java/com/rometools/modules/itunes/io/ITunesParserOldNamespace.java @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software */ -package org.rometools.feed.module.itunes.io; +package com.rometools.modules.itunes.io; import org.jdom2.Namespace; diff --git a/src/main/java/org/rometools/feed/module/itunes/package.html b/src/main/java/com/rometools/modules/itunes/package.html similarity index 100% rename from src/main/java/org/rometools/feed/module/itunes/package.html rename to src/main/java/com/rometools/modules/itunes/package.html diff --git a/src/main/java/org/rometools/feed/module/itunes/types/Category.java b/src/main/java/com/rometools/modules/itunes/types/Category.java similarity index 98% rename from src/main/java/org/rometools/feed/module/itunes/types/Category.java rename to src/main/java/com/rometools/modules/itunes/types/Category.java index 4be9d92..50e6eaf 100644 --- a/src/main/java/org/rometools/feed/module/itunes/types/Category.java +++ b/src/main/java/com/rometools/modules/itunes/types/Category.java @@ -38,7 +38,7 @@ * limitations under the License. * */ -package org.rometools.feed.module.itunes.types; +package com.rometools.modules.itunes.types; import java.io.Serializable; diff --git a/src/main/java/org/rometools/feed/module/itunes/types/Duration.java b/src/main/java/com/rometools/modules/itunes/types/Duration.java similarity index 98% rename from src/main/java/org/rometools/feed/module/itunes/types/Duration.java rename to src/main/java/com/rometools/modules/itunes/types/Duration.java index a79727d..7d04273 100644 --- a/src/main/java/org/rometools/feed/module/itunes/types/Duration.java +++ b/src/main/java/com/rometools/modules/itunes/types/Duration.java @@ -37,13 +37,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.itunes.types; +package com.rometools.modules.itunes.types; import java.io.Serializable; import java.text.NumberFormat; import java.util.StringTokenizer; -import com.sun.syndication.io.impl.NumberParser; +import com.rometools.rome.io.impl.NumberParser; /** * An encapsulation of the duration of a podcast. This will serialize (via .toString()) to HH:MM:SS diff --git a/src/main/java/org/rometools/feed/module/itunes/types/Subcategory.java b/src/main/java/com/rometools/modules/itunes/types/Subcategory.java similarity index 98% rename from src/main/java/org/rometools/feed/module/itunes/types/Subcategory.java rename to src/main/java/com/rometools/modules/itunes/types/Subcategory.java index 092a5da..0c68b92 100644 --- a/src/main/java/org/rometools/feed/module/itunes/types/Subcategory.java +++ b/src/main/java/com/rometools/modules/itunes/types/Subcategory.java @@ -38,7 +38,7 @@ * limitations under the License. * */ -package org.rometools.feed.module.itunes.types; +package com.rometools.modules.itunes.types; import java.io.Serializable; diff --git a/src/main/java/org/rometools/feed/module/itunes/types/package.html b/src/main/java/com/rometools/modules/itunes/types/package.html similarity index 100% rename from src/main/java/org/rometools/feed/module/itunes/types/package.html rename to src/main/java/com/rometools/modules/itunes/types/package.html diff --git a/src/main/java/org/rometools/feed/module/mediarss/MediaEntryModule.java b/src/main/java/com/rometools/modules/mediarss/MediaEntryModule.java similarity index 88% rename from src/main/java/org/rometools/feed/module/mediarss/MediaEntryModule.java rename to src/main/java/com/rometools/modules/mediarss/MediaEntryModule.java index 65e1320..1b3b8b8 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/MediaEntryModule.java +++ b/src/main/java/com/rometools/modules/mediarss/MediaEntryModule.java @@ -20,10 +20,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.mediarss; +package com.rometools.modules.mediarss; -import org.rometools.feed.module.mediarss.types.MediaContent; -import org.rometools.feed.module.mediarss.types.MediaGroup; +import com.rometools.modules.mediarss.types.MediaContent; +import com.rometools.modules.mediarss.types.MediaGroup; /** * Represents entry/item level information. diff --git a/src/main/java/org/rometools/feed/module/mediarss/MediaEntryModuleImpl.java b/src/main/java/com/rometools/modules/mediarss/MediaEntryModuleImpl.java similarity index 90% rename from src/main/java/org/rometools/feed/module/mediarss/MediaEntryModuleImpl.java rename to src/main/java/com/rometools/modules/mediarss/MediaEntryModuleImpl.java index aa0c62b..ecf6871 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/MediaEntryModuleImpl.java +++ b/src/main/java/com/rometools/modules/mediarss/MediaEntryModuleImpl.java @@ -19,17 +19,16 @@ * limitations under the License. * */ -package org.rometools.feed.module.mediarss; +package com.rometools.modules.mediarss; import java.io.Serializable; -import org.rometools.feed.module.mediarss.types.MediaContent; -import org.rometools.feed.module.mediarss.types.MediaGroup; -import org.rometools.feed.module.mediarss.types.Metadata; - -import com.sun.syndication.feed.CopyFrom; -import com.sun.syndication.feed.impl.EqualsBean; -import com.sun.syndication.feed.impl.ToStringBean; +import com.rometools.modules.mediarss.types.MediaContent; +import com.rometools.modules.mediarss.types.MediaGroup; +import com.rometools.modules.mediarss.types.Metadata; +import com.rometools.rome.feed.CopyFrom; +import com.rometools.rome.feed.impl.EqualsBean; +import com.rometools.rome.feed.impl.ToStringBean; /** * Represents information for an Entry/Item level. diff --git a/src/main/java/org/rometools/feed/module/mediarss/MediaModule.java b/src/main/java/com/rometools/modules/mediarss/MediaModule.java similarity index 88% rename from src/main/java/org/rometools/feed/module/mediarss/MediaModule.java rename to src/main/java/com/rometools/modules/mediarss/MediaModule.java index ba5e9e3..9e1c56d 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/MediaModule.java +++ b/src/main/java/com/rometools/modules/mediarss/MediaModule.java @@ -19,12 +19,11 @@ * limitations under the License. * */ -package org.rometools.feed.module.mediarss; +package com.rometools.modules.mediarss; -import org.rometools.feed.module.mediarss.types.Metadata; -import org.rometools.feed.module.mediarss.types.PlayerReference; - -import com.sun.syndication.feed.module.Module; +import com.rometools.modules.mediarss.types.Metadata; +import com.rometools.modules.mediarss.types.PlayerReference; +import com.rometools.rome.feed.module.Module; /** * This is the base module for MediaRSS. diff --git a/src/main/java/org/rometools/feed/module/mediarss/MediaModuleImpl.java b/src/main/java/com/rometools/modules/mediarss/MediaModuleImpl.java similarity index 91% rename from src/main/java/org/rometools/feed/module/mediarss/MediaModuleImpl.java rename to src/main/java/com/rometools/modules/mediarss/MediaModuleImpl.java index 2d83a0c..fbb0cc0 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/MediaModuleImpl.java +++ b/src/main/java/com/rometools/modules/mediarss/MediaModuleImpl.java @@ -20,15 +20,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.mediarss; +package com.rometools.modules.mediarss; import java.io.Serializable; -import org.rometools.feed.module.mediarss.types.Metadata; -import org.rometools.feed.module.mediarss.types.PlayerReference; - -import com.sun.syndication.feed.CopyFrom; -import com.sun.syndication.feed.module.ModuleImpl; +import com.rometools.modules.mediarss.types.Metadata; +import com.rometools.modules.mediarss.types.PlayerReference; +import com.rometools.rome.feed.CopyFrom; +import com.rometools.rome.feed.module.ModuleImpl; /** * diff --git a/src/main/java/org/rometools/feed/module/mediarss/io/AlternateMediaModuleParser.java b/src/main/java/com/rometools/modules/mediarss/io/AlternateMediaModuleParser.java similarity index 94% rename from src/main/java/org/rometools/feed/module/mediarss/io/AlternateMediaModuleParser.java rename to src/main/java/com/rometools/modules/mediarss/io/AlternateMediaModuleParser.java index 7ab4593..dc9e1fd 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/io/AlternateMediaModuleParser.java +++ b/src/main/java/com/rometools/modules/mediarss/io/AlternateMediaModuleParser.java @@ -7,7 +7,7 @@ * and open the template in the editor. */ -package org.rometools.feed.module.mediarss.io; +package com.rometools.modules.mediarss.io; import org.jdom2.Namespace; diff --git a/src/main/java/org/rometools/feed/module/mediarss/io/MediaModuleGenerator.java b/src/main/java/com/rometools/modules/mediarss/io/MediaModuleGenerator.java similarity index 90% rename from src/main/java/org/rometools/feed/module/mediarss/io/MediaModuleGenerator.java rename to src/main/java/com/rometools/modules/mediarss/io/MediaModuleGenerator.java index eed78f2..6d2ca05 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/io/MediaModuleGenerator.java +++ b/src/main/java/com/rometools/modules/mediarss/io/MediaModuleGenerator.java @@ -19,29 +19,29 @@ * limitations under the License. * */ -package org.rometools.feed.module.mediarss.io; +package com.rometools.modules.mediarss.io; import java.util.HashSet; import java.util.Set; import org.jdom2.Element; import org.jdom2.Namespace; -import org.rometools.feed.module.mediarss.MediaEntryModule; -import org.rometools.feed.module.mediarss.MediaModule; -import org.rometools.feed.module.mediarss.types.Category; -import org.rometools.feed.module.mediarss.types.Credit; -import org.rometools.feed.module.mediarss.types.MediaContent; -import org.rometools.feed.module.mediarss.types.MediaGroup; -import org.rometools.feed.module.mediarss.types.Metadata; -import org.rometools.feed.module.mediarss.types.PlayerReference; -import org.rometools.feed.module.mediarss.types.Rating; -import org.rometools.feed.module.mediarss.types.Restriction; -import org.rometools.feed.module.mediarss.types.Text; -import org.rometools.feed.module.mediarss.types.Thumbnail; -import org.rometools.feed.module.mediarss.types.UrlReference; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.io.ModuleGenerator; +import com.rometools.modules.mediarss.MediaEntryModule; +import com.rometools.modules.mediarss.MediaModule; +import com.rometools.modules.mediarss.types.Category; +import com.rometools.modules.mediarss.types.Credit; +import com.rometools.modules.mediarss.types.MediaContent; +import com.rometools.modules.mediarss.types.MediaGroup; +import com.rometools.modules.mediarss.types.Metadata; +import com.rometools.modules.mediarss.types.PlayerReference; +import com.rometools.modules.mediarss.types.Rating; +import com.rometools.modules.mediarss.types.Restriction; +import com.rometools.modules.mediarss.types.Text; +import com.rometools.modules.mediarss.types.Thumbnail; +import com.rometools.modules.mediarss.types.UrlReference; +import com.rometools.rome.feed.module.Module; +import com.rometools.rome.io.ModuleGenerator; //this class TBI public class MediaModuleGenerator implements ModuleGenerator { diff --git a/src/main/java/org/rometools/feed/module/mediarss/io/MediaModuleParser.java b/src/main/java/com/rometools/modules/mediarss/io/MediaModuleParser.java similarity index 93% rename from src/main/java/org/rometools/feed/module/mediarss/io/MediaModuleParser.java rename to src/main/java/com/rometools/modules/mediarss/io/MediaModuleParser.java index bb8a774..2cfa573 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/io/MediaModuleParser.java +++ b/src/main/java/com/rometools/modules/mediarss/io/MediaModuleParser.java @@ -19,7 +19,7 @@ * limitations under the License. * */ -package org.rometools.feed.module.mediarss.io; +package com.rometools.modules.mediarss.io; import java.net.URI; import java.util.ArrayList; @@ -29,31 +29,31 @@ import java.util.StringTokenizer; import org.jdom2.Element; import org.jdom2.Namespace; -import org.rometools.feed.module.mediarss.MediaEntryModuleImpl; -import org.rometools.feed.module.mediarss.MediaModule; -import org.rometools.feed.module.mediarss.MediaModuleImpl; -import org.rometools.feed.module.mediarss.types.Category; -import org.rometools.feed.module.mediarss.types.Credit; -import org.rometools.feed.module.mediarss.types.Expression; -import org.rometools.feed.module.mediarss.types.Hash; -import org.rometools.feed.module.mediarss.types.MediaContent; -import org.rometools.feed.module.mediarss.types.MediaGroup; -import org.rometools.feed.module.mediarss.types.Metadata; -import org.rometools.feed.module.mediarss.types.PlayerReference; -import org.rometools.feed.module.mediarss.types.Rating; -import org.rometools.feed.module.mediarss.types.Restriction; -import org.rometools.feed.module.mediarss.types.Text; -import org.rometools.feed.module.mediarss.types.Thumbnail; -import org.rometools.feed.module.mediarss.types.Time; -import org.rometools.feed.module.mediarss.types.UrlReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.rometools.modules.mediarss.MediaEntryModuleImpl; +import com.rometools.modules.mediarss.MediaModule; +import com.rometools.modules.mediarss.MediaModuleImpl; +import com.rometools.modules.mediarss.types.Category; +import com.rometools.modules.mediarss.types.Credit; +import com.rometools.modules.mediarss.types.Expression; +import com.rometools.modules.mediarss.types.Hash; +import com.rometools.modules.mediarss.types.MediaContent; +import com.rometools.modules.mediarss.types.MediaGroup; +import com.rometools.modules.mediarss.types.Metadata; +import com.rometools.modules.mediarss.types.PlayerReference; +import com.rometools.modules.mediarss.types.Rating; +import com.rometools.modules.mediarss.types.Restriction; +import com.rometools.modules.mediarss.types.Text; +import com.rometools.modules.mediarss.types.Thumbnail; +import com.rometools.modules.mediarss.types.Time; +import com.rometools.modules.mediarss.types.UrlReference; +import com.rometools.rome.feed.module.Module; +import com.rometools.rome.io.ModuleParser; import com.rometools.utils.Integers; import com.rometools.utils.Longs; import com.rometools.utils.Strings; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.io.ModuleParser; /** * @author Nathanial X. Freitas diff --git a/src/main/java/org/rometools/feed/module/mediarss/io/RSS20YahooParser.java b/src/main/java/com/rometools/modules/mediarss/io/RSS20YahooParser.java similarity index 95% rename from src/main/java/org/rometools/feed/module/mediarss/io/RSS20YahooParser.java rename to src/main/java/com/rometools/modules/mediarss/io/RSS20YahooParser.java index 6db160f..3eadf25 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/io/RSS20YahooParser.java +++ b/src/main/java/com/rometools/modules/mediarss/io/RSS20YahooParser.java @@ -19,7 +19,7 @@ * limitations under the License. * */ -package org.rometools.feed.module.mediarss.io; +package com.rometools.modules.mediarss.io; import java.util.Locale; @@ -27,8 +27,8 @@ import org.jdom2.Document; import org.jdom2.Element; import org.jdom2.Namespace; -import com.sun.syndication.feed.WireFeed; -import com.sun.syndication.io.impl.RSS20Parser; +import com.rometools.rome.feed.WireFeed; +import com.rometools.rome.io.impl.RSS20Parser; /** * @author Nathanial X. Freitas diff --git a/src/main/java/org/rometools/feed/module/mediarss/io/package.html b/src/main/java/com/rometools/modules/mediarss/io/package.html similarity index 100% rename from src/main/java/org/rometools/feed/module/mediarss/io/package.html rename to src/main/java/com/rometools/modules/mediarss/io/package.html diff --git a/src/main/java/org/rometools/feed/module/mediarss/package.html b/src/main/java/com/rometools/modules/mediarss/package.html similarity index 100% rename from src/main/java/org/rometools/feed/module/mediarss/package.html rename to src/main/java/com/rometools/modules/mediarss/package.html diff --git a/src/main/java/org/rometools/feed/module/mediarss/types/AbstractSchemeValue.java b/src/main/java/com/rometools/modules/mediarss/types/AbstractSchemeValue.java similarity index 96% rename from src/main/java/org/rometools/feed/module/mediarss/types/AbstractSchemeValue.java rename to src/main/java/com/rometools/modules/mediarss/types/AbstractSchemeValue.java index 7873d5b..9b6faa1 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/types/AbstractSchemeValue.java +++ b/src/main/java/com/rometools/modules/mediarss/types/AbstractSchemeValue.java @@ -21,7 +21,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.mediarss.types; +package com.rometools.modules.mediarss.types; import java.io.Serializable; diff --git a/src/main/java/org/rometools/feed/module/mediarss/types/Category.java b/src/main/java/com/rometools/modules/mediarss/types/Category.java similarity index 96% rename from src/main/java/org/rometools/feed/module/mediarss/types/Category.java rename to src/main/java/com/rometools/modules/mediarss/types/Category.java index 9a6a443..60012c1 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/types/Category.java +++ b/src/main/java/com/rometools/modules/mediarss/types/Category.java @@ -20,12 +20,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.mediarss.types; +package com.rometools.modules.mediarss.types; import java.io.Serializable; -import com.sun.syndication.feed.impl.EqualsBean; -import com.sun.syndication.feed.impl.ToStringBean; +import com.rometools.rome.feed.impl.EqualsBean; +import com.rometools.rome.feed.impl.ToStringBean; /** * diff --git a/src/main/java/org/rometools/feed/module/mediarss/types/Credit.java b/src/main/java/com/rometools/modules/mediarss/types/Credit.java similarity index 96% rename from src/main/java/org/rometools/feed/module/mediarss/types/Credit.java rename to src/main/java/com/rometools/modules/mediarss/types/Credit.java index 00bdb29..0411560 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/types/Credit.java +++ b/src/main/java/com/rometools/modules/mediarss/types/Credit.java @@ -20,12 +20,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.mediarss.types; +package com.rometools.modules.mediarss.types; import java.io.Serializable; -import com.sun.syndication.feed.impl.EqualsBean; -import com.sun.syndication.feed.impl.ToStringBean; +import com.rometools.rome.feed.impl.EqualsBean; +import com.rometools.rome.feed.impl.ToStringBean; /** * diff --git a/src/main/java/org/rometools/feed/module/mediarss/types/Expression.java b/src/main/java/com/rometools/modules/mediarss/types/Expression.java similarity index 97% rename from src/main/java/org/rometools/feed/module/mediarss/types/Expression.java rename to src/main/java/com/rometools/modules/mediarss/types/Expression.java index b72690b..f632432 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/types/Expression.java +++ b/src/main/java/com/rometools/modules/mediarss/types/Expression.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.mediarss.types; +package com.rometools.modules.mediarss.types; import java.io.Serializable; diff --git a/src/main/java/org/rometools/feed/module/mediarss/types/Hash.java b/src/main/java/com/rometools/modules/mediarss/types/Hash.java similarity index 94% rename from src/main/java/org/rometools/feed/module/mediarss/types/Hash.java rename to src/main/java/com/rometools/modules/mediarss/types/Hash.java index ea426bf..c385dd6 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/types/Hash.java +++ b/src/main/java/com/rometools/modules/mediarss/types/Hash.java @@ -20,12 +20,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.mediarss.types; +package com.rometools.modules.mediarss.types; import java.io.Serializable; -import com.sun.syndication.feed.impl.EqualsBean; -import com.sun.syndication.feed.impl.ToStringBean; +import com.rometools.rome.feed.impl.EqualsBean; +import com.rometools.rome.feed.impl.ToStringBean; /** * diff --git a/src/main/java/org/rometools/feed/module/mediarss/types/MediaContent.java b/src/main/java/com/rometools/modules/mediarss/types/MediaContent.java similarity index 99% rename from src/main/java/org/rometools/feed/module/mediarss/types/MediaContent.java rename to src/main/java/com/rometools/modules/mediarss/types/MediaContent.java index e8cbb5c..850f422 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/types/MediaContent.java +++ b/src/main/java/com/rometools/modules/mediarss/types/MediaContent.java @@ -19,12 +19,12 @@ * limitations under the License. * */ -package org.rometools.feed.module.mediarss.types; +package com.rometools.modules.mediarss.types; import java.io.Serializable; -import com.sun.syndication.feed.impl.EqualsBean; -import com.sun.syndication.feed.impl.ToStringBean; +import com.rometools.rome.feed.impl.EqualsBean; +import com.rometools.rome.feed.impl.ToStringBean; /** * <media:content>

diff --git a/src/main/java/org/rometools/feed/module/mediarss/types/MediaGroup.java b/src/main/java/com/rometools/modules/mediarss/types/MediaGroup.java similarity index 96% rename from src/main/java/org/rometools/feed/module/mediarss/types/MediaGroup.java rename to src/main/java/com/rometools/modules/mediarss/types/MediaGroup.java index b90b464..2e5e5cd 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/types/MediaGroup.java +++ b/src/main/java/com/rometools/modules/mediarss/types/MediaGroup.java @@ -21,12 +21,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.mediarss.types; +package com.rometools.modules.mediarss.types; import java.io.Serializable; -import com.sun.syndication.feed.impl.EqualsBean; -import com.sun.syndication.feed.impl.ToStringBean; +import com.rometools.rome.feed.impl.EqualsBean; +import com.rometools.rome.feed.impl.ToStringBean; /** * <media:group>

diff --git a/src/main/java/org/rometools/feed/module/mediarss/types/Metadata.java b/src/main/java/com/rometools/modules/mediarss/types/Metadata.java similarity index 99% rename from src/main/java/org/rometools/feed/module/mediarss/types/Metadata.java rename to src/main/java/com/rometools/modules/mediarss/types/Metadata.java index d061ad5..8f4b5c0 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/types/Metadata.java +++ b/src/main/java/com/rometools/modules/mediarss/types/Metadata.java @@ -21,13 +21,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.mediarss.types; +package com.rometools.modules.mediarss.types; import java.io.Serializable; import java.net.URI; -import com.sun.syndication.feed.impl.EqualsBean; -import com.sun.syndication.feed.impl.ToStringBean; +import com.rometools.rome.feed.impl.EqualsBean; +import com.rometools.rome.feed.impl.ToStringBean; /** * diff --git a/src/main/java/org/rometools/feed/module/mediarss/types/PlayerReference.java b/src/main/java/com/rometools/modules/mediarss/types/PlayerReference.java similarity index 95% rename from src/main/java/org/rometools/feed/module/mediarss/types/PlayerReference.java rename to src/main/java/com/rometools/modules/mediarss/types/PlayerReference.java index 106b500..d8969be 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/types/PlayerReference.java +++ b/src/main/java/com/rometools/modules/mediarss/types/PlayerReference.java @@ -20,13 +20,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.mediarss.types; +package com.rometools.modules.mediarss.types; import java.io.Serializable; import java.net.URI; -import com.sun.syndication.feed.impl.EqualsBean; -import com.sun.syndication.feed.impl.ToStringBean; +import com.rometools.rome.feed.impl.EqualsBean; +import com.rometools.rome.feed.impl.ToStringBean; /** * diff --git a/src/main/java/org/rometools/feed/module/mediarss/types/Rating.java b/src/main/java/com/rometools/modules/mediarss/types/Rating.java similarity index 95% rename from src/main/java/org/rometools/feed/module/mediarss/types/Rating.java rename to src/main/java/com/rometools/modules/mediarss/types/Rating.java index ea7d78d..8e2011c 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/types/Rating.java +++ b/src/main/java/com/rometools/modules/mediarss/types/Rating.java @@ -20,10 +20,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.mediarss.types; +package com.rometools.modules.mediarss.types; -import com.sun.syndication.feed.impl.EqualsBean; -import com.sun.syndication.feed.impl.ToStringBean; +import com.rometools.rome.feed.impl.EqualsBean; +import com.rometools.rome.feed.impl.ToStringBean; /** * <media:rating>

diff --git a/src/main/java/org/rometools/feed/module/mediarss/types/Reference.java b/src/main/java/com/rometools/modules/mediarss/types/Reference.java similarity index 95% rename from src/main/java/org/rometools/feed/module/mediarss/types/Reference.java rename to src/main/java/com/rometools/modules/mediarss/types/Reference.java index 0ba820f..e1819c4 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/types/Reference.java +++ b/src/main/java/com/rometools/modules/mediarss/types/Reference.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.mediarss.types; +package com.rometools.modules.mediarss.types; /** * This class is an idenfier for UrlReference and PlayerReference and is required for constructing a diff --git a/src/main/java/org/rometools/feed/module/mediarss/types/Restriction.java b/src/main/java/com/rometools/modules/mediarss/types/Restriction.java similarity index 97% rename from src/main/java/org/rometools/feed/module/mediarss/types/Restriction.java rename to src/main/java/com/rometools/modules/mediarss/types/Restriction.java index 882cca5..1c518e1 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/types/Restriction.java +++ b/src/main/java/com/rometools/modules/mediarss/types/Restriction.java @@ -20,12 +20,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.mediarss.types; +package com.rometools.modules.mediarss.types; import java.io.Serializable; -import com.sun.syndication.feed.impl.EqualsBean; -import com.sun.syndication.feed.impl.ToStringBean; +import com.rometools.rome.feed.impl.EqualsBean; +import com.rometools.rome.feed.impl.ToStringBean; /** * <media:restriction>

diff --git a/src/main/java/org/rometools/feed/module/mediarss/types/Text.java b/src/main/java/com/rometools/modules/mediarss/types/Text.java similarity index 96% rename from src/main/java/org/rometools/feed/module/mediarss/types/Text.java rename to src/main/java/com/rometools/modules/mediarss/types/Text.java index 7dd92a9..495dae5 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/types/Text.java +++ b/src/main/java/com/rometools/modules/mediarss/types/Text.java @@ -20,12 +20,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.mediarss.types; +package com.rometools.modules.mediarss.types; import java.io.Serializable; -import com.sun.syndication.feed.impl.EqualsBean; -import com.sun.syndication.feed.impl.ToStringBean; +import com.rometools.rome.feed.impl.EqualsBean; +import com.rometools.rome.feed.impl.ToStringBean; /** * <media:text>

diff --git a/src/main/java/org/rometools/feed/module/mediarss/types/Thumbnail.java b/src/main/java/com/rometools/modules/mediarss/types/Thumbnail.java similarity index 96% rename from src/main/java/org/rometools/feed/module/mediarss/types/Thumbnail.java rename to src/main/java/com/rometools/modules/mediarss/types/Thumbnail.java index 2331039..1aa9e1a 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/types/Thumbnail.java +++ b/src/main/java/com/rometools/modules/mediarss/types/Thumbnail.java @@ -19,13 +19,13 @@ * limitations under the License. * */ -package org.rometools.feed.module.mediarss.types; +package com.rometools.modules.mediarss.types; import java.io.Serializable; import java.net.URI; -import com.sun.syndication.feed.impl.EqualsBean; -import com.sun.syndication.feed.impl.ToStringBean; +import com.rometools.rome.feed.impl.EqualsBean; +import com.rometools.rome.feed.impl.ToStringBean; /** * <media:thumbnail>

diff --git a/src/main/java/org/rometools/feed/module/mediarss/types/Time.java b/src/main/java/com/rometools/modules/mediarss/types/Time.java similarity index 96% rename from src/main/java/org/rometools/feed/module/mediarss/types/Time.java rename to src/main/java/com/rometools/modules/mediarss/types/Time.java index 5e2d6bd..8bf9354 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/types/Time.java +++ b/src/main/java/com/rometools/modules/mediarss/types/Time.java @@ -20,12 +20,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.mediarss.types; +package com.rometools.modules.mediarss.types; import java.io.Serializable; import java.text.NumberFormat; -import com.sun.syndication.feed.impl.EqualsBean; +import com.rometools.rome.feed.impl.EqualsBean; /** * Represents a RFC 2326 3.6 Normal Play Time diff --git a/src/main/java/org/rometools/feed/module/mediarss/types/UrlReference.java b/src/main/java/com/rometools/modules/mediarss/types/UrlReference.java similarity index 96% rename from src/main/java/org/rometools/feed/module/mediarss/types/UrlReference.java rename to src/main/java/com/rometools/modules/mediarss/types/UrlReference.java index 35087ad..4c7b710 100644 --- a/src/main/java/org/rometools/feed/module/mediarss/types/UrlReference.java +++ b/src/main/java/com/rometools/modules/mediarss/types/UrlReference.java @@ -21,13 +21,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.mediarss.types; +package com.rometools.modules.mediarss.types; import java.io.Serializable; import java.net.URI; import java.net.URISyntaxException; -import com.sun.syndication.feed.impl.EqualsBean; +import com.rometools.rome.feed.impl.EqualsBean; /** * Used to indicate a URL primary reference for a MediaContent object. diff --git a/src/main/java/org/rometools/feed/module/mediarss/types/package.html b/src/main/java/com/rometools/modules/mediarss/types/package.html similarity index 100% rename from src/main/java/org/rometools/feed/module/mediarss/types/package.html rename to src/main/java/com/rometools/modules/mediarss/types/package.html diff --git a/src/main/java/org/rometools/feed/module/opensearch/OpenSearchModule.java b/src/main/java/com/rometools/modules/opensearch/OpenSearchModule.java similarity index 89% rename from src/main/java/org/rometools/feed/module/opensearch/OpenSearchModule.java rename to src/main/java/com/rometools/modules/opensearch/OpenSearchModule.java index 09ec0df..a1269aa 100644 --- a/src/main/java/org/rometools/feed/module/opensearch/OpenSearchModule.java +++ b/src/main/java/com/rometools/modules/opensearch/OpenSearchModule.java @@ -13,9 +13,9 @@ * */ -package org.rometools.feed.module.opensearch; +package com.rometools.modules.opensearch; -import com.sun.syndication.feed.module.Module; +import com.rometools.rome.feed.module.Module; /** * Provides access to A9 Open Search information. diff --git a/src/main/java/org/rometools/feed/module/opensearch/OpenSearchResponse.java b/src/main/java/com/rometools/modules/opensearch/OpenSearchResponse.java similarity index 97% rename from src/main/java/org/rometools/feed/module/opensearch/OpenSearchResponse.java rename to src/main/java/com/rometools/modules/opensearch/OpenSearchResponse.java index 1786dc0..bc9a45e 100644 --- a/src/main/java/org/rometools/feed/module/opensearch/OpenSearchResponse.java +++ b/src/main/java/com/rometools/modules/opensearch/OpenSearchResponse.java @@ -13,13 +13,12 @@ * */ -package org.rometools.feed.module.opensearch; +package com.rometools.modules.opensearch; import java.util.List; -import org.rometools.feed.module.opensearch.entity.OSQuery; - -import com.sun.syndication.feed.atom.Link; +import com.rometools.modules.opensearch.entity.OSQuery; +import com.rometools.rome.feed.atom.Link; /** * Provides access to A9 Open Search information. diff --git a/src/main/java/org/rometools/feed/module/opensearch/RequiredAttributeMissingException.java b/src/main/java/com/rometools/modules/opensearch/RequiredAttributeMissingException.java similarity index 95% rename from src/main/java/org/rometools/feed/module/opensearch/RequiredAttributeMissingException.java rename to src/main/java/com/rometools/modules/opensearch/RequiredAttributeMissingException.java index eae17ed..ddb53ce 100644 --- a/src/main/java/org/rometools/feed/module/opensearch/RequiredAttributeMissingException.java +++ b/src/main/java/com/rometools/modules/opensearch/RequiredAttributeMissingException.java @@ -13,7 +13,7 @@ * */ -package org.rometools.feed.module.opensearch; +package com.rometools.modules.opensearch; /** * @author Michael W. Nassif (enrouteinc@gmail.com) diff --git a/src/main/java/org/rometools/feed/module/opensearch/entity/OSQuery.java b/src/main/java/com/rometools/modules/opensearch/entity/OSQuery.java similarity index 97% rename from src/main/java/org/rometools/feed/module/opensearch/entity/OSQuery.java rename to src/main/java/com/rometools/modules/opensearch/entity/OSQuery.java index c8ff15c..ee8b011 100644 --- a/src/main/java/org/rometools/feed/module/opensearch/entity/OSQuery.java +++ b/src/main/java/com/rometools/modules/opensearch/entity/OSQuery.java @@ -13,11 +13,11 @@ * */ -package org.rometools.feed.module.opensearch.entity; +package com.rometools.modules.opensearch.entity; import java.io.Serializable; -import com.sun.syndication.feed.impl.ObjectBean; +import com.rometools.rome.feed.impl.ObjectBean; /** * @author Michael W. Nassif (enrouteinc@gmail.com) Class representation of the Query object diff --git a/src/main/java/org/rometools/feed/module/opensearch/impl/OpenSearchModuleGenerator.java b/src/main/java/com/rometools/modules/opensearch/impl/OpenSearchModuleGenerator.java similarity index 93% rename from src/main/java/org/rometools/feed/module/opensearch/impl/OpenSearchModuleGenerator.java rename to src/main/java/com/rometools/modules/opensearch/impl/OpenSearchModuleGenerator.java index 082ab4c..529e0f6 100644 --- a/src/main/java/org/rometools/feed/module/opensearch/impl/OpenSearchModuleGenerator.java +++ b/src/main/java/com/rometools/modules/opensearch/impl/OpenSearchModuleGenerator.java @@ -13,7 +13,7 @@ * */ -package org.rometools.feed.module.opensearch.impl; +package com.rometools.modules.opensearch.impl; import java.util.Collections; import java.util.HashSet; @@ -23,13 +23,13 @@ import java.util.Set; import org.jdom2.Attribute; import org.jdom2.Element; import org.jdom2.Namespace; -import org.rometools.feed.module.opensearch.OpenSearchModule; -import org.rometools.feed.module.opensearch.RequiredAttributeMissingException; -import org.rometools.feed.module.opensearch.entity.OSQuery; -import com.sun.syndication.feed.atom.Link; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.io.ModuleGenerator; +import com.rometools.modules.opensearch.OpenSearchModule; +import com.rometools.modules.opensearch.RequiredAttributeMissingException; +import com.rometools.modules.opensearch.entity.OSQuery; +import com.rometools.rome.feed.atom.Link; +import com.rometools.rome.feed.module.Module; +import com.rometools.rome.io.ModuleGenerator; /** * @author Michael W. Nassif (enrouteinc@gmail.com) OpenSearch implementation of ModuleGenerator diff --git a/src/main/java/org/rometools/feed/module/opensearch/impl/OpenSearchModuleImpl.java b/src/main/java/com/rometools/modules/opensearch/impl/OpenSearchModuleImpl.java similarity index 89% rename from src/main/java/org/rometools/feed/module/opensearch/impl/OpenSearchModuleImpl.java rename to src/main/java/com/rometools/modules/opensearch/impl/OpenSearchModuleImpl.java index dd3d6ac..6a21dc6 100644 --- a/src/main/java/org/rometools/feed/module/opensearch/impl/OpenSearchModuleImpl.java +++ b/src/main/java/com/rometools/modules/opensearch/impl/OpenSearchModuleImpl.java @@ -12,18 +12,17 @@ * limitations under the License. * */ -package org.rometools.feed.module.opensearch.impl; +package com.rometools.modules.opensearch.impl; import java.io.Serializable; import java.util.LinkedList; import java.util.List; -import org.rometools.feed.module.opensearch.OpenSearchModule; -import org.rometools.feed.module.opensearch.entity.OSQuery; - -import com.sun.syndication.feed.CopyFrom; -import com.sun.syndication.feed.atom.Link; -import com.sun.syndication.feed.module.ModuleImpl; +import com.rometools.modules.opensearch.OpenSearchModule; +import com.rometools.modules.opensearch.entity.OSQuery; +import com.rometools.rome.feed.CopyFrom; +import com.rometools.rome.feed.atom.Link; +import com.rometools.rome.feed.module.ModuleImpl; /** * @author Michael W. Nassif (enrouteinc@gmail.com) OpenSearch Module implementation @@ -130,7 +129,7 @@ public class OpenSearchModuleImpl extends ModuleImpl implements OpenSearchModule /* * (non-Javadoc) - * @see com.sun.syndication.feed.CopyFrom#copyFrom(java.lang.Object) + * @see com.rometools.rome.feed.CopyFrom#copyFrom(java.lang.Object) */ @Override public void copyFrom(final CopyFrom obj) { @@ -150,7 +149,7 @@ public class OpenSearchModuleImpl extends ModuleImpl implements OpenSearchModule /* * (non-Javadoc) - * @see com.sun.syndication.feed.CopyFrom#getInterface() + * @see com.rometools.rome.feed.CopyFrom#getInterface() */ @Override public Class getInterface() { diff --git a/src/main/java/org/rometools/feed/module/opensearch/impl/OpenSearchModuleParser.java b/src/main/java/com/rometools/modules/opensearch/impl/OpenSearchModuleParser.java similarity index 96% rename from src/main/java/org/rometools/feed/module/opensearch/impl/OpenSearchModuleParser.java rename to src/main/java/com/rometools/modules/opensearch/impl/OpenSearchModuleParser.java index 775e18c..1332b3d 100644 --- a/src/main/java/org/rometools/feed/module/opensearch/impl/OpenSearchModuleParser.java +++ b/src/main/java/com/rometools/modules/opensearch/impl/OpenSearchModuleParser.java @@ -13,7 +13,7 @@ * */ -package org.rometools.feed.module.opensearch.impl; +package com.rometools.modules.opensearch.impl; import java.net.MalformedURLException; import java.net.URL; @@ -26,12 +26,12 @@ import org.jdom2.Attribute; import org.jdom2.Element; import org.jdom2.Namespace; import org.jdom2.Parent; -import org.rometools.feed.module.opensearch.OpenSearchModule; -import org.rometools.feed.module.opensearch.entity.OSQuery; -import com.sun.syndication.feed.atom.Link; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.io.ModuleParser; +import com.rometools.modules.opensearch.OpenSearchModule; +import com.rometools.modules.opensearch.entity.OSQuery; +import com.rometools.rome.feed.atom.Link; +import com.rometools.rome.feed.module.Module; +import com.rometools.rome.io.ModuleParser; /** * @author Michael W. Nassif (enrouteinc@gmail.com) OpenSearch implementation of the ModuleParser diff --git a/src/main/java/org/rometools/feed/module/photocast/PhotocastModule.java b/src/main/java/com/rometools/modules/photocast/PhotocastModule.java similarity index 96% rename from src/main/java/org/rometools/feed/module/photocast/PhotocastModule.java rename to src/main/java/com/rometools/modules/photocast/PhotocastModule.java index df3e9ef..7d219b5 100644 --- a/src/main/java/org/rometools/feed/module/photocast/PhotocastModule.java +++ b/src/main/java/com/rometools/modules/photocast/PhotocastModule.java @@ -37,14 +37,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.photocast; +package com.rometools.modules.photocast; import java.net.URL; import java.util.Date; -import org.rometools.feed.module.photocast.types.Metadata; - -import com.sun.syndication.feed.module.Module; +import com.rometools.modules.photocast.types.Metadata; +import com.rometools.rome.feed.module.Module; /** * This is a ROME module that provides support for the "http://www.apple.com/ilife/wallpapers" diff --git a/src/main/java/org/rometools/feed/module/photocast/PhotocastModuleImpl.java b/src/main/java/com/rometools/modules/photocast/PhotocastModuleImpl.java similarity index 95% rename from src/main/java/org/rometools/feed/module/photocast/PhotocastModuleImpl.java rename to src/main/java/com/rometools/modules/photocast/PhotocastModuleImpl.java index b45c495..8f239de 100644 --- a/src/main/java/org/rometools/feed/module/photocast/PhotocastModuleImpl.java +++ b/src/main/java/com/rometools/modules/photocast/PhotocastModuleImpl.java @@ -39,16 +39,15 @@ * limitations under the License. */ -package org.rometools.feed.module.photocast; +package com.rometools.modules.photocast; import java.net.URL; import java.util.Date; -import org.rometools.feed.module.photocast.types.Metadata; - -import com.sun.syndication.feed.CopyFrom; -import com.sun.syndication.feed.impl.EqualsBean; -import com.sun.syndication.feed.impl.ToStringBean; +import com.rometools.modules.photocast.types.Metadata; +import com.rometools.rome.feed.CopyFrom; +import com.rometools.rome.feed.impl.EqualsBean; +import com.rometools.rome.feed.impl.ToStringBean; /** * diff --git a/src/main/java/org/rometools/feed/module/photocast/io/Generator.java b/src/main/java/com/rometools/modules/photocast/io/Generator.java similarity index 95% rename from src/main/java/org/rometools/feed/module/photocast/io/Generator.java rename to src/main/java/com/rometools/modules/photocast/io/Generator.java index 958839d..64780f4 100644 --- a/src/main/java/org/rometools/feed/module/photocast/io/Generator.java +++ b/src/main/java/com/rometools/modules/photocast/io/Generator.java @@ -39,17 +39,17 @@ * limitations under the License. */ -package org.rometools.feed.module.photocast.io; +package com.rometools.modules.photocast.io; import java.util.HashSet; import java.util.Set; import org.jdom2.Element; import org.jdom2.Namespace; -import org.rometools.feed.module.photocast.PhotocastModule; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.io.ModuleGenerator; +import com.rometools.modules.photocast.PhotocastModule; +import com.rometools.rome.feed.module.Module; +import com.rometools.rome.io.ModuleGenerator; /** * diff --git a/src/main/java/org/rometools/feed/module/photocast/io/Parser.java b/src/main/java/com/rometools/modules/photocast/io/Parser.java similarity index 93% rename from src/main/java/org/rometools/feed/module/photocast/io/Parser.java rename to src/main/java/com/rometools/modules/photocast/io/Parser.java index af2eaeb..354400d 100644 --- a/src/main/java/org/rometools/feed/module/photocast/io/Parser.java +++ b/src/main/java/com/rometools/modules/photocast/io/Parser.java @@ -39,7 +39,7 @@ * limitations under the License. */ -package org.rometools.feed.module.photocast.io; +package com.rometools.modules.photocast.io; import java.net.URL; import java.text.DateFormat; @@ -50,15 +50,15 @@ import java.util.Locale; import org.jdom2.Element; import org.jdom2.Namespace; -import org.rometools.feed.module.photocast.PhotocastModule; -import org.rometools.feed.module.photocast.PhotocastModuleImpl; -import org.rometools.feed.module.photocast.types.Metadata; -import org.rometools.feed.module.photocast.types.PhotoDate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.io.ModuleParser; +import com.rometools.modules.photocast.PhotocastModule; +import com.rometools.modules.photocast.PhotocastModuleImpl; +import com.rometools.modules.photocast.types.Metadata; +import com.rometools.modules.photocast.types.PhotoDate; +import com.rometools.rome.feed.module.Module; +import com.rometools.rome.io.ModuleParser; /** * diff --git a/src/main/java/org/rometools/feed/module/photocast/io/package.html b/src/main/java/com/rometools/modules/photocast/io/package.html similarity index 100% rename from src/main/java/org/rometools/feed/module/photocast/io/package.html rename to src/main/java/com/rometools/modules/photocast/io/package.html diff --git a/src/main/java/org/rometools/feed/module/photocast/package.html b/src/main/java/com/rometools/modules/photocast/package.html similarity index 100% rename from src/main/java/org/rometools/feed/module/photocast/package.html rename to src/main/java/com/rometools/modules/photocast/package.html diff --git a/src/main/java/org/rometools/feed/module/photocast/types/Metadata.java b/src/main/java/com/rometools/modules/photocast/types/Metadata.java similarity index 95% rename from src/main/java/org/rometools/feed/module/photocast/types/Metadata.java rename to src/main/java/com/rometools/modules/photocast/types/Metadata.java index 373aac5..02fe47f 100644 --- a/src/main/java/org/rometools/feed/module/photocast/types/Metadata.java +++ b/src/main/java/com/rometools/modules/photocast/types/Metadata.java @@ -39,10 +39,10 @@ * limitations under the License. */ -package org.rometools.feed.module.photocast.types; +package com.rometools.modules.photocast.types; -import com.sun.syndication.feed.impl.EqualsBean; -import com.sun.syndication.feed.impl.ToStringBean; +import com.rometools.rome.feed.impl.EqualsBean; +import com.rometools.rome.feed.impl.ToStringBean; /** * This is an immutable class representing the apple-wallpapers:metadata tag in the photocast diff --git a/src/main/java/org/rometools/feed/module/photocast/types/PhotoDate.java b/src/main/java/com/rometools/modules/photocast/types/PhotoDate.java similarity index 98% rename from src/main/java/org/rometools/feed/module/photocast/types/PhotoDate.java rename to src/main/java/com/rometools/modules/photocast/types/PhotoDate.java index dcfdf78..89a7f7e 100644 --- a/src/main/java/org/rometools/feed/module/photocast/types/PhotoDate.java +++ b/src/main/java/com/rometools/modules/photocast/types/PhotoDate.java @@ -39,7 +39,7 @@ * limitations under the License. */ -package org.rometools.feed.module.photocast.types; +package com.rometools.modules.photocast.types; import java.math.BigDecimal; import java.util.Date; diff --git a/src/main/java/org/rometools/feed/module/photocast/types/package.html b/src/main/java/com/rometools/modules/photocast/types/package.html similarity index 100% rename from src/main/java/org/rometools/feed/module/photocast/types/package.html rename to src/main/java/com/rometools/modules/photocast/types/package.html diff --git a/src/main/java/org/rometools/feed/module/portablecontacts/ContactModule.java b/src/main/java/com/rometools/modules/portablecontacts/ContactModule.java similarity index 93% rename from src/main/java/org/rometools/feed/module/portablecontacts/ContactModule.java rename to src/main/java/com/rometools/modules/portablecontacts/ContactModule.java index adb80c1..db32b49 100644 --- a/src/main/java/org/rometools/feed/module/portablecontacts/ContactModule.java +++ b/src/main/java/com/rometools/modules/portablecontacts/ContactModule.java @@ -15,7 +15,7 @@ * under the License. */ -package org.rometools.feed.module.portablecontacts; +package com.rometools.modules.portablecontacts; /** * diff --git a/src/main/java/org/rometools/feed/module/portablecontacts/types/Address.java b/src/main/java/com/rometools/modules/portablecontacts/types/Address.java similarity index 92% rename from src/main/java/org/rometools/feed/module/portablecontacts/types/Address.java rename to src/main/java/com/rometools/modules/portablecontacts/types/Address.java index e3a7736..9794765 100644 --- a/src/main/java/org/rometools/feed/module/portablecontacts/types/Address.java +++ b/src/main/java/com/rometools/modules/portablecontacts/types/Address.java @@ -15,7 +15,7 @@ * under the License. */ -package org.rometools.feed.module.portablecontacts.types; +package com.rometools.modules.portablecontacts.types; /** * diff --git a/src/main/java/org/rometools/feed/module/slash/Slash.java b/src/main/java/com/rometools/modules/slash/Slash.java similarity index 96% rename from src/main/java/org/rometools/feed/module/slash/Slash.java rename to src/main/java/com/rometools/modules/slash/Slash.java index e189d35..0cf59fa 100644 --- a/src/main/java/org/rometools/feed/module/slash/Slash.java +++ b/src/main/java/com/rometools/modules/slash/Slash.java @@ -38,11 +38,11 @@ * limitations under the License. */ -package org.rometools.feed.module.slash; +package com.rometools.modules.slash; import java.io.Serializable; -import com.sun.syndication.feed.module.Module; +import com.rometools.rome.feed.module.Module; /** * This interface represents the Slash RSS extension. diff --git a/src/main/java/org/rometools/feed/module/slash/SlashImpl.java b/src/main/java/com/rometools/modules/slash/SlashImpl.java similarity index 96% rename from src/main/java/org/rometools/feed/module/slash/SlashImpl.java rename to src/main/java/com/rometools/modules/slash/SlashImpl.java index b80e95a..de6248f 100644 --- a/src/main/java/org/rometools/feed/module/slash/SlashImpl.java +++ b/src/main/java/com/rometools/modules/slash/SlashImpl.java @@ -39,10 +39,10 @@ * limitations under the License. */ -package org.rometools.feed.module.slash; +package com.rometools.modules.slash; -import com.sun.syndication.feed.CopyFrom; -import com.sun.syndication.feed.impl.EqualsBean; +import com.rometools.rome.feed.CopyFrom; +import com.rometools.rome.feed.impl.EqualsBean; /** * @version $Revision: 1.2 $ diff --git a/src/main/java/org/rometools/feed/module/slash/io/SlashModuleGenerator.java b/src/main/java/com/rometools/modules/slash/io/SlashModuleGenerator.java similarity index 95% rename from src/main/java/org/rometools/feed/module/slash/io/SlashModuleGenerator.java rename to src/main/java/com/rometools/modules/slash/io/SlashModuleGenerator.java index 82a43cd..ce94b98 100644 --- a/src/main/java/org/rometools/feed/module/slash/io/SlashModuleGenerator.java +++ b/src/main/java/com/rometools/modules/slash/io/SlashModuleGenerator.java @@ -38,17 +38,17 @@ * limitations under the License. */ -package org.rometools.feed.module.slash.io; +package com.rometools.modules.slash.io; import java.util.HashSet; import java.util.Set; import org.jdom2.Element; import org.jdom2.Namespace; -import org.rometools.feed.module.slash.Slash; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.io.ModuleGenerator; +import com.rometools.modules.slash.Slash; +import com.rometools.rome.feed.module.Module; +import com.rometools.rome.io.ModuleGenerator; /** * The ModuleGenerator implementation for the Slash plug in. diff --git a/src/main/java/org/rometools/feed/module/slash/io/SlashModuleParser.java b/src/main/java/com/rometools/modules/slash/io/SlashModuleParser.java similarity index 93% rename from src/main/java/org/rometools/feed/module/slash/io/SlashModuleParser.java rename to src/main/java/com/rometools/modules/slash/io/SlashModuleParser.java index 8e3f380..8ca6d28 100644 --- a/src/main/java/org/rometools/feed/module/slash/io/SlashModuleParser.java +++ b/src/main/java/com/rometools/modules/slash/io/SlashModuleParser.java @@ -38,18 +38,18 @@ * limitations under the License. */ -package org.rometools.feed.module.slash.io; +package com.rometools.modules.slash.io; import java.util.Locale; import java.util.StringTokenizer; import org.jdom2.Element; import org.jdom2.Namespace; -import org.rometools.feed.module.slash.Slash; -import org.rometools.feed.module.slash.SlashImpl; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.io.ModuleParser; +import com.rometools.modules.slash.Slash; +import com.rometools.modules.slash.SlashImpl; +import com.rometools.rome.feed.module.Module; +import com.rometools.rome.io.ModuleParser; /** * ModuleParser implementation for Slash RSS. diff --git a/src/main/java/org/rometools/feed/module/slash/io/package.html b/src/main/java/com/rometools/modules/slash/io/package.html similarity index 100% rename from src/main/java/org/rometools/feed/module/slash/io/package.html rename to src/main/java/com/rometools/modules/slash/io/package.html diff --git a/src/main/java/org/rometools/feed/module/slash/package.html b/src/main/java/com/rometools/modules/slash/package.html similarity index 100% rename from src/main/java/org/rometools/feed/module/slash/package.html rename to src/main/java/com/rometools/modules/slash/package.html diff --git a/src/main/java/org/rometools/feed/module/sle/GroupStrategy.java b/src/main/java/com/rometools/modules/sle/GroupStrategy.java similarity index 63% rename from src/main/java/org/rometools/feed/module/sle/GroupStrategy.java rename to src/main/java/com/rometools/modules/sle/GroupStrategy.java index 4e966c1..5627207 100644 --- a/src/main/java/org/rometools/feed/module/sle/GroupStrategy.java +++ b/src/main/java/com/rometools/modules/sle/GroupStrategy.java @@ -1,10 +1,9 @@ -package org.rometools.feed.module.sle; +package com.rometools.modules.sle; -import org.rometools.feed.module.sle.io.ModuleParser; -import org.rometools.feed.module.sle.types.EntryValue; -import org.rometools.feed.module.sle.types.Group; - -import com.sun.syndication.feed.module.Extendable; +import com.rometools.modules.sle.io.ModuleParser; +import com.rometools.modules.sle.types.EntryValue; +import com.rometools.modules.sle.types.Group; +import com.rometools.rome.feed.module.Extendable; class GroupStrategy implements ValueStrategy { diff --git a/src/main/java/org/rometools/feed/module/sle/SimpleListExtension.java b/src/main/java/com/rometools/modules/sle/SimpleListExtension.java similarity index 94% rename from src/main/java/org/rometools/feed/module/sle/SimpleListExtension.java rename to src/main/java/com/rometools/modules/sle/SimpleListExtension.java index 21d3fee..1ffbaba 100644 --- a/src/main/java/org/rometools/feed/module/sle/SimpleListExtension.java +++ b/src/main/java/com/rometools/modules/sle/SimpleListExtension.java @@ -15,12 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.sle; +package com.rometools.modules.sle; -import org.rometools.feed.module.sle.types.Group; -import org.rometools.feed.module.sle.types.Sort; - -import com.sun.syndication.feed.module.Module; +import com.rometools.modules.sle.types.Group; +import com.rometools.modules.sle.types.Sort; +import com.rometools.rome.feed.module.Module; /** * This is the primary module interface for the MS diff --git a/src/main/java/org/rometools/feed/module/sle/SimpleListExtensionImpl.java b/src/main/java/com/rometools/modules/sle/SimpleListExtensionImpl.java similarity index 92% rename from src/main/java/org/rometools/feed/module/sle/SimpleListExtensionImpl.java rename to src/main/java/com/rometools/modules/sle/SimpleListExtensionImpl.java index 63bb4f5..e896a97 100644 --- a/src/main/java/org/rometools/feed/module/sle/SimpleListExtensionImpl.java +++ b/src/main/java/com/rometools/modules/sle/SimpleListExtensionImpl.java @@ -15,13 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.sle; +package com.rometools.modules.sle; -import org.rometools.feed.module.sle.types.Group; -import org.rometools.feed.module.sle.types.Sort; - -import com.sun.syndication.feed.CopyFrom; -import com.sun.syndication.feed.module.ModuleImpl; +import com.rometools.modules.sle.types.Group; +import com.rometools.modules.sle.types.Sort; +import com.rometools.rome.feed.CopyFrom; +import com.rometools.rome.feed.module.ModuleImpl; /** * diff --git a/src/main/java/org/rometools/feed/module/sle/SleEntry.java b/src/main/java/com/rometools/modules/sle/SleEntry.java similarity index 88% rename from src/main/java/org/rometools/feed/module/sle/SleEntry.java rename to src/main/java/com/rometools/modules/sle/SleEntry.java index b17e274..2527303 100644 --- a/src/main/java/org/rometools/feed/module/sle/SleEntry.java +++ b/src/main/java/com/rometools/modules/sle/SleEntry.java @@ -15,14 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.sle; +package com.rometools.modules.sle; -import org.rometools.feed.module.sle.io.ModuleParser; -import org.rometools.feed.module.sle.types.EntryValue; -import org.rometools.feed.module.sle.types.Group; -import org.rometools.feed.module.sle.types.Sort; - -import com.sun.syndication.feed.module.Module; +import com.rometools.modules.sle.io.ModuleParser; +import com.rometools.modules.sle.types.EntryValue; +import com.rometools.modules.sle.types.Group; +import com.rometools.modules.sle.types.Sort; +import com.rometools.rome.feed.module.Module; /** * This is a parse only module that holds the values of enternal fields declared in the SLE diff --git a/src/main/java/org/rometools/feed/module/sle/SleEntryImpl.java b/src/main/java/com/rometools/modules/sle/SleEntryImpl.java similarity index 92% rename from src/main/java/org/rometools/feed/module/sle/SleEntryImpl.java rename to src/main/java/com/rometools/modules/sle/SleEntryImpl.java index c69bfcf..247277f 100644 --- a/src/main/java/org/rometools/feed/module/sle/SleEntryImpl.java +++ b/src/main/java/com/rometools/modules/sle/SleEntryImpl.java @@ -15,18 +15,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.sle; +package com.rometools.modules.sle; -import org.rometools.feed.module.sle.io.LabelNamespaceElement; -import org.rometools.feed.module.sle.io.ModuleParser; -import org.rometools.feed.module.sle.types.EntryValue; -import org.rometools.feed.module.sle.types.Group; -import org.rometools.feed.module.sle.types.Sort; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.sun.syndication.feed.CopyFrom; -import com.sun.syndication.feed.impl.ObjectBean; +import com.rometools.modules.sle.io.LabelNamespaceElement; +import com.rometools.modules.sle.io.ModuleParser; +import com.rometools.modules.sle.types.EntryValue; +import com.rometools.modules.sle.types.Group; +import com.rometools.modules.sle.types.Sort; +import com.rometools.rome.feed.CopyFrom; +import com.rometools.rome.feed.impl.ObjectBean; /** * This is a parse only module that holds the values of enternal fields declared in the SLE diff --git a/src/main/java/org/rometools/feed/module/sle/SleUtility.java b/src/main/java/com/rometools/modules/sle/SleUtility.java similarity index 92% rename from src/main/java/org/rometools/feed/module/sle/SleUtility.java rename to src/main/java/com/rometools/modules/sle/SleUtility.java index a08c106..d1fa52e 100644 --- a/src/main/java/org/rometools/feed/module/sle/SleUtility.java +++ b/src/main/java/com/rometools/modules/sle/SleUtility.java @@ -15,19 +15,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.sle; +package com.rometools.modules.sle; import java.util.List; import org.jdom2.Document; -import org.rometools.feed.module.sle.types.Group; -import org.rometools.feed.module.sle.types.Sort; -import com.sun.syndication.feed.module.Extendable; -import com.sun.syndication.feed.synd.SyndFeed; -import com.sun.syndication.io.FeedException; -import com.sun.syndication.io.SyndFeedInput; -import com.sun.syndication.io.SyndFeedOutput; +import com.rometools.modules.sle.types.Group; +import com.rometools.modules.sle.types.Sort; +import com.rometools.rome.feed.module.Extendable; +import com.rometools.rome.feed.synd.SyndFeed; +import com.rometools.rome.io.FeedException; +import com.rometools.rome.io.SyndFeedInput; +import com.rometools.rome.io.SyndFeedOutput; /** * This is a utiltiy class for grouping and sorting lists of entries based on the SLE. diff --git a/src/main/java/org/rometools/feed/module/sle/SortStrategy.java b/src/main/java/com/rometools/modules/sle/SortStrategy.java similarity index 63% rename from src/main/java/org/rometools/feed/module/sle/SortStrategy.java rename to src/main/java/com/rometools/modules/sle/SortStrategy.java index 20d22e6..3b87517 100644 --- a/src/main/java/org/rometools/feed/module/sle/SortStrategy.java +++ b/src/main/java/com/rometools/modules/sle/SortStrategy.java @@ -1,10 +1,9 @@ -package org.rometools.feed.module.sle; +package com.rometools.modules.sle; -import org.rometools.feed.module.sle.io.ModuleParser; -import org.rometools.feed.module.sle.types.EntryValue; -import org.rometools.feed.module.sle.types.Sort; - -import com.sun.syndication.feed.module.Extendable; +import com.rometools.modules.sle.io.ModuleParser; +import com.rometools.modules.sle.types.EntryValue; +import com.rometools.modules.sle.types.Sort; +import com.rometools.rome.feed.module.Extendable; class SortStrategy implements ValueStrategy { diff --git a/src/main/java/org/rometools/feed/module/sle/SortableList.java b/src/main/java/com/rometools/modules/sle/SortableList.java similarity index 88% rename from src/main/java/org/rometools/feed/module/sle/SortableList.java rename to src/main/java/com/rometools/modules/sle/SortableList.java index 123f2a9..50357ae 100644 --- a/src/main/java/org/rometools/feed/module/sle/SortableList.java +++ b/src/main/java/com/rometools/modules/sle/SortableList.java @@ -1,11 +1,10 @@ -package org.rometools.feed.module.sle; +package com.rometools.modules.sle; import java.util.ArrayList; import java.util.Collection; -import org.rometools.feed.module.sle.types.EntryValue; - -import com.sun.syndication.feed.module.Extendable; +import com.rometools.modules.sle.types.EntryValue; +import com.rometools.rome.feed.module.Extendable; class SortableList extends ArrayList { diff --git a/src/main/java/com/rometools/modules/sle/ValueStrategy.java b/src/main/java/com/rometools/modules/sle/ValueStrategy.java new file mode 100644 index 0000000..ed50b8a --- /dev/null +++ b/src/main/java/com/rometools/modules/sle/ValueStrategy.java @@ -0,0 +1,10 @@ +package com.rometools.modules.sle; + +import com.rometools.modules.sle.types.EntryValue; +import com.rometools.rome.feed.module.Extendable; + +interface ValueStrategy { + + public EntryValue getValue(Extendable extendable, Object value); + +} \ No newline at end of file diff --git a/src/main/java/org/rometools/feed/module/sle/io/ItemParser.java b/src/main/java/com/rometools/modules/sle/io/ItemParser.java similarity index 91% rename from src/main/java/org/rometools/feed/module/sle/io/ItemParser.java rename to src/main/java/com/rometools/modules/sle/io/ItemParser.java index b5954ce..c083c9b 100644 --- a/src/main/java/org/rometools/feed/module/sle/io/ItemParser.java +++ b/src/main/java/com/rometools/modules/sle/io/ItemParser.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.sle.io; +package com.rometools.modules.sle.io; import java.math.BigDecimal; import java.util.ArrayList; @@ -25,21 +25,21 @@ import java.util.Locale; import org.jdom2.Element; import org.jdom2.Namespace; -import org.rometools.feed.module.sle.SleEntryImpl; -import org.rometools.feed.module.sle.types.DateValue; -import org.rometools.feed.module.sle.types.EntryValue; -import org.rometools.feed.module.sle.types.NumberValue; -import org.rometools.feed.module.sle.types.Sort; -import org.rometools.feed.module.sle.types.StringValue; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.io.impl.DateParser; +import com.rometools.modules.sle.SleEntryImpl; +import com.rometools.modules.sle.types.DateValue; +import com.rometools.modules.sle.types.EntryValue; +import com.rometools.modules.sle.types.NumberValue; +import com.rometools.modules.sle.types.Sort; +import com.rometools.modules.sle.types.StringValue; +import com.rometools.rome.feed.module.Module; +import com.rometools.rome.io.impl.DateParser; /** * * @author Robert "kebernet" Cooper */ -public class ItemParser implements com.sun.syndication.io.ModuleParser { +public class ItemParser implements com.rometools.rome.io.ModuleParser { /** Creates a new instance of ItemParser */ public ItemParser() { super(); diff --git a/src/main/java/org/rometools/feed/module/sle/io/LabelNamespaceElement.java b/src/main/java/com/rometools/modules/sle/io/LabelNamespaceElement.java similarity index 97% rename from src/main/java/org/rometools/feed/module/sle/io/LabelNamespaceElement.java rename to src/main/java/com/rometools/modules/sle/io/LabelNamespaceElement.java index 52ed6b4..f38e614 100644 --- a/src/main/java/org/rometools/feed/module/sle/io/LabelNamespaceElement.java +++ b/src/main/java/com/rometools/modules/sle/io/LabelNamespaceElement.java @@ -1,4 +1,4 @@ -package org.rometools.feed.module.sle.io; +package com.rometools.modules.sle.io; import org.jdom2.Namespace; import org.slf4j.Logger; diff --git a/src/main/java/org/rometools/feed/module/sle/io/ModuleGenerator.java b/src/main/java/com/rometools/modules/sle/io/ModuleGenerator.java similarity index 92% rename from src/main/java/org/rometools/feed/module/sle/io/ModuleGenerator.java rename to src/main/java/com/rometools/modules/sle/io/ModuleGenerator.java index bf1176b..0dbef02 100644 --- a/src/main/java/org/rometools/feed/module/sle/io/ModuleGenerator.java +++ b/src/main/java/com/rometools/modules/sle/io/ModuleGenerator.java @@ -6,24 +6,24 @@ * To change this template, choose Tools | Template Manager * and open the template in the editor. */ -package org.rometools.feed.module.sle.io; +package com.rometools.modules.sle.io; import java.util.HashSet; import java.util.Set; import org.jdom2.Element; import org.jdom2.Namespace; -import org.rometools.feed.module.sle.SimpleListExtension; -import org.rometools.feed.module.sle.types.Group; -import org.rometools.feed.module.sle.types.Sort; -import com.sun.syndication.feed.module.Module; +import com.rometools.modules.sle.SimpleListExtension; +import com.rometools.modules.sle.types.Group; +import com.rometools.modules.sle.types.Sort; +import com.rometools.rome.feed.module.Module; /** * * @author Robert "kebernet" Cooper */ -public class ModuleGenerator implements com.sun.syndication.io.ModuleGenerator { +public class ModuleGenerator implements com.rometools.rome.io.ModuleGenerator { private static final Set NAMESPACES = new HashSet(); diff --git a/src/main/java/org/rometools/feed/module/sle/io/ModuleParser.java b/src/main/java/com/rometools/modules/sle/io/ModuleParser.java similarity index 94% rename from src/main/java/org/rometools/feed/module/sle/io/ModuleParser.java rename to src/main/java/com/rometools/modules/sle/io/ModuleParser.java index fad32bb..79e807a 100644 --- a/src/main/java/org/rometools/feed/module/sle/io/ModuleParser.java +++ b/src/main/java/com/rometools/modules/sle/io/ModuleParser.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.sle.io; +package com.rometools.modules.sle.io; import java.util.ArrayList; import java.util.List; @@ -23,20 +23,20 @@ import java.util.Locale; import org.jdom2.Element; import org.jdom2.Namespace; -import org.rometools.feed.module.sle.SimpleListExtension; -import org.rometools.feed.module.sle.SimpleListExtensionImpl; -import org.rometools.feed.module.sle.types.Group; -import org.rometools.feed.module.sle.types.Sort; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.sun.syndication.feed.module.Module; +import com.rometools.modules.sle.SimpleListExtension; +import com.rometools.modules.sle.SimpleListExtensionImpl; +import com.rometools.modules.sle.types.Group; +import com.rometools.modules.sle.types.Sort; +import com.rometools.rome.feed.module.Module; /** * * @author Robert "kebernet" Cooper */ -public class ModuleParser implements com.sun.syndication.io.ModuleParser { +public class ModuleParser implements com.rometools.rome.io.ModuleParser { private static final Logger LOG = LoggerFactory.getLogger(ModuleParser.class); diff --git a/src/main/java/org/rometools/feed/module/sle/io/package.html b/src/main/java/com/rometools/modules/sle/io/package.html similarity index 100% rename from src/main/java/org/rometools/feed/module/sle/io/package.html rename to src/main/java/com/rometools/modules/sle/io/package.html diff --git a/src/main/java/org/rometools/feed/module/sle/package.html b/src/main/java/com/rometools/modules/sle/package.html similarity index 100% rename from src/main/java/org/rometools/feed/module/sle/package.html rename to src/main/java/com/rometools/modules/sle/package.html diff --git a/src/main/java/org/rometools/feed/module/sle/types/DateValue.java b/src/main/java/com/rometools/modules/sle/types/DateValue.java similarity index 96% rename from src/main/java/org/rometools/feed/module/sle/types/DateValue.java rename to src/main/java/com/rometools/modules/sle/types/DateValue.java index 6151744..5430d7a 100644 --- a/src/main/java/org/rometools/feed/module/sle/types/DateValue.java +++ b/src/main/java/com/rometools/modules/sle/types/DateValue.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.sle.types; +package com.rometools.modules.sle.types; import java.util.Date; import org.jdom2.Namespace; -import com.sun.syndication.feed.impl.ObjectBean; +import com.rometools.rome.feed.impl.ObjectBean; /** * An EntryValue implementation representing a "date" data-type. diff --git a/src/main/java/org/rometools/feed/module/sle/types/EntryValue.java b/src/main/java/com/rometools/modules/sle/types/EntryValue.java similarity index 97% rename from src/main/java/org/rometools/feed/module/sle/types/EntryValue.java rename to src/main/java/com/rometools/modules/sle/types/EntryValue.java index 8afd108..767ab5f 100644 --- a/src/main/java/org/rometools/feed/module/sle/types/EntryValue.java +++ b/src/main/java/com/rometools/modules/sle/types/EntryValue.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.sle.types; +package com.rometools.modules.sle.types; import java.io.Serializable; diff --git a/src/main/java/org/rometools/feed/module/sle/types/Group.java b/src/main/java/com/rometools/modules/sle/types/Group.java similarity index 97% rename from src/main/java/org/rometools/feed/module/sle/types/Group.java rename to src/main/java/com/rometools/modules/sle/types/Group.java index 35ce45f..fcbf7ec 100644 --- a/src/main/java/org/rometools/feed/module/sle/types/Group.java +++ b/src/main/java/com/rometools/modules/sle/types/Group.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.sle.types; +package com.rometools.modules.sle.types; import java.io.Serializable; import org.jdom2.Namespace; -import com.sun.syndication.feed.impl.ObjectBean; +import com.rometools.rome.feed.impl.ObjectBean; /** * The cf:group element is intended to inform the client that the property to diff --git a/src/main/java/org/rometools/feed/module/sle/types/NumberValue.java b/src/main/java/com/rometools/modules/sle/types/NumberValue.java similarity index 96% rename from src/main/java/org/rometools/feed/module/sle/types/NumberValue.java rename to src/main/java/com/rometools/modules/sle/types/NumberValue.java index 53703c6..2dce7c0 100644 --- a/src/main/java/org/rometools/feed/module/sle/types/NumberValue.java +++ b/src/main/java/com/rometools/modules/sle/types/NumberValue.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.sle.types; +package com.rometools.modules.sle.types; import java.math.BigDecimal; import org.jdom2.Namespace; -import com.sun.syndication.feed.impl.ObjectBean; +import com.rometools.rome.feed.impl.ObjectBean; /** * An EntryValue implementation for "number" data-type values. diff --git a/src/main/java/org/rometools/feed/module/sle/types/Sort.java b/src/main/java/com/rometools/modules/sle/types/Sort.java similarity index 98% rename from src/main/java/org/rometools/feed/module/sle/types/Sort.java rename to src/main/java/com/rometools/modules/sle/types/Sort.java index 5a809d7..c8f1d53 100644 --- a/src/main/java/org/rometools/feed/module/sle/types/Sort.java +++ b/src/main/java/com/rometools/modules/sle/types/Sort.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.sle.types; +package com.rometools.modules.sle.types; import java.io.Serializable; import org.jdom2.Namespace; -import com.sun.syndication.feed.impl.ObjectBean; +import com.rometools.rome.feed.impl.ObjectBean; /** *

diff --git a/src/main/java/org/rometools/feed/module/sle/types/StringValue.java b/src/main/java/com/rometools/modules/sle/types/StringValue.java similarity index 96% rename from src/main/java/org/rometools/feed/module/sle/types/StringValue.java rename to src/main/java/com/rometools/modules/sle/types/StringValue.java index 55ffc0a..744a144 100644 --- a/src/main/java/org/rometools/feed/module/sle/types/StringValue.java +++ b/src/main/java/com/rometools/modules/sle/types/StringValue.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.rometools.feed.module.sle.types; +package com.rometools.modules.sle.types; import org.jdom2.Namespace; -import com.sun.syndication.feed.impl.ObjectBean; +import com.rometools.rome.feed.impl.ObjectBean; /** * An EntryValue implementation for "text" data-types. diff --git a/src/main/java/org/rometools/feed/module/sle/types/package.html b/src/main/java/com/rometools/modules/sle/types/package.html similarity index 100% rename from src/main/java/org/rometools/feed/module/sle/types/package.html rename to src/main/java/com/rometools/modules/sle/types/package.html diff --git a/src/main/java/org/rometools/feed/module/sse/SSE091Generator.java b/src/main/java/com/rometools/modules/sse/SSE091Generator.java similarity index 90% rename from src/main/java/org/rometools/feed/module/sse/SSE091Generator.java rename to src/main/java/com/rometools/modules/sse/SSE091Generator.java index 5307b40..75e497c 100644 --- a/src/main/java/org/rometools/feed/module/sse/SSE091Generator.java +++ b/src/main/java/com/rometools/modules/sse/SSE091Generator.java @@ -1,4 +1,4 @@ -package org.rometools.feed.module.sse; +package com.rometools.modules.sse; import java.util.Date; import java.util.List; @@ -7,21 +7,21 @@ import java.util.Set; import org.jdom2.Element; import org.jdom2.Namespace; -import org.rometools.feed.module.sse.modules.Conflict; -import org.rometools.feed.module.sse.modules.Conflicts; -import org.rometools.feed.module.sse.modules.History; -import org.rometools.feed.module.sse.modules.Related; -import org.rometools.feed.module.sse.modules.SSEModule; -import org.rometools.feed.module.sse.modules.Sharing; -import org.rometools.feed.module.sse.modules.Sync; -import org.rometools.feed.module.sse.modules.Update; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.feed.rss.Item; -import com.sun.syndication.io.DelegatingModuleGenerator; -import com.sun.syndication.io.WireFeedGenerator; -import com.sun.syndication.io.impl.DateParser; -import com.sun.syndication.io.impl.RSS20Generator; +import com.rometools.modules.sse.modules.Conflict; +import com.rometools.modules.sse.modules.Conflicts; +import com.rometools.modules.sse.modules.History; +import com.rometools.modules.sse.modules.Related; +import com.rometools.modules.sse.modules.SSEModule; +import com.rometools.modules.sse.modules.Sharing; +import com.rometools.modules.sse.modules.Sync; +import com.rometools.modules.sse.modules.Update; +import com.rometools.rome.feed.module.Module; +import com.rometools.rome.feed.rss.Item; +import com.rometools.rome.io.DelegatingModuleGenerator; +import com.rometools.rome.io.WireFeedGenerator; +import com.rometools.rome.io.impl.DateParser; +import com.rometools.rome.io.impl.RSS20Generator; /** * Generator for the SSE Module. diff --git a/src/main/java/org/rometools/feed/module/sse/SSE091Parser.java b/src/main/java/com/rometools/modules/sse/SSE091Parser.java similarity index 92% rename from src/main/java/org/rometools/feed/module/sse/SSE091Parser.java rename to src/main/java/com/rometools/modules/sse/SSE091Parser.java index 8798e3e..39b1d13 100644 --- a/src/main/java/org/rometools/feed/module/sse/SSE091Parser.java +++ b/src/main/java/com/rometools/modules/sse/SSE091Parser.java @@ -1,4 +1,4 @@ -package org.rometools.feed.module.sse; +package com.rometools.modules.sse; import java.util.ArrayList; import java.util.Date; @@ -9,21 +9,21 @@ import org.jdom2.Attribute; import org.jdom2.DataConversionException; import org.jdom2.Element; import org.jdom2.filter.AbstractFilter; -import org.rometools.feed.module.sse.modules.Conflict; -import org.rometools.feed.module.sse.modules.Conflicts; -import org.rometools.feed.module.sse.modules.History; -import org.rometools.feed.module.sse.modules.Related; -import org.rometools.feed.module.sse.modules.SSEModule; -import org.rometools.feed.module.sse.modules.Sharing; -import org.rometools.feed.module.sse.modules.Sync; -import org.rometools.feed.module.sse.modules.Update; -import com.sun.syndication.feed.module.Module; -import com.sun.syndication.feed.rss.Item; -import com.sun.syndication.io.DelegatingModuleParser; -import com.sun.syndication.io.WireFeedParser; -import com.sun.syndication.io.impl.DateParser; -import com.sun.syndication.io.impl.RSS20Parser; +import com.rometools.modules.sse.modules.Conflict; +import com.rometools.modules.sse.modules.Conflicts; +import com.rometools.modules.sse.modules.History; +import com.rometools.modules.sse.modules.Related; +import com.rometools.modules.sse.modules.SSEModule; +import com.rometools.modules.sse.modules.Sharing; +import com.rometools.modules.sse.modules.Sync; +import com.rometools.modules.sse.modules.Update; +import com.rometools.rome.feed.module.Module; +import com.rometools.rome.feed.rss.Item; +import com.rometools.rome.io.DelegatingModuleParser; +import com.rometools.rome.io.WireFeedParser; +import com.rometools.rome.io.impl.DateParser; +import com.rometools.rome.io.impl.RSS20Parser; /** * Parses embedded SSE content from RSS channel and item content. diff --git a/src/main/java/org/rometools/feed/module/sse/modules/Conflict.java b/src/main/java/com/rometools/modules/sse/modules/Conflict.java similarity index 94% rename from src/main/java/org/rometools/feed/module/sse/modules/Conflict.java rename to src/main/java/com/rometools/modules/sse/modules/Conflict.java index 89dc446..54133ae 100644 --- a/src/main/java/org/rometools/feed/module/sse/modules/Conflict.java +++ b/src/main/java/com/rometools/modules/sse/modules/Conflict.java @@ -1,9 +1,9 @@ -package org.rometools.feed.module.sse.modules; +package com.rometools.modules.sse.modules; import java.util.Date; -import com.sun.syndication.feed.CopyFrom; -import com.sun.syndication.feed.rss.Item; +import com.rometools.rome.feed.CopyFrom; +import com.rometools.rome.feed.rss.Item; /** * element within diff --git a/src/main/java/org/rometools/feed/module/sse/modules/Conflicts.java b/src/main/java/com/rometools/modules/sse/modules/Conflicts.java similarity index 81% rename from src/main/java/org/rometools/feed/module/sse/modules/Conflicts.java rename to src/main/java/com/rometools/modules/sse/modules/Conflicts.java index b953fb9..f2b2d1e 100644 --- a/src/main/java/org/rometools/feed/module/sse/modules/Conflicts.java +++ b/src/main/java/com/rometools/modules/sse/modules/Conflicts.java @@ -1,6 +1,6 @@ -package org.rometools.feed.module.sse.modules; +package com.rometools.modules.sse.modules; -import com.sun.syndication.feed.CopyFrom; +import com.rometools.rome.feed.CopyFrom; /** * element within diff --git a/src/main/java/org/rometools/feed/module/sse/modules/History.java b/src/main/java/com/rometools/modules/sse/modules/History.java similarity index 97% rename from src/main/java/org/rometools/feed/module/sse/modules/History.java rename to src/main/java/com/rometools/modules/sse/modules/History.java index f34806d..e27114b 100644 --- a/src/main/java/org/rometools/feed/module/sse/modules/History.java +++ b/src/main/java/com/rometools/modules/sse/modules/History.java @@ -1,10 +1,10 @@ -package org.rometools.feed.module.sse.modules; +package com.rometools.modules.sse.modules; import java.util.ArrayList; import java.util.Date; import java.util.List; -import com.sun.syndication.feed.CopyFrom; +import com.rometools.rome.feed.CopyFrom; /** * 

diff --git a/src/main/java/org/rometools/feed/module/sse/modules/Related.java b/src/main/java/com/rometools/modules/sse/modules/Related.java
similarity index 97%
rename from src/main/java/org/rometools/feed/module/sse/modules/Related.java
rename to src/main/java/com/rometools/modules/sse/modules/Related.java
index d06ebae..d506947 100644
--- a/src/main/java/org/rometools/feed/module/sse/modules/Related.java
+++ b/src/main/java/com/rometools/modules/sse/modules/Related.java
@@ -1,8 +1,8 @@
-package org.rometools.feed.module.sse.modules;
+package com.rometools.modules.sse.modules;
 
 import java.util.Date;
 
-import com.sun.syndication.feed.CopyFrom;
+import com.rometools.rome.feed.CopyFrom;
 
 /**
  * 
diff --git a/src/main/java/org/rometools/feed/module/sse/modules/SSEModule.java b/src/main/java/com/rometools/modules/sse/modules/SSEModule.java
similarity index 91%
rename from src/main/java/org/rometools/feed/module/sse/modules/SSEModule.java
rename to src/main/java/com/rometools/modules/sse/modules/SSEModule.java
index 3b1b787..ba631e0 100644
--- a/src/main/java/org/rometools/feed/module/sse/modules/SSEModule.java
+++ b/src/main/java/com/rometools/modules/sse/modules/SSEModule.java
@@ -1,4 +1,4 @@
-package org.rometools.feed.module.sse.modules;
+package com.rometools.modules.sse.modules;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -6,8 +6,8 @@ import java.util.Set;
 
 import org.jdom2.Namespace;
 
-import com.sun.syndication.feed.CopyFrom;
-import com.sun.syndication.feed.module.Module;
+import com.rometools.rome.feed.CopyFrom;
+import com.rometools.rome.feed.module.Module;
 
 /**
  * The base module for SSE data synchronization. Defines a namespace, uri, and basic copying
diff --git a/src/main/java/org/rometools/feed/module/sse/modules/Sharing.java b/src/main/java/com/rometools/modules/sse/modules/Sharing.java
similarity index 98%
rename from src/main/java/org/rometools/feed/module/sse/modules/Sharing.java
rename to src/main/java/com/rometools/modules/sse/modules/Sharing.java
index 6c40acf..b5d1d95 100644
--- a/src/main/java/org/rometools/feed/module/sse/modules/Sharing.java
+++ b/src/main/java/com/rometools/modules/sse/modules/Sharing.java
@@ -1,8 +1,8 @@
-package org.rometools.feed.module.sse.modules;
+package com.rometools.modules.sse.modules;
 
 import java.util.Date;
 
-import com.sun.syndication.feed.CopyFrom;
+import com.rometools.rome.feed.CopyFrom;
 
 /**
  * 
diff --git a/src/main/java/org/rometools/feed/module/sse/modules/Sync.java b/src/main/java/com/rometools/modules/sse/modules/Sync.java
similarity index 98%
rename from src/main/java/org/rometools/feed/module/sse/modules/Sync.java
rename to src/main/java/com/rometools/modules/sse/modules/Sync.java
index 3ac3ac4..9ff18fe 100644
--- a/src/main/java/org/rometools/feed/module/sse/modules/Sync.java
+++ b/src/main/java/com/rometools/modules/sse/modules/Sync.java
@@ -1,9 +1,9 @@
-package org.rometools.feed.module.sse.modules;
+package com.rometools.modules.sse.modules;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.sun.syndication.feed.CopyFrom;
+import com.rometools.rome.feed.CopyFrom;
 
 /**
  * 
diff --git a/src/main/java/org/rometools/feed/module/sse/modules/Update.java b/src/main/java/com/rometools/modules/sse/modules/Update.java
similarity index 96%
rename from src/main/java/org/rometools/feed/module/sse/modules/Update.java
rename to src/main/java/com/rometools/modules/sse/modules/Update.java
index d2b975a..16967f3 100644
--- a/src/main/java/org/rometools/feed/module/sse/modules/Update.java
+++ b/src/main/java/com/rometools/modules/sse/modules/Update.java
@@ -1,8 +1,8 @@
-package org.rometools.feed.module.sse.modules;
+package com.rometools.modules.sse.modules;
 
 import java.util.Date;
 
-import com.sun.syndication.feed.CopyFrom;
+import com.rometools.rome.feed.CopyFrom;
 
 /**
  * 
diff --git a/src/main/java/org/rometools/feed/module/yahooweather/YWeatherEntryModule.java b/src/main/java/com/rometools/modules/yahooweather/YWeatherEntryModule.java
similarity index 93%
rename from src/main/java/org/rometools/feed/module/yahooweather/YWeatherEntryModule.java
rename to src/main/java/com/rometools/modules/yahooweather/YWeatherEntryModule.java
index 0abeeb4..4be4f22 100644
--- a/src/main/java/org/rometools/feed/module/yahooweather/YWeatherEntryModule.java
+++ b/src/main/java/com/rometools/modules/yahooweather/YWeatherEntryModule.java
@@ -34,10 +34,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.rometools.feed.module.yahooweather;
+package com.rometools.modules.yahooweather;
 
-import org.rometools.feed.module.yahooweather.types.Condition;
-import org.rometools.feed.module.yahooweather.types.Forecast;
+import com.rometools.modules.yahooweather.types.Condition;
+import com.rometools.modules.yahooweather.types.Forecast;
 
 /**
  * An interface describing the entry/item level data for Yahoo Weather.
diff --git a/src/main/java/org/rometools/feed/module/yahooweather/YWeatherFeedModule.java b/src/main/java/com/rometools/modules/yahooweather/YWeatherFeedModule.java
similarity index 90%
rename from src/main/java/org/rometools/feed/module/yahooweather/YWeatherFeedModule.java
rename to src/main/java/com/rometools/modules/yahooweather/YWeatherFeedModule.java
index f6f711a..c678ada 100644
--- a/src/main/java/org/rometools/feed/module/yahooweather/YWeatherFeedModule.java
+++ b/src/main/java/com/rometools/modules/yahooweather/YWeatherFeedModule.java
@@ -33,13 +33,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.rometools.feed.module.yahooweather;
+package com.rometools.modules.yahooweather;
 
-import org.rometools.feed.module.yahooweather.types.Astronomy;
-import org.rometools.feed.module.yahooweather.types.Atmosphere;
-import org.rometools.feed.module.yahooweather.types.Location;
-import org.rometools.feed.module.yahooweather.types.Units;
-import org.rometools.feed.module.yahooweather.types.Wind;
+import com.rometools.modules.yahooweather.types.Astronomy;
+import com.rometools.modules.yahooweather.types.Atmosphere;
+import com.rometools.modules.yahooweather.types.Location;
+import com.rometools.modules.yahooweather.types.Units;
+import com.rometools.modules.yahooweather.types.Wind;
 
 /**
  * An interface describing feed/channel level data for Yahoo Weather.
diff --git a/src/main/java/org/rometools/feed/module/yahooweather/YWeatherModule.java b/src/main/java/com/rometools/modules/yahooweather/YWeatherModule.java
similarity index 95%
rename from src/main/java/org/rometools/feed/module/yahooweather/YWeatherModule.java
rename to src/main/java/com/rometools/modules/yahooweather/YWeatherModule.java
index 244b1d9..25ec3e3 100644
--- a/src/main/java/org/rometools/feed/module/yahooweather/YWeatherModule.java
+++ b/src/main/java/com/rometools/modules/yahooweather/YWeatherModule.java
@@ -33,9 +33,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.rometools.feed.module.yahooweather;
+package com.rometools.modules.yahooweather;
 
-import com.sun.syndication.feed.module.Module;
+import com.rometools.rome.feed.module.Module;
 
 /**
  * A simple parent interface that defines the feed URI.
diff --git a/src/main/java/org/rometools/feed/module/yahooweather/YWeatherModuleImpl.java b/src/main/java/com/rometools/modules/yahooweather/YWeatherModuleImpl.java
similarity index 88%
rename from src/main/java/org/rometools/feed/module/yahooweather/YWeatherModuleImpl.java
rename to src/main/java/com/rometools/modules/yahooweather/YWeatherModuleImpl.java
index cacb36f..69bbdf2 100644
--- a/src/main/java/org/rometools/feed/module/yahooweather/YWeatherModuleImpl.java
+++ b/src/main/java/com/rometools/modules/yahooweather/YWeatherModuleImpl.java
@@ -33,19 +33,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.rometools.feed.module.yahooweather;
+package com.rometools.modules.yahooweather;
 
-import org.rometools.feed.module.yahooweather.types.Astronomy;
-import org.rometools.feed.module.yahooweather.types.Atmosphere;
-import org.rometools.feed.module.yahooweather.types.Condition;
-import org.rometools.feed.module.yahooweather.types.Forecast;
-import org.rometools.feed.module.yahooweather.types.Location;
-import org.rometools.feed.module.yahooweather.types.Units;
-import org.rometools.feed.module.yahooweather.types.Wind;
-
-import com.sun.syndication.feed.CopyFrom;
-import com.sun.syndication.feed.module.Module;
-import com.sun.syndication.feed.module.ModuleImpl;
+import com.rometools.modules.yahooweather.types.Astronomy;
+import com.rometools.modules.yahooweather.types.Atmosphere;
+import com.rometools.modules.yahooweather.types.Condition;
+import com.rometools.modules.yahooweather.types.Forecast;
+import com.rometools.modules.yahooweather.types.Location;
+import com.rometools.modules.yahooweather.types.Units;
+import com.rometools.modules.yahooweather.types.Wind;
+import com.rometools.rome.feed.CopyFrom;
+import com.rometools.rome.feed.module.Module;
+import com.rometools.rome.feed.module.ModuleImpl;
 
 /**
  * A Module implementation for entry or feed level information.
diff --git a/src/main/java/org/rometools/feed/module/yahooweather/io/WeatherModuleGenerator.java b/src/main/java/com/rometools/modules/yahooweather/io/WeatherModuleGenerator.java
similarity index 96%
rename from src/main/java/org/rometools/feed/module/yahooweather/io/WeatherModuleGenerator.java
rename to src/main/java/com/rometools/modules/yahooweather/io/WeatherModuleGenerator.java
index ce56033..088c819 100644
--- a/src/main/java/org/rometools/feed/module/yahooweather/io/WeatherModuleGenerator.java
+++ b/src/main/java/com/rometools/modules/yahooweather/io/WeatherModuleGenerator.java
@@ -35,7 +35,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.rometools.feed.module.yahooweather.io;
+package com.rometools.modules.yahooweather.io;
 
 import java.text.SimpleDateFormat;
 import java.util.HashSet;
@@ -44,12 +44,12 @@ import java.util.Set;
 
 import org.jdom2.Element;
 import org.jdom2.Namespace;
-import org.rometools.feed.module.yahooweather.YWeatherModule;
-import org.rometools.feed.module.yahooweather.YWeatherModuleImpl;
-import org.rometools.feed.module.yahooweather.types.Forecast;
 
-import com.sun.syndication.feed.module.Module;
-import com.sun.syndication.io.ModuleGenerator;
+import com.rometools.modules.yahooweather.YWeatherModule;
+import com.rometools.modules.yahooweather.YWeatherModuleImpl;
+import com.rometools.modules.yahooweather.types.Forecast;
+import com.rometools.rome.feed.module.Module;
+import com.rometools.rome.io.ModuleGenerator;
 
 /**
  * The ModuleGenerator implementation for the Yahoo Weather plug in.
diff --git a/src/main/java/org/rometools/feed/module/yahooweather/io/WeatherModuleParser.java b/src/main/java/com/rometools/modules/yahooweather/io/WeatherModuleParser.java
similarity index 90%
rename from src/main/java/org/rometools/feed/module/yahooweather/io/WeatherModuleParser.java
rename to src/main/java/com/rometools/modules/yahooweather/io/WeatherModuleParser.java
index 60013ae..cad9ee3 100644
--- a/src/main/java/org/rometools/feed/module/yahooweather/io/WeatherModuleParser.java
+++ b/src/main/java/com/rometools/modules/yahooweather/io/WeatherModuleParser.java
@@ -36,7 +36,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.rometools.feed.module.yahooweather.io;
+package com.rometools.modules.yahooweather.io;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -46,21 +46,21 @@ import java.util.Locale;
 
 import org.jdom2.Element;
 import org.jdom2.Namespace;
-import org.rometools.feed.module.yahooweather.YWeatherModule;
-import org.rometools.feed.module.yahooweather.YWeatherModuleImpl;
-import org.rometools.feed.module.yahooweather.types.Astronomy;
-import org.rometools.feed.module.yahooweather.types.Atmosphere;
-import org.rometools.feed.module.yahooweather.types.Condition;
-import org.rometools.feed.module.yahooweather.types.ConditionCode;
-import org.rometools.feed.module.yahooweather.types.Forecast;
-import org.rometools.feed.module.yahooweather.types.Location;
-import org.rometools.feed.module.yahooweather.types.Units;
-import org.rometools.feed.module.yahooweather.types.Wind;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.sun.syndication.feed.module.Module;
-import com.sun.syndication.io.ModuleParser;
+import com.rometools.modules.yahooweather.YWeatherModule;
+import com.rometools.modules.yahooweather.YWeatherModuleImpl;
+import com.rometools.modules.yahooweather.types.Astronomy;
+import com.rometools.modules.yahooweather.types.Atmosphere;
+import com.rometools.modules.yahooweather.types.Condition;
+import com.rometools.modules.yahooweather.types.ConditionCode;
+import com.rometools.modules.yahooweather.types.Forecast;
+import com.rometools.modules.yahooweather.types.Location;
+import com.rometools.modules.yahooweather.types.Units;
+import com.rometools.modules.yahooweather.types.Wind;
+import com.rometools.rome.feed.module.Module;
+import com.rometools.rome.io.ModuleParser;
 
 /**
  * ModuleParser implementation for Slash RSS.
diff --git a/src/main/java/org/rometools/feed/module/yahooweather/io/package.html b/src/main/java/com/rometools/modules/yahooweather/io/package.html
similarity index 100%
rename from src/main/java/org/rometools/feed/module/yahooweather/io/package.html
rename to src/main/java/com/rometools/modules/yahooweather/io/package.html
diff --git a/src/main/java/org/rometools/feed/module/yahooweather/package.html b/src/main/java/com/rometools/modules/yahooweather/package.html
similarity index 100%
rename from src/main/java/org/rometools/feed/module/yahooweather/package.html
rename to src/main/java/com/rometools/modules/yahooweather/package.html
diff --git a/src/main/java/org/rometools/feed/module/yahooweather/types/Astronomy.java b/src/main/java/com/rometools/modules/yahooweather/types/Astronomy.java
similarity index 96%
rename from src/main/java/org/rometools/feed/module/yahooweather/types/Astronomy.java
rename to src/main/java/com/rometools/modules/yahooweather/types/Astronomy.java
index fd565ea..30f4399 100644
--- a/src/main/java/org/rometools/feed/module/yahooweather/types/Astronomy.java
+++ b/src/main/java/com/rometools/modules/yahooweather/types/Astronomy.java
@@ -35,13 +35,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.rometools.feed.module.yahooweather.types;
+package com.rometools.modules.yahooweather.types;
 
 import java.io.Serializable;
 import java.util.Date;
 
-import com.sun.syndication.feed.impl.EqualsBean;
-import com.sun.syndication.feed.impl.ToStringBean;
+import com.rometools.rome.feed.impl.EqualsBean;
+import com.rometools.rome.feed.impl.ToStringBean;
 
 /**
  * Forecast information about current astronomical conditions. Attributes:
diff --git a/src/main/java/org/rometools/feed/module/yahooweather/types/Atmosphere.java b/src/main/java/com/rometools/modules/yahooweather/types/Atmosphere.java
similarity index 97%
rename from src/main/java/org/rometools/feed/module/yahooweather/types/Atmosphere.java
rename to src/main/java/com/rometools/modules/yahooweather/types/Atmosphere.java
index 818ca02..9ff349e 100644
--- a/src/main/java/org/rometools/feed/module/yahooweather/types/Atmosphere.java
+++ b/src/main/java/com/rometools/modules/yahooweather/types/Atmosphere.java
@@ -35,12 +35,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.rometools.feed.module.yahooweather.types;
+package com.rometools.modules.yahooweather.types;
 
 import java.io.Serializable;
 
-import com.sun.syndication.feed.impl.EqualsBean;
-import com.sun.syndication.feed.impl.ToStringBean;
+import com.rometools.rome.feed.impl.EqualsBean;
+import com.rometools.rome.feed.impl.ToStringBean;
 
 /**
  * Forecast information about current atmospheric pressure, humidity, and visibility. Attributes:
diff --git a/src/main/java/org/rometools/feed/module/yahooweather/types/Condition.java b/src/main/java/com/rometools/modules/yahooweather/types/Condition.java
similarity index 97%
rename from src/main/java/org/rometools/feed/module/yahooweather/types/Condition.java
rename to src/main/java/com/rometools/modules/yahooweather/types/Condition.java
index 9d82148..09eaf1e 100644
--- a/src/main/java/org/rometools/feed/module/yahooweather/types/Condition.java
+++ b/src/main/java/com/rometools/modules/yahooweather/types/Condition.java
@@ -35,13 +35,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.rometools.feed.module.yahooweather.types;
+package com.rometools.modules.yahooweather.types;
 
 import java.io.Serializable;
 import java.util.Date;
 
-import com.sun.syndication.feed.impl.EqualsBean;
-import com.sun.syndication.feed.impl.ToStringBean;
+import com.rometools.rome.feed.impl.EqualsBean;
+import com.rometools.rome.feed.impl.ToStringBean;
 
 /**
  * The current weather conditions. Attributes:
diff --git a/src/main/java/org/rometools/feed/module/yahooweather/types/ConditionCode.java b/src/main/java/com/rometools/modules/yahooweather/types/ConditionCode.java
similarity index 99%
rename from src/main/java/org/rometools/feed/module/yahooweather/types/ConditionCode.java
rename to src/main/java/com/rometools/modules/yahooweather/types/ConditionCode.java
index b86d212..4323ed5 100644
--- a/src/main/java/org/rometools/feed/module/yahooweather/types/ConditionCode.java
+++ b/src/main/java/com/rometools/modules/yahooweather/types/ConditionCode.java
@@ -35,13 +35,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.rometools.feed.module.yahooweather.types;
+package com.rometools.modules.yahooweather.types;
 
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.sun.syndication.feed.impl.EqualsBean;
+import com.rometools.rome.feed.impl.EqualsBean;
 
 /**
  * 
Condition Codes

diff --git a/src/main/java/org/rometools/feed/module/yahooweather/types/Forecast.java b/src/main/java/com/rometools/modules/yahooweather/types/Forecast.java
similarity index 97%
rename from src/main/java/org/rometools/feed/module/yahooweather/types/Forecast.java
rename to src/main/java/com/rometools/modules/yahooweather/types/Forecast.java
index beb72df..a219fb6 100644
--- a/src/main/java/org/rometools/feed/module/yahooweather/types/Forecast.java
+++ b/src/main/java/com/rometools/modules/yahooweather/types/Forecast.java
@@ -35,13 +35,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.rometools.feed.module.yahooweather.types;
+package com.rometools.modules.yahooweather.types;
 
 import java.io.Serializable;
 import java.util.Date;
 
-import com.sun.syndication.feed.impl.EqualsBean;
-import com.sun.syndication.feed.impl.ToStringBean;
+import com.rometools.rome.feed.impl.EqualsBean;
+import com.rometools.rome.feed.impl.ToStringBean;
 
 /**
  * The weather forecast for a specific day. The item element contains multiple forecast elements for
diff --git a/src/main/java/org/rometools/feed/module/yahooweather/types/Location.java b/src/main/java/com/rometools/modules/yahooweather/types/Location.java
similarity index 96%
rename from src/main/java/org/rometools/feed/module/yahooweather/types/Location.java
rename to src/main/java/com/rometools/modules/yahooweather/types/Location.java
index a7dde08..257fb78 100644
--- a/src/main/java/org/rometools/feed/module/yahooweather/types/Location.java
+++ b/src/main/java/com/rometools/modules/yahooweather/types/Location.java
@@ -35,12 +35,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.rometools.feed.module.yahooweather.types;
+package com.rometools.modules.yahooweather.types;
 
 import java.io.Serializable;
 
-import com.sun.syndication.feed.impl.EqualsBean;
-import com.sun.syndication.feed.impl.ToStringBean;
+import com.rometools.rome.feed.impl.EqualsBean;
+import com.rometools.rome.feed.impl.ToStringBean;
 
 /**
  * The location of this forecast. Attributes:
diff --git a/src/main/java/org/rometools/feed/module/yahooweather/types/Units.java b/src/main/java/com/rometools/modules/yahooweather/types/Units.java
similarity index 97%
rename from src/main/java/org/rometools/feed/module/yahooweather/types/Units.java
rename to src/main/java/com/rometools/modules/yahooweather/types/Units.java
index 3d9d566..6552a01 100644
--- a/src/main/java/org/rometools/feed/module/yahooweather/types/Units.java
+++ b/src/main/java/com/rometools/modules/yahooweather/types/Units.java
@@ -35,12 +35,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.rometools.feed.module.yahooweather.types;
+package com.rometools.modules.yahooweather.types;
 
 import java.io.Serializable;
 
-import com.sun.syndication.feed.impl.EqualsBean;
-import com.sun.syndication.feed.impl.ToStringBean;
+import com.rometools.rome.feed.impl.EqualsBean;
+import com.rometools.rome.feed.impl.ToStringBean;
 
 /**
  * Units for various aspects of the forecast. Attributes:
diff --git a/src/main/java/org/rometools/feed/module/yahooweather/types/Wind.java b/src/main/java/com/rometools/modules/yahooweather/types/Wind.java
similarity index 96%
rename from src/main/java/org/rometools/feed/module/yahooweather/types/Wind.java
rename to src/main/java/com/rometools/modules/yahooweather/types/Wind.java
index a5127ea..04235cf 100644
--- a/src/main/java/org/rometools/feed/module/yahooweather/types/Wind.java
+++ b/src/main/java/com/rometools/modules/yahooweather/types/Wind.java
@@ -35,12 +35,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.rometools.feed.module.yahooweather.types;
+package com.rometools.modules.yahooweather.types;
 
 import java.io.Serializable;
 
-import com.sun.syndication.feed.impl.EqualsBean;
-import com.sun.syndication.feed.impl.ToStringBean;
+import com.rometools.rome.feed.impl.EqualsBean;
+import com.rometools.rome.feed.impl.ToStringBean;
 
 /**
  * Units for various aspects of the forecast. Attributes:
diff --git a/src/main/java/org/rometools/feed/module/yahooweather/types/package.html b/src/main/java/com/rometools/modules/yahooweather/types/package.html
similarity index 100%
rename from src/main/java/org/rometools/feed/module/yahooweather/types/package.html
rename to src/main/java/com/rometools/modules/yahooweather/types/package.html
diff --git a/src/main/java/org/rometools/feed/module/sle/ValueStrategy.java b/src/main/java/org/rometools/feed/module/sle/ValueStrategy.java
deleted file mode 100644
index ff7a484..0000000
--- a/src/main/java/org/rometools/feed/module/sle/ValueStrategy.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.rometools.feed.module.sle;
-
-import org.rometools.feed.module.sle.types.EntryValue;
-
-import com.sun.syndication.feed.module.Extendable;
-
-interface ValueStrategy {
-
-    public EntryValue getValue(Extendable extendable, Object value);
-
-}
\ No newline at end of file
diff --git a/src/main/resources/org/rometools/feed/module/base/io/tags.properties b/src/main/resources/com/rometools/modules/base/io/tags.properties
similarity index 100%
rename from src/main/resources/org/rometools/feed/module/base/io/tags.properties
rename to src/main/resources/com/rometools/modules/base/io/tags.properties
diff --git a/src/main/resources/rome.properties b/src/main/resources/rome.properties
index a35ae97..c05fe38 100644
--- a/src/main/resources/rome.properties
+++ b/src/main/resources/rome.properties
@@ -1,151 +1,151 @@
-WireFeedParser.classes=org.rometools.feed.module.mediarss.io.RSS20YahooParser
+WireFeedParser.classes=com.rometools.modules.mediarss.io.RSS20YahooParser
 
-rss_2.0.feed.ModuleParser.classes=org.rometools.feed.module.cc.io.ModuleParserRSS2 \
-    org.rometools.feed.module.content.io.ContentModuleParser \
-    org.rometools.feed.module.itunes.io.ITunesParser \
-    org.rometools.feed.module.mediarss.io.MediaModuleParser \
-    org.rometools.feed.module.opensearch.impl.OpenSearchModuleParser \
-    org.rometools.feed.module.georss.SimpleParser \
-    org.rometools.feed.module.georss.W3CGeoParser \
-    org.rometools.feed.module.photocast.io.Parser \
-    org.rometools.feed.module.mediarss.io.MediaModuleParser \
-    org.rometools.feed.module.itunes.io.ITunesParserOldNamespace \
-    org.rometools.feed.module.mediarss.io.AlternateMediaModuleParser \
-    org.rometools.feed.module.sle.io.ModuleParser \
-    org.rometools.feed.module.yahooweather.io.WeatherModuleParser
+rss_2.0.feed.ModuleParser.classes=com.rometools.modules.cc.io.ModuleParserRSS2 \
+    com.rometools.modules.content.io.ContentModuleParser \
+    com.rometools.modules.itunes.io.ITunesParser \
+    com.rometools.modules.mediarss.io.MediaModuleParser \
+    com.rometools.modules.opensearch.impl.OpenSearchModuleParser \
+    com.rometools.modules.georss.SimpleParser \
+    com.rometools.modules.georss.W3CGeoParser \
+    com.rometools.modules.photocast.io.Parser \
+    com.rometools.modules.mediarss.io.MediaModuleParser \
+    com.rometools.modules.itunes.io.ITunesParserOldNamespace \
+    com.rometools.modules.mediarss.io.AlternateMediaModuleParser \
+    com.rometools.modules.sle.io.ModuleParser \
+    com.rometools.modules.yahooweather.io.WeatherModuleParser
 
-rss_1.0.feed.ModuleParser.classes=org.rometools.feed.module.cc.io.ModuleParserRSS1 \
-    org.rometools.feed.module.content.io.ContentModuleParser
+rss_1.0.feed.ModuleParser.classes=com.rometools.modules.cc.io.ModuleParserRSS1 \
+    com.rometools.modules.content.io.ContentModuleParser
 
-atom_0.3.feed.ModuleParser.classes=org.rometools.feed.module.cc.io.ModuleParserRSS2 \
-    org.rometools.feed.module.opensearch.impl.OpenSearchModuleParser \
-    org.rometools.feed.module.georss.SimpleParser \
-    org.rometools.feed.module.georss.W3CGeoParser \
-    org.rometools.feed.module.photocast.io.Parser \
-    org.rometools.feed.module.mediarss.io.MediaModuleParser \
-    org.rometools.feed.module.mediarss.io.AlternateMediaModuleParser
+atom_0.3.feed.ModuleParser.classes=com.rometools.modules.cc.io.ModuleParserRSS2 \
+    com.rometools.modules.opensearch.impl.OpenSearchModuleParser \
+    com.rometools.modules.georss.SimpleParser \
+    com.rometools.modules.georss.W3CGeoParser \
+    com.rometools.modules.photocast.io.Parser \
+    com.rometools.modules.mediarss.io.MediaModuleParser \
+    com.rometools.modules.mediarss.io.AlternateMediaModuleParser
 
-atom_1.0.feed.ModuleParser.classes=org.rometools.feed.module.cc.io.ModuleParserRSS2 \
-    org.rometools.feed.module.opensearch.impl.OpenSearchModuleParser \
-    org.rometools.feed.module.georss.SimpleParser \
-    org.rometools.feed.module.georss.W3CGeoParser \
-    org.rometools.feed.module.photocast.io.Parser \
-    org.rometools.feed.module.mediarss.io.MediaModuleParser \
-    org.rometools.feed.module.mediarss.io.AlternateMediaModuleParser
+atom_1.0.feed.ModuleParser.classes=com.rometools.modules.cc.io.ModuleParserRSS2 \
+    com.rometools.modules.opensearch.impl.OpenSearchModuleParser \
+    com.rometools.modules.georss.SimpleParser \
+    com.rometools.modules.georss.W3CGeoParser \
+    com.rometools.modules.photocast.io.Parser \
+    com.rometools.modules.mediarss.io.MediaModuleParser \
+    com.rometools.modules.mediarss.io.AlternateMediaModuleParser
 
-rss_2.0.item.ModuleParser.classes=org.rometools.feed.module.cc.io.ModuleParserRSS2 \
-    org.rometools.feed.module.base.io.GoogleBaseParser \
-    org.rometools.feed.module.content.io.ContentModuleParser \
-    org.rometools.feed.module.slash.io.SlashModuleParser \
-    org.rometools.feed.module.itunes.io.ITunesParser \
-    org.rometools.feed.module.mediarss.io.MediaModuleParser \
-    org.rometools.feed.module.opensearch.impl.OpenSearchModuleParser \
-    org.rometools.feed.module.georss.SimpleParser \
-    org.rometools.feed.module.georss.W3CGeoParser \
-    org.rometools.feed.module.photocast.io.Parser \
-    org.rometools.feed.module.itunes.io.ITunesParserOldNamespace \
-    org.rometools.feed.module.mediarss.io.AlternateMediaModuleParser \
-    org.rometools.feed.module.sle.io.ItemParser \
-    org.rometools.feed.module.yahooweather.io.WeatherModuleParser
+rss_2.0.item.ModuleParser.classes=com.rometools.modules.cc.io.ModuleParserRSS2 \
+    com.rometools.modules.base.io.GoogleBaseParser \
+    com.rometools.modules.content.io.ContentModuleParser \
+    com.rometools.modules.slash.io.SlashModuleParser \
+    com.rometools.modules.itunes.io.ITunesParser \
+    com.rometools.modules.mediarss.io.MediaModuleParser \
+    com.rometools.modules.opensearch.impl.OpenSearchModuleParser \
+    com.rometools.modules.georss.SimpleParser \
+    com.rometools.modules.georss.W3CGeoParser \
+    com.rometools.modules.photocast.io.Parser \
+    com.rometools.modules.itunes.io.ITunesParserOldNamespace \
+    com.rometools.modules.mediarss.io.AlternateMediaModuleParser \
+    com.rometools.modules.sle.io.ItemParser \
+    com.rometools.modules.yahooweather.io.WeatherModuleParser
 
-rss_1.0.item.ModuleParser.classes=org.rometools.feed.module.cc.io.ModuleParserRSS1 \
-    org.rometools.feed.module.base.io.GoogleBaseParser \
-    org.rometools.feed.module.base.io.CustomTagParser \
-    org.rometools.feed.module.content.io.ContentModuleParser \
-    org.rometools.feed.module.slash.io.SlashModuleParser
+rss_1.0.item.ModuleParser.classes=com.rometools.modules.cc.io.ModuleParserRSS1 \
+    com.rometools.modules.base.io.GoogleBaseParser \
+    com.rometools.modules.base.io.CustomTagParser \
+    com.rometools.modules.content.io.ContentModuleParser \
+    com.rometools.modules.slash.io.SlashModuleParser
 
-atom_0.3.item.ModuleParser.classes=org.rometools.feed.module.cc.io.ModuleParserRSS2 \
-    org.rometools.feed.module.base.io.GoogleBaseParser \
-    org.rometools.feed.module.base.io.CustomTagParser \
-    org.rometools.feed.module.slash.io.SlashModuleParser \
-    org.rometools.feed.module.opensearch.impl.OpenSearchModuleParser \
-    org.rometools.feed.module.georss.SimpleParser \
-    org.rometools.feed.module.georss.W3CGeoParser \
-    org.rometools.feed.module.photocast.io.Parser \
-    org.rometools.feed.module.mediarss.io.MediaModuleParser \
-    org.rometools.feed.module.mediarss.io.AlternateMediaModuleParser
+atom_0.3.item.ModuleParser.classes=com.rometools.modules.cc.io.ModuleParserRSS2 \
+    com.rometools.modules.base.io.GoogleBaseParser \
+    com.rometools.modules.base.io.CustomTagParser \
+    com.rometools.modules.slash.io.SlashModuleParser \
+    com.rometools.modules.opensearch.impl.OpenSearchModuleParser \
+    com.rometools.modules.georss.SimpleParser \
+    com.rometools.modules.georss.W3CGeoParser \
+    com.rometools.modules.photocast.io.Parser \
+    com.rometools.modules.mediarss.io.MediaModuleParser \
+    com.rometools.modules.mediarss.io.AlternateMediaModuleParser
 
-atom_1.0.item.ModuleParser.classes=org.rometools.feed.module.cc.io.ModuleParserRSS2 \
-    org.rometools.feed.module.base.io.GoogleBaseParser \
-    org.rometools.feed.module.base.io.CustomTagParser \
-    org.rometools.feed.module.slash.io.SlashModuleParser \
-    org.rometools.feed.module.opensearch.impl.OpenSearchModuleParser  \
-    org.rometools.feed.module.georss.SimpleParser \
-    org.rometools.feed.module.georss.W3CGeoParser \
-    org.rometools.feed.module.photocast.io.Parser \
-    org.rometools.feed.module.mediarss.io.MediaModuleParser \
-    org.rometools.feed.module.mediarss.io.AlternateMediaModuleParser
+atom_1.0.item.ModuleParser.classes=com.rometools.modules.cc.io.ModuleParserRSS2 \
+    com.rometools.modules.base.io.GoogleBaseParser \
+    com.rometools.modules.base.io.CustomTagParser \
+    com.rometools.modules.slash.io.SlashModuleParser \
+    com.rometools.modules.opensearch.impl.OpenSearchModuleParser  \
+    com.rometools.modules.georss.SimpleParser \
+    com.rometools.modules.georss.W3CGeoParser \
+    com.rometools.modules.photocast.io.Parser \
+    com.rometools.modules.mediarss.io.MediaModuleParser \
+    com.rometools.modules.mediarss.io.AlternateMediaModuleParser
 
-rss_2.0.feed.ModuleGenerator.classes=org.rometools.feed.module.cc.io.CCModuleGenerator \
-    org.rometools.feed.module.content.io.ContentModuleGenerator \
-    org.rometools.feed.module.itunes.io.ITunesGenerator \
-    org.rometools.feed.module.opensearch.impl.OpenSearchModuleGenerator \
-    org.rometools.feed.module.georss.SimpleGenerator \
-    org.rometools.feed.module.georss.W3CGeoGenerator \
-    org.rometools.feed.module.photocast.io.Generator \
-    org.rometools.feed.module.mediarss.io.MediaModuleGenerator \
-    org.rometools.feed.module.sle.io.ModuleGenerator \
-    org.rometools.feed.module.yahooweather.io.WeatherModuleGenerator
+rss_2.0.feed.ModuleGenerator.classes=com.rometools.modules.cc.io.CCModuleGenerator \
+    com.rometools.modules.content.io.ContentModuleGenerator \
+    com.rometools.modules.itunes.io.ITunesGenerator \
+    com.rometools.modules.opensearch.impl.OpenSearchModuleGenerator \
+    com.rometools.modules.georss.SimpleGenerator \
+    com.rometools.modules.georss.W3CGeoGenerator \
+    com.rometools.modules.photocast.io.Generator \
+    com.rometools.modules.mediarss.io.MediaModuleGenerator \
+    com.rometools.modules.sle.io.ModuleGenerator \
+    com.rometools.modules.yahooweather.io.WeatherModuleGenerator
 
-rss_1.0.feed.ModuleGenerator.classes=org.rometools.feed.module.content.io.ContentModuleGenerator
+rss_1.0.feed.ModuleGenerator.classes=com.rometools.modules.content.io.ContentModuleGenerator
 
-atom_0.3.feed.ModuleGenerator.classes=org.rometools.feed.module.cc.io.CCModuleGenerator \
-    org.rometools.feed.module.opensearch.impl.OpenSearchModuleGenerator \
-    org.rometools.feed.module.georss.SimpleGenerator \
-    org.rometools.feed.module.georss.W3CGeoGenerator \
-    org.rometools.feed.module.photocast.io.Generator \
-    org.rometools.feed.module.mediarss.io.MediaModuleGenerator
+atom_0.3.feed.ModuleGenerator.classes=com.rometools.modules.cc.io.CCModuleGenerator \
+    com.rometools.modules.opensearch.impl.OpenSearchModuleGenerator \
+    com.rometools.modules.georss.SimpleGenerator \
+    com.rometools.modules.georss.W3CGeoGenerator \
+    com.rometools.modules.photocast.io.Generator \
+    com.rometools.modules.mediarss.io.MediaModuleGenerator
 
-atom_1.0.feed.ModuleGenerator.classes=org.rometools.feed.module.cc.io.CCModuleGenerator \
-    org.rometools.feed.module.opensearch.impl.OpenSearchModuleGenerator \
-    org.rometools.feed.module.georss.SimpleGenerator \
-    org.rometools.feed.module.georss.W3CGeoGenerator \
-    org.rometools.feed.module.photocast.io.Generator \
-    org.rometools.feed.module.mediarss.io.MediaModuleGenerator
+atom_1.0.feed.ModuleGenerator.classes=com.rometools.modules.cc.io.CCModuleGenerator \
+    com.rometools.modules.opensearch.impl.OpenSearchModuleGenerator \
+    com.rometools.modules.georss.SimpleGenerator \
+    com.rometools.modules.georss.W3CGeoGenerator \
+    com.rometools.modules.photocast.io.Generator \
+    com.rometools.modules.mediarss.io.MediaModuleGenerator
 
-rss_2.0.item.ModuleGenerator.classes=org.rometools.feed.module.cc.io.CCModuleGenerator \
-    org.rometools.feed.module.base.io.GoogleBaseGenerator \
-    org.rometools.feed.module.base.io.CustomTagGenerator \
-    org.rometools.feed.module.content.io.ContentModuleGenerator \
-    org.rometools.feed.module.slash.io.SlashModuleGenerator \
-    org.rometools.feed.module.itunes.io.ITunesGenerator \
-    org.rometools.feed.module.opensearch.impl.OpenSearchModuleGenerator \
-    org.rometools.feed.module.georss.SimpleGenerator \
-    org.rometools.feed.module.georss.W3CGeoGenerator \
-    org.rometools.feed.module.photocast.io.Generator \
-    org.rometools.feed.module.mediarss.io.MediaModuleGenerator \
-    org.rometools.feed.module.yahooweather.io.WeatherModuleGenerator
+rss_2.0.item.ModuleGenerator.classes=com.rometools.modules.cc.io.CCModuleGenerator \
+    com.rometools.modules.base.io.GoogleBaseGenerator \
+    com.rometools.modules.base.io.CustomTagGenerator \
+    com.rometools.modules.content.io.ContentModuleGenerator \
+    com.rometools.modules.slash.io.SlashModuleGenerator \
+    com.rometools.modules.itunes.io.ITunesGenerator \
+    com.rometools.modules.opensearch.impl.OpenSearchModuleGenerator \
+    com.rometools.modules.georss.SimpleGenerator \
+    com.rometools.modules.georss.W3CGeoGenerator \
+    com.rometools.modules.photocast.io.Generator \
+    com.rometools.modules.mediarss.io.MediaModuleGenerator \
+    com.rometools.modules.yahooweather.io.WeatherModuleGenerator
 
-rss_1.0.item.ModuleGenerator.classes=org.rometools.feed.module.base.io.GoogleBaseGenerator \
-    org.rometools.feed.module.content.io.ContentModuleGenerator \
-    org.rometools.feed.module.slash.io.SlashModuleGenerator
+rss_1.0.item.ModuleGenerator.classes=com.rometools.modules.base.io.GoogleBaseGenerator \
+    com.rometools.modules.content.io.ContentModuleGenerator \
+    com.rometools.modules.slash.io.SlashModuleGenerator
 
-atom_0.3.item.ModuleGenerator.classes=org.rometools.feed.module.cc.io.CCModuleGenerator \
-    org.rometools.feed.module.base.io.GoogleBaseGenerator \
-    org.rometools.feed.module.base.io.CustomTagGenerator \
-    org.rometools.feed.module.slash.io.SlashModuleGenerator \
-    org.rometools.feed.module.opensearch.impl.OpenSearchModuleGenerator \
-    org.rometools.feed.module.georss.SimpleGenerator \
-    org.rometools.feed.module.georss.W3CGeoGenerator \
-    org.rometools.feed.module.photocast.io.Generator \
-    org.rometools.feed.module.mediarss.io.MediaModuleGenerator
+atom_0.3.item.ModuleGenerator.classes=com.rometools.modules.cc.io.CCModuleGenerator \
+    com.rometools.modules.base.io.GoogleBaseGenerator \
+    com.rometools.modules.base.io.CustomTagGenerator \
+    com.rometools.modules.slash.io.SlashModuleGenerator \
+    com.rometools.modules.opensearch.impl.OpenSearchModuleGenerator \
+    com.rometools.modules.georss.SimpleGenerator \
+    com.rometools.modules.georss.W3CGeoGenerator \
+    com.rometools.modules.photocast.io.Generator \
+    com.rometools.modules.mediarss.io.MediaModuleGenerator
 
-atom_1.0.item.ModuleGenerator.classes=org.rometools.feed.module.cc.io.CCModuleGenerator \
-    org.rometools.feed.module.base.io.CustomTagGenerator \
-    org.rometools.feed.module.slash.io.SlashModuleGenerator \
-    org.rometools.feed.module.opensearch.impl.OpenSearchModuleGenerator \
-    org.rometools.feed.module.georss.SimpleGenerator \
-    org.rometools.feed.module.georss.W3CGeoGenerator \
-    org.rometools.feed.module.photocast.io.Generator \
-    org.rometools.feed.module.mediarss.io.MediaModuleGenerator
+atom_1.0.item.ModuleGenerator.classes=com.rometools.modules.cc.io.CCModuleGenerator \
+    com.rometools.modules.base.io.CustomTagGenerator \
+    com.rometools.modules.slash.io.SlashModuleGenerator \
+    com.rometools.modules.opensearch.impl.OpenSearchModuleGenerator \
+    com.rometools.modules.georss.SimpleGenerator \
+    com.rometools.modules.georss.W3CGeoGenerator \
+    com.rometools.modules.photocast.io.Generator \
+    com.rometools.modules.mediarss.io.MediaModuleGenerator
 
-rss_2.0wNS.feed.ModuleParser.classes=org.rometools.feed.module.mediarss.io.MediaModuleParser
-rss_2.0wNS.item.ModuleParser.classes=org.rometools.feed.module.mediarss.io.MediaModuleParser
-rss_2.0yahoo.feed.ModuleParser.classes=org.rometools.feed.module.mediarss.io.MediaModuleParser
-rss_2.0yahoo.item.ModuleParser.classes=org.rometools.feed.module.mediarss.io.MediaModuleParser
+rss_2.0wNS.feed.ModuleParser.classes=com.rometools.modules.mediarss.io.MediaModuleParser
+rss_2.0wNS.item.ModuleParser.classes=com.rometools.modules.mediarss.io.MediaModuleParser
+rss_2.0yahoo.feed.ModuleParser.classes=com.rometools.modules.mediarss.io.MediaModuleParser
+rss_2.0yahoo.item.ModuleParser.classes=com.rometools.modules.mediarss.io.MediaModuleParser
 
-rss_2.0wNS.feed.ModuleGenerator.classes=org.rometools.feed.module.mediarss.io.MediaModuleGenerator
-rss_2.0wNS.item.ModuleGenerator.classes=org.rometools.feed.module.mediarss.io.MediaModuleGenerator
-rss_2.0yahoo.feed.ModuleGenerator.classes=org.rometools.feed.module.mediarss.io.MediaModuleGenerator
-rss_2.0yahoo.item.ModuleGenerator.classes=org.rometools.feed.module.mediarss.io.MediaModuleGenerator
+rss_2.0wNS.feed.ModuleGenerator.classes=com.rometools.modules.mediarss.io.MediaModuleGenerator
+rss_2.0wNS.item.ModuleGenerator.classes=com.rometools.modules.mediarss.io.MediaModuleGenerator
+rss_2.0yahoo.feed.ModuleGenerator.classes=com.rometools.modules.mediarss.io.MediaModuleGenerator
+rss_2.0yahoo.item.ModuleGenerator.classes=com.rometools.modules.mediarss.io.MediaModuleGenerator
 
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index f2e0f65..f0c8eaf 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -86,16 +86,16 @@ The ROME Modules Subproject.
 
  This is intended to serve as a guide for contributions as well as a hint for users working with the modules.
 
- * Modules are packaged in com.sun.syndication.feed.module.\[Module Name\].
+ * Modules are packaged in com.rometools.rome.feed.module.\[Module Name\].
  
- * Modules contain a com.sun.syndication.feed.module.\[Module Name\].Module.URI reference for retrieval from ROME Synd\* classes.
+ * Modules contain a com.rometools.rome.feed.module.\[Module Name\].Module.URI reference for retrieval from ROME Synd\* classes.
  
- * Modules contain a com.sun.syndication.feed.module.\[Module Name\].ModuleImpl that is a concrete implementation.
+ * Modules contain a com.rometools.rome.feed.module.\[Module Name\].ModuleImpl that is a concrete implementation.
  
- * Modules contain a com.sun.syndication.feed.module.\[Module Name\].types package that holds any other datatypes needed for the module.
+ * Modules contain a com.rometools.rome.feed.module.\[Module Name\].types package that holds any other datatypes needed for the module.
   Many of these are simple immutable types to simplify clone() and copyFrom()
  
- * Modules contain a com.sun.syndication.feed.module.\[Module Name\].io package with parsers and generators.
+ * Modules contain a com.rometools.rome.feed.module.\[Module Name\].io package with parsers and generators.
  
  []
     
\ No newline at end of file
diff --git a/src/test/java/org/rometools/feed/module/AbstractTestCase.java b/src/test/java/com/rometools/modules/AbstractTestCase.java
similarity index 96%
rename from src/test/java/org/rometools/feed/module/AbstractTestCase.java
rename to src/test/java/com/rometools/modules/AbstractTestCase.java
index 074a386..9c70de1 100644
--- a/src/test/java/org/rometools/feed/module/AbstractTestCase.java
+++ b/src/test/java/com/rometools/modules/AbstractTestCase.java
@@ -1,4 +1,4 @@
-package org.rometools.feed.module;
+package com.rometools.modules;
 
 import java.beans.IntrospectionException;
 import java.beans.Introspector;
diff --git a/src/test/java/org/rometools/feed/module/ITunesGeneratorTest.java b/src/test/java/com/rometools/modules/ITunesGeneratorTest.java
similarity index 88%
rename from src/test/java/org/rometools/feed/module/ITunesGeneratorTest.java
rename to src/test/java/com/rometools/modules/ITunesGeneratorTest.java
index dca9dfd..61d01e9 100644
--- a/src/test/java/org/rometools/feed/module/ITunesGeneratorTest.java
+++ b/src/test/java/com/rometools/modules/ITunesGeneratorTest.java
@@ -4,7 +4,7 @@
  *
  * Created on August 2, 2005, 2:31 PM
  */
-package org.rometools.feed.module;
+package com.rometools.modules;
 
 import java.io.File;
 import java.util.List;
@@ -12,15 +12,15 @@ import java.util.List;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.rometools.feed.module.itunes.AbstractITunesObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.SyndFeedInput;
-import com.sun.syndication.io.SyndFeedOutput;
-import com.sun.syndication.io.XmlReader;
+import com.rometools.modules.itunes.AbstractITunesObject;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.io.SyndFeedInput;
+import com.rometools.rome.io.SyndFeedOutput;
+import com.rometools.rome.io.XmlReader;
 
 /**
  *
diff --git a/src/test/java/org/rometools/feed/module/activitystreams/types/VerbTest.java b/src/test/java/com/rometools/modules/activitystreams/types/VerbTest.java
similarity index 93%
rename from src/test/java/org/rometools/feed/module/activitystreams/types/VerbTest.java
rename to src/test/java/com/rometools/modules/activitystreams/types/VerbTest.java
index 9664b03..7736d1c 100644
--- a/src/test/java/org/rometools/feed/module/activitystreams/types/VerbTest.java
+++ b/src/test/java/com/rometools/modules/activitystreams/types/VerbTest.java
@@ -15,13 +15,15 @@
  *  under the License.
  */
 
-package org.rometools.feed.module.activitystreams.types;
+package com.rometools.modules.activitystreams.types;
 
 import junit.framework.TestCase;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.rometools.modules.activitystreams.types.Verb;
+
 /**
  *
  * @author robert.cooper
diff --git a/src/test/java/org/rometools/feed/module/base/io/CustomTagGeneratorTest.java b/src/test/java/com/rometools/modules/base/io/CustomTagGeneratorTest.java
similarity index 84%
rename from src/test/java/org/rometools/feed/module/base/io/CustomTagGeneratorTest.java
rename to src/test/java/com/rometools/modules/base/io/CustomTagGeneratorTest.java
index c7ad933..8aa7db7 100644
--- a/src/test/java/org/rometools/feed/module/base/io/CustomTagGeneratorTest.java
+++ b/src/test/java/com/rometools/modules/base/io/CustomTagGeneratorTest.java
@@ -5,7 +5,7 @@
  * Created on February 6, 2006, 1:58 AM
  */
 
-package org.rometools.feed.module.base.io;
+package com.rometools.modules.base.io;
 
 import java.io.File;
 import java.util.Iterator;
@@ -15,16 +15,16 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.junit.Assert;
-import org.rometools.feed.module.AbstractTestCase;
-import org.rometools.feed.module.base.CustomTag;
-import org.rometools.feed.module.base.CustomTags;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.SyndFeedInput;
-import com.sun.syndication.io.SyndFeedOutput;
+import com.rometools.modules.AbstractTestCase;
+import com.rometools.modules.base.CustomTag;
+import com.rometools.modules.base.CustomTags;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.io.SyndFeedInput;
+import com.rometools.rome.io.SyndFeedOutput;
 
 /**
  *
diff --git a/src/test/java/org/rometools/feed/module/base/io/CustomTagParserTest.java b/src/test/java/com/rometools/modules/base/io/CustomTagParserTest.java
similarity index 85%
rename from src/test/java/org/rometools/feed/module/base/io/CustomTagParserTest.java
rename to src/test/java/com/rometools/modules/base/io/CustomTagParserTest.java
index f5ccc6f..7bb7f05 100644
--- a/src/test/java/org/rometools/feed/module/base/io/CustomTagParserTest.java
+++ b/src/test/java/com/rometools/modules/base/io/CustomTagParserTest.java
@@ -5,7 +5,7 @@
  * Created on February 6, 2006, 1:29 AM
  */
 
-package org.rometools.feed.module.base.io;
+package com.rometools.modules.base.io;
 
 import java.io.File;
 import java.net.URL;
@@ -18,19 +18,19 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.junit.Assert;
-import org.rometools.feed.module.AbstractTestCase;
-import org.rometools.feed.module.base.CustomTag;
-import org.rometools.feed.module.base.CustomTagImpl;
-import org.rometools.feed.module.base.CustomTags;
-import org.rometools.feed.module.base.types.DateTimeRange;
-import org.rometools.feed.module.base.types.FloatUnit;
-import org.rometools.feed.module.base.types.IntUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.SyndFeedInput;
+import com.rometools.modules.AbstractTestCase;
+import com.rometools.modules.base.CustomTag;
+import com.rometools.modules.base.CustomTagImpl;
+import com.rometools.modules.base.CustomTags;
+import com.rometools.modules.base.types.DateTimeRange;
+import com.rometools.modules.base.types.FloatUnit;
+import com.rometools.modules.base.types.IntUnit;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.io.SyndFeedInput;
 
 /**
  *
diff --git a/src/test/java/org/rometools/feed/module/base/io/GoogleBaseGeneratorTest.java b/src/test/java/com/rometools/modules/base/io/GoogleBaseGeneratorTest.java
similarity index 81%
rename from src/test/java/org/rometools/feed/module/base/io/GoogleBaseGeneratorTest.java
rename to src/test/java/com/rometools/modules/base/io/GoogleBaseGeneratorTest.java
index 4748740..bab56bc 100644
--- a/src/test/java/org/rometools/feed/module/base/io/GoogleBaseGeneratorTest.java
+++ b/src/test/java/com/rometools/modules/base/io/GoogleBaseGeneratorTest.java
@@ -4,7 +4,7 @@
  *
  * Created on November 17, 2005, 3:40 PM
  */
-package org.rometools.feed.module.base.io;
+package com.rometools.modules.base.io;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -14,22 +14,22 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.junit.Assert;
-import org.rometools.feed.module.AbstractTestCase;
-import org.rometools.feed.module.base.GoogleBase;
-import org.rometools.feed.module.base.GoogleBaseImpl;
-import org.rometools.feed.module.base.Product;
-import org.rometools.feed.module.base.Vehicle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.sun.syndication.feed.synd.SyndContent;
-import com.sun.syndication.feed.synd.SyndContentImpl;
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndEntryImpl;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.feed.synd.SyndFeedImpl;
-import com.sun.syndication.io.SyndFeedInput;
-import com.sun.syndication.io.SyndFeedOutput;
+import com.rometools.modules.AbstractTestCase;
+import com.rometools.modules.base.GoogleBase;
+import com.rometools.modules.base.GoogleBaseImpl;
+import com.rometools.modules.base.Product;
+import com.rometools.modules.base.Vehicle;
+import com.rometools.rome.feed.synd.SyndContent;
+import com.rometools.rome.feed.synd.SyndContentImpl;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndEntryImpl;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.feed.synd.SyndFeedImpl;
+import com.rometools.rome.io.SyndFeedInput;
+import com.rometools.rome.io.SyndFeedOutput;
 
 /**
  *
diff --git a/src/test/java/org/rometools/feed/module/base/io/GoogleBaseParserTest.java b/src/test/java/com/rometools/modules/base/io/GoogleBaseParserTest.java
similarity index 94%
rename from src/test/java/org/rometools/feed/module/base/io/GoogleBaseParserTest.java
rename to src/test/java/com/rometools/modules/base/io/GoogleBaseParserTest.java
index 45c5c57..eda33c7 100644
--- a/src/test/java/org/rometools/feed/module/base/io/GoogleBaseParserTest.java
+++ b/src/test/java/com/rometools/modules/base/io/GoogleBaseParserTest.java
@@ -4,7 +4,7 @@
  *
  * Created on November 17, 2005, 4:49 PM
  */
-package org.rometools.feed.module.base.io;
+package com.rometools.modules.base.io;
 
 import java.io.File;
 import java.net.URL;
@@ -15,33 +15,34 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.junit.Assert;
-import org.rometools.feed.module.AbstractTestCase;
-import org.rometools.feed.module.base.Article;
-import org.rometools.feed.module.base.Course;
-import org.rometools.feed.module.base.Event;
-import org.rometools.feed.module.base.GoogleBase;
-import org.rometools.feed.module.base.Housing;
-import org.rometools.feed.module.base.Job;
-import org.rometools.feed.module.base.Person;
-import org.rometools.feed.module.base.Product;
-import org.rometools.feed.module.base.Review;
-import org.rometools.feed.module.base.ScholarlyArticle;
-import org.rometools.feed.module.base.Service;
-import org.rometools.feed.module.base.Travel;
-import org.rometools.feed.module.base.Vehicle;
-import org.rometools.feed.module.base.Wanted;
-import org.rometools.feed.module.base.types.CurrencyEnumeration;
-import org.rometools.feed.module.base.types.FloatUnit;
-import org.rometools.feed.module.base.types.GenderEnumeration;
-import org.rometools.feed.module.base.types.PaymentTypeEnumeration;
-import org.rometools.feed.module.base.types.PriceTypeEnumeration;
-import org.rometools.feed.module.base.types.ShippingType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.SyndFeedInput;
+import com.rometools.modules.AbstractTestCase;
+import com.rometools.modules.base.Article;
+import com.rometools.modules.base.Course;
+import com.rometools.modules.base.Event;
+import com.rometools.modules.base.GoogleBase;
+import com.rometools.modules.base.Housing;
+import com.rometools.modules.base.Job;
+import com.rometools.modules.base.Person;
+import com.rometools.modules.base.Product;
+import com.rometools.modules.base.Review;
+import com.rometools.modules.base.ScholarlyArticle;
+import com.rometools.modules.base.Service;
+import com.rometools.modules.base.Travel;
+import com.rometools.modules.base.Vehicle;
+import com.rometools.modules.base.Wanted;
+import com.rometools.modules.base.io.GoogleBaseParser;
+import com.rometools.modules.base.types.CurrencyEnumeration;
+import com.rometools.modules.base.types.FloatUnit;
+import com.rometools.modules.base.types.GenderEnumeration;
+import com.rometools.modules.base.types.PaymentTypeEnumeration;
+import com.rometools.modules.base.types.PriceTypeEnumeration;
+import com.rometools.modules.base.types.ShippingType;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.io.SyndFeedInput;
 
 /**
  *
diff --git a/src/test/java/org/rometools/feed/module/base/types/FloatUnitTest.java b/src/test/java/com/rometools/modules/base/types/FloatUnitTest.java
similarity index 89%
rename from src/test/java/org/rometools/feed/module/base/types/FloatUnitTest.java
rename to src/test/java/com/rometools/modules/base/types/FloatUnitTest.java
index 5b3f8f1..c22945d 100644
--- a/src/test/java/org/rometools/feed/module/base/types/FloatUnitTest.java
+++ b/src/test/java/com/rometools/modules/base/types/FloatUnitTest.java
@@ -5,7 +5,7 @@
  * Created on November 18, 2005, 5:16 PM
  */
 
-package org.rometools.feed.module.base.types;
+package com.rometools.modules.base.types;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
@@ -14,6 +14,8 @@ import junit.framework.TestSuite;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.rometools.modules.base.types.FloatUnit;
+
 /**
  *
  * @author rcooper
diff --git a/src/test/java/org/rometools/feed/module/base/types/IntUnitTest.java b/src/test/java/com/rometools/modules/base/types/IntUnitTest.java
similarity index 85%
rename from src/test/java/org/rometools/feed/module/base/types/IntUnitTest.java
rename to src/test/java/com/rometools/modules/base/types/IntUnitTest.java
index 8d3e2c3..e768794 100644
--- a/src/test/java/org/rometools/feed/module/base/types/IntUnitTest.java
+++ b/src/test/java/com/rometools/modules/base/types/IntUnitTest.java
@@ -5,16 +5,18 @@
  * Created on November 18, 2005, 5:16 PM
  */
 
-package org.rometools.feed.module.base.types;
+package com.rometools.modules.base.types;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.rometools.feed.module.cc.io.CCModuleGenerator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.rometools.modules.base.types.IntUnit;
+import com.rometools.modules.cc.io.CCModuleGenerator;
+
 /**
  *
  * @author rcooper
diff --git a/src/test/java/org/rometools/feed/module/cc/io/CCModuleGeneratorTest.java b/src/test/java/com/rometools/modules/cc/io/CCModuleGeneratorTest.java
similarity index 88%
rename from src/test/java/org/rometools/feed/module/cc/io/CCModuleGeneratorTest.java
rename to src/test/java/com/rometools/modules/cc/io/CCModuleGeneratorTest.java
index 55a9238..6bb4b78 100644
--- a/src/test/java/org/rometools/feed/module/cc/io/CCModuleGeneratorTest.java
+++ b/src/test/java/com/rometools/modules/cc/io/CCModuleGeneratorTest.java
@@ -5,22 +5,22 @@
  * Created on November 20, 2005, 9:48 PM
  */
 
-package org.rometools.feed.module.cc.io;
+package com.rometools.modules.cc.io;
 
 import java.io.File;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.rometools.feed.module.AbstractTestCase;
-import org.rometools.feed.module.cc.CreativeCommons;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.SyndFeedInput;
-import com.sun.syndication.io.SyndFeedOutput;
+import com.rometools.modules.AbstractTestCase;
+import com.rometools.modules.cc.CreativeCommons;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.io.SyndFeedInput;
+import com.rometools.rome.io.SyndFeedOutput;
 
 /**
  *
diff --git a/src/test/java/org/rometools/feed/module/cc/io/ModuleParserTest.java b/src/test/java/com/rometools/modules/cc/io/ModuleParserTest.java
similarity index 86%
rename from src/test/java/org/rometools/feed/module/cc/io/ModuleParserTest.java
rename to src/test/java/com/rometools/modules/cc/io/ModuleParserTest.java
index 0d16617..4fcaa59 100644
--- a/src/test/java/org/rometools/feed/module/cc/io/ModuleParserTest.java
+++ b/src/test/java/com/rometools/modules/cc/io/ModuleParserTest.java
@@ -5,7 +5,7 @@
  * Created on November 20, 2005, 7:05 PM
  */
 
-package org.rometools.feed.module.cc.io;
+package com.rometools.modules.cc.io;
 
 import java.io.File;
 import java.util.List;
@@ -13,14 +13,14 @@ import java.util.List;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.rometools.feed.module.AbstractTestCase;
-import org.rometools.feed.module.cc.CreativeCommons;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.SyndFeedInput;
+import com.rometools.modules.AbstractTestCase;
+import com.rometools.modules.cc.CreativeCommons;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.io.SyndFeedInput;
 
 /**
  *
diff --git a/src/test/java/org/rometools/feed/module/cc/types/LicenseTest.java b/src/test/java/com/rometools/modules/cc/types/LicenseTest.java
similarity index 96%
rename from src/test/java/org/rometools/feed/module/cc/types/LicenseTest.java
rename to src/test/java/com/rometools/modules/cc/types/LicenseTest.java
index ad8fdc3..2f0a6aa 100644
--- a/src/test/java/org/rometools/feed/module/cc/types/LicenseTest.java
+++ b/src/test/java/com/rometools/modules/cc/types/LicenseTest.java
@@ -1,4 +1,4 @@
-package org.rometools.feed.module.cc.types;
+package com.rometools.modules.cc.types;
 
 import static org.junit.Assert.assertFalse;
 
@@ -9,6 +9,8 @@ import java.util.concurrent.atomic.AtomicLong;
 import org.junit.Before;
 import org.junit.Test;
 
+import com.rometools.modules.cc.types.License;
+
 /**
  * @author Matthew Buckett
  */
diff --git a/src/test/java/org/rometools/feed/module/content/ContentItemTest.java b/src/test/java/com/rometools/modules/content/ContentItemTest.java
similarity index 98%
rename from src/test/java/org/rometools/feed/module/content/ContentItemTest.java
rename to src/test/java/com/rometools/modules/content/ContentItemTest.java
index 703e389..0df4790 100644
--- a/src/test/java/org/rometools/feed/module/content/ContentItemTest.java
+++ b/src/test/java/com/rometools/modules/content/ContentItemTest.java
@@ -5,13 +5,15 @@
  * Created on February 2, 2005, 2:50 PM
  */
 
-package org.rometools.feed.module.content;
+package com.rometools.modules.content;
 
 import junit.framework.TestCase;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.rometools.modules.content.ContentItem;
+
 /**
  * This is all standard property storage testing.
  *
diff --git a/src/test/java/org/rometools/feed/module/content/ContentModuleGeneratorTest.java b/src/test/java/com/rometools/modules/content/ContentModuleGeneratorTest.java
similarity index 81%
rename from src/test/java/org/rometools/feed/module/content/ContentModuleGeneratorTest.java
rename to src/test/java/com/rometools/modules/content/ContentModuleGeneratorTest.java
index 0de2520..3e5a7fd 100644
--- a/src/test/java/org/rometools/feed/module/content/ContentModuleGeneratorTest.java
+++ b/src/test/java/com/rometools/modules/content/ContentModuleGeneratorTest.java
@@ -4,20 +4,21 @@
  *
  * Created on February 2, 2005, 4:15 PM
  */
-package org.rometools.feed.module.content;
+package com.rometools.modules.content;
 
 import java.io.File;
 import java.io.StringWriter;
 
-import org.rometools.feed.module.AbstractTestCase;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.SyndFeedInput;
-import com.sun.syndication.io.SyndFeedOutput;
-import com.sun.syndication.io.XmlReader;
+import com.rometools.modules.AbstractTestCase;
+import com.rometools.modules.content.ContentModule;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.io.SyndFeedInput;
+import com.rometools.rome.io.SyndFeedOutput;
+import com.rometools.rome.io.XmlReader;
 
 /**
  *
diff --git a/src/test/java/org/rometools/feed/module/content/ContentModuleImplTest.java b/src/test/java/com/rometools/modules/content/ContentModuleImplTest.java
similarity index 95%
rename from src/test/java/org/rometools/feed/module/content/ContentModuleImplTest.java
rename to src/test/java/com/rometools/modules/content/ContentModuleImplTest.java
index 095aeb0..1679dc5 100644
--- a/src/test/java/org/rometools/feed/module/content/ContentModuleImplTest.java
+++ b/src/test/java/com/rometools/modules/content/ContentModuleImplTest.java
@@ -5,7 +5,7 @@
  * Created on February 2, 2005, 2:58 PM
  */
 
-package org.rometools.feed.module.content;
+package com.rometools.modules.content;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -15,6 +15,10 @@ import junit.framework.TestCase;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.rometools.modules.content.ContentItem;
+import com.rometools.modules.content.ContentModule;
+import com.rometools.modules.content.ContentModuleImpl;
+
 /**
  *
  * @author Robert Cooper
diff --git a/src/test/java/org/rometools/feed/module/content/ContentModuleParserTest.java b/src/test/java/com/rometools/modules/content/ContentModuleParserTest.java
similarity index 76%
rename from src/test/java/org/rometools/feed/module/content/ContentModuleParserTest.java
rename to src/test/java/com/rometools/modules/content/ContentModuleParserTest.java
index 637c33c..fb3bc57 100644
--- a/src/test/java/org/rometools/feed/module/content/ContentModuleParserTest.java
+++ b/src/test/java/com/rometools/modules/content/ContentModuleParserTest.java
@@ -4,17 +4,18 @@
  *
  * Created on February 2, 2005, 3:35 PM
  */
-package org.rometools.feed.module.content;
+package com.rometools.modules.content;
 
 import java.io.File;
 import java.util.List;
 
-import org.rometools.feed.module.AbstractTestCase;
-
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.SyndFeedInput;
-import com.sun.syndication.io.XmlReader;
+import com.rometools.modules.AbstractTestCase;
+import com.rometools.modules.content.ContentItem;
+import com.rometools.modules.content.ContentModule;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.io.SyndFeedInput;
+import com.rometools.rome.io.XmlReader;
 
 /**
  *
@@ -40,7 +41,7 @@ public class ContentModuleParserTest extends AbstractTestCase {
     }
 
     /**
-     * Test of parse method, of class com.sun.syndication.feed.module.content.ContentModuleParser.
+     * Test of parse method, of class com.rometools.rome.feed.module.content.ContentModuleParser.
      * It will test through the whole ROME framework.
      */
     public void testParse() throws Exception {
diff --git a/src/test/java/org/rometools/feed/module/georss/GeoRSSModuleTest.java b/src/test/java/com/rometools/modules/georss/GeoRSSModuleTest.java
similarity index 91%
rename from src/test/java/org/rometools/feed/module/georss/GeoRSSModuleTest.java
rename to src/test/java/com/rometools/modules/georss/GeoRSSModuleTest.java
index 67bb14f..3da4517 100644
--- a/src/test/java/org/rometools/feed/module/georss/GeoRSSModuleTest.java
+++ b/src/test/java/com/rometools/modules/georss/GeoRSSModuleTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package org.rometools.feed.module.georss;
+package com.rometools.modules.georss;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -26,21 +26,24 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import org.rometools.feed.module.AbstractTestCase;
-import org.rometools.feed.module.georss.geometries.LineString;
-import org.rometools.feed.module.georss.geometries.Position;
-import org.rometools.feed.module.georss.geometries.PositionList;
-
-import com.sun.syndication.feed.synd.SyndContent;
-import com.sun.syndication.feed.synd.SyndContentImpl;
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndEntryImpl;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.feed.synd.SyndFeedImpl;
-import com.sun.syndication.io.FeedException;
-import com.sun.syndication.io.SyndFeedInput;
-import com.sun.syndication.io.SyndFeedOutput;
-import com.sun.syndication.io.XmlReader;
+import com.rometools.modules.AbstractTestCase;
+import com.rometools.modules.georss.GMLModuleImpl;
+import com.rometools.modules.georss.GeoRSSModule;
+import com.rometools.modules.georss.GeoRSSUtils;
+import com.rometools.modules.georss.SimpleModuleImpl;
+import com.rometools.modules.georss.geometries.LineString;
+import com.rometools.modules.georss.geometries.Position;
+import com.rometools.modules.georss.geometries.PositionList;
+import com.rometools.rome.feed.synd.SyndContent;
+import com.rometools.rome.feed.synd.SyndContentImpl;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndEntryImpl;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.feed.synd.SyndFeedImpl;
+import com.rometools.rome.io.FeedException;
+import com.rometools.rome.io.SyndFeedInput;
+import com.rometools.rome.io.SyndFeedOutput;
+import com.rometools.rome.io.XmlReader;
 
 /**
  * tests for geo-rss module.
diff --git a/src/test/java/org/rometools/feed/module/itunes/ITunesGeneratorTest.java b/src/test/java/com/rometools/modules/itunes/ITunesGeneratorTest.java
similarity index 85%
rename from src/test/java/org/rometools/feed/module/itunes/ITunesGeneratorTest.java
rename to src/test/java/com/rometools/modules/itunes/ITunesGeneratorTest.java
index eb467a3..d57859c 100644
--- a/src/test/java/org/rometools/feed/module/itunes/ITunesGeneratorTest.java
+++ b/src/test/java/com/rometools/modules/itunes/ITunesGeneratorTest.java
@@ -4,7 +4,7 @@
  *
  * Created on August 2, 2005, 2:31 PM
  */
-package org.rometools.feed.module.itunes;
+package com.rometools.modules.itunes;
 
 import java.io.File;
 import java.io.StringWriter;
@@ -13,17 +13,20 @@ import java.util.List;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.rometools.feed.module.AbstractTestCase;
-import org.rometools.feed.module.itunes.types.Category;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.feed.synd.SyndFeedImpl;
-import com.sun.syndication.io.SyndFeedInput;
-import com.sun.syndication.io.SyndFeedOutput;
-import com.sun.syndication.io.XmlReader;
+import com.rometools.modules.AbstractTestCase;
+import com.rometools.modules.itunes.AbstractITunesObject;
+import com.rometools.modules.itunes.FeedInformation;
+import com.rometools.modules.itunes.FeedInformationImpl;
+import com.rometools.modules.itunes.types.Category;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.feed.synd.SyndFeedImpl;
+import com.rometools.rome.io.SyndFeedInput;
+import com.rometools.rome.io.SyndFeedOutput;
+import com.rometools.rome.io.XmlReader;
 
 /**
  *
diff --git a/src/test/java/org/rometools/feed/module/itunes/ITunesParserTest.java b/src/test/java/com/rometools/modules/itunes/ITunesParserTest.java
similarity index 85%
rename from src/test/java/org/rometools/feed/module/itunes/ITunesParserTest.java
rename to src/test/java/com/rometools/modules/itunes/ITunesParserTest.java
index 7597649..57945c7 100644
--- a/src/test/java/org/rometools/feed/module/itunes/ITunesParserTest.java
+++ b/src/test/java/com/rometools/modules/itunes/ITunesParserTest.java
@@ -4,7 +4,7 @@
  *
  * Created on August 2, 2005, 1:30 PM
  */
-package org.rometools.feed.module.itunes;
+package com.rometools.modules.itunes;
 
 import java.io.File;
 import java.util.Iterator;
@@ -13,16 +13,19 @@ import java.util.List;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.rometools.feed.module.AbstractTestCase;
-import org.rometools.feed.module.itunes.io.ITunesGenerator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.sun.syndication.feed.module.Module;
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.SyndFeedInput;
-import com.sun.syndication.io.XmlReader;
+import com.rometools.modules.AbstractTestCase;
+import com.rometools.modules.itunes.AbstractITunesObject;
+import com.rometools.modules.itunes.EntryInformationImpl;
+import com.rometools.modules.itunes.FeedInformationImpl;
+import com.rometools.modules.itunes.io.ITunesGenerator;
+import com.rometools.rome.feed.module.Module;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.io.SyndFeedInput;
+import com.rometools.rome.io.XmlReader;
 
 /**
  *
diff --git a/src/test/java/org/rometools/feed/module/itunes/types/DurationTest.java b/src/test/java/com/rometools/modules/itunes/types/DurationTest.java
similarity index 96%
rename from src/test/java/org/rometools/feed/module/itunes/types/DurationTest.java
rename to src/test/java/com/rometools/modules/itunes/types/DurationTest.java
index 0c274b0..cb91cd9 100644
--- a/src/test/java/org/rometools/feed/module/itunes/types/DurationTest.java
+++ b/src/test/java/com/rometools/modules/itunes/types/DurationTest.java
@@ -19,7 +19,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
-package org.rometools.feed.module.itunes.types;
+package com.rometools.modules.itunes.types;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
@@ -28,6 +28,8 @@ import junit.framework.TestSuite;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.rometools.modules.itunes.types.Duration;
+
 /**
  *
  * @author cooper
diff --git a/src/test/java/org/rometools/feed/module/mediarss/GoogleTest.java b/src/test/java/com/rometools/modules/mediarss/GoogleTest.java
similarity index 75%
rename from src/test/java/org/rometools/feed/module/mediarss/GoogleTest.java
rename to src/test/java/com/rometools/modules/mediarss/GoogleTest.java
index c2d49c0..59f7699 100644
--- a/src/test/java/org/rometools/feed/module/mediarss/GoogleTest.java
+++ b/src/test/java/com/rometools/modules/mediarss/GoogleTest.java
@@ -5,7 +5,7 @@
  * Created on March 29, 2006, 11:49 PM
  */
 
-package org.rometools.feed.module.mediarss;
+package com.rometools.modules.mediarss;
 
 import java.io.InputStreamReader;
 import java.net.URL;
@@ -13,11 +13,12 @@ import java.net.URL;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.rometools.feed.module.AbstractTestCase;
-
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.SyndFeedInput;
+import com.rometools.modules.AbstractTestCase;
+import com.rometools.modules.mediarss.MediaEntryModule;
+import com.rometools.modules.mediarss.MediaModule;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.io.SyndFeedInput;
 
 /**
  *
diff --git a/src/test/java/org/rometools/feed/module/mediarss/MediaModuleTest.java b/src/test/java/com/rometools/modules/mediarss/MediaModuleTest.java
similarity index 91%
rename from src/test/java/org/rometools/feed/module/mediarss/MediaModuleTest.java
rename to src/test/java/com/rometools/modules/mediarss/MediaModuleTest.java
index a09dc47..f53a68f 100644
--- a/src/test/java/org/rometools/feed/module/mediarss/MediaModuleTest.java
+++ b/src/test/java/com/rometools/modules/mediarss/MediaModuleTest.java
@@ -5,7 +5,7 @@
  * Created on March 29, 2006, 11:49 PM
  */
 
-package org.rometools.feed.module.mediarss;
+package com.rometools.modules.mediarss;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
@@ -20,16 +20,17 @@ import java.util.List;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.rometools.feed.module.AbstractTestCase;
-import org.rometools.feed.module.mediarss.types.MediaContent;
-import org.rometools.feed.module.mediarss.types.Rating;
-import org.rometools.feed.module.mediarss.types.Thumbnail;
-
-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;
-import com.sun.syndication.io.SyndFeedOutput;
+import com.rometools.modules.AbstractTestCase;
+import com.rometools.modules.mediarss.MediaEntryModule;
+import com.rometools.modules.mediarss.MediaModule;
+import com.rometools.modules.mediarss.types.MediaContent;
+import com.rometools.modules.mediarss.types.Rating;
+import com.rometools.modules.mediarss.types.Thumbnail;
+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 com.rometools.rome.io.SyndFeedOutput;
 
 /**
  *
diff --git a/src/test/java/org/rometools/feed/module/mediarss/types/TimeTest.java b/src/test/java/com/rometools/modules/mediarss/types/TimeTest.java
similarity index 83%
rename from src/test/java/org/rometools/feed/module/mediarss/types/TimeTest.java
rename to src/test/java/com/rometools/modules/mediarss/types/TimeTest.java
index d042bce..63c1c1d 100644
--- a/src/test/java/org/rometools/feed/module/mediarss/types/TimeTest.java
+++ b/src/test/java/com/rometools/modules/mediarss/types/TimeTest.java
@@ -5,7 +5,7 @@
  * Created on April 18, 2006, 10:01 PM
  */
 
-package org.rometools.feed.module.mediarss.types;
+package com.rometools.modules.mediarss.types;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
@@ -15,6 +15,8 @@ import org.junit.Assert;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.rometools.modules.mediarss.types.Time;
+
 /**
  *
  * @author cooper
@@ -34,7 +36,7 @@ public class TimeTest extends TestCase {
     }
 
     /**
-     * Test of toString method, of class com.sun.syndication.feed.module.mediarss.types.Time.
+     * Test of toString method, of class com.rometools.rome.feed.module.mediarss.types.Time.
      */
     public void testToString() {
         final Time t = new Time("12:05:35.3");
diff --git a/src/test/java/org/rometools/feed/module/opensearch/OpenSearchModuleTest.java b/src/test/java/com/rometools/modules/opensearch/OpenSearchModuleTest.java
similarity index 80%
rename from src/test/java/org/rometools/feed/module/opensearch/OpenSearchModuleTest.java
rename to src/test/java/com/rometools/modules/opensearch/OpenSearchModuleTest.java
index bca6753..78b74aa 100644
--- a/src/test/java/org/rometools/feed/module/opensearch/OpenSearchModuleTest.java
+++ b/src/test/java/com/rometools/modules/opensearch/OpenSearchModuleTest.java
@@ -5,19 +5,19 @@
  * Created on April 25, 2006, 8:56 PM
  */
 
-package org.rometools.feed.module.opensearch;
+package com.rometools.modules.opensearch;
 
 import java.io.File;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.rometools.feed.module.AbstractTestCase;
-
-import com.sun.syndication.feed.module.Module;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.SyndFeedInput;
-import com.sun.syndication.io.SyndFeedOutput;
+import com.rometools.modules.AbstractTestCase;
+import com.rometools.modules.opensearch.OpenSearchModule;
+import com.rometools.rome.feed.module.Module;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.io.SyndFeedInput;
+import com.rometools.rome.io.SyndFeedOutput;
 
 /**
  *
diff --git a/src/test/java/org/rometools/feed/module/photocast/io/GeneratorTest.java b/src/test/java/com/rometools/modules/photocast/io/GeneratorTest.java
similarity index 75%
rename from src/test/java/org/rometools/feed/module/photocast/io/GeneratorTest.java
rename to src/test/java/com/rometools/modules/photocast/io/GeneratorTest.java
index fe12e05..c34e95a 100644
--- a/src/test/java/org/rometools/feed/module/photocast/io/GeneratorTest.java
+++ b/src/test/java/com/rometools/modules/photocast/io/GeneratorTest.java
@@ -5,7 +5,7 @@
  * Created on April 16, 2006, 5:58 PM
  */
 
-package org.rometools.feed.module.photocast.io;
+package com.rometools.modules.photocast.io;
 
 import java.io.File;
 import java.util.List;
@@ -13,15 +13,15 @@ import java.util.List;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.rometools.feed.module.AbstractTestCase;
-import org.rometools.feed.module.photocast.PhotocastModule;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.SyndFeedInput;
-import com.sun.syndication.io.SyndFeedOutput;
+import com.rometools.modules.AbstractTestCase;
+import com.rometools.modules.photocast.PhotocastModule;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.io.SyndFeedInput;
+import com.rometools.rome.io.SyndFeedOutput;
 
 /**
  *
@@ -42,7 +42,7 @@ public class GeneratorTest extends AbstractTestCase {
     }
 
     /**
-     * Test of generate method, of class com.sun.syndication.feed.module.photocast.io.Generator.
+     * Test of generate method, of class com.rometools.rome.feed.module.photocast.io.Generator.
      */
     public void testGenerate() throws Exception {
         final SyndFeedInput input = new SyndFeedInput();
@@ -63,7 +63,7 @@ public class GeneratorTest extends AbstractTestCase {
 
     /**
      * Test of getNamespaces method, of class
-     * com.sun.syndication.feed.module.photocast.io.Generator.
+     * com.rometools.rome.feed.module.photocast.io.Generator.
      */
     public void testGetNamespaces() {
         // TODO add your test code.
@@ -71,7 +71,7 @@ public class GeneratorTest extends AbstractTestCase {
 
     /**
      * Test of getNamespaceUri method, of class
-     * com.sun.syndication.feed.module.photocast.io.Generator.
+     * com.rometools.rome.feed.module.photocast.io.Generator.
      */
     public void testGetNamespaceUri() {
         // TODO add your test code.
diff --git a/src/test/java/org/rometools/feed/module/sle/GroupAndSortTest.java b/src/test/java/com/rometools/modules/sle/GroupAndSortTest.java
similarity index 83%
rename from src/test/java/org/rometools/feed/module/sle/GroupAndSortTest.java
rename to src/test/java/com/rometools/modules/sle/GroupAndSortTest.java
index 5c47dd7..aa7795b 100644
--- a/src/test/java/org/rometools/feed/module/sle/GroupAndSortTest.java
+++ b/src/test/java/com/rometools/modules/sle/GroupAndSortTest.java
@@ -1,4 +1,4 @@
-package org.rometools.feed.module.sle;
+package com.rometools.modules.sle;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -7,15 +7,17 @@ import java.util.List;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.rometools.feed.module.AbstractTestCase;
-import org.rometools.feed.module.sle.types.Sort;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.sun.syndication.feed.module.Extendable;
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.SyndFeedInput;
+import com.rometools.modules.AbstractTestCase;
+import com.rometools.modules.sle.SimpleListExtension;
+import com.rometools.modules.sle.SleUtility;
+import com.rometools.modules.sle.types.Sort;
+import com.rometools.rome.feed.module.Extendable;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.io.SyndFeedInput;
 
 /**
  *
@@ -34,7 +36,7 @@ public class GroupAndSortTest extends AbstractTestCase {
     }
 
     /**
-     * Test of sort method, of class com.sun.syndication.feed.module.sle.GroupAndSort.
+     * Test of sort method, of class com.rometools.rome.feed.module.sle.GroupAndSort.
      */
     public void testSort() throws Exception {
 
@@ -81,7 +83,7 @@ public class GroupAndSortTest extends AbstractTestCase {
     }
 
     /**
-     * Test of sort method, of class com.sun.syndication.feed.module.sle.GroupAndSort.
+     * Test of sort method, of class com.rometools.rome.feed.module.sle.GroupAndSort.
      */
     public void testSort2() throws Exception {
 
@@ -99,14 +101,14 @@ public class GroupAndSortTest extends AbstractTestCase {
     }
 
     /**
-     * Test of group method, of class com.sun.syndication.feed.module.sle.GroupAndSort.
+     * Test of group method, of class com.rometools.rome.feed.module.sle.GroupAndSort.
      */
     public void testGroup() {
         // TODO add your test code.
     }
 
     /**
-     * Test of sortAndGroup method, of class com.sun.syndication.feed.module.sle.GroupAndSort.
+     * Test of sortAndGroup method, of class com.rometools.rome.feed.module.sle.GroupAndSort.
      */
     public void testSortAndGroup() throws Exception {
 
diff --git a/src/test/java/org/rometools/feed/module/sle/io/ModuleGeneratorTest.java b/src/test/java/com/rometools/modules/sle/io/ModuleGeneratorTest.java
similarity index 81%
rename from src/test/java/org/rometools/feed/module/sle/io/ModuleGeneratorTest.java
rename to src/test/java/com/rometools/modules/sle/io/ModuleGeneratorTest.java
index 7d94006..01edf27 100644
--- a/src/test/java/org/rometools/feed/module/sle/io/ModuleGeneratorTest.java
+++ b/src/test/java/com/rometools/modules/sle/io/ModuleGeneratorTest.java
@@ -5,7 +5,7 @@
  * Created on April 29, 2006, 9:34 PM
  */
 
-package org.rometools.feed.module.sle.io;
+package com.rometools.modules.sle.io;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
@@ -28,7 +28,7 @@ public class ModuleGeneratorTest extends TestCase {
     }
 
     /**
-     * Test of generate method, of class com.sun.syndication.feed.module.sle.io.ModuleGenerator.
+     * Test of generate method, of class com.rometools.rome.feed.module.sle.io.ModuleGenerator.
      */
     public void testGenerate() {
         // TODO add your test code.
diff --git a/src/test/java/org/rometools/feed/module/sle/io/ModuleParserTest.java b/src/test/java/com/rometools/modules/sle/io/ModuleParserTest.java
similarity index 78%
rename from src/test/java/org/rometools/feed/module/sle/io/ModuleParserTest.java
rename to src/test/java/com/rometools/modules/sle/io/ModuleParserTest.java
index 67d22fb..44aa0d8 100644
--- a/src/test/java/org/rometools/feed/module/sle/io/ModuleParserTest.java
+++ b/src/test/java/com/rometools/modules/sle/io/ModuleParserTest.java
@@ -5,7 +5,7 @@
  * Created on April 29, 2006, 7:00 PM
  */
 
-package org.rometools.feed.module.sle.io;
+package com.rometools.modules.sle.io;
 
 import java.io.File;
 
@@ -13,17 +13,17 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.jdom2.Namespace;
-import org.rometools.feed.module.AbstractTestCase;
-import org.rometools.feed.module.sle.SimpleListExtension;
-import org.rometools.feed.module.sle.SleEntry;
-import org.rometools.feed.module.sle.types.Group;
-import org.rometools.feed.module.sle.types.Sort;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.SyndFeedInput;
+import com.rometools.modules.AbstractTestCase;
+import com.rometools.modules.sle.SimpleListExtension;
+import com.rometools.modules.sle.SleEntry;
+import com.rometools.modules.sle.types.Group;
+import com.rometools.modules.sle.types.Sort;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.io.SyndFeedInput;
 
 /**
  *
@@ -44,7 +44,7 @@ public class ModuleParserTest extends AbstractTestCase {
     }
 
     /**
-     * Test of parse method, of class com.sun.syndication.feed.module.sle.io.ModuleParser.
+     * Test of parse method, of class com.rometools.rome.feed.module.sle.io.ModuleParser.
      */
     public void testParse() throws Exception {
         final SyndFeedInput input = new SyndFeedInput();
diff --git a/src/test/java/org/rometools/feed/module/sse/SSEParserTest.java b/src/test/java/com/rometools/modules/sse/SSEParserTest.java
similarity index 92%
rename from src/test/java/org/rometools/feed/module/sse/SSEParserTest.java
rename to src/test/java/com/rometools/modules/sse/SSEParserTest.java
index 8557ce8..a1a3479 100644
--- a/src/test/java/org/rometools/feed/module/sse/SSEParserTest.java
+++ b/src/test/java/com/rometools/modules/sse/SSEParserTest.java
@@ -4,7 +4,7 @@
  *
  * Created on August 2, 2005, 1:30 PM
  */
-package org.rometools.feed.module.sse;
+package com.rometools.modules.sse;
 
 import java.io.File;
 import java.net.URL;
@@ -22,19 +22,20 @@ import org.jdom2.Content;
 import org.jdom2.Document;
 import org.jdom2.Element;
 import org.jdom2.input.SAXBuilder;
-import org.rometools.feed.module.AbstractTestCase;
-import org.rometools.feed.module.sse.modules.Conflict;
-import org.rometools.feed.module.sse.modules.History;
-import org.rometools.feed.module.sse.modules.SSEModule;
-import org.rometools.feed.module.sse.modules.Sync;
 
-import com.sun.syndication.feed.rss.Item;
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.SyndFeedInput;
-import com.sun.syndication.io.SyndFeedOutput;
-import com.sun.syndication.io.XmlReader;
-import com.sun.syndication.io.impl.DateParser;
+import com.rometools.modules.AbstractTestCase;
+import com.rometools.modules.sse.SSE091Generator;
+import com.rometools.modules.sse.modules.Conflict;
+import com.rometools.modules.sse.modules.History;
+import com.rometools.modules.sse.modules.SSEModule;
+import com.rometools.modules.sse.modules.Sync;
+import com.rometools.rome.feed.rss.Item;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.io.SyndFeedInput;
+import com.rometools.rome.io.SyndFeedOutput;
+import com.rometools.rome.io.XmlReader;
+import com.rometools.rome.io.impl.DateParser;
 
 /**
  * Test to verify correctness of SSE subproject.
@@ -57,7 +58,7 @@ public class SSEParserTest extends AbstractTestCase {
     }
 
     /**
-     * Test of getNamespaceUri method, of class com.sun.syndication.feed.module.sse.SSE091
+     * Test of getNamespaceUri method, of class com.rometools.rome.feed.module.sse.SSE091
      */
     public void testGetNamespaceUri() {
         assertEquals("Namespace", SSEModule.SSE_SCHEMA_URI, new SSE091Generator().getNamespaceUri());
diff --git a/src/test/java/org/rometools/feed/module/yahooweather/io/WeatherGeneratorTest.java b/src/test/java/com/rometools/modules/yahooweather/io/WeatherGeneratorTest.java
similarity index 87%
rename from src/test/java/org/rometools/feed/module/yahooweather/io/WeatherGeneratorTest.java
rename to src/test/java/com/rometools/modules/yahooweather/io/WeatherGeneratorTest.java
index a30a248..dffa34b 100644
--- a/src/test/java/org/rometools/feed/module/yahooweather/io/WeatherGeneratorTest.java
+++ b/src/test/java/com/rometools/modules/yahooweather/io/WeatherGeneratorTest.java
@@ -5,7 +5,7 @@
  * Created on November 19, 2005, 10:13 PM
  */
 
-package org.rometools.feed.module.yahooweather.io;
+package com.rometools.modules.yahooweather.io;
 
 import java.io.File;
 
@@ -13,15 +13,15 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.junit.Assert;
-import org.rometools.feed.module.AbstractTestCase;
-import org.rometools.feed.module.yahooweather.YWeatherModule;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.SyndFeedInput;
-import com.sun.syndication.io.SyndFeedOutput;
+import com.rometools.modules.AbstractTestCase;
+import com.rometools.modules.yahooweather.YWeatherModule;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.io.SyndFeedInput;
+import com.rometools.rome.io.SyndFeedOutput;
 
 /**
  *
diff --git a/src/test/java/org/rometools/feed/module/yahooweather/io/WeatherModuleParserTest.java b/src/test/java/com/rometools/modules/yahooweather/io/WeatherModuleParserTest.java
similarity index 82%
rename from src/test/java/org/rometools/feed/module/yahooweather/io/WeatherModuleParserTest.java
rename to src/test/java/com/rometools/modules/yahooweather/io/WeatherModuleParserTest.java
index c098fb2..40816f0 100644
--- a/src/test/java/org/rometools/feed/module/yahooweather/io/WeatherModuleParserTest.java
+++ b/src/test/java/com/rometools/modules/yahooweather/io/WeatherModuleParserTest.java
@@ -5,7 +5,7 @@
  * Created on November 19, 2005, 9:45 PM
  */
 
-package org.rometools.feed.module.yahooweather.io;
+package com.rometools.modules.yahooweather.io;
 
 import java.io.File;
 import java.util.List;
@@ -13,17 +13,18 @@ import java.util.List;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.rometools.feed.module.AbstractTestCase;
-import org.rometools.feed.module.cc.io.CCModuleGenerator;
-import org.rometools.feed.module.yahooweather.YWeatherEntryModule;
-import org.rometools.feed.module.yahooweather.YWeatherModule;
-import org.rometools.feed.module.yahooweather.YWeatherModuleImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.SyndFeedInput;
+import com.rometools.modules.AbstractTestCase;
+import com.rometools.modules.cc.io.CCModuleGenerator;
+import com.rometools.modules.yahooweather.YWeatherEntryModule;
+import com.rometools.modules.yahooweather.YWeatherModule;
+import com.rometools.modules.yahooweather.YWeatherModuleImpl;
+import com.rometools.modules.yahooweather.io.WeatherModuleParser;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.io.SyndFeedInput;
 
 /**
  *