From 0588cfd66d0b2747c9cc79017be846e0e6cc79d9 Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Fri, 30 May 2014 16:31:08 +0200 Subject: [PATCH] Renamed and harmonized packages --- .../certiorem/HttpStatusCodeException.java | 2 +- .../certiorem/hub/DeltaFeedInfoCache.java | 2 +- .../certiorem/hub/DeltaSyndFeedInfo.java | 6 +++--- .../rometools/certiorem/hub/Hub.java | 16 +++++++-------- .../rometools/certiorem/hub/Notifier.java | 9 ++++----- .../rometools/certiorem/hub/Verifier.java | 4 ++-- .../rometools/certiorem/hub/data/HubDAO.java | 2 +- .../certiorem/hub/data/Subscriber.java | 2 +- .../hub/data/SubscriptionSummary.java | 2 +- .../certiorem/hub/data/jpa/JPADAO.java | 8 ++++---- .../certiorem/hub/data/jpa/JPASubscriber.java | 4 ++-- .../certiorem/hub/data/jpa/package.html | 0 .../rometools/certiorem/hub/data/package.html | 0 .../hub/data/ram/InMemoryHubDAO.java | 8 ++++---- .../certiorem/hub/data/ram/package.html | 0 .../hub/notify/standard/AbstractNotifier.java | 14 ++++++------- .../hub/notify/standard/Notification.java | 6 +++--- .../notify/standard/ThreadPoolNotifier.java | 4 ++-- .../notify/standard/UnthreadedNotifier.java | 4 ++-- .../hub/notify/standard/package.html | 0 .../rometools/certiorem/hub/package.html | 0 .../hub/verify/standard/AbstractVerifier.java | 7 ++++--- .../verify/standard/ThreadPoolVerifier.java | 4 ++-- .../standard/ThreadpoolVerifierAdvanced.java | 2 +- .../verify/standard/UnthreadedVerifier.java | 4 ++-- .../hub/verify/standard/package.html | 0 .../rometools/certiorem/package.html | 0 .../certiorem/pub/NotificationException.java | 2 +- .../rometools/certiorem/pub/Publisher.java | 6 +++--- .../rometools/certiorem/pub/package.html | 0 .../rometools/certiorem/sub/Requester.java | 4 ++-- .../certiorem/sub/Subscriptions.java | 20 +++++++++---------- .../rometools/certiorem/sub/data/SubDAO.java | 2 +- .../certiorem/sub/data/Subscription.java | 2 +- .../sub/data/SubscriptionCallback.java | 2 +- .../rometools/certiorem/sub/data/package.html | 0 .../sub/data/ram/InMemorySubDAO.java | 7 ++++--- .../certiorem/sub/data/ram/package.html | 0 .../rometools/certiorem/sub/package.html | 0 .../sub/request/AbstractRequester.java | 6 +++--- .../certiorem/sub/request/AsyncRequester.java | 5 +++-- .../certiorem/sub/request/SyncRequester.java | 5 +++-- .../certiorem/sub/request/package.html | 0 .../certiorem/web/AbstractHubServlet.java | 6 +++--- .../certiorem/web/AbstractSubServlet.java | 6 +++--- .../rometools/certiorem/web/package.html | 0 .../certiorem/hub/AlwaysVerifier.java | 5 +++-- .../certiorem/hub/ControllerTest.java | 10 ++++++---- .../certiorem/hub/DeltaSyndFeedInfoTest.java | 7 ++++--- .../certiorem/hub/ExceptionVerifier.java | 5 +++-- .../certiorem/hub/NeverVerifier.java | 5 +++-- .../certiorem/hub/data/AbstractDAOTest.java | 5 ++++- .../hub/data/ram/InMemoryDAOTest.java | 7 ++++--- 53 files changed, 120 insertions(+), 107 deletions(-) rename src/main/java/{org => com}/rometools/certiorem/HttpStatusCodeException.java (96%) rename src/main/java/{org => com}/rometools/certiorem/hub/DeltaFeedInfoCache.java (97%) rename src/main/java/{org => com}/rometools/certiorem/hub/DeltaSyndFeedInfo.java (97%) rename src/main/java/{org => com}/rometools/certiorem/hub/Hub.java (96%) rename src/main/java/{org => com}/rometools/certiorem/hub/Notifier.java (88%) rename src/main/java/{org => com}/rometools/certiorem/hub/Verifier.java (96%) rename src/main/java/{org => com}/rometools/certiorem/hub/data/HubDAO.java (96%) rename src/main/java/{org => com}/rometools/certiorem/hub/data/Subscriber.java (99%) rename src/main/java/{org => com}/rometools/certiorem/hub/data/SubscriptionSummary.java (98%) rename src/main/java/{org => com}/rometools/certiorem/hub/data/jpa/JPADAO.java (95%) rename src/main/java/{org => com}/rometools/certiorem/hub/data/jpa/JPASubscriber.java (96%) rename src/main/java/{org => com}/rometools/certiorem/hub/data/jpa/package.html (100%) rename src/main/java/{org => com}/rometools/certiorem/hub/data/package.html (100%) rename src/main/java/{org => com}/rometools/certiorem/hub/data/ram/InMemoryHubDAO.java (95%) rename src/main/java/{org => com}/rometools/certiorem/hub/data/ram/package.html (100%) rename src/main/java/{org => com}/rometools/certiorem/hub/notify/standard/AbstractNotifier.java (93%) rename src/main/java/{org => com}/rometools/certiorem/hub/notify/standard/Notification.java (83%) rename src/main/java/{org => com}/rometools/certiorem/hub/notify/standard/ThreadPoolNotifier.java (97%) rename src/main/java/{org => com}/rometools/certiorem/hub/notify/standard/UnthreadedNotifier.java (91%) rename src/main/java/{org => com}/rometools/certiorem/hub/notify/standard/package.html (100%) rename src/main/java/{org => com}/rometools/certiorem/hub/package.html (100%) rename src/main/java/{org => com}/rometools/certiorem/hub/verify/standard/AbstractVerifier.java (96%) rename src/main/java/{org => com}/rometools/certiorem/hub/verify/standard/ThreadPoolVerifier.java (95%) rename src/main/java/{org => com}/rometools/certiorem/hub/verify/standard/ThreadpoolVerifierAdvanced.java (94%) rename src/main/java/{org => com}/rometools/certiorem/hub/verify/standard/UnthreadedVerifier.java (91%) rename src/main/java/{org => com}/rometools/certiorem/hub/verify/standard/package.html (100%) rename src/main/java/{org => com}/rometools/certiorem/package.html (100%) rename src/main/java/{org => com}/rometools/certiorem/pub/NotificationException.java (96%) rename src/main/java/{org => com}/rometools/certiorem/pub/Publisher.java (98%) rename src/main/java/{org => com}/rometools/certiorem/pub/package.html (100%) rename src/main/java/{org => com}/rometools/certiorem/sub/Requester.java (92%) rename src/main/java/{org => com}/rometools/certiorem/sub/Subscriptions.java (94%) rename src/main/java/{org => com}/rometools/certiorem/sub/data/SubDAO.java (95%) rename src/main/java/{org => com}/rometools/certiorem/sub/data/Subscription.java (98%) rename src/main/java/{org => com}/rometools/certiorem/sub/data/SubscriptionCallback.java (90%) rename src/main/java/{org => com}/rometools/certiorem/sub/data/package.html (100%) rename src/main/java/{org => com}/rometools/certiorem/sub/data/ram/InMemorySubDAO.java (93%) rename src/main/java/{org => com}/rometools/certiorem/sub/data/ram/package.html (100%) rename src/main/java/{org => com}/rometools/certiorem/sub/package.html (100%) rename src/main/java/{org => com}/rometools/certiorem/sub/request/AbstractRequester.java (94%) rename src/main/java/{org => com}/rometools/certiorem/sub/request/AsyncRequester.java (96%) rename src/main/java/{org => com}/rometools/certiorem/sub/request/SyncRequester.java (95%) rename src/main/java/{org => com}/rometools/certiorem/sub/request/package.html (100%) rename src/main/java/{org => com}/rometools/certiorem/web/AbstractHubServlet.java (95%) rename src/main/java/{org => com}/rometools/certiorem/web/AbstractSubServlet.java (94%) rename src/main/java/{org => com}/rometools/certiorem/web/package.html (100%) rename src/test/java/{org => com}/rometools/certiorem/hub/AlwaysVerifier.java (90%) rename src/test/java/{org => com}/rometools/certiorem/hub/ControllerTest.java (93%) rename src/test/java/{org => com}/rometools/certiorem/hub/DeltaSyndFeedInfoTest.java (89%) rename src/test/java/{org => com}/rometools/certiorem/hub/ExceptionVerifier.java (91%) rename src/test/java/{org => com}/rometools/certiorem/hub/NeverVerifier.java (90%) rename src/test/java/{org => com}/rometools/certiorem/hub/data/AbstractDAOTest.java (95%) rename src/test/java/{org => com}/rometools/certiorem/hub/data/ram/InMemoryDAOTest.java (80%) diff --git a/src/main/java/org/rometools/certiorem/HttpStatusCodeException.java b/src/main/java/com/rometools/certiorem/HttpStatusCodeException.java similarity index 96% rename from src/main/java/org/rometools/certiorem/HttpStatusCodeException.java rename to src/main/java/com/rometools/certiorem/HttpStatusCodeException.java index a6a7bd4..013ce71 100644 --- a/src/main/java/org/rometools/certiorem/HttpStatusCodeException.java +++ b/src/main/java/com/rometools/certiorem/HttpStatusCodeException.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.rometools.certiorem; +package com.rometools.certiorem; /** * diff --git a/src/main/java/org/rometools/certiorem/hub/DeltaFeedInfoCache.java b/src/main/java/com/rometools/certiorem/hub/DeltaFeedInfoCache.java similarity index 97% rename from src/main/java/org/rometools/certiorem/hub/DeltaFeedInfoCache.java rename to src/main/java/com/rometools/certiorem/hub/DeltaFeedInfoCache.java index bfe34ea..d197fd1 100644 --- a/src/main/java/org/rometools/certiorem/hub/DeltaFeedInfoCache.java +++ b/src/main/java/com/rometools/certiorem/hub/DeltaFeedInfoCache.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package org.rometools.certiorem.hub; +package com.rometools.certiorem.hub; import java.net.URL; diff --git a/src/main/java/org/rometools/certiorem/hub/DeltaSyndFeedInfo.java b/src/main/java/com/rometools/certiorem/hub/DeltaSyndFeedInfo.java similarity index 97% rename from src/main/java/org/rometools/certiorem/hub/DeltaSyndFeedInfo.java rename to src/main/java/com/rometools/certiorem/hub/DeltaSyndFeedInfo.java index d077dc2..9f14f47 100644 --- a/src/main/java/org/rometools/certiorem/hub/DeltaSyndFeedInfo.java +++ b/src/main/java/com/rometools/certiorem/hub/DeltaSyndFeedInfo.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package org.rometools.certiorem.hub; +package com.rometools.certiorem.hub; import java.math.BigInteger; import java.security.MessageDigest; @@ -13,8 +13,8 @@ import java.util.List; import java.util.Map; import com.rometools.fetcher.impl.SyndFeedInfo; -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; /** * Extends SyndFeedInfo to also track etags for individual entries. This may be used with diff --git a/src/main/java/org/rometools/certiorem/hub/Hub.java b/src/main/java/com/rometools/certiorem/hub/Hub.java similarity index 96% rename from src/main/java/org/rometools/certiorem/hub/Hub.java rename to src/main/java/com/rometools/certiorem/hub/Hub.java index b949a5a..81feb4f 100644 --- a/src/main/java/org/rometools/certiorem/hub/Hub.java +++ b/src/main/java/com/rometools/certiorem/hub/Hub.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.rometools.certiorem.hub; +package com.rometools.certiorem.hub; import java.net.URI; import java.net.URISyntaxException; @@ -26,17 +26,17 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.rometools.certiorem.HttpStatusCodeException; -import org.rometools.certiorem.hub.Notifier.SubscriptionSummaryCallback; -import org.rometools.certiorem.hub.Verifier.VerificationCallback; -import org.rometools.certiorem.hub.data.HubDAO; -import org.rometools.certiorem.hub.data.Subscriber; -import org.rometools.certiorem.hub.data.SubscriptionSummary; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.rometools.certiorem.HttpStatusCodeException; +import com.rometools.certiorem.hub.Notifier.SubscriptionSummaryCallback; +import com.rometools.certiorem.hub.Verifier.VerificationCallback; +import com.rometools.certiorem.hub.data.HubDAO; +import com.rometools.certiorem.hub.data.Subscriber; +import com.rometools.certiorem.hub.data.SubscriptionSummary; import com.rometools.fetcher.FeedFetcher; -import com.sun.syndication.feed.synd.SyndFeed; +import com.rometools.rome.feed.synd.SyndFeed; /** * The basic business logic controller for the Hub implementation. It is intended to be usable under diff --git a/src/main/java/org/rometools/certiorem/hub/Notifier.java b/src/main/java/com/rometools/certiorem/hub/Notifier.java similarity index 88% rename from src/main/java/org/rometools/certiorem/hub/Notifier.java rename to src/main/java/com/rometools/certiorem/hub/Notifier.java index 89373fa..b7f7ae3 100644 --- a/src/main/java/org/rometools/certiorem/hub/Notifier.java +++ b/src/main/java/com/rometools/certiorem/hub/Notifier.java @@ -16,14 +16,13 @@ * limitations under the License. */ -package org.rometools.certiorem.hub; +package com.rometools.certiorem.hub; import java.util.List; -import org.rometools.certiorem.hub.data.Subscriber; -import org.rometools.certiorem.hub.data.SubscriptionSummary; - -import com.sun.syndication.feed.synd.SyndFeed; +import com.rometools.certiorem.hub.data.Subscriber; +import com.rometools.certiorem.hub.data.SubscriptionSummary; +import com.rometools.rome.feed.synd.SyndFeed; /** * diff --git a/src/main/java/org/rometools/certiorem/hub/Verifier.java b/src/main/java/com/rometools/certiorem/hub/Verifier.java similarity index 96% rename from src/main/java/org/rometools/certiorem/hub/Verifier.java rename to src/main/java/com/rometools/certiorem/hub/Verifier.java index 5b6457e..b50a3f1 100644 --- a/src/main/java/org/rometools/certiorem/hub/Verifier.java +++ b/src/main/java/com/rometools/certiorem/hub/Verifier.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.rometools.certiorem.hub; +package com.rometools.certiorem.hub; -import org.rometools.certiorem.hub.data.Subscriber; +import com.rometools.certiorem.hub.data.Subscriber; /** * A strategy interface for verification of subscriptions. diff --git a/src/main/java/org/rometools/certiorem/hub/data/HubDAO.java b/src/main/java/com/rometools/certiorem/hub/data/HubDAO.java similarity index 96% rename from src/main/java/org/rometools/certiorem/hub/data/HubDAO.java rename to src/main/java/com/rometools/certiorem/hub/data/HubDAO.java index 249693b..b942746 100644 --- a/src/main/java/org/rometools/certiorem/hub/data/HubDAO.java +++ b/src/main/java/com/rometools/certiorem/hub/data/HubDAO.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.rometools.certiorem.hub.data; +package com.rometools.certiorem.hub.data; import java.util.List; diff --git a/src/main/java/org/rometools/certiorem/hub/data/Subscriber.java b/src/main/java/com/rometools/certiorem/hub/data/Subscriber.java similarity index 99% rename from src/main/java/org/rometools/certiorem/hub/data/Subscriber.java rename to src/main/java/com/rometools/certiorem/hub/data/Subscriber.java index c8bbe8f..01b2b42 100644 --- a/src/main/java/org/rometools/certiorem/hub/data/Subscriber.java +++ b/src/main/java/com/rometools/certiorem/hub/data/Subscriber.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.rometools.certiorem.hub.data; +package com.rometools.certiorem.hub.data; import java.io.Serializable; diff --git a/src/main/java/org/rometools/certiorem/hub/data/SubscriptionSummary.java b/src/main/java/com/rometools/certiorem/hub/data/SubscriptionSummary.java similarity index 98% rename from src/main/java/org/rometools/certiorem/hub/data/SubscriptionSummary.java rename to src/main/java/com/rometools/certiorem/hub/data/SubscriptionSummary.java index 8e7d3d0..42e63fa 100644 --- a/src/main/java/org/rometools/certiorem/hub/data/SubscriptionSummary.java +++ b/src/main/java/com/rometools/certiorem/hub/data/SubscriptionSummary.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.rometools.certiorem.hub.data; +package com.rometools.certiorem.hub.data; import java.io.Serializable; diff --git a/src/main/java/org/rometools/certiorem/hub/data/jpa/JPADAO.java b/src/main/java/com/rometools/certiorem/hub/data/jpa/JPADAO.java similarity index 95% rename from src/main/java/org/rometools/certiorem/hub/data/jpa/JPADAO.java rename to src/main/java/com/rometools/certiorem/hub/data/jpa/JPADAO.java index ceb2f67..4c084a3 100644 --- a/src/main/java/org/rometools/certiorem/hub/data/jpa/JPADAO.java +++ b/src/main/java/com/rometools/certiorem/hub/data/jpa/JPADAO.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.rometools.certiorem.hub.data.jpa; +package com.rometools.certiorem.hub.data.jpa; import java.util.LinkedList; import java.util.List; @@ -28,9 +28,9 @@ import javax.persistence.EntityTransaction; import javax.persistence.NoResultException; import javax.persistence.Query; -import org.rometools.certiorem.hub.data.HubDAO; -import org.rometools.certiorem.hub.data.Subscriber; -import org.rometools.certiorem.hub.data.SubscriptionSummary; +import com.rometools.certiorem.hub.data.HubDAO; +import com.rometools.certiorem.hub.data.Subscriber; +import com.rometools.certiorem.hub.data.SubscriptionSummary; /** * diff --git a/src/main/java/org/rometools/certiorem/hub/data/jpa/JPASubscriber.java b/src/main/java/com/rometools/certiorem/hub/data/jpa/JPASubscriber.java similarity index 96% rename from src/main/java/org/rometools/certiorem/hub/data/jpa/JPASubscriber.java rename to src/main/java/com/rometools/certiorem/hub/data/jpa/JPASubscriber.java index fe80d94..7620bf4 100644 --- a/src/main/java/org/rometools/certiorem/hub/data/jpa/JPASubscriber.java +++ b/src/main/java/com/rometools/certiorem/hub/data/jpa/JPASubscriber.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.rometools.certiorem.hub.data.jpa; +package com.rometools.certiorem.hub.data.jpa; import java.io.Serializable; import java.util.Date; @@ -28,7 +28,7 @@ import javax.persistence.NamedQuery; import javax.persistence.Temporal; import javax.persistence.TemporalType; -import org.rometools.certiorem.hub.data.Subscriber; +import com.rometools.certiorem.hub.data.Subscriber; /** * diff --git a/src/main/java/org/rometools/certiorem/hub/data/jpa/package.html b/src/main/java/com/rometools/certiorem/hub/data/jpa/package.html similarity index 100% rename from src/main/java/org/rometools/certiorem/hub/data/jpa/package.html rename to src/main/java/com/rometools/certiorem/hub/data/jpa/package.html diff --git a/src/main/java/org/rometools/certiorem/hub/data/package.html b/src/main/java/com/rometools/certiorem/hub/data/package.html similarity index 100% rename from src/main/java/org/rometools/certiorem/hub/data/package.html rename to src/main/java/com/rometools/certiorem/hub/data/package.html diff --git a/src/main/java/org/rometools/certiorem/hub/data/ram/InMemoryHubDAO.java b/src/main/java/com/rometools/certiorem/hub/data/ram/InMemoryHubDAO.java similarity index 95% rename from src/main/java/org/rometools/certiorem/hub/data/ram/InMemoryHubDAO.java rename to src/main/java/com/rometools/certiorem/hub/data/ram/InMemoryHubDAO.java index cdcce85..b9ed4a3 100644 --- a/src/main/java/org/rometools/certiorem/hub/data/ram/InMemoryHubDAO.java +++ b/src/main/java/com/rometools/certiorem/hub/data/ram/InMemoryHubDAO.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.rometools.certiorem.hub.data.ram; +package com.rometools.certiorem.hub.data.ram; import java.util.Collections; import java.util.LinkedList; @@ -24,9 +24,9 @@ import java.util.List; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArrayList; -import org.rometools.certiorem.hub.data.HubDAO; -import org.rometools.certiorem.hub.data.Subscriber; -import org.rometools.certiorem.hub.data.SubscriptionSummary; +import com.rometools.certiorem.hub.data.HubDAO; +import com.rometools.certiorem.hub.data.Subscriber; +import com.rometools.certiorem.hub.data.SubscriptionSummary; /** * A Simple In-Memory HubDAO for subscribers. diff --git a/src/main/java/org/rometools/certiorem/hub/data/ram/package.html b/src/main/java/com/rometools/certiorem/hub/data/ram/package.html similarity index 100% rename from src/main/java/org/rometools/certiorem/hub/data/ram/package.html rename to src/main/java/com/rometools/certiorem/hub/data/ram/package.html diff --git a/src/main/java/org/rometools/certiorem/hub/notify/standard/AbstractNotifier.java b/src/main/java/com/rometools/certiorem/hub/notify/standard/AbstractNotifier.java similarity index 93% rename from src/main/java/org/rometools/certiorem/hub/notify/standard/AbstractNotifier.java rename to src/main/java/com/rometools/certiorem/hub/notify/standard/AbstractNotifier.java index 2edd51b..4195ef1 100644 --- a/src/main/java/org/rometools/certiorem/hub/notify/standard/AbstractNotifier.java +++ b/src/main/java/com/rometools/certiorem/hub/notify/standard/AbstractNotifier.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.rometools.certiorem.hub.notify.standard; +package com.rometools.certiorem.hub.notify.standard; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -27,15 +27,15 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.List; -import org.rometools.certiorem.hub.Notifier; -import org.rometools.certiorem.hub.data.Subscriber; -import org.rometools.certiorem.hub.data.SubscriptionSummary; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.sun.syndication.feed.synd.SyndFeed; -import com.sun.syndication.io.FeedException; -import com.sun.syndication.io.SyndFeedOutput; +import com.rometools.certiorem.hub.Notifier; +import com.rometools.certiorem.hub.data.Subscriber; +import com.rometools.certiorem.hub.data.SubscriptionSummary; +import com.rometools.rome.feed.synd.SyndFeed; +import com.rometools.rome.io.FeedException; +import com.rometools.rome.io.SyndFeedOutput; /** * diff --git a/src/main/java/org/rometools/certiorem/hub/notify/standard/Notification.java b/src/main/java/com/rometools/certiorem/hub/notify/standard/Notification.java similarity index 83% rename from src/main/java/org/rometools/certiorem/hub/notify/standard/Notification.java rename to src/main/java/com/rometools/certiorem/hub/notify/standard/Notification.java index f0c62e6..d3ffdff 100644 --- a/src/main/java/org/rometools/certiorem/hub/notify/standard/Notification.java +++ b/src/main/java/com/rometools/certiorem/hub/notify/standard/Notification.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.rometools.certiorem.hub.notify.standard; +package com.rometools.certiorem.hub.notify.standard; -import org.rometools.certiorem.hub.Notifier.SubscriptionSummaryCallback; -import org.rometools.certiorem.hub.data.Subscriber; +import com.rometools.certiorem.hub.Notifier.SubscriptionSummaryCallback; +import com.rometools.certiorem.hub.data.Subscriber; /** * diff --git a/src/main/java/org/rometools/certiorem/hub/notify/standard/ThreadPoolNotifier.java b/src/main/java/com/rometools/certiorem/hub/notify/standard/ThreadPoolNotifier.java similarity index 97% rename from src/main/java/org/rometools/certiorem/hub/notify/standard/ThreadPoolNotifier.java rename to src/main/java/com/rometools/certiorem/hub/notify/standard/ThreadPoolNotifier.java index 0aa8f06..12e30e1 100644 --- a/src/main/java/org/rometools/certiorem/hub/notify/standard/ThreadPoolNotifier.java +++ b/src/main/java/com/rometools/certiorem/hub/notify/standard/ThreadPoolNotifier.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.rometools.certiorem.hub.notify.standard; +package com.rometools.certiorem.hub.notify.standard; import java.util.Timer; import java.util.TimerTask; @@ -25,7 +25,7 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import org.rometools.certiorem.hub.data.SubscriptionSummary; +import com.rometools.certiorem.hub.data.SubscriptionSummary; /** * A notifier implementation that uses a thread pool to deliver notifications to subscribers diff --git a/src/main/java/org/rometools/certiorem/hub/notify/standard/UnthreadedNotifier.java b/src/main/java/com/rometools/certiorem/hub/notify/standard/UnthreadedNotifier.java similarity index 91% rename from src/main/java/org/rometools/certiorem/hub/notify/standard/UnthreadedNotifier.java rename to src/main/java/com/rometools/certiorem/hub/notify/standard/UnthreadedNotifier.java index d04fec8..b1228eb 100644 --- a/src/main/java/org/rometools/certiorem/hub/notify/standard/UnthreadedNotifier.java +++ b/src/main/java/com/rometools/certiorem/hub/notify/standard/UnthreadedNotifier.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.rometools.certiorem.hub.notify.standard; +package com.rometools.certiorem.hub.notify.standard; -import org.rometools.certiorem.hub.data.SubscriptionSummary; +import com.rometools.certiorem.hub.data.SubscriptionSummary; /** * A notifier that does not use threads. All calls are blocking and synchronous. diff --git a/src/main/java/org/rometools/certiorem/hub/notify/standard/package.html b/src/main/java/com/rometools/certiorem/hub/notify/standard/package.html similarity index 100% rename from src/main/java/org/rometools/certiorem/hub/notify/standard/package.html rename to src/main/java/com/rometools/certiorem/hub/notify/standard/package.html diff --git a/src/main/java/org/rometools/certiorem/hub/package.html b/src/main/java/com/rometools/certiorem/hub/package.html similarity index 100% rename from src/main/java/org/rometools/certiorem/hub/package.html rename to src/main/java/com/rometools/certiorem/hub/package.html diff --git a/src/main/java/org/rometools/certiorem/hub/verify/standard/AbstractVerifier.java b/src/main/java/com/rometools/certiorem/hub/verify/standard/AbstractVerifier.java similarity index 96% rename from src/main/java/org/rometools/certiorem/hub/verify/standard/AbstractVerifier.java rename to src/main/java/com/rometools/certiorem/hub/verify/standard/AbstractVerifier.java index 4f0eac9..7a8398c 100644 --- a/src/main/java/org/rometools/certiorem/hub/verify/standard/AbstractVerifier.java +++ b/src/main/java/com/rometools/certiorem/hub/verify/standard/AbstractVerifier.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.rometools.certiorem.hub.verify.standard; +package com.rometools.certiorem.hub.verify.standard; import java.io.BufferedReader; import java.io.IOException; @@ -28,11 +28,12 @@ import java.net.URL; import java.net.URLEncoder; import java.util.UUID; -import org.rometools.certiorem.hub.Verifier; -import org.rometools.certiorem.hub.data.Subscriber; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.rometools.certiorem.hub.Verifier; +import com.rometools.certiorem.hub.data.Subscriber; + /** * An abstract verifier based on the java.net HTTP classes. This implements only synchronous * operations, and expects a child class to do Async ops. diff --git a/src/main/java/org/rometools/certiorem/hub/verify/standard/ThreadPoolVerifier.java b/src/main/java/com/rometools/certiorem/hub/verify/standard/ThreadPoolVerifier.java similarity index 95% rename from src/main/java/org/rometools/certiorem/hub/verify/standard/ThreadPoolVerifier.java rename to src/main/java/com/rometools/certiorem/hub/verify/standard/ThreadPoolVerifier.java index bb806ea..1c5f599 100644 --- a/src/main/java/org/rometools/certiorem/hub/verify/standard/ThreadPoolVerifier.java +++ b/src/main/java/com/rometools/certiorem/hub/verify/standard/ThreadPoolVerifier.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.rometools.certiorem.hub.verify.standard; +package com.rometools.certiorem.hub.verify.standard; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import org.rometools.certiorem.hub.data.Subscriber; +import com.rometools.certiorem.hub.data.Subscriber; /** * Uses a ThreadPoolExecutor to do async verifications. diff --git a/src/main/java/org/rometools/certiorem/hub/verify/standard/ThreadpoolVerifierAdvanced.java b/src/main/java/com/rometools/certiorem/hub/verify/standard/ThreadpoolVerifierAdvanced.java similarity index 94% rename from src/main/java/org/rometools/certiorem/hub/verify/standard/ThreadpoolVerifierAdvanced.java rename to src/main/java/com/rometools/certiorem/hub/verify/standard/ThreadpoolVerifierAdvanced.java index 19d9b5f..8751b27 100644 --- a/src/main/java/org/rometools/certiorem/hub/verify/standard/ThreadpoolVerifierAdvanced.java +++ b/src/main/java/com/rometools/certiorem/hub/verify/standard/ThreadpoolVerifierAdvanced.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.rometools.certiorem.hub.verify.standard; +package com.rometools.certiorem.hub.verify.standard; import java.util.concurrent.ThreadPoolExecutor; diff --git a/src/main/java/org/rometools/certiorem/hub/verify/standard/UnthreadedVerifier.java b/src/main/java/com/rometools/certiorem/hub/verify/standard/UnthreadedVerifier.java similarity index 91% rename from src/main/java/org/rometools/certiorem/hub/verify/standard/UnthreadedVerifier.java rename to src/main/java/com/rometools/certiorem/hub/verify/standard/UnthreadedVerifier.java index 060965c..8f2fac9 100644 --- a/src/main/java/org/rometools/certiorem/hub/verify/standard/UnthreadedVerifier.java +++ b/src/main/java/com/rometools/certiorem/hub/verify/standard/UnthreadedVerifier.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.rometools.certiorem.hub.verify.standard; +package com.rometools.certiorem.hub.verify.standard; -import org.rometools.certiorem.hub.data.Subscriber; +import com.rometools.certiorem.hub.data.Subscriber; /** * A verifier that does not use threads. Suitable for Google App Engine. diff --git a/src/main/java/org/rometools/certiorem/hub/verify/standard/package.html b/src/main/java/com/rometools/certiorem/hub/verify/standard/package.html similarity index 100% rename from src/main/java/org/rometools/certiorem/hub/verify/standard/package.html rename to src/main/java/com/rometools/certiorem/hub/verify/standard/package.html diff --git a/src/main/java/org/rometools/certiorem/package.html b/src/main/java/com/rometools/certiorem/package.html similarity index 100% rename from src/main/java/org/rometools/certiorem/package.html rename to src/main/java/com/rometools/certiorem/package.html diff --git a/src/main/java/org/rometools/certiorem/pub/NotificationException.java b/src/main/java/com/rometools/certiorem/pub/NotificationException.java similarity index 96% rename from src/main/java/org/rometools/certiorem/pub/NotificationException.java rename to src/main/java/com/rometools/certiorem/pub/NotificationException.java index 2e46354..91c5c58 100644 --- a/src/main/java/org/rometools/certiorem/pub/NotificationException.java +++ b/src/main/java/com/rometools/certiorem/pub/NotificationException.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.rometools.certiorem.pub; +package com.rometools.certiorem.pub; /** * diff --git a/src/main/java/org/rometools/certiorem/pub/Publisher.java b/src/main/java/com/rometools/certiorem/pub/Publisher.java similarity index 98% rename from src/main/java/org/rometools/certiorem/pub/Publisher.java rename to src/main/java/com/rometools/certiorem/pub/Publisher.java index 922766e..6857d55 100644 --- a/src/main/java/org/rometools/certiorem/pub/Publisher.java +++ b/src/main/java/com/rometools/certiorem/pub/Publisher.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.rometools.certiorem.pub; +package com.rometools.certiorem.pub; import java.io.IOException; import java.io.OutputStream; @@ -29,8 +29,8 @@ import java.util.concurrent.ThreadPoolExecutor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.sun.syndication.feed.synd.SyndFeed; -import com.sun.syndication.feed.synd.SyndLink; +import com.rometools.rome.feed.synd.SyndFeed; +import com.rometools.rome.feed.synd.SyndLink; /** * A class for sending update notifications to a hub. diff --git a/src/main/java/org/rometools/certiorem/pub/package.html b/src/main/java/com/rometools/certiorem/pub/package.html similarity index 100% rename from src/main/java/org/rometools/certiorem/pub/package.html rename to src/main/java/com/rometools/certiorem/pub/package.html diff --git a/src/main/java/org/rometools/certiorem/sub/Requester.java b/src/main/java/com/rometools/certiorem/sub/Requester.java similarity index 92% rename from src/main/java/org/rometools/certiorem/sub/Requester.java rename to src/main/java/com/rometools/certiorem/sub/Requester.java index ce027c0..016f37d 100644 --- a/src/main/java/org/rometools/certiorem/sub/Requester.java +++ b/src/main/java/com/rometools/certiorem/sub/Requester.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.rometools.certiorem.sub; +package com.rometools.certiorem.sub; -import org.rometools.certiorem.sub.data.Subscription; +import com.rometools.certiorem.sub.data.Subscription; /** * diff --git a/src/main/java/org/rometools/certiorem/sub/Subscriptions.java b/src/main/java/com/rometools/certiorem/sub/Subscriptions.java similarity index 94% rename from src/main/java/org/rometools/certiorem/sub/Subscriptions.java rename to src/main/java/com/rometools/certiorem/sub/Subscriptions.java index 051addb..5989389 100644 --- a/src/main/java/org/rometools/certiorem/sub/Subscriptions.java +++ b/src/main/java/com/rometools/certiorem/sub/Subscriptions.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.rometools.certiorem.sub; +package com.rometools.certiorem.sub; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -29,20 +29,20 @@ import java.net.URISyntaxException; import java.net.URL; import java.util.UUID; -import org.rometools.certiorem.HttpStatusCodeException; -import org.rometools.certiorem.sub.Requester.RequestCallback; -import org.rometools.certiorem.sub.data.SubDAO; -import org.rometools.certiorem.sub.data.Subscription; -import org.rometools.certiorem.sub.data.SubscriptionCallback; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.rometools.certiorem.HttpStatusCodeException; +import com.rometools.certiorem.sub.Requester.RequestCallback; +import com.rometools.certiorem.sub.data.SubDAO; +import com.rometools.certiorem.sub.data.Subscription; +import com.rometools.certiorem.sub.data.SubscriptionCallback; import com.rometools.fetcher.impl.FeedFetcherCache; import com.rometools.fetcher.impl.SyndFeedInfo; -import com.sun.syndication.feed.synd.SyndFeed; -import com.sun.syndication.feed.synd.SyndLink; -import com.sun.syndication.io.FeedException; -import com.sun.syndication.io.SyndFeedInput; +import com.rometools.rome.feed.synd.SyndFeed; +import com.rometools.rome.feed.synd.SyndLink; +import com.rometools.rome.io.FeedException; +import com.rometools.rome.io.SyndFeedInput; /** * diff --git a/src/main/java/org/rometools/certiorem/sub/data/SubDAO.java b/src/main/java/com/rometools/certiorem/sub/data/SubDAO.java similarity index 95% rename from src/main/java/org/rometools/certiorem/sub/data/SubDAO.java rename to src/main/java/com/rometools/certiorem/sub/data/SubDAO.java index 00692e1..cef1930 100644 --- a/src/main/java/org/rometools/certiorem/sub/data/SubDAO.java +++ b/src/main/java/com/rometools/certiorem/sub/data/SubDAO.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.rometools.certiorem.sub.data; +package com.rometools.certiorem.sub.data; /** * diff --git a/src/main/java/org/rometools/certiorem/sub/data/Subscription.java b/src/main/java/com/rometools/certiorem/sub/data/Subscription.java similarity index 98% rename from src/main/java/org/rometools/certiorem/sub/data/Subscription.java rename to src/main/java/com/rometools/certiorem/sub/data/Subscription.java index 8978c7a..8344df0 100644 --- a/src/main/java/org/rometools/certiorem/sub/data/Subscription.java +++ b/src/main/java/com/rometools/certiorem/sub/data/Subscription.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.rometools.certiorem.sub.data; +package com.rometools.certiorem.sub.data; import java.io.Serializable; diff --git a/src/main/java/org/rometools/certiorem/sub/data/SubscriptionCallback.java b/src/main/java/com/rometools/certiorem/sub/data/SubscriptionCallback.java similarity index 90% rename from src/main/java/org/rometools/certiorem/sub/data/SubscriptionCallback.java rename to src/main/java/com/rometools/certiorem/sub/data/SubscriptionCallback.java index 044edac..ce9e560 100644 --- a/src/main/java/org/rometools/certiorem/sub/data/SubscriptionCallback.java +++ b/src/main/java/com/rometools/certiorem/sub/data/SubscriptionCallback.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package org.rometools.certiorem.sub.data; +package com.rometools.certiorem.sub.data; import com.rometools.fetcher.impl.SyndFeedInfo; diff --git a/src/main/java/org/rometools/certiorem/sub/data/package.html b/src/main/java/com/rometools/certiorem/sub/data/package.html similarity index 100% rename from src/main/java/org/rometools/certiorem/sub/data/package.html rename to src/main/java/com/rometools/certiorem/sub/data/package.html diff --git a/src/main/java/org/rometools/certiorem/sub/data/ram/InMemorySubDAO.java b/src/main/java/com/rometools/certiorem/sub/data/ram/InMemorySubDAO.java similarity index 93% rename from src/main/java/org/rometools/certiorem/sub/data/ram/InMemorySubDAO.java rename to src/main/java/com/rometools/certiorem/sub/data/ram/InMemorySubDAO.java index 56bbd62..d631d6c 100644 --- a/src/main/java/org/rometools/certiorem/sub/data/ram/InMemorySubDAO.java +++ b/src/main/java/com/rometools/certiorem/sub/data/ram/InMemorySubDAO.java @@ -21,16 +21,17 @@ * and open the template in the editor. */ -package org.rometools.certiorem.sub.data.ram; +package com.rometools.certiorem.sub.data.ram; import java.util.Date; import java.util.concurrent.ConcurrentHashMap; -import org.rometools.certiorem.sub.data.SubDAO; -import org.rometools.certiorem.sub.data.Subscription; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.rometools.certiorem.sub.data.SubDAO; +import com.rometools.certiorem.sub.data.Subscription; + /** * * @author robert.cooper diff --git a/src/main/java/org/rometools/certiorem/sub/data/ram/package.html b/src/main/java/com/rometools/certiorem/sub/data/ram/package.html similarity index 100% rename from src/main/java/org/rometools/certiorem/sub/data/ram/package.html rename to src/main/java/com/rometools/certiorem/sub/data/ram/package.html diff --git a/src/main/java/org/rometools/certiorem/sub/package.html b/src/main/java/com/rometools/certiorem/sub/package.html similarity index 100% rename from src/main/java/org/rometools/certiorem/sub/package.html rename to src/main/java/com/rometools/certiorem/sub/package.html diff --git a/src/main/java/org/rometools/certiorem/sub/request/AbstractRequester.java b/src/main/java/com/rometools/certiorem/sub/request/AbstractRequester.java similarity index 94% rename from src/main/java/org/rometools/certiorem/sub/request/AbstractRequester.java rename to src/main/java/com/rometools/certiorem/sub/request/AbstractRequester.java index b6abf20..ec663df 100644 --- a/src/main/java/org/rometools/certiorem/sub/request/AbstractRequester.java +++ b/src/main/java/com/rometools/certiorem/sub/request/AbstractRequester.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.rometools.certiorem.sub.request; +package com.rometools.certiorem.sub.request; import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; import java.net.URLEncoder; -import org.rometools.certiorem.sub.Requester; -import org.rometools.certiorem.sub.data.Subscription; +import com.rometools.certiorem.sub.Requester; +import com.rometools.certiorem.sub.data.Subscription; /** * diff --git a/src/main/java/org/rometools/certiorem/sub/request/AsyncRequester.java b/src/main/java/com/rometools/certiorem/sub/request/AsyncRequester.java similarity index 96% rename from src/main/java/org/rometools/certiorem/sub/request/AsyncRequester.java rename to src/main/java/com/rometools/certiorem/sub/request/AsyncRequester.java index 62a2a82..bae5291 100644 --- a/src/main/java/org/rometools/certiorem/sub/request/AsyncRequester.java +++ b/src/main/java/com/rometools/certiorem/sub/request/AsyncRequester.java @@ -16,14 +16,15 @@ * limitations under the License. */ -package org.rometools.certiorem.sub.request; +package com.rometools.certiorem.sub.request; import java.io.IOException; -import org.rometools.certiorem.sub.data.Subscription; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.rometools.certiorem.sub.data.Subscription; + /** * A simple requester implementation that always makes requests as Async. * diff --git a/src/main/java/org/rometools/certiorem/sub/request/SyncRequester.java b/src/main/java/com/rometools/certiorem/sub/request/SyncRequester.java similarity index 95% rename from src/main/java/org/rometools/certiorem/sub/request/SyncRequester.java rename to src/main/java/com/rometools/certiorem/sub/request/SyncRequester.java index 7896991..721b0c8 100644 --- a/src/main/java/org/rometools/certiorem/sub/request/SyncRequester.java +++ b/src/main/java/com/rometools/certiorem/sub/request/SyncRequester.java @@ -20,14 +20,15 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package org.rometools.certiorem.sub.request; +package com.rometools.certiorem.sub.request; import java.io.IOException; -import org.rometools.certiorem.sub.data.Subscription; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.rometools.certiorem.sub.data.Subscription; + /** * A simple requester implementation that always makes requests as Async. * diff --git a/src/main/java/org/rometools/certiorem/sub/request/package.html b/src/main/java/com/rometools/certiorem/sub/request/package.html similarity index 100% rename from src/main/java/org/rometools/certiorem/sub/request/package.html rename to src/main/java/com/rometools/certiorem/sub/request/package.html diff --git a/src/main/java/org/rometools/certiorem/web/AbstractHubServlet.java b/src/main/java/com/rometools/certiorem/web/AbstractHubServlet.java similarity index 95% rename from src/main/java/org/rometools/certiorem/web/AbstractHubServlet.java rename to src/main/java/com/rometools/certiorem/web/AbstractHubServlet.java index 0a4ff7c..28ee4bf 100644 --- a/src/main/java/org/rometools/certiorem/web/AbstractHubServlet.java +++ b/src/main/java/com/rometools/certiorem/web/AbstractHubServlet.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.rometools.certiorem.web; +package com.rometools.certiorem.web; import java.io.IOException; import java.util.Arrays; @@ -26,8 +26,8 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.rometools.certiorem.HttpStatusCodeException; -import org.rometools.certiorem.hub.Hub; +import com.rometools.certiorem.HttpStatusCodeException; +import com.rometools.certiorem.hub.Hub; /** * diff --git a/src/main/java/org/rometools/certiorem/web/AbstractSubServlet.java b/src/main/java/com/rometools/certiorem/web/AbstractSubServlet.java similarity index 94% rename from src/main/java/org/rometools/certiorem/web/AbstractSubServlet.java rename to src/main/java/com/rometools/certiorem/web/AbstractSubServlet.java index 6094731..3b6f343 100644 --- a/src/main/java/org/rometools/certiorem/web/AbstractSubServlet.java +++ b/src/main/java/com/rometools/certiorem/web/AbstractSubServlet.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.rometools.certiorem.web; +package com.rometools.certiorem.web; import java.io.IOException; @@ -26,8 +26,8 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.rometools.certiorem.HttpStatusCodeException; -import org.rometools.certiorem.sub.Subscriptions; +import com.rometools.certiorem.HttpStatusCodeException; +import com.rometools.certiorem.sub.Subscriptions; /** * diff --git a/src/main/java/org/rometools/certiorem/web/package.html b/src/main/java/com/rometools/certiorem/web/package.html similarity index 100% rename from src/main/java/org/rometools/certiorem/web/package.html rename to src/main/java/com/rometools/certiorem/web/package.html diff --git a/src/test/java/org/rometools/certiorem/hub/AlwaysVerifier.java b/src/test/java/com/rometools/certiorem/hub/AlwaysVerifier.java similarity index 90% rename from src/test/java/org/rometools/certiorem/hub/AlwaysVerifier.java rename to src/test/java/com/rometools/certiorem/hub/AlwaysVerifier.java index 5d198e8..af5f9fb 100644 --- a/src/test/java/org/rometools/certiorem/hub/AlwaysVerifier.java +++ b/src/test/java/com/rometools/certiorem/hub/AlwaysVerifier.java @@ -16,9 +16,10 @@ * limitations under the License. */ -package org.rometools.certiorem.hub; +package com.rometools.certiorem.hub; -import org.rometools.certiorem.hub.data.Subscriber; +import com.rometools.certiorem.hub.Verifier; +import com.rometools.certiorem.hub.data.Subscriber; /** * diff --git a/src/test/java/org/rometools/certiorem/hub/ControllerTest.java b/src/test/java/com/rometools/certiorem/hub/ControllerTest.java similarity index 93% rename from src/test/java/org/rometools/certiorem/hub/ControllerTest.java rename to src/test/java/com/rometools/certiorem/hub/ControllerTest.java index d7dcb6d..7d5b1cd 100644 --- a/src/test/java/org/rometools/certiorem/hub/ControllerTest.java +++ b/src/test/java/com/rometools/certiorem/hub/ControllerTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.rometools.certiorem.hub; +package com.rometools.certiorem.hub; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -26,12 +26,14 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.rometools.certiorem.HttpStatusCodeException; -import org.rometools.certiorem.hub.data.HubDAO; -import org.rometools.certiorem.hub.data.ram.InMemoryHubDAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.rometools.certiorem.HttpStatusCodeException; +import com.rometools.certiorem.hub.Hub; +import com.rometools.certiorem.hub.Notifier; +import com.rometools.certiorem.hub.data.HubDAO; +import com.rometools.certiorem.hub.data.ram.InMemoryHubDAO; import com.rometools.fetcher.FeedFetcher; import com.rometools.fetcher.impl.HashMapFeedInfoCache; import com.rometools.fetcher.impl.HttpURLFeedFetcher; diff --git a/src/test/java/org/rometools/certiorem/hub/DeltaSyndFeedInfoTest.java b/src/test/java/com/rometools/certiorem/hub/DeltaSyndFeedInfoTest.java similarity index 89% rename from src/test/java/org/rometools/certiorem/hub/DeltaSyndFeedInfoTest.java rename to src/test/java/com/rometools/certiorem/hub/DeltaSyndFeedInfoTest.java index 54c2306..00b25f0 100644 --- a/src/test/java/org/rometools/certiorem/hub/DeltaSyndFeedInfoTest.java +++ b/src/test/java/com/rometools/certiorem/hub/DeltaSyndFeedInfoTest.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package org.rometools.certiorem.hub; +package com.rometools.certiorem.hub; import static org.junit.Assert.assertTrue; @@ -13,10 +13,11 @@ import java.util.List; import org.junit.Before; import org.junit.Test; +import com.rometools.certiorem.hub.DeltaFeedInfoCache; import com.rometools.fetcher.impl.HashMapFeedInfoCache; import com.rometools.fetcher.impl.HttpURLFeedFetcher; -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; /** * diff --git a/src/test/java/org/rometools/certiorem/hub/ExceptionVerifier.java b/src/test/java/com/rometools/certiorem/hub/ExceptionVerifier.java similarity index 91% rename from src/test/java/org/rometools/certiorem/hub/ExceptionVerifier.java rename to src/test/java/com/rometools/certiorem/hub/ExceptionVerifier.java index 7e7ae45..3aa877c 100644 --- a/src/test/java/org/rometools/certiorem/hub/ExceptionVerifier.java +++ b/src/test/java/com/rometools/certiorem/hub/ExceptionVerifier.java @@ -16,9 +16,10 @@ * limitations under the License. */ -package org.rometools.certiorem.hub; +package com.rometools.certiorem.hub; -import org.rometools.certiorem.hub.data.Subscriber; +import com.rometools.certiorem.hub.Verifier; +import com.rometools.certiorem.hub.data.Subscriber; /** * diff --git a/src/test/java/org/rometools/certiorem/hub/NeverVerifier.java b/src/test/java/com/rometools/certiorem/hub/NeverVerifier.java similarity index 90% rename from src/test/java/org/rometools/certiorem/hub/NeverVerifier.java rename to src/test/java/com/rometools/certiorem/hub/NeverVerifier.java index e4733bf..a5aa95e 100644 --- a/src/test/java/org/rometools/certiorem/hub/NeverVerifier.java +++ b/src/test/java/com/rometools/certiorem/hub/NeverVerifier.java @@ -16,9 +16,10 @@ * limitations under the License. */ -package org.rometools.certiorem.hub; +package com.rometools.certiorem.hub; -import org.rometools.certiorem.hub.data.Subscriber; +import com.rometools.certiorem.hub.Verifier; +import com.rometools.certiorem.hub.data.Subscriber; /** * diff --git a/src/test/java/org/rometools/certiorem/hub/data/AbstractDAOTest.java b/src/test/java/com/rometools/certiorem/hub/data/AbstractDAOTest.java similarity index 95% rename from src/test/java/org/rometools/certiorem/hub/data/AbstractDAOTest.java rename to src/test/java/com/rometools/certiorem/hub/data/AbstractDAOTest.java index 191f5cb..e70016a 100644 --- a/src/test/java/org/rometools/certiorem/hub/data/AbstractDAOTest.java +++ b/src/test/java/com/rometools/certiorem/hub/data/AbstractDAOTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.rometools.certiorem.hub.data; +package com.rometools.certiorem.hub.data; import java.util.List; @@ -25,6 +25,9 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.rometools.certiorem.hub.data.HubDAO; +import com.rometools.certiorem.hub.data.Subscriber; + /** * * @author robert.cooper diff --git a/src/test/java/org/rometools/certiorem/hub/data/ram/InMemoryDAOTest.java b/src/test/java/com/rometools/certiorem/hub/data/ram/InMemoryDAOTest.java similarity index 80% rename from src/test/java/org/rometools/certiorem/hub/data/ram/InMemoryDAOTest.java rename to src/test/java/com/rometools/certiorem/hub/data/ram/InMemoryDAOTest.java index be5f0a7..26917e3 100644 --- a/src/test/java/org/rometools/certiorem/hub/data/ram/InMemoryDAOTest.java +++ b/src/test/java/com/rometools/certiorem/hub/data/ram/InMemoryDAOTest.java @@ -16,10 +16,11 @@ * limitations under the License. */ -package org.rometools.certiorem.hub.data.ram; +package com.rometools.certiorem.hub.data.ram; -import org.rometools.certiorem.hub.data.AbstractDAOTest; -import org.rometools.certiorem.hub.data.HubDAO; +import com.rometools.certiorem.hub.data.AbstractDAOTest; +import com.rometools.certiorem.hub.data.HubDAO; +import com.rometools.certiorem.hub.data.ram.InMemoryHubDAO; /** *