svn commit: r439394 - in /incubator/roller/branches/roller_3.0: ./ contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/acronyms/ contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/bookmarks/ contrib/plugins/src/org/apac...

[ag...@apache.org]

Author: agilliland
Date: Fri Sep  1 10:39:44 2006
New Revision: 439394

URL: http://svn.apache.org/viewvc?rev=439394&view=rev
Log:
move current set of supported plugins to core source tree.

- moved plugin classes out of separate 'contrib' build space and into core source tree along with a java package change.
- updated default roller.properties config to only enable a subset of the plugins by default.
- updated config properties for topictag plugin to not use full classname since the package just changed.
- updated build.xml to not build and include contrib as part of standard build.


Added:
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/AcronymsPlugin.java
      - copied, changed from r439082, incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/acronyms/AcronymsPlugin.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/BookmarkPlugin.java
      - copied, changed from r439082, incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/bookmarks/BookmarkPlugin.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/ConvertLineBreaksPlugin.java
      - copied, changed from r439082, incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/convertbreaks/ConvertLineBreaksPlugin.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/GoogleLinkPlugin.java
      - copied, changed from r439082, incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/search/GoogleLinkPlugin.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/ObfuscateEmailPlugin.java
      - copied, changed from r439082, incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/email/ObfuscateEmailPlugin.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/SearchPluginBase.java
      - copied, changed from r439082, incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/search/SearchPluginBase.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/SmileysPlugin.java
      - copied, changed from r439082, incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/smileys/SmileysPlugin.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/TopicTagPlugin.java
      - copied, changed from r439082, incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/topictag/TopicTagPlugin.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/WikipediaLinkPlugin.java
      - copied, changed from r439082, incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/search/WikipediaLinkPlugin.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/smileys.properties
      - copied unchanged from r439082, incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/smileys/smileys.properties
Removed:
    incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/acronyms/AcronymsPlugin.java
    incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/bookmarks/BookmarkPlugin.java
    incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/convertbreaks/ConvertLineBreaksPlugin.java
    incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/email/ObfuscateEmailPlugin.java
    incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/search/GoogleLinkPlugin.java
    incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/search/SearchPluginBase.java
    incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/search/WikipediaLinkPlugin.java
    incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/smileys/SmileysPlugin.java
    incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/smileys/smileys.properties
    incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/topictag/TopicTagPlugin.java
Modified:
    incubator/roller/branches/roller_3.0/build.xml
    incubator/roller/branches/roller_3.0/web/WEB-INF/classes/roller.properties

Modified: incubator/roller/branches/roller_3.0/build.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/build.xml?rev=439394&r1=439393&r2=439394&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/build.xml (original)
+++ incubator/roller/branches/roller_3.0/build.xml Fri Sep  1 10:39:44 2006
@@ -354,9 +354,6 @@
         <fileset dir="${build.compile.web}" excludes="**/tomcat/**"/>
     </jar>
     
-    <!-- build contributions as well -->
-    <ant inheritAll="false" dir="contrib" />
-    
 </target>
 
 

Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/AcronymsPlugin.java (from r439082, incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/acronyms/AcronymsPlugin.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/AcronymsPlugin.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/AcronymsPlugin.java&p1=incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/acronyms/AcronymsPlugin.java&r1=439082&r2=439394&rev=439394&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/acronyms/AcronymsPlugin.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/AcronymsPlugin.java Fri Sep  1 10:39:44 2006
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.presentation.velocity.plugins.acronyms;
+package org.apache.roller.ui.rendering.plugins;
 
 import java.util.Iterator;
 import java.util.Map;

Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/BookmarkPlugin.java (from r439082, incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/bookmarks/BookmarkPlugin.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/BookmarkPlugin.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/BookmarkPlugin.java&p1=incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/bookmarks/BookmarkPlugin.java&r1=439082&r2=439394&rev=439394&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/bookmarks/BookmarkPlugin.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/BookmarkPlugin.java Fri Sep  1 10:39:44 2006
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.presentation.velocity.plugins.bookmarks;
+package org.apache.roller.ui.rendering.plugins;
 
 import java.util.Collection;
 import java.util.Iterator;

Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/ConvertLineBreaksPlugin.java (from r439082, incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/convertbreaks/ConvertLineBreaksPlugin.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/ConvertLineBreaksPlugin.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/ConvertLineBreaksPlugin.java&p1=incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/convertbreaks/ConvertLineBreaksPlugin.java&r1=439082&r2=439394&rev=439394&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/convertbreaks/ConvertLineBreaksPlugin.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/ConvertLineBreaksPlugin.java Fri Sep  1 10:39:44 2006
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.presentation.velocity.plugins.convertbreaks;
+package org.apache.roller.ui.rendering.plugins;
 
 import java.io.BufferedReader;
 import java.io.StringReader;

Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/GoogleLinkPlugin.java (from r439082, incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/search/GoogleLinkPlugin.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/GoogleLinkPlugin.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/GoogleLinkPlugin.java&p1=incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/search/GoogleLinkPlugin.java&r1=439082&r2=439394&rev=439394&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/search/GoogleLinkPlugin.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/GoogleLinkPlugin.java Fri Sep  1 10:39:44 2006
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.presentation.velocity.plugins.search;
+package org.apache.roller.ui.rendering.plugins;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/ObfuscateEmailPlugin.java (from r439082, incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/email/ObfuscateEmailPlugin.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/ObfuscateEmailPlugin.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/ObfuscateEmailPlugin.java&p1=incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/email/ObfuscateEmailPlugin.java&r1=439082&r2=439394&rev=439394&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/email/ObfuscateEmailPlugin.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/ObfuscateEmailPlugin.java Fri Sep  1 10:39:44 2006
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.presentation.velocity.plugins.email;
+package org.apache.roller.ui.rendering.plugins;
 
 import java.util.Map;
 import org.apache.commons.lang.StringEscapeUtils;

Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/SearchPluginBase.java (from r439082, incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/search/SearchPluginBase.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/SearchPluginBase.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/SearchPluginBase.java&p1=incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/search/SearchPluginBase.java&r1=439082&r2=439394&rev=439394&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/search/SearchPluginBase.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/SearchPluginBase.java Fri Sep  1 10:39:44 2006
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.presentation.velocity.plugins.search;
+package org.apache.roller.ui.rendering.plugins;
 
 import org.apache.commons.logging.Log;
 import org.apache.roller.RollerException;

Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/SmileysPlugin.java (from r439082, incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/smileys/SmileysPlugin.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/SmileysPlugin.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/SmileysPlugin.java&p1=incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/smileys/SmileysPlugin.java&r1=439082&r2=439394&rev=439394&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/smileys/SmileysPlugin.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/SmileysPlugin.java Fri Sep  1 10:39:44 2006
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.presentation.velocity.plugins.smileys;
+package org.apache.roller.ui.rendering.plugins;
 
 import java.util.Enumeration;
 import java.util.Map;

Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/TopicTagPlugin.java (from r439082, incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/topictag/TopicTagPlugin.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/TopicTagPlugin.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/TopicTagPlugin.java&p1=incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/topictag/TopicTagPlugin.java&r1=439082&r2=439394&rev=439394&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/topictag/TopicTagPlugin.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/TopicTagPlugin.java Fri Sep  1 10:39:44 2006
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.presentation.velocity.plugins.topictag;
+package org.apache.roller.ui.rendering.plugins;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -307,8 +307,7 @@
     protected Map buildBookmarkMap(WebsiteData website) throws RollerException
     {
         Map bookmarkMap = new HashMap();
-        if (RollerConfig.getBooleanProperty(
-            "org.apache.roller.presentation.velocity.plugins.topictag.TopicTagPlugin.ignoreBookmarks")) {
+        if (RollerConfig.getBooleanProperty("plugins.topictag.ignoreBookmarks")) {
             return bookmarkMap;
         }
         if (website == null)
@@ -340,11 +339,9 @@
         setLinkFormatString(getSetting("linkFormatString", getLinkFormatString()));
     }
 
-    private static final String thisClassnameDot = TopicTagPlugin.class.getName() + ".";
-
     private String getSetting(String propName, String defaultValue)
     {
-        String fullPropName = thisClassnameDot + propName;
+        String fullPropName = "plugins.topictag." + propName;
         String val = (String) RollerConfig.getProperty(fullPropName);
         return (val != null) ? val : defaultValue;
     }

Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/WikipediaLinkPlugin.java (from r439082, incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/search/WikipediaLinkPlugin.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/WikipediaLinkPlugin.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/WikipediaLinkPlugin.java&p1=incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/search/WikipediaLinkPlugin.java&r1=439082&r2=439394&rev=439394&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/search/WikipediaLinkPlugin.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/WikipediaLinkPlugin.java Fri Sep  1 10:39:44 2006
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.presentation.velocity.plugins.search;
+package org.apache.roller.ui.rendering.plugins;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/classes/roller.properties
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/classes/roller.properties?rev=439394&r1=439393&r2=439394&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/classes/roller.properties (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/classes/roller.properties Fri Sep  1 10:39:44 2006
@@ -216,17 +216,17 @@
 #----------------------------------
 # Enabled plugins ... remember, order does matter!!
 
-# Weblog entry editor plugins
+# Weblog entry plugins
 plugins.page=\
-org.apache.roller.presentation.velocity.plugins.convertbreaks.ConvertLineBreaksPlugin \
-,org.apache.roller.presentation.velocity.plugins.topictag.TopicTagPlugin \
-,org.apache.roller.presentation.velocity.plugins.search.WikipediaLinkPlugin \
-,org.apache.roller.presentation.velocity.plugins.search.GoogleLinkPlugin \
-,org.apache.roller.presentation.velocity.plugins.textile.TextilePlugin \
-,org.apache.roller.presentation.velocity.plugins.acronyms.AcronymsPlugin \
-,org.apache.roller.presentation.velocity.plugins.bookmarks.BookmarkPlugin \
-,org.apache.roller.presentation.velocity.plugins.email.ObfuscateEmailPlugin \
-,org.apache.roller.presentation.velocity.plugins.smileys.SmileysPlugin
+org.apache.roller.ui.rendering.plugins.ConvertLineBreaksPlugin \
+,org.apache.roller.ui.rendering.plugins.TopicTagPlugin \
+,org.apache.roller.ui.rendering.plugins.ObfuscateEmailPlugin \
+,org.apache.roller.ui.rendering.plugins.SmileysPlugin 
+#,org.apache.roller.ui.rendering.plugins.WikipediaLinkPlugin \
+#,org.apache.roller.ui.rendering.plugins.GoogleLinkPlugin \
+#,org.apache.roller.ui.rendering.plugins.AcronymsPlugin \
+#,org.apache.roller.ui.rendering.plugins.BookmarkPlugin
+
 
 #----------------------------------
 # scheduled tasks, each is comma separated list of classes
@@ -445,14 +445,14 @@
 # Optional site-wide customization settings for the TopicTag plugin.
 # n.b. these default settings match the coded default values that would be 
 # applied if these were omitted.
-org.apache.roller.presentation.velocity.plugins.topictag.TopicTagPlugin.defaultTopicBookmarkName=Default Topic Site
-org.apache.roller.presentation.velocity.plugins.topictag.TopicTagPlugin.defaultTopicSite=http://www.technorati.com/tag
-org.apache.roller.presentation.velocity.plugins.topictag.TopicTagPlugin.tagRegexWithBookmark=topic:\\{(.*?)\\}\\[(.*?)\\]
-org.apache.roller.presentation.velocity.plugins.topictag.TopicTagPlugin.tagRegexWithoutBookmark=topic:\\[(.*?)\\]
-org.apache.roller.presentation.velocity.plugins.topictag.TopicTagPlugin.linkFormatString=<a rel=\"tag\" href=\"{0}{1}\">{2}</a>
+plugins.topictag.defaultTopicBookmarkName=Default Topic Site
+plugins.topictag.defaultTopicSite=http://www.technorati.com/tag
+plugins.topictag.tagRegexWithBookmark=topic:\\{(.*?)\\}\\[(.*?)\\]
+plugins.topictag.tagRegexWithoutBookmark=topic:\\[(.*?)\\]
+plugins.topictag.linkFormatString=<a rel=\"tag\" href=\"{0}{1}\">{2}</a>
 
 # Set to true to allow only default topic tag site (and avoid costly bookmark queries)
-org.apache.roller.presentation.velocity.plugins.topictag.TopicTagPlugin.ignoreBookmarks=true
+plugins.topictag.ignoreBookmarks=true
 
 #---------------------------------
 # Experimental settings