This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit f4380471aa6a1490b4608e2169a678c3c79e0045 Author: juanpablo <[email protected]> AuthorDate: Tue Mar 24 15:51:40 2020 +0100 use o.a.w.api.core.Attachment instead of o.a.w.attachment.Attachment --- .../src/main/java/org/apache/wiki/rss/DefaultRSSGenerator.java | 2 +- jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/jspwiki-main/src/main/java/org/apache/wiki/rss/DefaultRSSGenerator.java b/jspwiki-main/src/main/java/org/apache/wiki/rss/DefaultRSSGenerator.java index 889484f..12ee384 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/rss/DefaultRSSGenerator.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/rss/DefaultRSSGenerator.java @@ -22,12 +22,12 @@ import org.apache.log4j.Logger; import org.apache.wiki.WikiContext; import org.apache.wiki.WikiPage; import org.apache.wiki.WikiSession; +import org.apache.wiki.api.core.Attachment; import org.apache.wiki.api.core.Context; import org.apache.wiki.api.core.Engine; import org.apache.wiki.api.core.Page; import org.apache.wiki.api.core.Session; import org.apache.wiki.api.providers.WikiProvider; -import org.apache.wiki.attachment.Attachment; import org.apache.wiki.auth.AuthorizationManager; import org.apache.wiki.auth.permissions.PagePermission; import org.apache.wiki.diff.DifferenceManager; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java b/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java index 41d48cb..e565c39 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java @@ -20,8 +20,9 @@ package org.apache.wiki.xmlrpc; import org.apache.wiki.LinkCollector; import org.apache.wiki.WikiContext; +import org.apache.wiki.api.core.Attachment; +import org.apache.wiki.api.core.Context; import org.apache.wiki.api.core.Page; -import org.apache.wiki.attachment.Attachment; import org.apache.wiki.auth.permissions.PagePermission; import org.apache.wiki.auth.permissions.PermissionFactory; import org.apache.wiki.pages.PageManager; @@ -216,7 +217,7 @@ public class RPCHandler extends AbstractRPCHandler { final LinkCollector extCollector = new LinkCollector(); final LinkCollector attCollector = new LinkCollector(); - final WikiContext context = new WikiContext( m_engine, page ); + final Context context = new WikiContext( m_engine, page ); m_engine.getManager( RenderingManager.class ).textToHTML( context, pagedata, localCollector, extCollector, attCollector ); final Vector< Hashtable< String, String > > result = new Vector<>();
