Renamed and harmonized packages

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;
 
 /**
  *

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;
 
 /**
  *

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;
 
 /**
  *

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;
 
 /**
  * <p>

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;
 
 /**
  * <p>

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;
 
 /**
  * <p>

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;
 
 /**
  * <p>

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;
 
 /**
  * <p>

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;
 
 /**
  * <p>

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;
 
 /**
  * <p>

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;
 
 /**
  * <p>

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;
 
 /**
  * <p>

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;
 
 /**
  * <p>

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;
 
 /**
  *

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;
 
 /**
  * <p>

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;
 
 /**
  * <p>

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;
 
 /**
  * <p>

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;
 
 /**
  * <p>

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;
 
 /**
  * <p>

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;
 
 /**
  *

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;
 
 /**
  * <p>

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;
 
 /**
  * <p>

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;
 
 /**
  * <p>

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;
 
 /**
  * <p>

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;
 
 /**
  * <p>

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;
 
 /**
  *

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;
 
 /**
  * <p>

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;
 
 /**
  *

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;
 

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

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.

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 $

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 $

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 $

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.

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;

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.

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.

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

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

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

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.

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

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;
 

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.

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.

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

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

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.

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.

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 $

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 $

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;
 
 /**
  *

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);

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.

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;
 

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;
 

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.

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.

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;
 
 /**
  *

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;
 

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

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;
 

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;
 

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;
 

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;

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;
 
 /**
  *

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 $

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 $

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 $

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;
 
 /**
  *

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 $

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;
 

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 $

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 $

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 <a href="mailto:cooper@screaming-penguin.com">Robert "kebernet" Cooper</a>
  */
-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;
 

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 <a href="mailto:cooper@screaming-penguin.com">Robert "kebernet" Cooper</a>
  */
-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<Element> encodeds = element.getChildren("encoded", CONTENT_NS);

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.

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.

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.

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.

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<Namespace> 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

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

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.

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) {

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

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.

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<Namespace> 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

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

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.

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<Namespace> 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

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

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.

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)