You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2012/12/26 23:22:42 UTC
svn commit: r1426062 -
/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/PluginManager.java
Author: juanpablo
Date: Wed Dec 26 22:22:42 2012
New Revision: 1426062
URL: http://svn.apache.org/viewvc?rev=1426062&view=rev
Log:
original execute() method returned to preserve backwards compatibility
Modified:
incubator/jspwiki/trunk/src/org/apache/wiki/plugin/PluginManager.java
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/PluginManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/PluginManager.java?rev=1426062&r1=1426061&r2=1426062&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/PluginManager.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/PluginManager.java Wed Dec 26 22:22:42 2012
@@ -19,12 +19,16 @@
package org.apache.wiki.plugin;
import java.io.IOException;
+import java.util.Map;
import java.util.Properties;
import org.apache.commons.lang.ClassUtils;
import org.apache.log4j.Logger;
+import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.exceptions.PluginException;
import org.apache.wiki.modules.WikiModuleInfo;
+import org.apache.wiki.parser.PluginContent;
import org.jdom.Element;
/**
@@ -130,6 +134,70 @@ public class PluginManager extends Defau
}
/**
+ * {@inheritDoc}
+ * @deprecated Remains because of old API compatobility; will be removed in 2.10 scope.
+ * Consider using {@link DefaultPluginManager#execute(WikiContext, String, Map)} instead
+ */
+ @Deprecated
+ public String execute( WikiContext context,
+ String classname,
+ Map< String, String > params )
+ throws PluginException {
+ String str = null;
+ try
+ {
+ str = super.execute(context, classname, params);
+ }
+ catch (org.apache.wiki.api.exceptions.PluginException e)
+ {
+ throw new PluginException( e.getMessage(), e );
+ }
+ return str;
+ }
+
+ /**
+ * {@inheritDoc}
+ * @deprecated Remains because of old API compatobility; will be removed in 2.10 scope.
+ * Consider using {@link DefaultPluginManager#execute(WikiContext, String)} instead
+ */
+ @Deprecated
+ public String execute( WikiContext context,
+ String commandline )
+ throws PluginException {
+ String str = null;
+ try
+ {
+ str = super.execute(context, commandline );
+ }
+ catch (org.apache.wiki.api.exceptions.PluginException e)
+ {
+ throw new PluginException( e.getMessage(), e );
+ }
+ return str;
+ }
+
+ /**
+ * {@inheritDoc}
+ * @deprecated Remains because of old API compatobility; will be removed in 2.10 scope.
+ * Consider using {@link DefaultPluginManager#parsePluginLine(WikiContext, String, int)} instead
+ */
+ @Deprecated
+ public PluginContent parsePluginLine( WikiContext context, String commandline, int pos )
+ throws PluginException
+ {
+ PluginContent pc = null;
+ try
+ {
+ pc = super.parsePluginLine(context, commandline, pos );
+ }
+ catch (org.apache.wiki.api.exceptions.PluginException e)
+ {
+ throw new PluginException( e.getMessage(), e );
+ }
+ return pc;
+ }
+
+ /**
* Contains information about a bunch of plugins.
*
*