Author: juanpablo
Date: Mon Dec 2 00:13:41 2013
New Revision: 1546872
URL: http://svn.apache.org/r1546872
Log:
* 2.10.0-svn-50
* Broke cycle between o.a.w.parser and o.a.w.api.engine packages:
** added public Pattern getPluginPattern() to o.a.w.api.engine.PluginManager
** moved PluginContent parsePluginLine( WikiContext context, String
commandline, int pos ) from
o.a.w.api.engine.PluginManager to equivalent-static method on
o.a.w.parser.PluginContent
** deleted deprecated public static boolean isPluginLink( String link ) from
o.a.w.api.engine.PluginManager,
consider using equivalent method on o.a.w.parser.JSPWikiMarkupParser
Modified:
jspwiki/trunk/jspwiki-war/src/main/config/doc/2.10-API.txt
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
Modified: jspwiki/trunk/jspwiki-war/src/main/config/doc/2.10-API.txt
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/config/doc/2.10-API.txt?rev=1546872&r1=1546871&r2=1546872&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/config/doc/2.10-API.txt (original)
+++ jspwiki/trunk/jspwiki-war/src/main/config/doc/2.10-API.txt Mon Dec 2
00:13:41 2013
@@ -105,15 +105,20 @@ org.apache.wiki.parser.JSPWikiMarkupPars
ones from WikiEngine
org.apache.wiki.parser.PluginContent
- -> getParameter returns String instead of Object (internally, it was
returning a String)
+ -> getParameter returns String instead of Object ( internally, it was
returning a String )
+ -> gains executeParse( WikiContext ), moved from o.a.w.p.PluginManager
+ -> gains PluginContent.executeParseLine( WikiContext, String, int ), moved
from o.a.w.p.PluginManager
org.apache.wiki.plugin.PluginManager
- -> new interface org.apache.wiki.api.engine.PluginManager
-> moved to org.apache.wiki.plugin.DefaultPluginManager
- -> @Deprecated public static boolean isPluginLink( String link )
+ -> new interface org.apache.wiki.api.engine.PluginManager
+ -> removed public static boolean isPluginLink( String link )
* equivalent method on org.apache.wiki.parser.JSPWikiMarkupParser
- -> @Deprecated public void executeParse(PluginContent content, WikiContext
context)
- * consider using PluginContent.executeParse(WikiContext) instead
+ -> removed public void executeParse( PluginContent content, WikiContext
context )
+ * consider using PluginContent.executeParse( WikiContext ) instead
+ -> removed parsePluginLine( WikiContext, String, int )
+ * consider using PluginContent.executeParseLine( WikiContext, String,
int ) instead
+ -> added public Pattern getPluginPattern(), which is part of the
org.apache.wiki.api.engine.PluginManager API
-> WikiPlugin newWikiPlugin( String pluginName, ResourceBundle rb ) is now
public
and part of the org.apache.wiki.api.engine.PluginManager API
-> WikiEngine.getPluginManager returns
org.apache.wiki.api.engine.PluginManager
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1546872&r1=1546871&r2=1546872&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
(original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Mon
Dec 2 00:13:41 2013
@@ -75,7 +75,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "49";
+ public static final String BUILD = "50";
/**
* This is the generic version string you should use
