From df2880a92c0e9263059d2f4d8066775fb2bf1e43 Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Fri, 30 May 2014 16:31:14 +0200 Subject: [PATCH] Renamed and harmonized packages --- .../rometools/certiorem/webapp}/HubServlet.java | 7 +++---- .../rometools/certiorem/webapp}/NotifyTest.java | 6 +++--- .../certiorem/webapp}/ServerModule.java | 16 ++++++++-------- .../rometools/certiorem/webapp}/SubServlet.java | 7 +++---- .../rometools/certiorem/webapp}/SubTest.java | 8 ++++---- src/main/webapp/WEB-INF/web.xml | 2 +- 6 files changed, 22 insertions(+), 24 deletions(-) rename src/main/java/{org/rometools/certiorem/example => com/rometools/certiorem/webapp}/HubServlet.java (74%) rename src/main/java/{org/rometools/certiorem/example => com/rometools/certiorem/webapp}/NotifyTest.java (87%) rename src/main/java/{org/rometools/certiorem/example => com/rometools/certiorem/webapp}/ServerModule.java (82%) rename src/main/java/{org/rometools/certiorem/example => com/rometools/certiorem/webapp}/SubServlet.java (74%) rename src/main/java/{org/rometools/certiorem/example => com/rometools/certiorem/webapp}/SubTest.java (89%) diff --git a/src/main/java/org/rometools/certiorem/example/HubServlet.java b/src/main/java/com/rometools/certiorem/webapp/HubServlet.java similarity index 74% rename from src/main/java/org/rometools/certiorem/example/HubServlet.java rename to src/main/java/com/rometools/certiorem/webapp/HubServlet.java index 7a6f68f..ea4e3bc 100644 --- a/src/main/java/org/rometools/certiorem/example/HubServlet.java +++ b/src/main/java/com/rometools/certiorem/webapp/HubServlet.java @@ -3,13 +3,12 @@ * and open the template in the editor. */ -package org.rometools.certiorem.example; - -import org.rometools.certiorem.hub.Hub; -import org.rometools.certiorem.web.AbstractHubServlet; +package com.rometools.certiorem.webapp; import com.google.inject.Inject; import com.google.inject.Singleton; +import com.rometools.certiorem.hub.Hub; +import com.rometools.certiorem.web.AbstractHubServlet; /** * diff --git a/src/main/java/org/rometools/certiorem/example/NotifyTest.java b/src/main/java/com/rometools/certiorem/webapp/NotifyTest.java similarity index 87% rename from src/main/java/org/rometools/certiorem/example/NotifyTest.java rename to src/main/java/com/rometools/certiorem/webapp/NotifyTest.java index e021eb4..3430e0f 100644 --- a/src/main/java/org/rometools/certiorem/example/NotifyTest.java +++ b/src/main/java/com/rometools/certiorem/webapp/NotifyTest.java @@ -3,19 +3,19 @@ * and open the template in the editor. */ -package org.rometools.certiorem.example; +package com.rometools.certiorem.webapp; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.rometools.certiorem.pub.NotificationException; -import org.rometools.certiorem.pub.Publisher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.inject.Singleton; +import com.rometools.certiorem.pub.NotificationException; +import com.rometools.certiorem.pub.Publisher; /** * diff --git a/src/main/java/org/rometools/certiorem/example/ServerModule.java b/src/main/java/com/rometools/certiorem/webapp/ServerModule.java similarity index 82% rename from src/main/java/org/rometools/certiorem/example/ServerModule.java rename to src/main/java/com/rometools/certiorem/webapp/ServerModule.java index f087c66..865cc55 100644 --- a/src/main/java/org/rometools/certiorem/example/ServerModule.java +++ b/src/main/java/com/rometools/certiorem/webapp/ServerModule.java @@ -2,15 +2,8 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package org.rometools.certiorem.example; +package com.rometools.certiorem.webapp; -import org.rometools.certiorem.hub.Hub; -import org.rometools.certiorem.hub.data.ram.InMemoryHubDAO; -import org.rometools.certiorem.hub.notify.standard.UnthreadedNotifier; -import org.rometools.certiorem.hub.verify.standard.UnthreadedVerifier; -import org.rometools.certiorem.sub.Subscriptions; -import org.rometools.certiorem.sub.data.ram.InMemorySubDAO; -import org.rometools.certiorem.sub.request.AsyncRequester; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -21,6 +14,13 @@ import com.google.inject.Provides; import com.google.inject.Singleton; import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; +import com.rometools.certiorem.hub.Hub; +import com.rometools.certiorem.hub.data.ram.InMemoryHubDAO; +import com.rometools.certiorem.hub.notify.standard.UnthreadedNotifier; +import com.rometools.certiorem.hub.verify.standard.UnthreadedVerifier; +import com.rometools.certiorem.sub.Subscriptions; +import com.rometools.certiorem.sub.data.ram.InMemorySubDAO; +import com.rometools.certiorem.sub.request.AsyncRequester; import com.rometools.fetcher.FeedFetcher; import com.rometools.fetcher.impl.HashMapFeedInfoCache; import com.rometools.fetcher.impl.HttpURLFeedFetcher; diff --git a/src/main/java/org/rometools/certiorem/example/SubServlet.java b/src/main/java/com/rometools/certiorem/webapp/SubServlet.java similarity index 74% rename from src/main/java/org/rometools/certiorem/example/SubServlet.java rename to src/main/java/com/rometools/certiorem/webapp/SubServlet.java index 97d40f4..8e78ece 100644 --- a/src/main/java/org/rometools/certiorem/example/SubServlet.java +++ b/src/main/java/com/rometools/certiorem/webapp/SubServlet.java @@ -3,13 +3,12 @@ * and open the template in the editor. */ -package org.rometools.certiorem.example; - -import org.rometools.certiorem.sub.Subscriptions; -import org.rometools.certiorem.web.AbstractSubServlet; +package com.rometools.certiorem.webapp; import com.google.inject.Inject; import com.google.inject.Singleton; +import com.rometools.certiorem.sub.Subscriptions; +import com.rometools.certiorem.web.AbstractSubServlet; /** * diff --git a/src/main/java/org/rometools/certiorem/example/SubTest.java b/src/main/java/com/rometools/certiorem/webapp/SubTest.java similarity index 89% rename from src/main/java/org/rometools/certiorem/example/SubTest.java rename to src/main/java/com/rometools/certiorem/webapp/SubTest.java index 70aae70..c728b16 100644 --- a/src/main/java/org/rometools/certiorem/example/SubTest.java +++ b/src/main/java/com/rometools/certiorem/webapp/SubTest.java @@ -3,20 +3,20 @@ * and open the template in the editor. */ -package org.rometools.certiorem.example; +package com.rometools.certiorem.webapp; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.rometools.certiorem.sub.Subscriptions; -import org.rometools.certiorem.sub.data.Subscription; -import org.rometools.certiorem.sub.data.SubscriptionCallback; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.inject.Inject; import com.google.inject.Singleton; +import com.rometools.certiorem.sub.Subscriptions; +import com.rometools.certiorem.sub.data.Subscription; +import com.rometools.certiorem.sub.data.SubscriptionCallback; import com.rometools.fetcher.impl.SyndFeedInfo; /** diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 5bc7954..bec632b 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -25,7 +25,7 @@ Guice config - org.rometools.certiorem.example.ServerModule + com.rometools.certiorem.example.ServerModule