roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agillil...@apache.org
Subject svn commit: r440456 - in /incubator/roller/branches/roller_3.0: src/org/apache/roller/business/ src/org/apache/roller/business/hibernate/ src/org/apache/roller/model/ src/org/apache/roller/pojos/ src/org/apache/roller/ui/authoring/struts/actions/ src/o...
Date Tue, 05 Sep 2006 19:32:29 GMT
Author: agilliland
Date: Tue Sep  5 12:32:28 2006
New Revision: 440456

URL: http://svn.apache.org/viewvc?view=rev&rev=440456
Log:
final cleanup for entry plugins architecture.  WeblogEntryPlugins are no longer
given access to the rendering model at init time.


Modified:
    incubator/roller/branches/roller_3.0/src/org/apache/roller/business/PluginManagerImpl.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateRollerPlanetManagerImpl.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/model/PluginManager.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/model/WeblogEntryPlugin.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WebsiteData.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryPageModel.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WebsiteFormAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/tags/ShowEntryContentTag.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/tags/ShowEntrySummaryTag.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/tags/ShowEntryTextTag.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/AcronymsPlugin.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/BookmarkPlugin.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/ConvertLineBreaksPlugin.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/ObfuscateEmailPlugin.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/SearchPluginBase.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/SmileysPlugin.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/TopicTagPlugin.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/OldPageHelper.java
    incubator/roller/branches/roller_3.0/tests/org/apache/roller/ui/rendering/plugins/SmileysTest.java

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/business/PluginManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/business/PluginManagerImpl.java?view=diff&rev=440456&r1=440455&r2=440456
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/business/PluginManagerImpl.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/business/PluginManagerImpl.java
Tue Sep  5 12:32:28 2006
@@ -1,21 +1,21 @@
 /*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-*  contributor license agreements.  The ASF licenses this file to You
-* under the Apache License, Version 2.0 (the "License"); you may not
-* use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.  For additional information regarding
-* copyright in this work, please see the NOTICE file in the top level
-* directory of this distribution.
-*/
-/* Created on November 26, 2005, 9:04 AM */
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  The ASF licenses this file to You
+ * under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
+ */
+
 package org.apache.roller.business;
 
 import java.util.Iterator;
@@ -33,18 +33,18 @@
 import org.apache.roller.pojos.WebsiteData;
 import org.apache.commons.lang.StringUtils;
 
+
 /**
- * Centralized page plugin management.
- * @author Dave Johnson
+ * Centralized plugin management.
  */
 public class PluginManagerImpl implements PluginManager {
     
-    private static Log mLogger =
-            LogFactory.getFactory().getInstance(PluginManagerImpl.class);
+    private static Log mLogger = LogFactory.getLog(PluginManagerImpl.class);
     
     // Plugin classes keyed by plugin name
     static Map mPagePlugins = new LinkedHashMap();
     
+    
     /**
      * Creates a new instance of PluginManagerImpl
      */
@@ -52,11 +52,13 @@
         loadPagePluginClasses();
     }
     
+    
     public boolean hasPagePlugins() {
         mLogger.debug("mPluginClasses.size(): " + mPagePlugins.size());
         return (mPagePlugins != null && mPagePlugins.size() > 0);
     }
     
+    
     /**
      * Initialize PagePlugins declared in roller.properties.
      * By using the full class name we also allow for the implementation of
@@ -91,18 +93,19 @@
             }
         }
     }
-
+    
+    
     /**
-     * Create and init plugins for processing entries in a specified website. 
+     * Create and init plugins for processing entries in a specified website.
      */
-    public Map getWeblogEntryPlugins(WebsiteData website, Map model) {
+    public Map getWeblogEntryPlugins(WebsiteData website) {
         Map ret = new LinkedHashMap();
         Iterator it = getPagePluginClasses().values().iterator();
         while (it.hasNext()) {
             try {
                 Class pluginClass = (Class)it.next();
                 WeblogEntryPlugin plugin = (WeblogEntryPlugin)pluginClass.newInstance();
-                plugin.init(website, model);
+                plugin.init(website);
                 ret.put(plugin.getName(), plugin);
             } catch (Exception e) {
                 mLogger.error("Unable to init() PagePlugin: ", e);
@@ -111,11 +114,12 @@
         return ret;
     }
     
-    public String applyWeblogEntryPlugins(Map pagePlugins, WeblogEntryData entry, String
str) { 
+    
+    public String applyWeblogEntryPlugins(Map pagePlugins, WeblogEntryData entry, String
str) {
         String ret = str;
-        WeblogEntryData copy = new WeblogEntryData(entry);        
+        WeblogEntryData copy = new WeblogEntryData(entry);
         List entryPlugins = copy.getPluginsList();
-        if (entryPlugins != null && !entryPlugins.isEmpty()) {    
+        if (entryPlugins != null && !entryPlugins.isEmpty()) {
             Iterator iter = entryPlugins.iterator();
             while (iter.hasNext()) {
                 String key = (String)iter.next();
@@ -130,6 +134,7 @@
         return ret;
     }
     
+    
     private static boolean isPagePlugin(Class pluginClass) {
         Class[] interfaces = pluginClass.getInterfaces();
         for (int i=0; i<interfaces.length; i++) {
@@ -138,11 +143,14 @@
         return false;
     }
     
+    
     private Map getPagePluginClasses() {
         return mPagePlugins;
     }
     
+    
     public void release() {
         // no op
     }
+    
 }

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateRollerPlanetManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateRollerPlanetManagerImpl.java?view=diff&rev=440456&r1=440455&r2=440456
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateRollerPlanetManagerImpl.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateRollerPlanetManagerImpl.java
Tue Sep  5 12:32:28 2006
@@ -136,7 +136,7 @@
                 
                 // Populate subscription object with new entries
                 PluginManager ppmgr = RollerFactory.getRoller().getPagePluginManager();
-                Map pagePlugins = ppmgr.getWeblogEntryPlugins(website, new HashMap());
+                Map pagePlugins = ppmgr.getWeblogEntryPlugins(website);
                 Iterator entryIter = entries.iterator();
                 while (entryIter.hasNext()) {
                     try {

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/model/PluginManager.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/model/PluginManager.java?view=diff&rev=440456&r1=440455&r2=440456
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/model/PluginManager.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/model/PluginManager.java Tue
Sep  5 12:32:28 2006
@@ -1 +1 @@
-/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 *  contributor
license agreements.  The ASF licenses this file to You
 * under the Apache License, Version
2.0 (the "License"); you may not
 * use this file except in compliance with the License.
* You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
*
 * Unless required by applicable law or agreed to in writing, software
 * distributed under
the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied.
 * See the License for the specific language governing permissions
and
 * limitations under the License.  For additional information regarding
 * copyright in
this work, please see the NOTICE file in the top level
 * directory of this distribution.
*/

package org.apache.roller.model;

import java.util.Map;
import org.apache.roller.pojos.WeblogEntryData;
import
org.apache.roller.pojos.WebsiteData;

 /**
 * Manages Roller plugins.
 */
public interface PluginManager {
    
    /**
     * Returns
true if plugins are present
     */
    public boolean hasPagePlugins();
    
    
    /**
    * Returns a list of all registered weblog entry plugins initialized for
     * use with
the specified weblog.
     *
     * @param website        Website being processed
     * @param
model          Rendering model
     */
    public Map getWeblogEntryPlugins(WebsiteData website,
Map model);
    
    
    /**
     * Apply a set of weblog entry plugins to the specified
string and
     * return the results.  This method must *NOT* alter the contents of
     *
the original entry object.
     *
     * @param entry       Original weblog entry
     * @param
plugins     Map of plugins to apply
     * @param str         String to which to apply plugins
    * @return        the transformed text
     */
    public String applyWeblogEntryPlugins(Map
pagePlugins, WeblogEntryData entry, String str)
 ;
    
    
    /**
     * Release all resources associated with Roller session.
     */
   public void release();
    
}
\ No newline at end of file
+/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 *  contributor
license agreements.  The ASF licenses this file to You
 * under the Apache License, Version
2.0 (the "License"); you may not
 * use this file except in compliance with the License.
* You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
*
 * Unless required by applicable law or agreed to in writing, software
 * distributed under
the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied.
 * See the License for the specific language governing permissions
and
 * limitations under the License.  For additional information regarding
 * copyright in
this work, please see the NOTICE file in the top level
 * directory of this distribution.
*/

package org.apache.roller.model;

import java.util.Map;
import org.apache.roller.pojos.WeblogEntryData;
import
org.apache.roller.pojos.WebsiteData;

 /**
 * Manages Roller plugins.
 */
public interface PluginManager {
    
    /**
     * Returns
true if plugins are present
     */
    public boolean hasPagePlugins();
    
    
    /**
    * Returns a list of all registered weblog entry plugins initialized for
     * use with
the specified weblog.
     *
     * @param website        Website being processed
     */
   public Map getWeblogEntryPlugins(WebsiteData website);
    
    
    /**
     * Apply a
set of weblog entry plugins to the specified string and
     * return the results.  This method
must *NOT* alter the contents of
     * the original entry object.
     *
     * @param entry
      Original weblog entry
     * @param plugins     Map of plugins to apply
     * @param
str         String to which to apply plugins
     * @return        the transformed text
 
   */
    public String applyWeblogEntryPlugins(Map pagePlugins, WeblogEntryData entry, String
str);
    
    
    /**
     * Release all resources associa
 ted with Roller session.
     */
    public void release();
    
}
\ No newline at end of file

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/model/WeblogEntryPlugin.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/model/WeblogEntryPlugin.java?view=diff&rev=440456&r1=440455&r2=440456
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/model/WeblogEntryPlugin.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/model/WeblogEntryPlugin.java
Tue Sep  5 12:32:28 2006
@@ -50,7 +50,7 @@
      * @param weblog     Weblog being processed
      * @param model      Rendering model where objects can be placed
      */
-    public void init(WebsiteData weblog, Map model) throws RollerException;
+    public void init(WebsiteData weblog) throws RollerException;
     
     
     /**

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WebsiteData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WebsiteData.java?view=diff&rev=440456&r1=440455&r2=440456
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WebsiteData.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WebsiteData.java Tue
Sep  5 12:32:28 2006
@@ -1118,7 +1118,7 @@
             try {
                 Roller roller = RollerFactory.getRoller();
                 PluginManager ppmgr = roller.getPagePluginManager();
-                initializedPlugins = ppmgr.getWeblogEntryPlugins(this, new HashMap()); 
+                initializedPlugins = ppmgr.getWeblogEntryPlugins(this); 
             } catch (Exception e) {
                 this.log.error("ERROR: initializing plugins");
             }

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java?view=diff&rev=440456&r1=440455&r2=440456
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java
Tue Sep  5 12:32:28 2006
@@ -645,8 +645,7 @@
                 // Run entry through registered PagePlugins
                 PluginManager ppmgr = roller.getPagePluginManager();
                 Map plugins = ppmgr.getWeblogEntryPlugins(
-                        entry.getWebsite(),
-                        new HashMap());
+                        entry.getWebsite());
                 
                 String content = "";
                 if (!StringUtils.isEmpty(entry.getText())) {

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryPageModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryPageModel.java?view=diff&rev=440456&r1=440455&r2=440456
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryPageModel.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryPageModel.java
Tue Sep  5 12:32:28 2006
@@ -231,8 +231,7 @@
                 Roller roller = RollerFactory.getRoller();
                 PluginManager ppmgr = roller.getPagePluginManager();
                 Map plugins = ppmgr.getWeblogEntryPlugins(
-                    getWebsite(),
-                    new HashMap());
+                    getWebsite());
                 Iterator it = plugins.values().iterator();
                 while (it.hasNext()) list.add(it.next());
             }

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WebsiteFormAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WebsiteFormAction.java?view=diff&rev=440456&r1=440455&r2=440456
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WebsiteFormAction.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WebsiteFormAction.java
Tue Sep  5 12:32:28 2006
@@ -365,8 +365,7 @@
                     Roller roller = RollerFactory.getRoller();
                     PluginManager ppmgr = roller.getPagePluginManager();
                     Map plugins = ppmgr.getWeblogEntryPlugins(
-                            getWebsite(),
-                            new HashMap());
+                            getWebsite());
                     Iterator it = plugins.values().iterator();
                     while (it.hasNext()) list.add(it.next());
                 }

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/tags/ShowEntryContentTag.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/tags/ShowEntryContentTag.java?view=diff&rev=440456&r1=440455&r2=440456
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/tags/ShowEntryContentTag.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/tags/ShowEntryContentTag.java
Tue Sep  5 12:32:28 2006
@@ -69,8 +69,7 @@
                     try {
                         PluginManager ppmgr = roller.getPagePluginManager();
                         Map plugins = ppmgr.getWeblogEntryPlugins(
-                            entry.getWebsite(),
-                            new HashMap());
+                            entry.getWebsite());
                         xformed = ppmgr.applyWeblogEntryPlugins(
                             plugins, entry, entry.getText());
                     } catch (Exception e) {

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/tags/ShowEntrySummaryTag.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/tags/ShowEntrySummaryTag.java?view=diff&rev=440456&r1=440455&r2=440456
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/tags/ShowEntrySummaryTag.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/tags/ShowEntrySummaryTag.java
Tue Sep  5 12:32:28 2006
@@ -63,8 +63,7 @@
                         RollerContext.getRollerContext();
                     PluginManager ppmgr = roller.getPagePluginManager();
                     Map plugins = ppmgr.getWeblogEntryPlugins(
-                        entry.getWebsite(),
-                        new HashMap());
+                        entry.getWebsite());
                     xformed = ppmgr.applyWeblogEntryPlugins(
                         plugins, entry, entry.getSummary());
                 }               

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/tags/ShowEntryTextTag.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/tags/ShowEntryTextTag.java?view=diff&rev=440456&r1=440455&r2=440456
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/tags/ShowEntryTextTag.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/tags/ShowEntryTextTag.java
Tue Sep  5 12:32:28 2006
@@ -78,8 +78,7 @@
                     try {
                         PluginManager ppmgr = roller.getPagePluginManager();
                         Map plugins = ppmgr.getWeblogEntryPlugins(
-                                entry.getWebsite(),
-                                new HashMap());
+                                entry.getWebsite());
 
                         xformed = ppmgr.applyWeblogEntryPlugins(plugins, entry, sourceText);
 

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/AcronymsPlugin.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/AcronymsPlugin.java?view=diff&rev=440456&r1=440455&r2=440456
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/AcronymsPlugin.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/AcronymsPlugin.java
Tue Sep  5 12:32:28 2006
@@ -72,7 +72,7 @@
     }
     
     
-    public void init(WebsiteData website, Map model) throws RollerException {}
+    public void init(WebsiteData website) throws RollerException {}
     
     
     public String render(WeblogEntryData entry, String str) {

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/BookmarkPlugin.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/BookmarkPlugin.java?view=diff&rev=440456&r1=440455&r2=440456
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/BookmarkPlugin.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/BookmarkPlugin.java
Tue Sep  5 12:32:28 2006
@@ -65,7 +65,7 @@
     }
     
     
-    public void init(WebsiteData website, Map model) throws RollerException {}
+    public void init(WebsiteData website) throws RollerException {}
     
     
     public String render(WeblogEntryData entry, String str) {

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/ConvertLineBreaksPlugin.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/ConvertLineBreaksPlugin.java?view=diff&rev=440456&r1=440455&r2=440456
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/ConvertLineBreaksPlugin.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/ConvertLineBreaksPlugin.java
Tue Sep  5 12:32:28 2006
@@ -67,7 +67,7 @@
     }
     
     
-    public void init(WebsiteData website, Map model) throws RollerException {
+    public void init(WebsiteData website) throws RollerException {
         // we don't need to do any init.
         mLogger.debug("initing");
     }

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/ObfuscateEmailPlugin.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/ObfuscateEmailPlugin.java?view=diff&rev=440456&r1=440455&r2=440456
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/ObfuscateEmailPlugin.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/ObfuscateEmailPlugin.java
Tue Sep  5 12:32:28 2006
@@ -57,7 +57,7 @@
     }
     
     
-    public void init(WebsiteData website, Map model) throws RollerException {}
+    public void init(WebsiteData website) throws RollerException {}
     
     
     public String render(WeblogEntryData entry, String str) {

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/SearchPluginBase.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/SearchPluginBase.java?view=diff&rev=440456&r1=440455&r2=440456
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/SearchPluginBase.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/SearchPluginBase.java
Tue Sep  5 12:32:28 2006
@@ -53,7 +53,7 @@
      *
      * @see org.apache.roller.model.PagePlugin#init(WebsiteData, Object, String baseUrl,
org.apache.velocity.context.Context)
      */
-    public void init(WebsiteData website, Map model) throws RollerException {
+    public void init(WebsiteData website) throws RollerException {
         if (mLogger.isDebugEnabled()) {
             mLogger.debug(getClass().getName() + "; version:  " + getVersion() + "; base
version " + baseVersion);
         }

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/SmileysPlugin.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/SmileysPlugin.java?view=diff&rev=440456&r1=440455&r2=440456
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/SmileysPlugin.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/SmileysPlugin.java
Tue Sep  5 12:32:28 2006
@@ -77,7 +77,7 @@
      * later use.  Need an HttpServletRequest though so that we can
      * get the ServletContext Path.  But only do it once.
      */
-    public synchronized void init(WebsiteData website, Map model) throws RollerException
{
+    public synchronized void init(WebsiteData website) throws RollerException {
         // don't do this work if Smileys already loaded
         if (SmileysPlugin.smileyPatterns.length < 1) {
             String baseURL = RollerRuntimeConfig.getAbsoluteContextURL();

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/TopicTagPlugin.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/TopicTagPlugin.java?view=diff&rev=440456&r1=440455&r2=440456
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/TopicTagPlugin.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/plugins/TopicTagPlugin.java
Tue Sep  5 12:32:28 2006
@@ -132,7 +132,7 @@
      * @param ctx  Plugins may place objects into the Velocity Context.
      * @see PagWeblogEntryPluginit(org.apache.roller.presentation.RollerRequest, org.apache.velocity.context.Context)
      */
-    public void init(WebsiteData website, Map model) throws RollerException
+    public void init(WebsiteData website) throws RollerException
     {
         if (mLogger.isDebugEnabled())
         {

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/OldPageHelper.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/OldPageHelper.java?view=diff&rev=440456&r1=440455&r2=440456
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/OldPageHelper.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/OldPageHelper.java
Tue Sep  5 12:32:28 2006
@@ -99,7 +99,7 @@
         // init plugins
         Roller roller = RollerFactory.getRoller();
         PluginManager ppmgr = roller.getPagePluginManager();
-        mPagePlugins = ppmgr.getWeblogEntryPlugins(mWebsite, ctx);
+        mPagePlugins = ppmgr.getWeblogEntryPlugins(mWebsite);
     }
     
     

Modified: incubator/roller/branches/roller_3.0/tests/org/apache/roller/ui/rendering/plugins/SmileysTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/tests/org/apache/roller/ui/rendering/plugins/SmileysTest.java?view=diff&rev=440456&r1=440455&r2=440456
==============================================================================
--- incubator/roller/branches/roller_3.0/tests/org/apache/roller/ui/rendering/plugins/SmileysTest.java
(original)
+++ incubator/roller/branches/roller_3.0/tests/org/apache/roller/ui/rendering/plugins/SmileysTest.java
Tue Sep  5 12:32:28 2006
@@ -83,7 +83,7 @@
         doFilters();
         
         SmileysPlugin plugin = new SmileysPlugin();
-        plugin.init(testWeblog, null);
+        plugin.init(testWeblog);
         assertTrue( SmileysPlugin.smileyPatterns.length > 0 );
         
         String test = "put on a happy :-) face";



Mime
View raw message