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 18:54:49 UTC
svn commit: r465676 - in /incubator/roller/trunk:
contrib/plugins/src/org/apache/roller/ui/rendering/plugins/
src/org/apache/roller/business/ src/org/apache/roller/business/hibernate/
src/org/apache/roller/model/ src/org/apache/roller/planet/pojos/ src...
Author: agilliland
Date: Thu Oct 19 09:54:45 2006
New Revision: 465676
URL: http://svn.apache.org/viewvc?view=rev&rev=465676
Log:
Moving org.apache.roller.model.* classes under org.apache.roller.business.*
This commit moves BookmarkManager, ConfigManager, and PluginManager
Added:
incubator/roller/trunk/src/org/apache/roller/business/BookmarkManager.java
- copied, changed from r465668, incubator/roller/trunk/src/org/apache/roller/model/BookmarkManager.java
incubator/roller/trunk/src/org/apache/roller/business/ConfigManager.java
- copied, changed from r465668, incubator/roller/trunk/src/org/apache/roller/model/ConfigManager.java
incubator/roller/trunk/src/org/apache/roller/business/PluginManager.java
- copied, changed from r465668, incubator/roller/trunk/src/org/apache/roller/model/PluginManager.java
incubator/roller/trunk/src/org/apache/roller/business/WeblogEntryEditor.java
- copied, changed from r465668, incubator/roller/trunk/src/org/apache/roller/model/WeblogEntryEditor.java
incubator/roller/trunk/src/org/apache/roller/business/WeblogEntryPlugin.java
- copied, changed from r465668, incubator/roller/trunk/src/org/apache/roller/model/WeblogEntryPlugin.java
Removed:
incubator/roller/trunk/src/org/apache/roller/model/BookmarkManager.java
incubator/roller/trunk/src/org/apache/roller/model/ConfigManager.java
incubator/roller/trunk/src/org/apache/roller/model/PluginManager.java
incubator/roller/trunk/src/org/apache/roller/model/WeblogEntryEditor.java
incubator/roller/trunk/src/org/apache/roller/model/WeblogEntryPlugin.java
Modified:
incubator/roller/trunk/contrib/plugins/src/org/apache/roller/ui/rendering/plugins/ReadMorePlugin.java
incubator/roller/trunk/contrib/plugins/src/org/apache/roller/ui/rendering/plugins/TextilePlugin.java
incubator/roller/trunk/src/org/apache/roller/business/PluginManagerImpl.java
incubator/roller/trunk/src/org/apache/roller/business/RollerImpl.java
incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateBookmarkManagerImpl.java
incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateConfigManagerImpl.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/HibernateUserManagerImpl.java
incubator/roller/trunk/src/org/apache/roller/model/Roller.java
incubator/roller/trunk/src/org/apache/roller/planet/pojos/PlanetEntryData.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/WeblogEntryData.java
incubator/roller/trunk/src/org/apache/roller/pojos/WebsiteData.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/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/WeblogEntryFormAction.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/WebsiteFormAction.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/plugins/TextEditor.java
incubator/roller/trunk/src/org/apache/roller/ui/core/plugins/XinhaEditor.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/ConvertLineBreaksPlugin.java
incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/GoogleLinkPlugin.java
incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/ObfuscateEmailPlugin.java
incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/SmileysPlugin.java
incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/TopicTagPlugin.java
incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/WikipediaLinkPlugin.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/tests/org/apache/roller/business/BookmarkTest.java
incubator/roller/trunk/tests/org/apache/roller/business/PluginManagerTest.java
incubator/roller/trunk/web/WEB-INF/jsps/authoring/WeblogEdit.jsp
incubator/roller/trunk/web/WEB-INF/jsps/authoring/edit-website.jsp
Modified: incubator/roller/trunk/contrib/plugins/src/org/apache/roller/ui/rendering/plugins/ReadMorePlugin.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/contrib/plugins/src/org/apache/roller/ui/rendering/plugins/ReadMorePlugin.java?view=diff&rev=465676&r1=465675&r2=465676
==============================================================================
--- incubator/roller/trunk/contrib/plugins/src/org/apache/roller/ui/rendering/plugins/ReadMorePlugin.java (original)
+++ incubator/roller/trunk/contrib/plugins/src/org/apache/roller/ui/rendering/plugins/ReadMorePlugin.java Thu Oct 19 09:54:45 2006
@@ -24,7 +24,7 @@
import org.apache.roller.RollerException;
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.model.WeblogEntryPlugin;
+import org.apache.roller.business.WeblogEntryPlugin;
import org.apache.roller.util.Utilities;
Modified: incubator/roller/trunk/contrib/plugins/src/org/apache/roller/ui/rendering/plugins/TextilePlugin.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/contrib/plugins/src/org/apache/roller/ui/rendering/plugins/TextilePlugin.java?view=diff&rev=465676&r1=465675&r2=465676
==============================================================================
--- incubator/roller/trunk/contrib/plugins/src/org/apache/roller/ui/rendering/plugins/TextilePlugin.java (original)
+++ incubator/roller/trunk/contrib/plugins/src/org/apache/roller/ui/rendering/plugins/TextilePlugin.java Thu Oct 19 09:54:45 2006
@@ -24,7 +24,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.model.WeblogEntryPlugin;
+import org.apache.roller.business.WeblogEntryPlugin;
/**
Copied: incubator/roller/trunk/src/org/apache/roller/business/BookmarkManager.java (from r465668, incubator/roller/trunk/src/org/apache/roller/model/BookmarkManager.java)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/BookmarkManager.java?view=diff&rev=465676&p1=incubator/roller/trunk/src/org/apache/roller/model/BookmarkManager.java&r1=465668&p2=incubator/roller/trunk/src/org/apache/roller/business/BookmarkManager.java&r2=465676
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/model/BookmarkManager.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/BookmarkManager.java Thu Oct 19 09:54:45 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.model;
+package org.apache.roller.business;
import java.util.List;
import org.apache.roller.RollerException;
Copied: incubator/roller/trunk/src/org/apache/roller/business/ConfigManager.java (from r465668, incubator/roller/trunk/src/org/apache/roller/model/ConfigManager.java)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/ConfigManager.java?view=diff&rev=465676&p1=incubator/roller/trunk/src/org/apache/roller/model/ConfigManager.java&r1=465668&p2=incubator/roller/trunk/src/org/apache/roller/business/ConfigManager.java&r2=465676
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/model/ConfigManager.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/ConfigManager.java Thu Oct 19 09:54:45 2006
@@ -16,19 +16,38 @@
* directory of this distribution.
*/
/*
- * Created on Feb 4, 2004
*/
package org.apache.roller.model;
import org.apache.roller.RollerException;
import org.apache.roller.pojos.RollerConfigData;
import java.io.Serializable;
/**
+ * Created on Feb 4, 2004
+ */
+package org.apache.roller.business;
+
+import org.apache.roller.RollerException;
+import org.apache.roller.pojos.RollerConfigData;
+import java.io.Serializable;
+
+/**
* Manages Roller configuration
* @deprecated Replaced by {@link RollerProperties}.
- */
public interface ConfigManager extends Serializable
{
/**
+ */
+public interface ConfigManager extends Serializable
+{
+ /**
* Release all resources associated with Roller session.
- */
public void release(); /**
+ */
+ public void release(); /**
* Store
*/
-
public void storeRollerConfig( RollerConfigData data ) throws RollerException;
/**
+
+
+ public void storeRollerConfig( RollerConfigData data ) throws RollerException;
+ /**
* Get single RollerConfig object in system.
* @deprecated
*/
-
public RollerConfigData getRollerConfig() throws RollerException;
/**
+
+ public RollerConfigData getRollerConfig() throws RollerException;
+ /**
* Read RollerConfig from XML file.
*/
-
public RollerConfigData readFromFile(String filePath) throws RollerException;
}
+
+ public RollerConfigData readFromFile(String filePath) throws RollerException;
+}
Copied: incubator/roller/trunk/src/org/apache/roller/business/PluginManager.java (from r465668, incubator/roller/trunk/src/org/apache/roller/model/PluginManager.java)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/PluginManager.java?view=diff&rev=465676&p1=incubator/roller/trunk/src/org/apache/roller/model/PluginManager.java&r1=465668&p2=incubator/roller/trunk/src/org/apache/roller/business/PluginManager.java&r2=465676
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/model/PluginManager.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/PluginManager.java Thu Oct 19 09:54:45 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.model;
+package org.apache.roller.business;
import java.util.List;
import java.util.Map;
Modified: incubator/roller/trunk/src/org/apache/roller/business/PluginManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/PluginManagerImpl.java?view=diff&rev=465676&r1=465675&r2=465676
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/business/PluginManagerImpl.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/PluginManagerImpl.java Thu Oct 19 09:54:45 2006
@@ -26,12 +26,12 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.config.RollerConfig;
-import org.apache.roller.model.WeblogEntryPlugin;
-import org.apache.roller.model.PluginManager;
+import org.apache.roller.business.WeblogEntryPlugin;
+import org.apache.roller.business.PluginManager;
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.pojos.WebsiteData;
import org.apache.commons.lang.StringUtils;
-import org.apache.roller.model.WeblogEntryEditor;
+import org.apache.roller.business.WeblogEntryEditor;
/**
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=465676&r1=465675&r2=465676
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/business/RollerImpl.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/RollerImpl.java Thu Oct 19 09:54:45 2006
@@ -27,7 +27,7 @@
import org.apache.roller.business.utils.UpgradeDatabase;
import org.apache.roller.business.FileManager;
import org.apache.roller.model.IndexManager;
-import org.apache.roller.model.PluginManager;
+import org.apache.roller.business.PluginManager;
import org.apache.roller.model.Roller;
import org.apache.roller.model.ThemeManager;
import org.apache.roller.model.ThreadManager;
Copied: incubator/roller/trunk/src/org/apache/roller/business/WeblogEntryEditor.java (from r465668, incubator/roller/trunk/src/org/apache/roller/model/WeblogEntryEditor.java)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/WeblogEntryEditor.java?view=diff&rev=465676&p1=incubator/roller/trunk/src/org/apache/roller/model/WeblogEntryEditor.java&r1=465668&p2=incubator/roller/trunk/src/org/apache/roller/business/WeblogEntryEditor.java&r2=465676
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/model/WeblogEntryEditor.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/WeblogEntryEditor.java Thu Oct 19 09:54:45 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.model;
+package org.apache.roller.business;
/**
* Represents an editor for a WeblogEntry.
Copied: incubator/roller/trunk/src/org/apache/roller/business/WeblogEntryPlugin.java (from r465668, incubator/roller/trunk/src/org/apache/roller/model/WeblogEntryPlugin.java)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/WeblogEntryPlugin.java?view=diff&rev=465676&p1=incubator/roller/trunk/src/org/apache/roller/model/WeblogEntryPlugin.java&r1=465668&p2=incubator/roller/trunk/src/org/apache/roller/business/WeblogEntryPlugin.java&r2=465676
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/model/WeblogEntryPlugin.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/WeblogEntryPlugin.java Thu Oct 19 09:54:45 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.model;
+package org.apache.roller.business;
import java.util.Map;
import org.apache.roller.RollerException;
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=465676&r1=465675&r2=465676
==============================================================================
--- 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 09:54:45 2006
@@ -39,7 +39,7 @@
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.input.SAXBuilder;
-import org.apache.roller.model.BookmarkManager;
+import org.apache.roller.business.BookmarkManager;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.util.Utilities;
Modified: incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateConfigManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateConfigManagerImpl.java?view=diff&rev=465676&r1=465675&r2=465676
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateConfigManagerImpl.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateConfigManagerImpl.java Thu Oct 19 09:54:45 2006
@@ -28,7 +28,7 @@
import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.model.ConfigManager;
+import org.apache.roller.business.ConfigManager;
/**
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=465676&r1=465675&r2=465676
==============================================================================
--- 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 09:54:45 2006
@@ -24,8 +24,8 @@
import org.apache.roller.RollerException;
import org.apache.roller.business.RollerImpl;
import org.apache.roller.config.RollerConfig;
-import org.apache.roller.model.BookmarkManager;
-import org.apache.roller.model.ConfigManager;
+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;
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=465676&r1=465675&r2=465676
==============================================================================
--- 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 09:54:45 2006
@@ -33,7 +33,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
import org.apache.roller.config.RollerRuntimeConfig;
-import org.apache.roller.model.PluginManager;
+import org.apache.roller.business.PluginManager;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.model.UserManager;
import org.apache.roller.model.WeblogManager;
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=465676&r1=465675&r2=465676
==============================================================================
--- 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 09:54:45 2006
@@ -39,7 +39,7 @@
import org.apache.roller.RollerException;
import org.apache.roller.config.RollerConfig;
import org.apache.roller.model.AutoPingManager;
-import org.apache.roller.model.BookmarkManager;
+import org.apache.roller.business.BookmarkManager;
import org.apache.roller.model.PingTargetManager;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.model.UserManager;
Modified: incubator/roller/trunk/src/org/apache/roller/model/Roller.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/model/Roller.java?view=diff&rev=465676&r1=465675&r2=465676
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/model/Roller.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/model/Roller.java Thu Oct 19 09:54:45 2006
@@ -21,7 +21,10 @@
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.referrers.ReferrerQueueManager;
import org.apache.roller.planet.model.PlanetManager;
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=465676&r1=465675&r2=465676
==============================================================================
--- 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 09:54:45 2006
@@ -38,7 +38,7 @@
import java.util.Map;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.roller.RollerException;
-import org.apache.roller.model.PluginManager;
+import org.apache.roller.business.PluginManager;
import org.apache.roller.model.Roller;
import org.apache.roller.model.RollerFactory;
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=465676&r1=465675&r2=465676
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/pojos/BookmarkData.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/pojos/BookmarkData.java Thu Oct 19 09:54:45 2006
@@ -18,7 +18,7 @@
package org.apache.roller.pojos;
import org.apache.roller.RollerException;
-import org.apache.roller.model.BookmarkManager;
+import org.apache.roller.business.BookmarkManager;
import org.apache.roller.model.Roller;
import org.apache.roller.model.RollerFactory;
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=465676&r1=465675&r2=465676
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/pojos/FolderData.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/pojos/FolderData.java Thu Oct 19 09:54:45 2006
@@ -25,7 +25,7 @@
import java.util.TreeSet;
import org.apache.roller.RollerException;
-import org.apache.roller.model.BookmarkManager;
+import org.apache.roller.business.BookmarkManager;
import org.apache.roller.model.RollerFactory;
/**
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=465676&r1=465675&r2=465676
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/pojos/WeblogEntryData.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/pojos/WeblogEntryData.java Thu Oct 19 09:54:45 2006
@@ -46,7 +46,7 @@
import org.apache.roller.model.Roller;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.model.UserManager;
-import org.apache.roller.model.WeblogEntryPlugin;
+import org.apache.roller.business.WeblogEntryPlugin;
import org.apache.roller.model.WeblogManager;
import org.apache.roller.util.DateUtil;
import org.apache.roller.util.MessageUtilities;
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=465676&r1=465675&r2=465676
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/pojos/WebsiteData.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/pojos/WebsiteData.java Thu Oct 19 09:54:45 2006
@@ -38,8 +38,8 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.ThemeNotFoundException;
import org.apache.roller.config.RollerRuntimeConfig;
-import org.apache.roller.model.BookmarkManager;
-import org.apache.roller.model.PluginManager;
+import org.apache.roller.business.BookmarkManager;
+import org.apache.roller.business.PluginManager;
import org.apache.roller.model.Roller;
import org.apache.roller.model.ThemeManager;
import org.apache.roller.model.UserManager;
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=465676&r1=465675&r2=465676
==============================================================================
--- 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 09:54:45 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.BookmarkManager;
+import org.apache.roller.business.BookmarkManager;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.pojos.BookmarkData;
import org.apache.roller.pojos.FolderData;
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=465676&r1=465675&r2=465676
==============================================================================
--- 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 09:54:45 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.BookmarkManager;
+import org.apache.roller.business.BookmarkManager;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.pojos.BookmarkData;
import org.apache.roller.pojos.FolderData;
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=465676&r1=465675&r2=465676
==============================================================================
--- 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 09:54:45 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.BookmarkManager;
+import org.apache.roller.business.BookmarkManager;
import org.apache.roller.model.Roller;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.pojos.BookmarkData;
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=465676&r1=465675&r2=465676
==============================================================================
--- 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 09:54:45 2006
@@ -27,7 +27,7 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.roller.model.BookmarkManager;
+import org.apache.roller.business.BookmarkManager;
import org.apache.roller.model.RollerFactory;
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/FolderSaveAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/FolderSaveAction.java?view=diff&rev=465676&r1=465675&r2=465676
==============================================================================
--- 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 09:54:45 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.BookmarkManager;
+import org.apache.roller.business.BookmarkManager;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.pojos.FolderData;
import org.apache.roller.pojos.PermissionsData;
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=465676&r1=465675&r2=465676
==============================================================================
--- 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 09:54:45 2006
@@ -32,7 +32,7 @@
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.upload.FormFile;
-import org.apache.roller.model.BookmarkManager;
+import org.apache.roller.business.BookmarkManager;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.ui.core.RollerRequest;
import org.apache.roller.ui.authoring.struts.formbeans.FolderFormEx;
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=465676&r1=465675&r2=465676
==============================================================================
--- 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 09:54:45 2006
@@ -61,7 +61,7 @@
import org.apache.roller.RollerPermissionsException;
import org.apache.roller.config.RollerConfig;
import org.apache.roller.model.IndexManager;
-import org.apache.roller.model.PluginManager;
+import org.apache.roller.business.PluginManager;
import org.apache.roller.model.Roller;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.model.UserManager;
Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryPageModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryPageModel.java?view=diff&rev=465676&r1=465675&r2=465676
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryPageModel.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryPageModel.java Thu Oct 19 09:54:45 2006
@@ -44,9 +44,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.config.RollerRuntimeConfig;
-import org.apache.roller.model.PluginManager;
+import org.apache.roller.business.PluginManager;
import org.apache.roller.model.Roller;
-import org.apache.roller.model.WeblogEntryEditor;
+import org.apache.roller.business.WeblogEntryEditor;
import org.apache.roller.pojos.WebsiteData;
/**
Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WebsiteFormAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WebsiteFormAction.java?view=diff&rev=465676&r1=465675&r2=465676
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WebsiteFormAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WebsiteFormAction.java Thu Oct 19 09:54:45 2006
@@ -45,11 +45,11 @@
import org.apache.roller.RollerPermissionsException;
import org.apache.roller.config.RollerConfig;
import org.apache.roller.config.RollerRuntimeConfig;
-import org.apache.roller.model.PluginManager;
+import org.apache.roller.business.PluginManager;
import org.apache.roller.model.Roller;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.model.UserManager;
-import org.apache.roller.model.WeblogEntryEditor;
+import org.apache.roller.business.WeblogEntryEditor;
import org.apache.roller.model.WeblogManager;
import org.apache.roller.pojos.UserData;
import org.apache.roller.pojos.WebsiteData;
Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/ShowEntryContentTag.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/ShowEntryContentTag.java?view=diff&rev=465676&r1=465675&r2=465676
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/ShowEntryContentTag.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/ShowEntryContentTag.java Thu Oct 19 09:54:45 2006
@@ -27,7 +27,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.model.PluginManager;
+import org.apache.roller.business.PluginManager;
import org.apache.roller.model.Roller;
import org.apache.roller.model.RollerFactory;
Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/ShowEntrySummaryTag.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/ShowEntrySummaryTag.java?view=diff&rev=465676&r1=465675&r2=465676
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/ShowEntrySummaryTag.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/ShowEntrySummaryTag.java Thu Oct 19 09:54:45 2006
@@ -29,7 +29,7 @@
import org.apache.struts.util.RequestUtils;
import org.apache.roller.model.Roller;
-import org.apache.roller.model.PluginManager;
+import org.apache.roller.business.PluginManager;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.ui.core.RollerContext;
Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/ShowEntryTextTag.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/ShowEntryTextTag.java?view=diff&rev=465676&r1=465675&r2=465676
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/ShowEntryTextTag.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/ShowEntryTextTag.java Thu Oct 19 09:54:45 2006
@@ -28,7 +28,7 @@
import org.apache.struts.util.RequestUtils;
import org.apache.roller.model.Roller;
-import org.apache.roller.model.PluginManager;
+import org.apache.roller.business.PluginManager;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.ui.core.RollerContext;
Modified: incubator/roller/trunk/src/org/apache/roller/ui/core/plugins/TextEditor.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/core/plugins/TextEditor.java?view=diff&rev=465676&r1=465675&r2=465676
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/core/plugins/TextEditor.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/plugins/TextEditor.java Thu Oct 19 09:54:45 2006
@@ -18,7 +18,7 @@
package org.apache.roller.ui.core.plugins;
-import org.apache.roller.model.WeblogEntryEditor;
+import org.apache.roller.business.WeblogEntryEditor;
import org.apache.roller.util.MessageUtilities;
Modified: incubator/roller/trunk/src/org/apache/roller/ui/core/plugins/XinhaEditor.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/core/plugins/XinhaEditor.java?view=diff&rev=465676&r1=465675&r2=465676
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/core/plugins/XinhaEditor.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/plugins/XinhaEditor.java Thu Oct 19 09:54:45 2006
@@ -18,7 +18,7 @@
package org.apache.roller.ui.core.plugins;
-import org.apache.roller.model.WeblogEntryEditor;
+import org.apache.roller.business.WeblogEntryEditor;
import org.apache.roller.util.MessageUtilities;
Modified: incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/AcronymsPlugin.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/AcronymsPlugin.java?view=diff&rev=465676&r1=465675&r2=465676
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/AcronymsPlugin.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/AcronymsPlugin.java Thu Oct 19 09:54:45 2006
@@ -29,7 +29,7 @@
import org.apache.roller.RollerException;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.model.UserManager;
-import org.apache.roller.model.WeblogEntryPlugin;
+import org.apache.roller.business.WeblogEntryPlugin;
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.pojos.WeblogTemplate;
import org.apache.roller.pojos.WebsiteData;
Modified: incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/BookmarkPlugin.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/BookmarkPlugin.java?view=diff&rev=465676&r1=465675&r2=465676
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/BookmarkPlugin.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/BookmarkPlugin.java Thu Oct 19 09:54:45 2006
@@ -28,9 +28,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
-import org.apache.roller.model.BookmarkManager;
+import org.apache.roller.business.BookmarkManager;
import org.apache.roller.model.RollerFactory;
-import org.apache.roller.model.WeblogEntryPlugin;
+import org.apache.roller.business.WeblogEntryPlugin;
import org.apache.roller.pojos.BookmarkData;
import org.apache.roller.pojos.FolderData;
import org.apache.roller.pojos.WeblogEntryData;
Modified: incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/ConvertLineBreaksPlugin.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/ConvertLineBreaksPlugin.java?view=diff&rev=465676&r1=465675&r2=465676
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/ConvertLineBreaksPlugin.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/ConvertLineBreaksPlugin.java Thu Oct 19 09:54:45 2006
@@ -26,7 +26,7 @@
import org.apache.roller.RollerException;
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.model.WeblogEntryPlugin;
+import org.apache.roller.business.WeblogEntryPlugin;
/**
Modified: incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/GoogleLinkPlugin.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/GoogleLinkPlugin.java?view=diff&rev=465676&r1=465675&r2=465676
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/GoogleLinkPlugin.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/GoogleLinkPlugin.java Thu Oct 19 09:54:45 2006
@@ -20,7 +20,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.model.WeblogEntryPlugin;
+import org.apache.roller.business.WeblogEntryPlugin;
import java.text.MessageFormat;
import java.util.regex.Pattern;
Modified: incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/ObfuscateEmailPlugin.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/ObfuscateEmailPlugin.java?view=diff&rev=465676&r1=465675&r2=465676
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/ObfuscateEmailPlugin.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/ObfuscateEmailPlugin.java Thu Oct 19 09:54:45 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.model.WeblogEntryPlugin;
+import org.apache.roller.business.WeblogEntryPlugin;
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.pojos.WebsiteData;
import org.apache.roller.util.RegexUtil;
Modified: incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/SmileysPlugin.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/SmileysPlugin.java?view=diff&rev=465676&r1=465675&r2=465676
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/SmileysPlugin.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/SmileysPlugin.java Thu Oct 19 09:54:45 2006
@@ -28,7 +28,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
import org.apache.roller.config.RollerRuntimeConfig;
-import org.apache.roller.model.WeblogEntryPlugin;
+import org.apache.roller.business.WeblogEntryPlugin;
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.pojos.WebsiteData;
Modified: incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/TopicTagPlugin.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/TopicTagPlugin.java?view=diff&rev=465676&r1=465675&r2=465676
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/TopicTagPlugin.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/TopicTagPlugin.java Thu Oct 19 09:54:45 2006
@@ -23,12 +23,12 @@
import org.apache.velocity.context.Context;
import org.apache.roller.RollerException;
import org.apache.roller.config.RollerConfig;
-import org.apache.roller.model.BookmarkManager;
+import org.apache.roller.business.BookmarkManager;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.pojos.BookmarkData;
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.model.WeblogEntryPlugin;
+import org.apache.roller.business.WeblogEntryPlugin;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
Modified: incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/WikipediaLinkPlugin.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/WikipediaLinkPlugin.java?view=diff&rev=465676&r1=465675&r2=465676
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/WikipediaLinkPlugin.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/WikipediaLinkPlugin.java Thu Oct 19 09:54:45 2006
@@ -20,7 +20,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.model.WeblogEntryPlugin;
+import org.apache.roller.business.WeblogEntryPlugin;
import java.text.MessageFormat;
import java.util.regex.Pattern;
Modified: incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/OldPageHelper.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/OldPageHelper.java?view=diff&rev=465676&r1=465675&r2=465676
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/OldPageHelper.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/OldPageHelper.java Thu Oct 19 09:54:45 2006
@@ -34,8 +34,8 @@
import org.apache.struts.Globals;
import org.apache.struts.util.RequestUtils;
import org.apache.roller.RollerException;
-import org.apache.roller.model.WeblogEntryPlugin;
-import org.apache.roller.model.PluginManager;
+import org.apache.roller.business.WeblogEntryPlugin;
+import org.apache.roller.business.PluginManager;
import org.apache.roller.model.Roller;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.pojos.FolderData;
Modified: incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/OldWeblogPageModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/OldWeblogPageModel.java?view=diff&rev=465676&r1=465675&r2=465676
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/OldWeblogPageModel.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/OldWeblogPageModel.java Thu Oct 19 09:54:45 2006
@@ -33,7 +33,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
import org.apache.roller.config.RollerRuntimeConfig;
-import org.apache.roller.model.BookmarkManager;
+import org.apache.roller.business.BookmarkManager;
import org.apache.roller.model.RefererManager;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.pojos.Template;
Modified: incubator/roller/trunk/tests/org/apache/roller/business/BookmarkTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/tests/org/apache/roller/business/BookmarkTest.java?view=diff&rev=465676&r1=465675&r2=465676
==============================================================================
--- incubator/roller/trunk/tests/org/apache/roller/business/BookmarkTest.java (original)
+++ incubator/roller/trunk/tests/org/apache/roller/business/BookmarkTest.java Thu Oct 19 09:54:45 2006
@@ -29,7 +29,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
import org.apache.roller.TestUtils;
-import org.apache.roller.model.BookmarkManager;
+import org.apache.roller.business.BookmarkManager;
import org.apache.roller.model.Roller;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.pojos.BookmarkData;
Modified: incubator/roller/trunk/tests/org/apache/roller/business/PluginManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/tests/org/apache/roller/business/PluginManagerTest.java?view=diff&rev=465676&r1=465675&r2=465676
==============================================================================
--- incubator/roller/trunk/tests/org/apache/roller/business/PluginManagerTest.java (original)
+++ incubator/roller/trunk/tests/org/apache/roller/business/PluginManagerTest.java Thu Oct 19 09:54:45 2006
@@ -24,7 +24,7 @@
import junit.framework.TestSuite;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.model.PluginManager;
+import org.apache.roller.business.PluginManager;
import org.apache.roller.model.RollerFactory;
Modified: incubator/roller/trunk/web/WEB-INF/jsps/authoring/WeblogEdit.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/WEB-INF/jsps/authoring/WeblogEdit.jsp?view=diff&rev=465676&r1=465675&r2=465676
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/jsps/authoring/WeblogEdit.jsp (original)
+++ incubator/roller/trunk/web/WEB-INF/jsps/authoring/WeblogEdit.jsp Thu Oct 19 09:54:45 2006
@@ -236,7 +236,7 @@
<fmt:message key="weblogEdit.pluginsToApply" /></a>
</div>
<div id="pluginControl" class="miscControl" style="display:none">
- <logic:iterate id="plugin" type="org.apache.roller.model.WeblogEntryPlugin"
+ <logic:iterate id="plugin" type="org.apache.roller.business.WeblogEntryPlugin"
collection="<%= model.getPagePlugins() %>">
<html:multibox property="pluginsArray"
title="<%= plugin.getName() %>" value="<%= plugin.getName() %>"
Modified: incubator/roller/trunk/web/WEB-INF/jsps/authoring/edit-website.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/WEB-INF/jsps/authoring/edit-website.jsp?view=diff&rev=465676&r1=465675&r2=465676
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/jsps/authoring/edit-website.jsp (original)
+++ incubator/roller/trunk/web/WEB-INF/jsps/authoring/edit-website.jsp Thu Oct 19 09:54:45 2006
@@ -235,7 +235,7 @@
<tr>
<td class="label"><fmt:message key="websiteSettings.label1" /> <br /><fmt:message key="websiteSettings.label2" /></td>
<td class="field">
- <logic:iterate id="plugin" type="org.apache.roller.model.WeblogEntryPlugin"
+ <logic:iterate id="plugin" type="org.apache.roller.business.WeblogEntryPlugin"
collection="<%= model.getPagePlugins() %>">
<html:multibox property="defaultPluginsArray"
title="<%= plugin.getName() %>" value="<%= plugin.getName() %>" /></input>