Return-Path: Delivered-To: apmail-incubator-roller-commits-archive@www.apache.org Received: (qmail 72351 invoked from network); 19 Oct 2006 18:34:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 19 Oct 2006 18:34:41 -0000 Received: (qmail 7229 invoked by uid 500); 19 Oct 2006 18:34:41 -0000 Delivered-To: apmail-incubator-roller-commits-archive@incubator.apache.org Received: (qmail 7202 invoked by uid 500); 19 Oct 2006 18:34:41 -0000 Mailing-List: contact roller-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: roller-dev@incubator.apache.org Delivered-To: mailing list roller-commits@incubator.apache.org Received: (qmail 7191 invoked by uid 99); 19 Oct 2006 18:34:41 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Oct 2006 11:34:41 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Oct 2006 11:34:37 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 55F731A981C; Thu, 19 Oct 2006 11:34:17 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r465716 [1/3] - in /incubator/roller/trunk: src/org/apache/roller/business/ src/org/apache/roller/business/hibernate/ src/org/apache/roller/business/pings/ src/org/apache/roller/business/referrers/ src/org/apache/roller/business/runnable/ s... Date: Thu, 19 Oct 2006 18:34:12 -0000 To: roller-commits@incubator.apache.org From: agilliland@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061019183417.55F731A981C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: agilliland Date: Thu Oct 19 11:34:05 2006 New Revision: 465716 URL: http://svn.apache.org/viewvc?view=rev&rev=465716 Log: Moving org.apache.roller.model.* classes under org.apache.roller.business.* This commit moves RollerFactory, Roller, and RefererManager Added: incubator/roller/trunk/src/org/apache/roller/business/Roller.java - copied, changed from r465714, incubator/roller/trunk/src/org/apache/roller/model/Roller.java incubator/roller/trunk/src/org/apache/roller/business/RollerFactory.java - copied, changed from r465668, incubator/roller/trunk/src/org/apache/roller/model/RollerFactory.java incubator/roller/trunk/src/org/apache/roller/business/referrers/RefererManager.java - copied, changed from r465668, incubator/roller/trunk/src/org/apache/roller/model/RefererManager.java Removed: incubator/roller/trunk/src/org/apache/roller/model/RefererManager.java incubator/roller/trunk/src/org/apache/roller/model/Roller.java incubator/roller/trunk/src/org/apache/roller/model/RollerFactory.java Modified: incubator/roller/trunk/src/org/apache/roller/business/IndexManagerImpl.java incubator/roller/trunk/src/org/apache/roller/business/RollerImpl.java incubator/roller/trunk/src/org/apache/roller/business/ThemeManagerImpl.java incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateAutoPingManagerImpl.java incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateBookmarkManagerImpl.java incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernatePingTargetManagerImpl.java incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernatePropertiesManagerImpl.java incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateRefererManagerImpl.java incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateRollerImpl.java incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateRollerPlanetManagerImpl.java incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateThreadManagerImpl.java incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java incubator/roller/trunk/src/org/apache/roller/business/pings/PingQueueProcessor.java incubator/roller/trunk/src/org/apache/roller/business/pings/PingQueueTask.java incubator/roller/trunk/src/org/apache/roller/business/referrers/QueuedReferrerProcessingJob.java incubator/roller/trunk/src/org/apache/roller/business/referrers/ReferrerProcessingJob.java incubator/roller/trunk/src/org/apache/roller/business/referrers/ReferrerQueueManagerImpl.java incubator/roller/trunk/src/org/apache/roller/business/runnable/RollerTask.java incubator/roller/trunk/src/org/apache/roller/business/runnable/TurnoverReferersTask.java incubator/roller/trunk/src/org/apache/roller/business/runnable/WorkerThread.java incubator/roller/trunk/src/org/apache/roller/business/search/operations/AddEntryOperation.java incubator/roller/trunk/src/org/apache/roller/business/search/operations/ReIndexEntryOperation.java incubator/roller/trunk/src/org/apache/roller/business/search/operations/RebuildWebsiteIndexOperation.java incubator/roller/trunk/src/org/apache/roller/config/PingConfig.java incubator/roller/trunk/src/org/apache/roller/config/RollerRuntimeConfig.java incubator/roller/trunk/src/org/apache/roller/planet/pojos/PlanetEntryData.java incubator/roller/trunk/src/org/apache/roller/planet/tasks/RefreshEntriesTask.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/pojos/BookmarkData.java incubator/roller/trunk/src/org/apache/roller/pojos/FolderData.java incubator/roller/trunk/src/org/apache/roller/pojos/RollerConfigData.java incubator/roller/trunk/src/org/apache/roller/pojos/UserData.java incubator/roller/trunk/src/org/apache/roller/pojos/WeblogCategoryAssoc.java incubator/roller/trunk/src/org/apache/roller/pojos/WeblogCategoryData.java incubator/roller/trunk/src/org/apache/roller/pojos/WeblogEntryData.java incubator/roller/trunk/src/org/apache/roller/pojos/WebsiteData.java incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/CommonPingTargetsAction.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/admin/struts/actions/RollerPropertiesAction.java incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/UserAdminAction.java incubator/roller/trunk/src/org/apache/roller/ui/authoring/ajax/UserDataServlet.java incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BasePingTargetsAction.java incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarkEditAction.java incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarkSaveAction.java incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarksAction.java incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategoriesAction.java incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategoryDeleteAction.java incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategoryEditAction.java incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategorySaveAction.java incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CommentManagementAction.java incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CustomPingTargetsAction.java incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/FolderEditAction.java incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/FolderSaveAction.java incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ImportBookmarksFormAction.java incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ImportEntriesAction.java incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/InvitationsAction.java incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/InviteMemberAction.java incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/MaintenanceAction.java incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/MemberPermissionsAction.java incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/PingSetupAction.java incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ReferersAction.java incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ThemeEditorAction.java incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ToggleLinkbackDisplayAction.java incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/UploadFileFormAction.java incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryManagementAction.java incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryPageModel.java incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogTemplateFormAction.java incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WebsiteFormAction.java incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/WebsiteFormEx.java incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/ShowEntryContentTag.java incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/ShowEntrySummaryTag.java incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/ShowEntryTextTag.java incubator/roller/trunk/src/org/apache/roller/ui/core/RollerContext.java incubator/roller/trunk/src/org/apache/roller/ui/core/RollerRequest.java incubator/roller/trunk/src/org/apache/roller/ui/core/RollerSession.java incubator/roller/trunk/src/org/apache/roller/ui/core/filters/PersistenceSessionFilter.java incubator/roller/trunk/src/org/apache/roller/ui/core/filters/RequestFilter.java incubator/roller/trunk/src/org/apache/roller/ui/core/security/BasicUserAutoProvision.java incubator/roller/trunk/src/org/apache/roller/ui/core/struts/actions/CreateWebsiteAction.java incubator/roller/trunk/src/org/apache/roller/ui/core/struts/actions/UserNewAction.java incubator/roller/trunk/src/org/apache/roller/ui/core/struts/actions/YourProfileAction.java incubator/roller/trunk/src/org/apache/roller/ui/core/struts/actions/YourWebsitesAction.java incubator/roller/trunk/src/org/apache/roller/ui/core/tags/calendar/BigWeblogCalendarModel.java incubator/roller/trunk/src/org/apache/roller/ui/core/tags/calendar/WeblogCalendarModel.java incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/BaseRollerMenu.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/WeblogRequestMapper.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/FeedModel.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/PageModel.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/PlanetModel.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/SearchResultsModel.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/SiteModel.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/pagers/CommentsPager.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/pagers/PlanetEntriesPager.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/pagers/UsersPager.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesDayPager.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesLatestPager.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesListPager.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesMonthPager.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesPermalinkPager.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesPreviewPager.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogsPager.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/AcronymsPlugin.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/BookmarkPlugin.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/TopicTagPlugin.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PageServlet.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PlanetFeedServlet.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PreviewResourceServlet.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/ResourceServlet.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/SearchServlet.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/TrackbackServlet.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/util/WeblogCommentRequest.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/util/WeblogFeedRequest.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/util/WeblogPageRequest.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/util/WeblogPreviewRequest.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/util/WeblogPreviewResourceRequest.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/util/WeblogRequest.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/util/WeblogSearchRequest.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/util/WeblogTrackbackRequest.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/util/cache/PlanetCache.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/util/cache/WeblogCacheWarmupJob.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/RollerResourceLoader.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/ThemeResourceLoader.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/OldPageHelper.java incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/OldWeblogPageModel.java incubator/roller/trunk/src/org/apache/roller/util/cache/CacheManager.java incubator/roller/trunk/src/org/apache/roller/util/cache/FuturePostingsInvalidationJob.java incubator/roller/trunk/src/org/apache/roller/webservices/adminapi/Authenticator.java incubator/roller/trunk/src/org/apache/roller/webservices/adminapi/Handler.java incubator/roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java incubator/roller/trunk/src/org/apache/roller/webservices/json/TagStatsServlet.java incubator/roller/trunk/src/org/apache/roller/webservices/xmlrpc/BaseAPIHandler.java incubator/roller/trunk/src/org/apache/roller/webservices/xmlrpc/BloggerAPIHandler.java incubator/roller/trunk/src/org/apache/roller/webservices/xmlrpc/MetaWeblogAPIHandler.java incubator/roller/trunk/tests/org/apache/roller/TestUtils.java incubator/roller/trunk/tests/org/apache/roller/business/BookmarkTest.java incubator/roller/trunk/tests/org/apache/roller/business/CommentTest.java incubator/roller/trunk/tests/org/apache/roller/business/FileManagerTest.java incubator/roller/trunk/tests/org/apache/roller/business/IndexManagerTest.java incubator/roller/trunk/tests/org/apache/roller/business/PermissionTest.java incubator/roller/trunk/tests/org/apache/roller/business/PingsTest.java incubator/roller/trunk/tests/org/apache/roller/business/PlanetManagerLocalTest.java incubator/roller/trunk/tests/org/apache/roller/business/PlanetManagerTest.java incubator/roller/trunk/tests/org/apache/roller/business/PluginManagerTest.java incubator/roller/trunk/tests/org/apache/roller/business/PropertiesTest.java incubator/roller/trunk/tests/org/apache/roller/business/RefererTest.java incubator/roller/trunk/tests/org/apache/roller/business/TaskLockTest.java incubator/roller/trunk/tests/org/apache/roller/business/UserTest.java incubator/roller/trunk/tests/org/apache/roller/business/WeblogCategoryTest.java incubator/roller/trunk/tests/org/apache/roller/business/WeblogEntryTest.java incubator/roller/trunk/tests/org/apache/roller/business/WeblogPageTest.java incubator/roller/trunk/tests/org/apache/roller/business/WeblogStatsTest.java incubator/roller/trunk/tests/org/apache/roller/business/WeblogTest.java incubator/roller/trunk/tests/org/apache/roller/ui/StrutsActionTestBase.java incubator/roller/trunk/tests/org/apache/roller/ui/authoring/struts/actions/BookmarksActionTest.java incubator/roller/trunk/tests/org/apache/roller/ui/authoring/struts/actions/WeblogEntryActionTest.java incubator/roller/trunk/tests/org/apache/roller/webservices/xmlrpc/RollerXmlRpcServerTest.java Modified: incubator/roller/trunk/src/org/apache/roller/business/IndexManagerImpl.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/IndexManagerImpl.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/business/IndexManagerImpl.java (original) +++ incubator/roller/trunk/src/org/apache/roller/business/IndexManagerImpl.java Thu Oct 19 11:34:05 2006 @@ -45,7 +45,7 @@ import EDU.oswego.cs.dl.util.concurrent.ReadWriteLock; import EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock; import org.apache.roller.config.RollerConfig; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; import org.apache.commons.lang.StringUtils; /** Copied: incubator/roller/trunk/src/org/apache/roller/business/Roller.java (from r465714, incubator/roller/trunk/src/org/apache/roller/model/Roller.java) URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/Roller.java?view=diff&rev=465716&p1=incubator/roller/trunk/src/org/apache/roller/model/Roller.java&r1=465714&p2=incubator/roller/trunk/src/org/apache/roller/business/Roller.java&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/model/Roller.java (original) +++ incubator/roller/trunk/src/org/apache/roller/business/Roller.java Thu Oct 19 11:34:05 2006 @@ -16,20 +16,14 @@ * directory of this distribution. */ -package org.apache.roller.model; +package org.apache.roller.business; import java.io.Serializable; import java.sql.Connection; import org.apache.roller.RollerException; -import org.apache.roller.business.BookmarkManager; -import org.apache.roller.business.ConfigManager; -import org.apache.roller.business.FileManager; -import org.apache.roller.business.PluginManager; -import org.apache.roller.business.PropertiesManager; -import org.apache.roller.business.ThemeManager; -import org.apache.roller.business.UserManager; -import org.apache.roller.business.WeblogManager; +import org.apache.roller.business.referrers.RefererManager; import org.apache.roller.business.referrers.ReferrerQueueManager; +import org.apache.roller.model.*; import org.apache.roller.planet.model.PlanetManager; Copied: incubator/roller/trunk/src/org/apache/roller/business/RollerFactory.java (from r465668, incubator/roller/trunk/src/org/apache/roller/model/RollerFactory.java) URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/RollerFactory.java?view=diff&rev=465716&p1=incubator/roller/trunk/src/org/apache/roller/model/RollerFactory.java&r1=465668&p2=incubator/roller/trunk/src/org/apache/roller/business/RollerFactory.java&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/model/RollerFactory.java (original) +++ incubator/roller/trunk/src/org/apache/roller/business/RollerFactory.java Thu Oct 19 11:34:05 2006 @@ -16,7 +16,7 @@ * directory of this distribution. */ -package org.apache.roller.model; +package org.apache.roller.business; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: incubator/roller/trunk/src/org/apache/roller/business/RollerImpl.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/RollerImpl.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/business/RollerImpl.java (original) +++ incubator/roller/trunk/src/org/apache/roller/business/RollerImpl.java Thu Oct 19 11:34:05 2006 @@ -28,7 +28,7 @@ import org.apache.roller.business.FileManager; import org.apache.roller.model.IndexManager; import org.apache.roller.business.PluginManager; -import org.apache.roller.model.Roller; +import org.apache.roller.business.Roller; import org.apache.roller.business.ThemeManager; import org.apache.roller.model.ThreadManager; Modified: incubator/roller/trunk/src/org/apache/roller/business/ThemeManagerImpl.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/ThemeManagerImpl.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/business/ThemeManagerImpl.java (original) +++ incubator/roller/trunk/src/org/apache/roller/business/ThemeManagerImpl.java Thu Oct 19 11:34:05 2006 @@ -39,7 +39,7 @@ import org.apache.roller.business.FileIOException; import org.apache.roller.business.FileManager; import org.apache.roller.business.FilePathException; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; import org.apache.roller.business.ThemeManager; import org.apache.roller.business.UserManager; import org.apache.roller.pojos.Theme; Modified: incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateAutoPingManagerImpl.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateAutoPingManagerImpl.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateAutoPingManagerImpl.java (original) +++ incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateAutoPingManagerImpl.java Thu Oct 19 11:34:05 2006 @@ -36,7 +36,7 @@ import org.apache.roller.config.PingConfig; import org.apache.roller.model.AutoPingManager; import org.apache.roller.model.PingQueueManager; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; /** Modified: incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateBookmarkManagerImpl.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateBookmarkManagerImpl.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateBookmarkManagerImpl.java (original) +++ incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateBookmarkManagerImpl.java Thu Oct 19 11:34:05 2006 @@ -40,7 +40,7 @@ import org.jdom.Element; import org.jdom.input.SAXBuilder; import org.apache.roller.business.BookmarkManager; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; import org.apache.roller.util.Utilities; Modified: incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernatePingTargetManagerImpl.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernatePingTargetManagerImpl.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernatePingTargetManagerImpl.java (original) +++ incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernatePingTargetManagerImpl.java Thu Oct 19 11:34:05 2006 @@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.roller.model.AutoPingManager; import org.apache.roller.model.PingTargetManager; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; import org.apache.roller.pojos.AutoPingData; import org.apache.roller.pojos.PingQueueEntryData; Modified: incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernatePropertiesManagerImpl.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernatePropertiesManagerImpl.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernatePropertiesManagerImpl.java (original) +++ incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernatePropertiesManagerImpl.java Thu Oct 19 11:34:05 2006 @@ -39,8 +39,8 @@ import org.apache.roller.config.runtime.PropertyDef; import org.apache.roller.config.runtime.RuntimeConfigDefs; import org.apache.roller.business.PropertiesManager; -import org.apache.roller.model.Roller; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.Roller; +import org.apache.roller.business.RollerFactory; import org.apache.roller.pojos.RollerConfigData; import org.apache.roller.pojos.RollerPropertyData; Modified: incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateRefererManagerImpl.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateRefererManagerImpl.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateRefererManagerImpl.java (original) +++ incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateRefererManagerImpl.java Thu Oct 19 11:34:05 2006 @@ -37,7 +37,7 @@ import org.hibernate.type.Type; import org.apache.roller.RollerException; import org.apache.roller.config.RollerRuntimeConfig; -import org.apache.roller.model.RefererManager; +import org.apache.roller.business.referrers.RefererManager; import org.apache.roller.pojos.RefererData; import org.apache.roller.pojos.WeblogEntryData; import org.apache.roller.pojos.WebsiteData; @@ -46,8 +46,8 @@ import org.hibernate.dialect.SQLServerDialect; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.dialect.Dialect; -import org.apache.roller.model.Roller; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.Roller; +import org.apache.roller.business.RollerFactory; import org.apache.roller.business.UserManager; import org.apache.roller.business.WeblogManager; import org.apache.roller.pojos.StatCount; 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=465716&r1=465715&r2=465716 ============================================================================== --- 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:34:05 2006 @@ -31,8 +31,8 @@ import org.apache.roller.model.PingTargetManager; import org.apache.roller.planet.model.PlanetManager; import org.apache.roller.business.PropertiesManager; -import org.apache.roller.model.RefererManager; -import org.apache.roller.model.Roller; +import org.apache.roller.business.referrers.RefererManager; +import org.apache.roller.business.Roller; import org.apache.roller.business.UserManager; import org.apache.roller.business.WeblogManager; import org.apache.roller.model.ThreadManager; Modified: incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateRollerPlanetManagerImpl.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateRollerPlanetManagerImpl.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateRollerPlanetManagerImpl.java (original) +++ incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateRollerPlanetManagerImpl.java Thu Oct 19 11:34:05 2006 @@ -34,7 +34,7 @@ import org.apache.roller.RollerException; import org.apache.roller.config.RollerRuntimeConfig; import org.apache.roller.business.PluginManager; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; import org.apache.roller.business.UserManager; import org.apache.roller.business.WeblogManager; import org.apache.roller.planet.business.hibernate.HibernatePlanetManagerImpl; Modified: incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateThreadManagerImpl.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateThreadManagerImpl.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateThreadManagerImpl.java (original) +++ incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateThreadManagerImpl.java Thu Oct 19 11:34:05 2006 @@ -25,7 +25,7 @@ import org.apache.roller.RollerException; import org.apache.roller.business.ThreadManagerImpl; import org.apache.roller.business.runnable.RollerTask; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; import org.apache.roller.pojos.TaskLockData; import org.hibernate.Criteria; import org.hibernate.HibernateException; Modified: incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java (original) +++ incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java Thu Oct 19 11:34:05 2006 @@ -41,7 +41,7 @@ import org.apache.roller.model.AutoPingManager; import org.apache.roller.business.BookmarkManager; import org.apache.roller.model.PingTargetManager; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; import org.apache.roller.business.UserManager; import org.apache.roller.business.WeblogManager; import org.apache.roller.pojos.AutoPingData; Modified: incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java (original) +++ incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java Thu Oct 19 11:34:05 2006 @@ -39,7 +39,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.roller.RollerException; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; import org.apache.roller.business.WeblogManager; import org.apache.roller.pojos.Assoc; import org.apache.roller.pojos.CommentData; Modified: incubator/roller/trunk/src/org/apache/roller/business/pings/PingQueueProcessor.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/pings/PingQueueProcessor.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/business/pings/PingQueueProcessor.java (original) +++ incubator/roller/trunk/src/org/apache/roller/business/pings/PingQueueProcessor.java Thu Oct 19 11:34:05 2006 @@ -25,7 +25,7 @@ import org.apache.roller.config.PingConfig; import org.apache.roller.config.RollerRuntimeConfig; import org.apache.roller.model.PingQueueManager; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; import org.apache.roller.pojos.PingQueueEntryData; import org.apache.roller.pojos.PingTargetData; import org.apache.roller.pojos.WebsiteData; Modified: incubator/roller/trunk/src/org/apache/roller/business/pings/PingQueueTask.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/pings/PingQueueTask.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/business/pings/PingQueueTask.java (original) +++ incubator/roller/trunk/src/org/apache/roller/business/pings/PingQueueTask.java Thu Oct 19 11:34:05 2006 @@ -26,8 +26,8 @@ import org.apache.roller.RollerException; import org.apache.roller.business.runnable.RollerTask; import org.apache.roller.config.PingConfig; -import org.apache.roller.model.Roller; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.Roller; +import org.apache.roller.business.RollerFactory; /** Modified: incubator/roller/trunk/src/org/apache/roller/business/referrers/QueuedReferrerProcessingJob.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/referrers/QueuedReferrerProcessingJob.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/business/referrers/QueuedReferrerProcessingJob.java (original) +++ incubator/roller/trunk/src/org/apache/roller/business/referrers/QueuedReferrerProcessingJob.java Thu Oct 19 11:34:05 2006 @@ -23,7 +23,7 @@ package org.apache.roller.business.referrers; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; /** Copied: incubator/roller/trunk/src/org/apache/roller/business/referrers/RefererManager.java (from r465668, incubator/roller/trunk/src/org/apache/roller/model/RefererManager.java) URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/referrers/RefererManager.java?view=diff&rev=465716&p1=incubator/roller/trunk/src/org/apache/roller/model/RefererManager.java&r1=465668&p2=incubator/roller/trunk/src/org/apache/roller/business/referrers/RefererManager.java&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/model/RefererManager.java (original) +++ incubator/roller/trunk/src/org/apache/roller/business/referrers/RefererManager.java Thu Oct 19 11:34:05 2006 @@ -16,7 +16,7 @@ * directory of this distribution. */ -package org.apache.roller.model; +package org.apache.roller.business.referrers; import java.util.List; import org.apache.roller.RollerException; Modified: incubator/roller/trunk/src/org/apache/roller/business/referrers/ReferrerProcessingJob.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/referrers/ReferrerProcessingJob.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/business/referrers/ReferrerProcessingJob.java (original) +++ incubator/roller/trunk/src/org/apache/roller/business/referrers/ReferrerProcessingJob.java Thu Oct 19 11:34:05 2006 @@ -29,8 +29,8 @@ import org.apache.commons.logging.LogFactory; import org.apache.roller.RollerException; import org.apache.roller.business.runnable.Job; -import org.apache.roller.model.RefererManager; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.referrers.RefererManager; +import org.apache.roller.business.RollerFactory; /** Modified: incubator/roller/trunk/src/org/apache/roller/business/referrers/ReferrerQueueManagerImpl.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/referrers/ReferrerQueueManagerImpl.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/business/referrers/ReferrerQueueManagerImpl.java (original) +++ incubator/roller/trunk/src/org/apache/roller/business/referrers/ReferrerQueueManagerImpl.java Thu Oct 19 11:34:05 2006 @@ -34,7 +34,7 @@ import org.apache.roller.business.runnable.ContinuousWorkerThread; import org.apache.roller.business.runnable.WorkerThread; import org.apache.roller.config.RollerConfig; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; /** Modified: incubator/roller/trunk/src/org/apache/roller/business/runnable/RollerTask.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/runnable/RollerTask.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/business/runnable/RollerTask.java (original) +++ incubator/roller/trunk/src/org/apache/roller/business/runnable/RollerTask.java Thu Oct 19 11:34:05 2006 @@ -26,7 +26,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.roller.RollerException; import org.apache.roller.config.RollerConfig; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; import org.apache.roller.model.ThreadManager; import org.apache.roller.util.DateUtil; Modified: incubator/roller/trunk/src/org/apache/roller/business/runnable/TurnoverReferersTask.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/runnable/TurnoverReferersTask.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/business/runnable/TurnoverReferersTask.java (original) +++ incubator/roller/trunk/src/org/apache/roller/business/runnable/TurnoverReferersTask.java Thu Oct 19 11:34:05 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.model.Roller; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.Roller; +import org.apache.roller.business.RollerFactory; /** Modified: incubator/roller/trunk/src/org/apache/roller/business/runnable/WorkerThread.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/runnable/WorkerThread.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/business/runnable/WorkerThread.java (original) +++ incubator/roller/trunk/src/org/apache/roller/business/runnable/WorkerThread.java Thu Oct 19 11:34:05 2006 @@ -25,8 +25,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.roller.model.Roller; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.Roller; +import org.apache.roller.business.RollerFactory; /** Modified: incubator/roller/trunk/src/org/apache/roller/business/search/operations/AddEntryOperation.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/search/operations/AddEntryOperation.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/business/search/operations/AddEntryOperation.java (original) +++ incubator/roller/trunk/src/org/apache/roller/business/search/operations/AddEntryOperation.java Thu Oct 19 11:34:05 2006 @@ -24,8 +24,8 @@ import org.apache.commons.logging.LogFactory; import org.apache.lucene.index.IndexWriter; import org.apache.roller.business.IndexManagerImpl; -import org.apache.roller.model.Roller; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.Roller; +import org.apache.roller.business.RollerFactory; import org.apache.roller.pojos.WeblogEntryData; /** Modified: incubator/roller/trunk/src/org/apache/roller/business/search/operations/ReIndexEntryOperation.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/search/operations/ReIndexEntryOperation.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/business/search/operations/ReIndexEntryOperation.java (original) +++ incubator/roller/trunk/src/org/apache/roller/business/search/operations/ReIndexEntryOperation.java Thu Oct 19 11:34:05 2006 @@ -27,8 +27,8 @@ import org.apache.lucene.index.Term; import org.apache.roller.business.IndexManagerImpl; import org.apache.roller.business.search.FieldConstants; -import org.apache.roller.model.Roller; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.Roller; +import org.apache.roller.business.RollerFactory; import org.apache.roller.pojos.WeblogEntryData; /** Modified: incubator/roller/trunk/src/org/apache/roller/business/search/operations/RebuildWebsiteIndexOperation.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/search/operations/RebuildWebsiteIndexOperation.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/business/search/operations/RebuildWebsiteIndexOperation.java (original) +++ incubator/roller/trunk/src/org/apache/roller/business/search/operations/RebuildWebsiteIndexOperation.java Thu Oct 19 11:34:05 2006 @@ -33,8 +33,8 @@ import org.apache.roller.business.IndexManagerImpl; import org.apache.roller.business.search.FieldConstants; import org.apache.roller.business.search.IndexUtil; -import org.apache.roller.model.Roller; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.Roller; +import org.apache.roller.business.RollerFactory; import org.apache.roller.business.WeblogManager; import org.apache.roller.pojos.WeblogEntryData; import org.apache.roller.pojos.WebsiteData; Modified: incubator/roller/trunk/src/org/apache/roller/config/PingConfig.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/config/PingConfig.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/config/PingConfig.java (original) +++ incubator/roller/trunk/src/org/apache/roller/config/PingConfig.java Thu Oct 19 11:34:05 2006 @@ -22,7 +22,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.roller.RollerException; import org.apache.roller.model.PingTargetManager; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; import org.apache.roller.pojos.PingTargetData; import java.util.*; Modified: incubator/roller/trunk/src/org/apache/roller/config/RollerRuntimeConfig.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/config/RollerRuntimeConfig.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/config/RollerRuntimeConfig.java (original) +++ incubator/roller/trunk/src/org/apache/roller/config/RollerRuntimeConfig.java Thu Oct 19 11:34:05 2006 @@ -27,7 +27,7 @@ import org.apache.roller.config.runtime.RuntimeConfigDefs; import org.apache.roller.config.runtime.RuntimeConfigDefsParser; import org.apache.roller.business.PropertiesManager; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; /** Modified: incubator/roller/trunk/src/org/apache/roller/planet/pojos/PlanetEntryData.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/planet/pojos/PlanetEntryData.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/planet/pojos/PlanetEntryData.java (original) +++ incubator/roller/trunk/src/org/apache/roller/planet/pojos/PlanetEntryData.java Thu Oct 19 11:34:05 2006 @@ -39,8 +39,8 @@ import org.apache.commons.lang.StringEscapeUtils; import org.apache.roller.RollerException; import org.apache.roller.business.PluginManager; -import org.apache.roller.model.Roller; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.Roller; +import org.apache.roller.business.RollerFactory; /** * Represents a planet entry, i.e. an entry that was parsed out of an RSS or Modified: incubator/roller/trunk/src/org/apache/roller/planet/tasks/RefreshEntriesTask.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/planet/tasks/RefreshEntriesTask.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/planet/tasks/RefreshEntriesTask.java (original) +++ incubator/roller/trunk/src/org/apache/roller/planet/tasks/RefreshEntriesTask.java Thu Oct 19 11:34:05 2006 @@ -24,8 +24,8 @@ import org.apache.commons.logging.LogFactory; import org.apache.roller.RollerException; import org.apache.roller.business.runnable.RollerTask; -import org.apache.roller.model.Roller; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.Roller; +import org.apache.roller.business.RollerFactory; /** 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=465716&r1=465715&r2=465716 ============================================================================== --- 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:34:05 2006 @@ -29,7 +29,7 @@ import org.apache.roller.business.runnable.RollerTask; import org.apache.roller.config.RollerRuntimeConfig; import org.apache.roller.planet.model.PlanetManager; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; import org.apache.roller.business.UserManager; import org.apache.roller.planet.pojos.PlanetGroupData; import org.apache.roller.planet.pojos.PlanetSubscriptionData; 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=465716&r1=465715&r2=465716 ============================================================================== --- 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:34:05 2006 @@ -29,7 +29,7 @@ import org.apache.roller.business.runnable.RollerTask; import org.apache.roller.config.RollerConfig; import org.apache.roller.planet.model.PlanetManager; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; import org.apache.roller.business.UserManager; import org.apache.roller.planet.pojos.PlanetConfigData; import org.apache.roller.planet.pojos.PlanetSubscriptionData; Modified: incubator/roller/trunk/src/org/apache/roller/pojos/BookmarkData.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/pojos/BookmarkData.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/pojos/BookmarkData.java (original) +++ incubator/roller/trunk/src/org/apache/roller/pojos/BookmarkData.java Thu Oct 19 11:34:05 2006 @@ -19,8 +19,8 @@ import org.apache.roller.RollerException; import org.apache.roller.business.BookmarkManager; -import org.apache.roller.model.Roller; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.Roller; +import org.apache.roller.business.RollerFactory; import java.io.Serializable; Modified: incubator/roller/trunk/src/org/apache/roller/pojos/FolderData.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/pojos/FolderData.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/pojos/FolderData.java (original) +++ incubator/roller/trunk/src/org/apache/roller/pojos/FolderData.java Thu Oct 19 11:34:05 2006 @@ -26,7 +26,7 @@ import org.apache.roller.RollerException; import org.apache.roller.business.BookmarkManager; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; /** *

Folder that holds Bookmarks and other Folders. A Roller Website has a Modified: incubator/roller/trunk/src/org/apache/roller/pojos/RollerConfigData.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/pojos/RollerConfigData.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/pojos/RollerConfigData.java (original) +++ incubator/roller/trunk/src/org/apache/roller/pojos/RollerConfigData.java Thu Oct 19 11:34:05 2006 @@ -26,8 +26,8 @@ import org.apache.commons.lang.StringUtils; import org.apache.roller.RollerException; -import org.apache.roller.model.Roller; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.Roller; +import org.apache.roller.business.RollerFactory; import org.apache.roller.util.PojoUtil; /** Modified: incubator/roller/trunk/src/org/apache/roller/pojos/UserData.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/pojos/UserData.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/pojos/UserData.java (original) +++ incubator/roller/trunk/src/org/apache/roller/pojos/UserData.java Thu Oct 19 11:34:05 2006 @@ -28,7 +28,7 @@ import org.apache.roller.RollerException; import org.apache.roller.config.RollerConfig; -import org.apache.roller.model.Roller; +import org.apache.roller.business.Roller; import org.apache.roller.util.PojoUtil; import org.apache.roller.util.Utilities; Modified: incubator/roller/trunk/src/org/apache/roller/pojos/WeblogCategoryAssoc.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/pojos/WeblogCategoryAssoc.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/pojos/WeblogCategoryAssoc.java (original) +++ incubator/roller/trunk/src/org/apache/roller/pojos/WeblogCategoryAssoc.java Thu Oct 19 11:34:05 2006 @@ -18,7 +18,7 @@ package org.apache.roller.pojos; import org.apache.roller.RollerException; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; /** *

WeblogCategoryAssoc represents association between weblog categories Modified: incubator/roller/trunk/src/org/apache/roller/pojos/WeblogCategoryData.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/pojos/WeblogCategoryData.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/pojos/WeblogCategoryData.java (original) +++ incubator/roller/trunk/src/org/apache/roller/pojos/WeblogCategoryData.java Thu Oct 19 11:34:05 2006 @@ -22,8 +22,8 @@ import java.util.List; import org.apache.roller.RollerException; -import org.apache.roller.model.Roller; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.Roller; +import org.apache.roller.business.RollerFactory; import org.apache.roller.business.WeblogManager; import org.apache.roller.util.PojoUtil; Modified: incubator/roller/trunk/src/org/apache/roller/pojos/WeblogEntryData.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/pojos/WeblogEntryData.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/pojos/WeblogEntryData.java (original) +++ incubator/roller/trunk/src/org/apache/roller/pojos/WeblogEntryData.java Thu Oct 19 11:34:05 2006 @@ -43,8 +43,8 @@ import org.apache.commons.logging.LogFactory; import org.apache.roller.RollerException; import org.apache.roller.config.RollerRuntimeConfig; -import org.apache.roller.model.Roller; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.Roller; +import org.apache.roller.business.RollerFactory; import org.apache.roller.business.UserManager; import org.apache.roller.business.WeblogEntryPlugin; import org.apache.roller.business.WeblogManager; Modified: incubator/roller/trunk/src/org/apache/roller/pojos/WebsiteData.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/pojos/WebsiteData.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/pojos/WebsiteData.java (original) +++ incubator/roller/trunk/src/org/apache/roller/pojos/WebsiteData.java Thu Oct 19 11:34:05 2006 @@ -31,8 +31,8 @@ import java.util.TreeMap; import org.apache.commons.lang.StringUtils; import org.apache.roller.RollerException; -import org.apache.roller.model.RefererManager; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.referrers.RefererManager; +import org.apache.roller.business.RollerFactory; import org.apache.roller.util.PojoUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -40,7 +40,7 @@ import org.apache.roller.config.RollerRuntimeConfig; import org.apache.roller.business.BookmarkManager; import org.apache.roller.business.PluginManager; -import org.apache.roller.model.Roller; +import org.apache.roller.business.Roller; import org.apache.roller.business.ThemeManager; import org.apache.roller.business.UserManager; import org.apache.roller.business.WeblogManager; Modified: incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/CommonPingTargetsAction.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/CommonPingTargetsAction.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/CommonPingTargetsAction.java (original) +++ incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/CommonPingTargetsAction.java Thu Oct 19 11:34:05 2006 @@ -22,7 +22,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.roller.RollerException; import org.apache.roller.model.PingTargetManager; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; import org.apache.roller.pojos.PingTargetData; import org.apache.roller.pojos.WebsiteData; import org.apache.roller.ui.authoring.struts.actions.BasePingTargetsAction; 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=465716&r1=465715&r2=465716 ============================================================================== --- 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:34:05 2006 @@ -35,8 +35,8 @@ import org.apache.struts.actions.DispatchAction; import org.apache.roller.config.RollerRuntimeConfig; import org.apache.roller.planet.model.PlanetManager; -import org.apache.roller.model.Roller; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.Roller; +import org.apache.roller.business.RollerFactory; import org.apache.roller.planet.pojos.PlanetConfigData; import org.apache.roller.planet.pojos.PlanetGroupData; import org.apache.roller.planet.ui.authoring.struts.forms.PlanetConfigForm; 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=465716&r1=465715&r2=465716 ============================================================================== --- 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:34:05 2006 @@ -36,8 +36,8 @@ import org.apache.struts.actions.DispatchAction; import org.apache.roller.RollerException; import org.apache.roller.planet.model.PlanetManager; -import org.apache.roller.model.Roller; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.Roller; +import org.apache.roller.business.RollerFactory; import org.apache.roller.planet.pojos.PlanetGroupData; import org.apache.roller.planet.ui.authoring.struts.forms.PlanetGroupForm; import org.apache.roller.ui.core.BasePageModel; 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=465716&r1=465715&r2=465716 ============================================================================== --- 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:34:05 2006 @@ -38,8 +38,8 @@ import org.apache.struts.actions.DispatchAction; import org.apache.roller.RollerException; import org.apache.roller.planet.model.PlanetManager; -import org.apache.roller.model.Roller; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.Roller; +import org.apache.roller.business.RollerFactory; import org.apache.roller.planet.pojos.PlanetConfigData; import org.apache.roller.planet.pojos.PlanetGroupData; import org.apache.roller.planet.pojos.PlanetSubscriptionData; Modified: incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/RollerPropertiesAction.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/RollerPropertiesAction.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/RollerPropertiesAction.java (original) +++ incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/RollerPropertiesAction.java Thu Oct 19 11:34:05 2006 @@ -44,8 +44,8 @@ import org.apache.roller.RollerException; import org.apache.roller.RollerPermissionsException; import org.apache.roller.business.PropertiesManager; -import org.apache.roller.model.Roller; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.Roller; +import org.apache.roller.business.RollerFactory; import org.apache.roller.pojos.RollerPropertyData; import org.apache.roller.ui.core.BasePageModel; import org.apache.roller.ui.core.RollerRequest; Modified: incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/UserAdminAction.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/UserAdminAction.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/UserAdminAction.java (original) +++ incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/UserAdminAction.java Thu Oct 19 11:34:05 2006 @@ -39,8 +39,8 @@ import org.apache.struts.action.ActionMessages; import org.apache.roller.RollerException; import org.apache.roller.model.IndexManager; -import org.apache.roller.model.Roller; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.Roller; +import org.apache.roller.business.RollerFactory; import org.apache.roller.business.UserManager; import org.apache.roller.pojos.UserData; import org.apache.roller.ui.core.BasePageModel; Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/ajax/UserDataServlet.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/ajax/UserDataServlet.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/ui/authoring/ajax/UserDataServlet.java (original) +++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/ajax/UserDataServlet.java Thu Oct 19 11:34:05 2006 @@ -27,8 +27,8 @@ import javax.servlet.http.HttpServletResponse; import org.apache.roller.RollerException; -import org.apache.roller.model.Roller; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.Roller; +import org.apache.roller.business.RollerFactory; import org.apache.roller.business.UserManager; import org.apache.roller.pojos.UserData; Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BasePingTargetsAction.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BasePingTargetsAction.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BasePingTargetsAction.java (original) +++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BasePingTargetsAction.java Thu Oct 19 11:34:05 2006 @@ -19,7 +19,7 @@ import org.apache.commons.logging.Log; import org.apache.roller.RollerException; import org.apache.roller.model.PingTargetManager; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; import org.apache.roller.pojos.PingTargetData; import org.apache.roller.pojos.WebsiteData; import org.apache.roller.ui.authoring.struts.forms.PingTargetForm; Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarkEditAction.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarkEditAction.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarkEditAction.java (original) +++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarkEditAction.java Thu Oct 19 11:34:05 2006 @@ -30,7 +30,7 @@ import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.apache.roller.business.BookmarkManager; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; import org.apache.roller.pojos.BookmarkData; import org.apache.roller.pojos.FolderData; import org.apache.roller.ui.core.BasePageModel; Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarkSaveAction.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarkSaveAction.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarkSaveAction.java (original) +++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarkSaveAction.java Thu Oct 19 11:34:05 2006 @@ -30,7 +30,7 @@ import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.apache.roller.business.BookmarkManager; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; import org.apache.roller.pojos.BookmarkData; import org.apache.roller.pojos.FolderData; import org.apache.roller.pojos.PermissionsData; Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarksAction.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarksAction.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarksAction.java (original) +++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarksAction.java Thu Oct 19 11:34:05 2006 @@ -43,8 +43,8 @@ import org.apache.struts.actions.DispatchAction; import org.apache.roller.RollerException; import org.apache.roller.business.BookmarkManager; -import org.apache.roller.model.Roller; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.Roller; +import org.apache.roller.business.RollerFactory; import org.apache.roller.pojos.BookmarkData; import org.apache.roller.pojos.FolderData; import org.apache.roller.pojos.WebsiteData; Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategoriesAction.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategoriesAction.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategoriesAction.java (original) +++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategoriesAction.java Thu Oct 19 11:34:05 2006 @@ -42,7 +42,7 @@ import org.apache.struts.action.ActionMessages; import org.apache.struts.actions.DispatchAction; import org.apache.roller.RollerException; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; import org.apache.roller.business.WeblogManager; import org.apache.roller.pojos.WeblogCategoryData; import org.apache.roller.ui.core.BasePageModel; Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategoryDeleteAction.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategoryDeleteAction.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategoryDeleteAction.java (original) +++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategoryDeleteAction.java Thu Oct 19 11:34:05 2006 @@ -31,7 +31,7 @@ import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; import org.apache.roller.business.WeblogManager; import org.apache.roller.pojos.WeblogCategoryData; import org.apache.roller.ui.core.RollerRequest; Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategoryEditAction.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategoryEditAction.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategoryEditAction.java (original) +++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategoryEditAction.java Thu Oct 19 11:34:05 2006 @@ -29,7 +29,7 @@ import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; import org.apache.roller.business.WeblogManager; import org.apache.roller.pojos.WeblogCategoryData; import org.apache.roller.ui.core.BasePageModel; Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategorySaveAction.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategorySaveAction.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategorySaveAction.java (original) +++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategorySaveAction.java Thu Oct 19 11:34:05 2006 @@ -29,7 +29,7 @@ import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; import org.apache.roller.business.WeblogManager; import org.apache.roller.pojos.PermissionsData; import org.apache.roller.pojos.WeblogCategoryData; Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CommentManagementAction.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CommentManagementAction.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CommentManagementAction.java (original) +++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CommentManagementAction.java Thu Oct 19 11:34:05 2006 @@ -39,8 +39,8 @@ import org.apache.struts.util.RequestUtils; import org.apache.roller.RollerException; import org.apache.roller.config.RollerRuntimeConfig; -import org.apache.roller.model.Roller; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.Roller; +import org.apache.roller.business.RollerFactory; import org.apache.roller.business.WeblogManager; import org.apache.roller.pojos.CommentData; import org.apache.roller.pojos.WeblogEntryData; Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CustomPingTargetsAction.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CustomPingTargetsAction.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CustomPingTargetsAction.java (original) +++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CustomPingTargetsAction.java Thu Oct 19 11:34:05 2006 @@ -23,7 +23,7 @@ import org.apache.roller.RollerException; import org.apache.roller.config.PingConfig; import org.apache.roller.model.PingTargetManager; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; import org.apache.roller.pojos.PingTargetData; import org.apache.roller.pojos.WebsiteData; import org.apache.roller.ui.authoring.struts.forms.PingTargetForm; Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/FolderEditAction.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/FolderEditAction.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/FolderEditAction.java (original) +++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/FolderEditAction.java Thu Oct 19 11:34:05 2006 @@ -28,7 +28,7 @@ import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.apache.roller.business.BookmarkManager; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; import org.apache.roller.pojos.FolderData; import org.apache.roller.ui.core.BasePageModel; import org.apache.roller.ui.core.RollerRequest; Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/FolderSaveAction.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/FolderSaveAction.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/FolderSaveAction.java (original) +++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/FolderSaveAction.java Thu Oct 19 11:34:05 2006 @@ -30,7 +30,7 @@ import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.apache.roller.business.BookmarkManager; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; import org.apache.roller.pojos.FolderData; import org.apache.roller.pojos.PermissionsData; import org.apache.roller.pojos.WebsiteData; Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ImportBookmarksFormAction.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ImportBookmarksFormAction.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ImportBookmarksFormAction.java (original) +++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ImportBookmarksFormAction.java Thu Oct 19 11:34:05 2006 @@ -33,7 +33,7 @@ import org.apache.struts.action.ActionMapping; import org.apache.struts.upload.FormFile; import org.apache.roller.business.BookmarkManager; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; import org.apache.roller.ui.core.RollerRequest; import org.apache.roller.ui.authoring.struts.formbeans.FolderFormEx; @@ -42,7 +42,7 @@ import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; import org.apache.roller.RollerException; -import org.apache.roller.model.Roller; +import org.apache.roller.business.Roller; import org.apache.roller.pojos.FolderData; import org.apache.roller.pojos.WebsiteData; import org.apache.roller.ui.core.BasePageModel; Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ImportEntriesAction.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ImportEntriesAction.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ImportEntriesAction.java (original) +++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ImportEntriesAction.java Thu Oct 19 11:34:05 2006 @@ -35,7 +35,7 @@ import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; import org.apache.struts.actions.DispatchAction; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; import org.apache.roller.pojos.WebsiteData; import org.apache.roller.ui.core.RollerRequest; import org.apache.roller.ui.core.RollerSession; Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/InvitationsAction.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/InvitationsAction.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/InvitationsAction.java (original) +++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/InvitationsAction.java Thu Oct 19 11:34:05 2006 @@ -38,8 +38,8 @@ import org.apache.struts.util.RequestUtils; import org.apache.roller.RollerException; import org.apache.roller.config.RollerRuntimeConfig; -import org.apache.roller.model.Roller; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.Roller; +import org.apache.roller.business.RollerFactory; import org.apache.roller.business.UserManager; import org.apache.roller.pojos.PermissionsData; import org.apache.roller.pojos.UserData; Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/InviteMemberAction.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/InviteMemberAction.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/InviteMemberAction.java (original) +++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/InviteMemberAction.java Thu Oct 19 11:34:05 2006 @@ -41,8 +41,8 @@ import org.apache.roller.RollerException; import org.apache.roller.config.RollerConfig; import org.apache.roller.config.RollerRuntimeConfig; -import org.apache.roller.model.Roller; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.Roller; +import org.apache.roller.business.RollerFactory; import org.apache.roller.business.UserManager; import org.apache.roller.pojos.PermissionsData; import org.apache.roller.pojos.UserData; Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/MaintenanceAction.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/MaintenanceAction.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/MaintenanceAction.java (original) +++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/MaintenanceAction.java Thu Oct 19 11:34:05 2006 @@ -33,7 +33,7 @@ import org.apache.struts.actions.DispatchAction; import org.apache.roller.RollerException; import org.apache.roller.model.IndexManager; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; import org.apache.roller.business.UserManager; import org.apache.roller.pojos.WebsiteData; import org.apache.roller.ui.core.BasePageModel; Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/MemberPermissionsAction.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/MemberPermissionsAction.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/MemberPermissionsAction.java (original) +++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/MemberPermissionsAction.java Thu Oct 19 11:34:05 2006 @@ -35,8 +35,8 @@ import org.apache.struts.action.ActionMessages; import org.apache.struts.actions.DispatchAction; import org.apache.roller.RollerException; -import org.apache.roller.model.Roller; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.Roller; +import org.apache.roller.business.RollerFactory; import org.apache.roller.business.UserManager; import org.apache.roller.pojos.PermissionsData; import org.apache.roller.pojos.UserData; Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/PingSetupAction.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/PingSetupAction.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/PingSetupAction.java (original) +++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/PingSetupAction.java Thu Oct 19 11:34:05 2006 @@ -24,7 +24,7 @@ import org.apache.roller.config.PingConfig; import org.apache.roller.model.AutoPingManager; import org.apache.roller.model.PingTargetManager; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; import org.apache.roller.pojos.AutoPingData; import org.apache.roller.pojos.PingTargetData; import org.apache.roller.pojos.WebsiteData; Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ReferersAction.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ReferersAction.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ReferersAction.java (original) +++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ReferersAction.java Thu Oct 19 11:34:05 2006 @@ -34,8 +34,8 @@ import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; import org.apache.struts.actions.DispatchAction; -import org.apache.roller.model.RefererManager; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.referrers.RefererManager; +import org.apache.roller.business.RollerFactory; import org.apache.roller.pojos.RefererData; import org.apache.roller.pojos.WebsiteData; import org.apache.roller.ui.core.BasePageModel; Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ThemeEditorAction.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ThemeEditorAction.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ThemeEditorAction.java (original) +++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ThemeEditorAction.java Thu Oct 19 11:34:05 2006 @@ -35,8 +35,8 @@ import org.apache.roller.RollerException; import org.apache.roller.ThemeNotFoundException; import org.apache.roller.config.RollerRuntimeConfig; -import org.apache.roller.model.Roller; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.Roller; +import org.apache.roller.business.RollerFactory; import org.apache.roller.business.ThemeManager; import org.apache.roller.business.UserManager; import org.apache.roller.pojos.Theme; Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ToggleLinkbackDisplayAction.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ToggleLinkbackDisplayAction.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ToggleLinkbackDisplayAction.java (original) +++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ToggleLinkbackDisplayAction.java Thu Oct 19 11:34:05 2006 @@ -27,8 +27,8 @@ import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.apache.roller.model.RefererManager; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.referrers.RefererManager; +import org.apache.roller.business.RollerFactory; import org.apache.roller.pojos.RefererData; import org.apache.roller.pojos.WeblogEntryData; import org.apache.roller.ui.core.RequestConstants; Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/UploadFileFormAction.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/UploadFileFormAction.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/UploadFileFormAction.java (original) +++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/UploadFileFormAction.java Thu Oct 19 11:34:05 2006 @@ -45,8 +45,8 @@ import org.apache.roller.RollerException; import org.apache.roller.config.RollerRuntimeConfig; import org.apache.roller.business.FileManager; -import org.apache.roller.model.Roller; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.Roller; +import org.apache.roller.business.RollerFactory; import org.apache.roller.pojos.WeblogResource; import org.apache.roller.pojos.WebsiteData; import org.apache.roller.ui.core.BasePageModel; Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java (original) +++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java Thu Oct 19 11:34:05 2006 @@ -62,8 +62,8 @@ import org.apache.roller.config.RollerConfig; import org.apache.roller.model.IndexManager; import org.apache.roller.business.PluginManager; -import org.apache.roller.model.Roller; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.Roller; +import org.apache.roller.business.RollerFactory; import org.apache.roller.business.UserManager; import org.apache.roller.business.WeblogManager; import org.apache.roller.pojos.PermissionsData; Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryManagementAction.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryManagementAction.java?view=diff&rev=465716&r1=465715&r2=465716 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryManagementAction.java (original) +++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryManagementAction.java Thu Oct 19 11:34:05 2006 @@ -35,7 +35,7 @@ import org.apache.struts.actions.DispatchAction; import org.apache.commons.lang.StringUtils; import org.apache.roller.RollerException; -import org.apache.roller.model.RollerFactory; +import org.apache.roller.business.RollerFactory; import org.apache.roller.business.WeblogManager; import org.apache.roller.pojos.WeblogCategoryData; import org.apache.roller.pojos.WeblogEntryData;