You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by aj...@apache.org on 2009/04/06 14:01:07 UTC
svn commit: r762298 - in /incubator/jspwiki/trunk: src/java/org/apache/wiki/
src/java/org/apache/wiki/action/ src/java/org/apache/wiki/content/
src/java/org/apache/wiki/event/ src/java/org/apache/wiki/parser/
src/java/org/apache/wiki/plugin/ src/java/o...
Author: ajaquith
Date: Mon Apr 6 12:01:06 2009
New Revision: 762298
URL: http://svn.apache.org/viewvc?rev=762298&view=rev
Log:
Eliminated nearly every reference to PageManager with ContentManager in the code, plus or minus about two references. JSPs not checked yet.
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/ReferenceManager.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/DeleteActionBean.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageRenamer.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/event/WikiEventUtils.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/event/WikiPageEvent.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ListLocksPlugin.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogArchivePlugin.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogEntryPlugin.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogPlugin.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckLockTag.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/NoSuchPageTag.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageExistsTag.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/Installer.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/admin/beans/SearchManagerBean.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/RPCHandler.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiEngineTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/DeleteActionBeanTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/UserManagerTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/DefaultAclManagerTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/ContentManagerTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/PluginManagerTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/rss/RSSGeneratorTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/ReferenceManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ReferenceManager.java?rev=762298&r1=762297&r2=762298&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/ReferenceManager.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/ReferenceManager.java Mon Apr 6 12:01:06 2009
@@ -462,7 +462,7 @@
*
* @return The Collection of Strings
*/
- public synchronized Collection findUnreferenced()
+ public synchronized Collection<String> findUnreferenced()
{
ArrayList<String> unref = new ArrayList<String>();
@@ -494,7 +494,7 @@
*
* @return A Collection of Strings
*/
- public synchronized Collection findUncreated()
+ public synchronized Collection<String> findUncreated()
{
TreeSet<String> uncreated = new TreeSet<String>();
@@ -543,7 +543,7 @@
* @since 2.2.33
* @deprecated Use WikiPage.getRefersTo() instead
*/
- public Collection findRefersTo( String pageName ) throws ProviderException, PageNotFoundException
+ public Collection<String> findRefersTo( String pageName ) throws ProviderException, PageNotFoundException
{
ArrayList<String> result = new ArrayList<String>();
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/DeleteActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/DeleteActionBean.java?rev=762298&r1=762297&r2=762298&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/DeleteActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/DeleteActionBean.java Mon Apr 6 12:01:06 2009
@@ -29,7 +29,6 @@
import net.sourceforge.stripes.action.UrlBinding;
import net.sourceforge.stripes.validation.*;
-import org.apache.wiki.PageManager;
import org.apache.wiki.WikiEngine;
import org.apache.wiki.api.WikiPage;
import org.apache.wiki.attachment.Attachment;
@@ -137,8 +136,7 @@
// If version supplied exists, validation succeeds also.
WikiEngine engine = getContext().getEngine();
- PageManager pm = engine.getPageManager();
- if( pm.pageExists( getPage().getName(), m_version ) )
+ if( engine.pageExists( getPage().getName(), m_version ) )
{
// While we're at it, set the correct version for the bean
m_page = engine.getPage( getPage().getName(), m_version );
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java?rev=762298&r1=762297&r2=762298&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java Mon Apr 6 12:01:06 2009
@@ -38,6 +38,7 @@
import org.apache.wiki.api.WikiException;
import org.apache.wiki.api.WikiPage;
import org.apache.wiki.auth.permissions.PagePermission;
+import org.apache.wiki.content.ContentManager;
import org.apache.wiki.content.PageNotFoundException;
import org.apache.wiki.filters.RedirectException;
import org.apache.wiki.filters.SpamProtect;
@@ -106,7 +107,7 @@
PageLock lock = (PageLock) session.getAttribute( LOCK_PREFIX + pagereq );
if( lock != null )
{
- engine.getPageManager().unlockPage( lock );
+ engine.getContentManager().unlockPage( lock );
session.removeAttribute( LOCK_PREFIX + pagereq );
}
return new RedirectResolution( ViewActionBean.class ).addParameter( "page", pagereq );
@@ -155,7 +156,7 @@
// If page is locked, make sure we tell the user
List<Message> messages = wikiContext.getMessages();
WikiEngine engine = wikiContext.getEngine();
- PageManager mgr = engine.getPageManager();
+ ContentManager mgr = engine.getContentManager();
PageLock lock = mgr.getCurrentLock( m_page );
if( lock != null )
{
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageRenamer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageRenamer.java?rev=762298&r1=762297&r2=762298&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageRenamer.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageRenamer.java Mon Apr 6 12:01:06 2009
@@ -26,10 +26,11 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.wiki.*;
+import org.apache.wiki.InternalWikiException;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
import org.apache.wiki.api.WikiException;
import org.apache.wiki.api.WikiPage;
-import org.apache.wiki.attachment.Attachment;
import org.apache.wiki.log.Logger;
import org.apache.wiki.log.LoggerFactory;
import org.apache.wiki.parser.JSPWikiMarkupParser;
@@ -233,8 +234,8 @@
{
p.setAttribute( WikiPage.CHANGENOTE, fromPage.getName()+" ==> "+toPage.getName() );
p.setAuthor( context.getCurrentUser().getName() );
-
- engine.getPageManager().putPageText( p, newText );
+ p.setContent( newText );
+ p.save();
engine.updateReferences( p );
}
}
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/event/WikiEventUtils.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/event/WikiEventUtils.java?rev=762298&r1=762297&r2=762298&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/event/WikiEventUtils.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/event/WikiEventUtils.java Mon Apr 6 12:01:06 2009
@@ -113,7 +113,7 @@
{
if( client instanceof WikiEngine )
{
- WikiEventManager.addWikiEventListener( ((WikiEngine)client).getPageManager(), listener );
+ WikiEventManager.addWikiEventListener( ((WikiEngine)client).getContentManager(), listener );
}
else // if ( client instanceof PageManager ) // no filter?
{
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/event/WikiPageEvent.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/event/WikiPageEvent.java?rev=762298&r1=762297&r2=762298&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/event/WikiPageEvent.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/event/WikiPageEvent.java Mon Apr 6 12:01:06 2009
@@ -62,7 +62,7 @@
* <p>
* Page lock and unlock events occur only once during an editing session,
* so there are no begin and end events. They are generated
- * by the {@link org.apache.wiki.PageManager}.
+ * by the {@link org.apache.wiki.content.ContentManager}.
* </p>
*
* <h3>WikiPageEvents</h3>
@@ -97,11 +97,11 @@
private static final long serialVersionUID = 1L;
/** Indicates a page lock event. This is based on events
- * generated by {@link org.apache.wiki.PageManager}. */
+ * generated by {@link org.apache.wiki.content.ContentManager}. */
public static final int PAGE_LOCK = 10;
/** Indicates a page unlock event. This is based on events
- * generated by {@link org.apache.wiki.PageManager}. */
+ * generated by {@link org.apache.wiki.content.ContentManager}. */
public static final int PAGE_UNLOCK = 11;
// PRE_TRANSLATE .........
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/parser/JSPWikiMarkupParser.java?rev=762298&r1=762297&r2=762298&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/parser/JSPWikiMarkupParser.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/parser/JSPWikiMarkupParser.java Mon Apr 6 12:01:06 2009
@@ -48,6 +48,7 @@
import org.apache.wiki.log.LoggerFactory;
import org.apache.wiki.plugin.PluginManager;
import org.apache.wiki.plugin.WikiPlugin;
+import org.apache.wiki.providers.ProviderException;
import org.apache.wiki.render.CleanTextRenderer;
import org.apache.wiki.render.RenderingManager;
import org.apache.wiki.util.RegExpUtil;
@@ -1378,15 +1379,17 @@
try
{
acl = m_engine.getAclManager().parseAcl( page, ruleLine );
-
- page.setAcl( acl );
-
+ page.save();
if( log.isDebugEnabled() ) log.debug( acl.toString() );
}
catch( WikiSecurityException wse )
{
return makeError( wse.getMessage() );
}
+ catch( ProviderException pe )
+ {
+ return makeError( "Could not save WikiPage after extracting ACL: " + pe.getMessage() );
+ }
return m_currentElement;
}
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ListLocksPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ListLocksPlugin.java?rev=762298&r1=762297&r2=762298&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ListLocksPlugin.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ListLocksPlugin.java Mon Apr 6 12:01:06 2009
@@ -26,9 +26,9 @@
import java.util.ResourceBundle;
import org.apache.wiki.PageLock;
-import org.apache.wiki.PageManager;
import org.apache.wiki.WikiContext;
import org.apache.wiki.api.PluginException;
+import org.apache.wiki.content.ContentManager;
/**
@@ -50,8 +50,8 @@
{
StringBuilder result = new StringBuilder();
- PageManager mgr = context.getEngine().getPageManager();
- List locks = mgr.getActiveLocks();
+ ContentManager mgr = context.getEngine().getContentManager();
+ List<PageLock> locks = mgr.getActiveLocks();
ResourceBundle rb = context.getBundle(WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE);
result.append("<table class=\"wikitable\">\n");
@@ -69,9 +69,9 @@
else
{
int rowNum = 1;
- for( Iterator i = locks.iterator(); i.hasNext(); )
+ for( Iterator<PageLock> i = locks.iterator(); i.hasNext(); )
{
- PageLock lock = (PageLock) i.next();
+ PageLock lock = i.next();
result.append( rowNum % 2 != 0 ? "<tr class=\"odd\">" : "<tr>" );
result.append("<td>"+lock.getPage()+"</td>");
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogArchivePlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogArchivePlugin.java?rev=762298&r1=762297&r2=762298&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogArchivePlugin.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogArchivePlugin.java Mon Apr 6 12:01:06 2009
@@ -138,7 +138,7 @@
WeblogPlugin pl = new WeblogPlugin();
- List blogEntries = pl.findBlogEntries( engine.getPageManager(),
+ List blogEntries = pl.findBlogEntries( engine.getContentManager(),
page, new Date(0L), new Date() );
for( Iterator i = blogEntries.iterator(); i.hasNext(); )
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogEntryPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogEntryPlugin.java?rev=762298&r1=762297&r2=762298&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogEntryPlugin.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogEntryPlugin.java Mon Apr 6 12:01:06 2009
@@ -23,9 +23,12 @@
import java.text.SimpleDateFormat;
import java.util.*;
-import org.apache.wiki.*;
+import org.apache.wiki.PageLock;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
import org.apache.wiki.api.PluginException;
import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.content.ContentManager;
import org.apache.wiki.content.PageAlreadyExistsException;
import org.apache.wiki.content.WikiName;
import org.apache.wiki.log.Logger;
@@ -76,7 +79,7 @@
SimpleDateFormat fmt = new SimpleDateFormat(WeblogPlugin.DEFAULT_DATEFORMAT);
String today = fmt.format( new Date() );
- int entryNum = findFreeEntry( engine.getPageManager(),
+ int entryNum = findFreeEntry( engine.getContentManager(),
blogName,
today );
@@ -116,20 +119,18 @@
return sb.toString();
}
- private int findFreeEntry( PageManager mgr,
+ private int findFreeEntry( ContentManager mgr,
String baseName,
String date )
throws ProviderException
{
- Collection everyone = mgr.getAllPages();
+ Collection<WikiPage> everyone = mgr.getAllPages( null );
int max = 0;
String startString = WeblogPlugin.makeEntryPage( baseName, date, "" );
- for( Iterator i = everyone.iterator(); i.hasNext(); )
+ for( WikiPage p : everyone )
{
- WikiPage p = (WikiPage)i.next();
-
if( p.getName().startsWith(startString) )
{
try
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogPlugin.java?rev=762298&r1=762297&r2=762298&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogPlugin.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogPlugin.java Mon Apr 6 12:01:06 2009
@@ -27,12 +27,16 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.wiki.*;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiProvider;
import org.apache.wiki.api.PluginException;
import org.apache.wiki.api.WikiPage;
import org.apache.wiki.auth.AuthorizationManager;
import org.apache.wiki.auth.permissions.PagePermission;
+import org.apache.wiki.content.ContentManager;
import org.apache.wiki.content.PageNotFoundException;
+import org.apache.wiki.content.WikiName;
import org.apache.wiki.log.Logger;
import org.apache.wiki.log.LoggerFactory;
import org.apache.wiki.parser.PluginContent;
@@ -258,7 +262,7 @@
try
{
- List<WikiPage> blogEntries = findBlogEntries( engine.getPageManager(),
+ List<WikiPage> blogEntries = findBlogEntries( engine.getContentManager(),
weblogName,
startTime.getTime(),
stopTime.getTime() );
@@ -421,27 +425,25 @@
* Attempts to locate all pages that correspond to the
* blog entry pattern. Will only consider the days on the dates; not the hours and minutes.
*
- * @param mgr A PageManager which is used to get the pages
+ * @param mgr A ContentManager which is used to get the pages
* @param baseName The basename (e.g. "Main" if you want "Main_blogentry_xxxx")
* @param start The date which is the first to be considered
* @param end The end date which is the last to be considered
* @return a list of pages with their FIRST revisions.
* @throws ProviderException If something goes wrong
*/
- public List<WikiPage> findBlogEntries( PageManager mgr,
+ public List<WikiPage> findBlogEntries( ContentManager mgr,
String baseName, Date start, Date end )
throws ProviderException
{
- Collection<WikiPage> everyone = mgr.getAllPages();
+ Collection<WikiPage> everyone = mgr.getAllPages( null );
ArrayList<WikiPage> result = new ArrayList<WikiPage>();
baseName = makeEntryPage( baseName );
SimpleDateFormat fmt = new SimpleDateFormat(DEFAULT_DATEFORMAT);
- for( Iterator<WikiPage> i = everyone.iterator(); i.hasNext(); )
+ for( WikiPage p : everyone )
{
- WikiPage p = i.next();
-
String pageName = p.getName();
if( pageName.startsWith( baseName ) )
@@ -473,7 +475,7 @@
//
if( pageDay != null && pageDay.after(start) && pageDay.before(end) )
{
- WikiPage firstVersion = mgr.getPageInfo( pageName, 1 );
+ WikiPage firstVersion = mgr.getPage( p.getQualifiedName(), 1 );
result.add( firstVersion );
}
}
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java?rev=762298&r1=762297&r2=762298&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java Mon Apr 6 12:01:06 2009
@@ -29,7 +29,6 @@
import java.util.Date;
import java.util.Collection;
-import java.util.Iterator;
import org.apache.wiki.*;
@@ -275,16 +274,14 @@
throws ProviderException,
IOException
{
- Collection pages = m_engine.getPageManager().getAllPages();
+ Collection<WikiPage> pages = m_engine.getContentManager().getAllPages( null );
Feed feed = SyndicationFactory.newSyndicationFeed();
feed.setTitle("List of blogs at this site");
feed.setModified( new Date() );
- for( Iterator i = pages.iterator(); i.hasNext(); )
+ for( WikiPage p : pages )
{
- WikiPage p = (WikiPage) i.next();
-
//
// List only weblogs
// FIXME: Unfortunately, a weblog is not known until it has
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckLockTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckLockTag.java?rev=762298&r1=762297&r2=762298&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckLockTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckLockTag.java Mon Apr 6 12:01:06 2009
@@ -22,13 +22,12 @@
import java.io.IOException;
-
import javax.servlet.http.HttpSession;
import org.apache.wiki.PageLock;
-import org.apache.wiki.PageManager;
import org.apache.wiki.WikiEngine;
import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.content.ContentManager;
import org.apache.wiki.providers.ProviderException;
/**
@@ -99,7 +98,7 @@
if( page != null )
{
- PageManager mgr = engine.getPageManager();
+ ContentManager mgr = engine.getContentManager();
PageLock lock = mgr.getCurrentLock( page );
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/NoSuchPageTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/NoSuchPageTag.java?rev=762298&r1=762297&r2=762298&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/NoSuchPageTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/NoSuchPageTag.java Mon Apr 6 12:01:06 2009
@@ -57,10 +57,10 @@
}
public int doWikiStartTag()
- throws IOException, PageNotFoundException, ProviderException
+ throws IOException, ProviderException
{
WikiEngine engine = m_wikiContext.getEngine();
- WikiPage page;
+ WikiPage page = null;
if( m_pageName == null )
{
@@ -68,11 +68,16 @@
}
else
{
- page = engine.getPage( m_pageName );
+ try
+ {
+ page = engine.getPage( m_pageName );
+ }
+ catch( PageNotFoundException e )
+ {
+ // Page is null
+ }
}
- // System.out.println("Checking "+page);
-
if( page != null && engine.pageExists( page.getName(), page.getVersion() ) )
{
return SKIP_BODY;
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageExistsTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageExistsTag.java?rev=762298&r1=762297&r2=762298&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageExistsTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageExistsTag.java Mon Apr 6 12:01:06 2009
@@ -22,7 +22,6 @@
import java.io.IOException;
-import org.apache.wiki.content.PageNotFoundException;
import org.apache.wiki.providers.ProviderException;
@@ -40,7 +39,7 @@
private static final long serialVersionUID = 0L;
public final int doWikiStartTag()
- throws IOException, PageNotFoundException, ProviderException
+ throws IOException, ProviderException
{
return (super.doWikiStartTag() == SKIP_BODY) ? EVAL_BODY_INCLUDE : SKIP_BODY;
}
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/Installer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/Installer.java?rev=762298&r1=762297&r2=762298&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/Installer.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/Installer.java Mon Apr 6 12:01:06 2009
@@ -29,7 +29,6 @@
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
-import org.apache.wiki.PageManager;
import org.apache.wiki.PropertyReader;
import org.apache.wiki.WikiEngine;
import org.apache.wiki.WikiSession;
@@ -249,7 +248,6 @@
parseProperty( AuthenticationManager.PROP_SECURITY, nullValue );
// Set a few more default properties, for easy setup
- m_props.setProperty( PageManager.PROP_PAGEPROVIDER, "VersioningFileProvider" );
m_props.setProperty( WikiEngine.PROP_ENCODING, "UTF-8" );
}
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/admin/beans/SearchManagerBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/admin/beans/SearchManagerBean.java?rev=762298&r1=762297&r2=762298&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/admin/beans/SearchManagerBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/admin/beans/SearchManagerBean.java Mon Apr 6 12:01:06 2009
@@ -95,7 +95,7 @@
@SuppressWarnings("unchecked")
public void backgroundTask() throws Exception
{
- Collection<WikiPage> allPages = m_engine.getPageManager().getAllPages();
+ Collection<WikiPage> allPages = m_engine.getContentManager().getAllPages( null );
SearchManager mgr = m_engine.getSearchManager();
m_max = allPages.size();
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java?rev=762298&r1=762297&r2=762298&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java Mon Apr 6 12:01:06 2009
@@ -246,7 +246,7 @@
WeblogPlugin plugin = new WeblogPlugin();
- List<WikiPage> changed = plugin.findBlogEntries(m_context.getEngine().getPageManager(),
+ List<WikiPage> changed = plugin.findBlogEntries(m_context.getEngine().getContentManager(),
blogid,
new Date(0L),
new Date());
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/RPCHandler.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/RPCHandler.java?rev=762298&r1=762297&r2=762298&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/RPCHandler.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/RPCHandler.java Mon Apr 6 12:01:06 2009
@@ -101,15 +101,14 @@
return toRPCString(m_engine.getApplicationName());
}
- public Vector getAllPages()
+ public Vector<String> getAllPages()
{
checkPermission( PagePermission.VIEW );
- Collection pages = m_engine.getRecentChanges(m_context.getPage().getWiki());
+ Collection<WikiPage> pages = m_engine.getRecentChanges(m_context.getPage().getWiki());
Vector<String> result = new Vector<String>();
- for( Iterator i = pages.iterator(); i.hasNext(); )
+ for( WikiPage p : pages )
{
- WikiPage p = (WikiPage) i.next();
if( !(p instanceof Attachment) )
{
result.add( toRPCString(p.getName()) );
@@ -154,10 +153,10 @@
return ht;
}
- public Vector getRecentChanges( Date since )
+ public Vector<Hashtable<String, Object>> getRecentChanges( Date since )
{
checkPermission( PagePermission.VIEW );
- Collection pages = m_engine.getRecentChanges(m_context.getPage().getWiki());
+ Collection<WikiPage> pages = m_engine.getRecentChanges(m_context.getPage().getWiki());
Vector<Hashtable<String, Object>> result = new Vector<Hashtable<String, Object>>();
Calendar cal = Calendar.getInstance();
@@ -171,10 +170,8 @@
(cal.getTimeZone().inDaylightTime(since) ? cal.get( Calendar.DST_OFFSET ) : 0 ) ) );
since = cal.getTime();
- for( Iterator i = pages.iterator(); i.hasNext(); )
+ for( WikiPage page : pages )
{
- WikiPage page = (WikiPage)i.next();
-
if( page.getLastModified().after( since ) && !(page instanceof Attachment) )
{
result.add( encodeWikiPage( page ) );
@@ -238,14 +235,14 @@
}
}
- public Hashtable getPageInfo( String pagename )
+ public Hashtable<String,Object> getPageInfo( String pagename )
throws XmlRpcException
{
pagename = parsePageCheckCondition( pagename );
return encodeWikiPage( getWikiPage(pagename,-1) );
}
- public Hashtable getPageInfoVersion( String pagename, int version )
+ public Hashtable<String,Object> getPageInfoVersion( String pagename, int version )
throws XmlRpcException
{
pagename = parsePageCheckCondition( pagename );
@@ -301,7 +298,7 @@
}
}
- public Vector listLinks( String pagename )
+ public Vector<Hashtable<String, String>> listLinks( String pagename )
throws XmlRpcException
{
pagename = parsePageCheckCondition( pagename );
@@ -329,9 +326,8 @@
//
// Add local links.
//
- for( Iterator i = localCollector.getLinks().iterator(); i.hasNext(); )
+ for( String link : localCollector.getLinks() )
{
- String link = (String) i.next();
Hashtable<String, String> ht = new Hashtable<String, String>();
ht.put( "page", toRPCString( link ) );
ht.put( "type", LINK_LOCAL );
@@ -362,16 +358,12 @@
//
// Add links to inline attachments
//
- for( Iterator i = attCollector.getLinks().iterator(); i.hasNext(); )
+ for( String link : attCollector.getLinks() )
{
- String link = (String) i.next();
-
Hashtable<String, String> ht = new Hashtable<String, String>();
-
ht.put( "page", toRPCString( link ) );
ht.put( "type", LINK_LOCAL );
ht.put( "href", context.getURL(WikiContext.ATTACH,link) );
-
result.add( ht );
}
@@ -380,16 +372,12 @@
// simply because URLs are by definition ASCII.
//
- for( Iterator i = extCollector.getLinks().iterator(); i.hasNext(); )
+ for( String link : extCollector.getLinks() )
{
- String link = (String) i.next();
-
Hashtable<String, String> ht = new Hashtable<String, String>();
-
ht.put( "page", link );
ht.put( "type", LINK_EXTERNAL );
ht.put( "href", link );
-
result.add( ht );
}
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiEngineTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiEngineTest.java?rev=762298&r1=762297&r2=762298&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiEngineTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiEngineTest.java Mon Apr 6 12:01:06 2009
@@ -711,7 +711,7 @@
m_engine.saveText( NAME1, "[Foobar]" );
m_engine.getText( NAME1 ); // Ensure that page is cached.
- Collection c = refMgr.findUncreated();
+ Collection<String> c = refMgr.findUncreated();
assertTrue( "Non-existent reference not detected by ReferenceManager",
Util.collectionContains( c, "Foobar" ));
@@ -752,7 +752,7 @@
m_engine.saveText( NAME1, "[Foobar]" );
m_engine.getText( NAME1 ); // Ensure that page is cached.
- Collection c = refMgr.findUncreated();
+ Collection<String> c = refMgr.findUncreated();
assertEquals( "uncreated count", 1, c.size() );
assertEquals( "wrong referenced page", "Foobar", (String)c.iterator().next() );
@@ -822,8 +822,6 @@
Properties pr = new Properties();
pr.load( TestEngine.findTestProperties( "/jspwiki_vers.properties" ) );
- pr.setProperty( PageManager.PROP_USECACHE, "true" );
-
m_engine.shutdown();
m_engine = new TestEngine( pr );
@@ -873,7 +871,7 @@
m_engine.saveText( "RenameBugTestPage", "Mary had a little generic object" );
m_engine.saveText( "OldNameTestPage", "Linked to RenameBugTestPage" );
- Collection pages = m_engine.getReferenceManager().findReferrers( WikiName.valueOf("RenameBugTestPage") );
+ Collection<WikiName> pages = m_engine.getReferenceManager().findReferrers( WikiName.valueOf("RenameBugTestPage") );
assertEquals( "has one", "OldNameTestPage", pages.iterator().next() );
WikiContext ctx = m_engine.getWikiContextFactory().newViewContext( m_engine.getPage("OldNameTestPage") );
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/DeleteActionBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/DeleteActionBeanTest.java?rev=762298&r1=762297&r2=762298&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/DeleteActionBeanTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/DeleteActionBeanTest.java Mon Apr 6 12:01:06 2009
@@ -20,8 +20,6 @@
*/
package org.apache.wiki.action;
-import java.io.File;
-import java.io.FileWriter;
import java.util.Properties;
import junit.framework.Test;
@@ -30,11 +28,8 @@
import net.sourceforge.stripes.mock.MockRoundtrip;
import net.sourceforge.stripes.validation.ValidationErrors;
-import org.apache.wiki.PageManager;
import org.apache.wiki.TestEngine;
import org.apache.wiki.api.WikiPage;
-import org.apache.wiki.attachment.Attachment;
-import org.apache.wiki.attachment.AttachmentManager;
import org.apache.wiki.auth.Users;
public class DeleteActionBeanTest extends TestCase
@@ -48,8 +43,6 @@
try
{
TestEngine.emptyWorkDir();
- props.load( TestEngine.findTestProperties( "/jspwiki_vers.properties" ) );
- props.setProperty( PageManager.PROP_USECACHE, "false" );
m_engine = new TestEngine( props );
}
catch( Exception e )
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/UserManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/UserManagerTest.java?rev=762298&r1=762297&r2=762298&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/UserManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/UserManagerTest.java Mon Apr 6 12:01:06 2009
@@ -24,20 +24,23 @@
import java.util.List;
import java.util.Properties;
+import junit.framework.TestCase;
+
import org.apache.commons.lang.ArrayUtils;
-import org.apache.wiki.*;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiSession;
+import org.apache.wiki.WikiSessionTest;
import org.apache.wiki.api.WikiPage;
-import org.apache.wiki.auth.AuthorizationManager;
-import org.apache.wiki.auth.UserManager;
-import org.apache.wiki.auth.WikiPrincipal;
import org.apache.wiki.auth.authorize.Group;
import org.apache.wiki.auth.authorize.GroupManager;
import org.apache.wiki.auth.permissions.PermissionFactory;
-import org.apache.wiki.auth.user.*;
+import org.apache.wiki.auth.user.DuplicateUserException;
+import org.apache.wiki.auth.user.UserDatabase;
+import org.apache.wiki.auth.user.UserProfile;
+import org.apache.wiki.auth.user.XMLUserDatabase;
+import org.apache.wiki.content.ContentManager;
import org.apache.wiki.workflow.*;
-import junit.framework.TestCase;
-
/**
* @author Andrew Jaquith
@@ -103,10 +106,10 @@
// First, count the number of users, groups, and pages
int oldUserCount = m_db.getWikiNames().length;
GroupManager groupManager = m_engine.getGroupManager();
- PageManager pageManager = m_engine.getPageManager();
+ ContentManager contentManager = m_engine.getContentManager();
AuthorizationManager authManager = m_engine.getAuthorizationManager();
int oldGroupCount = groupManager.getRoles().length;
- int oldPageCount = pageManager.getTotalPageCount();
+ int oldPageCount = contentManager.getTotalPageCount( null );
// Setup Step 1: create a new user with random name
WikiSession session = m_engine.guestSession();
@@ -147,7 +150,7 @@
// 3a. Make sure the page got saved, and that ONLY our test user has permission to read it.
WikiPage p = m_engine.getPage( pageName );
- assertEquals ( oldPageCount+1, pageManager.getTotalPageCount() );
+ assertEquals ( oldPageCount+1, contentManager.getTotalPageCount( null ) );
assertNotNull( p.getAcl().getEntry( new WikiPrincipal( oldLogin ) ) );
assertNotNull( p.getAcl().getEntry( new WikiPrincipal( oldName ) ) );
assertNull ( p.getAcl().getEntry( new WikiPrincipal( newLogin ) ) );
@@ -207,7 +210,7 @@
pageName = "TestPage2" + now;
m_engine.saveText( pageName, "More test text. [{ALLOW view " + oldName + ", " + oldLogin + ", Alice}] More text." );
p = m_engine.getPage( pageName );
- assertEquals ( oldPageCount+1, pageManager.getTotalPageCount() );
+ assertEquals ( oldPageCount+1, contentManager.getTotalPageCount( null ) );
assertNotNull( p.getAcl().getEntry( new WikiPrincipal( oldLogin ) ) );
assertNotNull( p.getAcl().getEntry( new WikiPrincipal( oldName ) ) );
assertNull ( p.getAcl().getEntry( new WikiPrincipal( newLogin ) ) );
@@ -262,7 +265,7 @@
assertEquals( oldGroupCount, groupManager.getRoles().length );
m_engine.deletePage( pageName );
- assertEquals( oldPageCount, pageManager.getTotalPageCount() );
+ assertEquals( oldPageCount, contentManager.getTotalPageCount( null ) );
}
public void testSetUserProfile() throws Exception
@@ -321,12 +324,12 @@
// Now, look in Admin's queue, and verify there's a pending Decision there
DecisionQueue dq = m_engine.getWorkflowManager().getDecisionQueue();
- Collection decisions = dq.getActorDecisions( m_engine.adminSession() );
+ Collection<Decision> decisions = dq.getActorDecisions( m_engine.adminSession() );
assertEquals( 1, decisions.size() );
// Verify that the Decision has all the facts and attributes we need
- Decision d = (Decision)decisions.iterator().next();
- List facts = d.getFacts();
+ Decision d = decisions.iterator().next();
+ List<Fact> facts = d.getFacts();
assertEquals( new Fact( UserManager.PREFS_FULL_NAME, profile.getFullname() ), facts.get(0) );
assertEquals( new Fact( UserManager.PREFS_LOGIN_NAME, profile.getLoginName() ), facts.get(1) );
assertEquals( new Fact( UserManager.FACT_SUBMITTER, session.getUserPrincipal().getName() ), facts.get(2) );
@@ -375,12 +378,12 @@
// Now, look in Admin's queue, and verify there's a pending Decision there
DecisionQueue dq = m_engine.getWorkflowManager().getDecisionQueue();
- Collection decisions = dq.getActorDecisions( m_engine.adminSession() );
+ Collection<Decision> decisions = dq.getActorDecisions( m_engine.adminSession() );
assertEquals( 1, decisions.size() );
// Verify that the Decision has all the facts and attributes we need
- Decision d = (Decision)decisions.iterator().next();
- List facts = d.getFacts();
+ Decision d = decisions.iterator().next();
+ List<Fact> facts = d.getFacts();
assertEquals( new Fact( UserManager.PREFS_FULL_NAME, profile.getFullname() ), facts.get(0) );
assertEquals( new Fact( UserManager.PREFS_LOGIN_NAME, profile.getLoginName() ), facts.get(1) );
assertEquals( new Fact( UserManager.FACT_SUBMITTER, session.getUserPrincipal().getName() ), facts.get(2) );
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/DefaultAclManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/DefaultAclManagerTest.java?rev=762298&r1=762297&r2=762298&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/DefaultAclManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/DefaultAclManagerTest.java Mon Apr 6 12:01:06 2009
@@ -33,7 +33,6 @@
import org.apache.wiki.api.WikiPage;
import org.apache.wiki.auth.WikiPrincipal;
import org.apache.wiki.auth.permissions.PermissionFactory;
-import org.apache.wiki.providers.ProviderException;
public class DefaultAclManagerTest
@@ -72,13 +71,13 @@
{
WikiPage page = m_engine.getPage( "TestDefaultPage" );
Acl acl = m_engine.getAclManager().getPermissions( page );
- assertNotNull( page.getAcl() );
- assertTrue(page.getAcl().isEmpty());
+ assertNotNull( acl );
+ assertTrue( acl.isEmpty());
page = m_engine.getPage( "TestAclPage" );
acl = m_engine.getAclManager().getPermissions( page );
- assertNotNull( page.getAcl() );
- assertFalse(page.getAcl().isEmpty());
+ assertNotNull( acl );
+ assertFalse( acl.isEmpty() );
Principal[] p;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/ContentManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/ContentManagerTest.java?rev=762298&r1=762297&r2=762298&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/ContentManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/ContentManagerTest.java Mon Apr 6 12:01:06 2009
@@ -34,9 +34,16 @@
@Override
protected void tearDown() throws Exception
{
- WikiPage p = m_mgr.getPage( WikiName.valueOf("Main:TestPage") );
-
- if( p != null ) m_mgr.deletePage( p );
+ try
+ {
+ WikiPage p = m_mgr.getPage( WikiName.valueOf("Main:TestPage") );
+
+ if( p != null ) m_mgr.deletePage( p );
+ }
+ catch ( PageNotFoundException e )
+ {
+ // No worries; it just means one of our unit tests never created TestPage...
+ }
super.tearDown();
}
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/PluginManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/PluginManagerTest.java?rev=762298&r1=762297&r2=762298&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/PluginManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/PluginManagerTest.java Mon Apr 6 12:01:06 2009
@@ -57,14 +57,16 @@
props.load( TestEngine.findTestProperties() );
engine = new TestEngine(props);
- engine.deletePage( "Testpage" );
context = engine.getWikiContextFactory().newViewContext( engine.createPage( "Testpage" ) );
manager = new PluginManager( engine, props );
}
public void tearDown() throws Exception
{
- engine.deletePage("Testpage");
+ if ( engine.pageExists( "Testpage" ) )
+ {
+ engine.deletePage("Testpage");
+ }
engine.shutdown();
}
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/rss/RSSGeneratorTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/rss/RSSGeneratorTest.java?rev=762298&r1=762297&r2=762298&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/rss/RSSGeneratorTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/rss/RSSGeneratorTest.java Mon Apr 6 12:01:06 2009
@@ -24,7 +24,6 @@
*/
package org.apache.wiki.rss;
-import java.io.File;
import java.util.Date;
import java.util.List;
import java.util.Properties;
@@ -39,7 +38,6 @@
import org.apache.wiki.api.WikiPage;
import org.apache.wiki.plugin.WeblogEntryPlugin;
import org.apache.wiki.plugin.WeblogPlugin;
-import org.apache.wiki.providers.AbstractFileProvider;
/**
*
@@ -89,7 +87,7 @@
WeblogPlugin blogplugin = new WeblogPlugin();
- List<WikiPage> entries = blogplugin.findBlogEntries( m_testEngine.getPageManager(),
+ List<WikiPage> entries = blogplugin.findBlogEntries( m_testEngine.getContentManager(),
"TestBlog",
new Date(0),
new Date(Long.MAX_VALUE) );
@@ -119,7 +117,7 @@
WeblogPlugin blogplugin = new WeblogPlugin();
- List<WikiPage> entries = blogplugin.findBlogEntries( m_testEngine.getPageManager(),
+ List<WikiPage> entries = blogplugin.findBlogEntries( m_testEngine.getContentManager(),
"TestBlog",
new Date(0),
new Date(Long.MAX_VALUE) );
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java?rev=762298&r1=762297&r2=762298&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java Mon Apr 6 12:01:06 2009
@@ -26,9 +26,7 @@
import java.util.*;
import org.apache.wiki.*;
-import org.apache.wiki.api.WikiPage;
-import org.apache.wiki.attachment.Attachment;
-import org.apache.wiki.xmlrpc.RPCHandler;
+import org.apache.wiki.api.WikiPage;import org.apache.wiki.xmlrpc.RPCHandler;
import org.apache.xmlrpc.*;
public class RPCHandlerTest extends TestCase
@@ -66,7 +64,7 @@
m_engine.shutdown();
}
- public void testNonexistantPage()
+ public void testNonexistentPage()
{
try
{
@@ -83,12 +81,12 @@
throws Exception
{
Date time = getCalendarTime( Calendar.getInstance().getTime() );
- Vector previousChanges = m_handler.getRecentChanges( time );
+ Vector<Hashtable<String,Object>> previousChanges = m_handler.getRecentChanges( time );
m_engine.saveText( NAME1, "Foo" );
WikiPage directInfo = m_engine.getPage( NAME1 );
time = getCalendarTime( directInfo.getLastModified() );
- Vector recentChanges = m_handler.getRecentChanges( time );
+ Vector<Hashtable<String,Object>> recentChanges = m_handler.getRecentChanges( time );
assertEquals( "wrong number of changes", 1, recentChanges.size() - previousChanges.size() );
}
@@ -116,7 +114,7 @@
m_engine.saveText( NAME1, "Foobar.[{ALLOW view Anonymous}]" );
WikiPage directInfo = m_engine.getPage( NAME1 );
- Hashtable ht = m_handler.getPageInfo( NAME1 );
+ Hashtable<String,Object> ht = m_handler.getPageInfo( NAME1 );
assertEquals( "name", (String)ht.get( "name" ), NAME1 );
Date d = (Date) ht.get( "lastModified" );
@@ -149,11 +147,11 @@
m_engine.saveText( pageName, text );
- Vector links = m_handler.listLinks( pageName );
+ Vector<Hashtable<String,String>> links = m_handler.listLinks( pageName );
assertEquals( "link count", 1, links.size() );
- Hashtable linkinfo = (Hashtable) links.elementAt(0);
+ Hashtable<String,String> linkinfo = links.elementAt(0);
assertEquals( "name", "Foobar", linkinfo.get("page") );
assertEquals( "type", "local", linkinfo.get("type") );