You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2006/10/19 20:47:40 UTC
svn commit: r465720 - 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/runnable/
src/org/apache/roller/business/search/ src/org/ap...
Author: agilliland
Date: Thu Oct 19 11:47:37 2006
New Revision: 465720
URL: http://svn.apache.org/viewvc?view=rev&rev=465720
Log:
Moving org.apache.roller.model.* classes under org.apache.roller.business.*
This commit moves *Ping*Manager, ThreadManager, and IndexManager.
Added:
incubator/roller/trunk/src/org/apache/roller/business/pings/AutoPingManager.java
- copied, changed from r465668, incubator/roller/trunk/src/org/apache/roller/model/AutoPingManager.java
incubator/roller/trunk/src/org/apache/roller/business/pings/PingQueueManager.java
- copied, changed from r465668, incubator/roller/trunk/src/org/apache/roller/model/PingQueueManager.java
incubator/roller/trunk/src/org/apache/roller/business/pings/PingTargetManager.java
- copied, changed from r465668, incubator/roller/trunk/src/org/apache/roller/model/PingTargetManager.java
incubator/roller/trunk/src/org/apache/roller/business/runnable/ThreadManager.java
- copied, changed from r465668, incubator/roller/trunk/src/org/apache/roller/model/ThreadManager.java
incubator/roller/trunk/src/org/apache/roller/business/runnable/ThreadManagerImpl.java
- copied, changed from r465668, incubator/roller/trunk/src/org/apache/roller/business/ThreadManagerImpl.java
incubator/roller/trunk/src/org/apache/roller/business/search/IndexManager.java
- copied, changed from r465668, incubator/roller/trunk/src/org/apache/roller/model/IndexManager.java
incubator/roller/trunk/src/org/apache/roller/business/search/IndexManagerImpl.java
- copied, changed from r465716, incubator/roller/trunk/src/org/apache/roller/business/IndexManagerImpl.java
Removed:
incubator/roller/trunk/src/org/apache/roller/business/IndexManagerImpl.java
incubator/roller/trunk/src/org/apache/roller/business/ThreadManagerImpl.java
incubator/roller/trunk/src/org/apache/roller/model/AutoPingManager.java
incubator/roller/trunk/src/org/apache/roller/model/IndexManager.java
incubator/roller/trunk/src/org/apache/roller/model/PingQueueManager.java
incubator/roller/trunk/src/org/apache/roller/model/PingTargetManager.java
incubator/roller/trunk/src/org/apache/roller/model/ThreadManager.java
Modified:
incubator/roller/trunk/src/org/apache/roller/business/Roller.java
incubator/roller/trunk/src/org/apache/roller/business/RollerImpl.java
incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateAutoPingManagerImpl.java
incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernatePingQueueManagerImpl.java
incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernatePingTargetManagerImpl.java
incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateRollerImpl.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/pings/PingQueueProcessor.java
incubator/roller/trunk/src/org/apache/roller/business/runnable/RollerTask.java
incubator/roller/trunk/src/org/apache/roller/business/search/IndexUtil.java
incubator/roller/trunk/src/org/apache/roller/business/search/operations/AddEntryOperation.java
incubator/roller/trunk/src/org/apache/roller/business/search/operations/IndexOperation.java
incubator/roller/trunk/src/org/apache/roller/business/search/operations/ReIndexEntryOperation.java
incubator/roller/trunk/src/org/apache/roller/business/search/operations/ReadFromIndexOperation.java
incubator/roller/trunk/src/org/apache/roller/business/search/operations/RebuildWebsiteIndexOperation.java
incubator/roller/trunk/src/org/apache/roller/business/search/operations/RemoveEntryOperation.java
incubator/roller/trunk/src/org/apache/roller/business/search/operations/RemoveWebsiteIndexOperation.java
incubator/roller/trunk/src/org/apache/roller/business/search/operations/SearchOperation.java
incubator/roller/trunk/src/org/apache/roller/business/search/operations/WriteToIndexOperation.java
incubator/roller/trunk/src/org/apache/roller/config/PingConfig.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/UserAdminAction.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/CustomPingTargetsAction.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/PingSetupAction.java
incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java
incubator/roller/trunk/src/org/apache/roller/ui/core/RollerContext.java
incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/SearchResultsModel.java
incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java
incubator/roller/trunk/tests/org/apache/roller/TestUtils.java
incubator/roller/trunk/tests/org/apache/roller/business/IndexManagerTest.java
incubator/roller/trunk/tests/org/apache/roller/business/PingsTest.java
incubator/roller/trunk/tests/org/apache/roller/business/TaskLockTest.java
incubator/roller/trunk/web/taglibs.jsp
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=465720&r1=465719&r2=465720
==============================================================================
--- 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:47:37 2006
@@ -21,9 +21,13 @@
import java.io.Serializable;
import java.sql.Connection;
import org.apache.roller.RollerException;
+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.business.referrers.RefererManager;
import org.apache.roller.business.referrers.ReferrerQueueManager;
-import org.apache.roller.model.*;
+import org.apache.roller.business.runnable.ThreadManager;
+import org.apache.roller.business.search.IndexManager;
import org.apache.roller.planet.model.PlanetManager;
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=465720&r1=465719&r2=465720
==============================================================================
--- 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:47:37 2006
@@ -24,13 +24,15 @@
import org.apache.roller.RollerException;
import org.apache.roller.business.referrers.ReferrerQueueManager;
import org.apache.roller.business.referrers.ReferrerQueueManagerImpl;
+import org.apache.roller.business.runnable.ThreadManagerImpl;
+import org.apache.roller.business.search.IndexManagerImpl;
import org.apache.roller.business.utils.UpgradeDatabase;
import org.apache.roller.business.FileManager;
-import org.apache.roller.model.IndexManager;
+import org.apache.roller.business.search.IndexManager;
import org.apache.roller.business.PluginManager;
import org.apache.roller.business.Roller;
import org.apache.roller.business.ThemeManager;
-import org.apache.roller.model.ThreadManager;
+import org.apache.roller.business.runnable.ThreadManager;
/**
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=465720&r1=465719&r2=465720
==============================================================================
--- 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:47:37 2006
@@ -34,8 +34,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.config.PingConfig;
-import org.apache.roller.model.AutoPingManager;
-import org.apache.roller.model.PingQueueManager;
+import org.apache.roller.business.pings.AutoPingManager;
+import org.apache.roller.business.pings.PingQueueManager;
import org.apache.roller.business.RollerFactory;
Modified: incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernatePingQueueManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernatePingQueueManagerImpl.java?view=diff&rev=465720&r1=465719&r2=465720
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernatePingQueueManagerImpl.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernatePingQueueManagerImpl.java Thu Oct 19 11:47:37 2006
@@ -31,7 +31,7 @@
import org.apache.roller.pojos.PingQueueEntryData;
import java.sql.Timestamp;
import java.util.List;
-import org.apache.roller.model.PingQueueManager;
+import org.apache.roller.business.pings.PingQueueManager;
/**
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=465720&r1=465719&r2=465720
==============================================================================
--- 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:47:37 2006
@@ -35,8 +35,8 @@
import java.util.Collection;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.model.AutoPingManager;
-import org.apache.roller.model.PingTargetManager;
+import org.apache.roller.business.pings.AutoPingManager;
+import org.apache.roller.business.pings.PingTargetManager;
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/HibernateRollerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateRollerImpl.java?view=diff&rev=465720&r1=465719&r2=465720
==============================================================================
--- 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:47:37 2006
@@ -26,16 +26,16 @@
import org.apache.roller.config.RollerConfig;
import org.apache.roller.business.BookmarkManager;
import org.apache.roller.business.ConfigManager;
-import org.apache.roller.model.AutoPingManager;
-import org.apache.roller.model.PingQueueManager;
-import org.apache.roller.model.PingTargetManager;
+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.business.PropertiesManager;
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;
+import org.apache.roller.business.runnable.ThreadManager;
/**
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=465720&r1=465719&r2=465720
==============================================================================
--- 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:47:37 2006
@@ -23,7 +23,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
-import org.apache.roller.business.ThreadManagerImpl;
+import org.apache.roller.business.runnable.ThreadManagerImpl;
import org.apache.roller.business.runnable.RollerTask;
import org.apache.roller.business.RollerFactory;
import org.apache.roller.pojos.TaskLockData;
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=465720&r1=465719&r2=465720
==============================================================================
--- 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:47:37 2006
@@ -38,9 +38,9 @@
import org.hibernate.criterion.SimpleExpression;
import org.apache.roller.RollerException;
import org.apache.roller.config.RollerConfig;
-import org.apache.roller.model.AutoPingManager;
+import org.apache.roller.business.pings.AutoPingManager;
import org.apache.roller.business.BookmarkManager;
-import org.apache.roller.model.PingTargetManager;
+import org.apache.roller.business.pings.PingTargetManager;
import org.apache.roller.business.RollerFactory;
import org.apache.roller.business.UserManager;
import org.apache.roller.business.WeblogManager;
Copied: incubator/roller/trunk/src/org/apache/roller/business/pings/AutoPingManager.java (from r465668, incubator/roller/trunk/src/org/apache/roller/model/AutoPingManager.java)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/pings/AutoPingManager.java?view=diff&rev=465720&p1=incubator/roller/trunk/src/org/apache/roller/model/AutoPingManager.java&r1=465668&p2=incubator/roller/trunk/src/org/apache/roller/business/pings/AutoPingManager.java&r2=465720
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/model/AutoPingManager.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/pings/AutoPingManager.java Thu Oct 19 11:47:37 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.model;
+package org.apache.roller.business.pings;
import java.util.Collection;
import java.util.List;
Copied: incubator/roller/trunk/src/org/apache/roller/business/pings/PingQueueManager.java (from r465668, incubator/roller/trunk/src/org/apache/roller/model/PingQueueManager.java)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/pings/PingQueueManager.java?view=diff&rev=465720&p1=incubator/roller/trunk/src/org/apache/roller/model/PingQueueManager.java&r1=465668&p2=incubator/roller/trunk/src/org/apache/roller/business/pings/PingQueueManager.java&r2=465720
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/model/PingQueueManager.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/pings/PingQueueManager.java Thu Oct 19 11:47:37 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.model;
+package org.apache.roller.business.pings;
import java.util.List;
import org.apache.roller.RollerException;
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=465720&r1=465719&r2=465720
==============================================================================
--- 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:47:37 2006
@@ -24,7 +24,7 @@
import org.apache.roller.RollerException;
import org.apache.roller.config.PingConfig;
import org.apache.roller.config.RollerRuntimeConfig;
-import org.apache.roller.model.PingQueueManager;
+import org.apache.roller.business.pings.PingQueueManager;
import org.apache.roller.business.RollerFactory;
import org.apache.roller.pojos.PingQueueEntryData;
import org.apache.roller.pojos.PingTargetData;
Copied: incubator/roller/trunk/src/org/apache/roller/business/pings/PingTargetManager.java (from r465668, incubator/roller/trunk/src/org/apache/roller/model/PingTargetManager.java)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/pings/PingTargetManager.java?view=diff&rev=465720&p1=incubator/roller/trunk/src/org/apache/roller/model/PingTargetManager.java&r1=465668&p2=incubator/roller/trunk/src/org/apache/roller/business/pings/PingTargetManager.java&r2=465720
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/model/PingTargetManager.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/pings/PingTargetManager.java Thu Oct 19 11:47:37 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.model;
+package org.apache.roller.business.pings;
import java.util.List;
import org.apache.roller.RollerException;
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=465720&r1=465719&r2=465720
==============================================================================
--- 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:47:37 2006
@@ -27,7 +27,7 @@
import org.apache.roller.RollerException;
import org.apache.roller.config.RollerConfig;
import org.apache.roller.business.RollerFactory;
-import org.apache.roller.model.ThreadManager;
+import org.apache.roller.business.runnable.ThreadManager;
import org.apache.roller.util.DateUtil;
Copied: incubator/roller/trunk/src/org/apache/roller/business/runnable/ThreadManager.java (from r465668, incubator/roller/trunk/src/org/apache/roller/model/ThreadManager.java)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/runnable/ThreadManager.java?view=diff&rev=465720&p1=incubator/roller/trunk/src/org/apache/roller/model/ThreadManager.java&r1=465668&p2=incubator/roller/trunk/src/org/apache/roller/business/runnable/ThreadManager.java&r2=465720
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/model/ThreadManager.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/runnable/ThreadManager.java Thu Oct 19 11:47:37 2006
@@ -16,11 +16,10 @@
* directory of this distribution.
*/
-package org.apache.roller.model;
+package org.apache.roller.business.runnable;
import java.util.Date;
import java.util.TimerTask;
-import org.apache.roller.business.runnable.RollerTask;
/**
Copied: incubator/roller/trunk/src/org/apache/roller/business/runnable/ThreadManagerImpl.java (from r465668, incubator/roller/trunk/src/org/apache/roller/business/ThreadManagerImpl.java)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/runnable/ThreadManagerImpl.java?view=diff&rev=465720&p1=incubator/roller/trunk/src/org/apache/roller/business/ThreadManagerImpl.java&r1=465668&p2=incubator/roller/trunk/src/org/apache/roller/business/runnable/ThreadManagerImpl.java&r2=465720
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/business/ThreadManagerImpl.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/runnable/ThreadManagerImpl.java Thu Oct 19 11:47:37 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.business;
+package org.apache.roller.business.runnable;
import EDU.oswego.cs.dl.util.concurrent.BoundedBuffer;
import EDU.oswego.cs.dl.util.concurrent.DirectExecutor;
@@ -25,8 +25,6 @@
import java.util.Date;
import java.util.Timer;
import java.util.TimerTask;
-import org.apache.roller.business.runnable.RollerTask;
-import org.apache.roller.model.ThreadManager;
import org.apache.roller.util.DateUtil;
Copied: incubator/roller/trunk/src/org/apache/roller/business/search/IndexManager.java (from r465668, incubator/roller/trunk/src/org/apache/roller/model/IndexManager.java)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/search/IndexManager.java?view=diff&rev=465720&p1=incubator/roller/trunk/src/org/apache/roller/model/IndexManager.java&r1=465668&p2=incubator/roller/trunk/src/org/apache/roller/business/search/IndexManager.java&r2=465720
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/model/IndexManager.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/search/IndexManager.java Thu Oct 19 11:47:37 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.model;
+package org.apache.roller.business.search;
import org.apache.roller.RollerException;
import org.apache.roller.business.search.operations.IndexOperation;
Copied: incubator/roller/trunk/src/org/apache/roller/business/search/IndexManagerImpl.java (from r465716, incubator/roller/trunk/src/org/apache/roller/business/IndexManagerImpl.java)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/search/IndexManagerImpl.java?view=diff&rev=465720&p1=incubator/roller/trunk/src/org/apache/roller/business/IndexManagerImpl.java&r1=465716&p2=incubator/roller/trunk/src/org/apache/roller/business/search/IndexManagerImpl.java&r2=465720
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/business/IndexManagerImpl.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/search/IndexManagerImpl.java Thu Oct 19 11:47:37 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
/* Created on Jul 18, 2003 */
-package org.apache.roller.business;
+package org.apache.roller.business.search;
import java.io.File;
import java.io.IOException;
@@ -31,6 +31,7 @@
import org.apache.lucene.store.FSDirectory;
import org.apache.lucene.store.RAMDirectory;
import org.apache.roller.RollerException;
+import org.apache.roller.business.*;
import org.apache.roller.business.search.operations.AddEntryOperation;
import org.apache.roller.business.search.operations.IndexOperation;
import org.apache.roller.business.search.operations.ReIndexEntryOperation;
@@ -38,7 +39,6 @@
import org.apache.roller.business.search.operations.RemoveEntryOperation;
import org.apache.roller.business.search.operations.RemoveWebsiteIndexOperation;
import org.apache.roller.business.search.operations.WriteToIndexOperation;
-import org.apache.roller.model.IndexManager;
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.pojos.WebsiteData;
Modified: incubator/roller/trunk/src/org/apache/roller/business/search/IndexUtil.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/search/IndexUtil.java?view=diff&rev=465720&r1=465719&r2=465720
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/business/search/IndexUtil.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/search/IndexUtil.java Thu Oct 19 11:47:37 2006
@@ -22,7 +22,7 @@
import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.index.Term;
-import org.apache.roller.business.IndexManagerImpl;
+import org.apache.roller.business.search.IndexManagerImpl;
import java.io.IOException;
import java.io.StringReader;
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=465720&r1=465719&r2=465720
==============================================================================
--- 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:47:37 2006
@@ -23,7 +23,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.lucene.index.IndexWriter;
-import org.apache.roller.business.IndexManagerImpl;
+import org.apache.roller.business.search.IndexManagerImpl;
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/IndexOperation.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/search/operations/IndexOperation.java?view=diff&rev=465720&r1=465719&r2=465720
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/business/search/operations/IndexOperation.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/search/operations/IndexOperation.java Thu Oct 19 11:47:37 2006
@@ -28,7 +28,7 @@
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
-import org.apache.roller.business.IndexManagerImpl;
+import org.apache.roller.business.search.IndexManagerImpl;
import org.apache.roller.business.search.FieldConstants;
import org.apache.roller.pojos.CommentData;
import org.apache.roller.pojos.WeblogCategoryData;
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=465720&r1=465719&r2=465720
==============================================================================
--- 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:47:37 2006
@@ -25,7 +25,7 @@
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.Term;
-import org.apache.roller.business.IndexManagerImpl;
+import org.apache.roller.business.search.IndexManagerImpl;
import org.apache.roller.business.search.FieldConstants;
import org.apache.roller.business.Roller;
import org.apache.roller.business.RollerFactory;
Modified: incubator/roller/trunk/src/org/apache/roller/business/search/operations/ReadFromIndexOperation.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/search/operations/ReadFromIndexOperation.java?view=diff&rev=465720&r1=465719&r2=465720
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/business/search/operations/ReadFromIndexOperation.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/search/operations/ReadFromIndexOperation.java Thu Oct 19 11:47:37 2006
@@ -19,7 +19,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.business.IndexManagerImpl;
+import org.apache.roller.business.search.IndexManagerImpl;
/**
* @author aim4min
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=465720&r1=465719&r2=465720
==============================================================================
--- 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:47:37 2006
@@ -30,7 +30,7 @@
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.Term;
import org.apache.roller.RollerException;
-import org.apache.roller.business.IndexManagerImpl;
+import org.apache.roller.business.search.IndexManagerImpl;
import org.apache.roller.business.search.FieldConstants;
import org.apache.roller.business.search.IndexUtil;
import org.apache.roller.business.Roller;
Modified: incubator/roller/trunk/src/org/apache/roller/business/search/operations/RemoveEntryOperation.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/search/operations/RemoveEntryOperation.java?view=diff&rev=465720&r1=465719&r2=465720
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/business/search/operations/RemoveEntryOperation.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/search/operations/RemoveEntryOperation.java Thu Oct 19 11:47:37 2006
@@ -24,7 +24,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
-import org.apache.roller.business.IndexManagerImpl;
+import org.apache.roller.business.search.IndexManagerImpl;
import org.apache.roller.business.search.FieldConstants;
import org.apache.roller.pojos.WeblogEntryData;
Modified: incubator/roller/trunk/src/org/apache/roller/business/search/operations/RemoveWebsiteIndexOperation.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/search/operations/RemoveWebsiteIndexOperation.java?view=diff&rev=465720&r1=465719&r2=465720
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/business/search/operations/RemoveWebsiteIndexOperation.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/search/operations/RemoveWebsiteIndexOperation.java Thu Oct 19 11:47:37 2006
@@ -25,7 +25,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
-import org.apache.roller.business.IndexManagerImpl;
+import org.apache.roller.business.search.IndexManagerImpl;
import org.apache.roller.business.search.FieldConstants;
import org.apache.roller.business.search.IndexUtil;
import org.apache.roller.pojos.WebsiteData;
Modified: incubator/roller/trunk/src/org/apache/roller/business/search/operations/SearchOperation.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/search/operations/SearchOperation.java?view=diff&rev=465720&r1=465719&r2=465720
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/business/search/operations/SearchOperation.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/search/operations/SearchOperation.java Thu Oct 19 11:47:37 2006
@@ -34,10 +34,10 @@
import org.apache.lucene.search.Sort;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.TermQuery;
-import org.apache.roller.business.IndexManagerImpl;
+import org.apache.roller.business.search.IndexManagerImpl;
import org.apache.roller.business.search.FieldConstants;
import org.apache.roller.business.search.IndexUtil;
-import org.apache.roller.model.IndexManager;
+import org.apache.roller.business.search.IndexManager;
/**
Modified: incubator/roller/trunk/src/org/apache/roller/business/search/operations/WriteToIndexOperation.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/search/operations/WriteToIndexOperation.java?view=diff&rev=465720&r1=465719&r2=465720
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/business/search/operations/WriteToIndexOperation.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/search/operations/WriteToIndexOperation.java Thu Oct 19 11:47:37 2006
@@ -20,7 +20,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.business.IndexManagerImpl;
+import org.apache.roller.business.search.IndexManagerImpl;
/**
* An operation that writes to index.
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=465720&r1=465719&r2=465720
==============================================================================
--- 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:47:37 2006
@@ -21,7 +21,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
-import org.apache.roller.model.PingTargetManager;
+import org.apache.roller.business.pings.PingTargetManager;
import org.apache.roller.business.RollerFactory;
import org.apache.roller.pojos.PingTargetData;
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=465720&r1=465719&r2=465720
==============================================================================
--- 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:47:37 2006
@@ -21,7 +21,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
-import org.apache.roller.model.PingTargetManager;
+import org.apache.roller.business.pings.PingTargetManager;
import org.apache.roller.business.RollerFactory;
import org.apache.roller.pojos.PingTargetData;
import org.apache.roller.pojos.WebsiteData;
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=465720&r1=465719&r2=465720
==============================================================================
--- 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:47:37 2006
@@ -38,7 +38,7 @@
import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionMessages;
import org.apache.roller.RollerException;
-import org.apache.roller.model.IndexManager;
+import org.apache.roller.business.search.IndexManager;
import org.apache.roller.business.Roller;
import org.apache.roller.business.RollerFactory;
import org.apache.roller.business.UserManager;
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=465720&r1=465719&r2=465720
==============================================================================
--- 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:47:37 2006
@@ -18,7 +18,7 @@
import org.apache.commons.logging.Log;
import org.apache.roller.RollerException;
-import org.apache.roller.model.PingTargetManager;
+import org.apache.roller.business.pings.PingTargetManager;
import org.apache.roller.business.RollerFactory;
import org.apache.roller.pojos.PingTargetData;
import org.apache.roller.pojos.WebsiteData;
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=465720&r1=465719&r2=465720
==============================================================================
--- 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:47:37 2006
@@ -22,7 +22,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
import org.apache.roller.config.PingConfig;
-import org.apache.roller.model.PingTargetManager;
+import org.apache.roller.business.pings.PingTargetManager;
import org.apache.roller.business.RollerFactory;
import org.apache.roller.pojos.PingTargetData;
import org.apache.roller.pojos.WebsiteData;
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=465720&r1=465719&r2=465720
==============================================================================
--- 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:47:37 2006
@@ -32,7 +32,7 @@
import org.apache.struts.action.ActionMessages;
import org.apache.struts.actions.DispatchAction;
import org.apache.roller.RollerException;
-import org.apache.roller.model.IndexManager;
+import org.apache.roller.business.search.IndexManager;
import org.apache.roller.business.RollerFactory;
import org.apache.roller.business.UserManager;
import org.apache.roller.pojos.WebsiteData;
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=465720&r1=465719&r2=465720
==============================================================================
--- 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:47:37 2006
@@ -22,8 +22,8 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
import org.apache.roller.config.PingConfig;
-import org.apache.roller.model.AutoPingManager;
-import org.apache.roller.model.PingTargetManager;
+import org.apache.roller.business.pings.AutoPingManager;
+import org.apache.roller.business.pings.PingTargetManager;
import org.apache.roller.business.RollerFactory;
import org.apache.roller.pojos.AutoPingData;
import org.apache.roller.pojos.PingTargetData;
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=465720&r1=465719&r2=465720
==============================================================================
--- 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:47:37 2006
@@ -60,7 +60,7 @@
import org.apache.roller.RollerException;
import org.apache.roller.RollerPermissionsException;
import org.apache.roller.config.RollerConfig;
-import org.apache.roller.model.IndexManager;
+import org.apache.roller.business.search.IndexManager;
import org.apache.roller.business.PluginManager;
import org.apache.roller.business.Roller;
import org.apache.roller.business.RollerFactory;
Modified: incubator/roller/trunk/src/org/apache/roller/ui/core/RollerContext.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/core/RollerContext.java?view=diff&rev=465720&r1=465719&r2=465720
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/core/RollerContext.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/RollerContext.java Thu Oct 19 11:47:37 2006
@@ -49,7 +49,7 @@
import org.apache.roller.config.RollerConfig;
import org.apache.roller.business.Roller;
import org.apache.roller.business.RollerFactory;
-import org.apache.roller.model.ThreadManager;
+import org.apache.roller.business.runnable.ThreadManager;
import org.apache.roller.ui.core.security.AutoProvision;
import org.apache.roller.util.cache.CacheManager;
import org.apache.velocity.runtime.RuntimeSingleton;
Modified: incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/SearchResultsModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/SearchResultsModel.java?view=diff&rev=465720&r1=465719&r2=465720
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/SearchResultsModel.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/SearchResultsModel.java Thu Oct 19 11:47:37 2006
@@ -34,7 +34,7 @@
import org.apache.roller.business.search.FieldConstants;
import org.apache.roller.business.search.operations.SearchOperation;
import org.apache.roller.config.RollerRuntimeConfig;
-import org.apache.roller.model.IndexManager;
+import org.apache.roller.business.search.IndexManager;
import org.apache.roller.business.Roller;
import org.apache.roller.business.RollerFactory;
import org.apache.roller.business.WeblogManager;
Modified: incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java?view=diff&rev=465720&r1=465719&r2=465720
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java Thu Oct 19 11:47:37 2006
@@ -43,7 +43,7 @@
import org.apache.roller.RollerException;
import org.apache.roller.config.RollerConfig;
import org.apache.roller.config.RollerRuntimeConfig;
-import org.apache.roller.model.IndexManager;
+import org.apache.roller.business.search.IndexManager;
import org.apache.roller.business.RollerFactory;
import org.apache.roller.business.UserManager;
import org.apache.roller.business.WeblogManager;
Modified: incubator/roller/trunk/tests/org/apache/roller/TestUtils.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/tests/org/apache/roller/TestUtils.java?view=diff&rev=465720&r1=465719&r2=465720
==============================================================================
--- incubator/roller/trunk/tests/org/apache/roller/TestUtils.java (original)
+++ incubator/roller/trunk/tests/org/apache/roller/TestUtils.java Thu Oct 19 11:47:37 2006
@@ -23,8 +23,8 @@
package org.apache.roller;
-import org.apache.roller.model.AutoPingManager;
-import org.apache.roller.model.PingTargetManager;
+import org.apache.roller.business.pings.AutoPingManager;
+import org.apache.roller.business.pings.PingTargetManager;
import org.apache.roller.business.RollerFactory;
import org.apache.roller.business.UserManager;
import org.apache.roller.business.WeblogManager;
Modified: incubator/roller/trunk/tests/org/apache/roller/business/IndexManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/tests/org/apache/roller/business/IndexManagerTest.java?view=diff&rev=465720&r1=465719&r2=465720
==============================================================================
--- incubator/roller/trunk/tests/org/apache/roller/business/IndexManagerTest.java (original)
+++ incubator/roller/trunk/tests/org/apache/roller/business/IndexManagerTest.java Thu Oct 19 11:47:37 2006
@@ -21,10 +21,11 @@
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import org.apache.roller.business.search.IndexManagerImpl;
import org.apache.roller.business.search.operations.AddEntryOperation;
import org.apache.roller.business.search.operations.RemoveEntryOperation;
import org.apache.roller.business.search.operations.SearchOperation;
-import org.apache.roller.model.IndexManager;
+import org.apache.roller.business.search.IndexManager;
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/PingsTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/tests/org/apache/roller/business/PingsTest.java?view=diff&rev=465720&r1=465719&r2=465720
==============================================================================
--- incubator/roller/trunk/tests/org/apache/roller/business/PingsTest.java (original)
+++ incubator/roller/trunk/tests/org/apache/roller/business/PingsTest.java Thu Oct 19 11:47:37 2006
@@ -31,8 +31,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.TestUtils;
-import org.apache.roller.model.AutoPingManager;
-import org.apache.roller.model.PingTargetManager;
+import org.apache.roller.business.pings.AutoPingManager;
+import org.apache.roller.business.pings.PingTargetManager;
import org.apache.roller.business.RollerFactory;
import org.apache.roller.pojos.AutoPingData;
import org.apache.roller.pojos.PingTargetData;
Modified: incubator/roller/trunk/tests/org/apache/roller/business/TaskLockTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/tests/org/apache/roller/business/TaskLockTest.java?view=diff&rev=465720&r1=465719&r2=465720
==============================================================================
--- incubator/roller/trunk/tests/org/apache/roller/business/TaskLockTest.java (original)
+++ incubator/roller/trunk/tests/org/apache/roller/business/TaskLockTest.java Thu Oct 19 11:47:37 2006
@@ -27,7 +27,7 @@
import org.apache.roller.TestUtils;
import org.apache.roller.business.runnable.RollerTask;
import org.apache.roller.business.RollerFactory;
-import org.apache.roller.model.ThreadManager;
+import org.apache.roller.business.runnable.ThreadManager;
/**
Modified: incubator/roller/trunk/web/taglibs.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/taglibs.jsp?view=diff&rev=465720&r1=465719&r2=465720
==============================================================================
--- incubator/roller/trunk/web/taglibs.jsp (original)
+++ incubator/roller/trunk/web/taglibs.jsp Thu Oct 19 11:47:37 2006
@@ -28,8 +28,8 @@
<%@ page import="javax.servlet.jsp.jstl.core.Config" %>
-<%@ page import="org.apache.roller.model.Roller" %>
-<%@ page import="org.apache.roller.model.RollerFactory" %>
+<%@ page import="org.apache.roller.business.Roller" %>
+<%@ page import="org.apache.roller.business.RollerFactory" %>
<%@ page import="org.apache.roller.pojos.UserData" %>
<%@ page import="org.apache.roller.pojos.WebsiteData" %>