You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2006/10/19 20:59:04 UTC

svn commit: r465725 - in /incubator/roller/trunk: sandbox/planetroller/src/org/apache/roller/planet/business/ sandbox/planetroller/src/org/apache/roller/planet/business/hibernate/ sandbox/planetroller/src/org/apache/roller/planet/model/ sandbox/planetr...

Author: snoopdave
Date: Thu Oct 19 11:59:01 2006
New Revision: 465725

URL: http://svn.apache.org/viewvc?view=rev&rev=465725
Log:
Eliminating model package in planet code too

Added:
    incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/business/Planet.java
      - copied, changed from r465720, incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/model/Planet.java
    incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/business/PlanetFactory.java
      - copied, changed from r465720, incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/model/PlanetFactory.java
    incubator/roller/trunk/src/org/apache/roller/planet/business/PlanetManager.java
      - copied, changed from r465720, incubator/roller/trunk/src/org/apache/roller/planet/model/PlanetManager.java
Removed:
    incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/model/
    incubator/roller/trunk/src/org/apache/roller/planet/model/
Modified:
    incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/business/hibernate/HibernatePlanetImpl.java
    incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/tasks/GeneratePlanetTask.java
    incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/tasks/StaticPlanetModel.java
    incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/ConfigForm.java
    incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/GroupForm.java
    incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/GroupsListForm.java
    incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/SubscriptionForm.java
    incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/utils/PersistenceSessionFilter.java
    incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/ApplicationResources.properties
    incubator/roller/trunk/sandbox/planetroller/web/index.jsp
    incubator/roller/trunk/src/org/apache/roller/business/Roller.java
    incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateRollerImpl.java
    incubator/roller/trunk/src/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java
    incubator/roller/trunk/src/org/apache/roller/planet/tasks/SyncWebsitesTask.java
    incubator/roller/trunk/src/org/apache/roller/planet/tasks/TechnoratiRankingsTask.java
    incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetConfigAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetGroupsAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetSubscriptionsAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/PlanetModel.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/pagers/PlanetEntriesPager.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PlanetFeedServlet.java
    incubator/roller/trunk/tests/org/apache/roller/business/PlanetManagerLocalTest.java
    incubator/roller/trunk/tests/org/apache/roller/business/PlanetManagerTest.java

Copied: incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/business/Planet.java (from r465720, incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/model/Planet.java)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/business/Planet.java?view=diff&rev=465725&p1=incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/model/Planet.java&r1=465720&p2=incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/business/Planet.java&r2=465725
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/model/Planet.java (original)
+++ incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/business/Planet.java Thu Oct 19 11:59:01 2006
@@ -16,9 +16,10 @@
 * directory of this distribution.
 */
 
-package org.apache.roller.planet.model;
+package org.apache.roller.planet.business;
 
 import org.apache.roller.RollerException;
+import org.apache.roller.planet.model.*;
 import org.apache.roller.planet.model.PlanetManager;
 
 

Copied: incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/business/PlanetFactory.java (from r465720, incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/model/PlanetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/business/PlanetFactory.java?view=diff&rev=465725&p1=incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/model/PlanetFactory.java&r1=465720&p2=incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/business/PlanetFactory.java&r2=465725
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/model/PlanetFactory.java (original)
+++ incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/business/PlanetFactory.java Thu Oct 19 11:59:01 2006
@@ -15,7 +15,7 @@
  * copyright in this work, please see the NOTICE file in the top level
  * directory of this distribution.
  */
-package org.apache.roller.planet.model;
+package org.apache.roller.planet.business;
 
 
 import org.apache.commons.logging.Log;

Modified: incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/business/hibernate/HibernatePlanetImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/business/hibernate/HibernatePlanetImpl.java?view=diff&rev=465725&r1=465724&r2=465725
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/business/hibernate/HibernatePlanetImpl.java (original)
+++ incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/business/hibernate/HibernatePlanetImpl.java Thu Oct 19 11:59:01 2006
@@ -24,7 +24,7 @@
 import org.apache.roller.business.hibernate.HibernatePersistenceStrategy;
 import org.apache.roller.planet.config.PlanetConfig;
 import org.apache.roller.planet.model.PlanetManager;
-import org.apache.roller.planet.model.Planet;
+import org.apache.roller.planet.business.Planet;
 
 /**
  * A Hibernate specific implementation of the Roller business layer.

Modified: incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/tasks/GeneratePlanetTask.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/tasks/GeneratePlanetTask.java?view=diff&rev=465725&r1=465724&r2=465725
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/tasks/GeneratePlanetTask.java (original)
+++ incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/tasks/GeneratePlanetTask.java Thu Oct 19 11:59:01 2006
@@ -26,8 +26,8 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
 import org.apache.roller.planet.config.PlanetConfig;
-import org.apache.roller.planet.model.Planet;
-import org.apache.roller.planet.model.PlanetFactory;
+import org.apache.roller.planet.business.Planet;
+import org.apache.roller.planet.business.PlanetFactory;
 import org.apache.roller.planet.model.PlanetManager;
 import org.apache.roller.ui.rendering.model.UtilitiesModel;
 import org.apache.roller.ui.rendering.velocity.deprecated.OldUtilities;

Modified: incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/tasks/StaticPlanetModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/tasks/StaticPlanetModel.java?view=diff&rev=465725&r1=465724&r2=465725
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/tasks/StaticPlanetModel.java (original)
+++ incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/tasks/StaticPlanetModel.java Thu Oct 19 11:59:01 2006
@@ -22,8 +22,8 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.planet.model.Planet;
-import org.apache.roller.planet.model.PlanetFactory;
+import org.apache.roller.planet.business.Planet;
+import org.apache.roller.planet.business.PlanetFactory;
 import org.apache.roller.planet.model.PlanetManager;
 import org.apache.roller.planet.pojos.PlanetConfigData;
 import org.apache.roller.planet.pojos.PlanetGroupData;

Modified: incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/ConfigForm.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/ConfigForm.java?view=diff&rev=465725&r1=465724&r2=465725
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/ConfigForm.java (original)
+++ incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/ConfigForm.java Thu Oct 19 11:59:01 2006
@@ -25,8 +25,8 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.planet.model.Planet;
-import org.apache.roller.planet.model.PlanetFactory;
+import org.apache.roller.planet.business.Planet;
+import org.apache.roller.planet.business.PlanetFactory;
 import org.apache.roller.planet.model.PlanetManager;
 import org.apache.roller.planet.pojos.PlanetConfigData;
 import org.apache.roller.planet.pojos.PlanetGroupData;

Modified: incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/GroupForm.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/GroupForm.java?view=diff&rev=465725&r1=465724&r2=465725
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/GroupForm.java (original)
+++ incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/GroupForm.java Thu Oct 19 11:59:01 2006
@@ -25,8 +25,8 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.planet.model.Planet;
-import org.apache.roller.planet.model.PlanetFactory;
+import org.apache.roller.planet.business.Planet;
+import org.apache.roller.planet.business.PlanetFactory;
 import org.apache.roller.planet.model.PlanetManager;
 import org.apache.roller.planet.pojos.PlanetGroupData;
 import org.apache.roller.planet.pojos.PlanetSubscriptionData;

Modified: incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/GroupsListForm.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/GroupsListForm.java?view=diff&rev=465725&r1=465724&r2=465725
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/GroupsListForm.java (original)
+++ incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/GroupsListForm.java Thu Oct 19 11:59:01 2006
@@ -23,8 +23,8 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.planet.model.Planet;
-import org.apache.roller.planet.model.PlanetFactory;
+import org.apache.roller.planet.business.Planet;
+import org.apache.roller.planet.business.PlanetFactory;
 import org.apache.roller.planet.pojos.PlanetGroupData;
 
 /**

Modified: incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/SubscriptionForm.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/SubscriptionForm.java?view=diff&rev=465725&r1=465724&r2=465725
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/SubscriptionForm.java (original)
+++ incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/SubscriptionForm.java Thu Oct 19 11:59:01 2006
@@ -28,7 +28,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.planet.model.PlanetFactory;
+import org.apache.roller.planet.business.PlanetFactory;
 import org.apache.roller.planet.model.PlanetManager;
 import org.apache.roller.planet.pojos.PlanetGroupData;
 import org.apache.roller.planet.pojos.PlanetSubscriptionData;

Modified: incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/utils/PersistenceSessionFilter.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/utils/PersistenceSessionFilter.java?view=diff&rev=465725&r1=465724&r2=465725
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/utils/PersistenceSessionFilter.java (original)
+++ incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/utils/PersistenceSessionFilter.java Thu Oct 19 11:59:01 2006
@@ -28,8 +28,8 @@
 import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.planet.model.Planet;
-import org.apache.roller.planet.model.PlanetFactory;
+import org.apache.roller.planet.business.Planet;
+import org.apache.roller.planet.business.PlanetFactory;
 
 
 /**

Modified: incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/ApplicationResources.properties?view=diff&rev=465725&r1=465724&r2=465725
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/ApplicationResources.properties (original)
+++ incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/ApplicationResources.properties Thu Oct 19 11:59:01 2006
@@ -86,7 +86,7 @@
 # main.jsp
 
 mainTitle=Welcome to Planet Roller
-mainConsoleLink=Planet admin console...
+mainConsoleLink=Use the Planet Roller admin console to configure a default group...
 
 # subscriptionForm.jsp
 

Modified: incubator/roller/trunk/sandbox/planetroller/web/index.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/index.jsp?view=diff&rev=465725&r1=465724&r2=465725
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/index.jsp (original)
+++ incubator/roller/trunk/sandbox/planetroller/web/index.jsp Thu Oct 19 11:59:01 2006
@@ -14,4 +14,10 @@
   limitations under the License.  For additional information regarding
   copyright in this work, please see the NOTICE file in the top level
   directory of this distribution.
---%><jsp:forward page="/main.faces" />
+--%>
+<%@ page import="org.apache.roller.planet.model.PlanetManager" %>
+<%@ page import="org.apache.roller.model.PlanetFactory" %>
+<%
+    PlanetManager pmgr= PlanetFactory.getPlanet().getPlanetManager();
+%>
+<jsp:forward page="/main.faces" />

Modified: incubator/roller/trunk/src/org/apache/roller/business/Roller.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/Roller.java?view=diff&rev=465725&r1=465724&r2=465725
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/business/Roller.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/Roller.java Thu Oct 19 11:59:01 2006
@@ -28,7 +28,7 @@
 import org.apache.roller.business.referrers.ReferrerQueueManager;
 import org.apache.roller.business.runnable.ThreadManager;
 import org.apache.roller.business.search.IndexManager;
-import org.apache.roller.planet.model.PlanetManager;
+import org.apache.roller.planet.business.PlanetManager;
 
 
 /** 

Modified: incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateRollerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateRollerImpl.java?view=diff&rev=465725&r1=465724&r2=465725
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateRollerImpl.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateRollerImpl.java Thu Oct 19 11:59:01 2006
@@ -29,7 +29,7 @@
 import org.apache.roller.business.pings.AutoPingManager;
 import org.apache.roller.business.pings.PingQueueManager;
 import org.apache.roller.business.pings.PingTargetManager;
-import org.apache.roller.planet.model.PlanetManager;
+import org.apache.roller.planet.business.PlanetManager;
 import org.apache.roller.business.PropertiesManager;
 import org.apache.roller.business.referrers.RefererManager;
 import org.apache.roller.business.Roller;

Copied: incubator/roller/trunk/src/org/apache/roller/planet/business/PlanetManager.java (from r465720, incubator/roller/trunk/src/org/apache/roller/planet/model/PlanetManager.java)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/planet/business/PlanetManager.java?view=diff&rev=465725&p1=incubator/roller/trunk/src/org/apache/roller/planet/model/PlanetManager.java&r1=465720&p2=incubator/roller/trunk/src/org/apache/roller/planet/business/PlanetManager.java&r2=465725
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/planet/model/PlanetManager.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/planet/business/PlanetManager.java Thu Oct 19 11:59:01 2006
@@ -15,7 +15,7 @@
  * copyright in this work, please see the NOTICE file in the top level
  * directory of this distribution.
  */
-package org.apache.roller.planet.model;
+package org.apache.roller.planet.business;
 
 import java.io.Serializable;
 import java.util.Date;

Modified: incubator/roller/trunk/src/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java?view=diff&rev=465725&r1=465724&r2=465725
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java Thu Oct 19 11:59:01 2006
@@ -45,7 +45,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.planet.model.PlanetManager;
+import org.apache.roller.planet.business.PlanetManager;
 import org.apache.roller.planet.pojos.PlanetConfigData;
 import org.apache.roller.planet.pojos.PlanetEntryData;
 import org.apache.roller.planet.pojos.PlanetGroupData;

Modified: incubator/roller/trunk/src/org/apache/roller/planet/tasks/SyncWebsitesTask.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/planet/tasks/SyncWebsitesTask.java?view=diff&rev=465725&r1=465724&r2=465725
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/planet/tasks/SyncWebsitesTask.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/planet/tasks/SyncWebsitesTask.java Thu Oct 19 11:59:01 2006
@@ -28,7 +28,7 @@
 import org.apache.roller.RollerException;
 import org.apache.roller.business.runnable.RollerTask;
 import org.apache.roller.config.RollerRuntimeConfig;
-import org.apache.roller.planet.model.PlanetManager;
+import org.apache.roller.planet.business.PlanetManager;
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.UserManager;
 import org.apache.roller.planet.pojos.PlanetGroupData;

Modified: incubator/roller/trunk/src/org/apache/roller/planet/tasks/TechnoratiRankingsTask.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/planet/tasks/TechnoratiRankingsTask.java?view=diff&rev=465725&r1=465724&r2=465725
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/planet/tasks/TechnoratiRankingsTask.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/planet/tasks/TechnoratiRankingsTask.java Thu Oct 19 11:59:01 2006
@@ -28,7 +28,7 @@
 import org.apache.roller.RollerException;
 import org.apache.roller.business.runnable.RollerTask;
 import org.apache.roller.config.RollerConfig;
-import org.apache.roller.planet.model.PlanetManager;
+import org.apache.roller.planet.business.PlanetManager;
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.UserManager;
 import org.apache.roller.planet.pojos.PlanetConfigData;

Modified: incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetConfigAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetConfigAction.java?view=diff&rev=465725&r1=465724&r2=465725
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetConfigAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetConfigAction.java Thu Oct 19 11:59:01 2006
@@ -34,7 +34,7 @@
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.actions.DispatchAction;
 import org.apache.roller.config.RollerRuntimeConfig;
-import org.apache.roller.planet.model.PlanetManager;
+import org.apache.roller.planet.business.PlanetManager;
 import org.apache.roller.business.Roller;
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.planet.pojos.PlanetConfigData;

Modified: incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetGroupsAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetGroupsAction.java?view=diff&rev=465725&r1=465724&r2=465725
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetGroupsAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetGroupsAction.java Thu Oct 19 11:59:01 2006
@@ -35,7 +35,7 @@
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.actions.DispatchAction;
 import org.apache.roller.RollerException;
-import org.apache.roller.planet.model.PlanetManager;
+import org.apache.roller.planet.business.PlanetManager;
 import org.apache.roller.business.Roller;
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.planet.pojos.PlanetGroupData;

Modified: incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetSubscriptionsAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetSubscriptionsAction.java?view=diff&rev=465725&r1=465724&r2=465725
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetSubscriptionsAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetSubscriptionsAction.java Thu Oct 19 11:59:01 2006
@@ -37,7 +37,7 @@
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.actions.DispatchAction;
 import org.apache.roller.RollerException;
-import org.apache.roller.planet.model.PlanetManager;
+import org.apache.roller.planet.business.PlanetManager;
 import org.apache.roller.business.Roller;
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.planet.pojos.PlanetConfigData;

Modified: incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/PlanetModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/PlanetModel.java?view=diff&rev=465725&r1=465724&r2=465725
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/PlanetModel.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/PlanetModel.java Thu Oct 19 11:59:01 2006
@@ -25,7 +25,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.planet.model.PlanetManager;
+import org.apache.roller.planet.business.PlanetManager;
 import org.apache.roller.business.Roller;
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.planet.pojos.PlanetSubscriptionData;

Modified: incubator/roller/trunk/src/org/apache/roller/ui/rendering/pagers/PlanetEntriesPager.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/pagers/PlanetEntriesPager.java?view=diff&rev=465725&r1=465724&r2=465725
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/pagers/PlanetEntriesPager.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/pagers/PlanetEntriesPager.java Thu Oct 19 11:59:01 2006
@@ -25,7 +25,7 @@
 import java.util.List;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.planet.model.PlanetManager;
+import org.apache.roller.planet.business.PlanetManager;
 import org.apache.roller.business.Roller;
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.planet.pojos.PlanetEntryData;

Modified: incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PlanetFeedServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PlanetFeedServlet.java?view=diff&rev=465725&r1=465724&r2=465725
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PlanetFeedServlet.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PlanetFeedServlet.java Thu Oct 19 11:59:01 2006
@@ -30,7 +30,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
 import org.apache.roller.config.RollerRuntimeConfig;
-import org.apache.roller.planet.model.PlanetManager;
+import org.apache.roller.planet.business.PlanetManager;
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.pojos.StaticTemplate;
 import org.apache.roller.pojos.Template;

Modified: incubator/roller/trunk/tests/org/apache/roller/business/PlanetManagerLocalTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/tests/org/apache/roller/business/PlanetManagerLocalTest.java?view=diff&rev=465725&r1=465724&r2=465725
==============================================================================
--- incubator/roller/trunk/tests/org/apache/roller/business/PlanetManagerLocalTest.java (original)
+++ incubator/roller/trunk/tests/org/apache/roller/business/PlanetManagerLocalTest.java Thu Oct 19 11:59:01 2006
@@ -25,7 +25,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.TestUtils;
-import org.apache.roller.planet.model.PlanetManager;
+import org.apache.roller.planet.business.PlanetManager;
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.pojos.UserData;
 import org.apache.roller.pojos.WeblogEntryData;

Modified: incubator/roller/trunk/tests/org/apache/roller/business/PlanetManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/tests/org/apache/roller/business/PlanetManagerTest.java?view=diff&rev=465725&r1=465724&r2=465725
==============================================================================
--- incubator/roller/trunk/tests/org/apache/roller/business/PlanetManagerTest.java (original)
+++ incubator/roller/trunk/tests/org/apache/roller/business/PlanetManagerTest.java Thu Oct 19 11:59:01 2006
@@ -29,7 +29,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.TestUtils;
 import org.apache.roller.config.RollerConfig;
-import org.apache.roller.planet.model.PlanetManager;
+import org.apache.roller.planet.business.PlanetManager;
 import org.apache.roller.business.Roller;
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.planet.pojos.PlanetConfigData;