Author: agilliland
Date: Fri Jun 8 09:46:19 2007
New Revision: 545557
URL: http://svn.apache.org/viewvc?view=rev&rev=545557
Log:
moving weblog entry plugins into a new business.plugins package which is more
appropriate than their current location. hopefully this will be the last time
we move the plugins :/
Added:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/PluginManager.java
- copied, changed from r544591,
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/PluginManager.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/PluginManagerImpl.java
- copied, changed from r544591,
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/PluginManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/AcronymsPlugin.java
- copied, changed from r544591,
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/AcronymsPlugin.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java
- copied, changed from r544591,
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/BookmarkPlugin.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/ConvertLineBreaksPlugin.java
- copied, changed from r544591,
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/ConvertLineBreaksPlugin.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/GoogleLinkPlugin.java
- copied, changed from r544591,
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/GoogleLinkPlugin.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/ObfuscateEmailPlugin.java
- copied, changed from r544591,
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/ObfuscateEmailPlugin.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/SearchPluginBase.java
- copied, changed from r544591,
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/SearchPluginBase.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/SmileysPlugin.java
- copied, changed from r544591,
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/SmileysPlugin.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/TopicTagPlugin.java
- copied, changed from r544591,
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/TopicTagPlugin.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/WeblogEntryPlugin.java
- copied, changed from r544591,
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WeblogEntryPlugin.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/WikipediaLinkPlugin.java
- copied, changed from r544591,
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/WikipediaLinkPlugin.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/smileys.properties
- copied unchanged from r544591,
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/smileys.properties
Removed:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/PluginManager.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/PluginManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WeblogEntryPlugin.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/Roller.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/RollerRomeFeedFetcher.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
roller/trunk/apps/weblogger/web/WEB-INF/classes/roller.properties
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/Roller.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/Roller.java?view=diff&rev=545557&r1=545556&r2=545557
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/Roller.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/Roller.java
Fri Jun 8 09:46:19 2007
@@ -18,6 +18,7 @@
package org.apache.roller.weblogger.business;
+import org.apache.roller.weblogger.business.plugins.PluginManager;
import java.io.Serializable;
import java.sql.Connection;
import org.apache.roller.weblogger.WebloggerException;
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerImpl.java?view=diff&rev=545557&r1=545556&r2=545557
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerImpl.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerImpl.java
Fri Jun 8 09:46:19 2007
@@ -18,6 +18,8 @@
package org.apache.roller.weblogger.business;
+import org.apache.roller.weblogger.business.plugins.PluginManagerImpl;
+import org.apache.roller.weblogger.business.plugins.PluginManager;
import java.io.IOException;
import java.util.Properties;
import org.apache.commons.logging.Log;
Copied:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/PluginManager.java
(from r544591,
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/PluginManager.java)
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/PluginManager.java?view=diff&rev=545557&p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/PluginManager.java&r1=544591&p2=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/PluginManager.java&r2=545557
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/PluginManager.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/PluginManager.java
Fri Jun 8 09:46:19 2007
@@ -16,13 +16,11 @@
* directory of this distribution.
*/
-package org.apache.roller.weblogger.business;
+package org.apache.roller.weblogger.business.plugins;
-import java.util.List;
import java.util.Map;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.ui.core.plugins.WeblogEntryEditor;
/**
Copied:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/PluginManagerImpl.java
(from r544591,
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/PluginManagerImpl.java)
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/PluginManagerImpl.java?view=diff&rev=545557&p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/PluginManagerImpl.java&r1=544591&p2=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/PluginManagerImpl.java&r2=545557
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/PluginManagerImpl.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/PluginManagerImpl.java
Fri Jun 8 09:46:19 2007
@@ -16,8 +16,10 @@
* directory of this distribution.
*/
-package org.apache.roller.weblogger.business;
+package org.apache.roller.weblogger.business.plugins;
+import org.apache.roller.weblogger.business.plugins.PluginManager;
+import org.apache.roller.weblogger.business.plugins.entry.WeblogEntryPlugin;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
Copied:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/AcronymsPlugin.java
(from r544591,
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/AcronymsPlugin.java)
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/AcronymsPlugin.java?view=diff&rev=545557&p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/AcronymsPlugin.java&r1=544591&p2=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/AcronymsPlugin.java&r2=545557
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/AcronymsPlugin.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/AcronymsPlugin.java
Fri Jun 8 09:46:19 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.weblogger.ui.rendering.plugins;
+package org.apache.roller.weblogger.business.plugins.entry;
import java.util.Iterator;
import java.util.Map;
@@ -29,7 +29,7 @@
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.UserManager;
-import org.apache.roller.weblogger.business.WeblogEntryPlugin;
+import org.apache.roller.weblogger.business.plugins.entry.WeblogEntryPlugin;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.WeblogTemplate;
import org.apache.roller.weblogger.pojos.Weblog;
Copied:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java
(from r544591,
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/BookmarkPlugin.java)
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java?view=diff&rev=545557&p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/BookmarkPlugin.java&r1=544591&p2=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java&r2=545557
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/BookmarkPlugin.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java
Fri Jun 8 09:46:19 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.weblogger.ui.rendering.plugins;
+package org.apache.roller.weblogger.business.plugins.entry;
import java.util.Collection;
import java.util.Iterator;
@@ -30,7 +30,7 @@
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.BookmarkManager;
import org.apache.roller.weblogger.business.RollerFactory;
-import org.apache.roller.weblogger.business.WeblogEntryPlugin;
+import org.apache.roller.weblogger.business.plugins.entry.WeblogEntryPlugin;
import org.apache.roller.weblogger.pojos.WeblogBookmark;
import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
import org.apache.roller.weblogger.pojos.WeblogEntry;
Copied:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/ConvertLineBreaksPlugin.java
(from r544591,
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/ConvertLineBreaksPlugin.java)
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/ConvertLineBreaksPlugin.java?view=diff&rev=545557&p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/ConvertLineBreaksPlugin.java&r1=544591&p2=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/ConvertLineBreaksPlugin.java&r2=545557
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/ConvertLineBreaksPlugin.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/ConvertLineBreaksPlugin.java
Fri Jun 8 09:46:19 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.weblogger.ui.rendering.plugins;
+package org.apache.roller.weblogger.business.plugins.entry;
import java.io.BufferedReader;
import java.io.StringReader;
@@ -26,7 +26,7 @@
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.business.WeblogEntryPlugin;
+import org.apache.roller.weblogger.business.plugins.entry.WeblogEntryPlugin;
/**
Copied:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/GoogleLinkPlugin.java
(from r544591,
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/GoogleLinkPlugin.java)
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/GoogleLinkPlugin.java?view=diff&rev=545557&p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/GoogleLinkPlugin.java&r1=544591&p2=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/GoogleLinkPlugin.java&r2=545557
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/GoogleLinkPlugin.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/GoogleLinkPlugin.java
Fri Jun 8 09:46:19 2007
@@ -16,11 +16,12 @@
* directory of this distribution.
*/
-package org.apache.roller.weblogger.ui.rendering.plugins;
+package org.apache.roller.weblogger.business.plugins.entry;
+import org.apache.roller.weblogger.business.plugins.entry.SearchPluginBase;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.business.WeblogEntryPlugin;
+import org.apache.roller.weblogger.business.plugins.entry.WeblogEntryPlugin;
import java.text.MessageFormat;
import java.util.regex.Pattern;
Copied:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/ObfuscateEmailPlugin.java
(from r544591,
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/ObfuscateEmailPlugin.java)
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/ObfuscateEmailPlugin.java?view=diff&rev=545557&p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/ObfuscateEmailPlugin.java&r1=544591&p2=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/ObfuscateEmailPlugin.java&r2=545557
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/ObfuscateEmailPlugin.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/ObfuscateEmailPlugin.java
Fri Jun 8 09:46:19 2007
@@ -16,14 +16,14 @@
* directory of this distribution.
*/
-package org.apache.roller.weblogger.ui.rendering.plugins;
+package org.apache.roller.weblogger.business.plugins.entry;
import java.util.Map;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.WeblogEntryPlugin;
+import org.apache.roller.weblogger.business.plugins.entry.WeblogEntryPlugin;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.util.RegexUtil;
Copied:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/SearchPluginBase.java
(from r544591,
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/SearchPluginBase.java)
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/SearchPluginBase.java?view=diff&rev=545557&p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/SearchPluginBase.java&r1=544591&p2=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/SearchPluginBase.java&r2=545557
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/SearchPluginBase.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/SearchPluginBase.java
Fri Jun 8 09:46:19 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.weblogger.ui.rendering.plugins;
+package org.apache.roller.weblogger.business.plugins.entry;
import org.apache.commons.logging.Log;
import org.apache.roller.weblogger.WebloggerException;
Copied:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/SmileysPlugin.java
(from r544591,
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/SmileysPlugin.java)
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/SmileysPlugin.java?view=diff&rev=545557&p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/SmileysPlugin.java&r1=544591&p2=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/SmileysPlugin.java&r2=545557
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/SmileysPlugin.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/SmileysPlugin.java
Fri Jun 8 09:46:19 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.weblogger.ui.rendering.plugins;
+package org.apache.roller.weblogger.business.plugins.entry;
import java.util.Enumeration;
import java.util.Map;
@@ -28,7 +28,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
-import org.apache.roller.weblogger.business.WeblogEntryPlugin;
+import org.apache.roller.weblogger.business.plugins.entry.WeblogEntryPlugin;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
Copied:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/TopicTagPlugin.java
(from r544591,
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/TopicTagPlugin.java)
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/TopicTagPlugin.java?view=diff&rev=545557&p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/TopicTagPlugin.java&r1=544591&p2=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/TopicTagPlugin.java&r2=545557
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/TopicTagPlugin.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/TopicTagPlugin.java
Fri Jun 8 09:46:19 2007
@@ -16,11 +16,10 @@
* directory of this distribution.
*/
-package org.apache.roller.weblogger.ui.rendering.plugins;
+package org.apache.roller.weblogger.business.plugins.entry;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.velocity.context.Context;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.RollerConfig;
import org.apache.roller.weblogger.business.BookmarkManager;
@@ -28,7 +27,7 @@
import org.apache.roller.weblogger.pojos.WeblogBookmark;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.business.WeblogEntryPlugin;
+import org.apache.roller.weblogger.business.plugins.entry.WeblogEntryPlugin;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
@@ -41,7 +40,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
-import javax.servlet.ServletConfig;
+
/**
* Provides an easy way to write topic tag links for Technorati (or similar
services).
Copied:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/WeblogEntryPlugin.java
(from r544591,
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WeblogEntryPlugin.java)
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/WeblogEntryPlugin.java?view=diff&rev=545557&p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WeblogEntryPlugin.java&r1=544591&p2=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/WeblogEntryPlugin.java&r2=545557
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WeblogEntryPlugin.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/WeblogEntryPlugin.java
Fri Jun 8 09:46:19 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.weblogger.business;
+package org.apache.roller.weblogger.business.plugins.entry;
import java.util.Map;
import org.apache.roller.weblogger.WebloggerException;
Copied:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/WikipediaLinkPlugin.java
(from r544591,
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/WikipediaLinkPlugin.java)
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/WikipediaLinkPlugin.java?view=diff&rev=545557&p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/WikipediaLinkPlugin.java&r1=544591&p2=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/WikipediaLinkPlugin.java&r2=545557
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/WikipediaLinkPlugin.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/WikipediaLinkPlugin.java
Fri Jun 8 09:46:19 2007
@@ -16,11 +16,12 @@
* directory of this distribution.
*/
-package org.apache.roller.weblogger.ui.rendering.plugins;
+package org.apache.roller.weblogger.business.plugins.entry;
+import org.apache.roller.weblogger.business.plugins.entry.SearchPluginBase;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.business.WeblogEntryPlugin;
+import org.apache.roller.weblogger.business.plugins.entry.WeblogEntryPlugin;
import java.text.MessageFormat;
import java.util.regex.Pattern;
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/RollerRomeFeedFetcher.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/RollerRomeFeedFetcher.java?view=diff&rev=545557&r1=545556&r2=545557
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/RollerRomeFeedFetcher.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/RollerRomeFeedFetcher.java
Fri Jun 8 09:46:19 2007
@@ -36,7 +36,7 @@
import org.apache.roller.planet.business.RomeFeedFetcher;
import org.apache.roller.planet.pojos.PlanetEntryData;
import org.apache.roller.planet.pojos.PlanetSubscriptionData;
-import org.apache.roller.weblogger.business.PluginManager;
+import org.apache.roller.weblogger.business.plugins.PluginManager;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.WeblogManager;
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java?view=diff&rev=545557&r1=545556&r2=545557
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java
Fri Jun 8 09:46:19 2007
@@ -40,7 +40,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.weblogger.business.BookmarkManager;
-import org.apache.roller.weblogger.business.PluginManager;
+import org.apache.roller.weblogger.business.plugins.PluginManager;
import org.apache.roller.weblogger.business.Roller;
import org.apache.roller.weblogger.business.themes.ThemeManager;
import org.apache.roller.weblogger.business.WeblogManager;
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java?view=diff&rev=545557&r1=545556&r2=545557
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
Fri Jun 8 09:46:19 2007
@@ -47,7 +47,7 @@
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.weblogger.business.RollerFactory;
-import org.apache.roller.weblogger.business.WeblogEntryPlugin;
+import org.apache.roller.weblogger.business.plugins.entry.WeblogEntryPlugin;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.util.DateUtil;
import org.apache.roller.weblogger.util.I18nMessages;
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java?view=diff&rev=545557&r1=545556&r2=545557
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java
Fri Jun 8 09:46:19 2007
@@ -30,8 +30,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.WeblogEntryPlugin;
-import org.apache.roller.weblogger.business.PluginManager;
+import org.apache.roller.weblogger.business.plugins.entry.WeblogEntryPlugin;
+import org.apache.roller.weblogger.business.plugins.PluginManager;
import org.apache.roller.weblogger.business.Roller;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java?view=diff&rev=545557&r1=545556&r2=545557
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java
Fri Jun 8 09:46:19 2007
@@ -25,9 +25,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.PluginManager;
+import org.apache.roller.weblogger.business.plugins.PluginManager;
import org.apache.roller.weblogger.business.RollerFactory;
-import org.apache.roller.weblogger.business.WeblogEntryPlugin;
+import org.apache.roller.weblogger.business.plugins.entry.WeblogEntryPlugin;
import org.apache.roller.weblogger.business.search.IndexManager;
import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.pojos.WeblogEntry;
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java?view=diff&rev=545557&r1=545556&r2=545557
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
Fri Jun 8 09:46:19 2007
@@ -26,7 +26,7 @@
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.business.PluginManager;
+import org.apache.roller.weblogger.business.plugins.PluginManager;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.WeblogManager;
Modified: roller/trunk/apps/weblogger/web/WEB-INF/classes/roller.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/classes/roller.properties?view=diff&rev=545557&r1=545556&r2=545557
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/classes/roller.properties (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/classes/roller.properties Fri Jun
8 09:46:19 2007
@@ -280,14 +280,14 @@
# Weblog entry plugins
plugins.page=\
-org.apache.roller.weblogger.ui.rendering.plugins.ConvertLineBreaksPlugin \
-,org.apache.roller.weblogger.ui.rendering.plugins.TopicTagPlugin \
-,org.apache.roller.weblogger.ui.rendering.plugins.ObfuscateEmailPlugin \
-,org.apache.roller.weblogger.ui.rendering.plugins.SmileysPlugin
-#,org.apache.roller.weblogger.ui.rendering.plugins.WikipediaLinkPlugin \
-#,org.apache.roller.weblogger.ui.rendering.plugins.GoogleLinkPlugin \
-#,org.apache.roller.weblogger.ui.rendering.plugins.AcronymsPlugin \
-#,org.apache.roller.weblogger.ui.rendering.plugins.BookmarkPlugin
+org.apache.roller.weblogger.business.plugins.entry.ConvertLineBreaksPlugin \
+,org.apache.roller.weblogger.business.plugins.entry.TopicTagPlugin \
+,org.apache.roller.weblogger.business.plugins.entry.ObfuscateEmailPlugin \
+,org.apache.roller.weblogger.business.plugins.entry.SmileysPlugin
+#,org.apache.roller.weblogger.business.plugins.entry.WikipediaLinkPlugin \
+#,org.apache.roller.weblogger.business.plugins.entry.GoogleLinkPlugin \
+#,org.apache.roller.weblogger.business.plugins.entry.AcronymsPlugin \
+#,org.apache.roller.weblogger.business.plugins.entry.BookmarkPlugin
# The list of configured WeblogEntryEditors available to users
plugins.weblogEntryEditors=\
